summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/ci-configure.sh5
-rw-r--r--meson_options.txt6
-rw-r--r--src/lib/ecore_x/Ecore_X.h14
-rw-r--r--src/lib/ecore_x/ecore_x.c28
-rw-r--r--src/lib/ecore_x/ecore_x_events.c182
-rw-r--r--src/lib/ecore_x/ecore_x_gesture.c90
-rw-r--r--src/lib/ecore_x/ecore_x_private.h13
-rw-r--r--src/lib/ecore_x/meson.build4
8 files changed, 11 insertions, 331 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index f5a127ba0d..88ca9e22ad 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -14,10 +14,11 @@ if [ "$DISTRO" != "" ] ; then
14 WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true" 14 WAYLAND_LINUX_COPTS=" -Dwl=true -Ddrm=true -Dopengl=es-egl -Dwl-deprecated=true -Ddrm-deprecated=true"
15 15
16 # TODO: 16 # TODO:
17 # - No libelogind, Xgesture packages in fedora 30 repo 17 # - Enable C++ bindings: -Dbindings=luajit,cxx
18 # - No libelogind package in fedora 30 repo
18 # - RPM fusion repo for xine and libvlc 19 # - RPM fusion repo for xine and libvlc
19 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ 20 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
20 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \ 21 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \
21 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \ 22 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \
22 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \ 23 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \
23 -Dvnc-server=true -Dbindings=luajit,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true" 24 -Dvnc-server=true -Dbindings=luajit,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true"
diff --git a/meson_options.txt b/meson_options.txt
index 4652730e6d..dd9fa01dcf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -150,12 +150,6 @@ option('xpresent',
150 description : 'X11 XPresent extension support in efl' 150 description : 'X11 XPresent extension support in efl'
151) 151)
152 152
153option('xgesture',
154 type : 'boolean',
155 value : false,
156 description : 'X11 XGesture support in efl'
157)
158
159option('xinput2', 153option('xinput2',
160 type : 'boolean', 154 type : 'boolean',
161 value : true, 155 value : true,
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 7d4423048b..b58520c1b3 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2713,15 +2713,11 @@ struct _Ecore_X_Event_Gesture_Notify_Group
2713 int group_id; 2713 int group_id;
2714}; 2714};
2715 2715
2716EAPI Eina_Bool ecore_x_gesture_supported(void); 2716EINA_DEPRECATED EAPI Eina_Bool ecore_x_gesture_supported(void);
2717 2717EINA_DEPRECATED EAPI Eina_Bool ecore_x_gesture_events_select(Ecore_X_Window win, Ecore_X_Gesture_Event_Mask mask);
2718EAPI Eina_Bool ecore_x_gesture_events_select(Ecore_X_Window win, Ecore_X_Gesture_Event_Mask mask); 2718EINA_DEPRECATED EAPI Ecore_X_Gesture_Event_Mask ecore_x_gesture_events_selected_get(Ecore_X_Window win);
2719 2719EINA_DEPRECATED EAPI Eina_Bool ecore_x_gesture_event_grab(Ecore_X_Window win, Ecore_X_Gesture_Event_Type type, int num_fingers);
2720EAPI Ecore_X_Gesture_Event_Mask ecore_x_gesture_events_selected_get(Ecore_X_Window win); 2720EINA_DEPRECATED EAPI Eina_Bool ecore_x_gesture_event_ungrab(Ecore_X_Window win, Ecore_X_Gesture_Event_Type type, int num_fingers);
2721
2722EAPI Eina_Bool ecore_x_gesture_event_grab(Ecore_X_Window win, Ecore_X_Gesture_Event_Type type, int num_fingers);
2723
2724EAPI Eina_Bool ecore_x_gesture_event_ungrab(Ecore_X_Window win, Ecore_X_Gesture_Event_Type type, int num_fingers);
2725 2721
2726EAPI void ecore_x_e_illume_indicator_state_set(Ecore_X_Window win, Ecore_X_Illume_Indicator_State state); 2722EAPI void ecore_x_e_illume_indicator_state_set(Ecore_X_Window win, Ecore_X_Illume_Indicator_State state);
2727EAPI Ecore_X_Illume_Indicator_State ecore_x_e_illume_indicator_state_get(Ecore_X_Window win); 2723EAPI Ecore_X_Illume_Indicator_State ecore_x_e_illume_indicator_state_get(Ecore_X_Window win);
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index cbe2d137cd..ff603bb43b 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 */
@@ -408,10 +405,6 @@ _ecore_x_init2(void)
408 int damage_base = 0; 405 int damage_base = 0;
409 int damage_err_base = 0; 406 int damage_err_base = 0;
410#endif /* ifdef ECORE_XDAMAGE */ 407#endif /* ifdef ECORE_XDAMAGE */
411#ifdef ECORE_XGESTURE
412 int gesture_base = 0;
413 int gesture_err_base = 0;
414#endif /* ifdef ECORE_XGESTURE */
415#ifdef ECORE_XKB 408#ifdef ECORE_XKB
416 int xkb_base = 0; 409 int xkb_base = 0;
417#endif /* ifdef ECORE_XKB */ 410#endif /* ifdef ECORE_XKB */
@@ -470,12 +463,6 @@ _ecore_x_init2(void)
470 ECORE_X_EVENT_HANDLERS_GROW(damage_base, XDamageNumberEvents); 463 ECORE_X_EVENT_HANDLERS_GROW(damage_base, XDamageNumberEvents);
471#endif /* ifdef ECORE_XDAMAGE */ 464#endif /* ifdef ECORE_XDAMAGE */
472 465
473#ifdef ECORE_XGESTURE
474 if (XGestureQueryExtension(_ecore_x_disp, &gesture_base, &gesture_err_base))
475 _ecore_x_event_gesture_id = gesture_base;
476
477 ECORE_X_EVENT_HANDLERS_GROW(gesture_base, GestureNumberEvents);
478#endif /* ifdef ECORE_XGESTURE */
479#ifdef ECORE_XKB 466#ifdef ECORE_XKB
480 { 467 {
481 int dummy; 468 int dummy;
@@ -577,20 +564,6 @@ _ecore_x_init2(void)
577 _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;
578#endif /* ifdef ECORE_XKB */ 565#endif /* ifdef ECORE_XKB */
579 566
580#ifdef ECORE_XGESTURE
581 if (_ecore_x_event_gesture_id)
582 {
583 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyFlick] = _ecore_x_event_handle_gesture_notify_flick;
584 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPan] = _ecore_x_event_handle_gesture_notify_pan;
585 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyPinchRotation] = _ecore_x_event_handle_gesture_notify_pinchrotation;
586 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTap] = _ecore_x_event_handle_gesture_notify_tap;
587 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyTapNHold] = _ecore_x_event_handle_gesture_notify_tapnhold;
588 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyHold] = _ecore_x_event_handle_gesture_notify_hold;
589 _ecore_x_event_handlers[_ecore_x_event_gesture_id + GestureNotifyGroup] = _ecore_x_event_handle_gesture_notify_group;
590 }
591
592#endif /* ifdef ECORE_XGESTURE */
593
594 ECORE_X_EVENT_ANY = ecore_event_type_new(); 567 ECORE_X_EVENT_ANY = ecore_event_type_new();
595 ECORE_X_EVENT_MOUSE_IN = ecore_event_type_new(); 568 ECORE_X_EVENT_MOUSE_IN = ecore_event_type_new();
596 ECORE_X_EVENT_MOUSE_OUT = ecore_event_type_new(); 569 ECORE_X_EVENT_MOUSE_OUT = ecore_event_type_new();
@@ -691,7 +664,6 @@ _ecore_x_init2(void)
691 _ecore_x_present_init(); 664 _ecore_x_present_init();
692 _ecore_x_dpms_init(); 665 _ecore_x_dpms_init();
693 _ecore_x_randr_init(); 666 _ecore_x_randr_init();
694 _ecore_x_gesture_init();
695 _ecore_x_input_init(); 667 _ecore_x_input_init();
696 _ecore_x_events_init(); 668 _ecore_x_events_init();
697 669
diff --git a/src/lib/ecore_x/ecore_x_events.c b/src/lib/ecore_x/ecore_x_events.c
index 904e115f0d..6431bdd283 100644
--- a/src/lib/ecore_x/ecore_x_events.c
+++ b/src/lib/ecore_x/ecore_x_events.c
@@ -2466,188 +2466,6 @@ _ecore_x_event_handle_generic_event(XEvent *event)
2466 data); 2466 data);
2467} 2467}
2468 2468
2469#ifdef ECORE_XGESTURE
2470void
2471_ecore_x_event_handle_gesture_notify_flick(XEvent *xevent)
2472{
2473 XGestureNotifyFlickEvent *xfe;
2474 Ecore_X_Event_Gesture_Notify_Flick *e;
2475
2476 _ecore_x_last_event_mouse_move = EINA_FALSE;
2477 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2478
2479 xfe = (XGestureNotifyFlickEvent *)xevent;
2480 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Flick));
2481 if (!e)
2482 return;
2483
2484 e->win = xfe->window;
2485 e->time = xfe->time;
2486 e->subtype = xfe->kind;
2487 e->num_fingers = xfe->num_finger;
2488 e->distance = xfe->distance;
2489 e->duration = xfe->duration;
2490 e->direction = xfe->direction;
2491 e->angle = XFixedToDouble(xfe->angle);
2492
2493 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_FLICK, e, NULL, NULL);
2494}
2495
2496void
2497_ecore_x_event_handle_gesture_notify_pan(XEvent *xevent)
2498{
2499 XGestureNotifyPanEvent *xpe;
2500 Ecore_X_Event_Gesture_Notify_Pan *e;
2501
2502 _ecore_x_last_event_mouse_move = EINA_FALSE;
2503 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2504
2505 xpe = (XGestureNotifyPanEvent *)xevent;
2506 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Pan));
2507 if (!e)
2508 return;
2509
2510 e->win = xpe->window;
2511 e->time = xpe->time;
2512 e->subtype = xpe->kind;
2513 e->num_fingers = xpe->num_finger;
2514 e->dx = xpe->dx;
2515 e->dy = xpe->dy;
2516 e->distance = xpe->distance;
2517 e->duration = xpe->duration;
2518 e->direction = xpe->direction;
2519
2520 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_PAN, e, NULL, NULL);
2521}
2522
2523void
2524_ecore_x_event_handle_gesture_notify_pinchrotation(XEvent *xevent)
2525{
2526 XGestureNotifyPinchRotationEvent *xpre;
2527 Ecore_X_Event_Gesture_Notify_PinchRotation *e;
2528
2529 _ecore_x_last_event_mouse_move = EINA_FALSE;
2530 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2531
2532 xpre = (XGestureNotifyPinchRotationEvent *)xevent;
2533 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_PinchRotation));
2534 if (!e)
2535 return;
2536
2537 e->win = xpre->window;
2538 e->time = xpre->time;
2539 e->subtype = xpre->kind;
2540 e->num_fingers = xpre->num_finger;
2541 e->distance = xpre->distance;
2542 e->cx = xpre->cx;
2543 e->cy = xpre->cy;
2544 e->zoom = XFixedToDouble(xpre->zoom);
2545 e->angle = XFixedToDouble(xpre->angle);
2546
2547 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_PINCHROTATION, e, NULL, NULL);
2548}
2549
2550void
2551_ecore_x_event_handle_gesture_notify_tap(XEvent *xevent)
2552{
2553 XGestureNotifyTapEvent *xte;
2554 Ecore_X_Event_Gesture_Notify_Tap *e;
2555
2556 _ecore_x_last_event_mouse_move = EINA_FALSE;
2557 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2558
2559 xte = (XGestureNotifyTapEvent *)xevent;
2560 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Tap));
2561 if (!e)
2562 return;
2563
2564 e->win = xte->window;
2565 e->time = xte->time;
2566 e->subtype = xte->kind;
2567 e->num_fingers = xte->num_finger;
2568 e->cx = xte->cx;
2569 e->cy = xte->cy;
2570 e->tap_repeat = xte->tap_repeat;
2571 e->interval = xte->interval;
2572
2573 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_TAP, e, NULL, NULL);
2574}
2575
2576void
2577_ecore_x_event_handle_gesture_notify_tapnhold(XEvent *xevent)
2578{
2579 XGestureNotifyTapNHoldEvent *xthe;
2580 Ecore_X_Event_Gesture_Notify_TapNHold *e;
2581
2582 _ecore_x_last_event_mouse_move = EINA_FALSE;
2583 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2584
2585 xthe = (XGestureNotifyTapNHoldEvent *)xevent;
2586 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_TapNHold));
2587 if (!e)
2588 return;
2589
2590 e->win = xthe->window;
2591 e->time = xthe->time;
2592 e->subtype = xthe->kind;
2593 e->num_fingers = xthe->num_finger;
2594 e->cx = xthe->cx;
2595 e->cy = xthe->cy;
2596 e->interval = xthe->interval;
2597 e->hold_time = xthe->holdtime;
2598
2599 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_TAPNHOLD, e, NULL, NULL);
2600}
2601
2602void
2603_ecore_x_event_handle_gesture_notify_hold(XEvent *xevent)
2604{
2605 XGestureNotifyHoldEvent *xhe;
2606 Ecore_X_Event_Gesture_Notify_Hold *e;
2607
2608 _ecore_x_last_event_mouse_move = EINA_FALSE;
2609 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2610
2611 xhe = (XGestureNotifyHoldEvent *)xevent;
2612 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Hold));
2613 if (!e)
2614 return;
2615
2616 e->win = xhe->window;
2617 e->time = xhe->time;
2618 e->subtype = xhe->kind;
2619 e->num_fingers = xhe->num_finger;
2620 e->cx = xhe->cx;
2621 e->cy = xhe->cy;
2622 e->hold_time = xhe->holdtime;
2623
2624 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_HOLD, e, NULL, NULL);
2625}
2626
2627void
2628_ecore_x_event_handle_gesture_notify_group(XEvent *xevent)
2629{
2630 XGestureNotifyGroupEvent *xge;
2631 Ecore_X_Event_Gesture_Notify_Group *e;
2632
2633 _ecore_x_last_event_mouse_move = EINA_FALSE;
2634 LOGFN(__FILE__, __LINE__, __FUNCTION__);
2635
2636 xge = (XGestureNotifyGroupEvent *)xevent;
2637 e = calloc(1, sizeof(Ecore_X_Event_Gesture_Notify_Group));
2638 if (!e)
2639 return;
2640
2641 e->win = xge->window;
2642 e->time = xge->time;
2643 e->subtype = xge->kind;
2644 e->num_groups = xge->num_group;
2645 e->group_id = xge->groupid;
2646
2647 ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_GROUP, e, NULL, NULL);
2648}
2649
2650#endif /* ifdef ECORE_XGESTURE */
2651#ifdef ECORE_XKB 2469#ifdef ECORE_XKB
2652 2470
2653void 2471void
diff --git a/src/lib/ecore_x/ecore_x_gesture.c b/src/lib/ecore_x/ecore_x_gesture.c
index 15a9efdc1f..4c68590643 100644
--- a/src/lib/ecore_x/ecore_x_gesture.c
+++ b/src/lib/ecore_x/ecore_x_gesture.c
@@ -4,84 +4,30 @@
4 4
5#include "ecore_x_private.h" 5#include "ecore_x_private.h"
6 6
7static Eina_Bool _gesture_available = EINA_FALSE;
8
9#ifdef ECORE_XGESTURE
10static int _gesture_major, _gesture_minor, _gesture_patch;
11int _gesture_version;
12#endif /* ifdef ECORE_XGESTURE */
13
14void
15_ecore_x_gesture_init(void)
16{
17#ifdef ECORE_XGESTURE
18 _gesture_major = 0;
19 _gesture_minor = 0;
20 _gesture_patch = 0;
21 _gesture_version = 0;
22
23 if (XGestureQueryVersion(_ecore_x_disp, &_gesture_major, &_gesture_minor, &_gesture_patch))
24 {
25 _gesture_version = (_gesture_major << 16) | _gesture_minor;
26 _gesture_available = EINA_TRUE;
27 }
28 else
29 _gesture_available = EINA_FALSE;
30#else /* ifdef ECORE_XGESTURE */
31 _gesture_available = EINA_FALSE;
32#endif /* ifdef ECORE_XGESTURE */
33}
34
35/* 7/*
36 * @brief Query whether gesture is available or not. 8 * @brief Query whether gesture is available or not.
37 * 9 *
38 * @return @c EINA_TRUE, if extension is available, @c EINA_FALSE otherwise. 10 * @return @c EINA_TRUE, if extension is available, @c EINA_FALSE otherwise.
11 *
12 * @deprecated
39 */ 13 */
40EAPI Eina_Bool 14EAPI Eina_Bool
41ecore_x_gesture_supported(void) 15ecore_x_gesture_supported(void)
42{ 16{
43 return _gesture_available; 17 return EINA_FALSE;
44} 18}
45 19
46EAPI Eina_Bool 20EAPI Eina_Bool
47ecore_x_gesture_events_select(Ecore_X_Window win, 21ecore_x_gesture_events_select(Ecore_X_Window win,
48 Ecore_X_Gesture_Event_Mask mask) 22 Ecore_X_Gesture_Event_Mask mask)
49{ 23{
50#ifdef ECORE_XGESTURE
51 if (!_gesture_available)
52 return EINA_FALSE;
53
54 LOGFN(__FILE__, __LINE__, __FUNCTION__);
55 XGestureSelectEvents(_ecore_x_disp, win, mask);
56 if (_ecore_xlib_sync) ecore_x_sync();
57
58 return EINA_TRUE;
59#else /* ifdef ECORE_XGESTURE */
60 (void) win;
61 (void) mask;
62 return EINA_FALSE; 24 return EINA_FALSE;
63#endif /* ifdef ECORE_XGESTURE */
64} 25}
65 26
66EAPI Ecore_X_Gesture_Event_Mask 27EAPI Ecore_X_Gesture_Event_Mask
67ecore_x_gesture_events_selected_get(Ecore_X_Window win) 28ecore_x_gesture_events_selected_get(Ecore_X_Window win)
68{ 29{
69#ifdef ECORE_XGESTURE
70 Ecore_X_Gesture_Event_Mask mask;
71
72 if (!_gesture_available)
73 return ECORE_X_GESTURE_EVENT_MASK_NONE;
74
75 LOGFN(__FILE__, __LINE__, __FUNCTION__);
76 if (GestureSuccess != XGestureGetSelectedEvents(_ecore_x_disp, win, (Mask *)&mask))
77 mask = ECORE_X_GESTURE_EVENT_MASK_NONE;
78 if (_ecore_xlib_sync) ecore_x_sync();
79
80 return mask;
81#else /* ifdef ECORE_XGESTURE */
82 (void) win;
83 return ECORE_X_GESTURE_EVENT_MASK_NONE; 30 return ECORE_X_GESTURE_EVENT_MASK_NONE;
84#endif /* ifdef ECORE_XGESTURE */
85} 31}
86 32
87EAPI Eina_Bool 33EAPI Eina_Bool
@@ -89,21 +35,7 @@ ecore_x_gesture_event_grab(Ecore_X_Window win,
89 Ecore_X_Gesture_Event_Type type, 35 Ecore_X_Gesture_Event_Type type,
90 int num_fingers) 36 int num_fingers)
91{ 37{
92#ifdef ECORE_XGESTURE
93 Eina_Bool ret;
94 if (!_gesture_available)
95 return EINA_FALSE;
96
97 LOGFN(__FILE__, __LINE__, __FUNCTION__);
98 ret = (GestureGrabSuccess == XGestureGrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime));
99 if (_ecore_xlib_sync) ecore_x_sync();
100 return ret;
101#else /* ifdef ECORE_XGESTURE */
102 (void) win;
103 (void) type;
104 (void) num_fingers;
105 return EINA_FALSE; 38 return EINA_FALSE;
106#endif /* ifdef ECORE_XGESTURE */
107} 39}
108 40
109EAPI Eina_Bool 41EAPI Eina_Bool
@@ -111,21 +43,5 @@ ecore_x_gesture_event_ungrab(Ecore_X_Window win,
111 Ecore_X_Gesture_Event_Type type, 43 Ecore_X_Gesture_Event_Type type,
112 int num_fingers) 44 int num_fingers)
113{ 45{
114#ifdef ECORE_XGESTURE
115 Eina_Bool ret;
116
117 if (!_gesture_available)
118 return EINA_FALSE;
119
120 LOGFN(__FILE__, __LINE__, __FUNCTION__);
121 ret = (GestureUngrabSuccess == XGestureUngrabEvent(_ecore_x_disp, win, type, num_fingers, CurrentTime));
122 if (_ecore_xlib_sync) ecore_x_sync();
123 return ret;
124#else /* ifdef ECORE_XGESTURE */
125 (void) win;
126 (void) type;
127 (void) num_fingers;
128 return EINA_FALSE; 46 return EINA_FALSE;
129#endif /* ifdef ECORE_XGESTURE */
130} 47}
131
diff --git a/src/lib/ecore_x/ecore_x_private.h b/src/lib/ecore_x/ecore_x_private.h
index ce81efe3d6..5a288d4a25 100644
--- a/src/lib/ecore_x/ecore_x_private.h
+++ b/src/lib/ecore_x/ecore_x_private.h
@@ -44,10 +44,6 @@
44#ifdef ECORE_XDAMAGE 44#ifdef ECORE_XDAMAGE
45#include <X11/extensions/Xdamage.h> 45#include <X11/extensions/Xdamage.h>
46#endif /* ifdef ECORE_XDAMAGE */ 46#endif /* ifdef ECORE_XDAMAGE */
47#ifdef ECORE_XGESTURE
48#include <X11/extensions/gesture.h>
49#include <X11/extensions/gestureproto.h>
50#endif /* ifdef ECORE_XGESTURE */
51#ifdef ECORE_XDPMS 47#ifdef ECORE_XDPMS
52#include <X11/extensions/dpms.h> 48#include <X11/extensions/dpms.h>
53#endif /* ifdef ECORE_XDPMS */ 49#endif /* ifdef ECORE_XDPMS */
@@ -248,15 +244,6 @@ void _ecore_x_event_handle_client_message(XEvent *xevent);
248void _ecore_x_event_handle_mapping_notify(XEvent *xevent); 244void _ecore_x_event_handle_mapping_notify(XEvent *xevent);
249void _ecore_x_event_handle_shape_change(XEvent *xevent); 245void _ecore_x_event_handle_shape_change(XEvent *xevent);
250void _ecore_x_event_handle_screensaver_notify(XEvent *xevent); 246void _ecore_x_event_handle_screensaver_notify(XEvent *xevent);
251#ifdef ECORE_XGESTURE
252void _ecore_x_event_handle_gesture_notify_flick(XEvent *xevent);
253void _ecore_x_event_handle_gesture_notify_pan(XEvent *xevent);
254void _ecore_x_event_handle_gesture_notify_pinchrotation(XEvent *xevent);
255void _ecore_x_event_handle_gesture_notify_tap(XEvent *xevent);
256void _ecore_x_event_handle_gesture_notify_tapnhold(XEvent *xevent);
257void _ecore_x_event_handle_gesture_notify_hold(XEvent *xevent);
258void _ecore_x_event_handle_gesture_notify_group(XEvent *xevent);
259#endif /* ifdef ECORE_XGESTURE */
260void _ecore_x_event_handle_sync_counter(XEvent *xevent); 247void _ecore_x_event_handle_sync_counter(XEvent *xevent);
261void _ecore_x_event_handle_sync_alarm(XEvent *xevent); 248void _ecore_x_event_handle_sync_alarm(XEvent *xevent);
262#ifdef ECORE_XRANDR 249#ifdef ECORE_XRANDR
diff --git a/src/lib/ecore_x/meson.build b/src/lib/ecore_x/meson.build
index 0e16bd7385..957b11c44e 100644
--- a/src/lib/ecore_x/meson.build
+++ b/src/lib/ecore_x/meson.build
@@ -61,10 +61,6 @@ if get_option('xpresent')
61 ecore_x_checks += [['Xpresent', 'Xpresent.h', 'Xpresent', 'XPresentQueryExtension']] 61 ecore_x_checks += [['Xpresent', 'Xpresent.h', 'Xpresent', 'XPresentQueryExtension']]
62endif 62endif
63 63
64if get_option('xgesture')
65 ecore_x_checks += [['Xgesture', 'gesture.h', 'Xgesture', 'XGestureQueryExtension']]
66endif
67
68if get_option('xinput2') 64if get_option('xinput2')
69 ecore_x_checks += [['Xi2', 'XInput2.h', 'Xi', 'XIQueryDevice']] 65 ecore_x_checks += [['Xi2', 'XInput2.h', 'Xi', 'XIQueryDevice']]
70endif 66endif