ginn

Merge lp:~gustavold/ginn/ginn.gustavo into lp:ginn

  1. ginn.gustavo
  2. Merge into trunk
Proposed by Gustavo Luiz Duarte
Status: Merged
Merged at revision: 61
Proposed branch: lp:~gustavold/ginn/ginn.gustavo
Merge into: lp:ginn
Diff against target: 80 lines (+17/-6)
2 files modified
src/ginn.c (+3/-0)
src/xt.c (+14/-6)
To merge this branch: bzr merge lp:~gustavold/ginn/ginn.gustavo
Reviewer Review Type Date Requested Status
Mohamed IKBEL Boulabiar (community) Approve
Review via email: mp+40733@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mohamed IKBEL Boulabiar (boulabiar) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ginn.c'
2--- src/ginn.c 2010-11-09 01:16:54 +0000
3+++ src/ginn.c 2010-11-12 15:55:42 +0000
4@@ -375,6 +375,8 @@
5 fprintf(stderr, "error subscribing to gestures\n");
6 return 1;
7 }
8+
9+ openDisplay();
10
11 while(1)
12 {
13@@ -395,6 +397,7 @@
14 }
15
16 geis_finish(instance);
17+ closeDisplay();
18 free(wp);
19 return 0;
20 }
21
22=== modified file 'src/xt.c'
23--- src/xt.c 2010-11-09 01:15:16 +0000
24+++ src/xt.c 2010-11-12 15:55:42 +0000
25@@ -21,11 +21,22 @@
26 #include <X11/extensions/XTest.h>
27 #include <X11/keysym.h>
28
29+static Display* disp = NULL;
30+
31+void openDisplay()
32+{
33+ disp = XOpenDisplay(NULL);
34+}
35+
36+void closeDisplay()
37+{
38+ XCloseDisplay(disp);
39+}
40+
41 void
42 injKey(KeySym ks, char * modifiers[])
43 {
44 int i;
45- Display* disp = XOpenDisplay(NULL);
46
47 for (i=0 ; i<4 && 0!=strcmp(modifiers[i],"") ; i++)
48 XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, XStringToKeysym(modifiers[i])), True, CurrentTime);
49@@ -34,14 +45,13 @@
50 for (i=0 ; i<4 && 0!=strcmp(modifiers[i],"") ; i++)
51 XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, XStringToKeysym(modifiers[i])), False, CurrentTime);
52
53- XCloseDisplay(disp);
54+ XFlush(disp);
55 }
56
57 void
58 injButton(int btn, char * modifiers[])
59 {
60 int i;
61- Display* disp = XOpenDisplay(NULL);
62
63 for (i=0 ; i<4 && 0!=strcmp(modifiers[i],"") ; i++)
64 XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, XStringToKeysym(modifiers[i])), True, CurrentTime);
65@@ -50,7 +60,7 @@
66 for (i=0 ; i<4 && 0!=strcmp(modifiers[i],"") ; i++)
67 XTestFakeKeyEvent(disp, XKeysymToKeycode(disp, XStringToKeysym(modifiers[i])), False, CurrentTime);
68
69- XCloseDisplay(disp);
70+ XFlush(disp);
71 }
72
73 static void
74@@ -68,7 +78,5 @@
75 static void
76 injectSymbols()
77 {
78- Display* disp = XOpenDisplay(NULL);
79- XCloseDisplay(disp);
80 }
81