andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,265 Commits 86 Branches 473 Tags 48 MiB
90f1024dc2
Commit Graph

2885 Commits

Author SHA1 Message Date
George Sapountzis
1ea2e69cfc glcore: build from mesa, dlopen from xorg 
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
  GLX_PROVIDER_INSTALL_DIR
(cherry picked from commit 567d389d47)
 2008-06-26 16:14:50 -04:00
Donnie Berkholz
f2c30a57e3 glcore: prepare for dynamic loading 
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
        DLOPEN_LIBS - to dlopen the glcore dso
        LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use

the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
(cherry picked from commit efb723e166)

Conflicts:

	configure.ac
 2008-06-26 16:14:50 -04:00
Adam Jackson
429b2a97a0 Bug #11842: Fix emulation of int1A PCI BIOS services. 
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
(cherry picked from commit 9e5b3deafb)
 2008-06-24 14:10:12 -04:00
Jeremy Huddleston
d451f3d146 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-24 09:36:01 -07:00
Paul Bender
2334ff9bb2 Bug #15665: Fix building without Composite. 
(cherry picked from commit 4c4e06af79)
 2008-06-24 10:45:16 -04:00
Adam Jackson
85e598cc62 Remove some default modes that really shouldn't be in the default set. 
(cherry picked from commit 59510a7643)
 2008-06-24 10:41:27 -04:00
Alan Coopersmith
dfb326790e Restore return type on xf86SetScrnInfoModes 
Seems to have been accidentally lost by commit 	76943fec86
(cherry picked from 925e895b86 commit)
 2008-06-23 19:32:01 -07:00
Jesse Ruffin
4c8a84acf5 Bug #16302: Fix GLX drawable refcounting in DMX. 
(cherry picked from commit 3b58782692)
 2008-06-23 14:35:46 -04:00
Adam Jackson
89d73d7595 Implement bswap in x86emu. 
Yes, this is a 486+ instruction and thus not strictly legal in vm86
mode, but enough BIOSes use it (looking at you VIA) that we might as
well implement it.
(cherry picked from commit c8d066a151)
 2008-06-23 14:01:15 -04:00
Matthieu Herrb
b0df9a6a42 preserve errno around the SIGIO handler 
(cherry picked from commit 19c7e9da55)
 2008-06-20 13:36:16 -04:00
Adam Jackson
7822a3d05f XAA: Disable offscreen pixmaps by default. 
Say Option "XaaOffscreenPixmaps" to turn them back on.

Apropos of bugs #13795 and #15098.  Not yet applied to master as this wants
a proper solution someday, but then, those bugs aren't closed yet either.
 2008-06-17 16:10:51 -04:00
Ian Romanick
fba700f1f6 Bug #15169: Make the server build again on Alpha. 
Still won't work until the kernel makes the resource files actually exist.

(cherry picked from commit f3490d3eba)
 2008-06-17 10:48:41 -04:00
Eamon Walsh
2552026664 Make devPrivates lookup functions ABI instead of static inlines. 
This is required to preserve compatibility across changes to the
internal representation of the privates list.
(cherry picked from commit 2d7ba09dc4)
 2008-06-13 16:45:08 -04:00
Dave Airlie
21248705bb modes: make aspect choosing work on single output case. 
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
 2008-06-12 14:54:56 +10:00
Julien Cristau
53a84d75c6 xfree86: fix build on GNU/kFreeBSD 
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
(cherry picked from commit e6cbb1e11e)
 2008-06-12 10:01:41 +10:00
Jeremy Huddleston
0ab483f74e XQuartz: Removed code path for old startup 
(cherry picked from commit a9ee6b0d00)
 2008-06-10 10:51:49 -07:00
Jeremy Huddleston
be616f0f8f XQuartz: Under the new startup model, we no longer need to do the foreground/background dance. 
(cherry picked from commit 4505bae5d7)
 2008-06-10 10:51:40 -07:00
Jeremy Huddleston
8e3a85beb9 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it. 
(cherry picked from commit ee92aced10)
 2008-06-10 01:45:57 -07:00
Jeremy Huddleston
a58487db23 XQuartz: Updated icon with more rsolutions and made it more dark-background friendly 
(cherry picked from commit d8cf5623fa)
 2008-06-10 01:45:50 -07:00
Jeremy Huddleston
33bfb761a7 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-10 01:45:40 -07:00
Paulo Cesar Pereira de Andrade
60990c69b4 Correct a NULL pointer deference 
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit c8af7ce35a)
 2008-06-09 14:09:39 -04:00
