Jeremy Huddleston
d6960e0075
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-08-26 20:19:23 -07:00
Jeremy Huddleston
38e59ad930
XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit.
...
(cherry picked from commit e7658e745f )
2008-08-26 20:19:16 -07:00
Jeremy Huddleston
6685522abe
XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it.
...
(cherry picked from commit 54a882dcbd )
2008-08-26 20:19:07 -07:00
Jeremy Huddleston
46b3a5dfd6
XQuartz: Fixed bogus args to debug ErrorF
...
(cherry picked from commit f0351c2b80 )
2008-08-26 20:18:59 -07:00
Jeremy Huddleston
cd59eee244
XQuartz: Cleaned up mouse event translation a bit more.
...
(cherry picked from commit c286f2a718 )
2008-08-26 20:18:49 -07:00
Jeremy Huddleston
7357dc56c4
Xquartz: Added missing ev_type for NSTabletPoint event.
...
(cherry picked from commit 07548f1394 )
2008-08-26 20:18:39 -07:00
Jeremy Huddleston
12c534bf14
XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
...
(cherry picked from commit fcdc9f8b5a )
2008-08-26 20:18:27 -07:00
Kristian Høgsberg
78f50cd575
Fix driGetConfigAttribIndex unaligned access to GLboolean.
...
We don't actually send the float mode so just drop it. Drop a couple of
other unused or redundant fields from GLXconfig.
2008-08-26 10:58:35 -04:00
Jeremy Huddleston
f2ec79e4a1
XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
...
(cherry picked from commit 81187364e5 )
2008-08-20 09:59:23 -07:00
Jeremy Huddleston
fcfc05482a
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 )
2008-08-20 09:59:05 -07:00
Jeremy Huddleston
a28a2be524
XQuartz: Just cleaned up formatting of event processing code... no "meat" changed...
...
(cherry picked from commit 745bc8ab38 )
2008-08-20 09:58:48 -07:00
Jeremy Huddleston
2da32894df
XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command
...
(cherry picked from commit 02af74d7a5 )
2008-08-20 09:56:19 -07:00
Jeremy Huddleston
ae9c1b3cfb
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 )
2008-08-20 09:56:06 -07:00
Jeremy Huddleston
7d9d864461
XQuartz: Updated bundle version to 2.3.1
...
(cherry picked from commit eedecba0b8 )
2008-08-20 09:54:29 -07:00
Jeremy Huddleston
14646ad8cd
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-08-20 09:54:08 -07:00
Maarten Maathuis
c662381a14
exa: fix assert logic thinko from 361a9eb953
...
- I guess failing PrepareAccess is rare, since this a 3 year old bug.
2008-08-17 23:20:45 +02:00
Jeremy Huddleston
79e39470e9
XQuartz: Fixed a stuck modifier key bug.
...
(cherry picked from commit eeb6e5a9e9 )
2008-08-14 09:13:26 -07:00
Jeremy Huddleston
01cd463492
XQuartz: Made 3-button mouse simulation a little more consistent.
...
(cherry picked from commit d207b037d2 )
2008-08-14 09:13:21 -07:00
Jeremy Huddleston
edf55da280
XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs.
...
(cherry picked from commit b287c481e1 )
2008-08-14 09:13:09 -07:00
Jeremy Huddleston
e013272fa8
Transport/Apple: Add TRANS_NOXAUTH to incoming connections when the listener is flagged as such
...
(cherry picked from commit ba4a792426 )
2008-08-14 09:12:59 -07:00
Jeremy Huddleston
0b2ab2327e
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-08-14 09:12:52 -07:00
Peter Hutterer
582f1381ae
xkb: ProcXkbSetDeviceInfo should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit c06e27b2f6 )
2008-08-13 16:59:02 +09:30
Peter Hutterer
07e922a257
xkb: ProcXkbSetGeometry should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit d9ca9819e9 )
2008-08-13 16:57:28 +09:30
Peter Hutterer
245fecf7cd
xkb: ProcXkbSetNames should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit 5ba87c3327 )
2008-08-13 16:56:05 +09:30
Peter Hutterer
a5c4b9db12
xkb: ProcXkbSetNamedIndicator should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit 7e45c80204 )
Includes follow-up fix d684f5760f .
2008-08-13 16:55:04 +09:30
Peter Hutterer
8d4004b092
xkb: ProcXkbSetIndicatorMap should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit a609dbed7c )
2008-08-13 16:52:55 +09:30
Peter Hutterer
8a18475848
xkb: ProcXkbSetCompatMap should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit e8c2a3d7c9 )
Conflicts:
xkb/xkb.c
2008-08-13 16:52:03 +09:30
Peter Hutterer
5b3eb0a3af
xkb: ProcXkbSetMap should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit 3c7740aa8f )
Conflicts:
xkb/xkb.c
2008-08-13 16:49:33 +09:30
Peter Hutterer
2fa7edd30d
xkb: ProcXkbBell should work on all attached SDs.
...
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
(cherry picked from commit 31afd51dd4 )
2008-08-13 16:43:22 +09:30
Alan Coopersmith
50382652af
Fix --disable/--enable-kbd_mode configure flag
2008-08-12 14:53:14 -07:00
Dave Miller
5930aeb45e
glx: fix crash in driGetConfigAttribIndex
...
Don't access GLboolean via int pointers
2008-08-09 16:47:49 +10:00
Jeremy Huddleston
4545ba91e9
XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
2008-08-08 01:52:18 -07:00
Jeremy Huddleston
af238e99da
Removed rogue #include
2008-08-08 01:41:28 -07:00
Peter Hutterer
6f74475a04
dix: don't try to create events if we don't have a screen. #16898
...
A NULL screen may happen during server shutdown, when the output has been shut
down but the devices still generate events.
X.Org Bug 16898 <http://bugs.freedesktop.org/show_bug.cgi?id=16898 >
(cherry picked from commit 465a9bb96e )
2008-08-08 01:20:53 -07:00
Jeremy Huddleston
8894e5312a
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:20:49 -07:00
Alan Coopersmith
b61ee18b72
Make xstrcasestr prototype return value match the implementation
...
(cherry picked from 3b687ffe16 commit)
2008-08-06 16:12:59 -07:00
Daniel Stone
b5932f176c
DIX: Add strcasestr from FreeBSD
...
Add strcasestr for use on systems which don't have it.
(cherry picked from ad87c72edc commit)
2008-08-06 16:12:06 -07:00
Daniel Stone
ce10b41f1b
dix: Actually build str(n)casecmp if we don't have it
...
Remember to add stuff to dix-config.h when you add new AC_DEFINES,
people ...
(cherry picked from 69b57dc651 commit)
2008-08-06 16:08:42 -07:00
Daniel Stone
8a319335fa
strcasecmp: Actually use the right license
...
Forgot to update the license when I committed the FreeBSD version, so it
still had an old SGI license. Sorry. Sorry.
(cherry picked from dcf6293030 commit)
2008-08-06 16:05:45 -07:00
Daniel Stone
5a5030af9b
DIX: Add strncasecmp from FreeBSD, make strcasecmp args const
...
Add strncasecmp (as we're now using it) in case someone doesn't have it,
and also change strncasecmp args to be const, in accordance with
everything else.
(cherry picked from 11f9e35202 commit)
2008-08-06 16:05:32 -07:00
Jeremy Huddleston
409e1dd1e9
glcontextmodes.[hc] were not added with the removal of the meas symlinks patch. Copied from mesa head 2008.08.06.
2008-08-06 13:36:43 -07:00
Jeremy Huddleston
90156c29ca
Cleaned up #ifdef HAVE_LAUNCHDs that got messed up in the merge.
2008-08-06 10:19:17 -07:00
Jeremy Huddleston
90f1024dc2
Fixed bitwise or-and typo in my last commit.
...
(cherry picked from commit 3ec2349760 )
2008-08-06 10:08:46 -07:00
Jeremy Huddleston
dfcf7f0db7
XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
...
(cherry picked from commit 672682ebf9 )
2008-08-05 18:41:44 -07:00
Jeremy Huddleston
f4da7327d8
XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
...
(cherry picked from commit a8f0d32216 )
2008-08-05 18:40:25 -07:00
Jeremy Huddleston
96be7fd24f
XQuartz: Fixed some errors / typos in the preferences pane.
...
(cherry picked from commit e1e0c398bb )
2008-08-05 18:40:21 -07:00
Jeremy Huddleston
ba42abaedd
XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize
...
(cherry picked from commit d3157ca45c )
2008-08-05 18:40:16 -07:00
Jeremy Huddleston
1e54d7a8d1
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-08-05 18:40:03 -07:00
Peter Hutterer
f7ee776de2
config: protect against potential out-of-bounds indexing.
...
(cherry picked from commit 3c6a9c531f )
2008-08-06 10:34:35 +09:30
Peter Hutterer
7d508f783c
config: support type strlist for XkbOptions property.
...
For backwards compatibility with server 1.4.
(cherry picked from commit 92c51b183c )
2008-08-06 10:34:35 +09:30