Skip to contentSkip to conversation

factor out commonly used scancode translation table

PATCH In review Bernhard Fischer 6 participants 8 messages Jan 4, 2007 – Jan 16, 2007 Kbuild

lore
Share & tools
lore

Bernhard Fischer

author
#0 lore raw

PATCH 1/1 factor out commonly used scancode translation table

Hi,

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Comments?
Please apply.

¹)
http://members.aon.at/berny_f/qemu/qemu-HEAD.ggi-2.2.x-04c-20070104.diff

Makefile.target renamed from qemu_trunk.orig/Makefile.target +1 -1
diff --exclude='*.diff' -rduNp ../qemu_trunk.orig/Makefile.target ./Makefile.target
@@ -444,7 +444,7 @@ $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
 cocoa.o: cocoa.m
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
 
-sdl.o: sdl.c keymaps.c sdl_keysym.h
+sdl.o: sdl.c keymaps.c sdl_keysym.h x_keymap.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $(BASE_CFLAGS) -c -o $@ $<
 
 vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h
sdl.c renamed from qemu_trunk.orig/sdl.c +1 -83

90 lines not on this page · raw message

x_keymap.c renamed from qemu_trunk.orig/x_keymap.c +106 -0

106 lines not on this page · raw message

#1 lore raw
Quoted 8 lines · Bernhard Fischer

Hi,

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Comments?

How it is done right now, each time x_keycode.c is included, you will end up with an extra copy in the final executable. Perhaps that simply keeping the LUT in sdl.c but removing the 'static' keyword from it and creating a sdl.h file with the statement:

extern const uint8_t *x_keycode_to_pc_keycode;

would be a better idea. Including a header file is more clean than including a C file as well.

Quoted 9 lines

Please apply.

¹)
http://members.aon.at/berny_f/qemu/qemu-HEAD.ggi-2.2.x-04c-20070104.diff
_______________________________________________
Qemu-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/qemu-devel

author
#2 lore raw
Quoted 7 lines · Jonathan Phenix
Quoted 6 lines · Bernhard Fischer

Hi,

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Quoted 6 lines
Quoted 2 lines

Comments?

How it is done right now, each time x_keycode.c is included, you will end up with an extra copy in the final executable. Perhaps that simply keeping the LUT in sdl.c but removing the 'static' keyword from it and creating a sdl.h file with the statement:

Yes, or create one public accessor func (_translate_keycode() or the like). I don't have SDL installed, so only have the LUT once, but you're of course right.

What's the preferred method? public LUT or public accessor?

#3 lore raw
Quoted 15 lines · Bernhard Fischer
Quoted 7 lines · Jonathan Phenix
Quoted 6 lines · Bernhard Fischer

Hi,

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Quoted 6 lines
Quoted 2 lines

Comments?

How it is done right now, each time x_keycode.c is included, you will end up with an extra copy in the final executable. Perhaps that simply keeping the LUT in sdl.c but removing the 'static' keyword from it and creating a sdl.h file with the statement:

Quoted 5 lines

Yes, or create one public accessor func (_translate_keycode() or the like). I don't have SDL installed, so only have the LUT once, but you're of course right.

What's the preferred method? public LUT or public accessor?

Public accessor, I'd say. Keystroke processing isn't performance critical.

Thiemo

author
#4 lore raw
Quoted 16 lines · Thiemo Seufer
Quoted 15 lines · Bernhard Fischer
Quoted 13 lines · Jonathan Phenix
Quoted 8 lines · Bernhard Fischer

Hi,

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Comments?

How it is done right now, each time x_keycode.c is included, you will end up with an extra copy in the final executable. Perhaps that simply keeping the LUT in sdl.c but removing the 'static' keyword from it and creating a sdl.h file with the statement:

Quoted 7 lines
Quoted 5 lines

Yes, or create one public accessor func (_translate_keycode() or the like). I don't have SDL installed, so only have the LUT once, but you're of course right.

What's the preferred method? public LUT or public accessor?

Public accessor, I'd say. Keystroke processing isn't performance critical.

New patch with a public accessor is attached. Couldn't think of a better name, please feel free to change it..

thanks,

