~jm-leddy/ubuntu/precise/xkeyboard-config/micmute

« back to all changes in this revision

Viewing changes to types/pc

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-01-24 00:35:43 UTC
  • mfrom: (12.3.3 sid)
  • Revision ID: package-import@ubuntu.com-20120124003543-crh44mpwp2rmb195
Tags: 2.5-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu changes:
  + rules, xkb-data-i18n.install, xkb-data.install: Split out
    xkb-data-i18n to be used by console-setup.
  + 105_intelligent_keyboard.patch: Add support for the Intelligent
    Keyboard K04
  + 108_fix_intltool_make_check.diff: Fix make check in the presence
    of the quilt patch system.
  + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration
    settings from dvorak-intl to dvorak-alt-intl to match rename in
    xkeyboard-config 1.9. (LP: 742683)
* xkb-data.install: Add missing directories (man, pkgconfig).
* xkb-data.postinst: Remove the xkb cache to make sure it gets regenerated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
59
59
    };
60
60
 
61
61
    type "CTRL+ALT" {
62
 
        modifiers = Control+Alt;
63
 
        map[Control+Alt] = Level2;
64
 
        level_name[Level1] = "Base";
65
 
        level_name[Level2] = "Ctrl+Alt";
 
62
        modifiers = Control+Alt+Shift+LevelThree;
 
63
        map[None] = Level1;
 
64
        map[Shift] = Level2;
 
65
        map[LevelThree] = Level3;
 
66
        map[Shift+LevelThree] = Level4;
 
67
        map[Control+Alt] = Level5;
 
68
        level_name[Level1] = "Base";
 
69
        level_name[Level2] = "Shift";
 
70
        level_name[Level3] = "Alt Base";
 
71
        level_name[Level4] = "Shift Alt";
 
72
        level_name[Level5] = "Ctrl+Alt";
66
73
    };
67
74
 
68
75
   // Local eight level