StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keymap-dump: remove some ugly empty lines 

xkbcomp prints them too, but that's just annoying. Also xkb_keycodes
doesn't have it already.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2013-02-25 12:09:17 +02:00 committed by Daniel Stone
parent e95dac76f2
commit 4a59c84e43
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/keymap-dump.c
View File

@ -185,10 +185,10 @@ static bool
write_types(struct xkb_keymap *keymap, struct buf *buf)
{
if (keymap->types_section_name)
write_buf(buf, "xkb_types \"%s\" {\n\n",
write_buf(buf, "xkb_types \"%s\" {\n",
keymap->types_section_name);
else
write_buf(buf, "xkb_types {\n\n");
write_buf(buf, "xkb_types {\n");
write_vmods(keymap, buf);
@ -414,10 +414,10 @@ write_compat(struct xkb_keymap *keymap, struct buf *buf)
const struct xkb_led *led;
if (keymap->compat_section_name)
write_buf(buf, "xkb_compatibility \"%s\" {\n\n",
write_buf(buf, "xkb_compatibility \"%s\" {\n",
keymap->compat_section_name);
else
write_buf(buf, "xkb_compatibility {\n\n");
write_buf(buf, "xkb_compatibility {\n");
write_vmods(keymap, buf);
@ -495,10 +495,10 @@ write_symbols(struct xkb_keymap *keymap, struct buf *buf)
xkb_layout_index_t group;
if (keymap->symbols_section_name)
write_buf(buf, "xkb_symbols \"%s\" {\n\n",
write_buf(buf, "xkb_symbols \"%s\" {\n",
keymap->symbols_section_name);
else
write_buf(buf, "xkb_symbols {\n\n");
write_buf(buf, "xkb_symbols {\n");
for (group = 0; group < keymap->num_group_names; group++)
if (keymap->group_names[group])

3
test/data/keymaps/stringcomp.data
View File

@ -294,7 +294,6 @@ xkb_keycodes "evdev_aliases(qwerty)" {
};
xkb_types "complete" {
virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
type "ONE_LEVEL" {
@ -589,7 +588,6 @@ xkb_types "complete" {
};
xkb_compatibility "complete_caps(caps_lock)_4_misc(assign_shift_left_action)_4_level5(level5_lock)_4" {
virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
interpret.useModMapMods= AnyLevel;
@ -1073,7 +1071,6 @@ xkb_compatibility "complete_caps(caps_lock)_4_misc(assign_shift_left_action)_4_l
};
xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
name[group1]="English (US)";
name[group2]="Russian";
name[group3]="Canadian Multilingual";