#include "gesture.h"
#include <xorg/mi.h>
#include <xdbg.h>
+#ifdef PANORAMIX
+#include <xorg/panoramiX.h>
+#include <xorg/panoramiXsrv.h>
+#endif
#define MGEST XDBG_M('G','E','S','T')
extern ScreenPtr miPointerCurrentScreen(void);
extern EventQueuePtr mieqGetEventQueuePtr();
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+static void GestureAlloc(int capability);
+static void GestureDeAlloc(void);
+static void GesturePalmAlloc(int capability);
+static void GesturePalmDeAlloc(void);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
static Bool GestureIsEventInMIEQ(int finger_index, enum EventType type);
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
static int GestureGetFingerIndexFromDevice(DeviceIntPtr device);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
static int GestureGetDeviceIdFromFingerIndex(int finger_index);
static Bool GestureIsPalmEventInMIEQ(void);
static Bool GestureIsPalmEvent(InternalEvent *event);
void GestureCbEventsSelected(Window win, Mask *pEventMask);
WindowPtr GestureGetEventsWindow(void);
static Bool GestureHasFingersEvents(int eventType);
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+int GestureGetTouchIndex(int deviceid, int touchid, int evtype);
+int GestureFindTouchIndex(int deviceid, int touchid, int evtype);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
//Enqueued event handlers and enabler/disabler
static ErrorStatus GestureEnableEventHandler(InputInfoPtr pInfo);
void GestureHandleKeyPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device);
void GestureHandleKeyReleaseEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device);
+void GestureHandleRawButtonPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device);
+void GestureHandleRawButtonReleaseEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device);
+void GestureHandleRawMotionEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device);
+
static void GestureRegisterDeviceInfo(DeviceIntPtr device);
//Gesture recognizer helper
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 21
-static Bool PointInBorderSize(WindowPtr pWin, int x, int y);
-#endif
+Bool PointInBorderSize(WindowPtr pWin, int x, int y);
static WindowPtr GestureWindowOnXY(int x, int y);
Bool GestureHasFingerEventMask(int eventType, int num_finger);
-#ifdef _F_SUPPORT_BEZEL_FLICK_
-static int get_distance(int x1, int y1, int x2, int y2);
-#endif
static double get_angle(int x1, int y1, int x2, int y2);
//Gesture recognizer and handlers
void GestureRecognize_GroupTap(int type, InternalEvent *ev, DeviceIntPtr device, int idx, int timer_expired);
void GestureRecognize_GroupTapNHold(int type, InternalEvent *ev, DeviceIntPtr device, int idx, int timer_expired);
void GestureRecognize_GroupHold(int type, InternalEvent *ev, DeviceIntPtr device, int idx, int timer_expired);
-#ifdef _F_SUPPORT_BEZEL_FLICK_
-int GestureBezelAngleRecognize(int type, int distance, double angle);
-#endif
void GestureHandleGesture_Flick(int num_of_fingers, int distance, Time duration, int direction);
void GestureHandleGesture_Tap(int num_finger, int tap_repeat, int cx, int cy);
void GestureHandleGesture_PinchRotation(int num_of_fingers, double zoom, double angle, int distance, int cx, int cy, int kinds);
static void GesturePalmUpdateAreaInfo(int type, int idx);
void GesturePalmRecognize(int type, InternalEvent *ev, DeviceIntPtr device);
+TouchPointInfoPtr GestureTouchFindByClientID(DeviceIntPtr dev);
void GestureGenerateTouchCancelEvent(void);
static void GestureDPMSCallback(CallbackListPtr *pcbl, void *unused, void *calldata);
static Window prop_anr_event_window_xid = None;
#endif
+static Atom prop_gesture_window_stack_changed = None;
+
GestureDevicePtr g_pGesture = NULL;
_X_EXPORT InputDriverRec GESTURE = {
1,
}
#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 21
+#ifdef PANORAMIX
static Bool
+XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin)
+{
+ SpritePtr pSprite = pDev->spriteInfo->sprite;
+
+ if (pWin == screenInfo.screens[0]->root) {
+ int i;
+
+ FOR_NSCREENS(i)
+ pSprite->windows[i] = screenInfo.screens[i]->root;
+ }
+ else {
+ PanoramiXRes *win;
+ int rc, i;
+
+ rc = dixLookupResourceByType((void **) &win, pWin->drawable.id,
+ XRT_WINDOW, serverClient, DixReadAccess);
+ if (rc != Success)
+ return FALSE;
+
+ FOR_NSCREENS(i) {
+ rc = dixLookupWindow(pSprite->windows + i, win->info[i].id,
+ serverClient, DixReadAccess);
+ if (rc != Success) /* window is being unmapped */
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+#endif
+
+Bool
PointInBorderSize(WindowPtr pWin, int x, int y)
{
BoxRec box;
- if (pixman_region_contains_point (&pWin->borderSize, x, y, &box))
- {
+
+ if (RegionContainsPoint(&pWin->borderSize, x, y, &box))
return TRUE;
+
+#ifdef PANORAMIX
+ if (!noPanoramiXExtension &&
+ XineramaSetWindowPntrs(inputInfo.pointer, pWin)) {
+ SpritePtr pSprite = inputInfo.pointer->spriteInfo->sprite;
+ int i;
+
+ FOR_NSCREENS_FORWARD_SKIP(i) {
+ if (RegionContainsPoint(&pSprite->windows[i]->borderSize,
+ x + screenInfo.screens[0]->x -
+ screenInfo.screens[i]->x,
+ y + screenInfo.screens[0]->y -
+ screenInfo.screens[i]->y, &box))
+ return TRUE;
+ }
}
+#endif
return FALSE;
}
-#endif
static WindowPtr
GestureWindowOnXY(int x, int y)
pSprite->spriteTrace = realloc(pSprite->spriteTrace,
pSprite->spriteTraceSize*sizeof(WindowPtr));
if (!pSprite->spriteTrace) {
- return NULL;
+ return NULL;
}
-
}
pSprite->spriteTrace[pSprite->spriteTraceGood++] = pWin;
pWin = pWin->firstChild;
return ret;
}
-#ifdef _F_SUPPORT_BEZEL_FLICK_
-static int
-get_distance(int _x1, int _y1, int _x2, int _y2)
-{
- int xx, yy;
- xx = ABS(_x2 - _x1);
- yy = ABS(_y2 - _y1);
-
- if(xx && yy)
- {
- return (int)sqrt(pow(xx, 2) + pow(yy, 2));
- }
- else if(xx)
- {
- return yy;
- }
- else if(yy)
- {
- return xx;
- }
- else
- {
- return 0;
- }
-}
-#endif//_F_SUPPORT_BEZEL_FLICK_
-
static double
get_angle(int _x1, int _y1, int _x2, int _y2)
{
}
}
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+int
+GestureGetTouchIndex(int deviceid, int touchid, int evtype)
+{
+ int idx=0, i=0;
+
+ for (i=0; i<g_pGesture->num_mt_devices; i++)
+ {
+ if (g_pGesture->fingers[i].touchid == touchid)
+ {
+ return i;
+ }
+ }
+ ErrorF("[GestureGetTouchIndex] Failed to get touch index, devid: %d, touchid: %d, evsystem: %d\n", deviceid, touchid, evtype);
+ return -1;
+}
+
+int
+GestureFindTouchIndex(int deviceid, int touchid, int evtype)
+{
+ int idx=-1, i=0;
+
+ if (deviceid == g_pGesture->master_pointer->id)
+ return -1;
+
+ for (i=0; i<g_pGesture->num_mt_devices; i++)
+ {
+ if (evtype == ET_TouchBegin)
+ {
+ if (g_pGesture->fingers[i].status == BTN_RELEASED)
+ {
+ g_pGesture->fingers[i].status = BTN_PRESSED;
+ g_pGesture->fingers[i].touchid = touchid;
+ return i;
+ }
+ }
+ else if (evtype == ET_TouchUpdate || evtype == ET_TouchEnd)
+ {
+ if (g_pGesture->fingers[i].touchid == touchid)
+ {
+ g_pGesture->fingers[i].status = (evtype == ET_TouchEnd)?BTN_RELEASED:BTN_MOVING;
+ return i;
+ }
+ }
+ }
+ XDBG_WARNING(MGEST, "Failed to find touch index, devid: %d, touchid: %d, evtype: %d\n", deviceid, touchid, evtype);
+ return -1;
+}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
+
+
void
GestureHandleGesture_Flick(int num_of_fingers, int distance, Time duration, int direction)
{
if(direction == FLICK_NORTHWARD || direction == FLICK_SOUTHWARD)
g_pGesture->recognized_palm |= PalmFlickVertiFilterMask;
}
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- else if(num_of_fingers == 1)
- {
- g_pGesture->bezel_recognized_mask |= BezelFlickFilterMask;
- }
-#endif
else
g_pGesture->recognized_gesture |= FlickFilterMask;
//Initialize a set of variables
num_pressed = 0;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
memset(&g_pGesture->cts, 0, sizeof(g_pGesture->cts));
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ memset(g_pGesture->cts, 0, g_pGesture->num_mt_devices*sizeof(CurTouchStatus));
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
pixman_region_init(&g_pGesture->chold_area);
#ifdef __HOLD_DETECTOR_DEBUG__
XDBG_DEBUG(MGEST, "[%d] Initialize...\n", __LINE__);
XDBG_DEBUG(MGEST, "has_hold_grabmask=0 and g_pGesture->hold_detector_activate=0\n");
#endif//__HOLD_DETECTOR_DEBUG__
return;
- }
+ }
}
if( IGNORE_EVENTS == g_pGesture->ehtype ||
#endif//__HOLD_DETECTOR_DEBUG__
return;
}
-
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for( i = 0 ; i < g_pGesture->num_mt_devices ; i++ )
{
if( device->id == g_pGesture->mt_devices[i]->id )
}
}
if( (idx < 0) || ((MAX_MT_DEVICES-1) < idx )) return;
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ idx = GestureGetTouchIndex(device->id, ev->device_event.touchid, type);
+ if( (idx < 0) || ((g_pGesture->num_mt_devices -1) < idx )) return;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->cts[idx].status = BTN_PRESSED;
g_pGesture->cts[idx].cx = ev->device_event.root_x;
g_pGesture->cts[idx].cy = ev->device_event.root_y;
}
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if(BTN_RELEASED == g_pGesture->cts[idx].status)
return;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
g_pGesture->cts[idx].status = BTN_RELEASED;
g_pGesture->cts[idx].cx = ev->device_event.root_x;
g_pGesture->cts[idx].cy = ev->device_event.root_y;
static Time base_time = 0;
Time current_time;
- if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected)
goto cleanup_pinchrotation;
if( timer_expired )
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagPinchRotation;
if( g_pGesture->num_pressed < 2 )
#endif//__DETAIL_DEBUG__
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if( !(g_pGesture->fingers[idx].flags & PressFlagPinchRotation) )
break;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if( state != GestureEnd && num_pressed >= 2)
{
#ifdef __DETAIL_DEBUG__
int area_size;
int flicked = 0;
- if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected)
goto cleanup_flick;
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagFlick;
if( g_pGesture->num_pressed < 2 )
return;
#endif//__DETAIL_DEBUG__
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if( !(g_pGesture->fingers[idx].flags & PressFlagFlick ) )
break;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if( g_pGesture->num_pressed )
break;
static OsTimerPtr pan_event_timer = NULL;
static int event_type = GestureNotifyPan;
- if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected)
goto cleanup_pan;
if( timer_expired )
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagPan;
if( g_pGesture->num_pressed < 2 )
#endif//__DETAIL_DEBUG__
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if( !(g_pGesture->fingers[idx].flags & PressFlagPan ) )
break;
{
TimerCancel(pan_event_timer);
pan_event_timer = NULL;
-
+
if( GestureHasFingerEventMask(GestureNotifyPan, num_pressed) )
{
GestureHandleGesture_Pan(num_pressed, prev_cx, prev_cy, direction, distance, current_time-prev_time, GestureBegin);
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if( state != GestureEnd && num_pressed >= 2)
{
#ifdef __DETAIL_DEBUG__
static OsTimerPtr tap_event_timer = NULL;
static int event_type = GestureNotifyTap;
- if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected)
goto cleanup_tap;
if( timer_expired )
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagTap;
if( g_pGesture->num_pressed < 2 )
#endif//__DETAIL_DEBUG__
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if( !(g_pGesture->fingers[idx].flags & PressFlagTap ) )
break;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if( g_pGesture->num_pressed )
{
break;
Time interval = 0;
Time holdtime = 0;
- if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected)
goto cleanup_tapnhold;
if( timer_expired )
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagTapNHold;
if( g_pGesture->num_pressed < 2 )
#endif//__DETAIL_DEBUG__
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if( !(g_pGesture->fingers[idx].flags & PressFlagTapNHold ) )
break;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if( state != GestureEnd && num_pressed >= 2)
{
#ifdef __DETAIL_DEBUG__
static OsTimerPtr hold_event_timer = NULL;
static int event_type = GestureNotifyHold;
- if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ if(g_pGesture->recognized_palm || g_pGesture->enqueue_fulled == 1 || g_pGesture->hold_detected)
goto cleanup_hold;
if( timer_expired )
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagHold;
if( g_pGesture->num_pressed < 2 )
#endif//__DETAIL_DEBUG__
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if( !(g_pGesture->fingers[idx].flags & PressFlagHold ) )
break;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if( state != GestureEnd && num_pressed >= 2)
{
#ifdef __DETAIL_DEBUG__
return;
}
-#ifdef _F_SUPPORT_BEZEL_FLICK_
-int
-GestureBezelAngleRecognize(int type, int distance, double angle)
-{
- if (distance < g_pGesture->bezel.flick_distance)
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "distance(%d) < flick_distance(%d)\n", distance, g_pGesture->bezel.flick_distance);
-#endif//__BEZEL_DEBUG__
- return 0;
- }
- switch(type)
- {
- case BEZEL_TOP_LEFT:
- break;
- case BEZEL_TOP_RIGHT:
- break;
- case BEZEL_BOTTOM_LEFT:
- if( (g_pGesture->bezel.min_rad< angle) && (angle < g_pGesture->bezel.max_rad) )
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "bottom_left bezel success....\n");
-#endif//__BEZEL_DEBUG__
- return 1;
- }
- else
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "bottom_left bezel failed....\n");
-#endif//__BEZEL_DEBUG__
- return 0;
- }
- case BEZEL_BOTTOM_RIGHT:
- if( (g_pGesture->bezel.min_180_rad< angle) && (angle < g_pGesture->bezel.max_180_rad))
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "bottom_right bezel success...\n");
-#endif//__BEZEL_DEBUG__
- return 1;
- }
- else
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "bottom_right bezel failed....\n");
-#endif//__BEZEL_DEBUG__
- return 0;
- }
- default:
- return 0;
- }
- return 0;
-}
-#endif
-
static inline void
GestureEnableDisable()
{
{
g_pGesture->grabMask = *pGrabMask;
g_pGesture->GrabEvents = (GestureGrabEventPtr)pGrabEvent;
+ ErrorF("grabMask: 0x%x, grabwin: 0x%x\n", g_pGesture->GrabEvents->pGestureGrabWinInfo->window);
GestureEnableDisable();
}
mask = (GESTURE_FILTER_MASK_ALL & ~(g_pGesture->grabMask | g_pGesture->eventMask));
#ifdef __DETAIL_DEBUG__
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- XDBG_DEBUG(MGEST, "g_pGesture->filter_mask=0x%x, mask=0x%x, palm_filter_mask=0x%x bezel_filter_mask=0x%x\n", g_pGesture->filter_mask, mask, g_pGesture->palm_filter_mask, g_pGesture->bezel_filter_mask);
-#else
XDBG_DEBUG(MGEST, "g_pGesture->filter_mask=0x%x, mask=0x%x, palm_filter_mask=0x%x\n", g_pGesture->filter_mask, mask, g_pGesture->palm_filter_mask);
-#endif
#endif//__DETAIL_DEBUG__
g_pGesture->palm_filter_mask = 0;
if(mask & FlickFilterMask)
{
g_pGesture->palm_filter_mask |= PalmFlickHorizFilterMask;
g_pGesture->palm_filter_mask |= PalmFlickVertiFilterMask;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- g_pGesture->bezel_filter_mask |= BezelFlickFilterMask;
-#endif
}
if(!(mask & FlickFilterMask))
{
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->GrabEvents[GestureNotifyFlick].pGestureGrabWinInfo[1].window))
- {
- g_pGesture->bezel_filter_mask |= BezelFlickFilterMask;
- }
- else
-#endif
if(!(g_pGesture->GrabEvents[GestureNotifyFlick].pGestureGrabWinInfo[0].window))
{
g_pGesture->palm_filter_mask |= PalmFlickHorizFilterMask;
}
if(!g_pGesture->palm.palmflag)
{
- if(!GestureHasFingersEvents(HoldFilterMask))
+ if(!GestureHasFingersEvents(GestureNotifyHold))
mask |= HoldFilterMask;
- if(!GestureHasFingersEvents(FlickFilterMask))
+ if(!GestureHasFingersEvents(GestureNotifyFlick))
mask |= FlickFilterMask;
g_pGesture->filter_mask = mask;
}
#ifdef __DETAIL_DEBUG__
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- XDBG_DEBUG(MGEST, "g_pGesture->filter_mask=0x%x, palm_filter_mask: 0x%x, bezel_filter_mask=0x%x\n", g_pGesture->filter_mask, g_pGesture->palm_filter_mask, g_pGesture->bezel_filter_mask);
-#else
XDBG_DEBUG(MGEST, "g_pGesture->filter_mask=0x%x, palm_filter_mask: 0x%x\n", g_pGesture->filter_mask, g_pGesture->palm_filter_mask);
-#endif
#endif//__DETAIL_DEBUG__
return pWin;
{
int i=0;
Mask eventmask = (1L << eventType);
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for(i=2; i<MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for(i=2; i<g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
if( (g_pGesture->grabMask & eventmask) &&
(g_pGesture->GrabEvents[eventType].pGestureGrabWinInfo[i].window != None) )
return 0;
}
-#ifdef _F_SUPPORT_BEZEL_FLICK_
-static CARD32
-GestureBezelSingleFingerTimerHandler(OsTimerPtr timer, CARD32 time, pointer arg)
-{
- BezelFlickStatusPtr pBezel = &g_pGesture->bezel;
-
- if( pBezel->is_active != BEZEL_NONE )
- {
- pBezel->is_active = BEZEL_END;
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "end\n");
-#endif//__BEZEL_DEBUG__
- }
- return 0;
-}
-#endif
-
static CARD32
GestureSingleFingerTimerHandler(OsTimerPtr timer, CARD32 time, pointer arg)
{
return ret_idx;
index_check:
-
- if(type == ET_ButtonPress)
+ if(type == GESTURE_TOUCH_PRESS)
{
pressed_idx = ret_idx;
}
- else if(type == ET_ButtonRelease)
+ else if(type == GESTURE_TOUCH_RELEASE)
{
if((pressed_idx <= 1) && (ret_idx >= (PALM_HORIZ_ARRAY_COUNT-2)))
{
return ret_idx;
index_check:
-
- if(type == ET_ButtonPress)
+ if(type == GESTURE_TOUCH_PRESS)
{
if((ret_idx <= 1) || (ret_idx >=(PALM_VERTI_ARRAY_COUNT-2)))
{
}
}
- else if(type == ET_ButtonRelease)
+ else if(type == GESTURE_TOUCH_RELEASE)
{
if((pressed_idx <= 1) && (ret_idx >= (PALM_VERTI_ARRAY_COUNT-2)))
{
}
if(g_pGesture->recognized_gesture || g_pGesture->hold_detected ||
- (g_pGesture->recognized_palm && !(g_pGesture->recognized_palm & PalmFlickHorizFilterMask)) || (g_pGesture->palm_filter_mask & PalmFlickHorizFilterMask)
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ (g_pGesture->recognized_palm && !(g_pGesture->recognized_palm & PalmFlickHorizFilterMask)) || (g_pGesture->palm_filter_mask & PalmFlickHorizFilterMask))
{
#ifdef __PALM_GESTURE_LOG__
XDBG_DEBUG(MGEST, "zoom_enabled: %d\n", g_pGesture->zoom_enabled);
}
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if(!is_flicking)
break;
if(!base_width_size || pPalm->cur_touched > curTouched)
num_pressed++;
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if(!num_pressed || !is_flicking)
{
#ifdef __PALM_GESTURE_LOG__
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
release_flag = 1;
if(--num_pressed < 0)
num_pressed = 0;
}
if(g_pGesture->recognized_gesture || g_pGesture->hold_detected ||
- (g_pGesture->recognized_palm && !(g_pGesture->recognized_palm & PalmFlickVertiFilterMask)) || (g_pGesture->palm_filter_mask & PalmFlickVertiFilterMask)
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ (g_pGesture->recognized_palm && !(g_pGesture->recognized_palm & PalmFlickVertiFilterMask)) || (g_pGesture->palm_filter_mask & PalmFlickVertiFilterMask))
{
#ifdef __PALM_GESTURE_LOG__
XDBG_DEBUG(MGEST, "zoom_enabled: %d\n", g_pGesture->zoom_enabled);
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if(!is_flicking)
break;
if(!base_height_size || pPalm->cur_touched > curTouched)
num_pressed++;
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if(!num_pressed|| !is_flicking)
break;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
release_flag = 1;
if(--num_pressed < 0)
g_pGesture->mt_tool_idx = -1;
memset(&g_pGesture->palm, 0, sizeof(PalmStatus));
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ GesturePalmAlloc(g_pGesture->num_mt_devices);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (!dev || !dev->valuator)
goto out;
pPalm = &g_pGesture->palm;
pixman_region_init(&pPalm->area);
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for( i = 0 ; i < MAX_MT_DEVICES ; i++ )
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for( i = 0 ; i < g_pGesture->num_mt_devices; i++ )
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
pixman_region_init_rect (&pPalm->finger_rects[i], 0, 0, FINGER_WIDTH_2T, FINGER_HEIGHT_2T);
}
switch(type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if (!pPalm->pti[idx].touch_status)
{
pPalm->cur_touched++;
#endif
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if (pPalm->pti[idx].touch_status)
{
--pPalm->cur_touched;
#endif
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
pPalm->pti[idx].x = de->root_x;
pPalm->pti[idx].y = de->root_y;
switch(type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
pPalm->finger_rects[idx].extents.x1 = pPalm->pti[idx].x - FINGER_WIDTH;
pPalm->finger_rects[idx].extents.x2 = pPalm->pti[idx].x + FINGER_WIDTH;
pPalm->finger_rects[idx].extents.y1 = pPalm->pti[idx].y - FINGER_HEIGHT;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if (!pPalm->pti[idx].touch_status || (pPalm->pti[idx].tmajor == 0))
return;
pPalm->finger_rects[idx].extents.x1 = pPalm->pti[idx].x - FINGER_WIDTH;
if( device->id < g_pGesture->first_fingerid )
return;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
idx = GestureGetFingerIndexFromDevice(device);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ idx = GestureGetTouchIndex(device->id, ev->device_event.touchid, type);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if( idx < 0 )
return;
#endif
switch(type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if( idx == 0 )
event_sum_palm_first_finger = BTN_PRESSED;
else if( idx == 1)
TimerCancel(pPalm->palm_single_finger_timer);
}
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if(pPalm->cur_touched == 0 || pPalm->pti[idx].touch_status != 1)
{
return;
calc_touched = 0;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if( idx == 0 )
event_sum_palm_first_finger = BTN_RELEASED;
else if( idx == 1)
{
pixman_region_init(&pPalm->area);
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for( i = 0 ; i < MAX_MT_DEVICES ; i++ )
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for( i = 0 ; i < g_pGesture->num_mt_devices; i++ )
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
pixman_region_init_rect (&pPalm->finger_rects[i], 0, 0, FINGER_WIDTH_2T, FINGER_HEIGHT_2T);
}
switch(type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if(( g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL ) && ( pPalm->cur_touched == 0))
goto flush_or_drop;
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
break;
}
#ifdef __PALM_DETAIL_LOG__
}
-#ifdef _F_SUPPORT_BEZEL_FLICK_
-void
-GestureBezelRecognize(int type, InternalEvent *ev, DeviceIntPtr device)
-{
- static OsTimerPtr bezel_finger_timer = NULL;
-
- BezelFlickStatusPtr pBezel = &g_pGesture->bezel;
- int direction = 0;
- int distance;
- double angle;
- static Time base_time = 0;
- int idx = -1;
- int i;
- static int px=-1, py=-1;
- static int mx=-1, my=-1;
- static int rx=-1, ry=-1;
- static int event_count=0;
-
- if(g_pGesture->enqueue_fulled == 1)
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "EQ Event is full.... palm recognize drop..\n");
-#endif//__BEZEL_DEBUG__
- goto bezel_failed;
- }
-
- if( (PROPAGATE_EVENTS == g_pGesture->ehtype) || (device->id != g_pGesture->first_fingerid) )
- return;
-
- for( i = 0 ; i < g_pGesture->num_mt_devices ; i++ )
- {
- if( device->id == g_pGesture->mt_devices[i]->id )
- {
- idx = i;
- break;
- }
- }
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[type: %d][g_pGesture->num_pressed=%d, x,y(%d, %d) ]\n", type, g_pGesture->num_pressed, ev->device_event.root_x, ev->device_event.root_x);
- XDBG_DEBUG(MGEST, "[filter_mask: 0x%x, bezel_filter_mask: 0x%x, palm_filter_mask: 0x%x\n", g_pGesture->filter_mask, g_pGesture->bezel_filter_mask, g_pGesture->palm_filter_mask);
-#endif//__BEZEL_DEBUG__
-
- if (idx < 0)
- return;
- if(g_pGesture->recognized_gesture || g_pGesture->recognized_palm)
- goto bezel_failed;
- if(g_pGesture->num_pressed > 1)
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "Not single finger g_pGesture->num_pressed: %d\n", g_pGesture->num_pressed);
-#endif//__BEZEL_DEBUG__
- goto bezel_failed;
- }
- if(pBezel->is_active == BEZEL_END)
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "Bezel state is END pBezel->is_active: %d\n", pBezel->is_active);
- XDBG_DEBUG(MGEST, "[filter_mask: 0x%x, bezel_filter_mask: 0x%x, palm_filter_mask: 0x%x\n", g_pGesture->filter_mask, g_pGesture->bezel_filter_mask, g_pGesture->palm_filter_mask);
-#endif//__BEZEL_DEBUG__
- goto bezel_failed;
- }
-
- switch(type)
- {
- case ET_ButtonPress:
- base_time = GetTimeInMillis();
- px = ev->device_event.root_x;
- py = ev->device_event.root_y;
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[P] pBezel->is_active: %d, g_pGesture->num_pressed: %d, idx: %d\n", pBezel->is_active, g_pGesture->num_pressed, idx);
- XDBG_DEBUG(MGEST, "[P] g_pGesture->fingers[%d].p: (%d, %d)\n", idx, px,py);
-#endif//__BEZEL_DEBUG__
- if( (pBezel->is_active == BEZEL_ON) && ((g_pGesture->num_pressed == 1) && (idx == 0)) )
- {
- if( ( px < pBezel->top_left.width) && ( py < pBezel->top_left.height) )
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[P] top_left\n");
-#endif//__BEZEL_DEBUG__
- pBezel->is_active = BEZEL_START;
- pBezel->bezelStatus = BEZEL_TOP_LEFT;
- }
- else if( (px > (720 - pBezel->top_right.width)) && ( py < pBezel->top_right.height) )
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[P] top_right\n");
-#endif//__BEZEL_DEBUG__
- pBezel->is_active = BEZEL_START;
- pBezel->bezelStatus = BEZEL_TOP_RIGHT;
- }
- else if( (px < pBezel->bottom_left.width) && ( py > (1280 - pBezel->bottom_left.height)) )
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[P] bottom_left\n");
-#endif//__BEZEL_DEBUG__
- pBezel->is_active = BEZEL_START;
- pBezel->bezelStatus = BEZEL_BOTTOM_LEFT;
- }
- else if( (px > (720 - pBezel->bottom_right.width)) && ( py > (1280 - pBezel->bottom_right.height)) )
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[P] bottom_right\n");
-#endif//__BEZEL_DEBUG__
- pBezel->is_active = BEZEL_START;
- pBezel->bezelStatus = BEZEL_BOTTOM_RIGHT;
- }
- else
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[P] None\n");
-#endif//__BEZEL_DEBUG__
- pBezel->bezelStatus = NO_BEZEL;
- goto bezel_failed;
- }
- }
- if(pBezel->is_active == BEZEL_START)
- {
- bezel_finger_timer = TimerSet(bezel_finger_timer, 0, 500, GestureBezelSingleFingerTimerHandler, NULL);
- }
- else
- {
- TimerCancel(bezel_finger_timer);
- }
- break;
- case ET_Motion:
- if(px <0 || py < 0)
- return;
- mx = ev->device_event.root_x;
- my = ev->device_event.root_y;
- event_count++;
- if( (g_pGesture->bezel.bezel_angle_moving_check) && (event_count >= 10))
- {
- angle = get_angle(px, py, mx, my);
- event_count = 0;
- if(!GestureBezelAngleRecognize(pBezel->bezelStatus, pBezel->flick_distance, angle))
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[M] moving limit!\n");
-#endif//__BEZEL_DEBUG__
- TimerCancel(bezel_finger_timer);
- goto bezel_failed;
- }
- }
- break;
- case ET_ButtonRelease:
- rx = ev->device_event.root_x;
- ry = ev->device_event.root_y;
- if( (g_pGesture->num_pressed == 0) && (g_pGesture->inc_num_pressed == 1) && (pBezel->is_active == BEZEL_START) )
- {
- angle = get_angle(px, py, rx, ry);
- distance = get_distance(px, py, rx, ry);
- Time duration = GetTimeInMillis() - base_time;
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[R] bezelStatus: %d, distance: %d, angle: %lf\n", pBezel->bezelStatus, distance, angle);
-#endif//__BEZEL_DEBUG__
- int res = GestureBezelAngleRecognize(pBezel->bezelStatus, distance, angle);
- if(res)
- {
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[R] Bezel Success\n");
-#endif//__BEZEL_DEBUG__
- pBezel->is_active = BEZEL_DONE;
- g_pGesture->filter_mask = GESTURE_FILTER_MASK_ALL;
- g_pGesture->palm_filter_mask = GESTURE_PALM_FILTER_MASK_ALL;
- TimerCancel(bezel_finger_timer);
-
- if( (0.0 < angle) && (angle < RAD_90DEG))
- direction = FLICK_NORTHEASTWARD;
- else if(angle < RAD_180DEG)
- direction = FLICK_NORTHWESTWARD;
-
- if( GestureHasFingerEventMask(GestureNotifyFlick, 1) )
- GestureHandleGesture_Flick(1, distance, duration, direction);
- goto bezel_cleanup;
- }
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[R] Bezel failed\n");
-#endif//__BEZEL_DEBUG__
- goto bezel_failed;
- }
- break;
- }
- return;
-bezel_failed:
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[F] Bezel failed\n");
-#endif//__BEZEL_DEBUG__
- pBezel->is_active = BEZEL_END;
- g_pGesture->bezel_filter_mask |= BezelFlickFilterMask;
- goto bezel_cleanup;
- return;
-bezel_cleanup:
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[F] Bezel cleanup\n");
-#endif//__BEZEL_DEBUG__
- TimerCancel(bezel_finger_timer);
- if( ERROR_INVALPTR == GestureFlushOrDrop() )
- {
- GestureControl(g_pGesture->this_device, DEVICE_OFF);
- }
- bezel_finger_timer = NULL;
- base_time = 0;
- px=py=mx=my=rx=ry=-1;
- event_count = 0;
-}
-#endif
-
static EventQueuePtr
GestureGetMIEQ(void)
{
double touch_major = 0.0f;
double touch_palm = 0.0f;
- if (event->any.type != ET_ButtonPress && event->any.type != ET_Motion && event->any.type != ET_ButtonRelease)
+ if (event->any.type != GESTURE_TOUCH_PRESS && event->any.type != GESTURE_TOUCH_MOTION && event->any.type != GESTURE_TOUCH_RELEASE)
return FALSE;
DeviceEvent *de = &event->device_event;
return FALSE;
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
static int
GestureGetFingerIndexFromDevice(DeviceIntPtr device)
{
int i;
-
for( i = 0 ; i < g_pGesture->num_mt_devices ; i++ )
{
if( device->id == g_pGesture->mt_devices[i]->id )
return i;
}
}
-
return -1;
}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
static int
GestureGetDeviceIdFromFingerIndex(int finger_index)
{
if (g_pGesture->num_mt_devices <= finger_index)
return -1;
+ if (!(g_pGesture->mt_devices))
+ return -1;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
return g_pGesture->mt_devices[finger_index]->id;
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ return g_pGesture->mt_devices->id;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
}
device->id < g_pGesture->first_fingerid )
return;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
idx = GestureGetFingerIndexFromDevice(device);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ idx = GestureGetTouchIndex(device->id, ev->device_event.touchid, type);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if( idx < 0 )
return;
#ifdef __DETAIL_DEBUG__
- XDBG_DEBUG(MGEST, "[type: %d][g_pGesture->num_pressed=%d, x,y(%d, %d) ]\n", type, g_pGesture->num_pressed, ev->device_event.root_x, ev->device_event.root_x);
+ XDBG_DEBUG(MGEST, "[type: %d,ehtype: %d][g_pGesture->num_pressed=%d, x,y(%d, %d) ]\n", type, g_pGesture->ehtype, g_pGesture->num_pressed, ev->device_event.root_x, ev->device_event.root_x);
XDBG_DEBUG(MGEST, "[inc_num_pressed: %d]\n", g_pGesture->inc_num_pressed);
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- XDBG_DEBUG(MGEST, "[filter_mask: 0x%x, bezel_filter_mask: 0x%x, palm_filter_mask: 0x%x\n", g_pGesture->filter_mask, g_pGesture->bezel_filter_mask, g_pGesture->palm_filter_mask);
- XDBG_DEBUG(MGEST, "[recognized_gesture: 0x%x, bezel_recognize_mask: 0x%x, recognized_palm: 0x%x\n", g_pGesture->recognized_gesture, g_pGesture->bezel_recognized_mask, g_pGesture->recognized_palm);
-#else
XDBG_DEBUG(MGEST, "[filter_mask: 0x%x, palm_filter_mask: 0x%x\n", g_pGesture->filter_mask, g_pGesture->palm_filter_mask);
XDBG_DEBUG(MGEST, "[recognized_gesture: 0x%x, recognized_palm: 0x%x\n", g_pGesture->recognized_gesture, g_pGesture->recognized_palm);
-#endif
#endif//__DETAIL_DEBUG__
switch( type )
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if( idx == 0 )
g_pGesture->event_sum[0] = BTN_PRESSED;
g_pGesture->fingers[idx].ptime = ev->any.time;
pixman_region_union(&g_pGesture->area, &g_pGesture->area, &g_pGesture->finger_rects[i]);
}
#ifdef __DETAIL_DEBUG__
- XDBG_DEBUG(MGEST, "[M][g_pGesture->inc_num_pressed=%d] AREA_SIZE(area)=%d\n", g_pGesture->inc_num_pressed, AREA_SIZE(&g_pGesture->area.extents));
+ XDBG_DEBUG(MGEST, "[P][g_pGesture->inc_num_pressed=%d] AREA_SIZE(area)=%d\n", g_pGesture->inc_num_pressed, AREA_SIZE(&g_pGesture->area.extents));
#endif//__DETAIL_DEBUG__
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if( !g_pGesture->fingers[idx].ptime )
return;
XDBG_DEBUG(MGEST, "single finger!\n");
#endif//__DETAIL_DEBUG__
Bool exist;
- exist = GestureIsEventInMIEQ(1, ET_ButtonPress);
+ exist = GestureIsEventInMIEQ(1, GESTURE_TOUCH_PRESS);
#ifdef __DETAIL_DEBUG__
XDBG_DEBUG(MGEST, "two finger touch in queue, exist: %d\n", exist);
#endif//__DETAIL_DEBUG__
XDBG_DEBUG(MGEST, "tap repeat Moving Limit Exceeded.\n");
#endif//__DETAIL_DEBUG__
Bool exist;
- exist = GestureIsEventInMIEQ(1, ET_ButtonPress);
+ exist = GestureIsEventInMIEQ(1, GESTURE_TOUCH_PRESS);
#ifdef __DETAIL_DEBUG__
XDBG_DEBUG(MGEST, "two finger touch in queue, exist: %d\n", exist);
#endif//__DETAIL_DEBUG__
#endif//__DETAIL_DEBUG__
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
g_pGesture->fingers[idx].rtime = ev->any.time;
g_pGesture->fingers[idx].rx = ev->device_event.root_x;
g_pGesture->fingers[idx].ry = ev->device_event.root_y;
}
#ifdef __DETAIL_DEBUG__
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- XDBG_DEBUG(MGEST, "[filter_mask: 0x%x, bezel_filter_mask: 0x%x, palm_filter_mask: 0x%x\n", g_pGesture->filter_mask, g_pGesture->bezel_filter_mask, g_pGesture->palm_filter_mask);
- XDBG_DEBUG(MGEST, "[recognized_gesture: 0x%x, bezel_recognize_mask: 0x%x, recognized_palm: 0x%x\n", g_pGesture->recognized_gesture, g_pGesture->bezel_recognized_mask, g_pGesture->recognized_palm);
-#else
- XDBG_DEBUG(MGEST, "[filter_mask: 0x%x, palm_filter_mask: 0x%x\n", g_pGesture->filter_mask, g_pGesture->palm_filter_mask);
- XDBG_DEBUG(MGEST, "[recognized_gesture: 0x%x, recognized_palm: 0x%x\n", g_pGesture->recognized_gesture, g_pGesture->recognized_palm);
-#endif
+ XDBG_DEBUG(MGEST, "[ehtype: %d][filter_mask: 0x%x, palm_filter_mask: 0x%x]\n", g_pGesture->ehtype, g_pGesture->filter_mask, g_pGesture->palm_filter_mask);
+ XDBG_DEBUG(MGEST, "[recognized_gesture: 0x%x, recognized_palm: 0x%x]\n", g_pGesture->recognized_gesture, g_pGesture->recognized_palm);
#endif//__DETAIL_DEBUG__
if( g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL )
#ifdef __DETAIL_DEBUG__
XDBG_DEBUG(MGEST, "recognized_gesture: 0x%x, filter_mask: 0x%x\n", g_pGesture->recognized_gesture, g_pGesture->filter_mask);
XDBG_DEBUG(MGEST, "recognized_palm: 0x%x, palm_filter_mask: 0x%x\n", g_pGesture->recognized_palm, g_pGesture->palm_filter_mask);
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- XDBG_DEBUG(MGEST, "bezel_recognized_mask: 0x%x, bezel_filter_mask: 0x%x\n", g_pGesture->bezel_recognized_mask, g_pGesture->bezel_filter_mask);
-#endif
#endif//__DETAIL_DEBUG__
- if(g_pGesture->recognized_gesture || g_pGesture->recognized_palm
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- || g_pGesture->bezel_recognized_mask)
-#else
- )
-#endif
+ if(g_pGesture->recognized_gesture || g_pGesture->recognized_palm)
{
g_pGesture->ehtype = IGNORE_EVENTS;
GestureEventsDrop();
if(g_pGesture->recognized_palm)
err = GestureRegionsReinit();
- //memset(pPalm->pti, 0, sizeof(pPalm->pti[MAX_MT_DEVICES]));
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for(i=0; i<MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for(i=0; i<g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
pPalm->pti[i].touch_status = 0;
pPalm->pti[i].tangle = 0.0f;
if( ERROR_NONE != err )
return err;
}
- else if((g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL) && (g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL)
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- && (g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
-#else
- )
-#endif
+ else if((g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL) && (g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL))
{
g_pGesture->ehtype = PROPAGATE_EVENTS;
if (g_pGesture->palm_rejection_mode == 1 && g_pGesture->palm_detected == TRUE)
return err;
}
err = GestureRegionsReinit();
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for(i=0; i<MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for(i=0; i<g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
pPalm->pti[i].touch_status = 0;
pPalm->pti[i].tangle = 0.0f;
{
int i;
PalmStatusPtr pPalm = &g_pGesture->palm;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- BezelFlickStatusPtr pBezel = &g_pGesture->bezel;
-#endif
#ifdef __DEBUG_EVENT_HANDLER__
XDBG_DEBUG(MGEST, "(%d:%d) time:%d cur:%d\n",
ev->any_event.deviceid, ev->any_event.sync, (int)ev->any.time, (int)GetTimeInMillis());
pPalm->biggest_wmajor = 0;
pPalm->bigger_wmajor = 0;
g_pGesture->enqueue_fulled = 0;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- pBezel->is_active = BEZEL_ON;
- g_pGesture->bezel_filter_mask = 0;
- g_pGesture->bezel_recognized_mask = 0;
-#endif
for( i=0 ; i < g_pGesture->num_mt_devices ; i++ )
g_pGesture->fingers[i].ptime = 0;
}
g_pGesture->no_palm_events = FALSE;
g_pGesture->stylusInfo.fake_events = FALSE;
g_pGesture->palm_detected = FALSE;
- memset(&g_pGesture->last_touches, 0, sizeof(g_pGesture->last_touches));
+ memset(g_pGesture->last_touches, 0, g_pGesture->num_mt_devices*sizeof(CurTouchStatus));
}
else if( MTOUCH_FRAME_SYNC_END == ev->any_event.sync )
{
#endif//__DEBUG_EVENT_HANDLER
g_pGesture->mtsync_status = MTOUCH_FRAME_SYNC_END;
g_pGesture->touch_cancel_status = FALSE;
+ for( i=0 ; i < g_pGesture->num_mt_devices ; i++ )
+ g_pGesture->fingers[i].status = BTN_RELEASED;
if(g_pGesture->is_active)
{
g_pGesture->event_sum[0] = 0;
pPalm->max_touched = 0;
g_pGesture->hold_detected = FALSE;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- pBezel->is_active = BEZEL_END;
- g_pGesture->bezel_filter_mask = BezelFlickFilterMask;
-#endif
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for(i=0; i<MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for(i=0; i<g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
g_pGesture->stylusInfo.t_status[i].status = BTN_RELEASED;
}
return -1;
}
- if (0 > mt_tool_idx)
+ if (mt_tool_idx < 0)
{
XDBG_WARNING(MGEST, "One or more of axes are not supported !\n");
return -1;
}
- if (ev->any.type == ET_ButtonPress || ev->any.type == ET_ButtonRelease)
+ if (ev->any.type == GESTURE_TOUCH_PRESS || ev->any.type == GESTURE_TOUCH_RELEASE)
{
if (device->id == g_pGesture->master_pointer->id && g_pGesture->stylusInfo.stylus_id == g_pGesture->first_fingerid)
de->valuators.data[mt_tool_idx] = 1;
{
int idx;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
idx = GestureGetFingerIndexFromDevice(device);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ idx = GestureGetTouchIndex(device->id, ev->device_event.touchid, ev->device_event.type);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (idx < 0)
{
if (device->id != g_pGesture->master_pointer->id)
}
switch(ev->any.type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->stylusInfo.t_status[idx].status = BTN_PRESSED;
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if (g_pGesture->stylusInfo.t_status[idx].status == BTN_PRESSED)
g_pGesture->stylusInfo.t_status[idx].status = BTN_MOVING;
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
g_pGesture->stylusInfo.t_status[idx].status = BTN_RELEASED;
break;
default:
return;
}
- if (0 > mt_tool_idx)
+ if (mt_tool_idx < 0)
{
XDBG_WARNING(MGEST, "One or more of axes are not supported !\n");
return;
{
g_pGesture->stylusInfo.pen_detected = TRUE;
g_pGesture->stylusInfo.fake_events = TRUE;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for(i=0; i<MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for(i=0; i<g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
if (g_pGesture->stylusInfo.t_status[i].status == BTN_PRESSED || g_pGesture->stylusInfo.t_status[i].status == BTN_MOVING)
{
InternalEvent release_ev;
memcpy(&release_ev, ev, sizeof(InternalEvent));
release_ev.any.time = ev->any.time;
- release_ev.any.type = ET_ButtonRelease;
+ release_ev.any.type = GESTURE_TOUCH_RELEASE;
release_ev.device_event.detail.button = 1;
- release_ev.device_event.type = ET_ButtonRelease;
+ release_ev.device_event.type = GESTURE_TOUCH_RELEASE;
release_ev.device_event.root_x = g_pGesture->stylusInfo.t_status[i].cx;
release_ev.device_event.root_y = g_pGesture->stylusInfo.t_status[i].cy;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
release_ev.device_event.deviceid = g_pGesture->mt_devices[i]->id;
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ release_ev.device_event.deviceid = g_pGesture->mt_devices->id;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
g_pGesture->stylusInfo.t_status[i].status = BTN_RELEASED;
GestureSetToolData(&release_ev, (double)0);
-
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
GestureHandleButtonReleaseEvent(screen_num, &release_ev, g_pGesture->mt_devices[i]);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ GestureHandleButtonReleaseEvent(screen_num, &release_ev, g_pGesture->mt_devices);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
if (g_pGesture->mt_devices[i]->id == g_pGesture->first_fingerid)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ if (i == 0)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
InternalEvent release_mev;
memcpy(&release_mev, ev, sizeof(InternalEvent));
release_mev.any.time = ev->any.time;
- release_mev.any.type = ET_ButtonRelease;
+ release_mev.any.type = GESTURE_TOUCH_RELEASE;
release_mev.device_event.detail.button = 1;
- release_mev.device_event.type = ET_ButtonRelease;
+ release_mev.device_event.type = GESTURE_TOUCH_RELEASE;
release_mev.device_event.root_x = g_pGesture->stylusInfo.t_status[i].cx;
release_mev.device_event.root_y = g_pGesture->stylusInfo.t_status[i].cy;
release_mev.device_event.deviceid = g_pGesture->master_pointer->id;
switch(ev->any.type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if(!(device->id < g_pGesture->first_fingerid))
g_pGesture->num_pressed++;
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if(!(device->id < g_pGesture->first_fingerid))
g_pGesture->num_pressed--;
break;
break;
}
memcpy(&master_ev, ev, sizeof(InternalEvent));
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
g_pGesture->mt_devices[0]->public.processInputProc(ev, g_pGesture->mt_devices[0]);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ g_pGesture->mt_devices->public.processInputProc(ev, g_pGesture->mt_devices);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
master_ev.device_event.deviceid = g_pGesture->master_pointer->id;
g_pGesture->master_pointer->public.processInputProc(&master_ev, g_pGesture->master_pointer);
void
GestureHandleButtonPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ int idx = 0;
+
+ TTRACE_BEGIN("XORG:GESTURE:BUTTON_PRESS");
#ifdef __DEBUG_EVENT_HANDLER__
- XDBG_DEBUG(MGEST, "mode: %d devid=%d time:%d cur: %d (%d, %d)\n",
- g_pGesture->ehtype, device->id, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
+ XDBG_DEBUG(MGEST, "mode: %d devid=%d touchid: %d, time:%d cur: %d (%d, %d)\n",
+ g_pGesture->ehtype, device->id, ev->device_event.touchid, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
#endif//__DEBUG_EVENT_HANDLER__
- int idx=0;
if (g_pGesture->touch_cancel_status == TRUE)
{
XDBG_DEBUG(MGEST, "Ignore Button Press event after touch cancel generated. \n");
return;
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
idx = GestureGetFingerIndexFromDevice(device);
+
if (0 <= idx)
{
g_pGesture->last_touches[idx].status = BTN_PRESSED;
g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
}
+#else
+ idx = GestureFindTouchIndex(ev->device_event.deviceid, ev->device_event.touchid, ev->device_event.type);
+ if (idx < 0 && ev->device_event.deviceid != g_pGesture->master_pointer->id) {
+ device->public.processInputProc(ev, device);
+ goto out;
+ }
+
+ g_pGesture->last_touches[idx].status = BTN_PRESSED;
+ g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
+ g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (g_pGesture->stylus_able)
{
{
if (!(g_pGesture->stylusInfo.stylus_id == g_pGesture->first_fingerid && device->id == g_pGesture->master_pointer->id))
{
- return;
+ goto out;
}
}
else if (device->id != g_pGesture->first_fingerid)
{
GestureChangeEventToFirstFingerEvent(screen_num, ev, device);
- return;
+ goto out;
}
}
}
if( ERROR_INVALPTR == GestureEnqueueEvent(screen_num, ev, device) )
{
GestureControl(g_pGesture->this_device, DEVICE_OFF);
- return;
+ goto out;
}
if( g_pGesture->num_mt_devices )
{
if(!(device->id < g_pGesture->first_fingerid))
g_pGesture->num_pressed++;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
- GestureBezelRecognize(ET_ButtonPress, ev, device);
-#endif
if(!(g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL))
- GestureRecognize(ET_ButtonPress, ev, device);
+ GestureRecognize(GESTURE_TOUCH_PRESS, ev, device);
if(!(g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL))
{
if (PalmRecognize)
- _GESTUREPALMRECOGNIZE_(PalmRecognize, ET_ButtonPress, ev, device)
+ _GESTUREPALMRECOGNIZE_(PalmRecognize, GESTURE_TOUCH_PRESS, ev, device)
else
- g_pGesture->ehtype = PROPAGATE_EVENTS;
+ {
+ g_pGesture->palm_filter_mask = GESTURE_PALM_FILTER_MASK_ALL;
+ GestureFlushOrDrop();
+ }
}
}
else
device->public.processInputProc(ev, device);
- GestureHoldDetector(ET_ButtonPress, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_PRESS, ev, device);
break;
case PROPAGATE_EVENTS:
{
device->public.processInputProc(ev, device);
}
- GestureHoldDetector(ET_ButtonPress, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_PRESS, ev, device);
break;
case IGNORE_EVENTS:
if(!(device->id < g_pGesture->first_fingerid))
g_pGesture->num_pressed++;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
- GestureBezelRecognize(ET_ButtonPress, ev, device);
-#endif
if(!(g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL))
- GestureRecognize(ET_ButtonPress, ev, device);
+ GestureRecognize(GESTURE_TOUCH_PRESS, ev, device);
if(!(g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL))
{
if (PalmRecognize)
- _GESTUREPALMRECOGNIZE_(PalmRecognize, ET_ButtonPress, ev, device);
+ _GESTUREPALMRECOGNIZE_(PalmRecognize, GESTURE_TOUCH_PRESS, ev, device);
}
break;
default:
break;
}
+out:
+ TTRACE_END();
+ return;
}
void
GestureHandleMotionEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ int idx = 0;
+
+ TTRACE_BEGIN("XORG:GESTURE:MOTION");
#ifdef __DEBUG_EVENT_HANDLER__
- XDBG_DEBUG(MGEST, "mode: %d devid=%d time:%d cur: %d (%d, %d)\n",
- g_pGesture->ehtype, device->id, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
+ XDBG_DEBUG(MGEST, "mode: %d devid=%d touchid: %d, time:%d cur: %d (%d, %d)\n",
+ g_pGesture->ehtype, device->id, ev->device_event.touchid, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
#endif//__DEBUG_EVENT_HANDLER__
- int idx=0;
if (g_pGesture->touch_cancel_status == TRUE)
{
XDBG_DEBUG(MGEST, "Ignore Button Press event after touch cancel generated. \n");
return;
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
idx = GestureGetFingerIndexFromDevice(device);
+
if (0 <= idx)
{
g_pGesture->last_touches[idx].status = BTN_MOVING;
g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
}
+#else
+ idx = GestureFindTouchIndex(ev->device_event.deviceid, ev->device_event.touchid, ev->device_event.type);
+ if (idx < 0 && ev->device_event.deviceid != g_pGesture->master_pointer->id) {
+ device->public.processInputProc(ev, device);
+ goto out;
+ }
+
+ g_pGesture->last_touches[idx].status = BTN_MOVING;
+ g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
+ g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (g_pGesture->stylus_able)
{
{
if (!(g_pGesture->stylusInfo.stylus_id == g_pGesture->first_fingerid && device->id == g_pGesture->master_pointer->id))
{
- return;
+ goto out;
}
}
else if (device->id != g_pGesture->first_fingerid)
{
GestureChangeEventToFirstFingerEvent(screen_num, ev, device);
- return;
+ goto out;
}
}
}
if( ERROR_INVALPTR == GestureEnqueueEvent(screen_num, ev, device) )
{
GestureControl(g_pGesture->this_device, DEVICE_OFF);
- return;
+ goto out;
}
if( g_pGesture->num_mt_devices )
{
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
- GestureBezelRecognize(ET_Motion, ev, device);
-#endif
if(!(g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL))
- GestureRecognize(ET_Motion, ev, device);
+ GestureRecognize(GESTURE_TOUCH_MOTION, ev, device);
if(!(g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL))
{
if (PalmRecognize)
- _GESTUREPALMRECOGNIZE_(PalmRecognize, ET_Motion, ev, device)
+ _GESTUREPALMRECOGNIZE_(PalmRecognize, GESTURE_TOUCH_MOTION, ev, device)
else
- g_pGesture->ehtype = PROPAGATE_EVENTS;
+ {
+ g_pGesture->palm_filter_mask = GESTURE_PALM_FILTER_MASK_ALL;
+ GestureFlushOrDrop();
+ }
}
}
else
device->public.processInputProc(ev, device);
- GestureHoldDetector(ET_Motion, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_MOTION, ev, device);
break;
case PROPAGATE_EVENTS:
{
device->public.processInputProc(ev, device);
}
- GestureHoldDetector(ET_Motion, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_MOTION, ev, device);
break;
case IGNORE_EVENTS:
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
- GestureBezelRecognize(ET_Motion, ev, device);
-#endif
if(!(g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL))
- GestureRecognize(ET_Motion, ev, device);
+ GestureRecognize(GESTURE_TOUCH_MOTION, ev, device);
if(!(g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL))
{
if (PalmRecognize)
- _GESTUREPALMRECOGNIZE_(PalmRecognize, ET_Motion, ev, device);
+ _GESTUREPALMRECOGNIZE_(PalmRecognize, GESTURE_TOUCH_MOTION, ev, device);
}
break;
default:
break;
}
-
+out:
+ TTRACE_END();
+ return;
}
void
GestureHandleButtonReleaseEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
-#ifdef __DEBUG_EVENT_HANDLER__
- XDBG_DEBUG(MGEST, "mode: %d devid=%d time:%d cur: %d (%d, %d)\n",
- g_pGesture->ehtype, device->id, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
+ int idx = 0;
+
+ TTRACE_BEGIN("XORG:GESTURE:BUTTON_RELEASE");
+#if 1//def __DEBUG_EVENT_HANDLER__
+ XDBG_DEBUG(MGEST, "mode: %d devid=%d touchid: %d, time:%d cur: %d (%d, %d)\n",
+ g_pGesture->ehtype, device->id, ev->device_event.touchid, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
#endif//__DEBUG_EVENT_HANDLER__
- int idx=0;
if (g_pGesture->touch_cancel_status == TRUE)
{
XDBG_DEBUG(MGEST, "Ignore Button Press event after touch cancel generated. \n");
return;
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
idx = GestureGetFingerIndexFromDevice(device);
+
if (0 <= idx)
{
g_pGesture->last_touches[idx].status = BTN_RELEASED;
g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
}
+#else
+ idx = GestureFindTouchIndex(ev->device_event.deviceid, ev->device_event.touchid, ev->device_event.type);
+ if (idx < 0 && ev->device_event.deviceid != g_pGesture->master_pointer->id) {
+ device->public.processInputProc(ev, device);
+ goto out;
+ }
+
+ g_pGesture->last_touches[idx].status = BTN_RELEASED;
+ g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
+ g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
+
if (g_pGesture->stylus_able)
{
{
if (!(g_pGesture->stylusInfo.stylus_id == g_pGesture->first_fingerid && device->id == g_pGesture->master_pointer->id))
{
- return;
+ goto out;
}
}
else if (device->id != g_pGesture->first_fingerid)
{
GestureChangeEventToFirstFingerEvent(screen_num, ev, device);
- return;
+ goto out;
}
}
}
if( ERROR_INVALPTR == GestureEnqueueEvent(screen_num, ev, device) )
{
GestureControl(g_pGesture->this_device, DEVICE_OFF);
- return;
+ goto out;
}
if( g_pGesture->num_mt_devices )
{
if(!(device->id < g_pGesture->first_fingerid))
g_pGesture->num_pressed--;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
- GestureBezelRecognize(ET_ButtonRelease, ev, device);
-#endif
if(!(g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL))
- GestureRecognize(ET_ButtonRelease, ev, device);
+ GestureRecognize(GESTURE_TOUCH_RELEASE, ev, device);
if(!(g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL))
{
if (PalmRecognize)
- _GESTUREPALMRECOGNIZE_(PalmRecognize, ET_ButtonRelease, ev, device)
+ _GESTUREPALMRECOGNIZE_(PalmRecognize, GESTURE_TOUCH_RELEASE, ev, device)
else
- g_pGesture->num_mt_devices = PROPAGATE_EVENTS;
+ {
+ g_pGesture->palm_filter_mask = GESTURE_PALM_FILTER_MASK_ALL;
+ GestureFlushOrDrop();
+ }
}
}
else
device->public.processInputProc(ev, device);
- GestureHoldDetector(ET_ButtonRelease, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_RELEASE, ev, device);
break;
case PROPAGATE_EVENTS:
#ifdef SUPPORT_ANR_WITH_INPUT_EVENT
- if( IsMaster(device) && ev->any.type == ET_ButtonRelease )
+ if( IsMaster(device) && ev->any.type == GESTURE_TOUCH_RELEASE )
{
if( g_pGesture->anr_window == NULL )
{
{
device->public.processInputProc(ev, device);
}
- GestureHoldDetector(ET_ButtonRelease, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_RELEASE, ev, device);
break;
case IGNORE_EVENTS:
if(!(device->id < g_pGesture->first_fingerid))
g_pGesture->num_pressed--;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
- GestureBezelRecognize(ET_ButtonRelease, ev, device);
-#endif
if(!(g_pGesture->filter_mask == GESTURE_FILTER_MASK_ALL))
- GestureRecognize(ET_ButtonRelease, ev, device);
+ GestureRecognize(GESTURE_TOUCH_RELEASE, ev, device);
if(!(g_pGesture->palm_filter_mask == GESTURE_PALM_FILTER_MASK_ALL))
{
if (PalmRecognize)
- _GESTUREPALMRECOGNIZE_(PalmRecognize, ET_ButtonRelease, ev, device);
+ _GESTUREPALMRECOGNIZE_(PalmRecognize, GESTURE_TOUCH_RELEASE, ev, device);
}
break;
default:
break;
}
+out:
+ TTRACE_END();
+ return;
}
void
GestureHandleKeyPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:KEY_PRESS");
#ifdef __DEBUG_EVENT_HANDLER__
XDBG_DEBUG(MGEST, "devid=%d time:%d cur:%d\n", device->id, ev->any.time, GetTimeInMillis());
#endif//__DEBUG_EVENT_HANDLER__
}
XDBG_SECURE(MGEST, "Ignore KeyPress (devid:%d, keycode:%d) during LCD Off!\n", device->id, ev->device_event.detail.key);
+ TTRACE_END();
return;
}
}
XDBG_INFO(MGEST, "Ignore TouchKey KEY_BACK (devid:%d)\n", device->id);
else
XDBG_SECURE(MGEST, "Ignore TouchKey KeyPress (devid:%d, keycode:%d)\n", device->id, ev->device_event.detail.key);
+ TTRACE_END();
return;
}
-
+ TTRACE_END();
device->public.processInputProc(ev, device);
}
void
GestureHandleKeyReleaseEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:KEY_RELEASE");
if (g_pGesture->pass_keycodes[3] == ev->device_event.detail.key)
{
XDBG_SECURE(MGEST, "TIME = %d, keycode = %d\n", ev->any.time, ev->device_event.detail.key);
}
+ TTRACE_END();
device->public.processInputProc(ev, device);
}
+void GestureHandleRawButtonPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
+{
+ int i;
+ TTRACE_BEGIN("XORG:GESTURE:RAW_BUTTON_PRESS");
+
+ if (g_pGesture->touch_cancel_status == TRUE)
+ {
+ XDBG_DEBUG(MGEST, "Ignore Raw Button Press event after touch cancel generated. \n");
+ TTRACE_END();
+ return;
+ }
+ TTRACE_END();
+ device->public.processInputProc(ev, device);
+}
+
+void GestureHandleRawButtonReleaseEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
+{
+ int i;
+ TTRACE_BEGIN("XORG:GESTURE:RAW_BUTTON_RELEASE");
+
+ if (g_pGesture->touch_cancel_status == TRUE)
+ {
+ XDBG_DEBUG(MGEST, "Ignore Raw Button Release event after touch cancel generated. \n");
+ TTRACE_END();
+ return;
+ }
+ TTRACE_END();
+ device->public.processInputProc(ev, device);
+}
+
+void GestureHandleRawMotionEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
+{
+ int i;
+ TTRACE_BEGIN("XORG:GESTURE:RAW_MOTION");
+
+ if (g_pGesture->touch_cancel_status == TRUE)
+ {
+ XDBG_DEBUG(MGEST, "Ignore Raw Motion event after touch cancel generated. \n");
+ TTRACE_END();
+ return;
+ }
+ TTRACE_END();
+ device->public.processInputProc(ev, device);
+}
+
static ErrorStatus
GestureEnableEventHandler(InputInfoPtr pInfo)
{
Bool res;
GestureDevicePtr pGesture = pInfo->private;
+ TTRACE_BEGIN("XORG:GESTURE:ENABLE_EVENT_HANDLER");
+
res = GestureInstallResourceStateHooks();
if( !res )
{
XDBG_ERROR(MGEST, "Failed on GestureInstallResourceStateHooks() !\n");
+ TTRACE_END();
return ERROR_ABNORMAL;
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
res = GestureSetMaxNumberOfFingers((int)MAX_MT_DEVICES);
-
if( !res )
{
XDBG_ERROR(MGEST, "Failed on GestureSetMaxNumberOfFingers(%d) !\n", (int)MAX_MT_DEVICES);
goto failed;
}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
res = GestureRegisterCallbacks(GestureCbEventsGrabbed, GestureCbEventsSelected);
goto failed;
}
+ GestureRegisterDeviceInfo(pInfo->dev);
+
+ TTRACE_END();
return ERROR_NONE;
failed:
GestureUninstallResourceStateHooks();
GestureUnsetMaxNumberOfFingers();
+ TTRACE_END();
return ERROR_ABNORMAL;
}
mieqSetHandler(ET_KeyPress, NULL);
mieqSetHandler(ET_KeyRelease, NULL);
- mieqSetHandler(ET_ButtonPress, NULL);
- mieqSetHandler(ET_ButtonRelease, NULL);
- mieqSetHandler(ET_Motion, NULL);
+ mieqSetHandler(GESTURE_TOUCH_PRESS, NULL);
+ mieqSetHandler(GESTURE_TOUCH_RELEASE, NULL);
+ mieqSetHandler(GESTURE_TOUCH_MOTION, NULL);
mieqSetHandler(ET_MTSync, NULL);
+ mieqSetHandler(GESTURE_RAW_TOUCH_PRESS, NULL);
+ mieqSetHandler(GESTURE_RAW_TOUCH_RELEASE, NULL);
+ mieqSetHandler(GESTURE_RAW_TOUCH_MOTION, NULL);
err = GestureFiniEQ();
int idx = 0;
int i;
- XDBG_INFO(MGEST, "Get devices information\n");
+ TTRACE_BEGIN("XORG:GESTURE:REGISTER_DEVICE");
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for (i=0; i<MAX_MT_DEVICES; i++)
{
pGesture->mt_devices[i] = NULL;
}
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ pGesture->mt_devices = NULL;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
for( dev = inputInfo.pointer ; dev; dev = dev->next )
{
if(IsPointerDevice(dev))
{
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
if( idx >= MAX_MT_DEVICES )
{
XDBG_WARNING(MGEST, "Number of mt device is over MAX_MT_DEVICES(%d) !\n",
{
pGesture->mt_devices[idx] = dev;
XDBG_INFO(MGEST, "[id:%d] MT device[%d] name=%s\n", dev->id, idx, pGesture->mt_devices[idx]->name);
- ErrorF("[id:%d] MT device[%d] name=%s\n", dev->id, idx, pGesture->mt_devices[idx]->name);
GesturePalmGetAbsAxisInfo(dev);
idx++;
}
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ if (strcasestr(dev->name, "Touchscreen"))
+ {
+ pGesture->mt_devices = dev;
+ XDBG_INFO(MGEST, "[id: %d] MT device name=%s\n", dev->id, pGesture->mt_devices->name);
+ TouchClassPtr touchInfo = dev->touch;
+ if (touchInfo)
+ {
+ XDBG_INFO(MGEST, "touchInfo state: %d, num_touches: %d, max_touches: %d\n",
+ touchInfo->state, touchInfo->num_touches, touchInfo->max_touches);
+ idx = touchInfo->max_touches;
+ }
+ else
+ {
+ XDBG_INFO(MGEST, "device(%d) hasn't touch class\n", dev->id);
+ }
+ }
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
}
}
XDBG_ERROR(MGEST, "Failed to get info of master pointer or XTest pointer !\n");
pGesture->num_mt_devices = 0;
+ TTRACE_END();
return;
}
{
XDBG_ERROR(MGEST, "Failed to mt device information !\n");
pGesture->num_mt_devices = 0;
- pGesture->first_fingerid = -1;
+ pGesture->first_fingerid = -1;
+
+ TTRACE_END();
return;
}
-
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
pGesture->first_fingerid = pGesture->mt_devices[0]->id;
memset(pGesture->fingers, 0, sizeof(TouchStatus)*pGesture->num_mt_devices);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ GestureAlloc(pGesture->num_mt_devices);
+ pGesture->first_fingerid = pGesture->mt_devices->id;
+ GesturePalmGetAbsAxisInfo(pGesture->mt_devices);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ Bool res = GestureSetMaxNumberOfFingers(g_pGesture->num_mt_devices);
+
+ if( !res )
+ {
+ XDBG_ERROR(MGEST, "Failed on GestureSetMaxNumberOfFingers(%d) !\n", g_pGesture->num_mt_devices);
+ goto failed;
+ }
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
pGesture->pRootWin = RootWindow(pGesture->master_pointer);
mieqSetHandler(ET_KeyPress, GestureHandleKeyPressEvent);
mieqSetHandler(ET_KeyRelease, GestureHandleKeyReleaseEvent);
- mieqSetHandler(ET_ButtonPress, GestureHandleButtonPressEvent);
- mieqSetHandler(ET_ButtonRelease, GestureHandleButtonReleaseEvent);
- mieqSetHandler(ET_Motion, GestureHandleMotionEvent);
+ mieqSetHandler(GESTURE_TOUCH_PRESS, GestureHandleButtonPressEvent);
+ mieqSetHandler(GESTURE_TOUCH_RELEASE, GestureHandleButtonReleaseEvent);
+ mieqSetHandler(GESTURE_TOUCH_MOTION, GestureHandleMotionEvent);
+ mieqSetHandler(GESTURE_RAW_TOUCH_PRESS, GestureHandleRawButtonPressEvent);
+ mieqSetHandler(GESTURE_RAW_TOUCH_RELEASE, GestureHandleRawButtonReleaseEvent);
+ mieqSetHandler(GESTURE_RAW_TOUCH_MOTION, GestureHandleRawMotionEvent);
mieqSetHandler(ET_MTSync, GestureHandleMTSyncEvent);
+ TTRACE_END();
return;
failed:
-
GestureUninstallResourceStateHooks();
GestureUnsetMaxNumberOfFingers();
+
+ TTRACE_END();
}
BOOL
return (dev->xtest_master_id != 0);
}
+TouchPointInfoPtr
+GestureTouchFindByClientID(DeviceIntPtr dev)
+{
+ TouchClassPtr t = dev->touch;
+ TouchPointInfoPtr ti;
+ int i;
+
+ if (!t)
+ return NULL;
+
+ for (i = 0; i < t->num_touches; i++) {
+ ti = &t->touches[i];
+ if (ti->active)
+ return ti;
+ }
+
+ return NULL;
+}
+
void
GestureGenerateTouchCancelEvent(void)
{
- int i;
- Bool canceled_touch_index[MAX_MT_DEVICES] = {FALSE, };
+ InternalEvent cancel_event;
+ TouchPointInfoPtr ti, pressed_touch_info, ti_master;
+ TouchListener *listener, *listener_master;
+ TouchClassPtr current_touch_class;
+ int i, idx;
- if (g_pGesture->mtsync_status == MTOUCH_FRAME_SYNC_END)
+ TTRACE_BEGIN("XORG:GESTURE:GENERATE_TOUCHCANCEL");
+
+ memset(&cancel_event, 0, sizeof(InternalEvent));
+
+ if (g_pGesture->mtsync_status == MTOUCH_FRAME_SYNC_END || g_pGesture->touch_cancel_status == TRUE)
{
- XDBG_DEBUG(MGEST, "no Touch(%d)\n", g_pGesture->mtsync_status);
+ XDBG_DEBUG(MGEST, "no Touch(%d) or Cancel events already generated(%d).\n", g_pGesture->mtsync_status, g_pGesture->touch_cancel_status);
+ TTRACE_END();
return;
}
- for (i=0; i<MAX_MT_DEVICES; i++)
+ if (!g_pGesture->mt_devices)
{
- if (!(g_pGesture->mt_devices[i]->button->buttonsDown)) continue;
- InternalEvent cancel_event;
-
- cancel_event.touch_cancel_event.header = ET_Internal;
- cancel_event.touch_cancel_event.type = ET_TouchCancel;
- cancel_event.touch_cancel_event.length = sizeof(TouchCancelEvent);
- cancel_event.touch_cancel_event.time = CurrentTime;
- cancel_event.touch_cancel_event.deviceid = g_pGesture->mt_devices[i]->id;
-
- cancel_event.touch_cancel_event.sourceid = g_pGesture->mt_devices[i]->id;
- cancel_event.touch_cancel_event.resource = 0;
- cancel_event.touch_cancel_event.flags = 0;
-
- g_pGesture->mt_devices[i]->public.processInputProc(&cancel_event, g_pGesture->mt_devices[i]);
- canceled_touch_index[i] = TRUE;
- g_pGesture->touch_cancel_status = TRUE;
+ XDBG_DEBUG(MGEST, "Multi touch device is not registered\n");
+ TTRACE_END();
+ return;
}
- for (i=0; i<MAX_MT_DEVICES; i++)
+ cancel_event.touch_cancel_event.header = ET_Internal;
+ cancel_event.touch_cancel_event.type = ET_TouchCancel;
+ cancel_event.touch_cancel_event.length = sizeof(TouchCancelEvent);
+ cancel_event.touch_cancel_event.time = CurrentTime;
+ cancel_event.touch_cancel_event.deviceid = g_pGesture->mt_devices->id;
+
+ ti = GestureTouchFindByClientID(g_pGesture->mt_devices);
+ cancel_event.touch_cancel_event.sourceid = ti?ti->sourceid:0;
+ listener = ti?ti->listeners:NULL;
+ cancel_event.touch_cancel_event.resource = listener?listener->listener:0;
+ cancel_event.touch_cancel_event.flags = 0;
+
+ ti_master = GestureTouchFindByClientID(g_pGesture->master_pointer);
+
+ if (!ti || !ti_master)
{
- if (canceled_touch_index[i] == FALSE) continue;
- InternalEvent release_event;
- InternalEvent release_event_master;
-
- memset(&release_event, 0, sizeof(InternalEvent));
-
- release_event.device_event.header = ET_Internal;
- release_event.device_event.type = ET_ButtonRelease;
- release_event.device_event.length = sizeof(DeviceEvent);
- release_event.device_event.time = CurrentTime;
- release_event.device_event.deviceid = g_pGesture->mt_devices[i]->id;
- release_event.device_event.sourceid = g_pGesture->mt_devices[i]->button->sourceid;
- release_event.device_event.detail.button = 1;
- release_event.device_event.root_x = g_pGesture->last_touches[i].cx;
- release_event.device_event.root_y = g_pGesture->last_touches[i].cy;
- if (g_pGesture->mt_devices[i]->id == g_pGesture->first_fingerid)
- {
- memcpy(&release_event_master, &release_event, sizeof(InternalEvent));
- release_event_master.device_event.deviceid = g_pGesture->master_pointer->id;
- }
+ XDBG_WARNING(MGEST, "Currently touches are released some other reasons: (touch reject)\n");
+ TTRACE_END();
+ return;
+ }
- g_pGesture->mt_devices[i]->public.processInputProc(&release_event, g_pGesture->mt_devices[i]);
- if (g_pGesture->mt_devices[i]->id == g_pGesture->first_fingerid)
- {
- g_pGesture->master_pointer->public.processInputProc(&release_event_master, g_pGesture->master_pointer);
+ g_pGesture->mt_devices->public.processInputProc(&cancel_event, g_pGesture->mt_devices);
+
+ current_touch_class = g_pGesture->mt_devices->touch;
+
+ XDBG_DEBUG(MGEST, "Generate Touch Cancel event\n");
+
+ if (current_touch_class)
+ {
+ for (i = 0; i < current_touch_class->num_touches; i++) {
+ pressed_touch_info = ¤t_touch_class->touches[i];
+ if (pressed_touch_info->active) {
+ idx = GestureGetTouchIndex(pressed_touch_info->sourceid, pressed_touch_info->client_id, ET_TouchCancel);
+ InternalEvent release_event;
+ InternalEvent release_event_master;
+
+ InternalEvent raw_release_event;
+ InternalEvent raw_release_event_master;
+
+ memset(&release_event, 0, sizeof(InternalEvent));
+ memset(&raw_release_event, 0, sizeof(InternalEvent));
+
+ raw_release_event.raw_event.header = ET_Internal;
+ raw_release_event.raw_event.type = ET_RawTouchEnd;
+ raw_release_event.raw_event.length = sizeof(RawDeviceEvent);
+ raw_release_event.raw_event.time = CurrentTime;
+ raw_release_event.raw_event.deviceid = g_pGesture->mt_devices->id;
+ raw_release_event.raw_event.sourceid = g_pGesture->mt_devices->button->sourceid;
+ raw_release_event.raw_event.detail.button = pressed_touch_info->client_id;
+ raw_release_event.raw_event.valuators.mask[0] = 0x3;
+ raw_release_event.raw_event.valuators.data_raw[0] = raw_release_event.raw_event.valuators.data[0] = g_pGesture->last_touches[idx].cx * 1.0;
+ raw_release_event.raw_event.valuators.data_raw[1] = raw_release_event.raw_event.valuators.data[1] = g_pGesture->last_touches[idx].cy * 1.0;
+
+ memcpy(&raw_release_event_master, &raw_release_event, sizeof(InternalEvent));
+ raw_release_event_master.raw_event.deviceid = g_pGesture->master_pointer->id;
+
+ g_pGesture->mt_devices->public.processInputProc(&raw_release_event, g_pGesture->mt_devices);
+ g_pGesture->master_pointer->public.processInputProc(&raw_release_event_master, g_pGesture->master_pointer);
+
+ release_event.device_event.header = ET_Internal;
+ release_event.device_event.type = ET_TouchEnd;
+ release_event.device_event.length = sizeof(DeviceEvent);
+ release_event.device_event.time = CurrentTime;
+ release_event.device_event.deviceid = g_pGesture->mt_devices->id;
+ release_event.device_event.sourceid = g_pGesture->mt_devices->button->sourceid;
+ release_event.device_event.touchid = pressed_touch_info->client_id;
+
+ release_event.device_event.root_x = g_pGesture->last_touches[idx].cx;
+ release_event.device_event.root_y = g_pGesture->last_touches[idx].cy;
+
+ memcpy(&release_event_master, &release_event, sizeof(InternalEvent));
+ release_event_master.device_event.deviceid = g_pGesture->master_pointer->id;
+
+ if (ti && ti->emulate_pointer)
+ {
+ release_event.device_event.flags |= TOUCH_POINTER_EMULATED;
+ release_event.device_event.detail.button = 1;
+ }
+ if (ti_master && ti_master->emulate_pointer)
+ {
+ release_event_master.device_event.flags |= TOUCH_POINTER_EMULATED;
+ release_event_master.device_event.detail.button = 1;
+ }
+
+// XDBG_DEBUG(MGEST, "Generate a touch end event for index: %d\n", idx);
+ g_pGesture->mt_devices->public.processInputProc(&release_event, g_pGesture->mt_devices);
+ g_pGesture->master_pointer->public.processInputProc(&release_event_master, g_pGesture->master_pointer);
+
+ g_pGesture->touch_cancel_status = TRUE;
+ }
}
}
+
+ TTRACE_END();
}
static void
{
int dpmsLevel = *(int *)calldata;
+ XDBG_DEBUG(MGEST, "TouchCancel mtsync_status: %d, dpmslevel: %d\n", g_pGesture->mtsync_status, dpmsLevel);
+
if ((DPMSModeOff == dpmsLevel) && (MTOUCH_FRAME_SYNC_END != g_pGesture->mtsync_status)) {
XDBG_DEBUG(MGEST, "TouchCancel dpmslevel: %d\n", dpmsLevel);
GestureGenerateTouchCancelEvent();
}
}
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+static void
+GestureAlloc(int capability)
+{
+ if (!g_pGesture)
+ {
+ ErrorF("[GestureAlloc] Failed to allocate a gesture drv's structures\n");
+ return;
+ }
+
+ g_pGesture->cts = (CurTouchStatus *)calloc(capability, sizeof(CurTouchStatus));
+ g_pGesture->finger_rects = (pixman_region16_t *)calloc(capability, sizeof(pixman_region16_t));
+ g_pGesture->fingers = (TouchStatus *)calloc(capability, sizeof(TouchStatus));
+ g_pGesture->event_sum= (int *)calloc(capability, sizeof(int));
+ g_pGesture->stylusInfo.t_status = (CurTouchStatus *)calloc(capability, sizeof(CurTouchStatus));
+ g_pGesture->last_touches = (CurTouchStatus *)calloc(capability, sizeof(CurTouchStatus));
+}
+
+static void
+GestureDealloc()
+{
+ if (!g_pGesture)
+ {
+ ErrorF("[GestureDealloc] Failed to free a gesture drv's structures\n");
+ return;
+ }
+
+ if (g_pGesture->cts) {
+ free(g_pGesture->cts);
+ g_pGesture->cts = NULL;
+ }
+ if (g_pGesture->finger_rects) {
+ free(g_pGesture->finger_rects);
+ g_pGesture->finger_rects = NULL;
+ }
+ if (g_pGesture->fingers) {
+ free(g_pGesture->fingers);
+ g_pGesture->fingers = NULL;
+ }
+ if (g_pGesture->event_sum) {
+ free(g_pGesture->event_sum);
+ g_pGesture->event_sum = NULL;
+ }
+ if (g_pGesture->last_touches) {
+ free(g_pGesture->last_touches);
+ g_pGesture->last_touches = NULL;
+ }
+}
+
+static void
+GesturePalmAlloc(int capability)
+{
+ if (!g_pGesture)
+ {
+ ErrorF("[GesturePalmAlloc] Failed to allocate a gesture drv's palm structures\n");
+ return;
+ }
+
+ g_pGesture->palm.pti = (PalmTouchInfo *)calloc(capability, sizeof(PalmTouchInfo));
+ g_pGesture->palm.qti = (QueuedTouchInfo *)calloc(capability+1, sizeof(QueuedTouchInfo));
+ g_pGesture->palm.finger_rects = (pixman_region16_t *)calloc(capability, sizeof(pixman_region16_t));
+}
+
+static void
+GesturePalmDealloc(int capability)
+{
+ if (!g_pGesture)
+ {
+ ErrorF("[GesturePalmDealloc] Failed to allocate a gesture drv's palm structures\n");
+ return;
+ }
+
+ if (g_pGesture->palm.pti) {
+ free(g_pGesture->palm.pti);
+ g_pGesture->palm.pti = NULL;
+ }
+ if (g_pGesture->palm.qti) {
+ free(g_pGesture->palm.qti);
+ g_pGesture->palm.qti = NULL;
+ }
+ if (g_pGesture->palm.finger_rects) {
+ free(g_pGesture->palm.finger_rects);
+ g_pGesture->palm.finger_rects = NULL;
+ }
+}
+
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
void
GestureEnable(int enable, Bool prop, DeviceIntPtr dev)
{
pixman_region_init(&g_pGesture->area);
pixman_region_init(&pPalm->area);
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for( i = 0 ; i < MAX_MT_DEVICES ; i++ )
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for( i = 0 ; i < g_pGesture->num_mt_devices; i++ )
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
pixman_region_init_rect (&g_pGesture->finger_rects[i], 0, 0, FINGER_WIDTH_2T, FINGER_HEIGHT_2T);
pixman_region_init_rect (&pPalm->finger_rects[i], 0, 0, FINGER_WIDTH_2T, FINGER_HEIGHT_2T);
pixman_region_init(&g_pGesture->area);
pixman_region_init(&pPalm->area);
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for( i = 0 ; i < MAX_MT_DEVICES ; i++ )
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for( i = 0 ; i < g_pGesture->num_mt_devices; i++ )
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
pixman_region_init_rect (&pPalm->finger_rects[i], 0, 0, FINGER_WIDTH_2T, FINGER_HEIGHT_2T);
}
GesturePalmRecognize_FlickVertical(ev->any.type, 0);
}
}
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(!(g_pGesture->bezel_filter_mask == BezelFlickFilterMask))
- {
- GestureBezelRecognize(ev->any.type, ev, device);
- }
-#endif
g_pGesture->filter_mask = GESTURE_FILTER_MASK_ALL;
g_pGesture->palm_filter_mask = GESTURE_PALM_FILTER_MASK_ALL;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- g_pGesture->bezel_filter_mask = BezelFlickFilterMask;
- g_pGesture->bezel_recognized_mask = 0;
-#endif
g_pGesture->recognized_gesture = 0;
g_pGesture->recognized_palm = 0;
if( ERROR_INVALPTR == GestureFlushOrDrop() )
#ifdef __DETAIL_DEBUG__
switch( ev->any.type )
{
- case ET_ButtonPress:
- XDBG_DEBUG(MGEST, "ET_ButtonPress (id:%d)\n", device->id);
+ case GESTURE_TOUCH_PRESS:
+ XDBG_DEBUG(MGEST, "Press (id:%d)\n", device->id);
break;
- case ET_ButtonRelease:
- XDBG_DEBUG(MGEST, "ET_ButtonRelease (id:%d)\n", device->id);
+ case GESTURE_TOUCH_RELEASE:
+ XDBG_DEBUG(MGEST, "Release (id:%d)\n", device->id);
break;
- case ET_Motion:
- XDBG_DEBUG(MGEST, "ET_Motion (id:%d)\n", device->id);
+ case GESTURE_TOUCH_MOTION:
+ XDBG_DEBUG(MGEST, "Motion (id:%d)\n", device->id);
break;
}
#endif//__DETAIL_DEBUG__
int i, j;
DeviceIntPtr device;
+ TTRACE_BEGIN("XORG:GESTURE:FLUSH_EVENT");
+
if( !g_pGesture->EQ )
{
XDBG_ERROR(MGEST, "Invalid pointer access !\n");
+ TTRACE_END();
return ERROR_INVALPTR;
}
{
device = g_pGesture->EQ[i].device;
#ifdef __DETAIL_DEBUG__
- if(g_pGesture->EQ[i].event->any.type != ET_Motion)
+ if(g_pGesture->EQ[i].event->any.type != GESTURE_TOUCH_MOTION)
XDBG_DEBUG(MGEST, "[%d] type: %d\n", device->id, g_pGesture->EQ[i].event->any.type);
#endif//__DETAIL_DEBUG__
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for(j = 0 ; j < MAX_MT_DEVICES+1 ; j++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for(j = 0 ; j < (g_pGesture->num_mt_devices+1) ; j++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
if(g_pGesture->palm.qti[j].devid == device->id)
{
#ifdef __DETAIL_DEBUG__
- if(g_pGesture->EQ[i].event->any.type != ET_Motion)
+ if(g_pGesture->EQ[i].event->any.type != GESTURE_TOUCH_MOTION)
XDBG_DEBUG(MGEST, "[%d] type: %d(pressed: %d) time: %d\n", device->id, g_pGesture->EQ[i].event->any.type, g_pGesture->palm.qti[j].pressed, GetTimeInMillis());
#endif//__DETAIL_DEBUG__
- if( (g_pGesture->palm.qti[j].pressed == 0) && (g_pGesture->EQ[i].event->any.type == ET_ButtonRelease) )
+ if( (g_pGesture->palm.qti[j].pressed == 0) && (g_pGesture->EQ[i].event->any.type == GESTURE_TOUCH_RELEASE) )
{
XDBG_WARNING(MGEST, "Enqueued event..ButtonRelease with no ButtonPress !(devid: %d)\n", device->id);
- g_pGesture->EQ[i].event->any.type = ET_ButtonPress;
+ g_pGesture->EQ[i].event->any.type = GESTURE_TOUCH_PRESS;
device->public.processInputProc(g_pGesture->EQ[i].event, device);
- g_pGesture->EQ[i].event->any.type = ET_ButtonRelease;
+ g_pGesture->EQ[i].event->any.type = GESTURE_TOUCH_RELEASE;
g_pGesture->palm.qti[j].pressed = 0;
}
- else if(g_pGesture->EQ[i].event->any.type == ET_ButtonPress)
+ else if(g_pGesture->EQ[i].event->any.type == GESTURE_TOUCH_PRESS)
{
g_pGesture->palm.qti[j].pressed = 1;
}
- else if( (g_pGesture->palm.qti[j].pressed == 1) && (g_pGesture->EQ[i].event->any.type == ET_ButtonRelease))
+ else if( (g_pGesture->palm.qti[j].pressed == 1) && (g_pGesture->EQ[i].event->any.type == GESTURE_TOUCH_RELEASE))
{
g_pGesture->palm.qti[j].pressed = 0;
}
}
}
#ifdef __DETAIL_DEBUG__
- if(g_pGesture->EQ[i].event->any.type != ET_Motion)
+ if(g_pGesture->EQ[i].event->any.type != GESTURE_TOUCH_MOTION)
XDBG_DEBUG(MGEST, "!!! [%d] type: %d\n", device->id, g_pGesture->EQ[i].event->any.type);
#endif
device->public.processInputProc(g_pGesture->EQ[i].event, device);
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
memset(g_pGesture->palm.qti, 0, sizeof(g_pGesture->palm.qti[MAX_MT_DEVICES+1]));
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ memset(g_pGesture->palm.qti, 0, sizeof(g_pGesture->palm.qti[(g_pGesture->num_mt_devices+1)]));
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for( i = 0 ; i < MAX_MT_DEVICES ; i++ )
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for( i = 0 ; i < g_pGesture->num_mt_devices; i++ )
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
g_pGesture->event_sum[i] = 0;
g_pGesture->headEQ = g_pGesture->tailEQ = 0;//Free EQ
+ TTRACE_END();
return ERROR_NONE;
}
return;
XISetDevicePropertyDeletable(dev, prop_gesture_palm_rejection_mode, FALSE);
+
+ prop_gesture_window_stack_changed = MakeAtom(GESTURE_WINDOW_STACK_CHANGED, strlen(GESTURE_WINDOW_STACK_CHANGED), TRUE);
+ XISetDevicePropertyDeletable(dev, prop_gesture_window_stack_changed, FALSE);
}
static int
return Success;
}
- sprintf(buf, "stylus_enable,%d", !!(g_pGesture->palm_rejection_mode));
+ snprintf(buf, sizeof(buf), "stylus_enable,%d", !!(g_pGesture->palm_rejection_mode));
XDBG_DEBUG(MGEST, "stylus_changed: %d!\n", !!(g_pGesture->palm_rejection_mode));
ret = write(fd, buf, strlen(buf));
close(fd_result);
}
}
+ else if(prop_gesture_window_stack_changed == atom)
+ {
+ if( val->format != 8 || val->type != XA_INTEGER || val->size != 1 )
+ return BadMatch;
+
+ if( !checkonly )
+ {
+ XDBG_DEBUG(MGEST, "stack chagned\n");
+ GestureGenerateTouchCancelEvent();
+ }
+ }
return Success;
}
static int
GestureInit(DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:INIT");
#ifdef HAVE_PROPERTIES
GestureInitProperty(device);
XIRegisterPropertyHandler(device, GestureSetProperty, NULL, NULL);
#endif
-
+ TTRACE_END();
return Success;
}
{
int rc = BadAlloc;
GestureDevicePtr pGesture;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- BezelFlickStatusPtr pBezel;
-#endif
+
+ TTRACE_BEGIN("XORG:GESTURE:PREINIT");
pGesture = calloc(1, sizeof(GestureDeviceRec));
if (!pGesture) {
pInfo->private = NULL;
//xf86DeleteInput(pInfo, 0);
+ TTRACE_END();
goto error;
}
pGesture->gestureWin = None;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- pBezel = &pGesture->bezel;
- pBezel->is_active = xf86SetIntOption(pInfo->options, "Bezel_Activate", 0);
- pBezel->top_left.width = xf86SetIntOption(pInfo->options, "Bezel_Top_Left_Width", 0);
- pBezel->top_left.height = xf86SetIntOption(pInfo->options, "Bezel_Top_Left_Height", 0);
- pBezel->top_right.width = xf86SetIntOption(pInfo->options, "Bezel_Top_Right_Width", 0);
- pBezel->top_right.height = xf86SetIntOption(pInfo->options, "Bezel_Top_Right_Height", 0);
- pBezel->bottom_left.width = xf86SetIntOption(pInfo->options, "Bezel_Bottom_Left_Width", 0);
- pBezel->bottom_left.height = xf86SetIntOption(pInfo->options, "Bezel_Bottom_Left_Height", 0);
- pBezel->bottom_right.width = xf86SetIntOption(pInfo->options, "Bezel_Bottom_Right_Width", 0);
- pBezel->bottom_right.height = xf86SetIntOption(pInfo->options, "Bezel_Bottom_Right_Height", 0);
- pBezel->flick_distance = xf86SetIntOption(pInfo->options, "Bezel_Flick_Distance", 0);
- pBezel->bezel_angle_ratio = xf86SetIntOption(pInfo->options, "Bezel_Flick_Angle_Ratio", 0);
- pBezel->bezel_angle_moving_check = xf86SetIntOption(pInfo->options, "Bezel_Flick_Angle_Moving_Check", 0);
-#ifdef __BEZEL_DEBUG__
- XDBG_DEBUG(MGEST, "[BEZEL] top_left.width: %d, top_left.height: %d\n", pBezel->top_left.width, pBezel->top_left.height);
- XDBG_DEBUG(MGEST, "[BEZEL] top_right.width: %d, top_right.height: %d\n", pBezel->top_right.width, pBezel->top_right.height);
- XDBG_DEBUG(MGEST, "[BEZEL] bottom_left.width: %d, bottom_left.height: %d\n", pBezel->bottom_left.width, pBezel->bottom_left.height);
- XDBG_DEBUG(MGEST, "[BEZEL] bottom_right.width: %d, bottom_right.height: %d\n", pBezel->bottom_right.width, pBezel->bottom_right.height);
- XDBG_DEBUG(MGEST, "[BEZEL] flick_distance: %d, bezel_angle_ratio: %d, bezel_angle_moving_check: %d\n", pBezel->flick_distance, pBezel->bezel_angle_ratio, pBezel->bezel_angle_moving_check);
-#endif//__BEZEL_DEBUG__
-#endif
-
pGesture->pinchrotation_time_threshold = xf86SetIntOption(pInfo->options, "PinchRotationTimeThresHold", PINCHROTATION_TIME_THRESHOLD);
pGesture->pinchrotation_dist_threshold = xf86SetRealOption(pInfo->options, "PinchRotationDistThresHold", PINCHROTATION_DIST_THRESHOLD);
pGesture->pinchrotation_angle_threshold = xf86SetRealOption(pInfo->options, "PinchRotationAngleThresHold", PINCHROTATION_ANGLE_THRESHOLD);
pGesture->ehtype = KEEP_EVENTS;
else
pGesture->ehtype = PROPAGATE_EVENTS;
-#ifdef _F_SUPPORT_BEZEL_FLICK_
- if(pBezel->bezel_angle_ratio > 0)
- {
- pBezel->min_rad = (RAD_90DEG / pBezel->bezel_angle_ratio);
- pBezel->max_rad = ((RAD_90DEG / pBezel->bezel_angle_ratio) * (pBezel->bezel_angle_ratio-1));
- pBezel->min_180_rad = (RAD_90DEG + pBezel->min_rad);
- pBezel->max_180_rad = (RAD_90DEG + pBezel->max_rad);
- }
- else
- {
- pBezel->min_rad = MIN_RAD;
- pBezel->max_rad = MAX_RAD;
- pBezel->min_180_rad = RAD_180DEG_MIN;
- pBezel->max_180_rad = RAD_180DEG_MAX;
- }
-#endif
+
pGesture->lastSelectedWin = None;
pGesture->touchkey_id = 0;
pGesture->mtsync_status = MTOUCH_FRAME_SYNC_END;
g_pGesture->palm.palm_single_finger_timer = NULL;
g_pGesture->enqueue_fulled = 0;
g_pGesture->zoom_enabled = 0;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
memset(g_pGesture->palm.qti, 0, sizeof(g_pGesture->palm.qti[MAX_MT_DEVICES+1]));
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ g_pGesture->palm.pti = NULL;
+ g_pGesture->palm.qti = NULL;
+ g_pGesture->palm.finger_rects = NULL;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
g_pGesture->palm_rejection_mode = 0;
g_pGesture->palm_detected = FALSE;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
memset(g_pGesture->stylusInfo.t_status, 0, sizeof(g_pGesture->stylusInfo.t_status[MAX_MT_DEVICES]));
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ g_pGesture->stylusInfo.t_status = NULL;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
g_pGesture->stylusInfo.stylus_id = 0;
g_pGesture->stylusInfo.pen_detected = FALSE;
-
g_pGesture->touch_cancel_status = FALSE;
+ TTRACE_END();
+
return Success;
error:
if (pInfo->fd >= 0)
close(pInfo->fd);
+ TTRACE_END();
return rc;
}
/* free what we have to free */
break;
case DEVICE_READY:
+ xf86Msg(X_INFO, "%s: device ready.\n", pInfo->name);
GestureRegisterDeviceInfo(device);
break;
}
GestureReadInput(InputInfoPtr pInfo)
{
}
-
//#define __DEBUG_EVENT_HANDLER__
//#define __PalmFlick_DEBUG__
//#define __HOLD_DETECTOR_DEBUG__
+//#define __DEBUG_EVENT_MOTION_HANDLER__
#ifdef __PalmFlick_DEBUG__
#define PalmFlickDebugPrint ErrorF
#include "gesture.h"
#include <xorg/mi.h>
-#define LOG_TAG "GESTURE"
+#define LOG_TAG "GESTURE"
#include "dlog.h"
-
-
char *strcasestr(const char *s, const char *find);
extern ScreenPtr miPointerCurrentScreen(void);
static void printk(const char* fmt, ...) __attribute__((format(printf, 1, 0)));
void GestureCbEventsGrabbed(Mask *pGrabMask, GestureGrabEventPtr *pGrabEvent);
void GestureCbEventsSelected(Window win, Mask *pEventMask);
WindowPtr GestureGetEventsWindow(void);
-static int GestureGetFingerIndexFromDevice(DeviceIntPtr device);
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+int GestureGetTouchIndex(int deviceid, int touchid, int evtype);
+int GestureFindTouchIndex(int deviceid, int touchid, int evtype);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+static void GestureAlloc(int capability);
+static void GestureDeAlloc(void);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
//Enqueued event handlers and enabler/disabler
static ErrorStatus GestureEnableEventHandler(InputInfoPtr pInfo);
static ErrorStatus GestureDisableEventHandler(void);
-static CARD32 GestureTimerHandler(OsTimerPtr timer, CARD32 time, pointer arg);
+static void GestureRegisterDeviceInfo(DeviceIntPtr device);
static CARD32 GestureEventTimerHandler(OsTimerPtr timer, CARD32 time, pointer arg);
void GestureHandleMTSyncEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device);
void GestureHandleButtonPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device);
static int GesturePalmGetScreenInfo();
static int GesturePalmGetHorizIndexWithX(int current_x, int idx, int type);
-void GestureGenerateTouchCancelEvent(void);
-
-static void GestureDPMSCallback(CallbackListPtr *pcbl, void *unused, void *calldata);
-
#ifdef HAVE_PROPERTIES
//function related property handling
static void GestureInitProperty(DeviceIntPtr dev);
static Window prop_anr_event_window_xid = None;
#endif
-
GestureDevicePtr g_pGesture = NULL;
_X_EXPORT InputDriverRec GESTURE = {
1,
&GestureUnplug
};
-extern CallbackListPtr DPMSCallback;
-
static void
printk(const char* fmt, ...)
{
pSprite->spriteTraceSize += 10;
pSprite->spriteTrace = realloc(pSprite->spriteTrace,
pSprite->spriteTraceSize*sizeof(WindowPtr));
- if (!pSprite->spriteTrace) {
- return NULL;
- }
}
pSprite->spriteTrace[pSprite->spriteTraceGood++] = pWin;
pWin = pWin->firstChild;
return 0;
}
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+int
+GestureGetTouchIndex(int deviceid, int touchid, int evtype)
+{
+ int idx=0, i=0;
+
+ for (i=0; i<g_pGesture->num_mt_devices; i++)
+ {
+ if (g_pGesture->fingers[i].touchid == touchid)
+ {
+ return i;
+ }
+ }
+ ErrorF("[GestureGetTouchIndex] Failed to get touch index, devid: %d, touchid: %d, evsystem: %d\n", deviceid, touchid, evtype);
+ return -1;
+}
+
+int
+GestureFindTouchIndex(int deviceid, int touchid, int evtype)
+{
+ int idx=-1, i=0;
+
+ for (i=0; i<g_pGesture->num_mt_devices; i++)
+ {
+ if (evtype == ET_TouchBegin)
+ {
+ if (g_pGesture->fingers[i].status == BTN_RELEASED)
+ {
+ g_pGesture->fingers[i].status = BTN_PRESSED;
+ g_pGesture->fingers[i].touchid = touchid;
+ return i;
+ }
+ }
+ else if (evtype == ET_TouchUpdate || evtype == ET_TouchEnd)
+ {
+ if (g_pGesture->fingers[i].touchid == touchid)
+ {
+ g_pGesture->fingers[i].status = (evtype == ET_TouchEnd)?BTN_RELEASED:BTN_MOVING;
+ return i;
+ }
+ }
+ }
+ ErrorF("[GesutreFindTouchIndex] Failed to find touch index, devid: %d, touchid: %d, evtype: %d\n", deviceid, touchid, evtype);
+ return -1;
+}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
void
GestureHandleGesture_Tap(int num_finger, int tap_repeat, int cx, int cy)
void
GestureHandleGesture_Flick(int num_of_fingers, int distance, Time duration, int direction)
{
+ DeviceIntPtr dev;
+ if (!g_pGesture->hwkey_dev)
+ {
+ for (dev = inputInfo.keyboard ; dev; dev = dev->next)
+ {
+ if (g_pGesture->hwkey_name && !strncmp(dev->name, g_pGesture->hwkey_name, strlen(dev->name)))
+ {
+ g_pGesture->hwkey_id = dev->id;
+ g_pGesture->hwkey_dev = dev;
+
+ ErrorF("[GestureTimerHandler] hwkey_name has been found. hwkey_id=%d (hwkey_dev->name:%s)\n", g_pGesture->hwkey_id, g_pGesture->hwkey_dev->name);
+ break;
+ }
+ else if (!strcasestr(dev->name, "keyboard") && strcasestr(dev->name, "key") && !IsXTestDevice(dev, NULL) && !IsMaster(dev))
+ {
+ g_pGesture->hwkey_id = dev->id;
+ g_pGesture->hwkey_dev = dev;
+
+ ErrorF("[GestureTimerHandler] hwkey has been found. hwkey_id=%d (hwkey_dev->name:%s)\n", g_pGesture->hwkey_id, g_pGesture->hwkey_dev->name);
+ break;
+ }
+ }
+
+ if (!g_pGesture->hwkey_id)
+ {
+ g_pGesture->hwkey_id = inputInfo.keyboard->id;
+ g_pGesture->hwkey_dev = inputInfo.keyboard;
+
+ ErrorF("[GestureTimerHandler] No hwkey has been found. Back key will go through VCK. hwkey_id=%d (hwkey_dev->name:%s)\n",
+ g_pGesture->hwkey_id, g_pGesture->hwkey_dev->name);
+ }
+ }
if (num_of_fingers == 0)
{
Window target_win;
switch (type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagTap;
if (g_pGesture->num_pressed < 2)
DetailDebugPrint("[GroupTap][P] num_pressed=%d, area_size=%d, base_mx=%d, base_my=%d\n", num_pressed, base_area_size, g_pGesture->fingers[idx].px, g_pGesture->fingers[idx].py);
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if (!(g_pGesture->fingers[idx].flags & PressFlagTap))
{
break;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if (g_pGesture->num_pressed)
{
DetailDebugPrint("[GroupTap][R] Second finger doesn't come up. g_pGesture->num_pressed=%d\n", g_pGesture->num_pressed);
switch (type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags = PressFlagFlick;
base_time = GetTimeInMillis();
num_pressed = g_pGesture->num_pressed;
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
motion_count++;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
DetailDebugPrint("[GroupFlick][R][F] 16\n");
goto cleanup_flick;
break;
switch (type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->fingers[idx].flags |= PressFlagHold;
if (g_pGesture->num_pressed < 2)
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if (!(g_pGesture->fingers[idx].flags & PressFlagHold))
{
DetailDebugPrint("[GroupHold][M] No PressFlagHold\n");
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
if (state != GestureEnd && num_pressed >= 2)
{
DetailDebugPrint("[GroupHold][R] No num_finger changed ! num_pressed=%d, g_pGesture->num_pressed=%d\n", num_pressed, g_pGesture->num_pressed);
{
// static int num_pressed = 0;
static int base_time = 0, current_time = 0;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
static int base_x[MAX_MT_DEVICES] = {0}, base_y[MAX_MT_DEVICES] = {0};
static int update_x[MAX_MT_DEVICES] = {0}, update_y[MAX_MT_DEVICES] = {0};
-
static int current_x[MAX_MT_DEVICES] = {0}, current_y[MAX_MT_DEVICES] = {0};
static Bool press_status[MAX_MT_DEVICES] = {FALSE, FALSE};
static Bool release_status[MAX_MT_DEVICES] = {FALSE, FALSE};
static Bool is_tmajor_invalid[MAX_MT_DEVICES] = {TRUE, TRUE};
static int mt_sync_count[MAX_MT_DEVICES] = {0};
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ int *base_x = g_pGesture->palmFlickInfo.base_x, *base_y = g_pGesture->palmFlickInfo.base_y;
+ int *update_x = g_pGesture->palmFlickInfo.update_x, *update_y = g_pGesture->palmFlickInfo.update_y;
+
+ int *current_x = g_pGesture->palmFlickInfo.current_x, *current_y = g_pGesture->palmFlickInfo.current_y;
+ Bool *press_status = g_pGesture->palmFlickInfo.press_status;
+ Bool *release_status = g_pGesture->palmFlickInfo.release_status;
+
+ int *line_idx = g_pGesture->palmFlickInfo.line_idx, *prev_line_idx = g_pGesture->palmFlickInfo.prev_line_idx, *press_idx = g_pGesture->palmFlickInfo.press_idx;
+ Bool *is_line_invalid = g_pGesture->palmFlickInfo.is_line_invalid;
+
+ int *max_tmajor = g_pGesture->palmFlickInfo.max_tmajor;
+ static int total_max_tmajor = 0;
+ Bool *is_tmajor_invalid = g_pGesture->palmFlickInfo.is_tmajor_invalid;
+
+ int *mt_sync_count = g_pGesture->palmFlickInfo.mt_sync_count;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
static Bool is_palm = FALSE;
PalmMiscInfoPtr pPalmMisc = &g_pGesture->palm_misc;
switch (type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if (!is_palm)
{
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if (total_max_tmajor > g_pGesture->palm_flick_max_tmajor_threshold)
{
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
current_x[idx] = g_pGesture->fingers[idx].mx;
current_y[idx] = g_pGesture->fingers[idx].my;
release_status[idx] = TRUE;
cleanup_flick:
DetailDebugPrint("[PalmFlick][R] cleanup_flick\n");
-
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for (int i = 0; i < MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for (int i = 0; i < g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
base_x[i] = 0;
base_y[i] = 0;
{
int i;
int ret_idx = -1;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
static int pressed_idx[MAX_MT_DEVICES] = {-1, -1};
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ int *pressed_idx = g_pGesture->palmInfo.pressed_idx;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
PalmMiscInfoPtr pPalmMisc = &g_pGesture->palm_misc;
for (i = 0; i < PALM_HORIZ_ARRAY_COUNT; i++)
index_check:
- if (type == ET_ButtonPress)
+ if (type == GESTURE_TOUCH_PRESS)
{
pressed_idx[idx] = ret_idx;
DetailDebugPrint("[GesturePalmGetHorizIndexWithX][P] pressed_idx=%d\n", pressed_idx[idx]);
}
- else if (type == ET_Motion)
+ else if (type == GESTURE_TOUCH_MOTION)
{
DetailDebugPrint("[GesturePalmGetHorizIndexWithX][M] moving x=%d, idx=%d, pressed_idx=%d\n", current_x, idx, pressed_idx[idx]);
}
- else if (type == ET_ButtonRelease)
+ else if (type == GESTURE_TOUCH_RELEASE)
{
if ((pressed_idx[idx] == 0) && (ret_idx == (PALM_HORIZ_ARRAY_COUNT - 1)))
{
HoldDetectorDebugPrint("[GestureHoldDetector] g_pGesture->num_mt_devices:%d\n", g_pGesture->num_mt_devices);
- for (i = 0; i < g_pGesture->num_mt_devices; i++)
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ for( i = 0 ; i < g_pGesture->num_mt_devices ; i++ )
{
- if ( device->id == g_pGesture->mt_devices[i]->id)
+ if( device->id == g_pGesture->mt_devices[i]->id )
{
idx = i;
- HoldDetectorDebugPrint("[GestureHoldDetector] idx:%d\n", idx);
break;
}
}
- if ((idx < 0) || ((MAX_MT_DEVICES-1) < idx)) return;
+ if( (idx < 0) || ((MAX_MT_DEVICES-1) < idx )) return;
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ idx = GestureGetTouchIndex(device->id, ev->device_event.touchid, type);
+ if( (idx < 0) || ((g_pGesture->num_mt_devices -1) < idx )) return;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
switch (type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
g_pGesture->cts[idx].status = BTN_PRESSED;
g_pGesture->cts[idx].cx = ev->device_event.root_x;
g_pGesture->cts[idx].cy = ev->device_event.root_y;
}
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if (BTN_RELEASED == g_pGesture->cts[idx].status)
return;
}
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
g_pGesture->cts[idx].status = BTN_RELEASED;
g_pGesture->cts[idx].cx = ev->device_event.root_x;
g_pGesture->cts[idx].cy = ev->device_event.root_y;
return 0;
}
-static int
-GestureGetFingerIndexFromDevice(DeviceIntPtr device)
-{
- int i;
-
- for( i = 0 ; i < g_pGesture->num_mt_devices ; i++ )
- {
- if( device->id == g_pGesture->mt_devices[i]->id )
- {
- return i;
- }
- }
-
- return -1;
-}
-
void
GestureRecognize(int type, InternalEvent *ev, DeviceIntPtr device)
{
{
return;
}
-
- idx = GestureGetFingerIndexFromDevice(device);
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ for (i = 0; i < g_pGesture->num_mt_devices; i++)
+ {
+ if (device->id == g_pGesture->mt_devices[i]->id)
+ {
+ idx = i;
+ break;
+ }
+ }
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ idx = GestureGetTouchIndex(device->id, ev->device_event.touchid, type);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (idx < 0)
return;
switch (type)
{
- case ET_ButtonPress:
+ case GESTURE_TOUCH_PRESS:
if (idx == 0)
{
g_pGesture->event_sum[0] = BTN_PRESSED;
}
break;
- case ET_Motion:
+ case GESTURE_TOUCH_MOTION:
if (!g_pGesture->fingers[idx].ptime)
{
break;
- case ET_ButtonRelease:
+ case GESTURE_TOUCH_RELEASE:
g_pGesture->fingers[idx].rtime = ev->any.time;
g_pGesture->fingers[idx].rx = ev->device_event.root_x;
g_pGesture->fingers[idx].ry = ev->device_event.root_y;
switch(ev->any_event.sync)
{
case ROTARY_FRAME_SYNC_BEGIN:
- if (g_pGesture->mt_devices[0] && (g_pGesture->mtsync_flag & MTSYNC_FLAG_TOUCH))
+ if (!g_pGesture->rotary_id) {
+ g_pGesture->rotary_id = device->id;
+ g_pGesture->rotary_dev = device;
+ }
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ if (g_pGesture->mt_devices[0]
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ if (g_pGesture->mt_devices
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ && (g_pGesture->mtsync_flag & MTSYNC_FLAG_TOUCH))
{
int zero = 0;
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
xf86PostButtonEvent(g_pGesture->mt_devices[0], 0, Button1, 0, 0, 2, &zero, &zero);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ xf86PostButtonEvent(g_pGesture->mt_devices, 0, Button1, 0, 0, 2, &zero, &zero);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
}
g_pGesture->mtsync_flag |= MTSYNC_FLAG_ROTARY;
DetailDebugPrint("[GestureHandleMTSyncEvent] Rotary input starts. Now touch events are dropped!\n");
g_pGesture->num_pressed = 0;
g_pGesture->has_hold_grabmask = 0;
g_pGesture->mtsync_total_count = 0;
- memset(&g_pGesture->last_touches, 0, sizeof(g_pGesture->last_touches));
+
for (i=0; i < g_pGesture->num_mt_devices; i++)
{
g_pGesture->fingers[i].ptime = 0;
void
GestureHandleButtonPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:BUTTON_PRESS");
#ifdef __DEBUG_EVENT_HANDLER__
DetailDebugPrint("[GestureHandleButtonPressEvent] devid=%d time:%d cur:%d (%d, %d)\n", device->id, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
#endif//__DEBUG_EVENT_HANDLER__
- int idx=0;
- if (g_pGesture->touch_cancel_status == TRUE)
- {
- DetailDebugPrint("[GestureHandleButtonPressEvent] Ignore Button Press event after touch cancel generated. \n");
- return;
- }
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ int idx = 0;
- idx = GestureGetFingerIndexFromDevice(device);
- if (0 <= idx)
- {
- g_pGesture->last_touches[idx].status = BTN_PRESSED;
- g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
- g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
+ idx = GestureFindTouchIndex(ev->device_event.deviceid, ev->device_event.touchid, ev->device_event.type);
+ if (idx < 0 && ev->device_event.deviceid != g_pGesture->master_pointer->id) {
+ device->public.processInputProc(ev, device);
+ goto out;
}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (g_pGesture->ehtype != KEEP_EVENTS)
{
if (ERROR_INVALPTR == GestureEnqueueEvent(screen_num, ev, device))
{
GestureControl(g_pGesture->this_device, DEVICE_OFF);
- return;
+ goto out;
}
if (g_pGesture->num_mt_devices)
{
- GestureRecognize(ET_ButtonPress, ev, device);
+ GestureRecognize(GESTURE_TOUCH_PRESS, ev, device);
}
else
{
device->public.processInputProc(ev, device);
}
- GestureHoldDetector(ET_ButtonPress, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_PRESS, ev, device);
break;
case PROPAGATE_EVENTS:
DetailDebugPrint("[GestureHandleButtonPressEvent] PROPAGATE_EVENT\n");
device->public.processInputProc(ev, device);
- GestureHoldDetector(ET_ButtonPress, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_PRESS, ev, device);
break;
case IGNORE_EVENTS:
DetailDebugPrint("[GestureHandleButtonPressEvent] IGNORE_EVENTS\n");
- GestureRecognize(ET_ButtonPress, ev, device);
+ GestureRecognize(GESTURE_TOUCH_PRESS, ev, device);
break;
default:
break;
}
+out:
+ TTRACE_END();
+ return;
}
void
GestureHandleMotionEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:MOTION");
#ifdef __DEBUG_EVENT_MOTION_HANDLER__
DetailDebugPrint("[GestureHandleMotionEvent] devid=%d time:%d cur:%d (%d, %d)\n", device->id, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
#endif
- int idx=0;
- if (g_pGesture->touch_cancel_status == TRUE)
- {
- DetailDebugPrint("[GestureHandleButtonPressEvent] Ignore Button Press event after touch cancel generated. \n");
- return;
- }
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ int idx = 0;
- idx = GestureGetFingerIndexFromDevice(device);
- if (0 <= idx)
- {
- g_pGesture->last_touches[idx].status = BTN_MOVING;
- g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
- g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
+ idx = GestureFindTouchIndex(ev->device_event.deviceid, ev->device_event.touchid, ev->device_event.type);
+ if (idx < 0 && ev->device_event.deviceid != g_pGesture->master_pointer->id) {
+ device->public.processInputProc(ev, device);
+ goto out;
}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (g_pGesture->ehtype != KEEP_EVENTS)
{
if (ERROR_INVALPTR == GestureEnqueueEvent(screen_num, ev, device))
{
GestureControl(g_pGesture->this_device, DEVICE_OFF);
- return;
+ goto out;
}
if (g_pGesture->num_mt_devices)
{
- GestureRecognize(ET_Motion, ev, device);
+ GestureRecognize(GESTURE_TOUCH_MOTION, ev, device);
}
else
{
device->public.processInputProc(ev, device);
}
- GestureHoldDetector(ET_Motion, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_MOTION, ev, device);
break;
case PROPAGATE_EVENTS:
device->public.processInputProc(ev, device);
- GestureHoldDetector(ET_Motion, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_MOTION, ev, device);
break;
case IGNORE_EVENTS:
- GestureRecognize(ET_Motion, ev, device);
+ GestureRecognize(GESTURE_TOUCH_MOTION, ev, device);
break;
default:
break;
}
-
+out:
+ TTRACE_END();
+ return;
}
void
GestureHandleButtonReleaseEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:BUTTON_RELEASE");
#ifdef __DEBUG_EVENT_HANDLER__
DetailDebugPrint("[GestureHandleButtonReleaseEvent] devid=%d time:%d cur:%d (%d, %d)\n", device->id, ev->any.time, GetTimeInMillis(), ev->device_event.root_x, ev->device_event.root_y);
#endif
- int idx=0;
- if (g_pGesture->touch_cancel_status == TRUE)
- {
- DetailDebugPrint("[GestureHandleButtonPressEvent] Ignore Button Press event after touch cancel generated. \n");
- return;
- }
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ int idx = 0;
- idx = GestureGetFingerIndexFromDevice(device);
- if (0 <= idx)
- {
- g_pGesture->last_touches[idx].status = BTN_RELEASED;
- g_pGesture->last_touches[idx].cx = ev->device_event.root_x;
- g_pGesture->last_touches[idx].cy = ev->device_event.root_y;
+ idx = GestureFindTouchIndex(ev->device_event.deviceid, ev->device_event.touchid, ev->device_event.type);
+ if (idx < 0 && ev->device_event.deviceid != g_pGesture->master_pointer->id) {
+ device->public.processInputProc(ev, device);
+ goto out;
}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
if (g_pGesture->ehtype != KEEP_EVENTS)
{
switch (g_pGesture->ehtype)
{
case KEEP_EVENTS:
- DetailDebugPrint("[GestureHandleButtonReleaseEvent] KEEP_EVENT\n");
+ DetailDebugPrint("[GestureHandleButtonPressEvent] KEEP_EVENT\n");
if (ERROR_INVALPTR == GestureEnqueueEvent(screen_num, ev, device))
{
GestureControl(g_pGesture->this_device, DEVICE_OFF);
- return;
+ goto out;
}
if (g_pGesture->num_mt_devices)
{
- GestureRecognize(ET_ButtonRelease, ev, device);
+ GestureRecognize(GESTURE_TOUCH_RELEASE, ev, device);
}
else
{
device->public.processInputProc(ev, device);
}
- GestureHoldDetector(ET_ButtonRelease, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_RELEASE, ev, device);
break;
case PROPAGATE_EVENTS:
- DetailDebugPrint("[GestureHandleButtonReleaseEvent] PROPAGATE_EVENTS\n");
+ DetailDebugPrint("[GestureHandleButtonPressEvent] PROPAGATE_EVENTS\n");
#ifdef SUPPORT_ANR_WITH_INPUT_EVENT
- if( IsMaster(device) && ev->any.type == ET_ButtonRelease )
+ if( IsMaster(device) && ev->any.type == GESTURE_TOUCH_RELEASE )
{
if( g_pGesture->anr_window == NULL )
{
}
#endif
device->public.processInputProc(ev, device);
- GestureHoldDetector(ET_ButtonRelease, ev, device);
+ GestureHoldDetector(GESTURE_TOUCH_RELEASE, ev, device);
#if 0
GestureEmulateHWKey(g_pGesture->hwkey_dev, g_pGesture->hwkeycode_flick_down);
GestureEmulateHWKey(g_pGesture->hwkey_dev, g_pGesture->hwkeycode_flick_up);
case IGNORE_EVENTS:
DetailDebugPrint("[GestureHandleButtonReleaseEvent] IGNORE_EVENTS\n");
- GestureRecognize(ET_ButtonRelease, ev, device);
+ GestureRecognize(GESTURE_TOUCH_RELEASE, ev, device);
break;
default:
break;
}
+out:
+ TTRACE_END();
+ return;
}
void
GestureHandleKeyPressEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:KEY_PRESS");
if ((ev->device_event.detail.key == 124) && (g_pGesture->power_pressed != 0))
{
g_pGesture->power_pressed = 2;
DetailDebugPrint("[GestureHandleKeyPressEvent] power key pressed devid: %d, hwkey_id: %d\n", device->id, g_pGesture->hwkey_id);
DetailDebugPrint("[GestureHandleKeyPressEvent] power_pressed: %d\n", g_pGesture->power_pressed);
}
+ TTRACE_END();
device->public.processInputProc(ev, device);
}
void
GestureHandleKeyReleaseEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:KEY_RELEASE");
if ((ev->device_event.detail.key == 124) && (g_pGesture->power_pressed != 0))
{
g_pGesture->power_pressed = 1;
DetailDebugPrint("[GestureHandleKeyReleaseEvent] power key released devid: %d, hwkey_id: %d\n", device->id, g_pGesture->hwkey_id);
DetailDebugPrint("[GestureHandleKeyReleaseEvent] power_pressed: %d\n", g_pGesture->power_pressed);
}
+ TTRACE_END();
device->public.processInputProc(ev, device);
}
Bool res;
GestureDevicePtr pGesture = pInfo->private;
+ TTRACE_BEGIN("XORG:GESTURE:ENABLE_EVENT_HANDLER");
+
res = GestureInstallResourceStateHooks();
if (!res)
{
ErrorF("[GestureEnableEventHandler] Failed on GestureInstallResourceStateHooks() !\n");
+ TTRACE_END();
return ERROR_ABNORMAL;
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
res = GestureSetMaxNumberOfFingers((int)MAX_MT_DEVICES);
-
if (!res)
{
ErrorF("[GestureEnableEventHandler] Failed on GestureSetMaxNumberOfFingers(%d) !\n", (int)MAX_MT_DEVICES);
goto failed;
}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
res = GestureRegisterCallbacks(GestureCbEventsGrabbed, GestureCbEventsSelected);
goto failed;
}
- pGesture->device_setting_timer = TimerSet(pGesture->device_setting_timer, 0, 5000, GestureTimerHandler, pInfo);
-
- if (!pGesture->device_setting_timer)
- {
- ErrorF("[GestureEnableEventHandler] Failed to set time for detecting devices !\n");
- goto failed;
- }
+ GestureRegisterDeviceInfo(pInfo->dev);
+ TTRACE_END();
return ERROR_NONE;
failed:
GestureUninstallResourceStateHooks();
GestureUnsetMaxNumberOfFingers();
+ TTRACE_END();
return ERROR_ABNORMAL;
}
{
ErrorStatus err = ERROR_NONE;
- mieqSetHandler(ET_ButtonPress, NULL);
- mieqSetHandler(ET_ButtonRelease, NULL);
- mieqSetHandler(ET_Motion, NULL);
+ mieqSetHandler(GESTURE_TOUCH_PRESS, NULL);
+ mieqSetHandler(GESTURE_TOUCH_RELEASE, NULL);
+ mieqSetHandler(GESTURE_TOUCH_MOTION, NULL);
mieqSetHandler(ET_KeyPress, NULL);
mieqSetHandler(ET_KeyRelease, NULL);
mieqSetHandler(ET_MTSync, NULL);
return err;
}
-static CARD32
-GestureTimerHandler(OsTimerPtr timer, CARD32 time, pointer arg)
+static void
+GestureRegisterDeviceInfo(DeviceIntPtr device)
{
- InputInfoPtr pInfo = (InputInfoPtr)arg;
- GestureDevicePtr pGesture;
- int idx;
- DeviceIntPtr dev;
-
- if (!pInfo)
- {
- ErrorF("[GestureTimerHandler][%s] pInfo is NULL !\n");
- goto failed;
- }
-
- pGesture = pInfo->private;
-
- idx = 0;
- for (dev = inputInfo.pointer; dev; dev = dev->next)
- {
- if (IsMaster(dev) && IsPointerDevice(dev))
- {
- pGesture->master_pointer = dev;
- ErrorF("[GestureTimerHandler][id:%d] Master Pointer=%s\n", dev->id, pGesture->master_pointer->name);
- continue;
- }
-
- if (IsXTestDevice(dev, NULL) && IsPointerDevice(dev))
- {
- pGesture->xtest_pointer = dev;
- ErrorF("[GestureTimerHandler][id:%d] XTest Pointer=%s\n", dev->id, pGesture->xtest_pointer->name);
- continue;
- }
-
- if (IsPointerDevice(dev))
- {
- if (idx >= MAX_MT_DEVICES)
- {
- ErrorF("[GestureTimerHandler] Number of mt device is over MAX_MT_DEVICES(%d) !\n", MAX_MT_DEVICES);
- continue;
- }
- pGesture->mt_devices[idx] = dev;
- ErrorF("[GestureTimerHandler][id:%d] MT device[%d] name=%s\n", dev->id, idx, pGesture->mt_devices[idx]->name);
- GesturePalmGetAbsAxisInfo(dev);
- idx++;
- }
- }
-
- for (dev = inputInfo.keyboard ; dev; dev = dev->next)
- {
- if (g_pGesture->hwkey_name && !strncmp(dev->name, g_pGesture->hwkey_name, strlen(dev->name)))
- {
- g_pGesture->hwkey_id = dev->id;
- g_pGesture->hwkey_dev = dev;
-
- ErrorF("[GestureTimerHandler] hwkey_name has been found. hwkey_id=%d (hwkey_dev->name:%s)\n", g_pGesture->hwkey_id, g_pGesture->hwkey_dev->name);
- break;
- }
- else if (!strncmp(dev->name, "tizen_rotary", strlen(dev->name)))
- {
- g_pGesture->rotary_id = dev->id;
- g_pGesture->rotary_dev = dev;
-
- ErrorF("[GestureTimerHandler] rotary_name has been found. rotary_id=%d (rotary_dev->name:%s)\n", g_pGesture->rotary_id, g_pGesture->rotary_dev->name);
- break;
- }
- else if (!strcasestr(dev->name, "keyboard") && strcasestr(dev->name, "key") && !IsXTestDevice(dev, NULL) && !IsMaster(dev))
- {
- g_pGesture->hwkey_id = dev->id;
- g_pGesture->hwkey_dev = dev;
-
- ErrorF("[GestureTimerHandler] hwkey has been found. hwkey_id=%d (hwkey_dev->name:%s)\n", g_pGesture->hwkey_id, g_pGesture->hwkey_dev->name);
- break;
- }
- }
-
- if (!g_pGesture->hwkey_id)
- {
- g_pGesture->hwkey_id = inputInfo.keyboard->id;
- g_pGesture->hwkey_dev = inputInfo.keyboard;
-
- ErrorF("[GestureTimerHandler] No hwkey has been found. Back key will go through VCK. hwkey_id=%d (hwkey_dev->name:%s)\n",
- g_pGesture->hwkey_id, g_pGesture->hwkey_dev->name);
- }
-
- if (!pGesture->master_pointer || !pGesture->xtest_pointer)
- {
- ErrorF("[GestureTimerHandler] Failed to get info of master pointer or XTest pointer !\n");
- pGesture->device_setting_timer = TimerSet(pGesture->device_setting_timer, 0, 0, NULL, NULL);
- pGesture->num_mt_devices = 0;
-
- return 0;
- }
-
- TimerCancel(pGesture->device_setting_timer);
- pGesture->device_setting_timer = NULL;
- pGesture->num_mt_devices = idx;
-
- if (!pGesture->num_mt_devices)
- {
- ErrorF("[GestureTimerHandler] Failed to mt device information !\n");
- TimerCancel(pGesture->device_setting_timer);
- pGesture->device_setting_timer = NULL;
- pGesture->num_mt_devices = 0;
- pGesture->first_fingerid = -1;
- return 0;
- }
-
- pGesture->first_fingerid = pGesture->mt_devices[0]->id;
- memset(pGesture->fingers, 0, sizeof(TouchStatus)*pGesture->num_mt_devices);
- pGesture->pRootWin = RootWindow(pGesture->master_pointer);
-
- if (g_pGesture->palm_misc.enabled)
- {
- GesturePalmGetScreenInfo();
- }
+ InputInfoPtr pInfo = device->public.devicePrivate;
+ GestureDevicePtr pGesture = pInfo->private;
+ DeviceIntPtr dev;
+ ScreenPtr pScreen = miPointerCurrentScreen();
+ int width = 0, height = 0;
+ int idx = 0;
+ int i;
+
+ TTRACE_BEGIN("XORG:GESTURE:REGISTER_DEVICE");
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ for (i=0; i<MAX_MT_DEVICES; i++)
+ {
+ pGesture->mt_devices[i] = NULL;
+ }
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ pGesture->mt_devices = NULL;
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
+ for( dev = inputInfo.pointer ; dev; dev = dev->next )
+ {
+ if(IsMaster(dev) && IsPointerDevice(dev))
+ {
+ pGesture->master_pointer = dev;
+ ErrorF("[id:%d] Master Pointer=%s\n", dev->id, pGesture->master_pointer->name);
+ continue;
+ }
+
+ if(IsXTestDevice(dev, NULL) && IsPointerDevice(dev))
+ {
+ pGesture->xtest_pointer = dev;
+ ErrorF("[id:%d] XTest Pointer=%s\n", dev->id, pGesture->xtest_pointer->name);
+ continue;
+ }
+
+ if(IsPointerDevice(dev))
+ {
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ if( idx >= MAX_MT_DEVICES )
+ {
+ ErrorF("Number of mt device is over MAX_MT_DEVICES(%d) !\n", MAX_MT_DEVICES);
+ continue;
+ }
+ if (strcasestr(dev->name, "Touchscreen"))
+ {
+ pGesture->mt_devices[idx] = dev;
+ ErrorF("[id:%d] MT device[%d] name=%s\n", dev->id, idx, pGesture->mt_devices[idx]->name);
+ GesturePalmGetAbsAxisInfo(dev);
+ idx++;
+ }
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ if (strcasestr(dev->name, "Touchscreen"))
+ {
+ pGesture->mt_devices = dev;
+ ErrorF("[id: %d] MT device name=%s\n", dev->id, pGesture->mt_devices->name);
+ TouchClassPtr touchInfo = dev->touch;
+ if (touchInfo)
+ {
+ ErrorF("touchInfo state: %d, num_touches: %d, max_touches: %d\n",
+ touchInfo->state, touchInfo->num_touches, touchInfo->max_touches);
+ idx = touchInfo->max_touches;
+ }
+ else
+ {
+ ErrorF("device(%d) hasn't touch class\n", dev->id);
+ }
+ }
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ }
+ }
+
+ if( !pGesture->master_pointer || !pGesture->xtest_pointer )
+ {
+ ErrorF("Failed to get info of master pointer or XTest pointer !\n");
+ pGesture->num_mt_devices = 0;
+
+ TTRACE_END();
+ return;
+ }
+
+ pGesture->num_mt_devices = idx;
+
+ if( !pGesture->num_mt_devices )
+ {
+ ErrorF("Failed to mt device information !\n");
+ pGesture->num_mt_devices = 0;
+ pGesture->first_fingerid = -1;
+
+ TTRACE_END();
+ return;
+ }
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ pGesture->first_fingerid = pGesture->mt_devices[0]->id;
+ memset(pGesture->fingers, 0, sizeof(TouchStatus)*pGesture->num_mt_devices);
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ GestureAlloc(pGesture->num_mt_devices);
+ pGesture->first_fingerid = pGesture->mt_devices->id;
+ GesturePalmGetAbsAxisInfo(dev);
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+ Bool res = GestureSetMaxNumberOfFingers(g_pGesture->num_mt_devices);
+
+ if( !res )
+ {
+ ErrorF("Failed on GestureSetMaxNumberOfFingers(%d) !\n", g_pGesture->num_mt_devices);
+ goto failed;
+ }
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
+ pGesture->pRootWin = RootWindow(pGesture->master_pointer);
+
+ if(g_pGesture->palm_misc.enabled)
+ GesturePalmGetScreenInfo();
+
+ g_pGesture->pTempWin = NULL;
+ g_pGesture->inc_num_pressed = 0;
+
+ if( ERROR_NONE != GestureRegionsInit() || ERROR_NONE != GestureInitEQ() )
+ {
+ goto failed;
+ }
+
+ mieqSetHandler(ET_KeyPress, GestureHandleKeyPressEvent);
+ mieqSetHandler(ET_KeyRelease, GestureHandleKeyReleaseEvent);
+ mieqSetHandler(GESTURE_TOUCH_PRESS, GestureHandleButtonPressEvent);
+ mieqSetHandler(GESTURE_TOUCH_RELEASE, GestureHandleButtonReleaseEvent);
+ mieqSetHandler(GESTURE_TOUCH_MOTION, GestureHandleMotionEvent);
+ mieqSetHandler(ET_MTSync, GestureHandleMTSyncEvent);
+
+ TTRACE_END();
+ return;
- g_pGesture->pTempWin = NULL;
- g_pGesture->inc_num_pressed = 0;
-
- if (ERROR_NONE != GestureRegionsInit() || ERROR_NONE != GestureInitEQ())
- {
- goto failed;
- }
-
- mieqSetHandler(ET_ButtonPress, GestureHandleButtonPressEvent);
- mieqSetHandler(ET_ButtonRelease, GestureHandleButtonReleaseEvent);
- mieqSetHandler(ET_Motion, GestureHandleMotionEvent);
- mieqSetHandler(ET_KeyPress, GestureHandleKeyPressEvent);
- mieqSetHandler(ET_KeyRelease, GestureHandleKeyReleaseEvent);
+failed:
+ GestureUninstallResourceStateHooks();
+ GestureUnsetMaxNumberOfFingers();
+ TTRACE_END();
+}
- //if ( pGesture->is_active)
- mieqSetHandler(ET_MTSync, GestureHandleMTSyncEvent);
+#ifndef _SUPPORT_EVDEVMULTITOUCH_DRV_
+static void
+GestureAlloc(int capability)
+{
+ if (!g_pGesture)
+ {
+ ErrorF("[GestureAlloc] Failed to allocate a gesture drv's structures\n");
+ return;
+ }
+
+ g_pGesture->cts = (CurTouchStatus *)calloc(capability, sizeof(CurTouchStatus));
+ g_pGesture->finger_rects = (pixman_region16_t *)calloc(capability, sizeof(pixman_region16_t));
+ g_pGesture->fingers = (TouchStatus *)calloc(capability, sizeof(TouchStatus));
+ g_pGesture->event_sum= (int *)calloc(capability, sizeof(int));
+ g_pGesture->max_mt_tmajor = (int *)calloc(capability, sizeof(int));
+
+ /* g_pGesture->palmFlickInfo */
+ {
+ g_pGesture->palmFlickInfo.base_x = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.base_y = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.update_x = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.update_y = (int *)calloc(capability, sizeof(int));
+
+ g_pGesture->palmFlickInfo.current_x = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.current_y = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.press_status = (Bool *)calloc(capability, sizeof(Bool));
+ g_pGesture->palmFlickInfo.release_status = (Bool *)calloc(capability, sizeof(Bool));
+
+ g_pGesture->palmFlickInfo.line_idx = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.prev_line_idx = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.press_idx = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.is_line_invalid = (Bool *)calloc(capability, sizeof(Bool));
+
+ g_pGesture->palmFlickInfo.max_tmajor = (int *)calloc(capability, sizeof(int));
+ g_pGesture->palmFlickInfo.is_tmajor_invalid = (Bool *)calloc(capability, sizeof(Bool));
+ g_pGesture->palmFlickInfo.mt_sync_count = (int *)calloc(capability, sizeof(int));
+ }
+ /* g_pGesture->palmInfo */
+ {
+ g_pGesture->palmInfo.pressed_idx = (int *)calloc(capability, sizeof(int));
+ }
+}
- return 0;
+#define GFree(x) \
+ if(x) { \
+ free(x); \
+ x=NULL; \
+ } \
-failed:
- GestureUninstallResourceStateHooks();
- GestureUnsetMaxNumberOfFingers();
-
- return 0;
+static void
+GestureDealloc()
+{
+ if (!g_pGesture)
+ {
+ ErrorF("[GestureDealloc] Failed to free a gesture drv's structures\n");
+ return;
+ }
+
+ GFree(g_pGesture->cts)
+ GFree(g_pGesture->finger_rects)
+ GFree(g_pGesture->fingers)
+ GFree(g_pGesture->event_sum)
+ GFree(g_pGesture->max_mt_tmajor)
+
+ /* g_pGesture->palmFlickInfo */
+ {
+ GFree(g_pGesture->palmFlickInfo.base_x)
+ GFree(g_pGesture->palmFlickInfo.base_y)
+ GFree(g_pGesture->palmFlickInfo.update_x)
+ GFree(g_pGesture->palmFlickInfo.update_y)
+
+ GFree(g_pGesture->palmFlickInfo.current_x)
+ GFree(g_pGesture->palmFlickInfo.current_y)
+ GFree(g_pGesture->palmFlickInfo.press_status)
+ GFree(g_pGesture->palmFlickInfo.release_status)
+
+ GFree(g_pGesture->palmFlickInfo.line_idx)
+ GFree(g_pGesture->palmFlickInfo.prev_line_idx)
+ GFree(g_pGesture->palmFlickInfo.press_idx)
+ GFree(g_pGesture->palmFlickInfo.is_line_invalid)
+
+ GFree(g_pGesture->palmFlickInfo.max_tmajor)
+ GFree(g_pGesture->palmFlickInfo.is_tmajor_invalid)
+ GFree(g_pGesture->palmFlickInfo.mt_sync_count)
+ }
+ /* g_pGesture->palmInfo */
+ {
+ GFree(g_pGesture->palmInfo.pressed_idx)
+ }
}
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
+
BOOL
IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master)
}
void
-GestureGenerateTouchCancelEvent(void)
-{
- int i;
- Bool canceled_touch_index[MAX_MT_DEVICES] = {FALSE, };
-
- if (g_pGesture->mtsync_flag & MTSYNC_FLAG_TOUCH)
- {
- ErrorF("no Touch(%d)\n", g_pGesture->mtsync_flag);
- return;
- }
-
- for (i=0; i<MAX_MT_DEVICES; i++)
- {
- if (!(g_pGesture->mt_devices[i]->button->buttonsDown)) continue;
- InternalEvent cancel_event;
-
- cancel_event.touch_cancel_event.header = ET_Internal;
- cancel_event.touch_cancel_event.type = ET_TouchCancel;
- cancel_event.touch_cancel_event.length = sizeof(TouchCancelEvent);
- cancel_event.touch_cancel_event.time = CurrentTime;
- cancel_event.touch_cancel_event.deviceid = g_pGesture->mt_devices[i]?g_pGesture->mt_devices[i]->id:0;
-
- cancel_event.touch_cancel_event.sourceid = g_pGesture->mt_devices[i]?g_pGesture->mt_devices[i]->id:0;
- cancel_event.touch_cancel_event.resource = 0;
- cancel_event.touch_cancel_event.flags = 0;
-
- g_pGesture->mt_devices[i]->public.processInputProc(&cancel_event, g_pGesture->mt_devices[i]);
- canceled_touch_index[i] = TRUE;
- g_pGesture->touch_cancel_status = TRUE;
- }
-
- for (i=0; i<MAX_MT_DEVICES; i++)
- {
- if (canceled_touch_index[i] == FALSE) continue;
- InternalEvent release_event;
- InternalEvent release_event_master;
-
- memset(&release_event, 0, sizeof(InternalEvent));
-
- release_event.device_event.header = ET_Internal;
- release_event.device_event.type = ET_ButtonRelease;
- release_event.device_event.length = sizeof(DeviceEvent);
- release_event.device_event.time = CurrentTime;
- release_event.device_event.deviceid = g_pGesture->mt_devices[i]->id;
- release_event.device_event.sourceid = g_pGesture->mt_devices[i]->button->sourceid;
- release_event.device_event.detail.button = 1;
- release_event.device_event.root_x = g_pGesture->last_touches[i].cx;
- release_event.device_event.root_y = g_pGesture->last_touches[i].cy;
- if (g_pGesture->mt_devices[i]->id == g_pGesture->first_fingerid)
- {
- memcpy(&release_event_master, &release_event, sizeof(InternalEvent));
- release_event_master.device_event.deviceid = g_pGesture->master_pointer->id;
- }
-
- g_pGesture->mt_devices[i]->public.processInputProc(&release_event, g_pGesture->mt_devices[i]);
- if (g_pGesture->mt_devices[i]->id == g_pGesture->first_fingerid)
- {
- g_pGesture->master_pointer->public.processInputProc(&release_event_master, g_pGesture->master_pointer);
- }
- g_pGesture->touch_cancel_status = TRUE;
- }
-}
-
-static void
-GestureDPMSCallback(CallbackListPtr *pcbl, void *unused, void *calldata)
-{
- int dpmsLevel = *(int *)calldata;
-
- if ((DPMSModeOff == dpmsLevel) && (MTSYNC_FLAG_TOUCH & g_pGesture->mtsync_flag)) {
- ErrorF("TouchCancel dpmslevel: %d, g_pGesture->mtsync_flag: %d\n", dpmsLevel, g_pGesture->mtsync_flag);
- GestureGenerateTouchCancelEvent();
- }
-}
-
-void
GestureEnable(int enable, Bool prop, DeviceIntPtr dev)
{
if ((!enable) && (g_pGesture->is_active))
}
pixman_region_init(&g_pGesture->area);
-
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for (i = 0; i < MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for (i = 0; i < g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
pixman_region_init_rect(&g_pGesture->finger_rects[i], 0, 0, FINGER_WIDTH_2T, FINGER_HEIGHT_2T);
}
switch (ev->any.type)
{
- case ET_ButtonPress:
- DetailDebugPrint("[GestureEnqueueEvent] ET_ButtonPress (id:%d)\n", device->id);
+ case GESTURE_TOUCH_PRESS:
+ DetailDebugPrint("[GestureEnqueueEvent] Press (id:%d)\n", device->id);
break;
- case ET_ButtonRelease:
- DetailDebugPrint("[GestureEnqueueEvent] ET_ButtonRelease (id:%d)\n", device->id);
+ case GESTURE_TOUCH_RELEASE:
+ DetailDebugPrint("[GestureEnqueueEvent] Releae (id:%d)\n", device->id);
break;
- case ET_Motion:
- DetailDebugPrint("[GestureEnqueueEvent] ET_Motion (id:%d)\n", device->id);
+ case GESTURE_TOUCH_MOTION:
+ DetailDebugPrint("[GestureEnqueueEvent] Motion (id:%d)\n", device->id);
break;
}
int i;
DeviceIntPtr device;
+ TTRACE_BEGIN("XORG:GESTURE:FLUSH_EVENT");
+
if (!g_pGesture->EQ)
{
ErrorF("[GestureEventsFlush] Invalid pointer access !\n");
+ TTRACE_END();
return ERROR_INVALPTR;
}
device->public.processInputProc(g_pGesture->EQ[i].event, device);
}
+#ifdef _SUPPORT_EVDEVMULTITOUCH_DRV_
for (i = 0; i < MAX_MT_DEVICES; i++)
+#else //_SUPPORT_EVDEVMULTITOUCH_DRV_
+ for (i = 0; i < g_pGesture->num_mt_devices; i++)
+#endif //_SUPPORT_EVDEVMULTITOUCH_DRV_
{
g_pGesture->event_sum[i] = 0;
}
g_pGesture->headEQ = g_pGesture->tailEQ = 0;//Free EQ
+ TTRACE_END();
return ERROR_NONE;
}
static int
GestureInit(DeviceIntPtr device)
{
+ TTRACE_BEGIN("XORG:GESTURE:INIT");
#ifdef HAVE_PROPERTIES
GestureInitProperty(device);
XIRegisterPropertyHandler(device, GestureSetProperty, NULL, NULL);
#endif
//GestureEnable(1, FALSE, g_pGesture->this_device);
+ TTRACE_END();
return Success;
}
int rc = BadAlloc;
GestureDevicePtr pGesture;
+ TTRACE_BEGIN("XORG:GESTURE:PREINIT");
+
pGesture = calloc(1, sizeof(GestureDeviceRec));
if (!pGesture)
pGesture->activate_flick_up = xf86SetIntOption(pInfo->options, "ActivateFlickUp", 0);
pGesture->activate_flick_right = xf86SetIntOption(pInfo->options, "ActivateFlickRight", 0);
pGesture->factory_cmdname = xf86SetStrOption(pInfo->options, "FactoryCmdName", NULL);
+ pGesture->rotary_id = 0;
+ pGesture->rotary_dev = NULL;
ErrorF("[X11][%s] ###############################################################\n", __FUNCTION__);
ErrorF("[X11][%s] screen_width=%d, screen_height=%d\n", __FUNCTION__,
pInfo->fd = -1;
- g_pGesture->touch_cancel_status = FALSE;
-
+ TTRACE_END();
return Success;
error:
if (pInfo->fd >= 0)
close(pInfo->fd);
+ TTRACE_END();
return rc;
}
pGesture->num_mt_devices = 0;
if (ERROR_ABNORMAL == GestureEnableEventHandler(pInfo))
goto device_off;
- if (!AddCallback(&DPMSCallback, GestureDPMSCallback, NULL))
- ErrorF("[Gesture]Failed to Add DPMS CallBack\n");
break;
case DEVICE_OFF:
device_off:
GestureDisableEventHandler();
- DeleteCallback(&DPMSCallback, GestureDPMSCallback, NULL);
GestureFini(device);
pGesture->this_device = NULL;
xf86Msg(X_INFO, "%s: Off.\n", pInfo->name);
case DEVICE_CLOSE:
/* free what we have to free */
break;
+ case DEVICE_READY:
+ xf86Msg(X_INFO, "%s: device ready.\n", pInfo->name);
+ GestureRegisterDeviceInfo(device);
+ break;
}
return Success;
}
projects / adaptation / xorg / driver / xserver-xorg-input-gesture.git / commitdiff