vl.h renamed from qemu_trunk.orig/vl.h +3 -0
@@ -869,6 +873,9 @@ void cocoa_display_init(DisplayState *ds
 /* vnc.c */
 void vnc_display_init(DisplayState *ds, const char *display);
 
+/* x_keymap.c */
+extern uint8_t _translate_keycode(const int key);
+
 /* ide.c */
 #define MAX_DISKS 4
sdl.c renamed from qemu_trunk.orig/sdl.c +1 -83

96 lines not on this page · raw message

x_keymap.c renamed from qemu_trunk.orig/x_keymap.c +110 -0

110 lines not on this page · raw message

Makefile.target renamed from qemu_trunk.orig/Makefile.target +3 -0
@@ -397,6 +397,9 @@ ifdef CONFIG_COREAUDIO
 COCOA_LIBS+=-framework CoreAudio
 endif
 endif
+ifdef CONFIG_SDL
+VL_OBJS+=x_keymap.o
+endif
 ifdef CONFIG_SLIRP
 CPPFLAGS+=-I$(SRC_PATH)/slirp
 SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \
#5 lore raw
Quoted 23 lines · Bernhard Fischer
Quoted 21 lines · Thiemo Seufer
Quoted 19 lines · Bernhard Fischer
Quoted 4 lines · Jonathan Phenix
Quoted 2 lines · Bernhard Fischer

Hi,

Quoted 9 lines
Quoted 7 lines

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Comments?

How it is done right now, each time x_keycode.c is included, you will end up with an extra copy in the final executable. Perhaps that simply keeping the LUT in sdl.c but removing the 'static' keyword from it and creating a sdl.h file with the statement:

Yes, or create one public accessor func (_translate_keycode() or the like). I don't have SDL installed, so only have the LUT once, but you're of course right.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

What's the preferred method? public LUT or public accessor?

Public accessor, I'd say. Keystroke processing isn't performance critical.

New patch with a public accessor is attached. Couldn't think of a better name, please feel free to change it..

Is it worth evening worry about this if the GGD patch isn't going to eventually end up in CVS?

Why have the abstraction if it's not going to be used? I'm not really sure I see the value in having GGD...

Regards,

Anthony Liguori

Quoted 249 lines

thanks,

------------------------------------------------------------------------

vl.h renamed from qemu_trunk.orig/vl.h +3 -0
@@ -869,6 +873,9 @@ void cocoa_display_init(DisplayState *ds
 /* vnc.c */
 void vnc_display_init(DisplayState *ds, const char *display);
 
+/* x_keymap.c */
+extern uint8_t _translate_keycode(const int key);
+
 /* ide.c */
 #define MAX_DISKS 4
sdl.c renamed from qemu_trunk.orig/sdl.c +1 -83
@@ -122,88 +122,6 @@ static uint8_t sdl_keyevent_to_keycode(c
 
 #else
 
-static const uint8_t x_keycode_to_pc_keycode[115] = {
-   0xc7,      /*  97  Home   */
-   0xc8,      /*  98  Up     */
-   0xc9,      /*  99  PgUp   */
-   0xcb,      /* 100  Left   */
-   0x4c,        /* 101  KP-5   */
-   0xcd,      /* 102  Right  */
-   0xcf,      /* 103  End    */
-   0xd0,      /* 104  Down   */
-   0xd1,      /* 105  PgDn   */
-   0xd2,      /* 106  Ins    */
-   0xd3,      /* 107  Del    */
-   0x9c,      /* 108  Enter  */
-   0x9d,      /* 109  Ctrl-R */
-   0x0,       /* 110  Pause  */
-   0xb7,      /* 111  Print  */
-   0xb5,      /* 112  Divide */
-   0xb8,      /* 113  Alt-R  */
-   0xc6,      /* 114  Break  */   
-   0x0,         /* 115 */
-   0x0,         /* 116 */
-   0x0,         /* 117 */
-   0x0,         /* 118 */
-   0x0,         /* 119 */
-   0x0,         /* 120 */
-   0x0,         /* 121 */
-   0x0,         /* 122 */
-   0x0,         /* 123 */
-   0x0,         /* 124 */
-   0x0,         /* 125 */
-   0x0,         /* 126 */
-   0x0,         /* 127 */
-   0x0,         /* 128 */
-   0x79,         /* 129 Henkan */
-   0x0,         /* 130 */
-   0x7b,         /* 131 Muhenkan */
-   0x0,         /* 132 */
-   0x7d,         /* 133 Yen */
-   0x0,         /* 134 */
-   0x0,         /* 135 */
-   0x47,         /* 136 KP_7 */
-   0x48,         /* 137 KP_8 */
-   0x49,         /* 138 KP_9 */
-   0x4b,         /* 139 KP_4 */
-   0x4c,         /* 140 KP_5 */
-   0x4d,         /* 141 KP_6 */
-   0x4f,         /* 142 KP_1 */
-   0x50,         /* 143 KP_2 */
-   0x51,         /* 144 KP_3 */
-   0x52,         /* 145 KP_0 */
-   0x53,         /* 146 KP_. */
-   0x47,         /* 147 KP_HOME */
-   0x48,         /* 148 KP_UP */
-   0x49,         /* 149 KP_PgUp */
-   0x4b,         /* 150 KP_Left */
-   0x4c,         /* 151 KP_ */
-   0x4d,         /* 152 KP_Right */
-   0x4f,         /* 153 KP_End */
-   0x50,         /* 154 KP_Down */
-   0x51,         /* 155 KP_PgDn */
-   0x52,         /* 156 KP_Ins */
-   0x53,         /* 157 KP_Del */
-   0x0,         /* 158 */
-   0x0,         /* 159 */
-   0x0,         /* 160 */
-   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 170 */
-   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 180 */
-   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 190 */
-   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 200 */
-   0x0,         /* 201 */
-   0x0,         /* 202 */
-   0x0,         /* 203 */
-   0x0,         /* 204 */
-   0x0,         /* 205 */
-   0x0,         /* 206 */
-   0x0,         /* 207 */
-   0x70,         /* 208 Hiragana_Katakana */
-   0x0,         /* 209 */
-   0x0,         /* 210 */
-   0x73,         /* 211 backslash */
-};
-
 static uint8_t sdl_keyevent_to_keycode(const SDL_KeyboardEvent *ev)
 {
     int keycode;

@@ -216,7 +134,7 @@ static uint8_t sdl_keyevent_to_keycode(c
         keycode -= 8; /* just an offset */
     } else if (keycode < 212) {
         /* use conversion table */
-        keycode = x_keycode_to_pc_keycode[keycode - 97];
+        keycode = _translate_keycode(keycode - 97);
     } else {
         keycode = 0;
     }
x_keymap.c renamed from qemu_trunk.orig/x_keymap.c +110 -0
@@ -0,0 +1,110 @@
+/*
+ * QEMU SDL display driver
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "vl.h"
+static const uint8_t x_keycode_to_pc_keycode[115] = {
+   0xc7,      /*  97  Home   */
+   0xc8,      /*  98  Up     */
+   0xc9,      /*  99  PgUp   */
+   0xcb,      /* 100  Left   */
+   0x4c,        /* 101  KP-5   */
+   0xcd,      /* 102  Right  */
+   0xcf,      /* 103  End    */
+   0xd0,      /* 104  Down   */
+   0xd1,      /* 105  PgDn   */
+   0xd2,      /* 106  Ins    */
+   0xd3,      /* 107  Del    */
+   0x9c,      /* 108  Enter  */
+   0x9d,      /* 109  Ctrl-R */
+   0x0,       /* 110  Pause  */
+   0xb7,      /* 111  Print  */
+   0xb5,      /* 112  Divide */
+   0xb8,      /* 113  Alt-R  */
+   0xc6,      /* 114  Break  */
+   0x0,         /* 115 */
+   0x0,         /* 116 */
+   0x0,         /* 117 */
+   0x0,         /* 118 */
+   0x0,         /* 119 */
+   0x0,         /* 120 */
+   0x0,         /* 121 */
+   0x0,         /* 122 */
+   0x0,         /* 123 */
+   0x0,         /* 124 */
+   0x0,         /* 125 */
+   0x0,         /* 126 */
+   0x0,         /* 127 */
+   0x0,         /* 128 */
+   0x79,         /* 129 Henkan */
+   0x0,         /* 130 */
+   0x7b,         /* 131 Muhenkan */
+   0x0,         /* 132 */
+   0x7d,         /* 133 Yen */
+   0x0,         /* 134 */
+   0x0,         /* 135 */
+   0x47,         /* 136 KP_7 */
+   0x48,         /* 137 KP_8 */
+   0x49,         /* 138 KP_9 */
+   0x4b,         /* 139 KP_4 */
+   0x4c,         /* 140 KP_5 */
+   0x4d,         /* 141 KP_6 */
+   0x4f,         /* 142 KP_1 */
+   0x50,         /* 143 KP_2 */
+   0x51,         /* 144 KP_3 */
+   0x52,         /* 145 KP_0 */
+   0x53,         /* 146 KP_. */
+   0x47,         /* 147 KP_HOME */
+   0x48,         /* 148 KP_UP */
+   0x49,         /* 149 KP_PgUp */
+   0x4b,         /* 150 KP_Left */
+   0x4c,         /* 151 KP_ */
+   0x4d,         /* 152 KP_Right */
+   0x4f,         /* 153 KP_End */
+   0x50,         /* 154 KP_Down */
+   0x51,         /* 155 KP_PgDn */
+   0x52,         /* 156 KP_Ins */
+   0x53,         /* 157 KP_Del */
+   0x0,         /* 158 */
+   0x0,         /* 159 */
+   0x0,         /* 160 */
+   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 170 */
+   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 180 */
+   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 190 */
+   0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,         /* 200 */
+   0x0,         /* 201 */
+   0x0,         /* 202 */
+   0x0,         /* 203 */
+   0x0,         /* 204 */
+   0x0,         /* 205 */
+   0x0,         /* 206 */
+   0x0,         /* 207 */
+   0x70,         /* 208 Hiragana_Katakana */
+   0x0,         /* 209 */
+   0x0,         /* 210 */
+   0x73,         /* 211 backslash */
+};
+
+uint8_t _translate_keycode(const int key)
+{
+	return x_keycode_to_pc_keycode[key];
+}
Makefile.target renamed from qemu_trunk.orig/Makefile.target +3 -1
@@ -397,6 +397,9 @@ ifdef CONFIG_COREAUDIO
 COCOA_LIBS+=-framework CoreAudio
 endif
 endif
+ifdef CONFIG_SDL
+VL_OBJS+=x_keymap.o
+endif
 ifdef CONFIG_SLIRP
 CPPFLAGS+=-I$(SRC_PATH)/slirp
 SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \
 
------------------------------------------------------------------------

_______________________________________________
Qemu-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/qemu-devel

#6 lore raw
In reply to Bernhard Fischer
Quoted 5 lines · Bernhard Fischer

Hi,

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Whatever happened to ggi? All I remember is that something over 5 years ago they managed to piss off Linus, and then their website went down.

I take it the project continues to lurch forward? Or am I thinking of a different project?

Rob

Signature · 2 lines
"Perfection is reached, not when there is no longer anything to add, but
when there is no longer anything to take away." - Antoine de Saint-Exupery
#7 lore raw
Quoted 7 lines · Rob Landley
Quoted 5 lines · Bernhard Fischer

Hi,

The attached patch moves the x_keycode_to_pc_keycode LUT from sdl.c into an x_keycode.c. This struct is also used by the GGI backend (that is not yet merged ¹).

Quoted 5 lines

Whatever happened to ggi? All I remember is that something over 5 years ago they managed to piss off Linus, and then their website went down.

I take it the project continues to lurch forward? Or am I thinking of a different project?

GGI is actively maintained and developed. It works fine for me. In recent years it added the possibility to use cocoa and quartz, directx was much improved, the fbdev, X11, etc targets work fine too. Last time i tried, even the directfb display was fine. The more uncommon targets like target-multi, the tile-target, several palette targets, target-tcp, target-vnc etc do work just fine.

There is a list of available display- and input-targets here:
http://www.ggi-project.org/targets.html

If the www server http://www.ggi-project.org/ is down (which doesn't happen too often) then you can as well use
http://www.ibiblio.org/ggicore/

If you have additional questions then let me direct you to the ggi list or irc channel..