pxcloud/spice-gtk
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk synced 2026-02-05 14:22:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reset grab-sequence on match

Browse Source 
This avoids triggering the grab event on consecutive
matches, such as ctrl+alt (match) then ctrl+alt+foo
(match again) that would prevent the longer combination
from being sent.
This commit is contained in:
Marc-André Lureau 2012-05-18 15:27:03 +02:00
parent a187824159
commit 4e419a1223
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/spice-widget.c
View File

@ -941,11 +941,7 @@ static gboolean check_for_grab_key(SpiceDisplay *display, int type, int keyval)
if (!d->grabseq->nkeysyms)
return FALSE;
if (type == GDK_KEY_RELEASE) {
/* Any key release resets the whole grab sequence */
memset(d->activeseq, 0, sizeof(gboolean) * d->grabseq->nkeysyms);
return FALSE;
} else {
if (type == GDK_KEY_PRESS) {
/* Record the new key press */
for (i = 0 ; i < d->grabseq->nkeysyms ; i++)
if (d->grabseq->keysyms[i] == keyval)
@ -956,8 +952,17 @@ static gboolean check_for_grab_key(SpiceDisplay *display, int type, int keyval)
if (d->activeseq[i] == FALSE)
return FALSE;
/* resets the whole grab sequence on success */
memset(d->activeseq, 0, sizeof(gboolean) * d->grabseq->nkeysyms);
return TRUE;
}
} else if (type == GDK_KEY_RELEASE) {
/* Any key release resets the whole grab sequence */
memset(d->activeseq, 0, sizeof(gboolean) * d->grabseq->nkeysyms);
return FALSE;
} else
g_warn_if_reached();
return FALSE;
}
static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
@ -999,6 +1004,7 @@ static gboolean key_event(GtkWidget *widget, GdkEventKey *key)
send_key(display, scancode, 0);
break;
default:
g_warn_if_reached();
break;
}