diff --git a/bochs/patches/patch.paste b/bochs/patches/patch.paste index 6271305c8..1d0d650a4 100644 --- a/bochs/patches/patch.paste +++ b/bochs/patches/patch.paste @@ -14,7 +14,7 @@ diff -urN clean/gui/bitmaps/copy.h bochs-paste/gui/bitmaps/copy.h +++ bochs-paste/gui/bitmaps/copy.h Mon Mar 11 09:01:13 2002 @@ -0,0 +1,18 @@ +///////////////////////////////////////////////////////////////////////// -+// $Id: patch.paste,v 1.3 2002-03-11 14:39:26 bdenney Exp $ ++// $Id: patch.paste,v 1.4 2002-03-11 14:46:28 bdenney Exp $ +///////////////////////////////////////////////////////////////////////// +#define BX_COPY_BMAP_X 32 +#define BX_COPY_BMAP_Y 32 @@ -36,7 +36,7 @@ diff -urN clean/gui/bitmaps/paste.h bochs-paste/gui/bitmaps/paste.h +++ bochs-paste/gui/bitmaps/paste.h Mon Mar 11 09:01:13 2002 @@ -0,0 +1,18 @@ +///////////////////////////////////////////////////////////////////////// -+// $Id: patch.paste,v 1.3 2002-03-11 14:39:26 bdenney Exp $ ++// $Id: patch.paste,v 1.4 2002-03-11 14:46:28 bdenney Exp $ +///////////////////////////////////////////////////////////////////////// +#define BX_PASTE_BMAP_X 32 +#define BX_PASTE_BMAP_Y 32 @@ -624,6 +624,184 @@ diff -urN clean/gui/keymap.h bochs-paste/gui/keymap.h Bit16u keymapCount; }; +diff -urN clean/gui/keymaps/converted.map bochs-paste/gui/keymaps/converted.map +--- clean/gui/keymaps/converted.map Wed Dec 31 19:00:00 1969 ++++ bochs-paste/gui/keymaps/converted.map Mon Mar 11 09:44:48 2002 +@@ -0,0 +1,174 @@ ++# Bochs Keymap file : X11 - i386 - US ++# Author : the Bochs team ++# ++# Format : ++# Bochs key symbol = X11 key symbol (without XK_ prefix) ++# ++ ++BX_KEY_0 '0' XK_0 ++BX_KEY_0+BX_KEY_SHIFT_L ')' XK_parenright ++BX_KEY_1 '1' XK_1 ++BX_KEY_1+BX_KEY_SHIFT_L '!' XK_exclam ++BX_KEY_2 '2' XK_2 ++BX_KEY_2+BX_KEY_SHIFT_L '@' XK_at ++BX_KEY_3 '3' XK_3 ++BX_KEY_3+BX_KEY_SHIFT_L '#' XK_numbersign ++BX_KEY_4 '4' XK_4 ++BX_KEY_4+BX_KEY_SHIFT_L '$' XK_dollar ++BX_KEY_5 '5' XK_5 ++BX_KEY_5+BX_KEY_SHIFT_L '%' XK_percent ++BX_KEY_6 '6' XK_6 ++BX_KEY_6+BX_KEY_SHIFT_L '^' XK_asciicircum ++BX_KEY_7 '7' XK_7 ++BX_KEY_7+BX_KEY_SHIFT_L '&' XK_ampersand ++BX_KEY_8 '8' XK_8 ++BX_KEY_8+BX_KEY_SHIFT_L '*' XK_asterisk ++BX_KEY_9 '9' XK_9 ++BX_KEY_9+BX_KEY_SHIFT_L '(' XK_parenleft ++BX_KEY_A+BX_KEY_SHIFT_L 'A' XK_A ++BX_KEY_A 'a' XK_a ++BX_KEY_B+BX_KEY_SHIFT_L 'B' XK_B ++BX_KEY_B 'b' XK_b ++BX_KEY_C+BX_KEY_SHIFT_L 'C' XK_C ++BX_KEY_C 'c' XK_c ++BX_KEY_D+BX_KEY_SHIFT_L 'D' XK_D ++BX_KEY_D 'd' XK_d ++BX_KEY_E+BX_KEY_SHIFT_L 'E' XK_E ++BX_KEY_E 'e' XK_e ++BX_KEY_F+BX_KEY_SHIFT_L 'F' XK_F ++BX_KEY_F 'f' XK_f ++BX_KEY_G+BX_KEY_SHIFT_L 'G' XK_G ++BX_KEY_G 'g' XK_g ++BX_KEY_H+BX_KEY_SHIFT_L 'H' XK_H ++BX_KEY_H 'h' XK_h ++BX_KEY_I+BX_KEY_SHIFT_L 'I' XK_I ++BX_KEY_I 'i' XK_i ++BX_KEY_J+BX_KEY_SHIFT_L 'J' XK_J ++BX_KEY_J 'j' XK_j ++BX_KEY_K+BX_KEY_SHIFT_L 'K' XK_K ++BX_KEY_K 'k' XK_k ++BX_KEY_L+BX_KEY_SHIFT_L 'L' XK_L ++BX_KEY_L 'l' XK_l ++BX_KEY_M+BX_KEY_SHIFT_L 'M' XK_M ++BX_KEY_M 'm' XK_m ++BX_KEY_N+BX_KEY_SHIFT_L 'N' XK_N ++BX_KEY_N 'n' XK_n ++BX_KEY_O+BX_KEY_SHIFT_L 'O' XK_O ++BX_KEY_O 'o' XK_o ++BX_KEY_P+BX_KEY_SHIFT_L 'P' XK_P ++BX_KEY_P 'p' XK_p ++BX_KEY_Q+BX_KEY_SHIFT_L 'Q' XK_Q ++BX_KEY_Q 'q' XK_q ++BX_KEY_R+BX_KEY_SHIFT_L 'R' XK_R ++BX_KEY_R 'r' XK_r ++BX_KEY_S+BX_KEY_SHIFT_L 'S' XK_S ++BX_KEY_S 's' XK_s ++BX_KEY_T+BX_KEY_SHIFT_L 'T' XK_T ++BX_KEY_T 't' XK_t ++BX_KEY_U+BX_KEY_SHIFT_L 'U' XK_U ++BX_KEY_U 'u' XK_u ++BX_KEY_V+BX_KEY_SHIFT_L 'V' XK_V ++BX_KEY_V 'v' XK_v ++BX_KEY_W+BX_KEY_SHIFT_L 'W' XK_W ++BX_KEY_W 'w' XK_w ++BX_KEY_X+BX_KEY_SHIFT_L 'X' XK_X ++BX_KEY_X 'x' XK_x ++BX_KEY_Y+BX_KEY_SHIFT_L 'Y' XK_Y ++BX_KEY_Y 'y' XK_y ++BX_KEY_Z+BX_KEY_SHIFT_L 'Z' XK_Z ++BX_KEY_Z 'z' XK_z ++BX_KEY_F1 none XK_F1 ++BX_KEY_F2 none XK_F2 ++BX_KEY_F3 none XK_F3 ++BX_KEY_F4 none XK_F4 ++BX_KEY_F5 none XK_F5 ++BX_KEY_F6 none XK_F6 ++BX_KEY_F7 none XK_F7 ++BX_KEY_F8 none XK_F8 ++BX_KEY_F9 none XK_F9 ++BX_KEY_F10 none XK_F10 ++BX_KEY_F11 none XK_F11 ++BX_KEY_F12 none XK_F12 ++BX_KEY_ALT_L none XK_Alt_L ++BX_KEY_ALT_L none XK_Meta_L ++BX_KEY_ALT_R none XK_Mode_switch ++BX_KEY_ALT_R none XK_Multi_key ++BX_KEY_BACKSLASH '\' XK_backslash ++BX_KEY_BACKSLASH+BX_KEY_SHIFT_L '|' XK_bar ++BX_KEY_BACKSPACE none XK_BackSpace ++BX_KEY_CAPS_LOCK none XK_Caps_Lock ++BX_KEY_COMMA ',' XK_comma ++BX_KEY_COMMA+BX_KEY_SHIFT_L '<' XK_less ++BX_KEY_CTRL_L none XK_Control_L ++BX_KEY_CTRL_R none XK_Control_R ++BX_KEY_DELETE none XK_Delete ++BX_KEY_DOWN none XK_Down ++BX_KEY_END none XK_End ++BX_KEY_ENTER return XK_Return ++BX_KEY_EQUALS '=' XK_equal ++BX_KEY_EQUALS+BX_KEY_SHIFT_L '+' XK_plus ++BX_KEY_ESC none XK_Escape ++BX_KEY_GRAVE+BX_KEY_SHIFT_L '~' XK_asciitilde ++BX_KEY_GRAVE '`' XK_grave ++BX_KEY_HOME none XK_Home ++BX_KEY_INSERT none XK_Insert ++BX_KEY_KP_5 none XK_KP_5 ++BX_KEY_KP_5 none XK_KP_Begin ++BX_KEY_KP_ADD none XK_KP_Add ++BX_KEY_KP_DELETE none XK_KP_Decimal ++BX_KEY_KP_DELETE none XK_KP_Delete ++BX_KEY_KP_DIVIDE none XK_KP_Divide ++BX_KEY_KP_DOWN none XK_KP_2 ++BX_KEY_KP_DOWN none XK_KP_Down ++BX_KEY_KP_END none XK_KP_1 ++BX_KEY_KP_END none XK_KP_End ++BX_KEY_KP_ENTER none XK_KP_Enter ++BX_KEY_KP_HOME none XK_KP_7 ++BX_KEY_KP_HOME none XK_KP_Home ++BX_KEY_KP_INSERT none XK_KP_0 ++BX_KEY_KP_INSERT none XK_KP_Insert ++BX_KEY_KP_LEFT none XK_KP_4 ++BX_KEY_KP_LEFT none XK_KP_Left ++BX_KEY_KP_MULTIPLY none XK_KP_Multiply ++BX_KEY_KP_PAGE_DOWN none XK_KP_3 ++BX_KEY_KP_PAGE_DOWN none XK_KP_Page_Down ++BX_KEY_KP_PAGE_UP none XK_KP_9 ++BX_KEY_KP_PAGE_UP none XK_KP_Page_Up ++BX_KEY_KP_RIGHT none XK_KP_6 ++BX_KEY_KP_RIGHT none XK_KP_Right ++BX_KEY_KP_SUBTRACT none XK_KP_Subtract ++BX_KEY_KP_UP none XK_KP_8 ++BX_KEY_KP_UP none XK_KP_Up ++BX_KEY_LEFT none XK_Left ++BX_KEY_LEFT_BRACKET+BX_KEY_SHIFT_L '{' XK_braceleft ++BX_KEY_LEFT_BRACKET '[' XK_bracketleft ++BX_KEY_MENU none XK_Menu ++BX_KEY_MINUS '-' XK_minus ++BX_KEY_MINUS+BX_KEY_SHIFT_L '_' XK_underscore ++BX_KEY_NUM_LOCK none XK_Num_Lock ++BX_KEY_PAGE_DOWN none XK_Page_Down ++BX_KEY_PAGE_UP none XK_Page_Up ++BX_KEY_PAUSE none XK_Break ++BX_KEY_PAUSE none XK_Pause ++BX_KEY_PERIOD+BX_KEY_SHIFT_L '>' XK_greater ++BX_KEY_PERIOD '.' XK_period ++BX_KEY_PRINT none XK_Print ++BX_KEY_PRINT none XK_Sys_Req ++BX_KEY_RIGHT none XK_Right ++BX_KEY_RIGHT_BRACKET+BX_KEY_SHIFT_L '}' XK_braceright ++BX_KEY_RIGHT_BRACKET ']' XK_bracketright ++BX_KEY_SCRL_LOCK none XK_Scroll_Lock ++BX_KEY_SEMICOLON+BX_KEY_SHIFT_L ':' XK_colon ++BX_KEY_SEMICOLON ';' XK_semicolon ++BX_KEY_SHIFT_L none XK_Shift_L ++BX_KEY_SHIFT_R none XK_Shift_R ++BX_KEY_SINGLE_QUOTE ''' XK_apostrophe ++BX_KEY_SINGLE_QUOTE+BX_KEY_SHIFT_L '"' XK_quotedbl ++BX_KEY_SLASH+BX_KEY_SHIFT_L '?' XK_question ++BX_KEY_SLASH '/' XK_slash ++BX_KEY_SPACE space XK_space ++BX_KEY_TAB none XK_ISO_Left_Tab ++BX_KEY_TAB tab XK_Tab ++BX_KEY_UP none XK_Up ++BX_KEY_WIN_L none XK_Super_L ++BX_KEY_WIN_R none XK_Super_R diff -urN clean/gui/keymaps/convertmap.pl bochs-paste/gui/keymaps/convertmap.pl --- clean/gui/keymaps/convertmap.pl Wed Dec 31 19:00:00 1969 +++ bochs-paste/gui/keymaps/convertmap.pl Mon Mar 11 09:23:44 2002 @@ -638,14 +816,1288 @@ diff -urN clean/gui/keymaps/convertmap.pl bochs-paste/gui/keymaps/convertmap.pl + ($key, $equals, $xksym) = split (/ +/); + printf ("%-45s %-10s %s\n", $key, 'none', "XK_$xksym"); +} +diff -urN clean/gui/keymaps/x11-pc-de.map bochs-paste/gui/keymaps/x11-pc-de.map +--- clean/gui/keymaps/x11-pc-de.map Wed Mar 6 04:31:55 2002 ++++ bochs-paste/gui/keymaps/x11-pc-de.map Mon Mar 11 09:44:48 2002 +@@ -1,216 +1,246 @@ +-# Bochs Keymap file : X11 - i386 - German +-# Author : Volker Ruppert ++# Bochs Keymap file ++# $Id: patch.paste,v 1.4 2002-03-11 14:46:28 bdenney Exp $ ++# Target: PC(x86) keyboard, US keymap ++# Author: Volker Ruppert + # +-# Format : +-# BX_KEY_* (bochs symbol) = X11 key symbol (without XK_ prefix) ++# The keymap file describes the layout of a keyboard, and how it translates ++# into Bochs key codes. + # +- BX_KEY_0 = 0 +- BX_KEY_0 = braceright +- BX_KEY_0 = equal +- BX_KEY_1 = 1 +- BX_KEY_1 = exclam +- BX_KEY_1 = onesuperior +- BX_KEY_2 = 2 +- BX_KEY_2 = quotedbl +- BX_KEY_2 = twosuperior +- BX_KEY_3 = 3 +- BX_KEY_3 = section +- BX_KEY_3 = threesuperior +- BX_KEY_4 = 4 +- BX_KEY_4 = dollar +- BX_KEY_4 = onequarter +- BX_KEY_5 = 5 +- BX_KEY_5 = onehalf +- BX_KEY_5 = percent +- BX_KEY_6 = 6 +- BX_KEY_6 = ampersand +- BX_KEY_6 = threequarters +- BX_KEY_7 = 7 +- BX_KEY_7 = braceleft +- BX_KEY_7 = slash +- BX_KEY_8 = 8 +- BX_KEY_8 = bracketleft +- BX_KEY_8 = parenleft +- BX_KEY_9 = 9 +- BX_KEY_9 = bracketright +- BX_KEY_9 = parenright +- BX_KEY_A = A +- BX_KEY_A = a +- BX_KEY_A = ae +- BX_KEY_B = B +- BX_KEY_B = b +- BX_KEY_B = rightdoublequotemark +- BX_KEY_C = C +- BX_KEY_C = c +- BX_KEY_C = cent +- BX_KEY_D = D +- BX_KEY_D = d +- BX_KEY_D = eth +- BX_KEY_E = E +- BX_KEY_E = EuroSign +- BX_KEY_E = e +- BX_KEY_F = F +- BX_KEY_F = dstroke +- BX_KEY_F = f +- BX_KEY_G = G +- BX_KEY_G = eng +- BX_KEY_G = g +- BX_KEY_H = H +- BX_KEY_H = h +- BX_KEY_H = hstroke +- BX_KEY_I = I +- BX_KEY_I = i +- BX_KEY_I = rightarrow +- BX_KEY_J = J +- BX_KEY_J = j +- BX_KEY_K = K +- BX_KEY_K = k +- BX_KEY_K = kra +- BX_KEY_L = L +- BX_KEY_L = l +- BX_KEY_M = M +- BX_KEY_M = m +- BX_KEY_M = mu +- BX_KEY_N = N +- BX_KEY_N = n +- BX_KEY_O = O +- BX_KEY_O = o +- BX_KEY_O = oslash +- BX_KEY_P = P +- BX_KEY_P = p +- BX_KEY_P = thorn +- BX_KEY_Q = Q +- BX_KEY_Q = at +- BX_KEY_Q = q +- BX_KEY_R = R +- BX_KEY_R = paragraph +- BX_KEY_R = r +- BX_KEY_S = S +- BX_KEY_S = s +- BX_KEY_T = T +- BX_KEY_T = t +- BX_KEY_T = tslash +- BX_KEY_U = U +- BX_KEY_U = downarrow +- BX_KEY_U = u +- BX_KEY_V = V +- BX_KEY_V = leftdoublequotemark +- BX_KEY_V = v +- BX_KEY_W = W +- BX_KEY_W = lstroke +- BX_KEY_W = w +- BX_KEY_X = X +- BX_KEY_X = guillemotright +- BX_KEY_X = x +- BX_KEY_Y = Z +- BX_KEY_Y = leftarrow +- BX_KEY_Y = z +- BX_KEY_Z = Y +- BX_KEY_Z = guillemotleft +- BX_KEY_Z = y +- BX_KEY_F1 = F1 +- BX_KEY_F2 = F2 +- BX_KEY_F3 = F3 +- BX_KEY_F4 = F4 +- BX_KEY_F5 = F5 +- BX_KEY_F6 = F6 +- BX_KEY_F7 = F7 +- BX_KEY_F8 = F8 +- BX_KEY_F9 = F9 +- BX_KEY_F10 = F10 +- BX_KEY_F11 = F11 +- BX_KEY_F12 = F12 +- BX_KEY_ALT_L = Alt_L +- BX_KEY_ALT_L = Meta_L +- BX_KEY_ALT_R = Mode_switch +- BX_KEY_ALT_R = Multi_key +- BX_KEY_BACKSLASH = apostrophe +- BX_KEY_BACKSLASH = numbersign +- BX_KEY_BACKSPACE = BackSpace +- BX_KEY_CAPS_LOCK = Caps_Lock +- BX_KEY_COMMA = comma +- BX_KEY_COMMA = horizconnector +- BX_KEY_COMMA = semicolon +- BX_KEY_CTRL_L = Control_L +- BX_KEY_CTRL_R = Control_R +- BX_KEY_DELETE = Delete +- BX_KEY_DOWN = Down +- BX_KEY_END = End +- BX_KEY_ENTER = Return +- BX_KEY_EQUALS = acute +- BX_KEY_EQUALS = cedilla +- BX_KEY_EQUALS = grave +- BX_KEY_ESC = Escape +- BX_KEY_GRAVE = asciicircum +- BX_KEY_GRAVE = degree +- BX_KEY_GRAVE = notsign +- BX_KEY_HOME = Home +- BX_KEY_INSERT = Insert +- BX_KEY_KP_5 = KP_5 +- BX_KEY_KP_5 = KP_Begin +- BX_KEY_KP_ADD = KP_Add +- BX_KEY_KP_DELETE = KP_Decimal +- BX_KEY_KP_DELETE = KP_Delete +- BX_KEY_KP_DIVIDE = KP_Divide +- BX_KEY_KP_DOWN = KP_2 +- BX_KEY_KP_DOWN = KP_Down +- BX_KEY_KP_END = KP_1 +- BX_KEY_KP_END = KP_End +- BX_KEY_KP_ENTER = KP_Enter +- BX_KEY_KP_HOME = KP_7 +- BX_KEY_KP_HOME = KP_Home +- BX_KEY_KP_INSERT = KP_0 +- BX_KEY_KP_INSERT = KP_Insert +- BX_KEY_KP_LEFT = KP_4 +- BX_KEY_KP_LEFT = KP_Left +- BX_KEY_KP_MULTIPLY = KP_Multiply +- BX_KEY_KP_PAGE_DOWN = KP_3 +- BX_KEY_KP_PAGE_DOWN = KP_Page_Down +- BX_KEY_KP_PAGE_UP = KP_9 +- BX_KEY_KP_PAGE_UP = KP_Page_Up +- BX_KEY_KP_RIGHT = KP_6 +- BX_KEY_KP_RIGHT = KP_Right +- BX_KEY_KP_SUBTRACT = KP_Subtract +- BX_KEY_KP_UP = KP_8 +- BX_KEY_KP_UP = KP_Up +- BX_KEY_LEFT = Left +- BX_KEY_LEFT_BACKSLASH = bar +- BX_KEY_LEFT_BACKSLASH = greater +- BX_KEY_LEFT_BACKSLASH = less +- BX_KEY_LEFT_BRACKET = Udiaeresis +- BX_KEY_LEFT_BRACKET = diaeresis +- BX_KEY_LEFT_BRACKET = udiaeresis +- BX_KEY_MENU = Menu +- BX_KEY_MINUS = backslash +- BX_KEY_MINUS = question +- BX_KEY_MINUS = ssharp +- BX_KEY_NUM_LOCK = Num_Lock +- BX_KEY_PAGE_DOWN = Page_Down +- BX_KEY_PAGE_UP = Page_Up +- BX_KEY_PAUSE = Break +- BX_KEY_PAUSE = Pause +- BX_KEY_PERIOD = colon +- BX_KEY_PERIOD = period +- BX_KEY_PERIOD = periodcentered +- BX_KEY_PRINT = Print +- BX_KEY_PRINT = Sys_Req +- BX_KEY_RIGHT = Right +- BX_KEY_RIGHT_BRACKET = asciitilde +- BX_KEY_RIGHT_BRACKET = asterisk +- BX_KEY_RIGHT_BRACKET = plus +- BX_KEY_SCRL_LOCK = Scroll_Lock +- BX_KEY_SEMICOLON = Odiaeresis +- BX_KEY_SEMICOLON = odiaeresis +- BX_KEY_SHIFT_L = Shift_L +- BX_KEY_SHIFT_R = Shift_R +- BX_KEY_SINGLE_QUOTE = Adiaeresis +- BX_KEY_SINGLE_QUOTE = adiaeresis +- BX_KEY_SLASH = dead_belowdot +- BX_KEY_SLASH = minus +- BX_KEY_SLASH = underscore +- BX_KEY_SPACE = space +- BX_KEY_TAB = ISO_Left_Tab +- BX_KEY_TAB = Tab +- BX_KEY_UP = Up +- BX_KEY_WIN_L = Super_L +- BX_KEY_WIN_R = Super_R ++# Format: ++# BX_Keysym ASCII_equivalent Xwin_Keysym ++# ++# Or, for keys that require modifiers: ++# BX_Keysym+BX_Modifier ASCII_equivalent Xwin_Keysym ++# ++# BX_Keysym and BX_Modifier must be present in the bx_key_symbol[] list in ++# gui/keymap.cc. The BX_Modifier is usually a shift key press, but it ++# could be any key. Presently a maximum of one modifier is supported, but this ++# could be changed in keymap.h (structure def has only one slot for modifier), ++# keymap.cc (parsing code), and iodev/keyboard.cc (simulate keypresses for >1 ++# modifier). ++# ++# The ASCII_equivalent must be either apostrophe + one character + apostrophe, ++# or one of these keywords: space, return, tab, backslash, apostrophe, none. ++# This format is designed to look like a char constant in C, but it's a very ++# simple parser. There's no concept of backslash being an escape char. The ++# backslash and apostrophe entries are provided for aesthetic purposes only: no ++# C++ programmer wants to see '\' or '''. The parser doesn't care, but they are ++# ugly. ++# ++# Xwin_Keysym is the X windows equivalent of the key combination. These ++# codes should match whatever you find in /usr/X11R6/include/X11/keysymdef.h. ++# If you're running X windows, Bochs will take each of these Xwin_Keysyms, ++# pull off the XK_ in front, and use XStringToKeysym() to change them into ++# numerical codes. If this lookup fails, you will get a panic and you need ++# to edit the keymap file. ++ ++BX_KEY_0 none XK_0 ++BX_KEY_0 none XK_braceright ++BX_KEY_0 none XK_equal ++BX_KEY_1 none XK_1 ++BX_KEY_1 none XK_exclam ++BX_KEY_1 none XK_onesuperior ++BX_KEY_2 none XK_2 ++BX_KEY_2 none XK_quotedbl ++BX_KEY_2 none XK_twosuperior ++BX_KEY_3 none XK_3 ++BX_KEY_3 none XK_section ++BX_KEY_3 none XK_threesuperior ++BX_KEY_4 none XK_4 ++BX_KEY_4 none XK_dollar ++BX_KEY_4 none XK_onequarter ++BX_KEY_5 none XK_5 ++BX_KEY_5 none XK_onehalf ++BX_KEY_5 none XK_percent ++BX_KEY_6 none XK_6 ++BX_KEY_6 none XK_ampersand ++BX_KEY_6 none XK_threequarters ++BX_KEY_7 none XK_7 ++BX_KEY_7 none XK_braceleft ++BX_KEY_7 none XK_slash ++BX_KEY_8 none XK_8 ++BX_KEY_8 none XK_bracketleft ++BX_KEY_8 none XK_parenleft ++BX_KEY_9 none XK_9 ++BX_KEY_9 none XK_bracketright ++BX_KEY_9 none XK_parenright ++BX_KEY_A none XK_A ++BX_KEY_A none XK_a ++BX_KEY_A none XK_ae ++BX_KEY_B none XK_B ++BX_KEY_B none XK_b ++BX_KEY_B none XK_rightdoublequotemark ++BX_KEY_C none XK_C ++BX_KEY_C none XK_c ++BX_KEY_C none XK_cent ++BX_KEY_D none XK_D ++BX_KEY_D none XK_d ++BX_KEY_D none XK_eth ++BX_KEY_E none XK_E ++BX_KEY_E none XK_EuroSign ++BX_KEY_E none XK_e ++BX_KEY_F none XK_F ++BX_KEY_F none XK_dstroke ++BX_KEY_F none XK_f ++BX_KEY_G none XK_G ++BX_KEY_G none XK_eng ++BX_KEY_G none XK_g ++BX_KEY_H none XK_H ++BX_KEY_H none XK_h ++BX_KEY_H none XK_hstroke ++BX_KEY_I none XK_I ++BX_KEY_I none XK_i ++BX_KEY_I none XK_rightarrow ++BX_KEY_J none XK_J ++BX_KEY_J none XK_j ++BX_KEY_K none XK_K ++BX_KEY_K none XK_k ++BX_KEY_K none XK_kra ++BX_KEY_L none XK_L ++BX_KEY_L none XK_l ++BX_KEY_M none XK_M ++BX_KEY_M none XK_m ++BX_KEY_M none XK_mu ++BX_KEY_N none XK_N ++BX_KEY_N none XK_n ++BX_KEY_O none XK_O ++BX_KEY_O none XK_o ++BX_KEY_O none XK_oslash ++BX_KEY_P none XK_P ++BX_KEY_P none XK_p ++BX_KEY_P none XK_thorn ++BX_KEY_Q none XK_Q ++BX_KEY_Q none XK_at ++BX_KEY_Q none XK_q ++BX_KEY_R none XK_R ++BX_KEY_R none XK_paragraph ++BX_KEY_R none XK_r ++BX_KEY_S none XK_S ++BX_KEY_S none XK_s ++BX_KEY_T none XK_T ++BX_KEY_T none XK_t ++BX_KEY_T none XK_tslash ++BX_KEY_U none XK_U ++BX_KEY_U none XK_downarrow ++BX_KEY_U none XK_u ++BX_KEY_V none XK_V ++BX_KEY_V none XK_leftdoublequotemark ++BX_KEY_V none XK_v ++BX_KEY_W none XK_W ++BX_KEY_W none XK_lstroke ++BX_KEY_W none XK_w ++BX_KEY_X none XK_X ++BX_KEY_X none XK_guillemotright ++BX_KEY_X none XK_x ++BX_KEY_Y none XK_Z ++BX_KEY_Y none XK_leftarrow ++BX_KEY_Y none XK_z ++BX_KEY_Z none XK_Y ++BX_KEY_Z none XK_guillemotleft ++BX_KEY_Z none XK_y ++BX_KEY_F1 none XK_F1 ++BX_KEY_F2 none XK_F2 ++BX_KEY_F3 none XK_F3 ++BX_KEY_F4 none XK_F4 ++BX_KEY_F5 none XK_F5 ++BX_KEY_F6 none XK_F6 ++BX_KEY_F7 none XK_F7 ++BX_KEY_F8 none XK_F8 ++BX_KEY_F9 none XK_F9 ++BX_KEY_F10 none XK_F10 ++BX_KEY_F11 none XK_F11 ++BX_KEY_F12 none XK_F12 ++BX_KEY_ALT_L none XK_Alt_L ++BX_KEY_ALT_L none XK_Meta_L ++BX_KEY_ALT_R none XK_Mode_switch ++BX_KEY_ALT_R none XK_Multi_key ++BX_KEY_BACKSLASH none XK_apostrophe ++BX_KEY_BACKSLASH none XK_numbersign ++BX_KEY_BACKSPACE none XK_BackSpace ++BX_KEY_CAPS_LOCK none XK_Caps_Lock ++BX_KEY_COMMA none XK_comma ++BX_KEY_COMMA none XK_horizconnector ++BX_KEY_COMMA none XK_semicolon ++BX_KEY_CTRL_L none XK_Control_L ++BX_KEY_CTRL_R none XK_Control_R ++BX_KEY_DELETE none XK_Delete ++BX_KEY_DOWN none XK_Down ++BX_KEY_END none XK_End ++BX_KEY_ENTER none XK_Return ++BX_KEY_EQUALS none XK_acute ++BX_KEY_EQUALS none XK_cedilla ++BX_KEY_EQUALS none XK_grave ++BX_KEY_ESC none XK_Escape ++BX_KEY_GRAVE none XK_asciicircum ++BX_KEY_GRAVE none XK_degree ++BX_KEY_GRAVE none XK_notsign ++BX_KEY_HOME none XK_Home ++BX_KEY_INSERT none XK_Insert ++BX_KEY_KP_5 none XK_KP_5 ++BX_KEY_KP_5 none XK_KP_Begin ++BX_KEY_KP_ADD none XK_KP_Add ++BX_KEY_KP_DELETE none XK_KP_Decimal ++BX_KEY_KP_DELETE none XK_KP_Delete ++BX_KEY_KP_DIVIDE none XK_KP_Divide ++BX_KEY_KP_DOWN none XK_KP_2 ++BX_KEY_KP_DOWN none XK_KP_Down ++BX_KEY_KP_END none XK_KP_1 ++BX_KEY_KP_END none XK_KP_End ++BX_KEY_KP_ENTER none XK_KP_Enter ++BX_KEY_KP_HOME none XK_KP_7 ++BX_KEY_KP_HOME none XK_KP_Home ++BX_KEY_KP_INSERT none XK_KP_0 ++BX_KEY_KP_INSERT none XK_KP_Insert ++BX_KEY_KP_LEFT none XK_KP_4 ++BX_KEY_KP_LEFT none XK_KP_Left ++BX_KEY_KP_MULTIPLY none XK_KP_Multiply ++BX_KEY_KP_PAGE_DOWN none XK_KP_3 ++BX_KEY_KP_PAGE_DOWN none XK_KP_Page_Down ++BX_KEY_KP_PAGE_UP none XK_KP_9 ++BX_KEY_KP_PAGE_UP none XK_KP_Page_Up ++BX_KEY_KP_RIGHT none XK_KP_6 ++BX_KEY_KP_RIGHT none XK_KP_Right ++BX_KEY_KP_SUBTRACT none XK_KP_Subtract ++BX_KEY_KP_UP none XK_KP_8 ++BX_KEY_KP_UP none XK_KP_Up ++BX_KEY_LEFT none XK_Left ++BX_KEY_LEFT_BACKSLASH none XK_bar ++BX_KEY_LEFT_BACKSLASH none XK_greater ++BX_KEY_LEFT_BACKSLASH none XK_less ++BX_KEY_LEFT_BRACKET none XK_Udiaeresis ++BX_KEY_LEFT_BRACKET none XK_diaeresis ++BX_KEY_LEFT_BRACKET none XK_udiaeresis ++BX_KEY_MENU none XK_Menu ++BX_KEY_MINUS none XK_backslash ++BX_KEY_MINUS none XK_question ++BX_KEY_MINUS none XK_ssharp ++BX_KEY_NUM_LOCK none XK_Num_Lock ++BX_KEY_PAGE_DOWN none XK_Page_Down ++BX_KEY_PAGE_UP none XK_Page_Up ++BX_KEY_PAUSE none XK_Break ++BX_KEY_PAUSE none XK_Pause ++BX_KEY_PERIOD none XK_colon ++BX_KEY_PERIOD none XK_period ++BX_KEY_PERIOD none XK_periodcentered ++BX_KEY_PRINT none XK_Print ++BX_KEY_PRINT none XK_Sys_Req ++BX_KEY_RIGHT none XK_Right ++BX_KEY_RIGHT_BRACKET none XK_asciitilde ++BX_KEY_RIGHT_BRACKET none XK_asterisk ++BX_KEY_RIGHT_BRACKET none XK_plus ++BX_KEY_SCRL_LOCK none XK_Scroll_Lock ++BX_KEY_SEMICOLON none XK_Odiaeresis ++BX_KEY_SEMICOLON none XK_odiaeresis ++BX_KEY_SHIFT_L none XK_Shift_L ++BX_KEY_SHIFT_R none XK_Shift_R ++BX_KEY_SINGLE_QUOTE none XK_Adiaeresis ++BX_KEY_SINGLE_QUOTE none XK_adiaeresis ++BX_KEY_SLASH none XK_dead_belowdot ++BX_KEY_SLASH none XK_minus ++BX_KEY_SLASH none XK_underscore ++BX_KEY_SPACE none XK_space ++BX_KEY_TAB none XK_ISO_Left_Tab ++BX_KEY_TAB none XK_Tab ++BX_KEY_UP none XK_Up ++BX_KEY_WIN_L none XK_Super_L ++BX_KEY_WIN_R none XK_Super_R +diff -urN clean/gui/keymaps/x11-pc-es.map bochs-paste/gui/keymaps/x11-pc-es.map +--- clean/gui/keymaps/x11-pc-es.map Wed Mar 6 04:31:55 2002 ++++ bochs-paste/gui/keymaps/x11-pc-es.map Mon Mar 11 09:44:48 2002 +@@ -1,186 +1,216 @@ +-# Bochs Keymap file : X11 - i386 - Spanish +-# Author : Vicente Hernando Ara ++# Bochs Keymap file ++# $Id: patch.paste,v 1.4 2002-03-11 14:46:28 bdenney Exp $ ++# Target: PC(x86) keyboard, US keymap ++# Author: Vicente Hernando Ara + # +-# Format : +-# Bochs key symbol = X11 key symbol (without XK_ prefix) ++# The keymap file describes the layout of a keyboard, and how it translates ++# into Bochs key codes. + # +- BX_KEY_0 = 0 +- BX_KEY_0 = equal +- BX_KEY_1 = 1 +- BX_KEY_1 = bar +- BX_KEY_1 = exclam +- BX_KEY_2 = 2 +- BX_KEY_2 = at +- BX_KEY_2 = quotedbl +- BX_KEY_3 = 3 +- BX_KEY_3 = numbersign +- BX_KEY_3 = periodcentered +- BX_KEY_4 = 4 +- BX_KEY_4 = dollar +- BX_KEY_5 = 5 +- BX_KEY_5 = percent +- BX_KEY_6 = 6 +- BX_KEY_6 = ampersand +- BX_KEY_7 = 7 +- BX_KEY_7 = slash +- BX_KEY_8 = 8 +- BX_KEY_8 = parenleft +- BX_KEY_9 = 9 +- BX_KEY_9 = parenright +- BX_KEY_A = A +- BX_KEY_A = a +- BX_KEY_B = B +- BX_KEY_B = b +- BX_KEY_C = C +- BX_KEY_C = c +- BX_KEY_D = D +- BX_KEY_D = d +- BX_KEY_E = E +- BX_KEY_E = EuroSign +- BX_KEY_E = e +- BX_KEY_F = F +- BX_KEY_F = f +- BX_KEY_G = G +- BX_KEY_G = g +- BX_KEY_H = H +- BX_KEY_H = h +- BX_KEY_I = I +- BX_KEY_I = i +- BX_KEY_J = J +- BX_KEY_J = j +- BX_KEY_K = K +- BX_KEY_K = k +- BX_KEY_L = L +- BX_KEY_L = l +- BX_KEY_M = M +- BX_KEY_M = m +- BX_KEY_N = N +- BX_KEY_N = n +- BX_KEY_O = O +- BX_KEY_O = o +- BX_KEY_P = P +- BX_KEY_P = p +- BX_KEY_Q = Q +- BX_KEY_Q = q +- BX_KEY_R = R +- BX_KEY_R = r +- BX_KEY_S = S +- BX_KEY_S = s +- BX_KEY_T = T +- BX_KEY_T = t +- BX_KEY_U = U +- BX_KEY_U = u +- BX_KEY_V = V +- BX_KEY_V = v +- BX_KEY_W = W +- BX_KEY_W = w +- BX_KEY_X = X +- BX_KEY_X = x +- BX_KEY_Y = Y +- BX_KEY_Y = y +- BX_KEY_Z = Z +- BX_KEY_Z = z +- BX_KEY_F1 = F1 +- BX_KEY_F2 = F2 +- BX_KEY_F3 = F3 +- BX_KEY_F4 = F4 +- BX_KEY_F5 = F5 +- BX_KEY_F6 = F6 +- BX_KEY_F7 = F7 +- BX_KEY_F8 = F8 +- BX_KEY_F9 = F9 +- BX_KEY_F10 = F10 +- BX_KEY_F11 = F11 +- BX_KEY_F12 = F12 +- BX_KEY_ALT_L = Alt_L +- BX_KEY_ALT_L = Meta_L +- BX_KEY_ALT_R = Mode_switch +- BX_KEY_ALT_R = Multi_key +- BX_KEY_BACKSLASH = Ccedilla +- BX_KEY_BACKSLASH = ccedilla +- BX_KEY_BACKSPACE = BackSpace +- BX_KEY_CAPS_LOCK = Caps_Lock +- BX_KEY_COMMA = comma +- BX_KEY_COMMA = semicolon +- BX_KEY_CTRL_L = Control_L +- BX_KEY_CTRL_R = Control_R +- BX_KEY_DELETE = Delete +- BX_KEY_DOWN = Down +- BX_KEY_END = End +- BX_KEY_ENTER = Return +- BX_KEY_EQUALS = exclamdown +- BX_KEY_EQUALS = questiondown +- BX_KEY_ESC = Escape +- BX_KEY_GRAVE = asciitilde +- BX_KEY_GRAVE = backslash +- BX_KEY_GRAVE = grave +- BX_KEY_GRAVE = masculine +- BX_KEY_GRAVE = ordfeminine +- BX_KEY_HOME = Home +- BX_KEY_INSERT = Insert +- BX_KEY_KP_5 = KP_5 +- BX_KEY_KP_5 = KP_Begin +- BX_KEY_KP_ADD = KP_Add +- BX_KEY_KP_DELETE = KP_Decimal +- BX_KEY_KP_DELETE = KP_Delete +- BX_KEY_KP_DIVIDE = KP_Divide +- BX_KEY_KP_DOWN = KP_2 +- BX_KEY_KP_DOWN = KP_Down +- BX_KEY_KP_END = KP_1 +- BX_KEY_KP_END = KP_End +- BX_KEY_KP_ENTER = KP_Enter +- BX_KEY_KP_HOME = KP_7 +- BX_KEY_KP_HOME = KP_Home +- BX_KEY_KP_INSERT = KP_0 +- BX_KEY_KP_INSERT = KP_Insert +- BX_KEY_KP_LEFT = KP_4 +- BX_KEY_KP_LEFT = KP_Left +- BX_KEY_KP_MULTIPLY = KP_Multiply +- BX_KEY_KP_PAGE_DOWN = KP_3 +- BX_KEY_KP_PAGE_DOWN = KP_Page_Down +- BX_KEY_KP_PAGE_UP = KP_9 +- BX_KEY_KP_PAGE_UP = KP_Page_Up +- BX_KEY_KP_RIGHT = KP_6 +- BX_KEY_KP_RIGHT = KP_Right +- BX_KEY_KP_SUBTRACT = KP_Subtract +- BX_KEY_KP_UP = KP_8 +- BX_KEY_KP_UP = KP_Up +- BX_KEY_LEFT = Left +- BX_KEY_LEFT_BACKSLASH = greater +- BX_KEY_LEFT_BACKSLASH = less +- BX_KEY_LEFT_BRACKET = braceleft +- BX_KEY_LEFT_BRACKET = bracketleft +- BX_KEY_LEFT_BRACKET = dead_circumflex +- BX_KEY_LEFT_BRACKET = dead_grave +- BX_KEY_MENU = Menu +- BX_KEY_MINUS = apostrophe +- BX_KEY_MINUS = question +- BX_KEY_NUM_LOCK = Num_Lock +- BX_KEY_PAGE_DOWN = Page_Down +- BX_KEY_PAGE_UP = Page_Up +- BX_KEY_PAUSE = Break +- BX_KEY_PAUSE = Pause +- BX_KEY_PERIOD = colon +- BX_KEY_PERIOD = period +- BX_KEY_PRINT = Print +- BX_KEY_PRINT = Sys_Req +- BX_KEY_RIGHT = Right +- BX_KEY_RIGHT_BRACKET = asterisk +- BX_KEY_RIGHT_BRACKET = braceright +- BX_KEY_RIGHT_BRACKET = bracketright +- BX_KEY_RIGHT_BRACKET = plus +- BX_KEY_SCRL_LOCK = Scroll_Lock +- BX_KEY_SEMICOLON = Ntilde +- BX_KEY_SEMICOLON = ntilde +- BX_KEY_SHIFT_L = Shift_L +- BX_KEY_SHIFT_R = Shift_R +- BX_KEY_SINGLE_QUOTE = dead_acute +- BX_KEY_SINGLE_QUOTE = dead_diaeresis +- BX_KEY_SLASH = minus +- BX_KEY_SLASH = underscore +- BX_KEY_SPACE = space +- BX_KEY_TAB = ISO_Left_Tab +- BX_KEY_TAB = Tab +- BX_KEY_UP = Up +- BX_KEY_WIN_L = Super_L +- BX_KEY_WIN_R = Super_R ++# Format: ++# BX_Keysym ASCII_equivalent Xwin_Keysym ++# ++# Or, for keys that require modifiers: ++# BX_Keysym+BX_Modifier ASCII_equivalent Xwin_Keysym ++# ++# BX_Keysym and BX_Modifier must be present in the bx_key_symbol[] list in ++# gui/keymap.cc. The BX_Modifier is usually a shift key press, but it ++# could be any key. Presently a maximum of one modifier is supported, but this ++# could be changed in keymap.h (structure def has only one slot for modifier), ++# keymap.cc (parsing code), and iodev/keyboard.cc (simulate keypresses for >1 ++# modifier). ++# ++# The ASCII_equivalent must be either apostrophe + one character + apostrophe, ++# or one of these keywords: space, return, tab, backslash, apostrophe, none. ++# This format is designed to look like a char constant in C, but it's a very ++# simple parser. There's no concept of backslash being an escape char. The ++# backslash and apostrophe entries are provided for aesthetic purposes only: no ++# C++ programmer wants to see '\' or '''. The parser doesn't care, but they are ++# ugly. ++# ++# Xwin_Keysym is the X windows equivalent of the key combination. These ++# codes should match whatever you find in /usr/X11R6/include/X11/keysymdef.h. ++# If you're running X windows, Bochs will take each of these Xwin_Keysyms, ++# pull off the XK_ in front, and use XStringToKeysym() to change them into ++# numerical codes. If this lookup fails, you will get a panic and you need ++# to edit the keymap file. ++# ++BX_KEY_0 none XK_0 ++BX_KEY_0 none XK_equal ++BX_KEY_1 none XK_1 ++BX_KEY_1 none XK_bar ++BX_KEY_1 none XK_exclam ++BX_KEY_2 none XK_2 ++BX_KEY_2 none XK_at ++BX_KEY_2 none XK_quotedbl ++BX_KEY_3 none XK_3 ++BX_KEY_3 none XK_numbersign ++BX_KEY_3 none XK_periodcentered ++BX_KEY_4 none XK_4 ++BX_KEY_4 none XK_dollar ++BX_KEY_5 none XK_5 ++BX_KEY_5 none XK_percent ++BX_KEY_6 none XK_6 ++BX_KEY_6 none XK_ampersand ++BX_KEY_7 none XK_7 ++BX_KEY_7 none XK_slash ++BX_KEY_8 none XK_8 ++BX_KEY_8 none XK_parenleft ++BX_KEY_9 none XK_9 ++BX_KEY_9 none XK_parenright ++BX_KEY_A none XK_A ++BX_KEY_A none XK_a ++BX_KEY_B none XK_B ++BX_KEY_B none XK_b ++BX_KEY_C none XK_C ++BX_KEY_C none XK_c ++BX_KEY_D none XK_D ++BX_KEY_D none XK_d ++BX_KEY_E none XK_E ++BX_KEY_E none XK_EuroSign ++BX_KEY_E none XK_e ++BX_KEY_F none XK_F ++BX_KEY_F none XK_f ++BX_KEY_G none XK_G ++BX_KEY_G none XK_g ++BX_KEY_H none XK_H ++BX_KEY_H none XK_h ++BX_KEY_I none XK_I ++BX_KEY_I none XK_i ++BX_KEY_J none XK_J ++BX_KEY_J none XK_j ++BX_KEY_K none XK_K ++BX_KEY_K none XK_k ++BX_KEY_L none XK_L ++BX_KEY_L none XK_l ++BX_KEY_M none XK_M ++BX_KEY_M none XK_m ++BX_KEY_N none XK_N ++BX_KEY_N none XK_n ++BX_KEY_O none XK_O ++BX_KEY_O none XK_o ++BX_KEY_P none XK_P ++BX_KEY_P none XK_p ++BX_KEY_Q none XK_Q ++BX_KEY_Q none XK_q ++BX_KEY_R none XK_R ++BX_KEY_R none XK_r ++BX_KEY_S none XK_S ++BX_KEY_S none XK_s ++BX_KEY_T none XK_T ++BX_KEY_T none XK_t ++BX_KEY_U none XK_U ++BX_KEY_U none XK_u ++BX_KEY_V none XK_V ++BX_KEY_V none XK_v ++BX_KEY_W none XK_W ++BX_KEY_W none XK_w ++BX_KEY_X none XK_X ++BX_KEY_X none XK_x ++BX_KEY_Y none XK_Y ++BX_KEY_Y none XK_y ++BX_KEY_Z none XK_Z ++BX_KEY_Z none XK_z ++BX_KEY_F1 none XK_F1 ++BX_KEY_F2 none XK_F2 ++BX_KEY_F3 none XK_F3 ++BX_KEY_F4 none XK_F4 ++BX_KEY_F5 none XK_F5 ++BX_KEY_F6 none XK_F6 ++BX_KEY_F7 none XK_F7 ++BX_KEY_F8 none XK_F8 ++BX_KEY_F9 none XK_F9 ++BX_KEY_F10 none XK_F10 ++BX_KEY_F11 none XK_F11 ++BX_KEY_F12 none XK_F12 ++BX_KEY_ALT_L none XK_Alt_L ++BX_KEY_ALT_L none XK_Meta_L ++BX_KEY_ALT_R none XK_Mode_switch ++BX_KEY_ALT_R none XK_Multi_key ++BX_KEY_BACKSLASH none XK_Ccedilla ++BX_KEY_BACKSLASH none XK_ccedilla ++BX_KEY_BACKSPACE none XK_BackSpace ++BX_KEY_CAPS_LOCK none XK_Caps_Lock ++BX_KEY_COMMA none XK_comma ++BX_KEY_COMMA none XK_semicolon ++BX_KEY_CTRL_L none XK_Control_L ++BX_KEY_CTRL_R none XK_Control_R ++BX_KEY_DELETE none XK_Delete ++BX_KEY_DOWN none XK_Down ++BX_KEY_END none XK_End ++BX_KEY_ENTER none XK_Return ++BX_KEY_EQUALS none XK_exclamdown ++BX_KEY_EQUALS none XK_questiondown ++BX_KEY_ESC none XK_Escape ++BX_KEY_GRAVE none XK_asciitilde ++BX_KEY_GRAVE none XK_backslash ++BX_KEY_GRAVE none XK_grave ++BX_KEY_GRAVE none XK_masculine ++BX_KEY_GRAVE none XK_ordfeminine ++BX_KEY_HOME none XK_Home ++BX_KEY_INSERT none XK_Insert ++BX_KEY_KP_5 none XK_KP_5 ++BX_KEY_KP_5 none XK_KP_Begin ++BX_KEY_KP_ADD none XK_KP_Add ++BX_KEY_KP_DELETE none XK_KP_Decimal ++BX_KEY_KP_DELETE none XK_KP_Delete ++BX_KEY_KP_DIVIDE none XK_KP_Divide ++BX_KEY_KP_DOWN none XK_KP_2 ++BX_KEY_KP_DOWN none XK_KP_Down ++BX_KEY_KP_END none XK_KP_1 ++BX_KEY_KP_END none XK_KP_End ++BX_KEY_KP_ENTER none XK_KP_Enter ++BX_KEY_KP_HOME none XK_KP_7 ++BX_KEY_KP_HOME none XK_KP_Home ++BX_KEY_KP_INSERT none XK_KP_0 ++BX_KEY_KP_INSERT none XK_KP_Insert ++BX_KEY_KP_LEFT none XK_KP_4 ++BX_KEY_KP_LEFT none XK_KP_Left ++BX_KEY_KP_MULTIPLY none XK_KP_Multiply ++BX_KEY_KP_PAGE_DOWN none XK_KP_3 ++BX_KEY_KP_PAGE_DOWN none XK_KP_Page_Down ++BX_KEY_KP_PAGE_UP none XK_KP_9 ++BX_KEY_KP_PAGE_UP none XK_KP_Page_Up ++BX_KEY_KP_RIGHT none XK_KP_6 ++BX_KEY_KP_RIGHT none XK_KP_Right ++BX_KEY_KP_SUBTRACT none XK_KP_Subtract ++BX_KEY_KP_UP none XK_KP_8 ++BX_KEY_KP_UP none XK_KP_Up ++BX_KEY_LEFT none XK_Left ++BX_KEY_LEFT_BACKSLASH none XK_greater ++BX_KEY_LEFT_BACKSLASH none XK_less ++BX_KEY_LEFT_BRACKET none XK_braceleft ++BX_KEY_LEFT_BRACKET none XK_bracketleft ++BX_KEY_LEFT_BRACKET none XK_dead_circumflex ++BX_KEY_LEFT_BRACKET none XK_dead_grave ++BX_KEY_MENU none XK_Menu ++BX_KEY_MINUS none XK_apostrophe ++BX_KEY_MINUS none XK_question ++BX_KEY_NUM_LOCK none XK_Num_Lock ++BX_KEY_PAGE_DOWN none XK_Page_Down ++BX_KEY_PAGE_UP none XK_Page_Up ++BX_KEY_PAUSE none XK_Break ++BX_KEY_PAUSE none XK_Pause ++BX_KEY_PERIOD none XK_colon ++BX_KEY_PERIOD none XK_period ++BX_KEY_PRINT none XK_Print ++BX_KEY_PRINT none XK_Sys_Req ++BX_KEY_RIGHT none XK_Right ++BX_KEY_RIGHT_BRACKET none XK_asterisk ++BX_KEY_RIGHT_BRACKET none XK_braceright ++BX_KEY_RIGHT_BRACKET none XK_bracketright ++BX_KEY_RIGHT_BRACKET none XK_plus ++BX_KEY_SCRL_LOCK none XK_Scroll_Lock ++BX_KEY_SEMICOLON none XK_Ntilde ++BX_KEY_SEMICOLON none XK_ntilde ++BX_KEY_SHIFT_L none XK_Shift_L ++BX_KEY_SHIFT_R none XK_Shift_R ++BX_KEY_SINGLE_QUOTE none XK_dead_acute ++BX_KEY_SINGLE_QUOTE none XK_dead_diaeresis ++BX_KEY_SLASH none XK_minus ++BX_KEY_SLASH none XK_underscore ++BX_KEY_SPACE none XK_space ++BX_KEY_TAB none XK_ISO_Left_Tab ++BX_KEY_TAB none XK_Tab ++BX_KEY_UP none XK_Up ++BX_KEY_WIN_L none XK_Super_L ++BX_KEY_WIN_R none XK_Super_R +diff -urN clean/gui/keymaps/x11-pc-fr.map bochs-paste/gui/keymaps/x11-pc-fr.map +--- clean/gui/keymaps/x11-pc-fr.map Wed Mar 6 04:31:55 2002 ++++ bochs-paste/gui/keymaps/x11-pc-fr.map Mon Mar 11 09:44:48 2002 +@@ -1,187 +1,217 @@ +-# Bochs Keymap file : X11 - i386 - French +-# Author : Christophe Bothamy ++# Bochs Keymap file ++# $Id: patch.paste,v 1.4 2002-03-11 14:46:28 bdenney Exp $ ++# Target: PC(x86) keyboard, US keymap ++# Author: Christophe Bothamy, Bryce Denney + # +-# Format : +-# Bochs key symbol = X11 key symbol (without XK_ prefix) ++# The keymap file describes the layout of a keyboard, and how it translates ++# into Bochs key codes. + # +- BX_KEY_0 = 0 +- BX_KEY_0 = agrave +- BX_KEY_0 = at +- BX_KEY_1 = 1 +- BX_KEY_1 = ampersand +- BX_KEY_2 = 2 +- BX_KEY_2 = asciitilde +- BX_KEY_2 = eacute +- BX_KEY_3 = 3 +- BX_KEY_3 = numbersign +- BX_KEY_3 = quotedbl +- BX_KEY_4 = 4 +- BX_KEY_4 = apostrophe +- BX_KEY_4 = braceleft +- BX_KEY_5 = 5 +- BX_KEY_5 = bracketleft +- BX_KEY_5 = parenleft +- BX_KEY_6 = 6 +- BX_KEY_6 = bar +- BX_KEY_6 = minus +- BX_KEY_7 = 7 +- BX_KEY_7 = egrave +- BX_KEY_7 = grave +- BX_KEY_8 = 8 +- BX_KEY_8 = backslash +- BX_KEY_8 = underscore +- BX_KEY_9 = 9 +- BX_KEY_9 = asciicircum +- BX_KEY_9 = ccedilla +- BX_KEY_A = Q +- BX_KEY_A = q +- BX_KEY_B = B +- BX_KEY_B = b +- BX_KEY_C = C +- BX_KEY_C = c +- BX_KEY_D = D +- BX_KEY_D = d +- BX_KEY_E = E +- BX_KEY_E = e +- BX_KEY_E = EuroSign +- BX_KEY_F = F +- BX_KEY_F = f +- BX_KEY_G = G +- BX_KEY_G = g +- BX_KEY_H = H +- BX_KEY_H = h +- BX_KEY_I = I +- BX_KEY_I = i +- BX_KEY_J = J +- BX_KEY_J = j +- BX_KEY_K = K +- BX_KEY_K = k +- BX_KEY_L = L +- BX_KEY_L = l +- BX_KEY_M = comma +- BX_KEY_M = question +- BX_KEY_N = N +- BX_KEY_N = n +- BX_KEY_O = O +- BX_KEY_O = o +- BX_KEY_P = P +- BX_KEY_P = p +- BX_KEY_Q = A +- BX_KEY_Q = a +- BX_KEY_R = R +- BX_KEY_R = r +- BX_KEY_S = S +- BX_KEY_S = s +- BX_KEY_T = T +- BX_KEY_T = t +- BX_KEY_U = U +- BX_KEY_U = u +- BX_KEY_V = V +- BX_KEY_V = v +- BX_KEY_W = Z +- BX_KEY_W = z +- BX_KEY_X = X +- BX_KEY_X = x +- BX_KEY_Y = Y +- BX_KEY_Y = y +- BX_KEY_Z = W +- BX_KEY_Z = w +- BX_KEY_F1 = F1 +- BX_KEY_F2 = F2 +- BX_KEY_F3 = F3 +- BX_KEY_F4 = F4 +- BX_KEY_F5 = F5 +- BX_KEY_F6 = F6 +- BX_KEY_F7 = F7 +- BX_KEY_F8 = F8 +- BX_KEY_F9 = F9 +- BX_KEY_F10 = F10 +- BX_KEY_F11 = F11 +- BX_KEY_F12 = F12 +- BX_KEY_ALT_L = Alt_L +- BX_KEY_ALT_L = Meta_L +- BX_KEY_ALT_R = Mode_switch +- BX_KEY_ALT_R = Multi_key +- BX_KEY_BACKSLASH = asterisk +- BX_KEY_BACKSLASH = mu +- BX_KEY_BACKSPACE = BackSpace +- BX_KEY_CAPS_LOCK = Caps_Lock +- BX_KEY_COMMA = period +- BX_KEY_COMMA = semicolon +- BX_KEY_CTRL_L = Control_L +- BX_KEY_CTRL_R = Control_R +- BX_KEY_DELETE = Delete +- BX_KEY_DOWN = Down +- BX_KEY_END = End +- BX_KEY_ENTER = Return +- BX_KEY_EQUALS = braceright +- BX_KEY_EQUALS = equal +- BX_KEY_EQUALS = plus +- BX_KEY_ESC = Escape +- BX_KEY_GRAVE = twosuperior +- BX_KEY_HOME = Home +- BX_KEY_INSERT = Insert +- BX_KEY_KP_5 = KP_5 +- BX_KEY_KP_5 = KP_Begin +- BX_KEY_KP_ADD = KP_Add +- BX_KEY_KP_DELETE = KP_Decimal +- BX_KEY_KP_DELETE = KP_Delete +- BX_KEY_KP_DIVIDE = KP_Divide +- BX_KEY_KP_DOWN = KP_2 +- BX_KEY_KP_DOWN = KP_Down +- BX_KEY_KP_END = KP_1 +- BX_KEY_KP_END = KP_End +- BX_KEY_KP_ENTER = KP_Enter +- BX_KEY_KP_HOME = KP_7 +- BX_KEY_KP_HOME = KP_Home +- BX_KEY_KP_INSERT = KP_0 +- BX_KEY_KP_INSERT = KP_Insert +- BX_KEY_KP_LEFT = KP_4 +- BX_KEY_KP_LEFT = KP_Left +- BX_KEY_KP_MULTIPLY = KP_Multiply +- BX_KEY_KP_PAGE_DOWN = KP_3 +- BX_KEY_KP_PAGE_DOWN = KP_Page_Down +- BX_KEY_KP_PAGE_UP = KP_9 +- BX_KEY_KP_PAGE_UP = KP_Page_Up +- BX_KEY_KP_RIGHT = KP_6 +- BX_KEY_KP_RIGHT = KP_Right +- BX_KEY_KP_SUBTRACT = KP_Subtract +- BX_KEY_KP_UP = KP_8 +- BX_KEY_KP_UP = KP_Up +- BX_KEY_LEFT = Left +- BX_KEY_LEFT_BACKSLASH = greater +- BX_KEY_LEFT_BACKSLASH = less +- BX_KEY_LEFT_BRACKET = dead_circumflex +- BX_KEY_LEFT_BRACKET = dead_diaeresis +- BX_KEY_MENU = Menu +- BX_KEY_MINUS = bracketright +- BX_KEY_MINUS = degree +- BX_KEY_MINUS = parenright +- BX_KEY_NUM_LOCK = Num_Lock +- BX_KEY_PAGE_DOWN = Page_Down +- BX_KEY_PAGE_UP = Page_Up +- BX_KEY_PAUSE = Break +- BX_KEY_PAUSE = Pause +- BX_KEY_PERIOD = colon +- BX_KEY_PERIOD = slash +- BX_KEY_PRINT = Print +- BX_KEY_PRINT = Sys_Req +- BX_KEY_RIGHT = Right +- BX_KEY_RIGHT_BRACKET = currency +- BX_KEY_RIGHT_BRACKET = dollar +- BX_KEY_RIGHT_BRACKET = sterling +- BX_KEY_SCRL_LOCK = Scroll_Lock +- BX_KEY_SEMICOLON = M +- BX_KEY_SEMICOLON = m +- BX_KEY_SHIFT_L = Shift_L +- BX_KEY_SHIFT_R = Shift_R +- BX_KEY_SINGLE_QUOTE = percent +- BX_KEY_SINGLE_QUOTE = ugrave +- BX_KEY_SLASH = exclam +- BX_KEY_SLASH = section +- BX_KEY_SPACE = space +- BX_KEY_TAB = ISO_Left_Tab +- BX_KEY_TAB = Tab +- BX_KEY_UP = Up +- BX_KEY_WIN_L = Super_L +- BX_KEY_WIN_R = Super_R ++# Format: ++# BX_Keysym ASCII_equivalent Xwin_Keysym ++# ++# Or, for keys that require modifiers: ++# BX_Keysym+BX_Modifier ASCII_equivalent Xwin_Keysym ++# ++# BX_Keysym and BX_Modifier must be present in the bx_key_symbol[] list in ++# gui/keymap.cc. The BX_Modifier is usually a shift key press, but it ++# could be any key. Presently a maximum of one modifier is supported, but this ++# could be changed in keymap.h (structure def has only one slot for modifier), ++# keymap.cc (parsing code), and iodev/keyboard.cc (simulate keypresses for >1 ++# modifier). ++# ++# The ASCII_equivalent must be either apostrophe + one character + apostrophe, ++# or one of these keywords: space, return, tab, backslash, apostrophe, none. ++# This format is designed to look like a char constant in C, but it's a very ++# simple parser. There's no concept of backslash being an escape char. The ++# backslash and apostrophe entries are provided for aesthetic purposes only: no ++# C++ programmer wants to see '\' or '''. The parser doesn't care, but they are ++# ugly. ++# ++# Xwin_Keysym is the X windows equivalent of the key combination. These ++# codes should match whatever you find in /usr/X11R6/include/X11/keysymdef.h. ++# If you're running X windows, Bochs will take each of these Xwin_Keysyms, ++# pull off the XK_ in front, and use XStringToKeysym() to change them into ++# numerical codes. If this lookup fails, you will get a panic and you need ++# to edit the keymap file. ++ ++BX_KEY_0 none XK_0 ++BX_KEY_0 none XK_agrave ++BX_KEY_0 none XK_at ++BX_KEY_1 none XK_1 ++BX_KEY_1 none XK_ampersand ++BX_KEY_2 none XK_2 ++BX_KEY_2 none XK_asciitilde ++BX_KEY_2 none XK_eacute ++BX_KEY_3 none XK_3 ++BX_KEY_3 none XK_numbersign ++BX_KEY_3 none XK_quotedbl ++BX_KEY_4 none XK_4 ++BX_KEY_4 none XK_apostrophe ++BX_KEY_4 none XK_braceleft ++BX_KEY_5 none XK_5 ++BX_KEY_5 none XK_bracketleft ++BX_KEY_5 none XK_parenleft ++BX_KEY_6 none XK_6 ++BX_KEY_6 none XK_bar ++BX_KEY_6 none XK_minus ++BX_KEY_7 none XK_7 ++BX_KEY_7 none XK_egrave ++BX_KEY_7 none XK_grave ++BX_KEY_8 none XK_8 ++BX_KEY_8 none XK_backslash ++BX_KEY_8 none XK_underscore ++BX_KEY_9 none XK_9 ++BX_KEY_9 none XK_asciicircum ++BX_KEY_9 none XK_ccedilla ++BX_KEY_A none XK_Q ++BX_KEY_A none XK_q ++BX_KEY_B none XK_B ++BX_KEY_B none XK_b ++BX_KEY_C none XK_C ++BX_KEY_C none XK_c ++BX_KEY_D none XK_D ++BX_KEY_D none XK_d ++BX_KEY_E none XK_E ++BX_KEY_E none XK_e ++BX_KEY_E none XK_EuroSign ++BX_KEY_F none XK_F ++BX_KEY_F none XK_f ++BX_KEY_G none XK_G ++BX_KEY_G none XK_g ++BX_KEY_H none XK_H ++BX_KEY_H none XK_h ++BX_KEY_I none XK_I ++BX_KEY_I none XK_i ++BX_KEY_J none XK_J ++BX_KEY_J none XK_j ++BX_KEY_K none XK_K ++BX_KEY_K none XK_k ++BX_KEY_L none XK_L ++BX_KEY_L none XK_l ++BX_KEY_M none XK_comma ++BX_KEY_M none XK_question ++BX_KEY_N none XK_N ++BX_KEY_N none XK_n ++BX_KEY_O none XK_O ++BX_KEY_O none XK_o ++BX_KEY_P none XK_P ++BX_KEY_P none XK_p ++BX_KEY_Q none XK_A ++BX_KEY_Q none XK_a ++BX_KEY_R none XK_R ++BX_KEY_R none XK_r ++BX_KEY_S none XK_S ++BX_KEY_S none XK_s ++BX_KEY_T none XK_T ++BX_KEY_T none XK_t ++BX_KEY_U none XK_U ++BX_KEY_U none XK_u ++BX_KEY_V none XK_V ++BX_KEY_V none XK_v ++BX_KEY_W none XK_Z ++BX_KEY_W none XK_z ++BX_KEY_X none XK_X ++BX_KEY_X none XK_x ++BX_KEY_Y none XK_Y ++BX_KEY_Y none XK_y ++BX_KEY_Z none XK_W ++BX_KEY_Z none XK_w ++BX_KEY_F1 none XK_F1 ++BX_KEY_F2 none XK_F2 ++BX_KEY_F3 none XK_F3 ++BX_KEY_F4 none XK_F4 ++BX_KEY_F5 none XK_F5 ++BX_KEY_F6 none XK_F6 ++BX_KEY_F7 none XK_F7 ++BX_KEY_F8 none XK_F8 ++BX_KEY_F9 none XK_F9 ++BX_KEY_F10 none XK_F10 ++BX_KEY_F11 none XK_F11 ++BX_KEY_F12 none XK_F12 ++BX_KEY_ALT_L none XK_Alt_L ++BX_KEY_ALT_L none XK_Meta_L ++BX_KEY_ALT_R none XK_Mode_switch ++BX_KEY_ALT_R none XK_Multi_key ++BX_KEY_BACKSLASH none XK_asterisk ++BX_KEY_BACKSLASH none XK_mu ++BX_KEY_BACKSPACE none XK_BackSpace ++BX_KEY_CAPS_LOCK none XK_Caps_Lock ++BX_KEY_COMMA none XK_period ++BX_KEY_COMMA none XK_semicolon ++BX_KEY_CTRL_L none XK_Control_L ++BX_KEY_CTRL_R none XK_Control_R ++BX_KEY_DELETE none XK_Delete ++BX_KEY_DOWN none XK_Down ++BX_KEY_END none XK_End ++BX_KEY_ENTER none XK_Return ++BX_KEY_EQUALS none XK_braceright ++BX_KEY_EQUALS none XK_equal ++BX_KEY_EQUALS none XK_plus ++BX_KEY_ESC none XK_Escape ++BX_KEY_GRAVE none XK_twosuperior ++BX_KEY_HOME none XK_Home ++BX_KEY_INSERT none XK_Insert ++BX_KEY_KP_5 none XK_KP_5 ++BX_KEY_KP_5 none XK_KP_Begin ++BX_KEY_KP_ADD none XK_KP_Add ++BX_KEY_KP_DELETE none XK_KP_Decimal ++BX_KEY_KP_DELETE none XK_KP_Delete ++BX_KEY_KP_DIVIDE none XK_KP_Divide ++BX_KEY_KP_DOWN none XK_KP_2 ++BX_KEY_KP_DOWN none XK_KP_Down ++BX_KEY_KP_END none XK_KP_1 ++BX_KEY_KP_END none XK_KP_End ++BX_KEY_KP_ENTER none XK_KP_Enter ++BX_KEY_KP_HOME none XK_KP_7 ++BX_KEY_KP_HOME none XK_KP_Home ++BX_KEY_KP_INSERT none XK_KP_0 ++BX_KEY_KP_INSERT none XK_KP_Insert ++BX_KEY_KP_LEFT none XK_KP_4 ++BX_KEY_KP_LEFT none XK_KP_Left ++BX_KEY_KP_MULTIPLY none XK_KP_Multiply ++BX_KEY_KP_PAGE_DOWN none XK_KP_3 ++BX_KEY_KP_PAGE_DOWN none XK_KP_Page_Down ++BX_KEY_KP_PAGE_UP none XK_KP_9 ++BX_KEY_KP_PAGE_UP none XK_KP_Page_Up ++BX_KEY_KP_RIGHT none XK_KP_6 ++BX_KEY_KP_RIGHT none XK_KP_Right ++BX_KEY_KP_SUBTRACT none XK_KP_Subtract ++BX_KEY_KP_UP none XK_KP_8 ++BX_KEY_KP_UP none XK_KP_Up ++BX_KEY_LEFT none XK_Left ++BX_KEY_LEFT_BACKSLASH none XK_greater ++BX_KEY_LEFT_BACKSLASH none XK_less ++BX_KEY_LEFT_BRACKET none XK_dead_circumflex ++BX_KEY_LEFT_BRACKET none XK_dead_diaeresis ++BX_KEY_MENU none XK_Menu ++BX_KEY_MINUS none XK_bracketright ++BX_KEY_MINUS none XK_degree ++BX_KEY_MINUS none XK_parenright ++BX_KEY_NUM_LOCK none XK_Num_Lock ++BX_KEY_PAGE_DOWN none XK_Page_Down ++BX_KEY_PAGE_UP none XK_Page_Up ++BX_KEY_PAUSE none XK_Break ++BX_KEY_PAUSE none XK_Pause ++BX_KEY_PERIOD none XK_colon ++BX_KEY_PERIOD none XK_slash ++BX_KEY_PRINT none XK_Print ++BX_KEY_PRINT none XK_Sys_Req ++BX_KEY_RIGHT none XK_Right ++BX_KEY_RIGHT_BRACKET none XK_currency ++BX_KEY_RIGHT_BRACKET none XK_dollar ++BX_KEY_RIGHT_BRACKET none XK_sterling ++BX_KEY_SCRL_LOCK none XK_Scroll_Lock ++BX_KEY_SEMICOLON none XK_M ++BX_KEY_SEMICOLON none XK_m ++BX_KEY_SHIFT_L none XK_Shift_L ++BX_KEY_SHIFT_R none XK_Shift_R ++BX_KEY_SINGLE_QUOTE none XK_percent ++BX_KEY_SINGLE_QUOTE none XK_ugrave ++BX_KEY_SLASH none XK_exclam ++BX_KEY_SLASH none XK_section ++BX_KEY_SPACE none XK_space ++BX_KEY_TAB none XK_ISO_Left_Tab ++BX_KEY_TAB none XK_Tab ++BX_KEY_UP none XK_Up ++BX_KEY_WIN_L none XK_Super_L ++BX_KEY_WIN_R none XK_Super_R diff -urN clean/gui/keymaps/x11-pc-us.map bochs-paste/gui/keymaps/x11-pc-us.map --- clean/gui/keymaps/x11-pc-us.map Wed Mar 6 04:31:55 2002 -+++ bochs-paste/gui/keymaps/x11-pc-us.map Mon Mar 11 09:23:44 2002 ++++ bochs-paste/gui/keymaps/x11-pc-us.map Mon Mar 11 09:44:48 2002 @@ -1,172 +1,204 @@ -# Bochs Keymap file : X11 - i386 - US -# Author : the Bochs team +# Bochs Keymap file -+# $Id: patch.paste,v 1.3 2002-03-11 14:39:26 bdenney Exp $ ++# $Id: patch.paste,v 1.4 2002-03-11 14:46:28 bdenney Exp $ +# Target: PC(x86) keyboard, US keymap +# Author: Christophe Bothamy, Bryce Denney #