s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '33-multi-touch-typing-not-yet-working' into 'master'

Browse Source 
Resolve "Multi-touch typing not-yet working"

Closes #33

See merge request Librem5/squeekboard!135
This commit is contained in:
Dorota Czaplejewicz
2019-09-10 09:15:50 +00:00
parent db8340181f b9ab4288d7
commit 04a47ad0af
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
eek/eek-gtk-keyboard.c
View File

@ -81,7 +81,8 @@ eek_gtk_keyboard_real_realize (GtkWidget *self)
GDK_KEY_RELEASE_MASK | GDK_KEY_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_MOTION_MASK); GDK_BUTTON_MOTION_MASK |
GDK_TOUCH_MASK);
GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self); GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->realize (self);
} }
@ -274,27 +275,27 @@ handle_touch_event (GtkWidget *widget,
EekGtkKeyboard *self = EEK_GTK_KEYBOARD (widget); EekGtkKeyboard *self = EEK_GTK_KEYBOARD (widget);
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
/* For each new touch, release the previous one and record the new event
sequence. */
if (event->type == GDK_TOUCH_BEGIN) { if (event->type == GDK_TOUCH_BEGIN) {
if (priv->sequence) { release(self, event->time);
// Ignore second and following touch points
return FALSE;
}
priv->sequence = event->sequence; priv->sequence = event->sequence;
depress(self, event->x, event->y, event->time); depress(self, event->x, event->y, event->time);
return TRUE; return TRUE;
} }
if (priv->sequence != event->sequence) { /* Only allow the latest touch point to be dragged. */
return FALSE; if (event->type == GDK_TOUCH_UPDATE && event->sequence == priv->sequence) {
}
if (event->type == GDK_TOUCH_UPDATE) {
drag(self, event->x, event->y, event->time); drag(self, event->x, event->y, event->time);
} }
if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) { else if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
// TODO: can the event have different coords than the previous update event? // TODO: can the event have different coords than the previous update event?
release(self, event->time); /* Only respond to the release of the latest touch point. Previous
priv->sequence = NULL; touches have already been released. */
if (event->sequence == priv->sequence) {
release(self, event->time);
priv->sequence = NULL;
}
} }
return TRUE; return TRUE;
} }