Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h aclass.c events.c
Log Message:
Fix desk button bindings when passed through by app.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -3 -r1.520 -r1.521
--- E.h 22 Dec 2005 18:43:14 -0000 1.520
+++ E.h 24 Dec 2005 00:39:29 -0000 1.521
@@ -488,6 +488,7 @@
int px, py;
Time last_btime;
Window last_bpress;
+ Window last_bpress2;
unsigned int last_button;
unsigned int last_keycode;
char double_click;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/aclass.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- aclass.c 27 Nov 2005 13:11:03 -0000 1.23
+++ aclass.c 24 Dec 2005 00:39:29 -0000 1.24
@@ -873,7 +873,7 @@
mouse = 0;
break;
case ButtonPress:
- if (ev->xbutton.time == 0)
+ if (Mode.events.double_click)
type = EVENT_DOUBLE_DOWN;
else
type = EVENT_MOUSE_DOWN;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- events.c 27 Nov 2005 13:11:05 -0000 1.109
+++ events.c 24 Dec 2005 00:39:29 -0000 1.110
@@ -243,15 +243,14 @@
SoundPlay("SOUND_BUTTON_CLICK");
Mode.events.double_click =
- (((ev->xbutton.time - Mode.events.last_btime) < DOUBLE_CLICK_TIME) &&
- (ev->xbutton.button == Mode.events.last_button));
+ ((ev->xbutton.time - Mode.events.last_btime < DOUBLE_CLICK_TIME) &&
+ ev->xbutton.button == Mode.events.last_button &&
+ ev->xbutton.window == Mode.events.last_bpress2);
Mode.events.last_bpress = ev->xbutton.window;
+ Mode.events.last_bpress2 = ev->xbutton.window;
Mode.events.last_btime = ev->xbutton.time;
Mode.events.last_button = ev->xbutton.button;
-
- if (Mode.events.double_click)
- ev->xbutton.time = 0;
break;
case ButtonRelease: /* 5 */
SoundPlay("SOUND_BUTTON_RAISE");
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
