summaryrefslogtreecommitdiff
path: root/types
Commit message (Collapse)AuthorAgeFilesLines
* types/level5: correct two specifications, to not swap levels 3 and 4Benno Schulenberg2023-04-271-2/+2
| | | | | | | | | | | | | | Just like Lock does not swap levels 3 and 4 when just LevelThree and maybe Shift are in effect for EIGHT_LEVEL_ALPHABETIC_WITH_LEVEL5_LOCK, Lock should *also* not swap those levels when also the LevelFive-Lock (NumLock) *and* LevelFive itself are in effect. This fixes issue #381. Problem existed since the EIGHT_LEVEL_ALPHABETIC_WITH_LEVEL5_LOCK type was introduced, in commit 39124ccf14, thirteen years ago. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* compat,types: harmonize some whitespace, and reshuffle some linesBenno Schulenberg2023-04-116-25/+28
| | | | Also, add some level specifications for clarity, although unneeded.
* types: move an 8-level type to the file with the other 8-level typesBenno Schulenberg2023-04-102-39/+37
| | | | | | Also rename it, so that the name is more descriptive. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* types: sort the includes mostly according to increasing number of levelsBenno Schulenberg2023-04-102-3/+3
| | | | | | | | | | This looks better when doing `xkbcomp :0 - | less`. The 'mousekeys' is placed last because the type is rather special and irrelevant (used only in three vendor layouts) and related to the numeric keypad. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* rename two eight-level types to be more readableBenno Schulenberg2023-04-101-2/+2
| | | | | | | | The "EIGHT_LEVEL_LEVEL_FIVE_LOCK" name was too condensed to make sense. With "EIGHT_LEVEL_WITH_LEVEL5_LOCK" the reader has at least a chance of understanding it. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* types/level5: drop the Lock modifier when it does nothingBenno Schulenberg2023-04-101-24/+1
| | | | | | | | | When a modifier should not have any effect on which level is chosen by the other modifiers, then the easiest way is to not mention this modifier amongst the modifiers that the type uses -- see for example the various non-alphabetic four-level types. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* types: group the basic four-level keypad type next to its sisterBenno Schulenberg2023-04-102-25/+16
| | | | | | | | | | | | Seventeen years ago, commit e3a93b0f51 wanted to distinguish between a normal keypad and a Mac keypad by redefining the FOUR_LEVEL_KEYPAD type when a Mac was used. Five years later, commit 566b887f8e removed this tweaked type again, causing the types in types/numpad to always include 'extra(keypad)'. Avoid these repetitive includes and group the FOUR_LEVEL_KEYPAD type (which, by the way, is not used anywhere) before its FOUR_LEVEL_MIXED_KEYPAD variant. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* types: improve the naming of the levels, distinguishing AltGr from AltBenno Schulenberg2023-04-044-54/+54
| | | | | | | | | | Types like "CTRL+ALT" and "FOUR_LEVEL_X" use both AltGr and Alt as modifiers -- it is then confusing to refer to both as "Alt". Also, using the word "Base" in the name for any level above the base level is not helpful, so drop those. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* types: consistently mention Shift before Lock (except for neater types)Benno Schulenberg2022-06-2910-279/+274
| | | | Also, use leading tabs where possible, and normalize other whitespace.
* types: specify the correct level for Shift+Lock+LevelFiveBenno Schulenberg2022-06-281-3/+4
| | | | | | | | | | | | | | For alphabetic types (full or semi), Shift should cancel CapsLock. Thus, add the missing level specification for EIGHT_LEVEL_ALPHABETIC and correct the level specification for EIGHT_LEVEL_SEMIALPHABETIC. This fixes issue #332. Bug existed since commit 075eed027d from seventeen years ago, when the eight-level types were introduced, and since commit 237cbf9989 from ten years ago, when the semi-alpha type was improperly fixed. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* harmonize some whitespace, to slightly improve readabilityBenno Schulenberg2022-06-059-32/+33
| | | | | Also, reshuffle an option to after the ones that it includes, as is done elsewhere in the file.
* types: put the eight-level semialphabetic type in a more logical positionBenno Schulenberg2022-06-031-38/+38
| | | | | | | | Twelve years ago, commit 39124ccf14 inserted two new eight-level types between the plain alphabetic and semialphabetic types, but these latter two logically belong together. So, place them together again. Also, improve a comment, and remove a modifier that is not used here.
* condense and correct four comments -- NumLock is a virtual modifierBenno Schulenberg2022-06-031-6/+4
| | | | | | | | | Mod2 is the real modifier, to which "NumLock" gets mapped by making <HYPR> set the "NumLock" modifier *and* mapping <HYPR> to Mod2. (The logic is absurd, but what can one do?) Also, reshuffle two lines and rearrange two lines for esthetics.
* types/extra: condense and improve an obsolete comment, and re-indentBenno Schulenberg2022-05-271-21/+8
| | | | | | | | | | | | | | | | | | | Fifteen years ago, commit 12a470d288 added U+1E9E on the fifth level of AE11 of the basic German layout, but the compose sequence that was needed for the intended effect (<U1E9E>: "SS") never materialized in libX11 -- understandably, because it would have made it impossible to type an U+1E9E into a document. Since 2017 (see https://en.wikipedia.org/wiki/Eszet) it is permissible to use the capital form ẞ instead of SS, so there is no longer any need for transforming U+1E9E to "SS" -- and it would have been imperfect anyway, because sometimes "SZ" would be required instead. So, remove any mention of SS and sharp s from the description of the special FOUR_LEVEL_PLUS_LOCK type. (The sister comment in symbols/de was removed five years ago in commit de13d5ab2f.) Also, indent the comment and another to better show what they apply to.
* remove pieces that are no longer needed after the previous two commitsBenno Schulenberg2022-05-131-36/+0
| | | | | | | | And some pieces that became redundant after commit 4346c44713 from six years ago: it made the Ctrls toggle rely on the plain Control modifier again instead of on the non-working LControl/RControl virtual modifiers. Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
* Drop autotoolsPeter Hutterer2021-12-171-7/+0
| | | | | | Even the xserver is now meson only and building a desktop stack without meson is not possible anymore. So let's drop autotools for meson, which is much easier to maintain.
* SHIFT+base key on Keypad not modify the base key on keypad swaping to number ↵Sérgio M. Basto2021-06-051-1/+0
| | | | | | | | | | | | | | | key. SHIFT+Page_Up, SHIFT+Home, etc are a very useful sequence keyboards in KDE, so when I press SHIFT+Page_Up and when Page_Up is on keypad, gives number 9 and is a very disapointing. For example in konsole, I use a lot SHIFT+Page_Up and SHIFT+Page_Down to scroll the screen up and down. After reasearch a lot if just not swap from base to number when press SHIFT, while SHIFT+number is not problem send the base key solves the problem in a very simple way I found a similar request on this topic https://bbs.archlinux.org/viewtopic.php?id=257020 from where I based myself to find the solution.
* Indent the various dist_foo_DATA for better visual alignmentsPeter Hutterer2020-06-021-4/+4
| | | | | | No functional changes Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Use dist_foo_DATA to remove the need for EXTRA_DISTPeter Hutterer2020-06-021-3/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Consistently declare layouts with "default partial"Marko Myllynen2020-02-268-8/+8
| | | | | Consolidate earlier inconsistent wording variants meaning the same thing to use "default partial" everywhere.
* Descriptions formatting, typos and mistakes v2Nik Kopylov2017-05-011-2/+2
|
* Reenable layer5-lock for de variantsSergey Udaltsov2016-01-261-121/+121
| | | | https://bugs.freedesktop.org/show_bug.cgi?id=93763
* State that "basic" defines only three of the four required typesGioele Barabucci2014-09-301-1/+2
|
* Missing PC_SUPER_LEVEL2Sergey Udaltsov2014-05-061-0/+8
| | | | https://bugs.freedesktop.org/show_bug.cgi?id=78076
* types/*: Partly harmonizing some whitespace and tabbing.Benno Schulenberg2014-01-156-39/+39
| | | | Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
* types/*: Correcting, tweaking, and harmonizing some comments.Benno Schulenberg2014-01-159-56/+58
| | | | Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
* Fixed Shift-F10 behaviourSergey V. Udaltsov2012-09-021-3/+5
| | | | | Preserving shift is essential for many applications https://bugs.freedesktop.org/show_bug.cgi?id=45008
* Remove *.dir generationDaniel Stone2012-08-291-4/+2
| | | | | | | | | | It's only used by the X server's ListComponents call, which I intend to stub out shortly. (For bonus points, that call will fork xkbcomp to generate the necessary listings itself if it can't find the *.dir files.) Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Extended mapping for level6 in EIGHT_LEVEL_SEMIALPHABETICSergey V. Udaltsov2012-08-091-0/+1
| | | | https://bugs.freedesktop.org/show_bug.cgi?id=53157
* Fix "mac style" numpadSergey V. Udaltsov2011-10-162-29/+3
| | | | https://bugs.freedesktop.org/show_bug.cgi?id=41607
* Move switch VT mapping to 5th level, amending CTRL+ALTSergey V. Udaltsov2011-06-151-4/+11
| | | | | The idea is to allow functional keys to have mappings on 2-4 levels (with Shift and RAlt) https://bugs.freedesktop.org/show_bug.cgi?id=11822
* Remove RCS tagsAlexandr Shadchin2011-02-1911-31/+0
| | | | Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
* Commented out 2 types used by de(neo)Sergey V. Udaltsov2010-05-041-121/+121
| | | | | | | | It seems X has a limit on total number of types. When this limit is passed, X server crashes at startup. If someone needs these 2 types - you can locally comment out some other types. Trying to resolve the issue with Xorg people
* Update Neo-layout to the final version, released 2010-03-28Stephan Hilb2010-05-021-0/+122
|
* Enable Maemo keyboards.Tomas Hanak2009-12-112-1/+15
| | | | | Signed-off-by: Tomas Hanak <ext-tomas.3.hanak@nokia.com> Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
* Remove unused .cvsignore file #23776Gaetan Nadon2009-09-081-3/+0
| | | | | | CVS is no longer used for X.Org modules Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* reindentingSergey V. Udaltsov2008-10-141-7/+7
|
* added numpad:shift3 option, b.fd.o#17110Sergey Udaltsov2008-10-111-0/+32
|
* improving build processSergey V. Udaltsov2008-08-061-0/+2
|
* options for nonbreakspace handling, b.fd.o#9529svu2008-04-221-0/+41
|
* Entering SS, b.fd.o#7642svu2007-10-071-1/+1
|
* Entering SS, b.fd.o#7642svu2007-10-071-0/+33
|
* renaming typessvu2007-08-281-7/+33
|
* more correct commentsvu2007-08-101-2/+2
|
* putting numpad after extra in types/*, hopefully fixes b.fd.o#8402svu2006-10-072-2/+2
|
* make partials partialssvu2006-10-071-4/+3
|
* new French layouts, b.fd.o#8240svu2006-09-241-0/+34
|
* b.fd.o#8280,b.fd.o#8312svu2006-09-175-27/+74
|
* another iteration in the war with RAltsvu2006-03-211-0/+8
|
* fixed scrolllock, closed b.fd.o#5635svu2006-01-221-2/+1
|
View Lorry Controller Status