isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

* clutter/fruity/clutter-fruity.c: made the multi touch code more

Browse Source 
robust. There are situations though where the device seems to stop
generating any touch events until all fingers have been lifted and
a new interaction session is started.
This commit is contained in:
Øyvind Kolås 2008-07-02 13:44:53 +00:00
parent 1001d1ffa1
commit 5829aa8210
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-07-02 Øyvind Kolås <pippin@o-hand.com>
* clutter/fruity/clutter-fruity.c: made the multi touch code more
robust. There are situations though where the device seems to stop
generating any touch events until all fingers have been lifted and
a new interaction session is started.
2008-07-02 Neil Roberts <neil@o-hand.com> 2008-07-02 Neil Roberts <neil@o-hand.com>
* clutter/eglx/clutter-stage-egl.c (clutter_stage_egl_realize): * clutter/eglx/clutter-stage-egl.c (clutter_stage_egl_realize):

31
clutter/fruity/clutter-fruity.c
View File

@ -79,10 +79,16 @@ typedef struct {
bool mapped[MAX_FINGERS] = {false, false, false, false, false}; /* an event has been mapped to this device */ bool mapped[MAX_FINGERS] = {false, false, false, false, false}; /* an event has been mapped to this device */
int evs[MAX_FINGERS] = {0,0,0,0,0}; int evs[MAX_FINGERS] = {0,0,0,0,0};
for (i = 0; i < event->fingerCount; i++) /* using numPoints (with the points[i].status check) seems to
* be no different from using numFingers :/ */
for (i = 0; i < event->numPoints; i++)
{ {
bool found = false; bool found = false;
if (event->points[i].status != 3) /* skip if finger not down */
continue;
/* NSLog(@"IncomingEvent: %d, pos: %f, %f", i, event->points[i].x, event->points[i].y);*/ /* NSLog(@"IncomingEvent: %d, pos: %f, %f", i, event->points[i].x, event->points[i].y);*/
/* check if this finger maps to one of the existing devices */ /* check if this finger maps to one of the existing devices */
@ -98,13 +104,14 @@ typedef struct {
if (!dev->is_down) if (!dev->is_down)
continue; /* device isn't down we cannot really match against it */ continue; /* device isn't down we cannot really match against it */
int dist = ABS(event->points[i].x - dev->x) + int dist = (event->points[i].x - dev->x) * (event->points[i].x - dev->x) +
ABS(event->points[i].y - dev->y); (event->points[i].y - dev->y) * (event->points[i].y - dev->y);
if (dist < 20) if (dist < 20 * 20)
{ {
found = true; found = true;
mapped[j] = true; mapped[j] = true;
/* only generate motion events if we've changed position */
if (dist >= 1) if (dist >= 1)
{ {
dev->x = event->points[i].x; dev->x = event->points[i].x;
@ -130,6 +137,7 @@ typedef struct {
dev->x = event->points[i].x; dev->x = event->points[i].x;
dev->y = event->points[i].y; dev->y = event->points[i].y;
g_assert (dev->is_down == FALSE);
dev->is_down = TRUE; dev->is_down = TRUE;
mapped[j] = true; mapped[j] = true;
@ -213,7 +221,7 @@ typedef struct {
} }
} }
#if 0 // old stylie #if 0 // old style
- (void) mouseDown:(GSEvent*)event - (void) mouseDown:(GSEvent*)event
{ {
CGPoint location= GSEventGetLocationInWindow(event); CGPoint location= GSEventGetLocationInWindow(event);
@ -274,13 +282,14 @@ typedef struct {
/* New... */ /* New... */
#if 0
- (void)gestureChanged:(GSEvent*)event { - (void)gestureChanged:(GSEvent*)event {
/*NSLog(@"gestureChanged:");*/ NSLog(@"gestureChanged:");
[self doEvent: event]; [self doEvent: event];
} }
- (void)gestureEnded:(GSEvent*)event { - (void)gestureEnded:(GSEvent*)event {
/*NSLog(@"gestureEnded:");*/ NSLog(@"gestureEnded:");
[self doEvent: event]; [self doEvent: event];
} }
@ -288,6 +297,7 @@ typedef struct {
/*NSLog(@"gestureStarted:");*/ /*NSLog(@"gestureStarted:");*/
[self doEvent: event]; [self doEvent: event];
} }
#endif
- (void)mouseDown:(GSEvent*)event { - (void)mouseDown:(GSEvent*)event {
/*NSLog(@"mouseDown:");*/ /*NSLog(@"mouseDown:");*/
@ -407,6 +417,13 @@ typedef struct {
g_main_context_iteration (NULL, FALSE); g_main_context_iteration (NULL, FALSE);
} }
- (id)initWithFrame:(struct CGRect)frame {
[super initWithFrame: frame];
[super setTapDelegate: self];
[super setGestureDelegate: self];
return self;
}
@end @end
void clutter_fruity_main (void) void clutter_fruity_main (void)