Alan Coopersmith
235fea0e1a
Update bsd & solaris descriptions in README.OS-lib
2008-07-07 15:21:59 -07:00
Tiago Vignatti
d78bebb20a
Remove unused function and variables.
2008-07-04 04:04:19 -03:00
Tiago Vignatti
a8c4727f01
Fix typo in the last commit.
2008-07-04 04:03:46 -03:00
Tiago Vignatti
3164288b12
Remove deprecated function miPointerPosition().
2008-07-04 03:55:59 -03:00
Tiago Vignatti
d1031a8972
Update README.OS-lib to reflect reality.
2008-07-04 03:46:21 -03:00
Tiago Vignatti
f72500c4a0
Nuke libc wrapper remaining stuffs.
2008-07-04 03:45:18 -03:00
Tiago Vignatti
3fd5fab566
Remove inexistent function headers.
2008-07-04 02:51:42 -03:00
Dave Airlie
0b9ef835a0
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.
2008-07-04 07:29:32 +10:00
Peter Hutterer
e317943c12
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 (written by Sasha Hlusiak).
Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).
Set AllowEmptyInput to enabled by default if hotplugging is enabled.
2008-07-03 22:49:46 +09:30
Peter Hutterer
fe5cf7cb00
xfree86: handle missing Screen lines in the ServerLayout #16301
...
If no Screen is specified in the ServerLayout section, either take the first
one from the config file or autogenerate a default screen.
X.Org Bug 16301 <http://bugs.freedesktop.org/show_bug.cgi?id=16301 >
2008-07-03 22:49:46 +09:30
Peter Hutterer
6674b87a7d
xfree86: move declaration of configured_device to start of function.
...
Last I checked C doesn't allow declarations halfway down a block.
2008-07-03 22:49:46 +09:30
Dave Airlie
1771edcb44
modes: check the crtc is valid before using its desired modes.
...
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
2008-07-03 19:05:26 +10:00
Adam Jackson
689292e58c
Fix GLX in Xvfb and kdrive.
2008-07-02 11:25:50 -04:00
Chris Ball
9a73bca859
Remove KdOffscreenMarkUsed() as all its callers are gone.
2008-07-02 09:46:06 -04:00
Adam Jackson
703a9645f3
Auf wiedersehen, KAA.
2008-07-01 17:50:48 -04:00
Jeremy Uejio
c8216aede6
Sun bug #6685465 : Xephyr uses wrong or bad colortable in 8-bit mode
...
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465 >
This bug is caused by Xephyr not handling the RGB byte order correctly
of the server where Xephyr is displaying on. The previous code just
assumed that the order was RGB and did not take into account that
Xservers may use different order (such as BGR).
The fix is to add a function to calculate the byte order and bits
to shift based on the visual mask and the visual bits_per_rgb (which
is usually 8, but could be server dependent). Since the shifts won't
change once the display connection has been made, I can cache these
values so that Xephyr doesn't have to keep recalculating them everytime
it tries to translate the Xephyr colormap entries for Xephyr clients to
the actual server colormap entries (i.e. calling the function
hostx_set_cmap_entry() repeatedly for every colormap entry).
2008-07-01 13:37:12 -07:00
Aaron Plattner
2e8daee053
Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
...
RandR 1.1 has a physical size for each mode. It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration. The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.
With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode. The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes. Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.
This change works around this problem by ignoring the DIX and querying the real
size from the driver.
2008-07-01 09:08:22 -07:00
Adam Jackson
e2bbf2d248
Don't try to load DRI2 if built without it.
2008-07-01 12:01:56 -04:00
Adam Jackson
66d7c9de82
Declare xf86InterpretEEDID() properly.
2008-07-01 10:55:54 -04:00
root
e4335e876d
Revert "XInput ABI is 2.1, not 3.1."
...
This reverts commit 76576c87b0
.
which was an incorrect revert of previous ABI bumps. Those
responsible for the accidental ABI bumps in both directions
have all been sacked.
This allows xf86-input-mouse to build again, for example.
2008-06-30 15:42:33 -07:00
Adam Jackson
76576c87b0
XInput ABI is 2.1, not 3.1.
2008-06-30 16:10:37 -04:00
Adam Jackson
bed12dd3df
Do EEDID in RANDR 1.2.
2008-06-30 16:04:54 -04:00
Adam Jackson
4fc18b5fc3
Hexdump the whole EDID block if extensions present.
2008-06-30 16:04:54 -04:00
Adam Jackson
b4fbc31e10
Actually fetch all blocks of EEDID if asked to.
2008-06-30 16:04:54 -04:00
Adam Jackson
211e2bdcc6
Bump ABI minor numbers for the devPrivate ABI functions.
2008-06-30 10:29:17 -04:00
Alan Coopersmith
01f0b9c978
xf86GetOptValFreq wants a pointer to double, but maxPixClock is an int
2008-06-25 19:23:20 -07:00
Adam Jackson
cbc20d92de
XTrap delenda est.
2008-06-25 09:52:36 -04:00
Tiago Vignatti
2ff7eb4995
xfree86: kill INHERIT_LOCK_STATE macro.
...
I don't know how this survived so long. Google didn't show
anything usable related with this.
2008-06-24 23:10:56 -03:00
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 4505bae5d7341e1241be50c25cb3d1b941701de4)
2008-06-10 10:52:04 -07:00
Jeremy Huddleston
c180a52332
XQuartz: Removed code path for old startup
...
(cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c)
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 ee92aced10d0743c4658e53b58b5d9f5a094a415)
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 d8cf5623faab952a0f1196c8fe10baa09d1fc089)
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 7812a8bdf9fab651ea5c07b852b2999547ec628d)
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 ff1c443cadf11d12a7d939e51194f6105153870e)
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 c3558bb8cd889e5b957190e9f5d23afad1e17b72)
2008-06-04 12:24:10 -07:00
Jeremy Huddleston
ea40fcf434
XQuartz: Fork for trigger
...
(cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e)
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 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
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 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
2008-05-23 02:32:37 -07:00
Jeremy Huddleston
225dddbaed
XQuartz: Move the launchd display grabbing into mach_startup
...
(cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e)
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 7dd351271522b475d8017e4bd1618f12817ee2fa)
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 cccee9cfc29f85cca635df3b8dd54199b45c4df8)
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 2a72309c061f7060480d150791019ce232481462)
2008-05-19 02:47:17 -07:00
Jeremy Huddleston
e997df8cd3
XQuartz: Cleaned up ListenOnOpenFD...
...
(cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
2008-05-18 23:32:57 -07:00
Jeremy Huddleston
738672858d
New XQuartz icon thanks to Simone Karin Lehmann
...
(cherry picked from commit c27e0c8f3c5108192362735db8a80bf3a9a1cc3a)
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 27fbfeacfa16d620801ac3492b25c1e50aec8588)
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 301262b07024ad960f22d99a1267fe137f5c3fce)
2008-05-17 14:56:57 -07:00
Jeremy Huddleston
2408303d79
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
...
(cherry picked from commit 543c2cd68d1ffef65d4644b860faad7191c6b9da)
2008-05-17 14:56:53 -07:00
Jeremy Huddleston
01612fe612
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 c28fecc621b1803a4d4536afbc724d141de9e6ee)
2008-05-17 14:56:34 -07:00
Jeremy Huddleston
1d09deaa6e
XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
...
(cherry picked from commit 5626b0949b1a6bdd2fa3ec2ef53a688084349b87)
2008-05-17 14:56:30 -07:00
Jeremy Huddleston
adc62f62b9
Xquartz: Xquartz stub now can send Mach IPC to start the server.
...
(cherry picked from commit 55a3bca8ea42f8677897f94bf0a429bdc08c6696)
2008-05-17 14:56:26 -07:00
Brad Smith
93c082a060
OpenBSD doesn't define __x86_64__, simplify tests.
...
Seeing as this code seems to be specific to OpenBSD I don't think
__x86_64__ should have been added there at all. It appears to have
been added wherever __amd64__ existed before which is wrong. I
think that part of the commit should be reverted but also all four of
the checks should be __OpenBSD__ && __amd64__ instead of two one
direction and two flipped.
2008-05-17 13:14:31 +02:00
Adam Jackson
aad1c37b09
RANDR 1.1 compat: remove senseless comparison against the virtual size.
2008-05-16 11:10:33 -04:00
Adam Jackson
14726b776d
xf86SetDesiredModes(): Skip disabled CRTCs first thing.
2008-05-16 11:10:33 -04:00
Adam Jackson
459f34b089
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".
2008-05-16 11:10:33 -04:00
Adam Jackson
96111c1547
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.
2008-05-16 11:10:32 -04:00
Adam Jackson
a4bbe1c8bc
Re-add sync range inference from legacy setup to RANDR 1.2.
2008-05-16 11:10:32 -04:00
Adam Jackson
99e4531f7c
The great kdrive purge.
...
Most of these drivers didn't work. ati was the only one that even came
close. The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
and vxworks directories have never built since modularisation, so clearly
no one can miss them.
2008-05-16 08:16:01 -04:00
Peter Hutterer
6fb76acc45
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
...
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
2008-05-16 21:10:00 +09:30
Peter Hutterer
f611719edc
xfree86: always render first cursor in HW, all others in SW.
2008-05-16 20:17:21 +09:30
Peter Hutterer
48ba58feac
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
...
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
2008-05-16 19:33:51 +09:30
Tiago Vignatti
622d7c1d89
Restructure and organize the code.
...
It was removed and simplified some conditionals. We don't need test for
pDev->isMaster inside xf86CursorSetCursor() because only MD enters there.
In the last chunk, ScreenPriv fields were being assigned without need, so
that code was wrapped inside the conditional to avoid it.
I also tried to make the identation more sane in some parts that I touched.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Minor modification, part of the original patch led to cursors not being
updated properly when controlled through XTest.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 17:14:43 +09:30
Tiago Vignatti
5af90025fe
Remove redundancy.
...
The only function that cat set SWCursor before xf86DeviceCursorInitialize()
is xf86InitCursor() when VCP and is created.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 17:02:15 +09:30
Brian Rogers
5127942f80
DGA: pass nevents to UpdateDeviceState. #15936
...
Missing parameter caused event processing to go nuts when checking valuators.
X.Org Bug 15936 <http://bugs.freedesktop.org/show_bug.cgi?id=15936 >
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 15:43:01 +09:30
Adam Jackson
166177e36b
Simplify default font path setup.
2008-05-14 16:02:05 -04:00
Jeremy Huddleston
cbb4e80eb7
XQuartz: More work on the Mach-IPC startup path
...
(cherry picked from commit 49cd0b185fd6c99b07357a74734b6a4023faca84)
2008-05-14 01:16:04 -07:00
Jeremy Huddleston
3b57c59bb0
Xquartz: More work on the new Mach startup
...
(cherry picked from commit 6237acf75d3310d7d4f262556b677557c2907284)
2008-05-14 01:16:01 -07:00
Jeremy Huddleston
e435acc84c
Added missing to EXTRA_DIST
...
(cherry picked from commit e39613f4633ed992bc276b70833a703560e528f9)
2008-05-14 01:15:58 -07:00
Jeremy Huddleston
f7d6d20ad6
XQuartz: Cleaned up the about box.
...
(cherry picked from commit 0279a5970694937e949ba533330ea48961c4edba)
2008-05-14 01:15:56 -07:00
Jeremy Huddleston
b37e1f1f5c
Don't need the fink-friendly printf in the DDX anymore.
...
(cherry picked from commit fe2279440450c795d67ba5a2234b0797d0bfe39c)
2008-05-14 01:15:54 -07:00
Peter Hutterer
68b4f250ee
dmx: fix build.
...
Just because it builds, doesn't mean it works.
2008-05-14 16:18:48 +09:30
Peter Hutterer
8234af6c6a
xfree86: remove Ubuntu-ism.
...
Additional #include was required due to broken libc headers or something like
that. Remove it, there's more to the world than ubuntu alone.
2008-05-13 11:17:39 +09:30
Peter Hutterer
1fc1a2897e
Remove UndisplayCursor API.
...
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
2008-05-13 11:17:02 +09:30
Adam Jackson
86678e7cc2
Fix fbdevhw initialization for PCI drivers.
...
graphics/fb%d, not graphics:fb%d. Thanks sysfs. Thysfs.
2008-05-12 14:53:37 -04:00
Adam Jackson
1c8bd318fb
X n'est pas une print API.
2008-05-12 14:15:11 -04:00
Jeremy Huddleston
f9fae16456
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 78032815aeb10c22ff45b49702e9c9df82ab471c)
2008-05-12 10:42:20 -07:00
Jeremy Huddleston
ac4e33a9cd
XQuartz: More startup work... listen if we're the actual server
...
(cherry picked from commit 3b0afb47c3d8ad922cb2315ed8034f4d77d4a249)
2008-05-12 10:42:16 -07:00
Jeremy Huddleston
a7800d9355
XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
...
(cherry picked from commit 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
2008-05-12 10:42:12 -07:00
Dave Airlie
3b6735528e
pci: don't do this pci stuff when we don't have hw access
2008-05-12 16:36:42 +10:00
Julien Cristau
9dfb525f6c
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.
2008-05-11 23:35:41 +02:00
Drew Parsons
7b3066d9b9
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental
2008-05-10 00:01:15 +10:00
Drew Parsons
2a3d1421e0
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.
2008-05-09 23:58:19 +10:00
Jeremy Huddleston
315f089056
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
...
(cherry picked from commit 2232c91d5c277673929eab2abb5e0495c00877cb)
2008-05-08 19:58:24 -07:00
Jeremy Huddleston
a07c5ad172
XQuartz: Set bundle version to 2.3.0
...
(cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
2008-05-08 19:58:15 -07:00
Jeremy Huddleston
05f23ed3ea
XQuartz: Fixed some issue in our bundle creation
...
(cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
2008-05-08 19:58:09 -07:00
Adam Jackson
f17ba5d584
Bug #13104 : Remove broken XAA a1 glyph fast path.
2008-05-08 16:04:24 -04:00
Adam Jackson
ddaecfa13c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2008-05-08 14:33:58 -04:00
Daniel Stone
641a5f955b
Build: Ensure xf86DefModeSet.c ends in an empty line
...
This shuts up a warning.
2008-05-07 22:29:04 +03:00
Adam Jackson
9c2e0871cf
Bug #13104 : XAA: Adapt to glyph storage changes.
...
Glyph bits are now stored in a proper pixmap, not just hanging off the
end of a GlyphRec.
2008-05-07 13:21:26 -04:00
Adam Jackson
718652eaf9
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.
2008-05-06 17:52:37 -04:00
Jeremy Huddleston
a85d3ac87c
XQuartz: Fixed typo
...
(cherry picked from commit 56b7988d2662caa4d31094695b414080e4470ed4)
2008-05-06 03:04:13 -07:00
Jeremy Huddleston
077ced6384
XQuartz: Added uncommitted files
...
(cherry picked from commit e414ec462cfc63f8eb7f504f526f5a2c73f51e69)
2008-05-06 03:04:09 -07:00
Jeremy Huddleston
80e502c5d1
Fixed up dist
...
(cherry picked from commit f225222ba2bf4f03425107f258d60b73c88efaec)
2008-05-06 03:04:04 -07:00
Jeremy Huddleston
7295e54433
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
...
(cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)
2008-05-06 02:49:48 -07:00
Ben Byer
d41d677ab4
Xquartz: experimental embedding of Sparkle.framework
...
(cherry picked from commit b7a1a640cef8c69442859cbf89034ad362a19684)
2008-05-06 02:49:41 -07:00
Peter Hutterer
9e0d73fd8a
xfree86: call SetCursor for the VCP when switching between SW/HW rendering.
...
We need a manual call to SetCursor when we switch from SW to HW rendering and
the other way round. This way we display the new cursor after removing the old
one.
In addition, we only update the internal state for the VCP's sprite. This way,
when we switch back to HW rendering the state is up-to-date and wasn't
overwritten with the other sprite's state.
The second part is a hack. It would be better to keep a state for each sprite,
but then again we don't have hardware that can render multiple cursors so we
might as well do with the hack.
2008-05-06 17:52:15 +09:30
Dave Airlie
e4ebfed178
xf86edid: fix typo in debug output
2008-05-06 16:47:18 +10:00
Peter Hutterer
b9c1a57e7a
xfree86: switch between to SW cursors if more than 1 sprite is available.
...
Switches back to HW cursors when sprites other than the VCP are removed.
The current state requires the cursor to change shape once before it updates
to SW / HW rendering (whatever is appropriate), e.g. by moving into a
different window. Until this is done, the cursor is invisible.
2008-05-06 14:51:23 +09:30
Peter Hutterer
3df88c17e3
xfree86: re-enable hardware cursor (for a single cursor)
...
This commit enables HW rendering for cursors again, but only for a single
cursor. Other cursors can be created, however they will not be visible.
2008-05-06 11:50:20 +09:30
Aaron Plattner
d500eeb945
Xephyr: Handle depth 30 and reject higher depths rather than crashing.
2008-05-04 10:26:25 -07:00
Jeremy Huddleston
f4a68f3701
XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
...
(cherry picked from commit 8d9eab3a2ec5955cc2698fdcb1fa6ed12b2aadb7)
2008-05-02 17:42:41 -07:00
Jeremy Huddleston
96fa7da3b8
XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
...
(cherry picked from commit ff10c37bdd09656cf2f7ee9577f5552caa1ffdb8)
2008-05-02 17:42:36 -07:00
Peter Hutterer
6f63724b28
xfree86: don't try to repaint the cursor before cursors exist.
2008-05-02 14:56:58 +09:30
Peter Hutterer
3344569529
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
2008-05-02 11:00:14 +09:30
Jeremy Huddleston
a338007be6
XQuartz: Adjust the screen origin offset properly for multimonitor setups
...
(cherry picked from commit f2020b9836bacd0593ac0b4c8541e32714ab02a9)
2008-05-01 18:04:18 -07:00
Paulo Cesar Pereira de Andrade
01c61f3d97
xorgcfg: Fix a crash if xorg.conf doesn't have a Files section.
...
This patch only creates a Files section if required, so if no entries are
added, an empty Files section will not be created.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-01 15:55:15 +09:30
Paulo Cesar Pereira de Andrade
6899ff81e8
Fix an off by one read error in drmSIGIOHandler().
...
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-01 10:14:30 +09:30
Jeremy Huddleston
ec0419b505
XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
...
(cherry picked from commit 1fcf74a436f2e19cceb3f285b89859025d94c040)
2008-04-30 17:33:11 -07:00
Kazuhiro Inaoka
ce36ae526d
Add M32R architecture support (bug #10020 )
...
Still needs autotools support, so this won't actually _build_: it's just
a starting point.
2008-04-30 11:58:32 +03:00
Ben Byer
b71b51c982
xquartz: created darwinTablet, to represent tablet events
...
(cherry picked from commit 50641bce730ee03738fa0c4beb8125b34fda556f)
2008-04-29 23:59:34 -07:00
Ben Byer
519581b0ba
xquartz: remove unused params from DarwinEQInit
...
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
2008-04-29 23:59:31 -07:00
Jeremy Huddleston
d70487a4c0
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 588683cecca2cfc65a28de035cd6ee3d64ff59d2)
2008-04-29 23:59:26 -07:00
Hong Liu
f65a1a62f9
Keep rotation wrappers in place while transforms are in use
...
LeaveVT/EnterVT cycles will free/realloc shadow frame buffers. Because of
this, the presense/absence of that data is insufficient to know whether
the screen function wrappers are necessary. Instead, the 'transform_in_use'
flag should be used.
This patch also adds 'xf86RotateFreeShadow' for drivers to use at LeaveVT
time to free the rotation data; it will be reallocated on EnterVT.
2008-04-29 09:00:11 -07:00
Peter Hutterer
ec2fca7e6f
xfree86: DGA needs to call into Xi.
...
Two steps: first use UpdateDeviceState() instead of replicating the device
changing code. And emulate XI events instead of core events.
2008-04-29 14:53:20 +09:30
Jeremy Huddleston
d5ab89f4f1
XQuartz: Unset CFProcessPath... blech
...
(cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)
2008-04-28 15:55:01 -07:00
Jeremy Huddleston
0c2312b21b
XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
...
(cherry picked from commit 22cf72437601c07b8a6c744b4f2f1f4cd6713e60)
2008-04-28 15:42:12 -07:00
Jeremy Huddleston
c3dc4bdbb0
XQuartz: Disabled DPMS extension
...
(cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
2008-04-28 15:42:02 -07:00
Jeremy Huddleston
07382a70c7
XQuartz: Added thread debugging to xprFrame.c
...
(cherry picked from commit 41542502b321c697271c1752525b600872b6df96)
2008-04-28 15:40:22 -07:00
Jeremy Huddleston
e973430608
XQuartz: More startup / threading house cleaning.
...
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
2008-04-28 11:49:19 -07:00
Jeremy Huddleston
4b46fc931e
XQuartz: Updated Localizable.strings
...
(cherry picked from commit d8d9c866b90fb24c93bd6e25fa90f8f2bf58ad34)
2008-04-28 11:49:18 -07:00
Jeremy Huddleston
4017ebe5bf
XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
...
(cherry picked from commit 03e707987f7f32e47dd0355c6d16bfb9169a379b)
2008-04-28 11:49:16 -07:00
Jeremy Huddleston
0bd28315af
Xquartz: Added missing to EXTRA_DIST
...
(cherry picked from commit f4b963256feb03e9e6b5521bdefeb390e9a49688)
2008-04-26 23:19:33 -07:00
Jeremy Huddleston
ef1c520537
XQuartz: Cleaned up startup and thread creation a tad.
...
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
2008-04-26 19:21:05 -07:00
Jeremy Huddleston
b114d4e861
XQuartz: Don't subtract the titlebar off of the pointer_y
...
(cherry picked from commit 00a9567acce2b27a649cbebd4790e3043688a7d8)
2008-04-26 17:05:34 -07:00
Jeremy Huddleston
b9ca789635
XQuartz: Added some pseudoramiX debug traces
...
(cherry picked from commit 5bee1585a399eab0a7b6fc80ad476d81b5d227d3)
2008-04-25 18:04:22 -07:00
Peter Hutterer
e251c9e75a
Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
2008-04-25 16:49:35 +09:30
Jeremy Huddleston
0209e46249
XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
...
(cherry picked from commit 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
2008-04-24 23:50:23 -07:00
Jeremy Huddleston
b65dbd350b
XQuartz: Cleaned up multi-monitor support.
...
(cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
(cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
2008-04-24 23:50:21 -07:00
Peter Hutterer
f5ac98747d
Standardise copyright headers for all new files created as part of MPX.
2008-04-25 14:50:24 +09:30
Peter Hutterer
9ab4e2fd8e
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 >
2008-04-24 14:19:28 +09:30
Peter Hutterer
7dc40c8eca
xfree86: Don't free master devices.
...
The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
2008-04-24 12:47:29 +09:30
Jeremy Huddleston
d09c520b32
Moved Apple GL bits into our DDX subtree
...
(cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
2008-04-23 10:22:34 -07:00
Jeremy Huddleston
b05b416c62
XQuartz: No need to include indirect.c a second time
...
(cherry picked from commit 41ed532525da85d1bd2c20af5ffa28ac6d1f4996)
2008-04-23 10:17:13 -07:00
Ben Byer
4e3a8af575
xquartz: clean up linker line for main binary
...
(cherry picked from commit 821d7400f2ff917497b2ee58ceef2b69c2d47ec7)
2008-04-23 10:16:55 -07:00
George Sapountzis
00effad583
xephyr: XEPHYR_DRI is identical to XF86DRI
2008-04-23 18:11:56 +03:00
George Sapountzis
6a9f7f28ec
xephyr: sync with mesa
2008-04-23 18:11:56 +03:00
George Sapountzis
7ffc68c5cc
xephyr: libGL is client lib
2008-04-23 18:11:56 +03:00
George Sapountzis
a27c244d72
xephyr: Makefile cleanup 2
2008-04-23 18:11:56 +03:00
George Sapountzis
d4d19b2f22
xephyr: Makefile cleanup 1
2008-04-23 18:11:56 +03:00
George Sapountzis
a88c6b6646
glcore: drop GLcore (files)
2008-04-23 18:11:55 +03:00
George Sapountzis
dd7a53f8f2
glcore: drop GLcore (build system)
2008-04-23 18:11:55 +03:00
George Sapountzis
567d389d47
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
2008-04-23 18:11:55 +03:00
George Sapountzis
efb723e166
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.
2008-04-23 18:11:55 +03:00
Julien Cristau
fbad87f2ae
autoconfig: don't call closedir() when opendir() failed
...
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
2008-04-23 14:59:24 +02:00
Jeremy Huddleston
76381092e8
XQuartz: Make sure QuartzAudioInit() gets run.
...
(cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0)
(cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
2008-04-23 02:22:28 -07:00
Peter Hutterer
275cdc1c74
xfree86: pass correct value to mieqEnqueue (merge detritus I guess)
2008-04-23 16:16:15 +09:30
Ross Burton
e77f65768e
Reuse the existing framebuffer mode in kdrive/fbdev
...
When starting up kdrive/fbdev, if the current framebuffer mode is sensible use
that unless told otherwise.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:07:46 +01:00
Ross Burton
c4fd112153
Add mediumraw support to the linux kdrive driver
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:05:53 +01:00
Ross Burton
455383db95
Enable the epson kdrive driver
...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:04:31 +01:00
Ross Burton
20a90bef8b
Add a default touchscreen path
...
When enabling the touchscreen, open /dev/input/touchscreen0 if no path was
specified.
2008-04-22 16:37:02 +01:00
Peter Hutterer
8190ef8754
Merge branch 'master' into mpx
...
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
2008-04-22 18:04:05 +09:30
Peter Hutterer
2ddbfd3457
xnest: re-enable XKB support. #10015
...
XKB was disabled in 08928afb05
, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.
X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015 >
2008-04-22 16:32:56 +09:30
Jeremy Huddleston
a8b8700c73
XQuartz: Fixed cmd-tab to bring all windows forward.
...
(cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
2008-04-21 23:45:00 -07:00
Jeremy Huddleston
590688131d
XQuartz: Fixed quit dialog to be more conforming with HIG.
...
(cherry picked from commit 14c6b837bb03bd0956f90882f550847f13d0ca09)
2008-04-21 19:08:30 -07:00
Ben Byer
570b0dca26
Fix for pointer-offset issue when using a multi-display environment on X11.app.
...
(cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)
2008-04-21 17:55:19 -07:00
Jordan Crouse
4fa89fbe18
xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
2008-04-21 12:09:00 -06:00
Julien Cristau
40c6be1408
Minor xorg.conf manpage fixups
...
Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
replaced, and rewrap some text to get __xservername__ replaced in the
description of Option "Accel" (cpp doesn't like the preceding quote).
2008-04-20 20:36:44 +02:00
Jeremy Huddleston
4bcfed2f9c
Revert "Removed XWin DDX"
...
This reverts commit 6550078b09
.
Doctor, I'm starting to get a pulse...
2008-04-20 08:35:42 -07:00
Jeremy Huddleston
14396fdeba
XQuartz: Cleanup turning off COMPOSITE
...
(cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)
2008-04-20 01:24:54 -07:00
Jeremy Huddleston
d13828797f
XQuartz: Cleaned up some casting to get rid of compiler warnings
...
(cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
2008-04-20 01:24:51 -07:00
Jeremy Huddleston
6550078b09
Removed XWin DDX
2008-04-19 09:29:46 -07:00
Jeremy Huddleston
ed9dabb47c
Last of the spam... I promise...
...
(cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)
2008-04-18 20:31:06 -07:00
Jeremy Huddleston
49f2bb4681
XQuartz: More sanitization of the namespace
...
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
2008-04-18 20:25:38 -07:00
Jeremy Huddleston
c2f0d020b5
XQuartz: Removed unneccessary include
...
(cherry picked from commit 45ff59e69eddfcceafced31cf6e73e381d0f6914)
2008-04-18 20:12:05 -07:00
Jeremy Huddleston
5183fea6d3
XQuartz: Handled sanitization of namespace better
...
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
2008-04-18 20:07:55 -07:00
Ben Byer
edd3fb784b
random flailing
...
(cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
2008-04-18 20:07:41 -07:00
Adam Jackson
a7503615a6
Death to TOG-CUP.
...
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
2008-04-18 19:56:41 -04:00
Eric Anholt
25827fde68
Nuke the MIT-SUNDRY-NONSTANDARD extension.
...
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
2008-04-18 16:37:08 -07:00
Adam Jackson
eafaf40fb3
Death to APPGROUP.
2008-04-18 18:50:05 -04:00
Adam Jackson
f6617b4127
Death to Extended Visual Information.
2008-04-18 18:28:01 -04:00
Jeremy Huddleston
c14f5dc237
XQuartz: Forgot to commit xprEvent.[hc] ...
...
(cherry picked from commit 70e543baf2508d636f01b2b7e8cb05172195b68c)
2008-04-17 20:31:24 -07:00
Ben Byer
22bb7608a0
Added XKB support for Xquartz
...
(cherry picked from commit 56dc1215202746590dbe8758411f47e8876e1317)
2008-04-17 17:25:55 -07:00
Jeremy Huddleston
652479dba3
XQuartz: Moved some rootless-specific cruft into xpr
...
(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
2008-04-17 15:50:11 -07:00
Jeremy Huddleston
2a1ba20af9
XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
...
(cherry picked from commit 7b087c965bce9f440ab5233d6383aa4a7de969b8)
2008-04-17 15:24:35 -07:00
Jeremy Huddleston
55f80d7545
XQuartz: A little more debugging output from threadSafety
...
(cherry picked from commit f6fbdbf838ab77c3a4635f0b2356b1bbb060ff5b)
2008-04-17 15:24:33 -07:00
Jeremy Huddleston
0d61f6fca1
XQuartz: Fixed some missing prototypes
...
(cherry picked from commit 95056afc562cfe58b116f5c36e4624018e79ff4a)
2008-04-17 13:21:13 -07:00
Jeremy Huddleston
dbd4c03156
XQuartz: Added framework for asserting which thread we're in.
...
(cherry picked from commit 00beb982510e7a82d77e1f1d43e77c84d7bf74c2)
2008-04-17 13:21:02 -07:00
Jeremy Huddleston
a3d40f0549
XQuartz: Include version info for CrashReporter
...
(cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
2008-04-17 11:57:45 -07:00
Jeremy Huddleston
6d11712c2a
XQuartz: Use strerror(errno)... cause I like text more than grepping header files
...
(cherry picked from commit 1b4c37d8f9b517fbec5b94ed4e4a5e86a31472a5)
2008-04-17 11:07:20 -07:00
Jeremy Huddleston
dcf4f917cc
merged darwinKeyboard.[ch] into quartzKeyboard
...
(cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
2008-04-17 11:03:31 -07:00
Ben Byer
582397cd02
oops, missed a spot
...
(cherry picked from commit 19872a6aeb8ee9cb0e33e4b4ffd794c9dbefe0cf)
2008-04-17 10:42:08 -07:00
Ben Byer
0bd1c369cc
formatting cleanup
...
(cherry picked from commit 769acd29348abf9e5b0bebfca6ae695d345f3077)
2008-04-17 10:42:00 -07:00
Ben Byer
700e14c226
delete debugging spew
...
(cherry picked from commit f04f3af86a91d0cafbc86a0d71aeb0599d685f07)
2008-04-17 10:41:55 -07:00
Ben Byer
a440eebf25
add support for horizontal scrolling (buttons 6 and 7)
...
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
2008-04-17 10:41:50 -07:00
Ben Byer
612e901ef6
enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
...
(cherry picked from commit ab662c736e0654e2b4347091f0d9e87f26034216)
2008-04-17 10:41:46 -07:00
Ben Byer
5bdfbfbedc
darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
...
(cherry picked from commit a8a090b853e811b9843a5732572cbbe542224f32)
2008-04-17 10:41:42 -07:00
Ben Byer
58e42683c9
hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
...
(cherry picked from commit cab54466a61281cfafc12825017c23d720cd75f4)
2008-04-17 10:41:38 -07:00
Ben Byer
cd3470a0cf
kludge: miEqEnqueue wants a device, even if we're passing custom messages,
...
so give it one
(cherry picked from commit a494ff04b2a14470eaf5a23c7cf6dbdea182c6d1)
2008-04-17 10:41:30 -07:00
Drew Parsons
966ae1781f
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...).
2008-04-18 01:20:36 +10:00
Drew Parsons
571206832d
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)
2008-04-18 01:14:01 +10:00
Jeremy Huddleston
8716d081fd
XQuartz: Don't enable rootless accelerated functionality... crashy...
...
(cherry picked from commit cdb4c291d8c10c3a9ea59d8e79275a30d2ea82b4)
2008-04-16 23:14:06 -07:00
Jeremy Huddleston
2ffdb0eb64
XQuartz: Don't use composite.
...
(cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
2008-04-16 21:54:00 -07:00
Jeremy Huddleston
757a1bf3a3
Xquartz: Don't need to link against rlAccel since we don't use it
...
(cherry picked from commit 180ec128adef11a9a90cea1189dc31ac5de8359f)
2008-04-16 21:53:03 -07:00
Jeremy Huddleston
9e7ced94a5
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
...
(cherry picked from commit cb27d5ca8230707b276763c0ec20e586203144c9)
2008-04-15 12:06:07 -07:00
Kristian Høgsberg
35982bc109
Make DRI2 a serverlayout/serverflags option.
...
Add xf86DRI2Enabled() to export the value of the setting.
2008-04-14 15:23:57 -04:00
Matt Turner
1fa4de80fc
Check for __x86_64__ when we check for __amd64__
...
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
2008-04-12 20:39:18 +02:00
Jeremy Huddleston
b1f3f42840
Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
...
(cherry picked from commit 55d9973b053f25bb95b26e00351dc5531caf5b04)
2008-04-11 17:50:04 -07:00
Adam Jackson
0dab6fa358
So long, and thanks for all the cfb.
2008-04-11 09:47:51 -04:00
Peter Hutterer
6d22a9615a
dix: Call DeleteInputDeviceRequest from CloseDownDevices ( #14418 )
...
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.
This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.
X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418 >
2008-04-11 18:45:32 +09:30
Eric Anholt
a7e3ad1c6b
Remove NDEBUG (assert() disable) define from the X Server.
...
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead. There should be no ABI consequences
to this change.
The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h. As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
2008-04-10 10:35:14 -07:00
Peter Hutterer
df2545b98d
xfree86: Sanity check before retrieving the paired device.
...
Some pointer devices send key events [1], blindly getting the paired device
crashes the server. So let's check if the device is a pointer before we try to
get the paired device.
[1] The MS Wireless Optical Desktop 2000's multimedia keys are sent through
the pointer device, not through the keyboard device.
2008-04-10 08:50:43 +09:30
Dave Airlie
b19027fbae
quirk: add quirk for ACR 640x350 default mode is wrong
...
RH #440186
2008-04-09 14:34:11 +10:00
Ben Byer
1f8188656a
add missing dix-config include
...
(cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
2008-04-08 21:25:15 -07:00
Jeremy Huddleston
3f51f493b6
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
...
(cherry picked from commit df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
(cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
2008-04-08 17:03:18 -07:00
Peter Hutterer
fd06e8f8c1
Merge branch 'master' into dcdc_rework
...
Conflicts:
Xext/xevie.c
dix/dispatch.c
2008-04-07 07:56:41 +09:30
Sascha Hlusiak
539bf3c283
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2008-04-07 00:10:16 +02:00
Sascha Hlusiak
3ab33e7cd4
Remove stale code
...
The jstk code for Joysticks is not used by any module, was never actually compiled and uses an API
that is deprecated these days.
No reason to keep it.
2008-04-06 23:23:47 +02:00
Adam Jackson
cc7c045bae
Fix PCI config space cycles from int10 emulator.
...
The top bit of 0xCF8 is an enable bit, not part of the domain. Sending
cycles to domain 128 instead of domain 0 is rarely the right thing to do.
2008-04-04 12:58:12 -04:00
Kristian Høgsberg
16a8ce7558
Only autoload RECORD if it was enabled.
2008-04-04 10:47:46 -04:00
Dave Airlie
f0915fb3c4
quirk: add quirk for ACER EDID
2008-04-04 09:59:40 +10:00
Jeremy Huddleston
2e42b67b82
XQuartz: Change reporting of space change to debug log rather than stderr
...
(cherry picked from commit ed15556a9fc4ebdb88f42961052fc8456082165f)
2008-04-02 18:05:55 -07:00
Ben Byer
c737d04c75
The AppKit thread should not be calling directly into the X server
...
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806ff5508aace059312156f319a9ed4479)
2008-04-02 17:48:24 -07:00
Ben Byer
15b0084f1a
formatting cleanup for X11Application.m (no code changes)
...
(cherry picked from commit eb083d3f68f459d90417558da1ed00729b749950)
2008-04-02 17:48:15 -07:00
Ben Byer
e9e2d88436
moved and renamed QuartzMessageServerThread to
...
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377efc930e25017636e5112093a3a6549c7)
2008-04-02 17:48:01 -07:00
Ben Byer
c1be4e3379
shovelling code around ...
...
(cherry picked from commit 2143182ba49195bbb2e9163ea6872fd68e7a4a85)
2008-04-02 17:47:59 -07:00
Ben Byer
985c631b2e
just a bit of juggling headers around -- we're preparing
...
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa727e22316e8ca456f7218bea9ee0313)
2008-04-02 17:47:57 -07:00
Ben Byer
89f1d880e8
nuke DarwinEventQueue
...
(cherry picked from commit 1e0ec02202eeaffae480048b91bf02140ee29f8a)
2008-04-02 17:47:52 -07:00
Jeremy Huddleston
8944b77ec0
continue with gutting darwinEvents.c
...
(cherry picked from commit c34fce7051b996633291dddc061b696ff737f3fb)
2008-04-02 17:47:42 -07:00
Jeremy Huddleston
aa6d12e93e
turns out we weren't actually using these files. oops
...
(cherry picked from commit bfec44d7b4baf0ad0aae55c8209bc60ac93c5b58)
2008-04-02 17:46:59 -07:00
Ben Byer
6c5962e447
remove vestigal DarwinEQPointerPost etc
...
(cherry picked from commit a25704c423598d596fd7f2ed4290d4b860bd5d5f)
2008-04-02 17:45:28 -07:00
Ben Byer
c6f0d5d1e5
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
...
(cherry picked from commit a9e081a60ca227c0d96d4613075d97d6b762366a)
2008-04-02 17:45:23 -07:00
Ben Byer
5b6c273eaa
add prototype for DarwinEventHandler
...
(cherry picked from commit 9a03ae33c4f9de830f15eabf3b994882ead7c000)
2008-04-02 17:45:20 -07:00
Ben Byer
3713be8b47
add logging of current thread ID to DEBUG_LOG macro
...
(cherry picked from commit 5848510cc5a8091b30230ab920d904ca6b159480)
2008-04-02 17:45:17 -07:00
Ben Byer
1400a51ae7
Begin to move all of our Xquartz DDX-specific event handlers
...
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f73a82b3aa0f7b0d1640aba5fb0d1bc)
2008-04-02 17:45:09 -07:00
Jeremy Huddleston
8746daa673
XQuartz: Fixed missing close-paren in preference pane text.
...
(cherry picked from commit ea37e151dc6032d2a1a33cef809f2a7d507aae35)
2008-04-02 17:33:22 -07:00
Kristian Høgsberg
b5a0a865c3
Pick up dri2proto from the standard proto header include path.
2008-04-02 19:21:41 -04:00
Kristian Høgsberg
7c20f65fea
Add @XORG_CFLAGS@ to satisfy xf86* includes.
...
Pointed out by Hasso Tepper.
2008-04-02 19:08:33 -04:00
Xiang, Haihao
b31de6a590
dri2: fix crasher if DRI2Connect fails
2008-04-02 16:29:30 +10:00
Hong Liu
ebc56aca8b
Bug #15160 : quirk Proview AY765C
...
prefer first detailed timing
2008-04-02 10:46:03 +08:00
Goneri Le Bouder
9500033b9e
xfree86: don't crash in AutoConfig if the primary device is not pci
...
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823 ).
2008-04-01 20:23:38 +02:00
Ben Byer
a4d0349411
Add code to track 5 valuators for pointing device, in preparation
...
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
2008-03-31 16:44:23 -07:00
Ben Byer
6648867d8b
add debug statements so we can see if/when our Xinput stubs are getting called.
...
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
2008-03-31 16:44:22 -07:00
Ben Byer
19ff23ab0e
Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
...
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
2008-03-31 16:44:21 -07:00
Kristian Høgsberg
c40e0b51f0
Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
...
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext. Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.
Add protocol code to DRI2 module and load DRI2 extension by default.
2008-03-31 16:50:58 -04:00
Jeremy Huddleston
b8ea9f2a25
XQuartz: Fixed names of enums to be more consistent
...
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
2008-03-28 17:03:20 -07:00
Jeremy Huddleston
bd28839eb8
=?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows
...
=20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-28 17:03:19 -07:00
Adam Jackson
933ffcdf7d
Compile fix.
2008-03-28 17:53:55 -04:00
Adam Jackson
9e8451d869
Add E-EDID segment selection.
2008-03-28 17:43:10 -04:00
Adam Jackson
0b4aef4d6d
Refactor DDC2 code to allow for proper segmented addressing.
2008-03-28 17:43:01 -04:00
Adam Jackson
88ece11d6c
Start E-EDID support in the DDC module.
...
Since there's no way to safely know how many blocks xf86DoEDID_DDC2 would
return, add a new xf86DoEEDID entrypoint to do that, and implement the
one in terms of the other.
2008-03-28 17:39:23 -04:00
Eamon Walsh
b5f98fcea2
XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
...
Patch by Joe Nall.
The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
2008-03-28 14:14:23 -04:00
Jeremy Huddleston
415e49b940
XQuartz: Sanity-check the removal of the 256-color option
...
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490fc21724e8eef0ec7e1a20a9cc2e39d)
2008-03-27 19:22:07 -07:00
Ben Byer
c1d37efe9a
xquartz: copy in new stubs from Xi/stubs.c to replace our old
...
Xinput stubs. Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
2008-03-27 19:14:50 -07:00
Ben Byer
c4a616a741
prevent "fake mouse clicks" from generating spurious extra events
...
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
2008-03-27 19:14:39 -07:00
Dave Airlie
c747030a49
quirk: fix LPL monitors properly.
...
no point having a h cm fix when we really want to copy the sizes from the
other place.
RH BZ 435216
2008-03-27 15:19:52 +10:00
David Nusinow
f028e245a7
Bug #10016 : Implement WM_CLASS hints in Xephyr.
2008-03-24 16:06:33 -04:00
Adam Jackson
862ff9ac92
Bug #11510 : Fix build without RECORD.
2008-03-24 13:37:42 -04:00
Adam Jackson
87bfd3bd96
Bug #11508 : Fix build without XV.
2008-03-24 13:33:38 -04:00
Julien Cristau
4217ba0cf0
xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet
...
The latter doesn't return the option's value, just whether it's present
in the configuration.
2008-03-22 17:53:45 +01:00
Julien Cristau
6b9d2bb1f7
exa: use xf86ReturnOptValBool instead of xf86IsOptionSet
...
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration. So using Option "EXANoComposite" "false"
disabled composite acceleration.
2008-03-22 17:28:48 +01:00
Jeremy Huddleston
6385947396
XQuartz: Disable 256 color option and fullscreen option
...
(cherry picked from commit 7c1964338a33558d3f25e369dfca99e3ef9d10f9)
2008-03-21 19:37:49 -07:00
Jeremy Huddleston
93daa3a3bf
Xquartz: Added separate preference tab for quartz-wm settings
...
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7cb0b0db3db948d26b4d5ec7747deb8)
2008-03-21 19:37:46 -07:00
Jeremy Huddleston
c49e112683
XQuartz: Initial framework for dealing with spaces on OS-X
...
(cherry picked from commit 9831324998f9d1f05ff944c58c5bf60dcae17355)
2008-03-21 19:37:42 -07:00
Jeremy Huddleston
4c76607b69
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
...
(cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
2008-03-21 19:33:21 -07:00
Jeremy Huddleston
87c64cfd69
=?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2)
...
=20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-21 19:33:21 -07:00
Michel Dänzer
da973e962d
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
...
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.
Correct patch this time :)
2008-03-20 09:18:29 -04:00
Alex Deucher
f8c1eb29e2
Revert "Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB"
...
This reverts commit 2673525796
.
Pushed the wrong patch.
2008-03-20 09:14:41 -04:00
Michel Dänzer
2673525796
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
...
See bug 11796
2008-03-19 19:12:37 -04:00
Dodji Seketeli
cdadd2ff9b
[Xephyr/DRI] correctly route motion events targeted at GL drawable
2008-03-18 14:02:41 +01:00
Jesse Barnes
afd7428690
Cleanup logic in xf86PrepareOutputs
...
Should have done this in the first place. Since we're checking for the absence
of the get_crtc callback in the first place, we'll short circuit the later call
and disable the output, so the ugly "continue" block is unnecesary.
2008-03-17 14:55:44 -07:00
Jesse Barnes
ba85caacb5
Make xf86SetDesiredModes aware of current output configuration
...
By adding a new output callback, ->get_crtc, xf86SetDesiredModes is able to
avoid turning off outputs & CRTCs if the current output<->CRTC mappings are the
same as the desired configuration. This helps avoid flickering displays at
startup time, which speeds things up a little and looks better.
2008-03-17 14:13:09 -07:00
Jesse Barnes
bee2ddf35f
Fail CRTC configuration if !vtSema
...
Unless we check for vtSema before calling into the CRTC and output callbacks,
we may end up trying to access video memory that no longer exists, leading to a
crash. So if we don't have vtSema, return FALSE to the caller, indicating that
we didn't do anything.
Fixes #14444 .
2008-03-17 08:33:01 -07:00
Matthieu Herrb
db248ffb84
test for the presence of pci_system_init_dev_mem() before calling it.
...
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
2008-03-16 18:46:11 +01:00
Donnie Berkholz
aa231f28d5
Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
2008-03-14 18:43:41 -07:00
Donnie Berkholz
a955c3b587
Xephyr: Distribute ephyrdriext.h in tarballs.
2008-03-14 18:43:40 -07:00
Adam Jackson
57d48d94b8
Fix a stray use of ALLOCATE_LOCAL.
2008-03-14 14:46:03 -04:00
Adam Jackson
8248537722
RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
...
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor. But let's not
split hairs.
2008-03-14 14:24:21 -04:00
Bart Trojanowski
1b9878ffcf
Bug #14332 : Fix PCI access cycles from x86emu.
...
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to. However, we would ignore that and always send the
cycle to the device whose BIOS we were running. This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
2008-03-13 17:42:16 -04:00
Doug Chapman
f7abe05b33
Bug #14091 : Fix build (and runtime) on ia64.
2008-03-13 17:40:34 -04:00
Adam Jackson
5d7437c29e
RANDR 1.2: Fix the RANDR 1.1 screen size estimation to approach reality.
...
While the ScreenRec's notion of size in millimeters would get updates,
the RANDR 1.1 notion wouldn't, so your screen would appear to be square
and probably at some ludicrous DPI.
2008-03-13 17:37:12 -04:00
Adam Jackson
61c3f63a75
RANDR 1.2: Don't report a square resolution to RANDR 1.1 clients.
...
It can't possibly do anything useful, and older versions of Gnome (and
proably others) get very confused by it. So do the drivers, for that
matter.
2008-03-13 17:34:54 -04:00
Mark Kettenis
06c0372c3a
OpenBSD support for libpciaccess.
...
xserver and libpciaccess both need to open /dev/xf86, which can only
be opened once. I implemented pci_system_init_dev_mem() like Ian
suggested. This requires some minor changes to the BSD-specific
os-support code. Since pci_system_init_dev_mem() is a no-op on
FreeBSD this should be no problem.
2008-03-12 21:45:37 +01:00
Matthias Hopf
2036851125
Return randr interface version in xf86CrtcScreenInit()
...
Necessary to allow drivers to be run-time backwards compatible when using the
modes/ functions w/o providing their own copy.
2008-03-12 11:37:28 +01:00
Kristian Høgsberg
bc504ffbba
DRI2: Add DRI2AuthConnection().
...
DRI2 uses the same authentication scheme as XF86DRI, so implement this
entry point so DRI2 protocol code can access it.
2008-03-11 00:56:16 -04:00
Adam Jackson
ab9b0b36ac
Add the "amd" driver to magic driver selection.
2008-03-10 13:40:00 -04:00
Adam Jackson
0f6aaf636b
Bug #14927 : Fix the math for xf86NumDefaultModes.
2008-03-10 09:14:20 -04:00
Kristian Høgsberg
acedc03367
DRI2: Return event buffer head index in DRI2CreateDrawable.
...
And pass it to the DRI driver in AIGLX.
2008-03-09 21:39:19 -04:00
Julien Cristau
911f0c1476
Programs in hw/dmx/examples/ want client-side xkb headers.
2008-03-07 23:26:56 +01:00
Adam Jackson
3bf7ff7032
Size xf86DefaultModes explicitly.
...
i.e., don't check for the end of the list by ->name == NULL, since that
won't work now. Fix the consumers of xf86DefaultModes to use the new
explicit size as well.
2008-03-07 09:25:06 -05:00
Adam Jackson
3fcb6445dc
Fix segfault when a monitor exists but has no modes.
...
Thanks to Zhenyu Wang for finding this.
2008-03-07 08:30:19 -05:00
Aaron Plattner
a8d760f567
Get modes code building with old X servers again.
...
This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer than 1.2"
since XORG_VERSION current went backwards at some point.
2008-03-06 14:42:00 -08:00
Jesse Barnes
ca616b902b
Allow RandR get output property to call into drivers
...
In order to report accurate values to users of the RandR property interface,
it's sometimes necessary to ask the driver to update the value (for example
when backlight brightness changes without the server's knowledge, due to hotkey
events or direct sysfs banging).
This patch wires up the core server code with a new xf86CrtcFuncs callback,
get_property, to allow for this.
The new code is available under the RANDR_13_INTERFACE define, which in turn
depends on the RANDR_12_INTERFACE code.
2008-03-06 13:50:58 -08:00
Adam Jackson
34b69e3bc0
Fix distcheck.
...
(cherry picked from commit 2a47accff8dccded4dfe031f9366c028ba927824)
2008-03-05 23:57:15 -05:00
Adam Jackson
27e7dacbf7
Make xf86InitialConfiguration slightly smarter.
...
Old heuristic was to find the first monitor that expressed a preference,
then attempt to get all other monitors to agree. This doesn't work
particularly well when the two sets of modes don't precisely intersect,
you get overlapping-but-not-identical output geometry and things go wrong.
New heuristic is:
- Exact user preference, if given
- Exact output preference, if the same for all outputs
- Best (largest) mode of modes common to all outputs:
- with the same aspect ratio as all outputs (may be NULL)
- with 4:3 aspect ratio
- Then the old heuristic to try to get something lit
Note that it is simply not doable to have a reliable initial output guess if
you insist on trying to clone all outputs together. It's far too easy to
end up with displays that simply don't have modes in common. We need to
switch to right-of placement someday, once we're not limited to CRTC size
limits and we have working multi-GPU in RANDR.
2008-03-04 11:38:34 -05:00
Adam Jackson
95df04b744
Remove all mention of the vga driver from the config logic.
2008-03-04 10:59:24 -05:00
Peter Hutterer
4f2cd0ed96
Merge branch 'master' into mpx
...
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
James Cloos
613852ce6a
Fix some documentation typos
2008-03-03 16:11:05 -05:00
Adam Jackson
708f07753f
RANDR 1.2: Inherit PreferredMode from the global configuration, if any.
...
If you don't do this, then Modes "800x600" in the Display subsection will
be dutifully ignored and the driver will start at whatever resolution it
feels like.
2008-03-03 15:49:48 -05:00
Adam Jackson
605e6764df
Fix Motif menu drawing in Xnest.
...
See also Red Hat bug #229350 , OpenSolaris bug #6366490 .
2008-03-03 15:45:17 -05:00
Adam Jackson
3b73d62791
xf86DDCMonitorSet: Honor the DisplaySize from the config file.
...
We honor sync ranges and pixel clock settings from the config here, no
reason to ignore DisplaySize.
2008-03-03 15:43:22 -05:00
David Nusinow
f7ab2d3821
Add missing file from previous commit.
2008-03-02 18:36:25 -05:00
David Nusinow
b5ce0e1d0b
Bug #13860 : Ensure that the DRI mode is in octal format.
2008-03-02 17:12:02 -05:00
Matthieu Herrb
c934366424
use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly
2008-03-02 19:32:01 +01:00
David Nusinow
2bb9c1f36f
bug #10008 : Make Xvfb.1 document the correct default depth
2008-03-01 18:45:46 -05:00
George Sapountzis
3d64290547
clean some "unused" warnings
2008-03-01 19:49:24 +02:00
Maarten Maathuis
8af2c39bcc
Fix big mistake in commit fd41f46ac6
.
...
- When a mode is deleted, the name pointer is also free()'ed.
- This leaves other modes with an invalid pointer.
2008-03-01 16:54:01 +01:00
Eamon Walsh
ef60632e20
dix: Modify callers of property and selection API to use new interfaces.
2008-02-29 18:01:37 -05:00
Eamon Walsh
34bf308a9e
dix: Refactoring of selection code to allow for polyinstantiation.
...
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
2008-02-29 18:01:37 -05:00
Eamon Walsh
d5715f7bea
dix: Refactoring of property code to allow for polyinstantiation.
...
Introduces dixLookupProperty() API.
2008-02-29 18:01:37 -05:00
Adam Jackson
b7eb92774a
EDID 1.4: Print additional CVT support data in the log.
2008-02-29 16:01:15 -05:00
Adam Jackson
31014d88af
EDID 1.4: Decode additional CVT support information.
...
Table 3.28: Display Range Limits & CVT Support Definition
2008-02-29 16:01:15 -05:00
Adam Jackson
d1c48955f8
Fix CVT abuse in DDCModesFromStandardTiming.
...
CVT is enough different from GTF that it should not be used on monitors
that aren't expecting it. This brings us closer to what the spec says
the correct behaviour is.
2008-02-29 16:01:15 -05:00
Adam Jackson
26c2e95fa5
Nuke a duplicate SYMFUNC(xf86CVTMode)
2008-02-29 16:01:15 -05:00
Adam Jackson
ca5625b911
Add xf86GTFMode().
...
This should probably be shared like xf86CVTMode().
2008-02-29 16:01:15 -05:00
Adam Jackson
4cb4817c10
Remove the duplicate copy of xf86cvt.c
2008-02-29 16:01:15 -05:00
Adam Jackson
e65e51a99b
Constify the built-in mode tables.
2008-02-29 16:01:14 -05:00
Adam Jackson
6828d8fc2b
Clean up DisplayModeRec handling in many places.
...
Use xf86DuplicateMode() instead of rolling our own, and change
malloc+memset to calloc.
2008-02-29 16:01:14 -05:00
Adam Jackson
85617b56e5
Remove some #if 0 guarding code duplicated in xf86Modes.c
2008-02-29 16:01:14 -05:00
Adam Jackson
fd41f46ac6
Allow xf86DuplicateMode() to work correctly on read-only modes.
...
Before this it was meaningless to try to mark DisplayModeRec tables
const, since the mode name would be emitted as a pointer to an
anonymous string constant, and therefore would have to be fixed up by
ld.so and so couldn't live in .rodata. With this change the standard
mode lists can live in .rodata, and modes duplicated from them will
have their names filled in on the fly.
2008-02-29 16:01:14 -05:00
Adam Jackson
8ac19d16a0
Add several comments documenting our EDID failures.
2008-02-29 16:01:14 -05:00
Kristian Høgsberg
13bfa5937d
GLX: Adjust to changes in DRI driver interface.
2008-02-29 15:11:13 -05:00
Eamon Walsh
27bcf40cda
XACE: Fix instances of DixUnknownAccess at hook callsites.
2008-02-28 16:43:43 -05:00
Tiago Vignatti
aebd9dc252
Oops, there's one more parenthesis.
2008-02-28 01:22:31 -03:00
Dave Airlie
08afc70513
quirks: another LPL panel with the cm/mm wrong
2008-02-28 10:45:41 +10:00
Dodji Seketeli
d74b0327e8
[Xephyr/GL] unbreak the build
...
Don't touch Xephyr DRI stuff when not compiling in a DRI environment.
2008-02-27 09:48:53 +01:00
Dave Airlie
d12b7b6632
xf86Crtc: add higher level modesetting entry point.
...
For kernel modesetting work we need a bigger stick to beat the modesetting path
2008-02-27 07:09:14 +10:00
Tiago Vignatti
c46f7b62d2
Fine, we don't need pciInit() anymore. Nuke, nuke, nuke...
2008-02-25 18:14:08 -03:00
Tiago Vignatti
a9050d5424
Jesus, pciInit() was called 32 times in my machine without need!
...
xf86scanpci() will always call pciInit() before any other function, so
there's no need to guarantee it after.
2008-02-25 18:10:18 -03:00
Tiago Vignatti
81272f7ec9
Some doc clean up:
...
clean up legacy things in os-support/bus/Pci.c.
Put InitOutput() comment to its right place.
2008-02-25 17:39:33 -03:00
Tiago Vignatti
7c582dd6de
remove lnxPciInit() unused function.
2008-02-25 17:31:37 -03:00
Tiago Vignatti
9727db88d5
No more "-scanpci" given that we already have it in libpciaccess.
...
(Yeah, lets nuke dead code!)
2008-02-25 17:08:07 -03:00
Tiago Vignatti
f19f7b8e53
Clean some garbage caused when pciaccess was merged:
...
FindPCIVideoInfo() function isn't need anymore.
xf86scanpci() is being called only once so we don't need permanent
(static) variables there.
restorePciState() is not used for now (until we find why multiple
cards aren't working).
2008-02-25 17:07:07 -03:00
Adam Jackson
4b50e71bf1
Bug #13736 : Fix %bx in VBEGetPixelClock to match spec.
...
Reported by Yannick Henault.
2008-02-24 20:25:13 -05:00
Jeremy Huddleston
6dc369028d
XQuartz: Quit now properly warns the user
...
(cherry picked from commit ed3d7b3959c2a0cb63e37210455bcc6cf195b807)
2008-02-23 00:28:41 -08:00
Adam Jackson
e6a4cde16d
Use the client-side XKB headers for the config utilities
2008-02-22 18:36:29 -05:00
Adam Jackson
347db49ebe
s/via/openchrome/ in the autoconfig logic.
...
Xorg's via driver is effectively dead anyway.
2008-02-22 16:05:33 -05:00
Adam Jackson
69f7826767
Match Xephyr DRI definitions to the ones in xf86dri.h
2008-02-22 16:04:35 -05:00
Adam Jackson
24bebdded4
fbFillRegionTiled() is now dead code.
...
Only ever called from the old PaintWindow* screen hooks, but those are
gone now. As a pleasant side effect, fb loses its #ifdef PANORAMIX.
2008-02-22 15:22:38 -05:00
Adam Jackson
ee21aba6be
Fix Xinerama's consolidated visual handling.
...
Formerly the code claimed it could only handle up to 256 visuals, which
was true. Also true, but not explicitly stated, was that it could only
handle visuals with VID < 256. If you have enough screens, and subsystems
that add lots of visuals, you can easily run off the end. (Made worse
because we allocate visual IDs from the same pool as XIDs.) If your app
then chooses a visual > 256, then the Xinerama code would throw BadMatch
on CreateColormap and your app wouldn't start.
With this change, PanoramiXVisualTable is gone. Other subsystems that
were using it as a translation table between each screen's visuals now
use a PanoramiXTranslateVisual() helper.
2008-02-22 15:19:54 -05:00
Dodji Seketeli
c14fd2a5cb
[Xephyr/GL] properly route expose event on GL drawables
...
When an expose event happens on an host GL window paired with an
internal drawable, route that expose event to the clients listening
to the expose event on the internal drawable.
2008-02-21 15:33:02 +01:00
Dodji Seketeli
437c78ef9f
[Xephyr/GL] don't crash when the host returns a NULL server string
2008-02-21 15:29:27 +01:00
Peter Hutterer
67a78e84a8
Revert "xfree86: plug a memory leak in xf86LoadModules."
...
This reverts commit 3abce3ea2b
and
6cbaf15e61
.
The memory returned to xf86LoadModule was allocated in doLoadModule, which
calls the respective module's PreInit. As it turns out, input and output
drivers store a pointer to the module elswhere, so freeing it in
xf86LoadModule is a bad idea.
For further reference: hw/xfree86/common/xf86Helper.c
Input drivers: xf86InputDriverList[blah]->module = module;
Output drivers: xf86DriverList[blah]->module = module;
Unloading the module would not look pretty then.
2008-02-19 21:31:50 +10:30
Jeremy Huddleston
5f5ec5db35
XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
...
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471ec6e6ad672dc00118fc7edbd6ddc7c)
2008-02-19 00:01:42 -08:00
Peter Hutterer
74628d6397
dix: change GetEventList to return length of list and set parameter in place.
...
Changing DDXs to use new prototype too.
2008-02-19 16:53:15 +10:30
Peter Hutterer
6cbaf15e61
xfree86: guard against NULL-pointer dereferences in xf86LoadModules.
...
Should have been part of 3abce3ea2b
, but I
forgot to git-update-index before I committed.
Thanks to Bill Crawford for pointing it out.
2008-02-19 12:05:13 +10:30
Peter Hutterer
3fe64d8d27
Move input event list initialisation and storage from DDX to DIX.
...
Rather than letting the DDX allocate the events, allocate them once in the DIX
and just pass it around when needed.
DDX should call GetEventList() to obtain this list and then pass it into
Get{Pointer|Keyboard}Events.
2008-02-18 18:46:01 +10:30
Arjan van de Ven
3abce3ea2b
xfree86: plug a memory leak in xf86LoadModules.
...
LoadModule() returns the only reference to a fresh piece of memory (a
ModuleDescPtr). Sadly, xf86LoadModules dropped the return value on the floor
leaking memory for each module it loaded.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-02-18 18:14:40 +10:30
Arjan van de Ven
6dc71f6b2c
xfree86: plug memory leak in InitPathList.
...
All the failure paths were very diligent in freeing the "fullpath" temporary
string, but the success case was not. All the content only got strdup()d, so
it's not live memory anymore.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-02-18 18:14:33 +10:30
Arjan van de Ven
1bec6ad897
xfree86: plug memory leak in xf86LogInit()
...
xf86LogInit allocates a piece of memory, stores it in lf. LogInit() will then
effectively strdup it, but lf is never freed again.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-02-18 18:14:20 +10:30
Daniel Stone
68bd7ac193
XKB: Move headers into the server tree
...
We need to start breaking the XKB API to enforce sanity, so drag whichever
headers we need to do so into the server tree, as the client API is set in
stone, being part of Xlib.
2008-02-17 22:52:07 +02:00
Maarten Maathuis
a48cc88ea2
Fix rotation for multi-monitor situation.
...
- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
- Fix bug #13787 .
2008-02-17 18:47:28 +01:00
Jeremy Huddleston
b95059c207
Added Xquartz.plist to EXTRA_DIST
...
(cherry picked from commit 70f9495e0c1f1459507064b673fe57b1c90d3c2c)
2008-02-16 02:57:23 -08:00
Jeremy Huddleston
d103820bb8
Fixed unescaped newline in EXTRA_DIST
...
(cherry picked from commit 567c172c4d400fdfe69e7b096a3877fce5c2de9f)
2008-02-16 01:01:33 -08:00
Jeremy Huddleston
a7d936c4ac
XQuartz: Fixed EXTRA_DIST to include localization
...
(cherry picked from commit 1b338c2a9330c85490a7c24d52adf24b124b70e6)
2008-02-16 01:01:29 -08:00
Kristian Høgsberg
0ffb6a3ad0
GLX: Implement support for TTM BO based TFP when available.
2008-02-14 22:20:56 -05:00
Kristian Høgsberg
879515b139
Add GLX provider for DRI2.
2008-02-14 19:53:49 -05:00
Kristian Høgsberg
b71dc54352
Add DRI2 module.
2008-02-14 19:53:49 -05:00
Adam Jackson
3e0353c785
Bah, macros are hard.
2008-02-15 06:42:48 +11:00
Maarten Maathuis
c38feeb149
Fix typo in commit b8b7cdf6df
.
2008-02-14 18:52:47 +01:00
Adam Jackson
b8b7cdf6df
Silence useless debug spew from XFree86-Misc extension.
2008-02-15 01:31:46 +11:00
Adam Jackson
ba69904148
Simplify dlloader a bit more.
2008-02-14 08:52:43 +11:00
Adam Jackson
f750ce53ac
Remove some braindamage from ModuleDesc.
...
Yay dead code elimination.
2008-02-14 08:22:57 +11:00
Adam Jackson
e91ff09568
Friends don't let friends call xf86AddModuleInfo.
...
That code only existed to leak memory. It can go now, thanks.
2008-02-14 08:21:44 +11:00
Adam Jackson
0bdd20a045
Eradicate the VTInit code.
...
"This option should rarely be used." Never sounds like a better idea.
2008-02-14 07:52:46 +11:00
Adam Jackson
24089b0624
Don't bother warning people about the keyboard driver rename, just do it.
2008-02-14 07:52:33 +11:00
Adam Jackson
2aaf6ac134
Don't even attempt to parse -bpp in xfree86 DDX option parsing.
...
This hasn't been valid since 1999. Get with the times, man.
2008-02-14 07:52:26 +11:00
Adam Jackson
f3b3b37ec6
Use strerror instead of errno values in user strings.
2008-02-14 07:52:02 +11:00
Adam Jackson
7c0709a736
requestingClient is an xprintism, hide it for other servers.
2008-02-14 07:11:52 +11:00
Jeremy Huddleston
8a244c2bc0
XQuartz: Fixed layout of Applications->Customize menu
...
Now resizing it won't produce weir overlaps of the widgets. Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d13c82633fdbe8120396bfbe1e7489a)
2008-02-11 12:10:59 -08:00
Jeremy Huddleston
3570ca1cb7
XQuartz: Added option for setting quartz-wm click-through preference
...
(cherry picked from commit bf54c267cba97b2b3b9a621da0575776a388b2cb)
2008-02-10 18:30:52 -08:00
Jeremy Huddleston
8004e160fa
XQuartz: Converted interface to nib 3.x format
...
(cherry picked from commit 656aaab95773bd70fc3504b68bf7e1d292891d93)
2008-02-10 18:30:48 -08:00
Bart Trojanowski
66f8001b61
X86EMU: handle CPUID instruction
...
After trying to switch from X to VT (or just quit) the video-amd driver
attempts to issue INT 10/0 to go to mode 3 (VGA). The emulator, running
the BIOS code, would then spit out:
c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE!
The opcode was 0F A2, or CPUID; it was not implemented in the emulator.
This simple patch, against 1.3.0.0, handles the CPUID instruction in one of
two ways:
1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction
directly.
2) if ran elsewhere it returns a canned 486dx4 set of values for
function 1.
This fix allows the video-amd driver to switch back to console mode,
with the GSW BIOS.
Thanks to Symbio Technologies for funding my work, and ThinCan for
providing hardware :)
Signed-off-by: Bart Trojanowski <bart@jukie.net>
Acked-by: Eric Anholt <eric@anholt.net>
2008-02-08 10:48:40 -08:00
liuhong
d3c36fe721
validate mode clock for probed modes
...
Some modes claimed in monitor EDID data may not be supported by
the monitor. So also validating the max clock for probed modes.
2008-02-05 12:45:27 -08:00
liuhong
4b5b6e7baa
fix max clock unit
...
max clock from EDID data is in MHz, while we need KHz to validate modes.
2008-02-05 12:45:16 -08:00
Peter Hutterer
10617dc0fb
xfree86: stick two more checks in for num_valuators < MAX_VALUATORS
2008-02-01 14:24:04 +10:30
Matthieu Herrb
c68f063be6
xfree86: don't call xalloc from signal handlers when posting events.
...
Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-02-01 14:14:17 +10:30
Peter Hutterer
e5e531ce96
Merge branch 'master' into mpx
...
Conflicts:
dix/events.c
2008-01-31 16:36:17 +10:30
Benjamin Tissoires
6c38682084
kdrive: AddInputClient takes a ClientPtr.
2008-01-31 15:51:32 +10:30
Coleman Kane
df325be394
Bug 13101: xorg-server has a typo in hw/xfree86/os-support/bsd/i386_video.c
...
X.Org Bug #13101 <https://bugs.freedesktop.org/show_bug.cgi?id=13101 >
Patch #12360 <https://bugs.freedesktop.org/attachment.cgi?id=12360 >
2008-01-29 09:48:00 -08:00
Julien Goodwin
94f412cb7e
Loader: Fix verbosity confusion
...
'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
This means that gdm's log would just be full of bare 'module already
built-in' messages.
2008-01-29 14:46:15 +11:00
Julien Goodwin
442838fcb3
xorg.conf.man: Fix monitor/output confusion in monitor positioning
...
On the Intel driver at least, LeftOf/RightOf/Above/Below in xorg.conf refers
to output names, not monitor names. Fix nomenclature in xorg.conf.man.
2008-01-29 14:46:15 +11:00
Peter Hutterer
5b8641a5fd
xfree86: fix AlwaysCore handling. (Bug #14256 )
...
Assume AlwaysCore being set by default, just like the other options.
X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256 >
2008-01-29 10:01:42 +10:30
Peter Hutterer
0ac1755977
Merge branch 'master' into mpx
...
Conflicts:
Xext/sampleEVI.c
2008-01-26 13:55:07 +10:30
Eamon Walsh
e915a26397
xselinux: Move the extension to extmod instead of being built-in.
2008-01-25 19:22:19 -05:00
Eamon Walsh
f6a78ee143
XACE: Remove the extension code entirely, XACE is completely static now.
2008-01-25 18:04:10 -05:00
Hong Liu
734e115871
Bug #12439 : add a quirk to use +hsync +vsync for the probed detailed mode.
...
Samsung 205BW quirk is somehow reworked.
2008-01-23 21:24:09 +08:00
Adam Jackson
cc22b05ea0
There is no such thing as /dev/cpu/mtrr.
2008-01-22 18:57:11 -05:00
Peter Hutterer
ba315ae5dd
Xi: add XACE hooks for device creation (ChangeDeviceHierarchy)
...
AddInputDevice checks for permissions already, so all we do is modify a few
callers to let AID sort it out.
2008-01-21 23:44:07 +10:30
Peter Hutterer
883811c2be
dix: remove inputInfo.pointer reference in TryClientEvents.
...
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
2008-01-18 18:48:46 +10:30
Jeremy Huddleston
23f3f0e27d
XQuartz: Moved SetFrontProcess haco to set_front_process
...
So it is done by the other thread...
(cherry picked from commit 7429379eb1001ee3dc769daa8fe6b3aef1b9cc8a)
2008-01-17 09:49:25 -08:00
Matthieu Herrb
bbde5b62a1
Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
2008-01-17 15:26:41 +01:00
Daniel Stone
e85130c85f
Xephyr: One-time keyboard leak fix
...
Don't leak the originally-allocated keysym map.
2008-01-17 18:43:06 +11:00
Tiago Vignatti
7a0d16ef0a
Removed some warnings.
2008-01-15 03:27:16 -02:00
Tiago Vignatti
315d6a2b1d
Fix Xephyr compilation without GLX.
2008-01-15 02:59:56 -02:00
Dave Airlie
1f83f40525
xf86Cursors: fix memset for non-square cursors
2008-01-15 10:21:17 +10:00
Jeremy Huddleston
180a5aba4d
XQuartz: Fixed copy-paste error with login_shell commit
...
(cherry picked from commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2)
2008-01-12 21:34:09 -08:00
Jeremy Huddleston
6fd4a5e2e4
XQuartz: Corrected copyright X.org Project -> X.org Foundation
...
(cherry picked from commit f21631444816fc12b8a534c2cf79e6ac6c2af7c9)
2008-01-12 12:02:01 -08:00
Jeremy Huddleston
f72255639c
XQuartz: added 'login_shell' option to defaults
...
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18cebd3435d70f62855239484974c455a1)
2008-01-12 12:01:57 -08:00
Jeremy Huddleston
ec24a6b5aa
XQuartz: Fixed switching into XQuartz via expose.
...
(cherry picked from commit 627ed60ce5d7499761028edf379ebd95250d3e04)
2008-01-12 12:01:52 -08:00
Peter Hutterer
38bf01bd1c
Merge branch 'master' into mpx
2008-01-10 13:38:46 +10:30
Peter Harris
0883e838e2
xf86misc.c: Avoid use of swapped values
2008-01-09 18:43:55 -08:00
Alan Coopersmith
59a63d72a1
Fix reference to old versions of XFree86 to not say "Xorg 4.2 or earlier"
2008-01-09 18:42:58 -08:00
Richard Purdie
c31aead0fe
[Kdrive] make XCalibrate 'orientation aware'
2008-01-08 12:31:47 +01:00
David Nusinow
30375cd6d1
Don't log DPMS enabling as being from xorg.conf if it's not
2008-01-07 20:57:30 -05:00
David Nusinow
260505e3c5
Log enabling of DPMS even when it's not set in xorg.conf
2008-01-06 16:37:13 -05:00
Julien Cristau
7e76221659
Fix the name of the XFree86-Misc extension in the xorg.conf manpage.
2008-01-06 18:23:09 +01:00
Julien Cristau
59df687835
Document the AllowEmptyInput, AutoAddDevices and AutoEnableDevices flags
...
Add documentation for the new AllowEmptyInput, AutoAddDevices and
AutoEnableDevices server flags in the xorg.conf manpage.
2008-01-06 17:02:03 +01:00
Jeremy Huddleston
7d226d6a25
XQuartz: Cleanup for strict-prototyping
...
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4beb7a427b00b18097f548876ad3c11d7)
2008-01-05 03:17:27 -08:00
Jeremy Huddleston
11967dce11
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
2008-01-04 23:10:10 -08:00
Jeremy Huddleston
aca75f389e
XQuartz: Flush the debug log for easier debugging
...
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d4239c7f3918332ef07752f1e211afb23)
2008-01-04 23:10:10 -08:00
Alex Deucher
20eb26f9d1
Fix potential crasher in xf86CrtcRotate()
...
xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
2008-01-03 22:53:36 -05:00
Jeremy Huddleston
e46d559739
XQuartz: Cleaned up color map configuration.
...
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27c053d22882f54337cfd09203aa5383)
2008-01-03 13:25:56 -08:00
Peter Hutterer
8da83836b6
Merge branch 'master' into mpx
...
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
Alan Coopersmith
ccf6636d2c
Kill xf86getpagesize even harder (dummylib & ioport)
2008-01-02 19:28:33 -08:00
Alan Coopersmith
f6666dcc3b
Add dixAllocatePrivate stub to dummylib for utils
...
Normally not necessary, except when building non-optimized/debug causes
the inline functions from private.h to appear in os-support/libxorgos.la
2008-01-02 19:19:55 -08:00
Alan Coopersmith
73f4229960
Fix names/types of new vuidMouse{Get,Set}ScreenPrivates macros
2008-01-02 19:17:54 -08:00
Adam Jackson
85365ddf16
EDID 1.4: If given a native pixel format, use it when inferring virtual.
2007-12-28 17:38:52 -05:00
Adam Jackson
312b30cb03
EDID 1.4: First detailed mode is always preferred.
...
... so act like it in the modelist generator, not just the parser.
2007-12-28 17:38:51 -05:00
Jurij Smakov
36ff05771b
GL: Add GLX compile flags lost in modular X server changes
...
RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64. This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.
Also, Alpha needs to pass -mieee to the compiler as well.
This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever. To the best of my
knowledge the patch was written by Jurij Smakov. See Debian bug
number #388125 .
I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392 .
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-29 00:00:04 +02:00
Adam Jackson
bae459cfc4
Don't carp on EDID 1.4 blocks anymore.
...
Also whine more loudly when we get something other than 1.x.
2007-12-28 16:53:17 -05:00
Adam Jackson
70b2d6cfeb
Check the gamma value, not its address.
2007-12-28 16:53:17 -05:00
Adam Jackson
592d814ee0
EDID 1.4: Additional semantics for display feature bits.
...
First mode is _always_ preferred in 1.4; the bit that used to mean this
now means that the preferred mode is also the native pixel format. The
old "is GTF" bit now means "is continuous-frequency" instead.
Section 3.6.4, Table 3.14: Feature Support, Notes 4 and 5.
2007-12-28 16:53:17 -05:00
Adam Jackson
322d0103ae
EDID 1.4: Alternate color encodings for digital inputs.
...
Section 3.6.4, Table 3.14: Feature support.
2007-12-28 16:53:17 -05:00
Adam Jackson
f1f43caf7e
EDID 1.4: Allow for gamma definition in extension blocks.
...
Section 3.6.3, Table 3.13: Display Transfer Characteristics (Gamma)
2007-12-28 16:53:16 -05:00
Adam Jackson
861ee38817
EDID 1.4: Additional aspect ratio semantics for screen size fields.
...
Section 3.6.2, Table 3.12: Horizontal and Vertical Screen Size or
Aspect Ratio.
2007-12-28 16:53:16 -05:00
Adam Jackson
14b5c8a447
EDID 1.4: Extended support for digital interfaces.
...
Section 3.6.1, Table 3.11: Video Input Definition.
2007-12-28 16:53:16 -05:00
Adam Jackson
a948216dcc
EDID 1.4: Decode CVT 3-byte codes and add them to the mode pool.
...
Section 3.10.3.8: CVT 3 Byte Code Descriptor Definition.
2007-12-28 16:53:16 -05:00
Adam Jackson
f6df66cc89
EDID 1.4: Trivial support for new detailed sections.
...
Nothing actually decoded yet, but at least we print what they are.
New in EDID 1.4:
- Color Management Data (0xF9), Section 3.10.3.7
- CVT 3 Byte Code Descriptor (0xF8), Section 3.10.3.8
- Established Timings III Descriptor (0xF7), section 3.10.3.9
- Manufacturer-specified data tag (0x00 - 0x0F), section 3.10.3.12
2007-12-28 16:53:16 -05:00
Adam Jackson
bac3ecde39
EDID 1.4: Allow for sync range offsets.
...
Table 3.26: Display Range Limits & Timing Descriptor Block Definition
2007-12-28 16:53:16 -05:00
Eamon Walsh
643c52be32
xselinux: Remove "X" prefix on remaining functions and strings.
...
Should be evident from the context.
2007-12-28 13:27:28 -05:00
Adam Jackson
938da5ee38
Add HDMI and DisplayPort connector types.
2007-12-28 12:23:44 -05:00
Daniel Stone
941058f8da
KDrive: Xephyr: Don't leak screen damage structure
2007-12-28 15:51:36 +02:00
David S. Miller
ae869fc766
[SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
...
xf86getpagesize() was removed, but this one call site was
not fixed up.
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-27 07:34:09 +01:00
Jeremy Huddleston
beb29c605b
XQuartz: *REALLY* use CFStringCreateWithCString
...
I need sleep! Why am I making these stupid mistakes... sorry for pointless commit spam. ugg.
(cherry picked from commit b16351fc6457aabead328472d16dc25789032940)
2007-12-21 02:09:15 -08:00
Jeremy Huddleston
5dd895efa3
XQuartz: Use CFStringCreateWithCString
...
(cherry picked from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)
2007-12-21 02:07:07 -08:00
Jeremy Huddleston
2c24231fc2
XQuartz: Reduce code duplication in X11.app
...
(cherry picked from commit b81809cd91a9f90b7f2de77b1dcf514cee87c32d)
2007-12-21 01:58:03 -08:00
Jeremy Huddleston
f3042a63be
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
2007-12-21 01:24:43 -08:00
Jeremy Huddleston
fa9680a730
XQuartz: Added localization.
...
(cherry picked from commit 7a5cc7bfbb296a2c41a580b063324c448f7131db)
2007-12-20 19:38:49 -08:00
Jeremy Huddleston
603a8b73d4
XQuartz: Cleaned up command line arguments.
2007-12-20 18:29:57 -08:00
Jeremy Huddleston
4cf3002b60
XQuartz: Kill off server-main.c and launcher-main.c
...
Now using xinit
(cherry picked from commit 5d6ae3d299f72df714117948b3d31dcbddf6c0bc)
2007-12-20 18:09:24 -08:00
Jeremy Huddleston
1f74bef1ad
XQuartz: Don't fork to exec app_to_run.
...
Plus other housecleaning...
(cherry picked from commit ae302db472f127be082d05b418ede332fae8ccc5)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
2d15d439f8
Xquartz: Use X11ControllerMain()
...
(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
42802a8e6b
Xquartz: General Cleanup
...
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
2007-12-20 13:18:17 -08:00
Dave Airlie
7ef7727b80
entity sharing: make !shareable entity non-fatal.
...
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
2007-12-20 10:11:26 +10:00
Adam Jackson
7721d3e921
Reference cvt and gtf in the xorg.conf man page.
2007-12-18 19:14:26 -05:00
Jeremy Huddleston
bf20c4374a
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
...
(cherry picked from commit 767b4c9d9daa5d0ea59ac1f0d70146798da631cb)
2007-12-16 01:14:55 -08:00
Samuel Thibault
58c2898b62
xfree86: permit access to io port 0xffff on the hurd
2007-12-16 01:21:45 +01:00
Ben Byer
a3f7f7b60e
clarified debug message to indicate that we're sleeping
...
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf893f8f81bacd434b31408dfb38cb06)
2007-12-14 15:22:57 -08:00
Ben Byer
e0e59b3bbc
we need to link against CoreServices, not ApplicationServices
...
(cherry picked from commit ba4d2096e7953ef5b971682f0e28535da968acb1)
2007-12-14 15:22:49 -08:00
Ben Byer
062d9234e2
fixed bug in x11-exec that prevent icon from showing up
...
(cherry picked from commit e1f4a0c20d3a52d98954c4b28d0ec4d44564bc32)
2007-12-14 15:22:44 -08:00
Jeremy Huddleston
95c02adea8
Xquartz: Fixed cpprules include
2007-12-14 15:21:40 -08:00
Otavio Salvador
8673033700
kdrive/ati: use operating system input devices
2007-12-14 13:15:27 +02:00
Otavio Salvador
e110255501
kdrive/vesa: use operating system input devices
2007-12-14 13:15:27 +02:00
Otavio Salvador
863ba390e9
kdrive/fbdev: use operating system input devices
2007-12-14 13:15:27 +02:00
Arkadiusz Miskiewicz
ca59d3f7bd
Xprint: Clean up generated files
...
Remember to clean generated wrapper files.
2007-12-14 13:15:26 +02:00
Eamon Walsh
a2df51f8e9
Bump video driver ABI and extension ABI for devPrivates rework.
2007-12-14 00:53:54 -05:00
Eamon Walsh
86b2e59bfb
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
configure.ac
This is the last pull before merging to master.
2007-12-14 00:32:24 -05:00
Eamon Walsh
1c1a4bc970
devPrivates rework: more cleanup from previous merge operation.
2007-12-13 19:51:40 -05:00
Jeremy Huddleston
cb0d7e2c26
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
2007-12-13 16:29:40 -08:00
Jeremy Huddleston
c39212fd73
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
2007-12-13 16:29:09 -08:00
Ben Byer
82e1aff9fb
Modified X11 plist to use x11-exec
...
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
2007-12-13 16:28:35 -08:00
Ben Byer
1a5910588a
created x11-exec wrapper, which uses LaunchServices to find
...
(and then exec) X11.app
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
2007-12-13 16:28:30 -08:00
Eamon Walsh
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Adam Jackson
efcdc0d701
Correct the documentation comments in xf86Modes.c
...
Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
2007-12-13 15:38:41 -05:00
Adam Jackson
1768af38c7
Add infrastructure for validating modes by memory bandwidth.
2007-12-13 15:06:18 -05:00
Adam Jackson
4359193aaa
Explain a confusing #ifdef.
2007-12-13 10:59:48 -05:00
Adam Jackson
8cedbb0a53
Clean up some #if 0.
2007-12-13 10:57:35 -05:00
Aaron Plattner
a125ce4a84
Fix dist by including modeline2c.awk.
...
This was broken by commit cb44b6121c
, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
2007-12-12 12:24:29 -08:00
Aaron Plattner
6715923437
Get rid of xf86DefModes.c.
...
It's out of date and not included in the build. Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
2007-12-12 10:59:15 -08:00
Jeremy Huddleston
eab0c4e490
Xquartz: Pre-process Xquartz man page
...
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
2007-12-10 21:03:37 -08:00
Jeremy Huddleston
1ff945a8e4
Xquartz: Make Alt work with Xmodmap again
...
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
2007-12-10 21:03:30 -08:00
Jeremy Huddleston
7d61893b49
Xquartz: Removed Xplugin.h from EXTRA_DIST
...
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
2007-12-10 20:34:40 -08:00
Ben Byer
8f2eff643b
remove Xplugin.h, because we should use the one in /usr/include
...
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
2007-12-09 12:03:22 -08:00
Jeremy Huddleston
7b573ed436
Xquartz: Added missing link to libconfig.a
...
(cherry picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)
2007-12-09 12:02:15 -08:00
Jeremy Huddleston
020b0e92b0
Xquartz Added quartzKeyboard.h to EXTRA_DIST
...
(cherry picked from commit 37c9781fdb672229ceab101b080762e15512943f)
2007-12-08 11:49:55 -08:00
Ben Byer
5e016fa9b2
Added darwinEvents.h to EXTRA_DIST
...
(cherry picked from commit 45e5247564c423a2bf02cfec1993155858c91a14)
2007-12-08 11:33:54 -08:00
Jeremy Huddleston
6bb5dacc17
Xquartz: Actually add quartzForeground.[hc]
...
Sorry for the commit spam... I'm tired and was overly quick to commit... forgot to include a neccessary file.
(cherry picked from commit e564b7aeaab63e4c943445275af680b3b5898a94)
2007-12-08 01:42:03 -08:00
Jeremy Huddleston
02df036670
Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
...
(cherry picked from commit c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)
2007-12-08 01:28:49 -08:00
Jeremy Huddleston
740cc54f08
Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
...
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)
2007-12-08 01:25:13 -08:00
Jeremy Huddleston
41a0aeaae9
XQuartz: Fixed "Multiple Dock Icons"
...
BAM!
(cherry picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31)
(cherry picked from commit 0502955a2af487b51bf22916ac02e497c2d96aba)
2007-12-08 00:35:14 -08:00
Jeremy Huddleston
a1b0346853
XQuartz: Cleaned up configure, X11.app path in launchd script
...
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc331d1d621b2541492a3336f69d70a2)
2007-12-07 23:26:11 -08:00
Jeremy Huddleston
0ad1c359c5
Darwin: Use __APPLE__ instead of __DARWIN__
...
(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
2007-12-07 18:54:58 -08:00
Brice Goglin
85ed0bb440
Add a missing linebreak after LoadModule: "foo"
...
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
2007-12-08 02:53:51 +01:00
Jeremy Huddleston
c238ef06a2
Darwin: Dead coded removal
...
Kill off assert macro
(cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)
2007-12-07 14:08:31 -08:00
Jeremy Huddleston
8a8239f2e2
Darwin: Renamed DarwinModeBlah to QuartzBlah
...
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
2007-12-05 21:26:16 -08:00
Jeremy Huddleston
bc65a24393
Darwin: Flattened quartz into darwin, renamed darwin xquartz
...
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
2007-12-05 20:32:40 -08:00
Jeremy Huddleston
e00f7061b2
Darwin: Cleaned up keyboard interface headers
...
(cherry picked from commit 141f69dc3d8d6e7d8ff65607f43700ac11243041)
2007-12-05 20:31:36 -08:00
Andrew Oakley
cb44b6121c
Fix commit aa0dfb3f42
...
From bugzilla bug 13467¹:
Currently the xserver fails to build without this (now deleted) file, as the
Makefile tries to distribute it. The patch simply removes the reference to
modeline2c.pl.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
Signed-off-by: James Cloos <cloos@jhcloos.com>
2007-12-05 20:23:05 -05:00
Daniel Stone
320abd7d1d
XKB: Actions: Don't run certain actions on the core keyboard
...
Don't run VT switches, terminations, or anything, on the core keyboard: only
run actions which affect the keyboard state. If we get an action such as VT
switch, just swallow the event.
2007-12-05 19:37:48 +00:00
Hong Liu
c6cfcd408d
Bug 13308: Verify and reject obviously broken modes.
2007-12-05 17:48:28 +01:00
Jeremy Huddleston
8d0efe4c2a
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
...
(cherry picked from commit e8399fd4d66a2b77b770c277e2fa424229a721b2)
2007-12-04 18:00:28 -08:00
Jeremy Huddleston
cc98a8e241
Darwin: RIP dumpkeymap, cr, and fullscreen
...
Taking out the trash.
We don't need dumpkeymap since we'll be getting keymaps straight from the OS. .Xmodmap should be sufficient for any user-needed changes. If this is not
the case, please let us know, so we can address any problems you have.
fullscreen never worked AFAIK
cr isn't being used and xpr is much better.
(cherry picked from commit e41af2967e885466c4d194fa4c3b358e6be37c30)
2007-12-04 16:41:57 -08:00
Adam Jackson
13af2d1efc
Restore xf86getsecs() as not having an ANSI equivalent.
2007-12-04 17:36:21 -05:00
Jeremy Huddleston
f8d7729df3
Darwin: Combine launcher and server X11.app
...
This should hopefully eliminate confusion some people have over which X11.app is which.
Now BOTH are in /A/U/X11.app and we intelligently determine whether to execute our app_to_run
or launch the server. If arguments are given, we launch the server. Otherwise if we can
connect to an X DISPLAY, we execute app_to_run. Otherwise, we launch the server.
(cherry picked from commit e7026216ccaa8e4fb073800ba947c9909d4faada)
2007-12-03 20:22:01 -08:00
Dave Airlie
678f786715
xf86crtc: oh mon could be NULL, so check before quirks
2007-12-04 12:24:47 +11:00
Dave Airlie
a9df4bb555
xf86Crtc: pass correct parameter.
...
quite how this has worked I've no idea.
2007-12-04 12:17:29 +11:00
Adam Jackson
fe25f897c6
xf86getpagesize -> getpagesize elsewhere in os-support/
2007-12-03 18:34:40 -05:00
Alan Coopersmith
b84f2833a6
xf86getpagesize() -> getpagesize() in os-support/solaris/sun_bios.c
2007-12-03 14:52:46 -08:00
James Cloos
aa0dfb3f42
Remove Perl dependency from the build
...
From bugzilla bug 13467¹:
The modeline2c script is the only part of the Xorg server that requires Perl.
[This] is a simpler replacement that works with any normal AWK.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
Bug was posted by Joerg Sonnenberger <joerg@NetBSD.org>.
2007-12-03 16:57:58 -05:00
Alan Coopersmith
b77ca7cc9c
Use _X_EXPORT instead of __attribute__((visibility("default")))
2007-12-03 11:31:21 -08:00
Adam Jackson
1faba797cb
Death to libcwrapper.
...
This has been deprecated since 1.1. Since we're breaking ABI again anyway,
remove it entirely.
2007-12-03 14:12:58 -05:00
Peter Hutterer
28b93d74a1
ephyr: miPointerWarpCursor needs the device parameter.
...
Thanks to Mitchell Quille for spotting it.
2007-12-03 14:35:33 +10:30
Ben Byer
83ba1e167c
added missing call to xcb_connect()
...
(cherry picked from commit dc2fb323ee11f081d447605be151024f9e2487f9)
2007-12-01 19:04:06 -08:00
Jeremy Huddleston
9ad4560b3c
Darwin: Alt is Mode_switch Switching to Mode_switch to maintain compatibility with Tiger X11.
...
(cherry picked from commit 8a76c99c0ebbaf7375f3a9c75c4f7921a79024da)
2007-12-01 17:27:36 -08:00
Jeremy Huddleston
f83d758dcc
Darwin: properly implemented xcb check for stale sockets
...
(cherry picked from commit f543cb8fbb3d9213cb03396f4252ab9821319993)
2007-11-30 16:11:15 -08:00
Jeremy Huddleston
f54b28eeba
Darwin: Undo focus-hack which didn't work right.
2007-11-30 16:09:23 -08:00
Dave Airlie
f30abe30c5
edid quirk for MAX 0x77e monitor
...
From RH bugzilla 306441
2007-11-30 13:53:21 +10:00
Jeremy Huddleston
8a079be0dd
Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround.
...
(cherry picked from commit d2b768890f0878ae4e3fec8f7219e82b79256133)
2007-11-29 02:21:16 -08:00
Jeremy Huddleston
3839756061
Darwin: Removed support for darwinSwapAltMeta
...
(cherry picked from commit 3d153c8fa40986d194b7701f5eafa0080e32399a)
2007-11-29 02:21:16 -08:00
Dave Airlie
89c3dfe41e
modes: use xf86RandR12Index to stop illegal access
...
xf86RandR12Index set to -1, and if initialised it gets 0 or higher.
This allows the server to start with xinerama turned on with only one head
2007-11-29 19:57:24 +11:00
Dave Airlie
725710fd0b
randr: make randr code not segfault when xinerama set
2007-11-29 19:40:53 +11:00
Adam Jackson
23b8ca8a37
RANDR 1.2: Only enable unknown outputs if there are no connected outputs.
...
Otherwise you end up with a confusing initial geometry, and xscreensaver
and friends get very angry.
2007-11-27 13:20:40 -05:00
Jeremy Huddleston
601307615e
Darwin,Rootless: Makefile cleanup
...
(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
2007-11-26 14:49:32 -08:00
Eamon Walsh
54cb729ecc
registry: Add a call for DTRACE compatibility.
2007-11-26 15:59:01 -05:00
Eamon Walsh
decd5a7c60
registry: Rebase registry to use the server config file of protocol names.
2007-11-26 15:26:49 -05:00
Adam Jackson
a344920ae8
Allow Virtual to be specified globally in the Screen section.
...
The Display subsections are optional, and it's confusing to need to create
them just to set a Virtual size.
2007-11-26 11:53:08 -05:00
Matthias Hopf
c6c284e64b
Initialize Mode with 0 in xf86RandRModeConvert.
...
Asking for trouble if non-initialized values contain random data.
2007-11-26 15:39:42 +01:00
Matthias Hopf
f6401f944d
Don't segfault if referring to a relative output where no modes survived.
2007-11-23 16:14:48 +01:00
Matthias Hopf
fa19e84714
Fix initial placement of LeftOf and Above.
2007-11-23 16:14:48 +01:00
Matthias Hopf
184e571957
Adjust offsets of modes that do not fit virtual screen size.
...
Fixes memory corruption if a too small "Virtual" was specified in xorg.conf
for the selected multi-monitor configuration.
2007-11-23 16:14:48 +01:00
Jeremy Huddleston
63351df0ee
Darwin: Fix compilation/linking problems
2007-11-22 18:02:07 -08:00
Jeremy Huddleston
bf4ef4da75
Darwin: Remove the PaintWindow optimization which snuck back in.
2007-11-22 17:45:15 -08:00
Jeremy Huddleston
59c7ca6586
Darwin: Added missing Makefile.am
2007-11-22 13:29:15 -08:00
Jeremy Huddleston
23596291c3
Darwin: More syncing witn xorg-server-1.2-apple
2007-11-22 13:17:44 -08:00
Jeremy Huddleston
ed9524d36e
Darwin: Copied over missing file (Localizable.strings) from xorg-server-1.2-apple
2007-11-22 01:07:02 -08:00
Jeremy Huddleston
4d9cef197b
Darwin: Misc cleanups to line up with xorg-server-1.2-apple
2007-11-22 00:35:09 -08:00
Jeremy Huddleston
5e950123da
Darwin: Removed cvs tags from Xquartz man page
2007-11-21 23:32:00 -08:00
Jeremy Huddleston
3a2f714eea
Darwin: Removed .svn dir
2007-11-21 23:30:37 -08:00
Jeremy Huddleston
602de4f70b
Darwin: Use UTF8String since lossyCString is deprecated
...
(cherry picked from commit 1786f9464af51ff606a612aec6fe420fa9688a28)
2007-11-21 23:27:17 -08:00
Ben Byer
13666e287c
Darwin: Added some DEBUG_LOG sauce to the XP_EVENT handling code
...
(cherry picked from commit ec84a4cef66a2b46ed71f9758c434ea629d2f270)
2007-11-21 23:26:15 -08:00
Ben Byer
829b6641bd
Darwin: Disabled ALT_IS_MODE_SWITCH
...
(cherry picked from commit fd181254f85543558190140787dc7b41f6cf90db)
2007-11-21 23:23:44 -08:00
Ben Byer
8486f8af91
Darwin: Added a lightweight debugging facility to support troubleshooting
...
(for example) the stuck modifier key issue
(cherry picked from commit 0e0b452d10c0af55497c3299b5f3db45d5b381cb)
2007-11-21 23:18:46 -08:00
Ben Byer
8358334180
Darwin: Fixed the call to xp_init so that we now receive Motion notifications even
...
if X is not the active application.
fixes <rdar://problem/5167664> xeyes dead until window activation
(cherry picked from commit c7573379a85a1480cc51650075078e41dafe56af)
2007-11-21 23:16:27 -08:00
Ben Byer
512dee9087
Darwin: fix for spurious "Are you sure you want to quit?" message
...
(cherry picked from commit 30cbfc786e4fedda3fe070bacceabe1d9212d00b)
2007-11-21 23:15:26 -08:00
Ben Byer
28e73e99a9
Darwin: Adding "fake RandR" support from old X11.app
...
(cherry picked from commit 633490c4e8dab30af7ecbe1bef076c22ad5f5da9)
2007-11-21 23:14:21 -08:00
Ben Byer
01b70afaac
Darwin: Initial support for Spaces -- if you use Expose to drag an X11
...
window to another Space, it will work correctly (as opposed
to just leaving a ghost window). We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
(cherry picked from commit 2d50ea8013e7c1639d570e227b53b037fb567565)
2007-11-21 23:13:48 -08:00
Ben Byer
b39edc01a6
Darwin: Swap modifier keys for buttons 2 and 3 -- now Option-click is the middle click
...
(cherry picked from commit 0aa61293b62aeb69a93b2035d0aef8644343eed3)
2007-11-21 23:12:15 -08:00
Ben Byer
606a8dc73d
Darwin: Trap Deactivate messages and release modifiers to avoid "stuck shift lock" (etc) bugs
...
(cherry picked from commit 2b189a99330eb465fa0d17020fb1db1e38829151)
2007-11-21 23:12:01 -08:00
Ben Byer
4c18ef4331
Darwin: Workaround for a bug where the holding down Command to make a "fake"
...
button 2 click would actually result in a Command-2 chord.
(I.e. it wasn't releasing Command before clicking the fake button.)
(cherry picked from commit 0d5dd5dffa4c5ce3f54dfe53720a39d524dc8e37)
2007-11-21 23:11:38 -08:00
Peter Hutterer
f9269bebae
DeviceIntRec: move lastx/lasty from valuator into DeviceIntRec.
...
We free the ValuatorClassRec quite regularly. If a SIGIO is handled while
we're swapping device classes, we can bring the server down when we try to
access lastx/lasty of the master device.
2007-11-22 17:30:14 +10:30
Jeremy Huddleston
7f2972d47a
Darwin: Really add launcher this time
2007-11-21 21:59:59 -08:00
Jeremy Huddleston
bcbaf2a0ce
Darwin: Dead code removal, Code cleanup, Added launcher
...
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
2007-11-21 19:52:11 -08:00
Alan Coopersmith
a55ec1a9f4
Restore checks for __i386 where needed for Sun compilers on Solaris
2007-11-20 18:31:07 -08:00
Eamon Walsh
a541e826c9
Revert "registry: Register WINDOWSWM extension protocol names."
...
This reverts commit 4c3285c883
.
Moving all the names into dix/registry.c
2007-11-20 17:50:26 -05:00
Eamon Walsh
993595430b
Revert "registry: Register XF86DRI extension protocol names."
...
This reverts commit b778672408
.
Moving all the names into dix/registry.c
2007-11-20 17:48:46 -05:00
Eamon Walsh
6b73c215c9
Revert "registry: Register XF86VidMode extension protocol names."
...
This reverts commit 960677e876
.
Moving all the names into dix/registry.c
2007-11-20 17:47:30 -05:00
Eamon Walsh
8e2cd7a804
Revert "registry: Register XF86Misc extension protocol names."
...
This reverts commit 2cd1b32b77
.
Moving all the names into dix/registry.c
2007-11-20 17:45:30 -05:00
Eamon Walsh
0356153a58
Revert "registry: Register XF86DGA extension protocol names."
...
This reverts commit 3815284e89
.
Moving all the names into dix/registry.c
2007-11-20 17:43:18 -05:00
Eamon Walsh
de93c1e9df
Revert "registry: Register DMX extension protocol names."
...
This reverts commit 32f3f5a1e7
.
Moving all the names into dix/registry.c
2007-11-20 17:40:57 -05:00
Eamon Walsh
2d3e0cdf4b
Revert "registry: Register APPLEDRI extension protocol names."
...
This reverts commit 3464b41923
.
Moving all the names into dix/registry.c
2007-11-20 17:39:56 -05:00
Eamon Walsh
546d46224e
Revert "registry: Register XINERAMA extension protocol names."
...
This reverts commit b9f5ab98c8
.
Moving all the names into dix/registry.c
2007-11-20 17:37:48 -05:00
Eamon Walsh
fd2d83d5bf
Revert "registry: Register APPLEWM extension protocol names."
...
This reverts commit eee46b4681
.
Moving all the names into dix/registry.c
2007-11-20 17:34:48 -05:00
Dodji Seketeli
be0cbe5a33
kaa: update kaaCreatePixmap to support the new usage_int
2007-11-20 15:39:49 +01:00
Eamon Walsh
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
Eamon Walsh
60be452c2e
xace: restore the old SaveScreens function and introduce new API, since the
...
old version is called from drivers...
2007-11-19 16:59:34 -05:00
Michel Dänzer
ea9c63e93b
DEFAULT_DPI was undefined here.
2007-11-19 15:53:49 +01:00
Adam Jackson
db9ae86353
Bump DEFAULT_DPI to 96.
...
75 is just nonsense.
2007-11-18 11:57:01 -05:00
Tormod Volden
ee2d4626dc
Bug #12932 : Use DEFAULT_DPI in randr1.2 instead of hardcoded 96.
2007-11-18 11:56:31 -05:00
Adam Jackson
d15339a92c
Bug #9725 : Don't look in root's $HOME for config files, that's just confusing.
2007-11-17 22:12:10 -05:00
Aaron Plattner
f797c96845
Save pixmap allocation hints into the PixmapRec.
2007-11-15 12:21:25 -08:00
Adam Jackson
6bc50de021
Simplify system resource range setup.
...
osRes only existed to get copied into Acc. Waste of effort.
2007-11-15 15:03:58 -05:00
Adam Jackson
e1ff14a924
Delete some dead code in X -configure.
2007-11-15 14:45:49 -05:00
Adam Jackson
c67b9c5fc3
Clean up some garbage in driver enumeration.
2007-11-15 14:24:36 -05:00
Adam Jackson
0706e5e790
Eliminate some redundancy in autoconfiguration.
...
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
2007-11-15 14:15:09 -05:00
Adam Jackson
2c01a49bf0
Don't sleep(1) at exit on any platform.
2007-11-15 13:32:59 -05:00
Tiago Vignatti
4c9cc82fc4
For some reason "-nozap" appeared twice. Weird.
2007-11-15 01:46:11 -02:00
Adam Jackson
cecac79445
Don't sleep(1) at server exit.
2007-11-14 14:46:22 -05:00
Eamon Walsh
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
Ben Byer
338c1aedbd
formatting fixes
2007-11-08 20:41:47 -08:00
Ben Byer
bd269d0d78
Fix for off-by-one error in menu bar height calculation -- props to Nicholas Riley!
2007-11-08 20:39:08 -08:00
Ben Byer
b4d1448405
Undo some last-minute breakage in xpr.h
2007-11-08 20:38:02 -08:00
Ben Byer
05d5b9baa0
removed debugging output
2007-11-08 20:37:38 -08:00
Ben Byer
9a8abcfa6d
Fixed focus problem (clicking on an X11 window that sits behind
...
an Aqua window would not always bring it to the top of the stack.
2007-11-08 20:37:18 -08:00
Ben Byer
b34d2ffc38
formatting changes.
2007-11-08 20:37:04 -08:00
Ben Byer
50dac9b2cb
Fixed Spaces issue, correctly -- dragging an X window from one
...
Space to another in Expose mode now works.
2007-11-08 20:11:34 -08:00
Ben Byer
a6ac900295
formatting cleanup
2007-11-08 20:06:05 -08:00
Ben Byer
67e96be13c
Fixed logic error that prevent JIS (Japanese) keyboard layouts from
...
being detected.
2007-11-08 20:04:44 -08:00
Ben Byer
154fb6417e
Initial support for Spaces -- if you use Expose to drag an X11
...
window to another Space, it will work correctly (as opposed
to just leaving a ghost window). We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
2007-11-08 20:04:03 -08:00
Ben Byer
169f83e366
Disable deferred updates in xp_init to fix performance problems
...
-- thanks to Eric Gouriou for pointing out the issue
2007-11-08 20:00:55 -08:00
Peter Hutterer
184a7b8917
Merge branch 'mpx' into mdsd
...
Conflicts:
Xi/opendev.c
2007-11-08 09:34:35 +10:30
Dodji Seketeli
e94ab0b502
sync with 'master'
2007-11-07 19:05:38 +01:00
Michel Dänzer
9bee1c6912
EXA: Disable problematic optimization of dest pixmap migration by default.
...
Also add some code comments about these optimizations.
2007-11-07 19:01:24 +01:00
Dodji Seketeli
26e1fc7b42
Xephyr: don't use Xv or GL when those are disabled.
2007-11-07 18:48:23 +01:00
Dodji Seketeli
950f9995d1
Xnest: fix lib dependancy to make libtool happy
...
This fixes an undefined symbol error happening when compiling
the server with the --disable-xv configure switch.
Basically, xnest was linking against
@XSERVER_LIBS@ and @XNEST_LIBS@ and the order of the libraries
given to the linker at the end of the process was bogus.
* configure.ac: make XNEST_LIBS contain the $XSERVER_LIBS re-ordered
in such a way that the linker finds the symbols of all the libs contained
in $XNEST_LIBS.
* hw/xnest/Makefile.am: don't link against @XSERVER_LIBS@ anymore because
XNEST_LIBS contains the right thing.
2007-11-07 18:43:16 +01:00
Peter Hutterer
0b729051c0
Merge branch 'master' into mpx
...
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
Dodji Seketeli
868e303630
Xephyr: fix a crash when using xrandr twice
...
* hw/kdrive/ephyr/ephyr.c:
(ephyrScreenFini): don't forget to
free shadowfb data (if necessary) upon server is reset.
2007-11-06 16:24:46 +01:00
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Dodji Seketeli
632c33c5c1
pull 'master'
2007-11-05 17:53:04 +01:00
Daniel Stone
dda10c9066
Remove all traces of external RGB database (and Speedo)
...
Remove all references to an external RGB database (which hasn't been enabled
for a very long time). Also get rid of some references to Speedo fonts.
2007-11-05 16:28:35 +00:00
Dodji Seketeli
6ff79ea5f7
Xephyr: fix some DRI build breakage
2007-11-05 16:46:49 +01:00
Daniel Stone
733d42065f
XFree86: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
caf5450634
KDrive: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
d57060f167
DMX: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
def6f74f2d
Xvfb: Remove usage of alloca
...
Replace with heap allocations
2007-11-05 14:34:42 +00:00
Daniel Stone
259f4c36d5
Xprint: Remove usage of alloca
...
Replace with heap-based allocations.
2007-11-05 14:34:42 +00:00
Daniel Stone
1c84337af0
Xwin: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00:00
Ben Byer
b1764ddf13
pulling more patches over from xorg-xserver-1.2-apple branch
2007-11-05 05:45:21 -08:00
Ben Byer
10fde62fc8
more CVS tags
2007-11-05 05:45:21 -08:00
Ben Byer
27ecb89250
Removed CVS tags.
2007-11-05 05:45:21 -08:00
Aaron Plattner
f2e310132f
Add CreatePixmap allocation hints.
...
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
2007-11-04 16:11:28 -08:00
Mark Vytlacil
41c3069f7c
XFree86: Input: Save/restore errno around SIGIO (bug #10683 )
...
Make sure errno is saved and restored from the SIGIO handler, so errors
from system calls in input handlers don't break the interrupted code.
2007-11-04 16:46:21 +00:00
Ben Byer
ff9929ed48
pulling in changes from xorg-server-1.2-apple branch
2007-11-04 05:13:19 -08:00
Matthias Hopf
4d0f35c81d
Always duplicate mode name when duplicating a mode.
...
If the originating mode didn't have a name, we would end up with the name of
the original mode being setup correctly, but with the name of the copy still
being NULL.
2007-11-02 19:27:32 +01:00
Adam Jackson
dfb1cce28a
Restore build of xf8_16bpp.
...
It doesn't link against cfb, so don't conditionalize its build against cfb.
2007-11-02 12:51:56 -04:00
Kristian Høgsberg
7a0555e9bb
Fix crash in xf86InitOrigins()
...
In a multihead setup, if only the first screen can be
initialized, but the second screen is mentioned first in the
ServerLayout section, the xf86InitOrigins() function will crash
because the screen referred to in the e.g. "RightOf" part is
non-existent.
2007-11-02 12:06:09 -04:00
Adam Jackson
5b41d4e60b
Don't filter modes away during VBE mode list construction.
...
Pass all VBE modes back up to the driver, on the assumption that it
knows how to filter modes intelligently.
2007-11-02 12:05:58 -04:00
Adam Jackson
c095da04fe
Fix magic number in fbdevhw
...
The transformation between fbdev and xfree86 mode timings needs to be
invertible, otherwise Xen and other framebuffers that don't have real
pixel clocks won't initialize.
2007-11-02 12:05:41 -04:00
Adam Jackson
f4fe66f676
Disable explicit commenting in Monitor section.
2007-11-02 12:05:22 -04:00
Adam Jackson
22f0e3a8b0
Avoid PS/2 protocol probing for /dev/input/mice
...
The kernel will always upconvert to ExplorerPS/2 for all readers of
/dev/input/mice, so don't waste time on startup trying to figure
that out.
2007-11-02 12:04:56 -04:00
Adam Jackson
b97518666d
Fix accidental ABI usage in RANDR 1.2 drivers.
...
Due to RANDR 1.2, xf86findOptionValue and xf86nameCompare are now ABI.
Make sure they're exported from the server.
2007-11-02 12:04:29 -04:00
Adam Jackson
a2ee5fe0c4
Enable MIT-SHM in Xdmx.
...
The extension is entirely DIX-level, no new DDX changes needed.
2007-11-01 13:47:17 -04:00
Kristian Høgsberg
692654b430
Set up visuals for the existing X visuals.
...
This makes the root visual a GLX capable visual again and adds a GLX visual
for the COMPOSITE ARGB visual cleanly (as opposed to the hack we had before).
2007-10-29 18:14:18 -04:00
Kristian Høgsberg
a5546a99ac
Change the GLX module to initialize after COMPOSITE.
...
This changes the module initalization order so that the GLX module initializes
after COMPOSITE. The reason for this change is to be able to initialize a
GLX visual config for the COMPOSITE ARGB visual.
2007-10-29 18:14:18 -04:00
Peter Hutterer
8ead41388e
xfree86: wrap keyboard devices for XKB.
...
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.
Note that the VCK is still not wrapped, so core events will bypass XKB.
(cherry picked from commit d627061b48
)
2007-10-28 17:31:07 +02:00
Daniel Stone
493b83bd09
XFree86: Remove ridiculous SIGIO debugging
...
YOU PRESSED A KEY
AND AGAIN
YOU RELEASED A KEY
AND AGAIN
YOU PRESSED A KEY
AND AGAIN
... not so much.
2007-10-28 15:50:18 +02:00
Daniel Stone
df57ae1639
configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate
...
Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been
explicitly disabled in configure, or we don't have the proto modules
installed.
2007-10-28 15:46:26 +02:00
Matthias Hopf
27b13eeb56
Nuke superfluous ",", added missing include for xf86i2c.h.
2007-10-26 13:15:07 +02:00
Daniel Stone
6d59bb5709
XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs
...
When we're building with --enable-debug, don't emit an ErrorF every time a
function gets called.
2007-10-26 09:12:38 +03:00
Eamon Walsh
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
Matthias Hopf
48ca5961ca
Prefer configured DisplaySize to probed DDC data, if available.
...
Based on patch by Hong Liu <hong.liu@intel.com>.
2007-10-24 20:31:51 +02:00
David Nusinow
d808d653d1
Define PCI_TXT_IDS_DIR more cleanly
2007-10-22 21:30:04 -04:00
Keith Packard
29e0e18072
Leave hardware-specified preferred modes alone when user preference exists.
...
Instead of removing the preference bit marking the hardware declared mode
preference, leave it in place and just move the user preferred mode to the
front of the list while marking it with the USERPREF bit which will cause it
to be selected by the initial mode selection code.
2007-10-22 13:38:16 -07:00
David Nusinow
be9b0e558d
Add a note as to why the text file based PCI ID scheme is present at all
2007-10-21 23:49:14 -04:00
David Nusinow
b79b965bd9
Fix compilation issue on FreeBSD (bug #12841 )
...
Hide getline call by checking for glibc. If not, use fgetln instead. Even
though this section is now #ifdef'ed for linux only, this should help make
it more portable if non-linux folks end up wanting it.
2007-10-21 23:46:54 -04:00
David Nusinow
7f5e71fa73
Make PCI text file directory configurable
2007-10-21 23:41:49 -04:00
Eric Anholt
4b14c9a9cd
Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.
...
Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.
2007-10-19 16:34:54 -07:00
Eric Anholt
7e1cada6c6
Disable debian pci-id-list autoconfig code on non-linux.
...
It contains static paths, fails to build on non-glibc, and apparently just
exists to support distributions managing binary drivers and open-source drivers
together. Also restores previous code for fallback to vesa if nothing is
detected.
2007-10-19 15:16:19 -07:00
Matthias Hopf
74e84b8d89
Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.).
2007-10-19 17:28:15 +02:00
Matthias Hopf
6fdf3ddfef
Fix ids of ACPI events according to ACPI spec.
2007-10-19 17:20:21 +02:00