Refactory UI to grab shortcut keys, and tests to not look for triggers.

client/site_tests/factory_Touchpad/factory_Touchpad.py

 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # DESCRIPTION :
 #
 # Intended for use during manufacturing to validate that the touchpad
@@ skipping 37 matching lines @@
 _X_OF_OFFSET = 486 + _F_RADIUS + 2
 _Y_OF_OFFSET = 54 + _F_RADIUS + 2
 
 _X_TFL_OFFSET = 459 + _F_RADIUS + 2
 _X_TFR_OFFSET = 513 + _F_RADIUS + 2
 _Y_TF_OFFSET = 117 + _F_RADIUS + 2
 
 
 class TouchpadTest:
 
-    def __init__(self, tp_image, drawing_area, ft_state):
+    def __init__(self, tp_image, drawing_area):
         self._tp_image = tp_image
         self._drawing_area = drawing_area
-        self._ft_state = ft_state
         self._motion_grid = {}
         for x in range(_X_SEGMENTS):
             for y in range(_Y_SEGMENTS):
                 self._motion_grid['%d,%d' % (x, y)] = False
         self._scroll_array = {}
         for y in range(_Y_SEGMENTS):
             self._scroll_array[y] = False
         self._l_click = False
         self._r_click = False
         self._of_z_rad = 0
@@ skipping 113 matching lines @@
         if self._l_click and not self._r_click:
             context.set_source_rgba(*ful.RGBA_YELLOW_OVERLAY)
 
         context.arc(_X_TFL_OFFSET, _Y_TF_OFFSET, self._tf_z_rad, 0.0, 2.0 * pi)
         context.fill()
         context.arc(_X_TFR_OFFSET, _Y_TF_OFFSET, self._tf_z_rad, 0.0, 2.0 * pi)
         context.fill()
 
         return True
 
-    def key_press_event(self, widget, event):
-        self._ft_state.exit_on_trigger(event)
-        return True
-
     def button_press_event(self, widget, event):
         factory.log('button_press_event %d,%d' % (event.x, event.y))
         return True
 
     def button_release_event(self, widget, event):
         factory.log('button_release_event %d,%d' % (event.x, event.y))
         return True
 
     def motion_event(self, widget, event):
         factory.log('motion_event %d,%d' % (event.x, event.y))
         return True
 
-    def register_callbacks(self, window):
-        window.connect('key-press-event', self.key_press_event)
-        window.add_events(gdk.KEY_PRESS_MASK)
-
 
 class SynClient:
 
     def __init__(self, test):
         self._test = test
         proc = subprocess.Popen(_SYNCLIENT_SETTINGS_CMDLINE.split(),
                                 stdout=subprocess.PIPE)
         settings_data = proc.stdout.readlines()
         settings = {}
         for line in settings_data:
@@ skipping 31 matching lines @@
     def quit(self):
         factory.log('killing SynClient ...')
         self._proc.kill()
         factory.log('dead')
 
 
 class factory_Touchpad(test.test):
     version = 1
     preserve_srcdir = True
 
-    def run_once(self,
-                 test_widget_size=None,
-                 trigger_set=None):
+    def run_once(self):
 
         factory.log('%s run_once' % self.__class__)
 
-        ft_state = ful.State(trigger_set)
-
         os.chdir(self.srcdir)
         tp_image = cairo.ImageSurface.create_from_png('touchpad.png')
         image_size = (tp_image.get_width(), tp_image.get_height())
 
         drawing_area = gtk.DrawingArea()
 
-        test = TouchpadTest(tp_image, drawing_area, ft_state)
+        test = TouchpadTest(tp_image, drawing_area)
 
         drawing_area.set_size_request(*image_size)
         drawing_area.connect('expose_event', test.expose_event)
         drawing_area.connect('button-press-event', test.button_press_event)
         drawing_area.connect('button-release-event', test.button_release_event)
         drawing_area.connect('motion-notify-event', test.motion_event)
         drawing_area.add_events(gdk.EXPOSURE_MASK |
                                 gdk.BUTTON_PRESS_MASK |
                                 gdk.BUTTON_RELEASE_MASK |
                                 gdk.POINTER_MOTION_MASK)
 
         countdown_widget, countdown_label = ful.make_countdown_widget()
         gobject.timeout_add(1000, test.timer_event, countdown_label)
 
         test_widget = gtk.VBox()
         test_widget.set_spacing(20)
         test_widget.pack_start(drawing_area, False, False)
         test_widget.pack_start(countdown_widget, False, False)
 
         synclient = SynClient(test)
 
-        ft_state.run_test_widget(
-            test_widget=test_widget,
-            test_widget_size=test_widget_size,
-            window_registration_callback=test.register_callbacks,
+        ful.run_test_widget(self.job, test_widget,
             cleanup_callback=synclient.quit)
 
         missing = test.calc_missing_string()
         if missing:
             raise error.TestFail(missing)
 
         factory.log('%s run_once finished' % self.__class__)