summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvu <svu>2007-08-28 22:04:37 +0000
committersvu <svu>2007-08-28 22:04:37 +0000
commitf2809061b29168f3ab29e1069875fc0370fd5942 (patch)
tree4e7f35ce32338a2f32c12c14511fc3c5e60423b1
parent0281a93a543381bc1ce55062a4c0546474d7ea1d (diff)
renaming types
-rw-r--r--ChangeLog6
-rw-r--r--symbols/digital_vndr/pc4
-rw-r--r--symbols/group31
-rw-r--r--symbols/jp20
-rw-r--r--symbols/la4
-rw-r--r--symbols/level33
-rw-r--r--symbols/pc4
-rw-r--r--types/pc40
8 files changed, 72 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f289bc..1179484 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-28 Sergey Udaltsov
+
+ * symbols/group, symbols/jp, symbols/la, symbols/level3, symbols/pc,
+ symbols/digital_vndr/pc, types/pc: renaming types, giving more
+ sensible names
+
2007-08-27 Sergey Udaltsov
* keycodes/evdev: missing keycodes for evdev:
diff --git a/symbols/digital_vndr/pc b/symbols/digital_vndr/pc
index e390873..b1faec0 100644
--- a/symbols/digital_vndr/pc
+++ b/symbols/digital_vndr/pc
@@ -111,12 +111,12 @@ xkb_symbols "pc" {
key <FK11> { [ F11 ] };
key <FK12> { [ F12 ] };
key <PRSC> {
- type= "PC_SYSRQ",
+ type= "PC_ALT_LEVEL2",
symbols[Group1]= [ Print, Sys_Req ]
};
key <SCLK> { [ Scroll_Lock ] };
key <PAUS> {
- type= "PC_BREAK",
+ type= "PC_CONTROL_LEVEL2",
symbols[Group1]= [ Pause, Break ]
};
diff --git a/symbols/group b/symbols/group
index 68a3bdb..03d2250 100644
--- a/symbols/group
+++ b/symbols/group
@@ -102,11 +102,11 @@ xkb_symbols "shifts_toggle" {
partial modifier_keys
xkb_symbols "ctrl_shift_toggle" {
key <LFSH> {
- type[Group1]="PC_BREAK",
+ type[Group1]="PC_CONTROL_LEVEL2",
symbols[Group1]= [ Shift_L, ISO_Prev_Group ]
};
key <RTSH> {
- type[Group1]="PC_BREAK",
+ type[Group1]="PC_CONTROL_LEVEL2",
symbols[Group1]= [ Shift_R, ISO_Next_Group ]
};
key <LCTL> { [ Control_L, ISO_Prev_Group ] };
@@ -120,7 +120,7 @@ xkb_symbols "ctrl_shift_toggle" {
partial modifier_keys
xkb_symbols "lctrl_lshift_toggle" {
key <LFSH> {
- type[Group1]="PC_BREAK",
+ type[Group1]="PC_CONTROL_LEVEL2",
symbols[Group1]= [ Shift_L, ISO_Next_Group ]
};
key <LCTL> { [ Control_L, ISO_Next_Group ] };
@@ -150,21 +150,21 @@ partial modifier_keys
xkb_symbols "ctrl_alt_toggle" {
virtual_modifiers Alt;
key <LALT> {
- type[Group1]="PC_BREAK",
+ type[Group1]="PC_CONTROL_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Prev_Group ],
virtualMods= Alt
};
key <RALT> {
- type[Group1]="PC_BREAK",
+ type[Group1]="PC_CONTROL_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Next_Group ],
virtualMods= Alt
};
key <LCTL> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Control_L, ISO_Prev_Group ]
};
key <RCTL> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Control_R, ISO_Next_Group ]
};
};
@@ -186,11 +186,11 @@ xkb_symbols "alt_shift_toggle" {
virtualMods= Alt
};
key <LFSH> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Shift_L, ISO_Prev_Group ]
};
key <RTSH> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Shift_R, ISO_Next_Group ]
};
};
@@ -230,13 +230,13 @@ xkb_symbols "rwin_toggle" {
// Both Ctrls pressed together toggle group
partial modifier_keys
xkb_symbols "ctrls_toggle" {
- virtual_modifiers AltGr;
+ virtual_modifiers Control;
key <LCTL> {
- type[Group1]="PC_BREAK",
+ type[Group1]="PC_CONTROL_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Prev_Group ]
};
key <RCTL> {
- type[Group1]="PC_BREAK",
+ type[Group1]="PC_CONTROL_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Next_Group ]
};
};
@@ -244,14 +244,13 @@ xkb_symbols "ctrls_toggle" {
// Both Alts pressed together toggle group
partial modifier_keys
xkb_symbols "alts_toggle" {
- virtual_modifiers Alt;
key <LALT> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Prev_Group ],
virtualMods= Alt
};
key <RALT> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ NoSymbol, ISO_Next_Group ],
virtualMods= Alt
};
@@ -313,7 +312,7 @@ xkb_symbols "rctrl_toggle" {
partial modifier_keys
xkb_symbols "alt_caps_toggle" {
key <CAPS> {
- type="PC_SYSRQ",
+ type="PC_ALT_LEVEL2",
symbols[Group1]= [ Caps_Lock, ISO_Next_Group]
};
};
diff --git a/symbols/jp b/symbols/jp
index 79f124e..d976821 100644
--- a/symbols/jp
+++ b/symbols/jp
@@ -19,7 +19,7 @@ xkb_symbols "common" {
// Alphanumeric section
key <HZTG> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
};
@@ -80,27 +80,27 @@ xkb_symbols "common" {
key <NFER> { [ Muhenkan ] };
key <XFER> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Henkan, Mode_switch ]
};
key <HKTG> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Hiragana_Katakana, Romaji ]
};
key <EISU> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Eisu_toggle ]
};
key <KANA> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Hiragana_Katakana ]
};
key <PRSC> {
- type[Group1]= "PC_SYSRQ",
+ type[Group1]= "PC_ALT_LEVEL2",
symbols[Group1]= [ Print, Execute ]
};
};
@@ -122,7 +122,7 @@ xkb_symbols "kana" {
// Alphanumeric section
key <HZTG> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
};
key <AE01> { [ kana_NU ] };
@@ -182,18 +182,18 @@ xkb_symbols "kana" {
key <NFER> { [ Muhenkan ] };
key <XFER> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Henkan, Mode_switch ]
};
key <HKTG> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Hiragana_Katakana, Romaji ]
};
// End alphanumeric section
key <PRSC> {
- type[Group1]= "PC_SYSRQ",
+ type[Group1]= "PC_ALT_LEVEL2",
symbols[Group1]= [ Print, Execute ]
};
};
diff --git a/symbols/la b/symbols/la
index 99e9cf9..b050cc4 100644
--- a/symbols/la
+++ b/symbols/la
@@ -67,11 +67,11 @@ xkb_symbols "basic" {
key <AB10> { [ 0x1000e9d, parenright ]};
override key <LFSH> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
[ Shift_L, ISO_First_Group ]
};
override key <RTSH> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
[ Shift_R, ISO_Last_Group ]
};
};
diff --git a/symbols/level3 b/symbols/level3
index 6d53ef1..644c8ef 100644
--- a/symbols/level3
+++ b/symbols/level3
@@ -48,8 +48,9 @@ xkb_symbols "ralt_switch_multikey" {
//
partial hidden modifier_keys
xkb_symbols "ralt_switch_for_alts_toggle" {
+ virtual_modifiers LAlt, AlGr;
key <LALT> {
- type[Group1]="PC_SYSRQ",
+ type[Group1]="PC_ALT_LEVEL2",
symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ]
};
key <RALT> {
diff --git a/symbols/pc b/symbols/pc
index 36f6890..0ce0ae7 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -122,12 +122,12 @@ xkb_symbols "function" {
partial hidden alphanumeric_keys
xkb_symbols "editing" {
key <PRSC> {
- type= "PC_SYSRQ",
+ type= "PC_ALT_LEVEL2",
symbols[Group1]= [ Print, Sys_Req ]
};
key <SCLK> { [ Scroll_Lock ] };
key <PAUS> {
- type= "PC_BREAK",
+ type= "PC_CONTROL_LEVEL2",
symbols[Group1]= [ Pause, Break ]
};
key <INS> { [ Insert ] };
diff --git a/types/pc b/types/pc
index b049755..9d20c12 100644
--- a/types/pc
+++ b/types/pc
@@ -8,8 +8,12 @@ partial default xkb_types "default" {
// a PC compatible keyboard.
virtual_modifiers Alt;
virtual_modifiers LevelThree;
+ virtual_modifiers LAlt;
+ virtual_modifiers RAlt;
+ virtual_modifiers RControl;
+ virtual_modifiers LControl;
- type "PC_BREAK" {
+ type "PC_CONTROL_LEVEL2" {
modifiers = Control;
map[None] = Level1;
map[Control] = Level2;
@@ -17,6 +21,22 @@ partial default xkb_types "default" {
level_name[Level2] = "Control";
};
+ type "PC_LCONTROL_LEVEL2" {
+ modifiers = LControl;
+ map[None] = Level1;
+ map[LControl] = Level2;
+ level_name[Level1] = "Base";
+ level_name[Level2] = "LControl";
+ };
+
+ type "PC_RCONTROL_LEVEL2" {
+ modifiers = RControl;
+ map[None] = Level1;
+ map[RControl] = Level2;
+ level_name[Level1] = "Base";
+ level_name[Level2] = "RControl";
+ };
+
type "PC_ALT_LEVEL2" {
modifiers = Alt;
map[None] = Level1;
@@ -25,14 +45,20 @@ partial default xkb_types "default" {
level_name[Level2] = "Alt";
};
- type "PC_SYSRQ" {
- modifiers = Alt+LevelThree;
+ type "PC_LALT_LEVEL2" {
+ modifiers = LAlt;
map[None] = Level1;
- map[Alt] = Level2;
- map[LevelThree] = Level3;
+ map[LAlt] = Level2;
level_name[Level1] = "Base";
- level_name[Level2] = "Alt";
- level_name[Level3] = "Level3";
+ level_name[Level2] = "LAlt";
+ };
+
+ type "PC_RALT_LEVEL2" {
+ modifiers = RAlt;
+ map[None] = Level1;
+ map[RAlt] = Level2;
+ level_name[Level1] = "Base";
+ level_name[Level2] = "RAlt";
};
type "CTRL+ALT" {