Commit graph

8637 commits

Author SHA1 Message Date
Jeremy Huddleston
d6495bb272 XQuartz: pbproxy: Wait for the server to finish starting up, so display is valid.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit e87a03fd53)
2009-11-15 11:03:33 -08:00
Jeremy Huddleston
909d04000c XQuartz: Buildfix for Leopard and older
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 15fc56addc)
2009-11-15 11:03:16 -08:00
Jeremy Huddleston
afc7663f0d XQuartz: Cleanup X11Controller.m compilation warnings.
Declare X11Controller as implementing NSTableViewDataSource.
Use selectRowIndexes:byExtendingSelection instead of selectRow:byExtendingSelection

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 840a68dc5e)
2009-11-06 11:01:07 -08:00
Jeremy Huddleston
6b70e145b7 XQuartz: Use dixLookupResourceByType instead of LookupIDByType
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 0e3ad44c3b)
2009-11-06 11:00:47 -08:00
Jeremy Huddleston
f203963678 XQuartz: Don't weed out duplicates in generated keymap
There seems to be an issue in the 1.5+ server where shift-space does not
produce a space when 'keycode 57 = space' but it does when 'keycode 57 = space
space'

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 069fc6ce0a)
2009-11-06 11:00:38 -08:00
Jeremy Huddleston
dfb0c50294 XQuartz: Controller thread launches clients
This avoids a memory leak due to no active auto-release pool on the server thread.

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 6d6e8fb27f)
2009-11-06 11:00:32 -08:00
Peter Hutterer
2d55b842b8 xserver 1.7.1.901
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-11-06 14:41:19 +10:00
Alan Coopersmith
4fe904f2d5 Enable XF86PM on all Solaris platforms, not just x86/x64
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit f7b375bd14)
2009-11-06 14:41:19 +10:00
Alan Coopersmith
f0dc842b14 Use $(MAKE) instead of "make" to build Solaris inline assembly
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit f77262513e)
2009-11-06 14:41:19 +10:00
Tiago Vignatti
05d6672a1b EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_driver
It crash the server when the drawable is 32 bit and the framebuffer is 16.

This is pretty much a copy-past from commit 8e873185.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 9640407643)
2009-11-06 14:27:35 +10:00
Rami Ylimaki
269202982d dix: Fixes a memory leak when a cursor resource is released.
Just open and close a client that creates cursors in order to
reproduce. In the problem case bits->refcnt is -1 and therefore
bits->devPrivates is never released.

Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 0573042cdd)
2009-11-06 14:27:02 +10:00
Jeremy Huddleston
ade4636c7e dix: Properly detect if the other device is frozen
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 7897b6c2d4)
2009-11-04 11:34:28 -08:00
Jeremy Huddleston
ccbf949abb XQuartz: Run xmodmap after programatically updating the keymap.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Martin Otte <otte@duke.edu>
(cherry picked from commit 5e79976c13)
2009-11-04 11:34:16 -08:00
Maarten Maathuis
9e9ff04320 exa: remove some outdated comment
- This comment is still in exa_driver.c and there it makes sense.

Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 412c56ef33)
2009-11-03 13:27:37 +10:00
Adam Jackson
30572be7c7 EDID: Extend the HDTV hack to handle "1368x769"
Hate televisions so much.

Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit ec98d7fc78)
2009-11-03 13:27:07 +10:00
Adam Jackson
9c87ede1d6 modes: Fix duplicate detection, and do it more consistently
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 7c0803f555)
2009-11-03 13:26:44 +10:00
Adam Jackson
f61376b136 modes: De-duplicate a clock range check.
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit ba2d39dd54)
2009-11-03 13:26:37 +10:00
Adam Jackson
263d2b05d6 EDID: Fix interlaced detailed timings to be frame size, not field size
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 25236d19e6)
2009-11-03 13:26:30 +10:00
Jamey Sharp
4caa7982ef Suppress certain GCC warnings in auto-generated code.
- Don't warn for references to deprecated functions in xorg_symbols.
- Ignore functions generated by gl_apitemp.py that are never used.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit fab74d1081)
2009-11-03 13:25:51 +10:00
Jamey Sharp
6ca6283bce Don't cast double to int: use default conversions or explicitly round.
GCC warns about casting a double return value to int.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 239435875d)
2009-11-03 13:25:44 +10:00
Jamey Sharp
ebbac19550 Suppress GCC warnings like "the address of u1' will always evaluate as true'".
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit e8c48fd8f7)
2009-11-03 13:25:38 +10:00
Mikhail Gusarov
171dc59ec5 kdrive: Grab evdev mouse/keyboard devices when X server is active
Input events are directed to both vt and input devices by default.
Unless input devices are grabbed, keyboard events fill it vt buffers
and cause spontaneous wakeups in kernel tty layer when buffers are full.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 662594aeff)
2009-11-03 13:25:35 +10:00
Tormod Volden
9ed5acec41 xfree86: Fix description of DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE
The message ending up in the log is misleading as to what the quirk
actually does: It ignores the sizes in the detailed timings and
replaces them with the display "Max Image Size".

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 757c11630d)
2009-11-03 13:20:16 +10:00
Hans Nieser
9db4c77956 Xinput: allow non-integer values again for Constant- and AdaptiveDeceleration
This was initially fixed by commit 3932a84857
but then (presumably not intentionally) undone by commit
1d54479cb3 .