Drew Parsons
c00ff932f8 Disable D-BUS from Xprint. 
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.

Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
(cherry picked from commit 2a3d1421e0)
 2008-06-09 13:57:03 -04:00
Drew Parsons
2f994cb00e Create dix/libXpdix.la for Xprint-specific build of libdix.la 
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
(cherry picked from commit 966ae1781f)
 2008-06-09 13:56:59 -04:00
Drew Parsons
30774d6b3c Define XPRINT in XPRINT_CFLAGS (configure.ac) 
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736 it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
(cherry picked from commit 571206832d)
 2008-06-09 13:56:53 -04:00
Dave Airlie
50e77eb838 int10: add pci_device_enable support on Linux 
(cherry picked from commit ea4ec9e998)
 2008-06-09 13:29:32 -04:00
Jeremy Huddleston
500ace5659 XQuartz: Removed async debugging sleep 
(cherry picked from commit 7812a8bdf9)
 2008-06-04 12:23:12 -07:00
Jeremy Huddleston
677c8d6af7 XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling 
(cherry picked from commit ff1c443cad)
 2008-06-04 12:23:06 -07:00
Jeremy Huddleston
9e30e41c6e XQuartz: Don't forget to destroy the mutex and cond after we're done with them 
(cherry picked from commit c3558bb8cd)
 2008-06-04 12:23:00 -07:00
Jeremy Huddleston
469b649e13 XQuartz: Fork for trigger 
(cherry picked from commit dd0f8a0f59)
 2008-06-04 12:22:54 -07:00
Jeremy Huddleston
17fb292b52 XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/ 
(cherry picked from commit 7f840e9dc1)
 2008-06-04 12:22:48 -07:00
Jeremy Huddleston
f060c41843 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-23 02:31:25 -07:00
Jeremy Huddleston
0f44d72873 XQuartz: A 2 second delay for launchd socket connections should be sufficient. 
(cherry picked from commit 2bb4251b3c)
 2008-05-23 02:31:16 -07:00
Jeremy Huddleston
b55226326c XQuartz: Move the launchd display grabbing into mach_startup 
(cherry picked from commit c3866c98d2)
 2008-05-23 02:30:02 -07:00
