r4472 - developers/jeremy/maniac/src

[jeremy at docs.openmoko.org]

Author: jeremy
Date: 2008-06-04 08:34:12 +0200 (Wed, 04 Jun 2008)
New Revision: 4472

Modified:
   developers/jeremy/maniac/src/maniac.c
   developers/jeremy/maniac/src/mouse_event.c
   developers/jeremy/maniac/src/mouse_event.h
Log:
2008-06-04  Jeremy Chang  <jeremy at openmoko.com>

        *  Add Double_Click command in test.



Modified: developers/jeremy/maniac/src/maniac.c
===================================================================
--- developers/jeremy/maniac/src/maniac.c	2008-06-03 04:47:27 UTC (rev 4471)
+++ developers/jeremy/maniac/src/maniac.c	2008-06-04 06:34:12 UTC (rev 4472)
@@ -116,7 +116,7 @@
      {
         x = rand() % w;
         y = rand() % h;
-        mouse_cmd = rand() % 2;
+        mouse_cmd = rand() % 3;
         lap = random_lap_get();
 
         if(fd)
@@ -184,11 +184,15 @@
    switch(cmd) 
      {
         case MOUSE_CLICK:
-           maniac_mouseclick(disp, 1, x, y);
+           maniac_mouse_click(disp, 1, x, y);
            printf("Click x=%4d, y=%4d, lap=%7d\n", x, y, lap);
            break;
+        case MOUSE_DOUBLE_CLICK:
+           maniac_mouse_double_click(disp, 1, x, y);
+           printf("Double_Click x=%4d, y=%4d, lap=%7d\n", x, y, lap);
+           break;
         case MOUSE_DND:
-           maniac_mousednd(disp, 1, x, y);
+           maniac_mouse_dnd(disp, 1, x, y);
            printf("DND   x=%4d, y=%4d lap=%7d\n", x, y, lap);
            break;
         default:

Modified: developers/jeremy/maniac/src/mouse_event.c
===================================================================
--- developers/jeremy/maniac/src/mouse_event.c	2008-06-03 04:47:27 UTC (rev 4471)
+++ developers/jeremy/maniac/src/mouse_event.c	2008-06-04 06:34:12 UTC (rev 4472)
@@ -1,4 +1,5 @@
 #include <X11/extensions/XTest.h>
+#include <unistd.h>
 #include <stdio.h>
 #include "mouse_event.h"
 
@@ -50,7 +51,7 @@
 }
 
 int
-maniac_mouseclick(Display *disp, int button, int x, int y) 
+maniac_mouse_click(Display *disp, int button, int x, int y) 
 {
    int ret;
    ret = maniac_mousemove(disp, x, y);
@@ -61,9 +62,24 @@
 }
 
 int
-maniac_mousednd(Display *disp, int button, int x, int y)
+maniac_mouse_double_click(Display *disp, int button, int x, int y) 
 {
    int ret;
+   ret = maniac_mousemove(disp, x, y);
+   if (!ret) 
+     return ret;
+   ret = maniac_click(disp, button);
+   if (!ret) 
+     return ret;
+   usleep(200000);
+   ret = maniac_click(disp, button);
+   return ret;
+}
+
+int
+maniac_mouse_dnd(Display *disp, int button, int x, int y)
+{
+   int ret;
    ret = maniac_mousedown(disp, button);
    if (!ret)
      return ret;

Modified: developers/jeremy/maniac/src/mouse_event.h
===================================================================
--- developers/jeremy/maniac/src/mouse_event.h	2008-06-03 04:47:27 UTC (rev 4471)
+++ developers/jeremy/maniac/src/mouse_event.h	2008-06-04 06:34:12 UTC (rev 4472)
@@ -7,6 +7,7 @@
 
 enum {
   MOUSE_CLICK,
+  MOUSE_DOUBLE_CLICK,
   MOUSE_DND
 }MouseCmd;
 
@@ -16,8 +17,9 @@
 int maniac_mousedown(Display *disp, int button); 
 int maniac_mouseup(Display *disp, int button);
 int maniac_click(Display *disp, int button); 
-int maniac_mouseclick(Display *disp, int button, int x, int y);
-int maniac_mousednd(Display *disp, int button, int x, int y);
+int maniac_mouse_click(Display *disp, int button, int x, int y);
+int maniac_mouse_double_click(Display *disp, int button, int x, int y);
+int maniac_mouse_dnd(Display *disp, int button, int x, int y);
 
 
 #endif