summaryrefslogtreecommitdiff
path: root/src/lib/ecore_x/ecore_x.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore_x/ecore_x.c')
-rw-r--r--src/lib/ecore_x/ecore_x.c32
1 files changed, 4 insertions, 28 deletions
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index a32f42f..ff603bb 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -61,9 +61,6 @@ static int _ecore_x_event_fixes_selection_id = 0;
61#ifdef ECORE_XDAMAGE 61#ifdef ECORE_XDAMAGE
62static int _ecore_x_event_damage_id = 0; 62static int _ecore_x_event_damage_id = 0;
63#endif /* ifdef ECORE_XDAMAGE */ 63#endif /* ifdef ECORE_XDAMAGE */
64#ifdef ECORE_XGESTURE
65static int _ecore_x_event_gesture_id = 0;
66#endif /* ifdef ECORE_XGESTURE */
67#ifdef ECORE_XKB 64#ifdef ECORE_XKB
68static int _ecore_x_event_xkb_id = 0; 65static int _ecore_x_event_xkb_id = 0;
69#endif /* ifdef ECORE_XKB */ 66#endif /* ifdef ECORE_XKB */
@@ -167,6 +164,8 @@ EAPI int ECORE_X_RAW_BUTTON_PRESS = 0;
167EAPI int ECORE_X_RAW_BUTTON_RELEASE = 0; 164EAPI int ECORE_X_RAW_BUTTON_RELEASE = 0;
168EAPI int ECORE_X_RAW_MOTION = 0; 165EAPI int ECORE_X_RAW_MOTION = 0;
169 166
167EAPI int ECORE_X_DEVICES_CHANGE = 0;
168
170#ifdef LOGRT 169#ifdef LOGRT
171static double t0 = 0.0; 170static double t0 = 0.0;
172static Status (*_logrt_real_reply)(Display *disp, 171static Status (*_logrt_real_reply)(Display *disp,
@@ -406,10 +405,6 @@ _ecore_x_init2(void)
406 int damage_base = 0; 405 int damage_base = 0;
407 int damage_err_base = 0; 406 int damage_err_base = 0;
408#endif /* ifdef ECORE_XDAMAGE */ 407#endif /* ifdef ECORE_XDAMAGE */
409#ifdef ECORE_XGESTURE
410 int gesture_base = 0;
411 int gesture_err_base = 0;
412#endif /* ifdef ECORE_XGESTURE */
413#ifdef ECORE_XKB 408#ifdef ECORE_XKB
414 int xkb_base = 0; 409 int xkb_base = 0;
415#endif /* ifdef ECORE_XKB */ 410#endif /* ifdef ECORE_XKB */
@@ -468,12 +463,6 @@ _ecore_x_init2(void)
468 ECORE_X_EVENT_HANDLERS_GROW(damage_base, XDamageNumberEvents); 463 ECORE_X_EVENT_HANDLERS_GROW(damage_base, XDamageNumberEvents);
469#endif /* ifdef ECORE_XDAMAGE */ 464#endif /* ifdef ECORE_XDAMAGE */
470 465
471#ifdef ECORE_XGESTURE
472 if (XGestureQueryExtension(_ecore_x_disp, &gesture_base, &gesture_err_base))
473 _ecore_x_event_gesture_id = gesture_base;
474
475 ECORE_X_EVENT_HANDLERS_GROW(gesture_base, GestureNumberEvents);
476#endif /* ifdef ECORE_XGESTURE */
477#ifdef ECORE_XKB 466#ifdef ECORE_XKB
478 { 467 {
479 int dummy; 468 int dummy;
@@ -575,20 +564,6 @@ _ecore_x_init2(void)
575 _ecore_x_event_handlers[_ecore_x_event_xkb_id] = _ecore_x_event_handle_xkb; 564 _ecore_x_event_handlers[_ecore_x_event_xkb_id] = _ecore_x_event_handle_xkb;
576#endif /* ifdef ECORE_XKB */ 565#endif /* ifdef ECORE_XKB */
577 566
578#ifdef ECORE_XGESTURE
579 if (_ecore_x_event_gesture_id)
580 {
581 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyFlick] = _ecore_x_event_handle_gesture_notify_flick;
582 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPan] = _ecore_x_event_handle_gesture_notify_pan;
583 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPinchRotation] = _ecore_x_event_handle_gesture_notify_pinchrotation;
584 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTap] = _ecore_x_event_handle_gesture_notify_tap;
585 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTapNHold] = _ecore_x_event_handle_gesture_notify_tapnhold;
586 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyHold] = _ecore_x_event_handle_gesture_notify_hold;
587 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyGroup] = _ecore_x_event_handle_gesture_notify_group;
588 }
589
590#endif /* ifdef ECORE_XGESTURE */
591
592 ECORE_X_EVENT_ANY = ecore_event_type_new(); 567 ECORE_X_EVENT_ANY = ecore_event_type_new();
593 ECORE_X_EVENT_MOUSE_IN = ecore_event_type_new(); 568 ECORE_X_EVENT_MOUSE_IN = ecore_event_type_new();
594 ECORE_X_EVENT_MOUSE_OUT = ecore_event_type_new(); 569 ECORE_X_EVENT_MOUSE_OUT = ecore_event_type_new();
@@ -655,6 +630,8 @@ _ecore_x_init2(void)
655 ECORE_X_RAW_BUTTON_RELEASE = ecore_event_type_new(); 630 ECORE_X_RAW_BUTTON_RELEASE = ecore_event_type_new();
656 ECORE_X_RAW_MOTION = ecore_event_type_new(); 631 ECORE_X_RAW_MOTION = ecore_event_type_new();
657 632
633 ECORE_X_DEVICES_CHANGE = ecore_event_type_new();
634
658 _ecore_x_modifiers_get(); 635 _ecore_x_modifiers_get();
659 636
660 _ecore_x_atoms_init(); 637 _ecore_x_atoms_init();
@@ -687,7 +664,6 @@ _ecore_x_init2(void)
687 _ecore_x_present_init(); 664 _ecore_x_present_init();
688 _ecore_x_dpms_init(); 665 _ecore_x_dpms_init();
689 _ecore_x_randr_init(); 666 _ecore_x_randr_init();
690 _ecore_x_gesture_init();
691 _ecore_x_input_init(); 667 _ecore_x_input_init();
692 _ecore_x_events_init(); 668 _ecore_x_events_init();
693 669