Date:2011-06-19 12:29:22 (12 years 9 months ago)
Author:David Kühling
Commit:026792a07506d890bc99a392cc9e11095c8eaf0d
Message:liballegro: change the keybord driver fix to tread RCONTROL as before (as CTRL)

Files: liballegro/patches/060-fix-keyboard-drv.patch (2 diffs)

Change Details

liballegro/patches/060-fix-keyboard-drv.patch
11Index: allegro-4.4.2/src/linux/lkeybd.c
22===================================================================
3+++ allegro-4.4.2/src/linux/lkeybd.c 2011-06-16 20:27:40.000000000 +0200
3--- allegro-4.4.2.orig/src/linux/lkeybd.c 2011-06-19 11:32:20.000000000 +0200
44@@ -143,7 +143,10 @@
55 /* convert Allegro format scancodes into key_shifts flag bits */
66 static unsigned short modifier_table[__allegro_KEY_MAX - __allegro_KEY_MODIFIERS] =
...... 
1414    __allegro_KB_CTRL_FLAG, __allegro_KB_ALT_FLAG, __allegro_KB_ALT_FLAG,
1515    __allegro_KB_LWIN_FLAG, __allegro_KB_RWIN_FLAG, __allegro_KB_MENU_FLAG,
1616    __allegro_KB_SCROLOCK_FLAG, __allegro_KB_NUMLOCK_FLAG, __allegro_KB_CAPSLOCK_FLAG
17@@ -204,9 +207,13 @@
17@@ -204,7 +207,10 @@
1818                 map = 0;
1919                 if (key[__allegro_KEY_LSHIFT] || key[__allegro_KEY_RSHIFT]) map |= 1;
2020                 if (key[__allegro_KEY_ALTGR]) map |= 2;
2121- if (key[__allegro_KEY_LCONTROL] || key[__allegro_KEY_RCONTROL]) map |= 4;
22+ /* if (key[__allegro_KEY_LCONTROL] || key[__allegro_KEY_RCONTROL]) map |= 4; */
22+
23+ /* fixes for nanonote's keyboard: LCONTROL is 'Fn' modifier */
24+ if (key[__allegro_KEY_LCONTROL]) map |= (1<<6);
25+ if (key[__allegro_KEY_RCONTROL]) map |= 4;
2326                 if (key[__allegro_KEY_ALT]) map |= 8;
2427
25+ /* fixes for nanonote's keyboard */
26+ if (key[__allegro_KEY_LCONTROL]) map |= (1<<6);
27+ if (key[__allegro_KEY_RCONTROL]) map |= (1<<7);
28+
2928                 /* Map scancode to type and value */
30                 kbe.kb_table = map;
31                 kbe.kb_index = code;

Archive Download the corresponding diff file



interactive