Commit Graph

4246 Commits

Author SHA1 Message Date
Dave Airlie
2edf967b00 xserver: SIGIO option handling was incorrect.
reported by a user on #radeon when DRI1 broke.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-17 15:24:51 +10:00
Alan Coopersmith
e2c6455180 Add configuration option for use of SIGIO handlers for input events
Boolean option to enable/disable SIGIO handlers is set by the first
of these found:
  - UseSIGIO option is set in xorg.conf ServerFlags
  - Default set at build time by ./configure --enable-use-sigio-by-default
  - Platform default value: Solaris = no, all others = yes

This matches the current settings on all platforms except Solaris.
This reverts Solaris (for now) to the settings used in Xorg 1.6, before
SIGIO support for Solaris was added, due to some system level bugs that
won't be resolved in time for Xorg 1.7 release, but allows us to enable
when those are resolved (or when we need to test if they're resolved).
See http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6879897

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-17 10:06:37 +10:00
Matthias Hopf
3bdf364761 Work around sporadic segfault on resume with intel/KMS due to cursor->bits == NULL.
Apparently SavedCursor is sometime tried to be set while already being set.
2009-09-16 16:05:36 +02:00
Alan Coopersmith
fe31f9c646 Change xf86dristr.h includes to use xf86driproto.h instead
Clears warnings about obsolete headers, but raises minimum
required version of xf86driproto to 2.1.0

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 12:06:07 +10:00
Peter Hutterer
159e032040 dmx: don't include panoramiXsrv.h if building w/o Xinerama
Reported-by: Marvin Schmidt
Tested-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:44:08 +10:00
Rémi Cardona
f56cbe1ef2 dix: append "built-ins" to the font path in SetDefaultFontPath
49b93df8a3 made the hard dependency on
a "fixed" font go away but only Xorg could use the built-ins fonts by
default.

With this commit, all DDXs get "built-ins" appended to their FontPath, not
just Xorg.

Tested with Xorg, Xvfb and Xnest.

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:44:08 +10:00
Alan Coopersmith
e320736c45 Fix module path in xorg.conf man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:04:25 +10:00
Tiago Vignatti
49b98d092e xfree86: vgaarb: rework wrapping function
No semantical changes.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:04:24 +10:00
Jeremy Huddleston
422cd7a674 XQuartz: pbproxy: Remove debugging XBell()
(cherry picked from commit 1fd7c1fd47)
2009-09-14 14:29:50 -07:00
Alan Coopersmith
2b00afec4b Update xorg.conf man page & sample for changes in Xorg 1.7
AllowMouseOpenFail description changed to reflect actual behaviour
and point to AllowEmptyInput for previously described behaviour.

Update default DPMS mode timeouts to match new defaults set
in April 2009 by commit d52fddefae

Update autoloaded module list to match ModuleDefaults in xf86Config.c
Update module subdir list to match stdSubdirs in loadmod.c

Add xorg.conf options that were added to the code:
- XkbDir option added in February 2009
  by commit 76f18b94bd
- DRI2 option added in April 2008
  by 35982bc109

Remove xorg.conf options that were removed from the code:
- XkbDisable option was removed in January 2009
  by commit 40877c6680
- PciProbe/Config options were removed in August 2008
  by commit fdf7c747a8
- EstimateSizesAggressively was removed in August 2008
  by commit cd1e8f2614
- loadable font modules were removed in July 2008
  by commit affec10635
- ModInDev options were removed in December 2008
  by commit 6de6ffff35

(Also strips some trailing whitespaces to make git happier.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 16:03:18 +10:00
Alan Coopersmith
b6f5c54fc6 xfree86: Change default font path to match configure.ac's --default-font-path.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 16:03:18 +10:00
Peter Hutterer
23dc4678e9 dmx: use top_builddir, not top_srcdir to get libxfixes.la
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Byeong-ryeol Kim <brofkims@gmail.com>
2009-09-14 14:40:37 +10:00
Peter Hutterer
c626a5578a xfree86: fix VT_WAITACTIVE control flow (#11477)
Move misplaced } to get the flow of

if (!ShareVTs)  {
   VT_ACTIVATE
   VT_WAITACTIVE
}

X.Org Bug 11477 <http://bugs.freedesktop.org/show_bug.cgi?id=11477>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
2009-09-14 12:10:13 +10:00
Kevin E Martin
e85775aa64 Include <X11/extensions/dmx.h> and remove _DMX_SERVER_ define.
Fixes build with newer dmx header files that have been split between dmx.h
and dmxext.h.  _DMX_SERVER_ is no longer needed with the split headers.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 09:32:53 +10:00
Peter Hutterer
72607960c1 dmx: Remove some dead code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:17 +10:00
Peter Hutterer
88187ad889 dmx: purge DMX EQ leftovers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:17 +10:00
Peter Hutterer
f3aaa46f27 dmx: formatting fix to improve readability
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:17 +10:00
Peter Hutterer
7a588c833e dmx: Default rules are now base, not xfree86
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
33243ae971 dmx: include xfixes lib, reshuffle include order to resolve linker errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
2d46678762 dmx: remove dmx-internal event queue.
The EQ is in the DIX now.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
545f11139d dmx: compiler warning fix (mixed declarations + code)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
7d703af74c dmx: get the state from XKB for dmxCheckSpecialKeys
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
6e52f92331 dmx: fix dmxKeySymToKeyCode to work with mandatory XKB.
Approach taken is inefficient, it converts the xkb symbol table to a core
symbol table first and then extracts the keycode from there.
Consider this a todo for a rainy afternoon when the beer fridge demands
emptying.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
61ae0a5ca5 dmx: fix up dmxKeyCodeToKeySym for XKB-only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
9caba3e2ab dmx: fix two calls to InitKeyboardDeviceStruct.
Takes RMLVO now instead of the keysyms directly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
29b9a10dad dmx: XkbComponentNamesRec doesn't have a keymap field anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
a6f3f6a63a dmx: switch lnx-input and usb-input over to xkb-only.
kbd*Convert are nearly identical, it just asks for merging. Not today
though.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
5d81aee5f7 dmx: include xkbsrv.h to silence compiler.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Alan Coopersmith
8fb3fa28a5 compiler.h: include <string.h> before using memmove()
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-09-11 11:21:26 -07:00
Tiago Vignatti
d908ee6e54 Revert "Make sys.c use compiler.h unaligned access functions"
This reverts commit 1b30545c04.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-11 15:31:04 +10:00
Tiago Vignatti
281ebb453d xfree86: vgaarb: close and cleanup vga arbiter
So far there are no apparently issues on not closing the fd. But let's do the
right job here.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-11 09:19:36 +10:00
Martin-Éric Racine
9871f9be4e Use lowercase PCI vendor ID for NSC. 2009-09-09 13:43:45 +03:00
Daniel Stone
f4350c66b4 fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
Apparently the kernel can't decide on an API to expose to userspace, so
let's just try both in the hope that one will work.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Michel Dänzer <michel@daenzer.net>
2009-09-09 15:59:00 +10:00
Peter Hutterer
72f6be5408 xfree86: remove now unused xf86CrtcShadowClear
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 11:36:37 +10:00
Peter Hutterer
1f24638985 kdrive: output meaningful error message for HAL devices.
kdrive ignores all devices from hal as they don't have the 'type' option
set. Instead of "Unrecognised device identifier!" print out "Ignoring
device from HAL." to indicate that the errors surrounding the device don't
really matter.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-09-09 10:47:11 +10:00
Peter Hutterer
ae812bb796 Xnest: set the default pointer accel to the host's values (#10013)
The defaultPointerControl holds compile-time defaults for pointer
acceleration. If an Xnest instance is started, it resets the hosts pointer
accel values to these built-in defaults instead of using the host values.

This patch queries the host for the values before initializing the device,
thus leaving the host values untouched.

X.Org Bug 10013 <http://bugs.freedesktop.org/show_bug.cgi?id=10013>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 10:47:08 +10:00
Peter Hutterer
447bd4ce90 kdrive: fix sdl build by removing old keySymsRec references.
These are set in kinput now through InitKeyboardDeviceStruct.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 10:31:15 +10:00
Peter Hutterer
e9a507acca kdrive: remove xkb member from KdKeyboardInfo
Wasn't being used by anyone.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 10:31:08 +10:00
Martin-Éric Racine
cafa7c5f90 Added comment with the PCI device ID of Geode SCx200 series. 2009-09-08 23:52:52 +03:00
Jeremy Huddleston
1e0caf9a2c XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
(cherry picked from commit 647c871dc9)
2009-09-06 14:06:28 -07:00
Jeremy Huddleston
081f72390a XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a97)
2009-09-06 14:06:16 -07:00
Jeremy Huddleston
7ece2cb220 XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
(cherry picked from commit 1b659cda1a)
2009-09-06 14:06:06 -07:00
Jeremy Huddleston
1747120043 XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3e)
2009-09-05 02:53:59 -07:00
Jeremy Huddleston
1f61bbeffd XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce3)
2009-09-04 00:42:44 -07:00
Jeremy Huddleston
0a361d0e5f XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab00)
2009-09-04 00:42:31 -07:00
Peter Hutterer
58d9a4c635 xfree86: fix make distcheck after removal of Domain.note and RAC.Notes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04 15:07:14 +10:00
Peter Hutterer
6fb01c8286 require xf86vidmodeproto 2.2.99.1 or newer. 2009-09-04 12:51:02 +10:00
Peter Hutterer
59e731ef66 xfree86: silence some xf86dgaproto compiler warnings
We already require xf86dgaproto > 2.0.99 since 6fffcd582

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04 12:51:02 +10:00
Peter Hutterer
ead57a1353 xfree86: silence 'unused variable' compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04 12:51:02 +10:00
Martin-Éric Racine
09f0ee1324 Formatted recent Geode PCI ID changes to fit a 80-column coding style. 2009-09-04 04:17:09 +03:00