Enlightenment CVS committal
Author : stffrdhrn
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x.c
Log Message:
Keep track of max handlers_num using the handlers_num, not LASTEvent
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- ecore_x.c 8 Mar 2006 08:54:36 -0000 1.108
+++ ecore_x.c 8 Mar 2006 15:07:37 -0000 1.109
@@ -170,18 +170,19 @@
if (!_ecore_x_disp) return 0;
_ecore_x_error_handler_init();
_ecore_x_event_handlers_num = LASTEvent;
-
+
if (XShapeQueryExtension(_ecore_x_disp, &shape_base, &shape_err_base))
_ecore_x_event_shape_id = shape_base + ShapeNotify;
- if (_ecore_x_event_shape_id >= LASTEvent)
+ if (_ecore_x_event_shape_id >= _ecore_x_event_handlers_num)
_ecore_x_event_handlers_num = _ecore_x_event_shape_id + 1;
+
#ifdef ECORE_XSS
if (XScreenSaverQueryExtension(_ecore_x_disp, &screensaver_base,
&screensaver_err_base))
_ecore_x_event_screensaver_id = screensaver_base + ScreenSaverNotify;
#endif
- if (_ecore_x_event_screensaver_id >= LASTEvent)
+ if (_ecore_x_event_screensaver_id >= _ecore_x_event_handlers_num)
_ecore_x_event_handlers_num = _ecore_x_event_screensaver_id + 1;
-
+
if (XSyncQueryExtension(_ecore_x_disp, &sync_base, &sync_err_base))
{
int major, minor;
@@ -190,13 +191,13 @@
if (!XSyncInitialize(_ecore_x_disp, &major, &minor))
_ecore_x_event_sync_id = 0;
}
- if (_ecore_x_event_sync_id + XSyncAlarmNotify >= LASTEvent)
+ if (_ecore_x_event_sync_id + XSyncAlarmNotify >=
_ecore_x_event_handlers_num)
_ecore_x_event_handlers_num = _ecore_x_event_sync_id + XSyncAlarmNotify +
1;
-
+
#ifdef ECORE_XRANDR
if (XRRQueryExtension(_ecore_x_disp, &randr_base, &randr_err_base))
_ecore_x_event_randr_id = randr_base + RRScreenChangeNotify;
- if (_ecore_x_event_randr_id >= LASTEvent)
+ if (_ecore_x_event_randr_id >= _ecore_x_event_handlers_num)
_ecore_x_event_handlers_num = _ecore_x_event_randr_id + 1;
#endif
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs