Skip to content

Commit 3fd51ec

Browse files
wismillwismill
committed
MyMod → VMod
1 parent b5e3084 commit 3fd51ec

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎test/data/keymaps/real-modifiers.xkb

+35-35
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ xkb_keycodes "test" {
2626

2727
xkb_types "complete" {
2828
// Define a buch of virtual modifier to test mappings to Mod5-Mod10 real
29-
// modifiers. WonderMod will be mapped to Mod5+Mod6.
30-
virtual_modifiers MyMod5,MyMod6,MyMod6,MyMod7,MyMod8,MyMod9,MyMod10,WonderMod;
29+
// modifiers. VMod11 will be mapped to Mod5+Mod6.
30+
virtual_modifiers VMod5,VMod6,VMod6,VMod7,VMod8,VMod9,VMod10,VMod11;
3131

3232
type "ONE_LEVEL" {
3333
modifiers= none;
@@ -40,16 +40,16 @@ xkb_types "complete" {
4040
level_name[2]= "Shift";
4141
};
4242
type "SOOO_MANY_LEVELS" {
43-
modifiers = Shift+MyMod5+MyMod6+MyMod6+MyMod7+MyMod8+MyMod9+MyMod10+WonderMod;
43+
modifiers = Shift+VMod5+VMod6+VMod6+VMod7+VMod8+VMod9+VMod10+VMod11;
4444
map[Shift] = 2;
45-
map[MyMod5] = 3;
46-
map[MyMod6] = 4;
47-
map[MyMod6+Shift] = 5;
48-
map[MyMod7] = 6;
49-
map[MyMod8] = 7;
50-
map[MyMod9] = 8;
51-
map[MyMod10] = 9;
52-
map[WonderMod] = 10;
45+
map[VMod5] = 3;
46+
map[VMod6] = 4;
47+
map[VMod6+Shift] = 5;
48+
map[VMod7] = 6;
49+
map[VMod8] = 7;
50+
map[VMod9] = 8;
51+
map[VMod10] = 9;
52+
map[VMod11] = 10;
5353
level_name[1] = "1";
5454
level_name[2] = "2";
5555
level_name[3] = "3";
@@ -67,7 +67,7 @@ xkb_compatibility "complete" {
6767
interpret.repeat= False;
6868
interpret.locking= False;
6969

70-
virtual_modifiers MyMod5,MyMod6,MyMod7,MyMod8,MyMod9,MyMod10,WonderMod;
70+
virtual_modifiers VMod5,VMod6,VMod7,VMod8,VMod9,VMod10,VMod11;
7171

7272
interpret Any+AnyOf(all) {
7373
action = SetMods(modifiers=modMapMods,clearLocks);
@@ -76,43 +76,43 @@ xkb_compatibility "complete" {
7676
// Define some letter keysyms as custom modifiers
7777
interpret Q {
7878
useModMapMods = level1;
79-
virtualModifier = MyMod5;
80-
action = SetMods(modifiers=MyMod5);
79+
virtualModifier = VMod5;
80+
action = SetMods(modifiers=VMod5);
8181
};
8282
interpret W {
8383
useModMapMods = level1;
84-
virtualModifier = MyMod6;
85-
action = SetMods(modifiers=MyMod6);
84+
virtualModifier = VMod6;
85+
action = SetMods(modifiers=VMod6);
8686
};
8787
interpret E {
8888
useModMapMods = level1;
89-
virtualModifier = MyMod7;
90-
action = SetMods(modifiers=MyMod7);
89+
virtualModifier = VMod7;
90+
action = SetMods(modifiers=VMod7);
9191
};
9292
interpret R {
9393
useModMapMods = level1;
94-
virtualModifier = MyMod8;
95-
action = SetMods(modifiers=MyMod8);
94+
virtualModifier = VMod8;
95+
action = SetMods(modifiers=VMod8);
9696
};
9797
interpret T {
9898
useModMapMods = level1;
99-
virtualModifier = MyMod9;
100-
action = SetMods(modifiers=MyMod9);
99+
virtualModifier = VMod9;
100+
action = SetMods(modifiers=VMod9);
101101
};
102102
interpret Y {
103103
useModMapMods = level1;
104-
virtualModifier = MyMod10;
105-
action = SetMods(modifiers=MyMod10);
104+
virtualModifier = VMod10;
105+
action = SetMods(modifiers=VMod10);
106106
};
107107
interpret U {
108108
useModMapMods = level1;
109-
virtualModifier = WonderMod;
110-
action = SetMods(modifiers=WonderMod);
109+
virtualModifier = VMod11;
110+
action = SetMods(modifiers=VMod11);
111111
};
112112
interpret I {
113113
useModMapMods = level1;
114-
virtualModifier = WonderMod;
115-
action = SetMods(modifiers=WonderMod);
114+
virtualModifier = VMod11;
115+
action = SetMods(modifiers=VMod11);
116116
};
117117
};
118118
xkb_symbols {
@@ -124,31 +124,31 @@ xkb_symbols {
124124
key <LFSH> { [Shift_L] };
125125
modifier_map Shift { <LFSH> };
126126

127-
// virtual modifier: MyMod5
127+
// virtual modifier: VMod5
128128
key <AD01> { [Q] };
129129
modifier_map Mod5 { <AD01> };
130130

131-
// virtual modifier: MyMod6
131+
// virtual modifier: VMod6
132132
key <AD02> { [W] };
133133
modifier_map Mod6 { <AD02> }; // real modifier not supported by X11
134134

135-
// virtual modifier: MyMod7
135+
// virtual modifier: VMod7
136136
key <AD03> { [E] };
137137
modifier_map Mod7 { <AD03> }; // real modifier not supported by X11
138138

139-
// virtual modifier: MyMod8
139+
// virtual modifier: VMod8
140140
key <AD04> { [R] };
141141
modifier_map Mod8 { <AD04> }; // real modifier not supported by X11
142142

143-
// virtual modifier: MyMod9
143+
// virtual modifier: VMod9
144144
key <AD05> { [T] };
145145
modifier_map Mod9 { <AD05> }; // real modifier not supported by X11
146146

147-
// virtual modifier: MyMod10
147+
// virtual modifier: VMod10
148148
key <AD06> { [Y] };
149149
modifier_map Mod10 { <AD06> }; // real modifier not supported by X11
150150

151-
// virtual modifier: WonderMod (Mod5+Mod6)
151+
// virtual modifier: VMod11 (Mod5+Mod6)
152152
key <AD07> { [U] };
153153
modifier_map Mod5 { <AD07> };
154154
key <AD08> { [I] };

‎test/modifiers.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,14 @@ test_real_mods(void)
173173
assert(keycode != XKB_KEYCODE_INVALID);
174174
key = XkbKey(keymap, keycode);
175175
assert(key->modmap == Mod5Mask);
176-
/* Test that MyMod5 is the first defined virtual modifier */
176+
/* Test that VMod5 is the first defined virtual modifier */
177177
assert(key->vmodmap == HighestRealMask << 1);
178178

179179
keycode = xkb_keymap_key_by_name(keymap, "AD02");
180180
assert(keycode != XKB_KEYCODE_INVALID);
181181
key = XkbKey(keymap, keycode);
182182
assert(key->modmap == Mod6Mask);
183-
/* Test that MyMod5 is the second defined virtual modifier */
183+
/* Test that VMod5 is the second defined virtual modifier */
184184
assert(key->vmodmap == HighestRealMask << 2);
185185

186186
/* Test that we get the expected keysym for each level of KEY_O (<AD09>).
@@ -192,44 +192,44 @@ test_real_mods(void)
192192
KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
193193
KEY_O, BOTH, XKB_KEY_2, NEXT,
194194
KEY_LEFTSHIFT, UP, XKB_KEY_Shift_L, NEXT,
195-
/* Level 3 (MyMod5 = Mod5) */
195+
/* Level 3 (VMod5 = Mod5) */
196196
KEY_Q, DOWN, XKB_KEY_Q, NEXT,
197197
KEY_O, BOTH, XKB_KEY_3, NEXT,
198198
KEY_Q, UP, XKB_KEY_Q, NEXT,
199-
/* Level 4 (MyMod6 = Mod6) */
199+
/* Level 4 (VMod6 = Mod6) */
200200
KEY_W, DOWN, XKB_KEY_W, NEXT,
201201
KEY_O, BOTH, XKB_KEY_4, NEXT,
202-
/* Level 5 (MyMod6 + Shift = Mod6 + Shift) */
202+
/* Level 5 (VMod6 + Shift = Mod6 + Shift) */
203203
KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT,
204204
KEY_O, BOTH, XKB_KEY_5, NEXT,
205205
KEY_LEFTSHIFT, UP, XKB_KEY_Shift_L, NEXT,
206206
KEY_W, UP, XKB_KEY_W, NEXT,
207-
/* Level 6 (MyMod7 = Mod7) */
207+
/* Level 6 (VMod7 = Mod7) */
208208
KEY_E, DOWN, XKB_KEY_E, NEXT,
209209
KEY_O, BOTH, XKB_KEY_6, NEXT,
210210
KEY_E, UP, XKB_KEY_E, NEXT,
211-
/* Level 7 (MyMod8 = Mod8) */
211+
/* Level 7 (VMod8 = Mod8) */
212212
KEY_R, DOWN, XKB_KEY_R, NEXT,
213213
KEY_O, BOTH, XKB_KEY_7, NEXT,
214214
KEY_R, UP, XKB_KEY_R, NEXT,
215-
/* Level 8 (MyMod9 = Mod9) */
215+
/* Level 8 (VMod9 = Mod9) */
216216
KEY_T, DOWN, XKB_KEY_T, NEXT,
217217
KEY_O, BOTH, XKB_KEY_8, NEXT,
218218
KEY_T, UP, XKB_KEY_T, NEXT,
219-
/* Level 9 (MyMod10 = Mod10) */
219+
/* Level 9 (VMod10 = Mod10) */
220220
KEY_Y, DOWN, XKB_KEY_Y, NEXT,
221221
KEY_O, BOTH, XKB_KEY_9, NEXT,
222222
KEY_Y, UP, XKB_KEY_Y, NEXT,
223-
/* Level 10 using KEY_U (WonderMod = Mod5 + Mod6) */
223+
/* Level 10 using KEY_U (VMod11 = Mod5 + Mod6) */
224224
KEY_U, DOWN, XKB_KEY_U, NEXT,
225225
KEY_O, BOTH, XKB_KEY_A, NEXT,
226226
KEY_U, UP, XKB_KEY_U, NEXT,
227-
/* Level 10 using KEY_I (WonderMod = Mod5 + Mod6) */
227+
/* Level 10 using KEY_I (VMod11 = Mod5 + Mod6) */
228228
KEY_I, DOWN, XKB_KEY_I, NEXT,
229229
KEY_O, BOTH, XKB_KEY_A, NEXT,
230230
KEY_I, UP, XKB_KEY_I, NEXT,
231231
/* Level 10 using KEY_Q + KEY_W
232-
* MyMod5 + MyMod6 = Mod5 + Mod6 = WonderMod */
232+
* VMod5 + VMod6 = Mod5 + Mod6 = VMod11 */
233233
KEY_Q, DOWN, XKB_KEY_Q, NEXT,
234234
KEY_W, DOWN, XKB_KEY_W, NEXT,
235235
KEY_O, BOTH, XKB_KEY_A, NEXT,

0 commit comments

Comments
 (0)