Jeremy Huddleston
517151d5f4 XQuartz: Fixed a few issues with fd passing... still not working =( 
(cherry picked from commit 7dd3512715)
 2008-05-23 02:29:50 -07:00
Adam Jackson
5efe36f7af Fix reduced-blanking mode filtering in RANDR 1.2. 
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool.  Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
(cherry picked from commit 0178b6a4ab)
 2008-05-19 11:27:58 -04:00
Jeremy Huddleston
86bfcd8d78 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server 
(cherry picked from commit cccee9cfc2)
 2008-05-19 02:47:12 -07:00
Jeremy Huddleston
afc8507e48 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:07 -07:00
Jeremy Huddleston
18a8825adc XQuartz: Cleaned up ListenOnOpenFD... 
(cherry picked from commit 6fb587d3d5)
 2008-05-18 23:32:53 -07:00
Jeremy Huddleston
2147b74126 New XQuartz icon thanks to Simone Karin Lehmann 
(cherry picked from commit c27e0c8f3c)
 2008-05-18 23:32:45 -07:00
Jeremy Huddleston
b6ab42ad39 XQuartz: More work towards Mach-IPC startup... started working on FD passing 
(cherry picked from commit 27fbfeacfa)
 2008-05-18 22:44:50 -07:00
Jeremy Huddleston
b54b2529ad Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-17 14:55:45 -07:00
Jeremy Huddleston
85a6286dcd 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:55:38 -07:00
Jeremy Huddleston
1f4d224f82 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:55:31 -07:00
Jeremy Huddleston
3a0fc76ac7 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:54:15 -07:00
Jeremy Huddleston
7d39e7e400 XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init. 
(cherry picked from commit 5626b0949b)
 2008-05-17 14:54:10 -07:00
Jeremy Huddleston
880a872498 Xquartz: Xquartz stub now can send Mach IPC to start the server. 
(cherry picked from commit 55a3bca8ea)
 2008-05-17 14:54:04 -07:00
Adam Jackson
0230f39fa3 RANDR 1.1 compat: remove senseless comparison against the virtual size. 
(cherry picked from commit aad1c37b09)
 2008-05-16 11:11:40 -04:00
Adam Jackson
95985256ef xf86SetDesiredModes(): Skip disabled CRTCs first thing. 
(cherry picked from commit 14726b776d)
 2008-05-16 11:11:40 -04:00
Adam Jackson
bedcf98558 Fix initial mode selection even harder. 
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs".  Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
(cherry picked from commit 459f34b089)
 2008-05-16 11:11:40 -04:00
Adam Jackson
bd50c41f6f Redo RANDR compatibility output selection. 
Old logic was just the first one that happened to have an associated
CRTC.  The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
(cherry picked from commit 96111c1547)
 2008-05-16 11:11:40 -04:00
Adam Jackson
0b031442fe Re-add sync range inference from legacy setup to RANDR 1.2. 
(cherry picked from commit a4bbe1c8bc)
 2008-05-16 11:11:39 -04:00
Adam Jackson
cfff55a2bb Fix fbdevhw initialization for PCI drivers. 
graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
(cherry picked from commit 86678e7cc2)
 2008-05-16 10:03:24 -04:00
Jeremy Huddleston
800db31e16 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-14 01:15:43 -07:00
Jeremy Huddleston
f8929b9e5b XQuartz: More work on the Mach-IPC startup path 
(cherry picked from commit 49cd0b185f)
 2008-05-14 01:15:38 -07:00
Jeremy Huddleston
4160d13b48 Xquartz: More work on the new Mach startup 
(cherry picked from commit 6237acf75d)
 2008-05-14 01:15:31 -07:00
Jeremy Huddleston
02744383d5 Added missing to EXTRA_DIST 
(cherry picked from commit e39613f463)
 2008-05-14 01:15:23 -07:00
Jeremy Huddleston
0605c35188 XQuartz: Cleaned up the about box. 
(cherry picked from commit 0279a59706)
 2008-05-14 01:15:15 -07:00
Jeremy Huddleston
1c507cb8bf Don't need the fink-friendly printf in the DDX anymore. 
(cherry picked from commit fe22794404)
 2008-05-14 01:15:06 -07:00
Jeremy Huddleston
c624964539 XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app 
(cherry picked from commit 78032815ae)
 2008-05-12 10:41:58 -07:00
Jeremy Huddleston
5687d51d7e XQuartz: More startup work... listen if we're the actual server 
(cherry picked from commit 3b0afb47c3)
 2008-05-12 10:41:48 -07:00
Jeremy Huddleston
6cb8900736 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support 
(cherry picked from commit 9b67fca9b7)
 2008-05-12 10:41:38 -07:00
Julien Cristau
f2278a882f kdrive: allow disabling Composite 
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
(cherry picked from commit 9dfb525f6c)
 2008-05-11 23:38:03 +02:00
Jeremy Huddleston
e2431ff488 XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work. 
(cherry picked from commit 2232c91d5c)
 2008-05-08 19:57:48 -07:00
Jeremy Huddleston
d6cf35fc56 XQuartz: Set bundle version to 2.3.0 
(cherry picked from commit 8a0524b30e)
 2008-05-08 19:57:17 -07:00
Jeremy Huddleston
561ece68ea XQuartz: Fixed some issue in our bundle creation 
(cherry picked from commit 330ffad547)
 2008-05-08 19:56:29 -07:00
Jeremy Huddleston
50ce5f2083 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-05-08 19:55:25 -07:00
Adam Jackson
64948dc667 Bug #13104: Remove broken XAA a1 glyph fast path. 
(cherry picked from commit f17ba5d584)
 2008-05-08 16:12:01 -04:00
Adam Jackson
f2aa0000a2 Bug #13104: Don't let XAA glyph pixmaps anywhere near video memory. 
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code.  Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.

Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
(cherry picked from commit 718652eaf9)
 2008-05-08 16:09:56 -04:00
Jeremy Huddleston
4f0a975d02 XQuartz: Fixed typo 
(cherry picked from commit 56b7988d26)
 2008-05-06 03:04:30 -07:00
Jeremy Huddleston
1764a6a651 XQuartz: Added uncommitted files 
(cherry picked from commit e414ec462c)
 2008-05-06 03:04:27 -07:00
Jeremy Huddleston
5bac727e06 Fixed up dist 
(cherry picked from commit f225222ba2)
 2008-05-06 03:04:23 -07:00
Jeremy Huddleston
89e8654ba4 XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite 
(cherry picked from commit 453a982e63)
 2008-05-06 02:49:31 -07:00
Ben Byer
62601cfc1f Xquartz: experimental embedding of Sparkle.framework 
(cherry picked from commit b7a1a640ce)
 2008-05-06 02:49:22 -07:00
Jeremy Huddleston
b8ed63740d XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values 
(cherry picked from commit 8d9eab3a2e)
 2008-05-02 17:42:28 -07:00
Jeremy Huddleston
eb9187cb08 XQuartz: Avoid a possible crash at startup due to unfavorable context switching. 
(cherry picked from commit ff10c37bdd)
 2008-05-02 17:42:19 -07:00
Jeremy Huddleston
f93f835588 XQuartz: Adjust the screen origin offset properly for multimonitor setups 
(cherry picked from commit f2020b9836)
 2008-05-01 18:04:23 -07:00
Jeremy Huddleston
51925ed0db XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h 
(cherry picked from commit 1fcf74a436)
 2008-04-30 17:32:55 -07:00
Jordan Crouse
fd0ec73bcb xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode' 
(cherry picked from commit 4fa89fbe18)
 2008-04-30 11:51:08 +03:00
Ben Byer
cc58f22037 xquartz: created darwinTablet, to represent tablet events 
(cherry picked from commit 50641bce73)
 2008-04-29 23:59:02 -07:00
Ben Byer
1f2dc202bd xquartz: remove unused params from DarwinEQInit 
(cherry picked from commit 299a056737)
 2008-04-29 23:58:55 -07:00
Jeremy Huddleston
c6edfc2cab XQuartz: Fix to tablet-event handling code; we now scale 
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
(cherry picked from commit 588683cecc)
 2008-04-29 23:58:47 -07:00
Jeremy Huddleston
dd876f2c59 XQuartz: Unset CFProcessPath... blech 
(cherry picked from commit ce4fbfbc75)
 2008-04-28 15:55:06 -07:00
Jeremy Huddleston
2500818656 XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m) 
(cherry picked from commit 22cf724376)
 2008-04-28 15:39:40 -07:00
