Attachment 297833 Details for Bug 435763 – Track based on scancode instead of keycode

[patch] Track based on scancode instead of keycode

gtk-vnc-0.3.2-keystate-tracking-scancode.patch (text/plain), 2.19 KB, created by Daniel Berrangé on 2008-03-12 19:35:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2008-03-12 19:35:14 UTC

Size: 2.19 KB

patch

obsolete

>diff -rup gtk-vnc-0.3.2.orig/src/vncdisplay.c gtk-vnc-0.3.2.new/src/vncdisplay.c
>--- gtk-vnc-0.3.2.orig/src/vncdisplay.c	2008-03-12 14:50:13.000000000 -0400
>+++ gtk-vnc-0.3.2.new/src/vncdisplay.c	2008-03-12 15:20:01.000000000 -0400
>@@ -44,6 +44,7 @@ struct _VncDisplayPrivate
> 	gboolean in_keyboard_grab;
> 
> 	guint down_keyval[16];
>+	guint down_scancode[16];
> 
> 	int button_mask;
> 	int last_x;
>@@ -412,12 +413,13 @@ static gboolean key_event(GtkWidget *wid
> 	if (key->type == GDK_KEY_PRESS) {
> 		int i;
> 		for (i = 0 ; i < (int)(sizeof(priv->down_keyval)/sizeof(priv->down_keyval[0])) ; i++) {
>-			if (priv->down_keyval[i] == 0) {
>+			if (priv->down_scancode[i] == 0) {
> 				priv->down_keyval[i] = keyval;
>+				priv->down_scancode[i] = key->hardware_keycode;
> 				/* Send the actual key event we're dealing with */
> 				gvnc_key_event(priv->gvnc, 1, keyval);
> 				break;
>-			} else if (priv->down_keyval[i] == keyval) {
>+			} else if (priv->down_scancode[i] == key->hardware_keycode) {
> 				/* Got an press when we're already pressed ! Why ... ?
> 				 *
> 				 * Well, GTK merges sequential press+release pairs of the same
>@@ -430,14 +432,16 @@ static gboolean key_event(GtkWidget *wid
> 				gvnc_key_event(priv->gvnc, 0, keyval);
> 				/* Now send our actual ldown event */
> 				gvnc_key_event(priv->gvnc, 1, keyval);
>+				break;
> 			}
> 		}
> 	} else {
> 		int i;
> 		for (i = 0 ; i < (int)(sizeof(priv->down_keyval)/sizeof(priv->down_keyval[0])) ; i++) {
> 			/* We were pressed, and now we're released, so... */
>-			if (priv->down_keyval[i] == keyval) {
>+			if (priv->down_scancode[i] == key->hardware_keycode) {
> 				priv->down_keyval[i] = 0;
>+				priv->down_scancode[i] = 0;
> 				/* ..send the key releae event we're dealing with */
> 				gvnc_key_event(priv->gvnc, 0, keyval);
> 				break;
>@@ -503,10 +507,11 @@ static gboolean focus_event(GtkWidget *w
> 
> 	for (i = 0 ; i < (int)(sizeof(priv->down_keyval)/sizeof(priv->down_keyval[0])) ; i++) {
> 		/* We are currently pressed so... */
>-		if (priv->down_keyval[i] != 0) {
>+		if (priv->down_scancode[i] != 0) {
> 			/* ..send the fake key releae event to match */
> 			gvnc_key_event(priv->gvnc, 0, priv->down_keyval[i]);
> 			priv->down_keyval[i] = 0;
>+			priv->down_scancode[i] = 0;
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 435763: 297833