|
From: <cnv...@us...> - 2008-05-21 21:07:46
|
Revision: 18795
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18795&view=rev
Author: cnvogelg
Date: 2008-05-21 14:07:49 -0700 (Wed, 21 May 2008)
Log Message:
-----------
chris/cocoa-port: fixed Mac OS X keyboard mapping. added separate symbolic mappings for german and us keyboards.
Modified Paths:
--------------
branches/chris/cocoa-port/vice/data/C64/Makefile.am
branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h
Added Paths:
-----------
branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm
branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm
Removed Paths:
-------------
branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm
Modified: branches/chris/cocoa-port/vice/data/C64/Makefile.am
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/Makefile.am 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/data/C64/Makefile.am 2008-05-21 21:07:49 UTC (rev 18795)
@@ -21,7 +21,8 @@
os2.vkm \
os2_sym.vkm \
osx_pos.vkm \
- osx_sym.vkm \
+ osx_sym_de.vkm \
+ osx_sym_us.vkm \
pc64.vpl \
ROdflt.vkm \
vice.vpl \
Modified: branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -21,15 +21,8 @@
# 2 left shift
# 4 right shift
# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
!CLEAR
!LSHIFT 1 7
@@ -42,7 +35,7 @@
3 2 5 8 /* F -> F */
4 3 5 8 /* H -> H */
5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
+6 1 4 8 /* Y -> Z */
7 2 7 8 /* X -> X */
8 2 4 8 /* C -> C */
9 3 7 8 /* V -> V */
@@ -52,7 +45,8 @@
13 1 1 8 /* W -> W */
14 1 6 8 /* E -> E */
15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
+
+16 3 1 8 /* Z -> Y */
17 2 6 8 /* T -> T */
18 7 0 8 /* 1 -> 1 */
19 7 3 8 /* 2 -> 2 */
@@ -68,6 +62,7 @@
29 4 3 8 /* 0 -> 0 */
30 6 1 8 /* Plus -> * */
31 4 6 8 /* O -> O */
+
32 3 6 8 /* U -> U */
33 5 6 8 /* "U -> @ */
34 4 1 8 /* I -> I */
@@ -84,23 +79,24 @@
45 4 7 8 /* N -> N */
46 4 4 8 /* M -> M */
47 5 4 8 /* . -> . */
+
48 7 2 8 /* TAB -> Ctrl */
49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
+50 7 5 8 /* < > -> CBM */
51 0 0 8 /* Backspace -> Del */
52 6 4 4 /* Enter -> Right Shift */
53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
56 1 7 2 /* Left Shift -> Left Shift */
#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
+58 7 5 8 /* Left Alt -> CBM */
59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
#64 -1 -1 0 /* (no key) */
#65 -1 -1 0 /* Numpad . -> (no key) */
#66 -1 -1 0 /* &&& -> (no key) */
@@ -116,6 +112,7 @@
#76 -1 -1 0 /* Numpad Enter -> (no key) */
#77 -1 -1 0 /* &&& -> (no key) */
#78 -1 -1 0 /* Numpad - -> (no key) */
+
#82 -1 -1 0 /* Numpad 0 -> (no key) */
#83 -1 -1 0 /* Numpad 1 -> (no key) */
#84 -1 -1 0 /* Numpad 2 -> (no key) */
@@ -126,53 +123,25 @@
#89 -1 -1 0 /* Numpad 7 -> (no key) */
#91 -1 -1 0 /* Numpad 8 -> (no key) */
#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
96 0 6 8 /* F5 -> F5 */
97 0 6 1 /* F6 -> F6 */
98 0 3 8 /* F7 -> F7 */
99 0 5 8 /* F3 -> F3 */
100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
115 6 3 8 /* Home -> CLR/HOME */
116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
118 0 5 1 /* F4 -> F4 */
120 0 4 1 /* F2 -> F2 */
121 6 0 8 /* PgDown -> Pound */
122 0 4 8 /* F1 -> F1 */
123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Deleted: branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -1,183 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 1 2 8 /* A -> A */
-1 1 5 8 /* S -> S */
-2 2 2 8 /* D -> D */
-3 2 5 8 /* F -> F */
-4 3 5 8 /* H -> H */
-5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
-7 2 7 8 /* X -> X */
-8 2 4 8 /* C -> C */
-9 3 7 8 /* V -> V */
-10 7 1 8 /* ^ -> Left Arrow */
-11 3 4 8 /* B -> B */
-12 7 6 8 /* Q -> Q */
-13 1 1 8 /* W -> W */
-14 1 6 8 /* E -> E */
-15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
-17 2 6 8 /* T -> T */
-18 7 0 8 /* 1 -> 1 */
-19 7 3 8 /* 2 -> 2 */
-20 1 0 8 /* 3 -> 3 */
-21 1 3 8 /* 4 -> 4 */
-22 2 3 8 /* 6 -> 6 */
-23 2 0 8 /* 5 -> 5 */
-24 5 3 8 /* ` -> Minus */
-25 4 0 8 /* 9 -> 9 */
-26 3 0 8 /* 7 -> 7 */
-27 5 0 8 /* \ss -> Plus */
-28 3 3 8 /* 8 -> 8 */
-29 4 3 8 /* 0 -> 0 */
-30 6 1 8 /* Plus -> * */
-31 4 6 8 /* O -> O */
-32 3 6 8 /* U -> U */
-33 5 6 8 /* "U -> @ */
-34 4 1 8 /* I -> I */
-35 5 1 8 /* P -> P */
-36 0 1 8 /* Return -> Return */
-37 5 2 8 /* L -> L */
-38 4 2 8 /* J -> J */
-39 6 2 8 /* "A -> ; */
-40 4 5 8 /* K -> K */
-41 5 5 8 /* "O -> : */
-42 6 5 8 /* Hash -> = */
-43 5 7 8 /* , -> , */
-44 6 7 8 /* Minus -> / */
-45 4 7 8 /* N -> N */
-46 4 4 8 /* M -> M */
-47 5 4 8 /* . -> . */
-48 7 2 8 /* TAB -> Ctrl */
-49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
-51 0 0 8 /* Backspace -> Del */
-52 6 4 4 /* Enter -> Right Shift */
-53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
-56 1 7 2 /* Left Shift -> Left Shift */
-#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
-59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
-#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
-#64 -1 -1 0 /* (no key) */
-#65 -1 -1 0 /* Numpad . -> (no key) */
-#66 -1 -1 0 /* &&& -> (no key) */
-#67 -1 -1 0 /* Numpad * -> (no key) */
-#68 -1 -1 0 /* (no key) */
-#69 -1 -1 0 /* Numpad + -> (no key) */
-#70 -1 -1 0 /* &&& -> (no key) */
-#71 -1 -1 0 /* Numpad Clear -> (no key) */
-#72 -1 -1 0 /* &&& -> (no key) */
-#73 -1 -1 0 /* &&& -> (no key) */
-#74 -1 -1 0 /* &&& -> (no key) */
-#75 -1 -1 0 /* Numpad / -> (no key) */
-#76 -1 -1 0 /* Numpad Enter -> (no key) */
-#77 -1 -1 0 /* &&& -> (no key) */
-#78 -1 -1 0 /* Numpad - -> (no key) */
-#82 -1 -1 0 /* Numpad 0 -> (no key) */
-#83 -1 -1 0 /* Numpad 1 -> (no key) */
-#84 -1 -1 0 /* Numpad 2 -> (no key) */
-#85 -1 -1 0 /* Numpad 3 -> (no key) */
-#86 -1 -1 0 /* Numpad 4 -> (no key) */
-#87 -1 -1 0 /* Numpad 5 -> (no key) */
-#88 -1 -1 0 /* Numpad 6 -> (no key) */
-#89 -1 -1 0 /* Numpad 7 -> (no key) */
-#91 -1 -1 0 /* Numpad 8 -> (no key) */
-#92 -1 -1 0 /* Numpad 9 -> (no key) */
-96 0 6 8 /* F5 -> F5 */
-97 0 6 1 /* F6 -> F6 */
-98 0 3 8 /* F7 -> F7 */
-99 0 5 8 /* F3 -> F3 */
-100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
-115 6 3 8 /* Home -> CLR/HOME */
-116 6 6 8 /* PgUp -> Up Arrow */
-118 0 5 1 /* F4 -> F4 */
-120 0 4 1 /* F2 -> F2 */
-121 6 0 8 /* PgDown -> Pound */
-122 0 4 8 /* F1 -> F1 */
-123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
-126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-123 -2 4 /* Left -> Joy2 LEFT */
-124 -2 6 /* Right -> Joy2 RIGHT */
-125 -2 2 /* Down -> Joy2 DOWN */
-126 -2 8 /* Up -> Joy2 UP */
-52 -2 0 /* Enter -> Joy2 BUTTON */
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Copied: branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm (from rev 18792, branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm)
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm (rev 0)
+++ branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -0,0 +1,154 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 3 1 8 /* Y -> Y */
+7 2 7 8 /* X -> X */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 1 4 8 /* Z -> Z */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 0 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 3 0 1 /* ` -> ´ ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 32 /* 7 -> 7 !! */
+26 6 7 16 /* 7 -> / !! */
+27 6 7 1 /* \ss -> ? ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 32 /* 0 -> 0 !! */
+29 6 5 16 /* 0 -> 0 !! */
+30 5 0 32 /* Plus -> + !! */
+30 6 1 16 /* Plus -> * !! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+#33 5 6 8 /* "U -> ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+#39 6 2 8 /* "A -> ! */
+40 4 5 8 /* K -> K */
+#41 5 5 8 /* "O -> ! */
+42 1 0 33 /* Hash -> # !! */
+42 3 0 1 /* Hash -> ' !! */
+43 5 7 32 /* , -> , !! */
+43 6 2 16 /* , -> ; !! */
+44 5 3 0 /* Minus -> Minus ! */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 32 /* . -> . !! */
+47 5 5 16 /* . -> : !! */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 5 7 33 /* < > -> < !! */
+50 5 4 1 /* < > -> > !! */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Added: branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm (rev 0)
+++ branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -0,0 +1,150 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 1 4 8 /* Z -> Z */
+7 2 7 8 /* X -> X ! */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 3 1 8 /* Y -> Y ! */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 8 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 6 5 32 /* = -> = ! */
+24 5 0 0 /* = -> + ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 8 /* 7 -> 7 */
+27 5 3 0 /* - -> - ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 8 /* 0 -> 0 */
+30 6 2 1 /* ] -> ] ! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+33 5 5 1 /* [ -> [ ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+39 3 0 33 /* ' -> ' ! */
+39 7 3 1 /* " -> " ! */
+40 4 5 8 /* K -> K */
+41 6 2 32 /* ; -> ; ! */
+41 5 5 16 /* ; -> : ! */
+42 6 6 8 /* \ -> Up Arrow ! */
+43 5 7 8 /* , -> , */
+44 6 7 8 /* / -> / */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 8 /* . -> . */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 7 5 8 /* < > -> CBM */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib 2008-05-21 21:07:49 UTC (rev 18795)
@@ -8,10 +8,10 @@
<integer>3</integer>
<key>IBOpenObjects</key>
<array>
- <integer>2</integer>
+ <integer>1</integer>
</array>
<key>IBSystem Version</key>
- <string>9B18</string>
+ <string>9C7010</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h 2008-05-21 21:07:49 UTC (rev 18795)
@@ -33,8 +33,8 @@
extern signed long kbd_arch_keyname_to_keynum(char *keyname);
extern const char *kbd_arch_keynum_to_keyname(signed long keynum);
-#define KBD_C64_SYM_US "osx_sym.vkm"
-#define KBD_C64_SYM_DE "osx_sym.vkm"
+#define KBD_C64_SYM_US "osx_sym_us.vkm"
+#define KBD_C64_SYM_DE "osx_sym_de.vkm"
#define KBD_C64_POS "osx_pos.vkm"
#define KBD_C128_SYM "osx_sym.vkm"
#define KBD_C128_POS "osx_pos.vkm"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|