Commit Graph

5267 Commits

Author SHA1 Message Date
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
Peter Hutterer
2f6b270e48 config: add parsing for input.x11_options.XkbOptions. #16874
X.Org Bug 16874 <http://bugs.freedesktop.org/show_bug.cgi?id=16784>
(cherry picked from commit 35b14519b4)
2008-08-06 10:34:35 +09:30
Daniel Stone
0788adb9a6 HAL: Remove grotesque open-coded strcasestr
Not only was this pretty ugly, but it didn't even work on systems
without strcasestr anyway, due to the define not being in dix-config.h.
Lack of strcasestr is handled transparently with the version from
FreeBSD now anyway, so, huzzah.
(cherry picked from commit b8dd07f855)
2008-08-06 10:34:35 +09:30
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
b6024da704 Xi: ChangeDeviceControl presence events should set the appropriate devchange.
Requires inputproto 1.4.4 or higher.
(cherry picked from commit 591ef3c047)
2008-07-29 10:16:16 +09:30
Peter Hutterer
da29a25315 Require inputproto 1.4.4
for DeviceControlChanged define.
2008-07-29 10:04:24 +09:30
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
Daniel Stone
37927b8bfa Revert "Xi: event_{x,y} should refer to the extended device (bug #16289)"
After discussion with Peter, realised that diverging from 1.3 and 1.4's
behaviour was daft and insane.  Sorry.

This reverts commit 8259d19f71.
2008-07-29 02:51:57 +03:00
Adam Jackson
c0c73e9236 xserver 1.4.99.906
You know, Mesa 7.1 could release any day now and that'd be just fine.
2008-07-23 14:16:47 -04:00
Pierre-Loup A. Griffais
e909a39619 Don't return BadAlloc when trying to set a PictureFilter with no parameters when a filter with parameters was previously set.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
(cherry picked from commit bc3c03a3f3)
2008-07-23 13:50:54 -04:00
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
Roland Scheidegger
14a033f032 glx: copy msaa visual capabilities
(cherry picked from commit 49751fee3b)
2008-07-23 13:49:58 -04:00
Peter Hutterer
ff1a9b7fea xkb: don't send core events for extension devices on SlowKey timeout.
RedHat Bug 448604 <https://bugzilla.redhat.com/show_bug.cgi?id=448604>
2008-07-23 17:08:49 +09:30
Kristian Høgsberg
2d6022bd40 Need to unref pixmaps backing pbuffers too.
(cherry picked from commit facb255fa9)
2008-07-21 17:16:00 -04:00
Kristian Høgsberg
e4cfdc07f4 Fix embarrasing GLXPixmap leak.
(cherry picked from commit d5ae85b5b7)
2008-07-21 17:14:08 -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
45f274415d Xi: don't attempt to send to a NULL window.
Only applicable when the server comes down/restarts. In this case,
WindowTable[i] may be NULL. Let's not try to send an event then.
(cherry picked from commit f377141912)
2008-07-16 11:05:10 +09:30
Peter Hutterer
476de585be dix: NULL out WindowTable after freeing all the windows.
CloseDownDevices() tries to send PresenceNotify events. If the windows are
already freed, then we are accessing dangling pointers.
(cherry picked from commit aec485f2dc)
2008-07-16 10:34:55 +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
Julien Cristau
5659f6d31b Export xkbfile.h in the SDK
It's needed by xkbsrv.h
(cherry picked from commit d8af9d9ab1)
2008-07-13 15:14:41 +02:00
Ander Conselvan de Oliveira
e135a77b8b Fix incorrect test regarding keyboard map.
In the map stored in each keyboard device, the first line refers to minimum
keycode, i.e., the 0th line refers to keycode 8. When not using XKB the wrong
test caused some keys to be interpreted as locks ('m' for instance). The had
to be pressed twice to generate both KeyPress and KeyRelease events.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-07-13 21:30:46 +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
a0a4cbf1b5 Set machine dependent defaults for ppc64
(cherry picked from commit 0733ef2e8a)
2008-07-11 10:03:28 -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
Sascha Hlusiak
c30f36c8c1 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway.

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
2008-07-03 21:42:10 +02:00