From: "Junko Ichino" Subject: [RFC] keymap support for PVFB Date: Thu, 28 Dec 2006 13:11:29 +0900 Message-ID: <009d01c72a36$405dd400$d9b2220a@VF05186P> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_009A_01C72A81.B0372420" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. ------=_NextPart_000_009A_01C72A81.B0372420 Content-Type: text/plain; format=flowed; charset="iso-2022-jp"; reply-type=original Content-Transfer-Encoding: 7bit Hi all, My name is Junko Ichino. Currently, Paravirtualized frame buffer is supporting only US keymap. I'm trying to make a patch to support several keymaps for Paravirtualized frame buffer, which uses QEMU's keymap. But, some special keys cannot be input in Japanese keymap. For example, backslash and underscore. I'm investigating this problem now. Where is the problem? Thanks, - Junko Ichino ------=_NextPart_000_009A_01C72A81.B0372420 Content-Type: application/octet-stream; name="pvfb-keymap.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="pvfb-keymap.patch" # HG changeset patch=0A= # User ichino.junko@jp.fujitsu.com=0A= # Node ID d5f18d970be9bc0bb4d4c308f41bb32902babb2d=0A= # Parent 367f0c6efe2178e26ba0194ca795ff098e22a80b=0A= keymap support for vncfb=0A= =0A= Signed-off-by: Junko Ichino =0A= Signed-off-by: Takanori Kasai =0A= Signed-off-by: Tsunehisa Doi =0A= =0A= diff -r 367f0c6efe21 -r d5f18d970be9 tools/xenfb/Makefile=0A= --- a/tools/xenfb/Makefile Sat Dec 23 21:32:05 2006 +0000=0A= +++ b/tools/xenfb/Makefile Thu Dec 28 11:27:14 2006 +0900=0A= @@ -1,7 +1,7 @@ XEN_ROOT=3D../..=0A= XEN_ROOT=3D../..=0A= include $(XEN_ROOT)/tools/Rules.mk=0A= =0A= -CFLAGS +=3D -I$(XEN_LIBXC) -I$(XEN_XENSTORE) = -I$(XEN_ROOT)/linux-2.6-xen-sparse/include=0A= +CFLAGS +=3D -I$(XEN_LIBXC) -I$(XEN_XENSTORE) = -I$(XEN_ROOT)/linux-2.6-xen-sparse/include -I$(XEN_ROOT)/tools/ioemu=0A= LDFLAGS +=3D -L$(XEN_LIBXC) -L$(XEN_XENSTORE)=0A= =0A= INSTALL =3D install=0A= diff -r 367f0c6efe21 -r d5f18d970be9 tools/xenfb/vncfb.c=0A= --- a/tools/xenfb/vncfb.c Sat Dec 23 21:32:05 2006 +0000=0A= +++ b/tools/xenfb/vncfb.c Thu Dec 28 11:27:14 2006 +0900=0A= @@ -11,142 +11,13 @@=0A= #include =0A= #include "xenfb.h"=0A= =0A= -static int xk2linux[0x10000] =3D {=0A= - [XK_a] =3D KEY_A,=0A= - [XK_b] =3D KEY_B,=0A= - [XK_c] =3D KEY_C,=0A= - [XK_d] =3D KEY_D,=0A= - [XK_e] =3D KEY_E,=0A= - [XK_f] =3D KEY_F,=0A= - [XK_g] =3D KEY_G,=0A= - [XK_h] =3D KEY_H,=0A= - [XK_i] =3D KEY_I,=0A= - [XK_j] =3D KEY_J,=0A= - [XK_k] =3D KEY_K,=0A= - [XK_l] =3D KEY_L,=0A= - [XK_m] =3D KEY_M,=0A= - [XK_n] =3D KEY_N,=0A= - [XK_o] =3D KEY_O,=0A= - [XK_p] =3D KEY_P,=0A= - [XK_q] =3D KEY_Q,=0A= - [XK_r] =3D KEY_R,=0A= - [XK_s] =3D KEY_S,=0A= - [XK_t] =3D KEY_T,=0A= - [XK_u] =3D KEY_U,=0A= - [XK_v] =3D KEY_V,=0A= - [XK_w] =3D KEY_W,=0A= - [XK_x] =3D KEY_X,=0A= - [XK_y] =3D KEY_Y,=0A= - [XK_z] =3D KEY_Z,=0A= - [XK_A] =3D KEY_A,=0A= - [XK_B] =3D KEY_B,=0A= - [XK_C] =3D KEY_C,=0A= - [XK_D] =3D KEY_D,=0A= - [XK_E] =3D KEY_E,=0A= - [XK_F] =3D KEY_F,=0A= - [XK_G] =3D KEY_G,=0A= - [XK_H] =3D KEY_H,=0A= - [XK_I] =3D KEY_I,=0A= - [XK_J] =3D KEY_J,=0A= - [XK_K] =3D KEY_K,=0A= - [XK_L] =3D KEY_L,=0A= - [XK_M] =3D KEY_M,=0A= - [XK_N] =3D KEY_N,=0A= - [XK_O] =3D KEY_O,=0A= - [XK_P] =3D KEY_P,=0A= - [XK_Q] =3D KEY_Q,=0A= - [XK_R] =3D KEY_R,=0A= - [XK_S] =3D KEY_S,=0A= - [XK_T] =3D KEY_T,=0A= - [XK_U] =3D KEY_U,=0A= - [XK_V] =3D KEY_V,=0A= - [XK_W] =3D KEY_W,=0A= - [XK_X] =3D KEY_X,=0A= - [XK_Y] =3D KEY_Y,=0A= - [XK_Z] =3D KEY_Z,=0A= - [XK_0] =3D KEY_0,=0A= - [XK_1] =3D KEY_1,=0A= - [XK_2] =3D KEY_2,=0A= - [XK_3] =3D KEY_3,=0A= - [XK_4] =3D KEY_4,=0A= - [XK_5] =3D KEY_5,=0A= - [XK_6] =3D KEY_6,=0A= - [XK_7] =3D KEY_7,=0A= - [XK_8] =3D KEY_8,=0A= - [XK_9] =3D KEY_9,=0A= - [XK_Return] =3D KEY_ENTER,=0A= - [XK_BackSpace] =3D KEY_BACKSPACE,=0A= - [XK_Tab] =3D KEY_TAB,=0A= - [XK_Pause] =3D KEY_PAUSE,=0A= - [XK_Delete] =3D KEY_DELETE,=0A= - [XK_slash] =3D KEY_SLASH,=0A= - [XK_minus] =3D KEY_MINUS,=0A= - [XK_equal] =3D KEY_EQUAL,=0A= - [XK_Escape] =3D KEY_ESC,=0A= - [XK_braceleft] =3D KEY_LEFTBRACE,=0A= - [XK_braceright] =3D KEY_RIGHTBRACE,=0A= - [XK_bracketleft] =3D KEY_LEFTMETA,=0A= - [XK_bracketright] =3D KEY_RIGHTMETA,=0A= - [XK_Control_L] =3D KEY_LEFTCTRL,=0A= - [XK_Control_R] =3D KEY_RIGHTCTRL,=0A= - [XK_Shift_L] =3D KEY_LEFTSHIFT,=0A= - [XK_Shift_R] =3D KEY_RIGHTSHIFT,=0A= - [XK_Alt_L] =3D KEY_LEFTALT,=0A= - [XK_Alt_R] =3D KEY_RIGHTALT,=0A= - [XK_semicolon] =3D KEY_SEMICOLON, =0A= - [XK_apostrophe] =3D KEY_APOSTROPHE,=0A= - [XK_grave] =3D KEY_GRAVE,=0A= - [XK_backslash] =3D KEY_BACKSLASH,=0A= - [XK_comma] =3D KEY_COMMA,=0A= - [XK_period] =3D KEY_DOT,=0A= - [XK_space] =3D KEY_SPACE,=0A= - [XK_Caps_Lock] =3D KEY_CAPSLOCK,=0A= - [XK_Num_Lock] =3D KEY_NUMLOCK,=0A= - [XK_Scroll_Lock] =3D KEY_SCROLLLOCK,=0A= - [XK_Sys_Req] =3D KEY_SYSRQ,=0A= - [XK_Linefeed] =3D KEY_LINEFEED,=0A= - [XK_Home] =3D KEY_HOME,=0A= - [XK_Pause] =3D KEY_PAUSE,=0A= - [XK_F1] =3D KEY_F1,=0A= - [XK_F2] =3D KEY_F2,=0A= - [XK_F3] =3D KEY_F3,=0A= - [XK_F4] =3D KEY_F4,=0A= - [XK_F5] =3D KEY_F5,=0A= - [XK_F6] =3D KEY_F6,=0A= - [XK_F7] =3D KEY_F7,=0A= - [XK_F8] =3D KEY_F8,=0A= - [XK_F9] =3D KEY_F9,=0A= - [XK_F10] =3D KEY_F10,=0A= - [XK_F11] =3D KEY_F11,=0A= - [XK_F12] =3D KEY_F12,=0A= - [XK_Up] =3D KEY_UP,=0A= - [XK_Page_Up] =3D KEY_PAGEUP,=0A= - [XK_Left] =3D KEY_LEFT,=0A= - [XK_Right] =3D KEY_RIGHT,=0A= - [XK_End] =3D KEY_END,=0A= - [XK_Down] =3D KEY_DOWN,=0A= - [XK_Page_Down] =3D KEY_PAGEDOWN,=0A= - [XK_Insert] =3D KEY_INSERT, =0A= - [XK_colon] =3D KEY_SEMICOLON,=0A= - [XK_quotedbl] =3D KEY_APOSTROPHE,=0A= - [XK_less] =3D KEY_COMMA,=0A= - [XK_greater] =3D KEY_DOT,=0A= - [XK_question] =3D KEY_SLASH,=0A= - [XK_bar] =3D KEY_BACKSLASH,=0A= - [XK_asciitilde] =3D KEY_GRAVE,=0A= - [XK_exclam] =3D KEY_1,=0A= - [XK_at] =3D KEY_2,=0A= - [XK_numbersign] =3D KEY_3,=0A= - [XK_dollar] =3D KEY_4,=0A= - [XK_percent] =3D KEY_5,=0A= - [XK_asciicircum] =3D KEY_6,=0A= - [XK_ampersand] =3D KEY_7,=0A= - [XK_asterisk] =3D KEY_8,=0A= - [XK_parenleft] =3D KEY_9,=0A= - [XK_parenright] =3D KEY_0,=0A= - [XK_underscore] =3D KEY_MINUS,=0A= - [XK_plus] =3D KEY_EQUAL,=0A= -};=0A= +#define qemu_mallocz(size) calloc(1, (size))=0A= +#include "config-host.h"=0A= +static const char *bios_dir =3D CONFIG_QEMU_SHAREDIR;=0A= +#include "vnc_keysym.h"=0A= +#include "keymaps.c"=0A= +=0A= +static void *kbd_layout;=0A= =0A= static int btnmap[] =3D {=0A= BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, BTN_FORWARD, BTN_BACK=0A= @@ -165,13 +36,16 @@ static void on_kbd_event(rfbBool down, r=0A= */=0A= rfbScreenInfoPtr server =3D cl->screen;=0A= struct xenfb *xenfb =3D server->screenData;=0A= - if (keycode >=3D sizeof(xk2linux) / sizeof(*xk2linux))=0A= +=0A= + if( keycode >=3D 'A' && keycode <=3D 'Z' )=0A= + keycode +=3D 'a' - 'A';=0A= +=0A= + int scancode =3D keysym2scancode(kbd_layout, keycode);=0A= + if (scancode =3D=3D 0)=0A= return;=0A= - if (xk2linux[keycode] =3D=3D 0)=0A= - return;=0A= - if (xenfb_send_key(xenfb, down, xk2linux[keycode]) < 0)=0A= + if (xenfb_send_key(xenfb, down, scancode) < 0)=0A= fprintf(stderr, "Key %d %s lost (%s)\n",=0A= - xk2linux[keycode], down ? "down" : "up",=0A= + scancode, down ? "down" : "up",=0A= strerror(errno));=0A= }=0A= =0A= @@ -305,6 +179,7 @@ static struct option options[] =3D {=0A= { "title", 1, NULL, 't' },=0A= { "unused", 0, NULL, 'u' },=0A= { "listen", 1, NULL, 'l' },=0A= + { "keymap", 1, NULL, 'k' },=0A= { NULL }=0A= };=0A= =0A= @@ -318,6 +193,7 @@ int main(int argc, char **argv)=0A= int domid =3D -1, port =3D -1;=0A= char *title =3D NULL;=0A= char *listen =3D NULL;=0A= + char *keymap =3D NULL;=0A= bool unused =3D false;=0A= int opt;=0A= struct xenfb *xenfb;=0A= @@ -331,7 +207,7 @@ int main(int argc, char **argv)=0A= =0A= vncpasswd[0] =3D '\0';=0A= =0A= - while ((opt =3D getopt_long(argc, argv, "d:p:t:u", options,=0A= + while ((opt =3D getopt_long(argc, argv, "d:p:t:uk:", options,=0A= NULL)) !=3D -1) {=0A= switch (opt) {=0A= case 'd':=0A= @@ -359,6 +235,9 @@ int main(int argc, char **argv)=0A= case 'l':=0A= listen =3D strdup(optarg);=0A= break;=0A= + case 'k':=0A= + keymap =3D strdup(optarg);=0A= + break;=0A= case '?':=0A= exit(1);=0A= }=0A= @@ -378,7 +257,12 @@ int main(int argc, char **argv)=0A= fprintf(stderr, "Invalid port specified\n");=0A= exit(1);=0A= }=0A= - =0A= +=0A= + if (keymap =3D=3D NULL){=0A= + keymap =3D "en-us";=0A= + }=0A= + kbd_layout =3D init_keyboard_layout(keymap);=0A= +=0A= fake_argv[2] =3D portstr;=0A= =0A= if (title !=3D NULL)=0A= ------=_NextPart_000_009A_01C72A81.B0372420 Content-Type: application/octet-stream; name="tools-build.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="tools-build.patch" # HG changeset patch=0A= # User kasai.takanori@jp.fujitsu.com=0A= # Node ID fd6dad0fefc84cdb5e4390f204a80cf5c3be7bcb=0A= # Parent d5f18d970be9bc0bb4d4c308f41bb32902babb2d=0A= The build order change for keyboard selection of pvfb=0A= =0A= Signed-off-by: Takanori Kasai =0A= Signed-off-by: Junko Ichino =0A= Signed-off-by: Tsunehisa Doi =0A= =0A= diff -r d5f18d970be9 -r fd6dad0fefc8 tools/Makefile=0A= --- a/tools/Makefile Thu Dec 28 11:27:14 2006 +0900=0A= +++ b/tools/Makefile Thu Dec 28 11:31:05 2006 +0900=0A= @@ -19,8 +19,9 @@ SUBDIRS-y +=3D libaio=0A= SUBDIRS-y +=3D libaio=0A= SUBDIRS-y +=3D blktap=0A= SUBDIRS-y +=3D libfsimage=0A= -SUBDIRS-$(XENFB_TOOLS) +=3D xenfb=0A= SUBDIRS-$(LIBXENAPI_BINDINGS) +=3D libxen=0A= +=0A= +POST_SUBDIRS-$(XENFB_TOOLS) +=3D xenfb=0A= =0A= # These don't cross-compile=0A= ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))=0A= @@ -34,6 +35,9 @@ all: check=0A= $(MAKE) -C $$subdir $@; \=0A= done=0A= $(MAKE) ioemu=0A= + @set -e; for subdir in $(POST_SUBDIRS-y); do \=0A= + $(MAKE) -C $$subdir $@; \=0A= + done=0A= =0A= .PHONY: install=0A= install: check=0A= @@ -41,6 +45,9 @@ install: check=0A= $(MAKE) -C $$subdir $@; \=0A= done=0A= $(MAKE) ioemuinstall=0A= + @set -e; for subdir in $(POST_SUBDIRS-y); do \=0A= + $(MAKE) -C $$subdir $@; \=0A= + done=0A= $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump=0A= $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen=0A= =0A= @@ -50,6 +57,9 @@ clean: check_clean=0A= $(MAKE) -C $$subdir $@; \=0A= done=0A= $(MAKE) ioemuclean=0A= + @set -e; for subdir in $(POST_SUBDIRS-y); do \=0A= + $(MAKE) -C $$subdir $@; \=0A= + done=0A= =0A= .PHONY: distclean=0A= distclean: clean=0A= ------=_NextPart_000_009A_01C72A81.B0372420 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ------=_NextPart_000_009A_01C72A81.B0372420--