Peter Hutterer
32a7bbbba6
xfree86: fix up leftover allocation of xf86Events.
...
Thanks to Eamon Walsh for spotting this.
2008-06-25 09:59:46 +09:30
Julien Cristau
9ed9d98dec
x86emu: fix build, fallout from 9719354
2008-06-24 22:36:32 +02:00
Eamon Walsh
e9b4f3cd85
Fix "warning: suggest parentheses around && within ||".
2008-06-24 15:04:01 -04:00
Eamon Walsh
8910dde96e
Fix "warning: assignment discards qualifiers from pointer target type".
2008-06-24 15:04:01 -04:00
Eamon Walsh
95d4ede538
Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
2008-06-24 15:04:01 -04:00
Eamon Walsh
fa1545eeda
Fix "warning: passing argument 1 of `xf86addNewLoadDirective' from incompatible pointer type".
2008-06-24 15:04:01 -04:00
Adam Jackson
9719354ae0
Check for __amd64__, not __x86_64__.
...
Spiritual revert of 1fa4de80fc
. Intel's C
compiler claims to be gcc-compatible; if they're not defining the same
macros as gcc then that's their bug, not ours. Even if we were to do
this aliasing we should do it once and for all in servermd.h.
2008-06-24 14:37:06 -04:00
Adam Jackson
9e5b3deafb
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.
2008-06-24 14:08:04 -04:00
Adam Jackson
d34430414a
Remove xorgconfig. Use X -configure instead.
2008-06-24 13:32:55 -04:00
Paul Bender
4c4e06af79
Bug #15665 : Fix building without Composite.
2008-06-24 10:44:47 -04:00
Adam Jackson
59510a7643
Remove some default modes that really shouldn't be in the default set.
2008-06-24 10:40:36 -04:00
Julien Cristau
b622f6dc5d
kdrive: fix building with --disable-xv (bug#16488)
2008-06-23 23:45:57 +02:00
Jesse Ruffin
3b58782692
Bug #16302 : Fix GLX drawable refcounting in DMX.
2008-06-23 14:35:20 -04:00
Adam Jackson
c8d066a151
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.
2008-06-23 14:00:50 -04:00
Matthieu Herrb
155fcecb32
Various messages clean-ups.
2008-06-19 16:59:41 +02:00
Matthieu Herrb
ce4d4b3c1b
build fix
2008-06-19 16:57:20 +02:00
Matthieu Herrb
19c7e9da55
preserve errno around the SIGIO handler
2008-06-19 16:55:25 +02:00
Matthieu Herrb
0a81d47638
Remove RCS Id.
2008-06-19 16:53:40 +02:00
Matthieu Herrb
c0d7ad9c88
Let code build with gcc 2.95
2008-06-19 16:51:18 +02:00
Ian Romanick
f3490d3eba
Bug #15169 : Make the server build again on Alpha.
...
Still won't work until the kernel makes the resource files actually exist.
2008-06-17 10:35:24 -04:00
Eamon Walsh
720e44f973
Fix "warning: no previous prototype for ‘XevieExtensionInit’".
2008-06-13 21:42:37 -04:00
Eamon Walsh
2d7ba09dc4
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.
2008-06-13 16:43:56 -04:00
Adam Jackson
f31bd087e8
Death to mfb.
...
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
2008-06-13 10:51:18 -04:00
Adam Jackson
d15b379030
Remove xgl.
...
This code hasn't been updated with anything even resembling what anyone is
shipping in nearly thirty months. It hasn't built out of the box since
7.1. Most of its features over AIGLX are accomplished with DRI2 and
friends.
2008-06-12 16:00:50 -04:00
Dave Airlie
c37a93b485
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:55:16 +10:00
Tiago Vignatti
390b155135
Welcome to hotplug era.
...
`rm -rf xorg.conf` does not imply an error message. Maybe a warning.
checkInput() is defined but not used.
2008-06-11 18:21:33 -03:00
Tiago Vignatti
6e018f6a30
No need for inputPending field in xf86Info.
2008-06-11 18:10:55 -03:00
Tiago Vignatti
84db8837d0
Remove unused xf86DeviceCursorUndisplay() function.
2008-06-11 17:47:00 -03:00
Peter Hutterer
656d5d9885
kdrive: fix wrong use of &, should be | instead.
...
Fallout from 26e7e69ab8
2008-06-11 17:32:59 +09:30
Peter Hutterer
e083b5a075
xnest: wrap the xnest cursor sprite funcs around the mi funcs.
...
Modelled after the xfree86 code. Call miDCInitialize to init the SW rendering
engine, then take the pointers, store it in a xnest-local variable, and put
the xnest-specific sprite funcs in place. In the xnest sprite funcs, call
through to the mi sprite funcs after doing xnest-specific stuff.
2008-06-11 17:24:19 +09:30
Peter Hutterer
a3a7c12fcf
xfree86: Fix up xf86ScaleAxis
...
Some driver still call it, so we might as well work correctly. Always
resetting X to the Sxhigh is sub-optimal.
2008-06-11 17:24:19 +09:30
Jeremy Huddleston
f8431a62d5
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:52:04 -07:00
Jeremy Huddleston
c180a52332
XQuartz: Removed code path for old startup
...
(cherry picked from commit a9ee6b0d00
)
2008-06-10 10:51:58 -07:00
Jeremy Huddleston
5170c169db
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:46:01 -07:00
Jeremy Huddleston
01ace5f3fd
XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
...
(cherry picked from commit d8cf5623fa
)
2008-06-10 01:46:00 -07:00
Peter Hutterer
2854abd39d
xnest: fix up sprite funcs to stop compiler warnings.
2008-06-08 23:28:28 +09:30
Peter Hutterer
c68ca0c7b2
xnest: switch to using EventList rather than xEvents.
2008-06-08 23:28:28 +09:30
Peter Hutterer
34429d16d3
xnest: call miDCInitialize rather than miPointerInitialize.
...
This unfortunately gives us a lots of artefacts, so cursor rendering cannot be
assumed complete. But it's better than crashing.
2008-06-08 23:28:28 +09:30
Peter Hutterer
585125685b
ephyr: some whitespace changes.
2008-06-08 23:28:27 +09:30
Peter Hutterer
874dcdb3bd
dmx: remove a ifndef XINPUT, XINPUT is always defined now.
2008-06-05 16:14:29 +09:30
Peter Hutterer
52752911ea
dmx: don't free event list after use.
2008-06-05 16:14:23 +09:30
Peter Hutterer
5c5e581245
dmx: add an XFlush.
...
Beats me why we need it, but without it we get segfaults lateron.
2008-06-05 16:14:18 +09:30
Peter Hutterer
246c10441b
dmx: fix false memory allocation.
...
beNumVisuals and the number of GLX Visuals can be significantly different.
2008-06-05 16:14:12 +09:30
Peter Hutterer
17cd262257
dmx: don't dereference a nullpointer.
2008-06-05 16:13:58 +09:30
Peter Hutterer
75eb635e35
dmx: add stubs for DeviceCursorInitialize, DeviceCursorCleanup
2008-06-05 16:13:44 +09:30
Peter Hutterer
3ff2f3a00e
dmx: for now, don't acknowledge SDs.
2008-06-05 16:13:38 +09:30
Peter Hutterer
5bcd9e8953
dmx: learn about the existence of IsXExtensionPointer and IsXExtensionKeyboard
2008-06-05 16:13:23 +09:30
Peter Hutterer
8da8a0fec4
dmx: claim we support XI 2.
...
We don't really, yet, but at least we get the full device list this way.
2008-06-05 16:13:18 +09:30
Peter Hutterer
6f1d5147cb
dmx: fix a segfault caused by GC devPrivates never being initalised.
2008-06-05 16:13:12 +09:30
Peter Hutterer
d10ba4591a
dmx: some more build fixes.
2008-06-05 16:13:03 +09:30
Jeremy Huddleston
40855d8000
XQuartz: Removed async debugging sleep
...
(cherry picked from commit 7812a8bdf9
)
2008-06-04 12:24:15 -07:00
Jeremy Huddleston
ee86b75119
XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
...
(cherry picked from commit ff1c443cad
)
2008-06-04 12:24:12 -07:00
Jeremy Huddleston
38da26cd36
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:24:10 -07:00
Jeremy Huddleston
ea40fcf434
XQuartz: Fork for trigger
...
(cherry picked from commit dd0f8a0f59
)
2008-06-04 12:24:06 -07:00
Jeremy Huddleston
2393dae6ff
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:24:04 -07:00
Peter Hutterer
26e7e69ab8
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 >
2008-06-02 11:11:37 +09:30
Peter Hutterer
ac1db45449
xfree86: suspend signals while removing a device (corrected version).
...
Block/Release is now symmetrical.
2008-06-02 10:40:10 +09:30
Peter Hutterer
95ecaa411a
Revert "xfree86: suspend signals while removing a device."
...
Left the signals blocked hanging after removing a master device.
This reverts commit 74372fd004
.
2008-06-02 10:38:45 +09:30
Tiago Vignatti
5ba07cb548
kdrive: changes ephyr API according mpx merge.
...
This fix host-cursor in Xephyr server.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-06-02 10:27:12 +09:30
Peter Hutterer
f79ad5674e
kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr
2008-05-31 18:46:35 +09:30
Peter Hutterer
942086fc96
dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it
2008-05-31 18:17:49 +09:30
Peter Hutterer
64677f6a16
xfree86: fix offset error in EDID parsing. #15964
...
X.Org Bug 15964 <http://bugs.freedesktop.org/show_bug.cgi?id=15964 >
2008-05-27 21:18:35 +09:30
Paulo Cesar Pereira de Andrade
c8af7ce35a
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>
2008-05-27 15:20:28 +09:30
Peter Hutterer
3a1278907e
xfree86: Bump XINPUT ABI to 3.0.
2008-05-26 18:14:31 +09:30
Peter Hutterer
26c1958c32
Merge branch 'master' into mpx
2008-05-26 17:37:31 +09:30
Peter Hutterer
1883485edd
If core motion history is required, scale back to screen coords and INT16.
2008-05-26 17:22:25 +09:30
Peter Hutterer
0877de13ac
Remove GetMotionProc from ValuatorClassRec.
...
With the MD/SD device hierarchy we need control over the generation of the
motion history as well as the conversion later before posting it to the
client. So let's not let the drivers change it.
No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping
it seems safe enough.
2008-05-25 22:49:54 +09:30
Peter Hutterer
00b4339168
dmx: remove some #if 0'd code.
2008-05-25 22:34:11 +09:30
Michel Dänzer
29586101dc
EXA: Only record damage generated by rendering operations.
...
Recording damage from other operations (e.g. creating a client damage record)
may confuse the migration code resulting in corruption.
Option "EXAOptimizeMigration" appears safe now, so enable it by default. Also
remove it from the manpage, as it should only be necessary on request in the
course of bug report diagnostics anymore.
2008-05-24 20:01:41 +02:00
Julien Cristau
e6cbb1e11e
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 .
2008-05-23 23:01:24 +02:00
George Sapountzis
21a8052fdc
glx: fix forgotten swrast -> SWRast
2008-05-23 22:40:26 +03:00
George Sapountzis
877e6c35ff
glx: missing swrast is fatal
2008-05-23 22:40:26 +03:00
George Sapountzis
ae0504d34d
kdrive: need not export symbols for glx anymore
2008-05-23 22:40:25 +03:00
Jeremy Huddleston
7082929ef7
XQuartz: A 2 second delay for launchd socket connections should be sufficient.
...
(cherry picked from commit 2bb4251b3c
)
2008-05-23 02:32:37 -07:00
Jeremy Huddleston
225dddbaed
XQuartz: Move the launchd display grabbing into mach_startup
...
(cherry picked from commit c3866c98d2
)
2008-05-23 02:31:41 -07:00
Jeremy Huddleston
3a22190061
XQuartz: Fixed a few issues with fd passing... still not working =(
...
(cherry picked from commit 7dd3512715
)
2008-05-23 02:31:38 -07:00
Peter Hutterer
6c9e9f8a40
input: instead of lastx/y, use a last.valuators[] array on the device.
...
During GetPointerEvents (and others), we need to access the last coordinates
posted for this device from the driver (not as posted to the client!). Lastx/y
is ok if we only have two axes, but with more complex devices we also need to
transition between all other axes.
ABI break, recompile your input drivers.
2008-05-23 12:01:37 +09:30
Peter Hutterer
74372fd004
xfree86: suspend signals while removing a device.
...
Getting a keyboard event while halfway through freeing memory can be
unpleasant.
2008-05-22 18:08:32 +09:30
Dave Airlie
ea4ec9e998
int10: add pci_device_enable support on Linux
2008-05-22 08:58:42 +10:00
Kristian Høgsberg
4230b92744
Clean up remaining afb references.
2008-05-21 17:58:15 -04:00
Adam Jackson
20ea99c655
Death to afb.
...
Planar framebuffer people, please talk to wfb for all your 1988 hardware
needs.
2008-05-21 17:03:25 -04:00
Dan Nicholson
c76fddeea2
Fix up paths for GL/glx -> glx renaming
2008-05-21 10:51:15 -07:00
Kristian Høgsberg
a8a9b40e55
Move the windows GL files to the xwin DDX.
2008-05-21 12:36:25 -04:00
Kristian Høgsberg
e5aad4bc08
Get out of the mesa symlinking business.
...
This copies over the files generated from mesa/src/mesa/glapi. There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.
The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch]. Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.
The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
2008-05-21 12:15:18 -04:00
Kristian Høgsberg
f558c7d4d1
Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
2008-05-21 12:15:18 -04:00
Kristian Høgsberg
77ff8fd507
Drop glcore GLX provider.
...
Obsoleted by the DRI swrast driver.
2008-05-21 12:15:18 -04:00
George Sapountzis
255142b61e
drop xprint remnants: InitGlobals
2008-05-21 18:13:09 +03:00
Peter Hutterer
7509fb498c
Merge branch 'hwcursor' into mpx
2008-05-21 16:25:35 +09:30
George Sapountzis
6ff6465931
Add loader for the swrast dri driver.
2008-05-20 16:38:05 -04:00
Alan Coopersmith
925e895b86
Restore return type on xf86SetScrnInfoModes
...
Seems to have been accidentally lost by commit 76943fec86
2008-05-19 18:43:29 -07:00
Peter Hutterer
99d28c3ef3
Merge branch 'master' into mpx
...
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
Adam Jackson
0178b6a4ab
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.
2008-05-19 11:22:19 -04:00
Jeremy Huddleston
bb687465d0
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:18 -07:00
Jeremy Huddleston
4b69d22bcb
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:17 -07:00
Jeremy Huddleston
e997df8cd3
XQuartz: Cleaned up ListenOnOpenFD...
...
(cherry picked from commit 6fb587d3d5
)
2008-05-18 23:32:57 -07:00
Jeremy Huddleston
738672858d
New XQuartz icon thanks to Simone Karin Lehmann
...
(cherry picked from commit c27e0c8f3c
)
2008-05-18 23:32:56 -07:00
Jeremy Huddleston
4be2104c80
XQuartz: More work towards Mach-IPC startup... started working on FD passing
...
(cherry picked from commit 27fbfeacfa
)
2008-05-18 22:45:19 -07:00
Julien Cristau
82c4075d4b
xfree86: fix initial output positions with Above or LeftOf and rotation
...
The fix in fa19e84714
was incomplete,
as it was still using the wrong output's initial rotation to compute
the position.
2008-05-19 03:27:12 +02:00
Dave Airlie
7dca84f3ee
cursor: don't dereference NULL pointer is devPrivates not yet set.
...
This fixes a bug on server recycle with ati zaphod.
2008-05-19 11:16:08 +10:00
Jeremy Huddleston
5af5db5033
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:56:57 -07:00