Merge remote branch 'cros/upstream' into master

client/tests/kvm/stepeditor.py

 #!/usr/bin/python
 """
 Step file creator/editor.
 
 @copyright: Red Hat Inc 2009
 @author: mgoldish@redhat.com (Michael Goldish)
 @version: "20090401"
 """
 
 import pygtk, gtk, os, glob, shutil, sys, logging
 import common, ppm_utils
 pygtk.require('2.0')
 
 
 # General utilities
 
 def corner_and_size_clipped(startpoint, endpoint, limits):
     c0 = startpoint[:]
     c1 = endpoint[:]
-    if c0[0] < 0: c0[0] = 0
-    if c0[1] < 0: c0[1] = 0
-    if c1[0] < 0: c1[0] = 0
-    if c1[1] < 0: c1[1] = 0
-    if c0[0] > limits[0] - 1: c0[0] = limits[0] - 1
-    if c0[1] > limits[1] - 1: c0[1] = limits[1] - 1
-    if c1[0] > limits[0] - 1: c1[0] = limits[0] - 1
-    if c1[1] > limits[1] - 1: c1[1] = limits[1] - 1
+    if c0[0] < 0:
+        c0[0] = 0
+    if c0[1] < 0:
+        c0[1] = 0
+    if c1[0] < 0:
+        c1[0] = 0
+    if c1[1] < 0:
+        c1[1] = 0
+    if c0[0] > limits[0] - 1:
+        c0[0] = limits[0] - 1
+    if c0[1] > limits[1] - 1:
+        c0[1] = limits[1] - 1
+    if c1[0] > limits[0] - 1:
+        c1[0] = limits[0] - 1
+    if c1[1] > limits[1] - 1:
+        c1[1] = limits[1] - 1
     return ([min(c0[0], c1[0]),
              min(c0[1], c1[1])],
             [abs(c1[0] - c0[0]) + 1,
              abs(c1[1] - c0[1]) + 1])
 
 
 def key_event_to_qemu_string(event):
     keymap = gtk.gdk.keymap_get_default()
     keyvals = keymap.get_entries_for_keycode(event.hardware_keycode)
     keyval = keyvals[0][0]
@@ skipping 43 matching lines @@
              "Super_R": "0xdb",
              }
 
     if ord('a') <= keyval <= ord('z') or ord('0') <= keyval <= ord('9'):
         str = keyname
     elif keyname in dict.keys():
         str = dict[keyname]
     else:
         return ""
 
-    if event.state & gtk.gdk.CONTROL_MASK: str = "ctrl-" + str
-    if event.state & gtk.gdk.MOD1_MASK: str = "alt-" + str
-    if event.state & gtk.gdk.SHIFT_MASK: str = "shift-" + str
+    if event.state & gtk.gdk.CONTROL_MASK:
+        str = "ctrl-" + str
+    if event.state & gtk.gdk.MOD1_MASK:
+        str = "alt-" + str
+    if event.state & gtk.gdk.SHIFT_MASK:
+        str = "shift-" + str
 
     return str
 
 
 class StepMakerWindow:
 
     # Constructor
 
     def __init__(self):
         # Window
@@ skipping 148 matching lines @@
 
         label = gtk.Label("Keystrokes:")
         box.pack_start(label, False)
         label.show()
 
         frame = gtk.Frame()
         frame.set_shadow_type(gtk.SHADOW_IN)
         box.pack_start(frame)
         frame.show()
 
-        self.text_buffer = gtk.TextBuffer() ;
+        self.text_buffer = gtk.TextBuffer()
         self.entry_keys = gtk.TextView(self.text_buffer)
         self.entry_keys.set_wrap_mode(gtk.WRAP_WORD)
         self.entry_keys.connect("key-press-event", self.event_key_press)
         frame.add(self.entry_keys)
         self.entry_keys.show()
 
         self.check_manual = gtk.CheckButton("Manual")
         self.check_manual.connect("toggled", self.event_manual_toggled)
         box.pack_start(self.check_manual, False)
         self.check_manual.show()
@@ skipping 1108 matching lines @@
             file.write("# " + "-" * 32 + "\n")
             file.write(step)
         file.close()
 
 
 if __name__ == "__main__":
     se = StepEditor()
     if len(sys.argv) > 1:
         se.set_steps_file(sys.argv[1])
     gtk.main()