Signed-off-by: Hans Nieser <hnsr@xs4all.nl>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 55f4c80a4c)
2009-11-03 13:19:55 +10:00
Jon TURNEY
6e2f5912b6 dmx: Correctly compute DMXGetScreenAttributes reply length
Correctly allow for excess length of DMXGetScreenAttributes reply
over standard 32 byte reply in addition to the displayName string
when computing the length of reply

http://bugs.freedesktop.org/show_bug.cgi?id=24685

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by:  Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 50a5c32430)
2009-11-03 13:19:47 +10:00
Peter Hutterer
48329b2c5c xserver 1.7.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-23 13:24:50 +10:00
Keith Packard
da6c66dbc5 DRI2: Report the correct extension minor version
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 9a2f6135bf)
2009-10-23 13:24:50 +10:00
Marcin Baczyński
fb5db61be2 Kill compilation warnings.
Signed-off-by: Marcin Baczyński <marbacz@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit d886008c96)
2009-10-23 13:24:50 +10:00
Adam Jackson
5085340be6 dix: Fix up colormap fixup.
FindClientResourcesByType() will walk all colormaps on all screens; we
only want to fix up the current screen.  Otherwise, screens > 0 will
have the visual pointers for their colormaps pointing off into space.

Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 15b30fde17)
2009-10-23 13:24:49 +10:00
Jon TURNEY
23ca41f4c3 Resolve an inconsistency between libX11 and Xserver over GetModifierMapping
libX11 ModMap.c believes that GetModifierMapping can never return an error

Xserver devices.c believes that GetModifierMapping can return an error if
the ModMap couldn't be generated

According to the protocol document I have, libX11 is right, so adjust the
server to send back an empty modmap if one couldn't be made...

http://bugs.freedesktop.org/show_bug.cgi?id=24621

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 909df9beb3)
2009-10-22 13:31:52 +10:00
Peter Hutterer
4b9979ae19 Merge branch 'server-1.7-branch' of git://anongit.freedesktop.org/~ewalsh/xserver into server-1.7-nominations 2009-10-22 13:31:21 +10:00
Eamon Walsh
4549953327 Don't print a failure message when XACE denies an input event delivery.
A denial is normal and the behavior should be to drop the event.
Having the log message creates excessive log spam.

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
(cherry picked from commit d4fe55c98c28055191faeba92f43f30fb47cc43a)
2009-10-21 22:01:59 -04:00
Eamon Walsh
4cf085ce92 xselinux: Note something in the log if disabled by boolean.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-10-21 20:55:55 -04:00
Eamon Walsh
53c1430377 xselinux: Use the now-exported IsPointerDevice() instead of a copy.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-10-21 20:54:28 -04:00
Eamon Walsh
951a16c51e dix: Export IsPointerDevice() and IsKeyboardDevice().
Makes the functions available to extmod for extensions to call.

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
(cherry picked from commit 0ae1632be0)
2009-10-21 20:52:38 -04:00
Eamon Walsh
f874af7a85 xselinux: Allow SetWindowCreateContext to be used for pixmaps as well.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-10-21 19:32:05 -04:00
Eamon Walsh
5560f270c8 xselinux: switch from x_device to separate x_pointer and x_keyboard classes.
This will allow separate controls over pointer and keyboard without having
to relabel the devices to separate types.