Jeremy Huddleston
1448fed9b6 XQuartz: Disabled DPMS extension 2008-04-28 15:39:02 -07:00
Jeremy Huddleston
080a4eb9b6 XQuartz: Added thread debugging to xprFrame.c 
(cherry picked from commit 41542502b3)
 2008-04-28 15:29:32 -07:00
Jeremy Huddleston
cf5a4210a4 XQuartz: More startup / threading house cleaning. 
(cherry picked from commit 72653c24c0)
 2008-04-28 11:49:07 -07:00
Jeremy Huddleston
ab5abdc7af XQuartz: Updated Localizable.strings 
(cherry picked from commit d8d9c866b9)
 2008-04-28 11:48:59 -07:00
Jeremy Huddleston
1545be4b57 XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST 
(cherry picked from commit 03e707987f)
 2008-04-28 11:48:52 -07:00
Jeremy Huddleston
5ecd552e19 Xquartz: Added missing to EXTRA_DIST 
(cherry picked from commit f4b963256f)
 2008-04-26 23:19:43 -07:00
Jeremy Huddleston
90c4fd7a49 XQuartz: Cleaned up startup and thread creation a tad. 
(cherry picked from commit c861fe00e1)
(cherry picked from commit ef1c520537)
 2008-04-26 19:21:18 -07:00
Jeremy Huddleston
4a811c665a XQuartz: Don't subtract the titlebar off of the pointer_y 
(cherry picked from commit 00a9567acc)
 2008-04-26 17:05:38 -07:00
Jeremy Huddleston
631e2986f1 XQuartz: Added some pseudoramiX debug traces 
(cherry picked from commit 5bee1585a3)
(cherry picked from commit 5c6aa1272e)
 2008-04-25 18:01:55 -07:00
Jeremy Huddleston
40514b3cc7 XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging. 
(cherry picked from commit 515b8b855a)
 2008-04-24 23:50:14 -07:00
Jeremy Huddleston
730e2a5ac3 XQuartz: Cleaned up multi-monitor support. 
(cherry picked from commit c05abf0a19)
(cherry picked from commit 9112f29043)
 2008-04-24 23:50:08 -07:00
Jeremy Huddleston
c9356f3289 Moved Apple GL bits into our DDX subtree 2008-04-23 10:13:50 -07:00
Jeremy Huddleston
41ed532525 XQuartz: No need to include indirect.c a second time 2008-04-23 09:59:48 -07:00
Ben Byer
821d7400f2 xquartz: clean up linker line for main binary 2008-04-23 03:40:31 -07:00
Jeremy Huddleston
824b31c7f8 XQuartz: Make sure QuartzAudioInit() gets run. 
(cherry picked from commit bb3d034675)
 2008-04-23 02:22:14 -07:00
Jeremy Huddleston
b9b2d028d2 XQuartz: Fixed cmd-tab to bring all windows forward. 
(cherry picked from commit e48e2ce931)
 2008-04-21 23:44:52 -07:00
Jeremy Huddleston
b43ead0cfd XQuartz: Fixed quit dialog to be more conforming with HIG. 
(cherry picked from commit 14c6b837bb)
 2008-04-21 19:08:24 -07:00