Jeremy Huddleston
c48b4ddeff
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-08-29 20:44:55 -07:00
Xavier Bestel
580e96d6d4
Cosmetic fix to EDID decoding.
...
(cherry picked from commit bb2cacd33e )
2008-08-29 14:48:40 -04:00
Jeremy Huddleston
41f99b1021
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:15 -07:00
Jeremy Huddleston
e86de2ac86
XQuartz: Fixed needed xplugin version. ><
...
(cherry picked from commit 01b3a99dff )
2008-08-26 23:10:13 -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
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
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
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
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
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
Julien Cristau
db918ea2b0
xfree86: use xorg.conf input devices if there is no ServerLayout
...
If xorg.conf has no ServerLayout section, use the first mouse and
keyboard sections as core devices, even with AllowEmptyInput.
(cherry picked from commit 2eaed4a10f )
2008-08-06 10:34:35 +09:30
Jeremy Huddleston
a20a7eb85e
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-08-05 12:53:36 -07:00
Jeremy Huddleston
a1431499bc
XQuartz: Fixed proper processing of tablet button presses
...
(cherry picked from commit ca0babafa4 )
2008-08-05 12:51:49 -07:00
Jeremy Huddleston
f40c6631ad
XQuartz: Nuke Sparkle.
...
(cherry picked from commit 4991f54a8d )
2008-08-05 12:51:20 -07:00
Jeremy Huddleston
29bce2bb59
XQuartz: Fixed first-client-can't-connect bug
...
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153e )
2008-08-05 12:51:12 -07:00
Peter Hutterer
d199d800a4
xfree86: warn some more about potential missing input devices.
...
Put out a warning if xorg.conf has InputDevice sections, but these aren't
referenced in the used ServerLayout. This is only performed if AllowEmptyInput
is enabled.
The reason behind this is that the server used to auto-add the first
mouse/keyboard sections if none where referenced. Now, with HAL and AEI
enabled by default, setups that relied on this auto-adding break and are left
without input devices. The least we can do is warn them.
(cherry picked from commit 47160edec7 )
2008-07-29 10:03:07 +09:30
Peter Hutterer
538942cc65
xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now.
...
(cherry picked from commit f30b0823db )
2008-07-29 10:03:07 +09:30
Dodji Seketeli
c217cb96dc
[Xephyr] Fix #15839
...
Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
(cherry picked from commit 5de1867fbb )
2008-07-23 13:50:48 -04:00
Eamon Walsh
ceffece78b
Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
...
(cherry picked from commit 95d4ede538 )
2008-07-21 17:13:59 -04:00
Dave Airlie
7f542ab37f
modes: fix initial xorg.conf mode selection.
...
This was all kinds of broken, we ignored user preferred modes for multiple
monitors and also for side-by-side configurations.
(cherry picked from commit 0b9ef835a0 )
2008-07-21 17:08:07 -04:00
Peter Hutterer
0baf677da6
kdrive: don't post motion event if there was no motion. #16179
...
Based on the patch by Tomas Janousek. Backported version.
X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179 >
(cherry picked from commit 26e7e69ab8 )
2008-07-17 08:44:39 +09:30
Peter Hutterer
a75cbabc25
Revert "kdrive: don't post motion event if there was no motion. #16179 "
...
Just because it compiles on my machine doesn't make it right. Needs backported
patch from http://bugs.freedesktop.org/show_bug.cgi?id=16179 .
This reverts commit a08ea64ded .
2008-07-17 08:40:54 +09:30
Peter Hutterer
a08ea64ded
kdrive: don't post motion event if there was no motion. #16179
...
Based on the patch by Tomas Janousek.
X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179 >
(cherry picked from commit 26e7e69ab8 )
2008-07-16 21:43:22 +09:30
Peter Hutterer
5cb38a3fca
xfree86: don't free the config-file related information in DIDR. #15645
...
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.
This is an addon to 6d22a9615a , an attempt to
fix Bug 14418.
X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645 >
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645 >
(cherry picked from commit 9ab4e2fd8e )
2008-07-16 10:32:46 +09:30
Julien Cristau
2b3faf2a75
Bug #16674 : Make sure RANDR reports refresh as 0 if pixel clock is 0.
...
(cherry picked from commit 9111944b29 )
2008-07-15 10:37:31 -04:00
Peter Hutterer
5b546f1c49
xfree86: append, not prepent, new input devices to xf86InputDevs.
...
If devices are prepended to the list, their wake-up order on resume is not the
same as the original initialisation order. Hot-plugged devices, originally
inited last, are re-enabled before the xorg.conf devices and in some cases may
steal the device files. Result: we have different devices before and after
suspend/resume.
RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386 >
(cherry picked from commit 11ee0ae939 )
2008-07-14 12:53:28 +09:30
Jeremy Huddleston
e5d4970d4d
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-07-11 10:12:55 -07:00
Jeremy Huddleston
fe27bba853
XQuartz: Use CFEqual to compare keyboards
...
(cherry picked from commit 5538e43b9a )
2008-07-11 10:04:08 -07:00
Jeremy Huddleston
0c262e96b0
XQuartz: More fd handoff cleanup.
...
(cherry picked from commit 199d2dcb70 )
2008-07-11 10:04:01 -07:00
Jeremy Huddleston
73f41f38c5
XQuartz: Some fd handoff cleanup.
...
(cherry picked from commit 9c20a4804d )
2008-07-11 10:03:53 -07:00
Jeremy Huddleston
7bfdc4bd34
XQuartz: Remove deprecated keyboard code.
...
(cherry picked from commit 69cfc1a21e )
2008-07-11 10:03:41 -07:00
Jeremy Huddleston
f7b8efa23d
XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
...
(cherry picked from commit 49668e8a88 )
2008-07-11 10:03:17 -07:00
Jeremy Huddleston
9025097f06
Xquartz: Removed include directive for removed header
...
(cherry picked from commit e65a36d57f )
2008-07-11 10:03:09 -07:00