[Backport to 1.7]

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
(cherry picked from commit 6c2ae5fec5)
2009-10-21 19:32:05 -04:00
Eamon Walsh
4814532133 xace: Relax permissions on XkbGetState from Read to Getattr.
This request is used to get the current keyboard group and is called from
GTK.  It does not return an actual keymap (aside from modifiers) so it
should be safe to relax the permission on it.  However it does return
button state information which should be controlled through a separate
pointer Read check.

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
(cherry picked from commit c4ffce4dc8)
2009-10-21 19:32:05 -04:00
Eamon Walsh
c1a861eedf xselinux: Stop special-casing QueryPointer access checks.
XACE has been changed to not return BadAccess on device read failures.
Thus, no need for this workaround code.

[Backport to 1.7]

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
(cherry-picked from commit 0ff2831990)
2009-10-21 19:32:05 -04:00
Eamon Walsh
7d3f8ce505 xace: Fake return values on denials in input polling requests.
Instead of returning BadAccess when "read" permission is denied
on a device, falsify the device state (buttons down, keys pressed).
This is nicer to applications, but may still have undesired side
effects.  The long-term solution is not to use these requests in
event-driven code!

Requests affected: QueryPointer, QueryKeymap, XiQueryDevice.

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
(cherry picked from commit 8502c06e19)
2009-10-21 19:32:05 -04:00
Lee Leahu
d6d3620faf dmxDestroyWindow() - must call the X's native DetroyWindow()
Don't really know why this section was disabled, but without it,
certain pPicture resources do not get free'd until later in the
FreeClientResources() process after the screen has been free'd -
resulting in seg fault.

With this patch, all resources normally free'd using vanilla X are
now also being freed correctly by Xdmx.

https://bugs.freedesktop.org/show_bug.cgi?id=24576

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit f713f447a2)
2009-10-22 07:53:52 +10:00
Lee Leahu
d1da013b32 dmx: when setting up device axis, use the correct counter number
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 664a8e37fd)
2009-10-22 07:53:50 +10:00
Peter Hutterer
c16f3ae484 kdrive: silence tslib compiler warnings
tslib.c: In function 'TslibInit':
tslib.c:157: warning: unused variable 'tsDev'
tslib.c:156: warning: unused variable 'inputent'
tslib.c:155: warning: unused variable 'inputdir'
tslib.c:154: warning: unused variable 'i'
tslib.c:154: warning: unused variable 'fd'

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit e08d8a2b04)
2009-10-22 07:53:39 +10:00
Keith Packard
e644e322c7 Fix 'distcheck' to use host xkb files but install to build dir
'make distcheck' needs to read xkb files and write out compiled
versions as a part of the 'make check' phase. This patch passes
suitable options to the configure stage of the distcheck process to
read xkb files from the system location and write them to the
distcheck _inst directory.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 08e7f62faf)
2009-10-22 07:53:35 +10:00
Colin Harrison
55d3a77eb9 Xming: Remove unused X-boxed icon resource
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
(cherry picked from commit 78c87bdad1)

Squashed-into this commit:

Fix make dist after 78c87bdad1

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 63f4bf3917)
2009-10-20 08:53:37 +10:00
Jeremy Huddleston
75e52c777c XQuartz: Fix a possible minor memory leak
(cherry picked from commit 24e640e1fa)
2009-10-19 12:55:32 -07:00
Jeremy Huddleston
31c6fc7673 XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d8)
(cherry picked from commit f3223c71cf)
2009-10-19 12:54:45 -07:00
Peter Hutterer
37b5f41cce xserver 1.7.0.902
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-19 11:55:03 +10:00
Peter Hutterer
37f857eb4c Revert "Xming: Remove unused X-boxed icon resource"
Breaks make dist.
make[2]: *** No rule to make target `X-boxed.ico', needed by `distdir'.  Stop.

This reverts commit 2969eaa88c.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-19 11:51:54 +10:00
Alan Coopersmith
650ac84a0c Fix segfault when -extension XKEYBOARD is passed on the command line
Users should be told they can't disable XKB or XInput via error messages,
not core dumps.

Reported by T`2 on #xorg irc

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 2bd71a6db2)
2009-10-19 11:20:16 +10:00