From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LfgdU-00088Y-Us for qemu-devel@nongnu.org; Fri, 06 Mar 2009 15:27:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LfgdU-00087v-5L for qemu-devel@nongnu.org; Fri, 06 Mar 2009 15:27:12 -0500 Received: from [199.232.76.173] (port=46333 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LfgdT-00087l-Id for qemu-devel@nongnu.org; Fri, 06 Mar 2009 15:27:11 -0500 Received: from savannah.gnu.org ([199.232.41.3]:42062 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LfgdT-0000R5-7n for qemu-devel@nongnu.org; Fri, 06 Mar 2009 15:27:11 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LfgdS-0000d5-PR for qemu-devel@nongnu.org; Fri, 06 Mar 2009 20:27:10 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LfgdS-0000d1-Gd for qemu-devel@nongnu.org; Fri, 06 Mar 2009 20:27:10 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Fri, 06 Mar 2009 20:27:10 +0000 Subject: [Qemu-devel] [6721] Refactor keymap code to avoid duplication ("Daniel P. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6721 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6721 Author: aliguori Date: 2009-03-06 20:27:10 +0000 (Fri, 06 Mar 2009) Log Message: ----------- Refactor keymap code to avoid duplication ("Daniel P. Berrange") Each of the graphical frontends #include a .c file, for keymap code resulting in duplicated definitions & duplicated compiled code. A couple of small changes allowed this to be sanitized, so instead of doing a #include "keymaps.c", duplicating all code, we can have a shared keymaps.h file, and only compile code once. This allows the next patch to move the VncState struct out into a header file without causing clashing definitions. Makefile | 9 +++++--- b/keymaps.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ curses.c | 3 -- curses_keys.h | 9 +++----- keymaps.c | 45 ++++++++++++++++--------------------------- sdl.c | 3 -- sdl_keysym.h | 7 ++---- vnc.c | 5 +--- vnc_keysym.h | 7 ++---- 9 files changed, 97 insertions(+), 51 deletions(-) Signed-off-by: Daniel P. Berrange Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/Makefile trunk/curses.c trunk/curses_keys.h trunk/keymaps.c trunk/sdl.c trunk/sdl_keysym.h trunk/vnc.c trunk/vnc_keysym.h Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/Makefile 2009-03-06 20:27:10 UTC (rev 6721) @@ -137,6 +137,7 @@ AUDIO_OBJS+= wavcapture.o OBJS+=$(addprefix audio/, $(AUDIO_OBJS)) +OBJS+=keymaps.o ifdef CONFIG_SDL OBJS+=sdl.o x_keymap.o endif @@ -161,15 +162,17 @@ cocoa.o: cocoa.m -sdl.o: sdl.c keymaps.c sdl_keysym.h +keymaps.o: keymaps.c keymaps.h +sdl.o: sdl.c keymaps.h sdl_keysym.h + sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) -vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h +vnc.o: vnc.c keymaps.h sdl_keysym.h vnchextile.h d3des.c d3des.h vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -curses.o: curses.c keymaps.c curses_keys.h +curses.o: curses.c keymaps.h curses_keys.h bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS) Modified: trunk/curses.c =================================================================== --- trunk/curses.c 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/curses.c 2009-03-06 20:27:10 UTC (rev 6721) @@ -158,7 +158,6 @@ /* generic keyboard conversion */ #include "curses_keys.h" -#include "keymaps.c" static kbd_layout_t *kbd_layout = 0; static int keycode2keysym[CURSES_KEYS]; @@ -311,7 +310,7 @@ keyboard_layout = "en-us"; #endif if(keyboard_layout) { - kbd_layout = init_keyboard_layout(keyboard_layout); + kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); if (!kbd_layout) exit(1); } Modified: trunk/curses_keys.h =================================================================== --- trunk/curses_keys.h 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/curses_keys.h 2009-03-06 20:27:10 UTC (rev 6721) @@ -21,6 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#include "keymaps.h" + + #define KEY_RELEASE 0x80 #define KEY_MASK 0x7f #define SHIFT_CODE 0x2a @@ -239,11 +243,6 @@ }; -typedef struct { - const char* name; - int keysym; -} name2keysym_t; - static const name2keysym_t name2keysym[] = { /* Plain ASCII */ { "space", 0x020 }, Modified: trunk/keymaps.c =================================================================== --- trunk/keymaps.c 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/keymaps.c 2009-03-06 20:27:10 UTC (rev 6721) @@ -22,35 +22,21 @@ * THE SOFTWARE. */ -static int get_keysym(const char *name) +#include "keymaps.h" +#include "sysemu.h" + +static int get_keysym(const name2keysym_t *table, + const char *name) { const name2keysym_t *p; - for(p = name2keysym; p->name != NULL; p++) { + for(p = table; p->name != NULL; p++) { if (!strcmp(p->name, name)) return p->keysym; } return 0; } -struct key_range { - int start; - int end; - struct key_range *next; -}; -#define MAX_NORMAL_KEYCODE 512 -#define MAX_EXTRA_COUNT 256 -typedef struct { - uint16_t keysym2keycode[MAX_NORMAL_KEYCODE]; - struct { - int keysym; - uint16_t keycode; - } keysym2keycode_extra[MAX_EXTRA_COUNT]; - int extra_count; - struct key_range *keypad_range; - struct key_range *numlock_range; -} kbd_layout_t; - static void add_to_key_range(struct key_range **krp, int code) { struct key_range *kr; for (kr = *krp; kr; kr = kr->next) { @@ -73,7 +59,8 @@ } } -static kbd_layout_t *parse_keyboard_layout(const char *language, +static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, + const char *language, kbd_layout_t * k) { FILE *f; @@ -102,7 +89,7 @@ if (!strncmp(line, "map ", 4)) continue; if (!strncmp(line, "include ", 8)) { - parse_keyboard_layout(line + 8, k); + parse_keyboard_layout(table, line + 8, k); } else { char *end_of_keysym = line; while (*end_of_keysym != 0 && *end_of_keysym != ' ') @@ -110,7 +97,7 @@ if (*end_of_keysym) { int keysym; *end_of_keysym = 0; - keysym = get_keysym(line); + keysym = get_keysym(table, line); if (keysym == 0) { // fprintf(stderr, "Warning: unknown keysym %s\n", line); } else { @@ -154,12 +141,14 @@ return k; } -static void *init_keyboard_layout(const char *language) + +void *init_keyboard_layout(const name2keysym_t *table, const char *language) { - return parse_keyboard_layout(language, 0); + return parse_keyboard_layout(table, language, 0); } -static int keysym2scancode(void *kbd_layout, int keysym) + +int keysym2scancode(void *kbd_layout, int keysym) { kbd_layout_t *k = kbd_layout; if (keysym < MAX_NORMAL_KEYCODE) { @@ -180,7 +169,7 @@ return 0; } -static inline int keycode_is_keypad(void *kbd_layout, int keycode) +int keycode_is_keypad(void *kbd_layout, int keycode) { kbd_layout_t *k = kbd_layout; struct key_range *kr; @@ -191,7 +180,7 @@ return 0; } -static inline int keysym_is_numlock(void *kbd_layout, int keysym) +int keysym_is_numlock(void *kbd_layout, int keysym) { kbd_layout_t *k = kbd_layout; struct key_range *kr; Modified: trunk/sdl.c =================================================================== --- trunk/sdl.c 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/sdl.c 2009-03-06 20:27:10 UTC (rev 6721) @@ -109,7 +109,6 @@ /* generic keyboard conversion */ #include "sdl_keysym.h" -#include "keymaps.c" static kbd_layout_t *kbd_layout = NULL; @@ -677,7 +676,7 @@ keyboard_layout = "en-us"; #endif if(keyboard_layout) { - kbd_layout = init_keyboard_layout(keyboard_layout); + kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); if (!kbd_layout) exit(1); } Modified: trunk/sdl_keysym.h =================================================================== --- trunk/sdl_keysym.h 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/sdl_keysym.h 2009-03-06 20:27:10 UTC (rev 6721) @@ -1,7 +1,6 @@ -typedef struct { - const char* name; - int keysym; -} name2keysym_t; + +#include "keymaps.h" + static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020}, Modified: trunk/vnc.c =================================================================== --- trunk/vnc.c 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/vnc.c 2009-03-06 20:27:10 UTC (rev 6721) @@ -36,7 +36,6 @@ #include "vnc.h" #include "vnc_keysym.h" -#include "keymaps.c" #include "d3des.h" #ifdef CONFIG_VNC_TLS @@ -2422,9 +2421,9 @@ vs->ds = ds; if (keyboard_layout) - vs->kbd_layout = init_keyboard_layout(keyboard_layout); + vs->kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout); else - vs->kbd_layout = init_keyboard_layout("en-us"); + vs->kbd_layout = init_keyboard_layout(name2keysym, "en-us"); if (!vs->kbd_layout) exit(1); Modified: trunk/vnc_keysym.h =================================================================== --- trunk/vnc_keysym.h 2009-03-06 20:27:05 UTC (rev 6720) +++ trunk/vnc_keysym.h 2009-03-06 20:27:10 UTC (rev 6721) @@ -1,7 +1,6 @@ -typedef struct { - const char* name; - int keysym; -} name2keysym_t; + +#include "keymaps.h" + static const name2keysym_t name2keysym[]={ /* ascii */ { "space", 0x020},