Jeremy Huddleston
6008cc1164
XQuartz: Setup the modifier map in the quartz thread
...
This avoids possible doing it twice which could result in incorrect
keycodes for alt due to our loss of information about its side.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-01-13 11:21:28 -08:00
Jeremy Huddleston
9071b0d697
XQuartz: Explicitly pass a bellProc to make XBell() work again.
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-11 18:00:19 -08:00
Jeremy Huddleston
15fc56addc
XQuartz: Buildfix for Leopard and older
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-11 18:00:19 -08:00
Jeremy Huddleston
069fc6ce0a
XQuartz: Don't weed out duplicates in generated keymap
...
There seems to be an issue in the 1.5+ server where shift-space does not
produce a space when 'keycode 57 = space' but it does when 'keycode 57 = space
space'
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-05 18:34:50 -08:00
Jeremy Huddleston
6d6e8fb27f
XQuartz: Controller thread launches clients
...
This avoids a memory leak due to no active auto-release pool on the server thread.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-05 18:34:50 -08:00
Jeremy Huddleston
5e79976c13
XQuartz: Run xmodmap after programatically updating the keymap.
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Martin Otte <otte@duke.edu>
2009-11-03 16:35:27 -08:00
Jeremy Huddleston
873467adad
XQuartz: Set the proper bitmap for key repeats...
...
XkbSetRepeatKeys lies and doesn't do what it says it will...
2009-09-30 00:23:47 -07:00
Jeremy Huddleston
f11a356bce
XQuartz: Cleaned up keymap setting for easier maintenance
...
(cherry picked from commit b9dfed9e88
)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston
15e15816a2
XQuartz: Fix inverse map from mode_switch to alt
...
(cherry picked from commit de6cee11e1
)
2009-09-27 23:31:23 -07:00
Jeremy Huddleston
226b1033b4
XQuartz: Transition from xEvent based mieq to InternalEvent
...
(cherry picked from commit a3dbde2de8
)
2009-09-27 23:31:07 -07:00
Jeremy Huddleston
7159381881
XQuartz: Nuke duplicate locks that make painful headaches
...
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
2009-09-26 23:30:46 -07:00
Jeremy Huddleston
e360104880
XQuartz: Purge redundant QuartzBell
...
(cherry picked from commit de14a63d20
)
2009-08-05 16:17:01 -07:00
Jeremy Huddleston
7f28c555b8
XQuartz: Use CopyKeyClass to copy the keymap to the virtual core keyboard.
...
(cherry picked from commit 9a801d1716
)
2009-07-25 20:19:05 -07:00
Jeremy Huddleston
1031ac3a73
Revert "XQuartz: Copy the keyboard map to the core keyboard"
...
This reverts commit 795de791cf
.
2009-07-25 20:18:38 -07:00
Jeremy Huddleston
795de791cf
XQuartz: Copy the keyboard map to the core keyboard
...
This still doesn't handle the modifier map... gotta figure out what to do now that SwitchCoreKeyboard is gone
(cherry picked from commit 427e1aab41
)
2009-07-25 15:25:06 -07:00
Jeremy Huddleston
53ae6b6338
XQuartz: Cleanup keymap locking, fix a possible synchro bug
...
(cherry picked from commit 33e7437a49
)
2009-07-15 23:18:35 -07:00
Peter Hutterer
b406886bbf
input: allow NULL as XkbRMVLOSet in InitKeyboardDeviceStruct.
...
Virtually all callers use
XkbGetRulesDefault(&rmlvo);
InitKeyboardDeviceStruct(..., rmlvo);
Let's save them the trouble and accept NULL as a hint to take the
default RMLVO.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-04-17 10:03:40 +10:00
Jeremy Huddleston
7907b37d96
XQuartz: Don't erase the mode_switch+keysym if it's the same as shift+keysym
...
(cherry picked from commit 3e2427e6e9
)
2009-02-26 21:26:01 -08:00
Jeremy Huddleston
c7c50157b5
XQuartz: quartzKeyboard compile fixes for recent XKB Changes
...
Seems we're less divorced from XKB than we'd like for now... hopefully not having any rules installed will still let us override things the way we want to...
2009-02-22 00:29:48 -08:00
Daniel Stone
f06a9d2e05
Input: Clean up keymap change notifications
...
Keyboard map notifications are always generated from within XKB code,
which also takes care of copying the keysyms, etc. If you need to
mangle the keymap yourself, generate a new core keymap/modmap, and pass
it to XkbApplyMappingChange.
SendMappingNotify is renamed to SendPointerMappingNotify (and ditto its
Device variants), which still only _sends_ the notifications, as opposed
to also doing the copying a la XkbApplyMappingChange.
Also have the modmap change code traverse the device hierachy, rather
than just going off the core keyboard.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-01-22 15:08:58 +11:00
Daniel Stone
32db27a7f8
Input: Remove modifierMap from core
...
We already have modmap (in the exact same format!) in XKB, so just use
that all the time, instead of duplicating the information.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-01-22 15:08:55 +11:00
Daniel Stone
f062e90a95
Input: Remove modifierKeyMap
...
Since modifierKeyMap is generated from modifierMap, just remove it, and
only generate it when we need to send the modifier map to the client.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-01-22 15:08:55 +11:00
Jeremy Huddleston
1beff89810
XQuartz: misc 1.6 updates (still --disable-glx)
...
rlAccel is not longer compatable, and it's not worth fixing
Don't override DeviceCursorInitialize with a noop
Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
(cherry picked from commit c137f68168
)
2009-01-11 01:55:26 -08:00
Jeremy Huddleston
fc14d52297
XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
...
(cherry picked from commit 91f3c34357
)
2009-01-07 01:48:23 -08:00
Jeremy Huddleston
3986b683ad
XQuartz: Honor system key repeat rate
...
(cherry picked from commit 4303c9be39
)
2008-12-31 12:44:43 -08:00
Jeremy Huddleston
ef4179f43a
XQuartz: Fix dead-acute on Greek keyboards
...
(cherry picked from commit 807f2ec35c
)
2008-11-28 13:02:25 -08:00
Jeremy Huddleston
800f5c681b
XQuartz: Fix Czech keyboard dead-acute
...
(cherry picked from commit 771df2786b
)
2008-11-28 13:02:12 -08:00
Jeremy Huddleston
ac57bb36d5
XQuartz: Fix an uninitialized keyboard_type on Tiger
...
(cherry picked from commit 27b1a5eb34
)
2008-11-28 13:01:59 -08:00
Jeremy Huddleston
d508a3dcca
XQuartz: More dead code removal
...
(cherry picked from commit dcb0f6a2e6
)
2008-11-25 00:54:32 -08:00
Jeremy Huddleston
41fbdf72f2
XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
...
(cherry picked from commit 73ec6d3dfe
)
2008-11-25 00:54:27 -08:00
Jeremy Huddleston
8e2287c220
XQuartz: Updated some code to use newer server API
2008-11-22 13:57:45 -08:00
Jeremy Huddleston
b262788401
XQuartz: More Tiger ifdefs
...
(cherry picked from commit 803509072f
)
2008-11-21 10:59:26 -08:00
Jeremy Huddleston
03f7a66a1a
XQuartz: Don't use TIS on Tiger...
...
(cherry picked from commit be8ac84c15
)
2008-11-15 19:52:52 -08:00
Jeremy Huddleston
c5086badf0
XQuartz: LP64 related casting fixes from Bob Murphy
...
(cherry picked from commit ea71710aaa
)
2008-10-31 19:03:38 -07:00
Jeremy Huddleston
e4ea1494de
XQuartz: Cleaned up keyboard init and map reload.
...
(cherry picked from commit f78c9fc06c
)
2008-10-21 09:34:40 -07:00
Jeremy Huddleston
ebb2e1449c
XQuartz: Fixed follow-keyboard-layout
...
≈
(cherry picked from commit a9f9fbf512
)
2008-10-21 09:34:28 -07:00
Jeremy Huddleston
12a59c44cb
XQuartz: Fixed threading issue with TSM.
...
(cherry picked from commit 93ab4e0071
)
2008-09-26 12:31:21 -07:00
Jeremy Huddleston
999f3362d5
XQuartz: Dead code removal
...
(cherry picked from commit 43184cd379
)
2008-09-12 15:26:18 -07:00
Jeremy Huddleston
c4d290fc54
XQuartz: Fixed missing symbol in quartzKeyboard debugging
...
(cherry picked from commit 8ad55e484f
)
2008-08-30 14:21:17 -07:00
Jeremy Huddleston
2db1afbf2e
XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
...
(cherry picked from commit c8244177b0
)
2008-08-26 23:10:18 -07:00
Jeremy Huddleston
13a89f1920
XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
...
(cherry picked from commit fcdc9f8b5a
)
2008-08-26 20:19:33 -07:00
Jeremy Huddleston
6c5612c2e1
XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu.
...
(cherry picked from commit e4110861d3
)
(cherry picked from commit fcfc05482a
)
2008-08-20 10:00:37 -07:00
Jeremy Huddleston
be06961312
XQuartz: More input fixes
...
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
({l,r}{control,alt,command,shift})
(cherry picked from commit 8fb6a1cf44
)
(cherry picked from commit ae9c1b3cfb
)
2008-08-20 10:00:20 -07:00
Jeremy Huddleston
5accc9b3ce
XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew.
...
(cherry picked from commit 5854e712e9
)
2008-08-08 01:21:08 -07:00
Jeremy Huddleston
c3267106fb
XQuartz: Use CFEqual to compare keyboards
...
(cherry picked from commit 5538e43b9a
)
2008-07-11 10:13:36 -07:00
Jeremy Huddleston
26d8030c38
XQuartz: Remove deprecated keyboard code.
...
(cherry picked from commit 69cfc1a21e
)
2008-07-11 10:13:26 -07:00
Jeremy Huddleston
4b69d22bcb
XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
...
(cherry picked from commit 2a72309c06
)
2008-05-19 02:47:17 -07:00
Jeremy Huddleston
5af5db5033
XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there...
...
(cherry picked from commit 301262b070
)
2008-05-17 14:56:57 -07:00
Jeremy Huddleston
2408303d79
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
...
(cherry picked from commit 543c2cd68d
)
2008-05-17 14:56:53 -07:00
Jeremy Huddleston
01612fe612
XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
...
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621
)
2008-05-17 14:56:34 -07:00