Changeset 33321 in vbox for trunk

Timestamp:

Oct 21, 2010 5:14:03 PM (14 years ago)

Author:

vboxsync

Message:

Main. VBoxShell: demo recorder fully functional

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (2 diffs)
• Main/MouseImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -441 +441 @@
     print "Header is", header
     basere = re.compile(r'(?P<s>\d+): (?P<t>[km]) (?P<p>.*)')
-    mre = re.compile(r'(?P<a>\d+) (?P<x>\d+) (?P<y>\d+) (?P<z>\d+) (?P<w>\d+) (?P<b>\d+)')
+    mre = re.compile(r'(?P<a>\d+) (?P<x>-*\d+) (?P<y>-*\d+) (?P<z>-*\d+) (?P<w>-*\d+) (?P<b>-*\d+)')
     kre = re.compile(r'\d+')
 
@@ -449 +449 @@
     try:
         end = time.time() + dur
-        while  time.time() < end:
-            for line in demo:
-                m = basere.search(line)
-                if m is not None:
-                    dict = m.groupdict()
-                    stamp = dict['s']
-                    params = dict['p']
-                    type = dict['t']
-
-                    time.sleep(float(stamp)/1000)
-
-                    if type == 'k':
-                        codes=kre.findall(params)
-                        #print "KBD:",codes
-                        kbd.putScancodes(codes)
-                    elif type == 'm':
-                        mm = mre.search(params)
-                        if mm is not None:
-                            mdict = mm.groupdict()
-                            if mdict['a'] == '1':
-                                # absolute
-                                #print "MA: ",mdict['x'],mdict['y'],mdict['b']
-                                mouse.putMouseEventAbsolute(mdict['x'], mdict['y'], mdict['z'], mdict['w'], mdict['b'])
-                            else:
-                                #print "MR: ",mdict['x'],mdict['y'],mdict['b']
-                                mouse.putMouseEvent(mdict['x'], mdict['y'], mdict['z'], mdict['w'], mdict['b'])
+        for line in demo:
+            if time.time() > end:
+                break
+            m = basere.search(line)
+            if m is None:
+                continue
+
+            dict = m.groupdict()
+            stamp = dict['s']
+            params = dict['p']
+            type = dict['t']
+
+            time.sleep(float(stamp)/1000)
+
+            if type == 'k':
+                codes=kre.findall(params)
+                #print "KBD:",codes
+                kbd.putScancodes(codes)
+            elif type == 'm':
+                mm = mre.search(params)
+                if mm is not None:
+                    mdict = mm.groupdict()
+                    if mdict['a'] == '1':
+                        # absolute
+                        #print "MA: ",mdict['x'],mdict['y'],mdict['z'],mdict['b']
+                        mouse.putMouseEventAbsolute(int(mdict['x']), int(mdict['y']), int(mdict['z']), int(mdict['w']), int(mdict['b']))
+                    else:
+                        #print "MR: ",mdict['x'],mdict['y'],mdict['b']
+                        mouse.putMouseEvent(int(mdict['x']), int(mdict['y']), int(mdict['z']), int(mdict['w']), int(mdict['b']))
 
     # We need to catch all exceptions here, to close file

trunk/src/VBox/Main/MouseImpl.cpp

@@ -580 +580 @@
 
 #ifndef VBOXBFE_WITHOUT_COM
-    mMouseEvent.reinit(VBoxEventType_OnGuestMouseEvent, true, mouseXAbs, mouseYAbs, dz, dw, fButtons);
+    mMouseEvent.reinit(VBoxEventType_OnGuestMouseEvent, true, x, y, dz, dw, fButtons);
     mMouseEvent.fire(0);
 #endif