Commit Graph

6868 Commits

Author SHA1 Message Date
Jeremy Huddleston
de78ac4378 XQuartz: Try harder to get the user's login environment
(cherry picked from commit 6bedaddd78)
(cherry picked from commit 338f096861)
2009-01-09 11:02:24 -08:00
Jeremy Huddleston
c391114df9 XQuartz: Reposition windows when we enter fullscreen to ensure our root window
(cherry picked from commit 7617d3659b)
(cherry picked from commit 61ae56f973)
2009-01-09 11:02:19 -08:00
Jeremy Huddleston
beafebef82 XQuartz: Re-enable rlAccel
It was incorrectly blamed for some crashes a few months ago, and it should be
safe to use until we get an EXA driver to replace it.
(cherry picked from commit 8121f30bd2)
(cherry picked from commit 85347902d9)
2009-01-09 11:02:14 -08:00
Jeremy Huddleston
86ba5eff62 XQuartz: Don't use keycode 0 to determine !swallow since our most common key to swallow is actual keycode 0 (a)
(cherry picked from commit 33f43a7f03)
(cherry picked from commit 84f0c03418)
2009-01-09 11:00:27 -08:00
Jeremy Huddleston
2a42a059ce XQuartz: Update our "screens" when we toggle rootless rather than when we toggle fullscreen
This old behavior was used as a workaround for the menubar behavior in the older server,
but we handle it better now and need to update our screens when we toggle the rootless
state instead.
(cherry picked from commit 508aa95bc2)
(cherry picked from commit 7e7758e178)
2009-01-09 11:00:21 -08:00
Jeremy Huddleston
51319550c9 XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
(cherry picked from commit 67455e716e)
(cherry picked from commit 7dc0dafef1)
2009-01-09 11:00:16 -08:00
Jeremy Huddleston
b0503b69f9 XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
(cherry picked from commit 22f664ab95)
(cherry picked from commit 4c256c0e9c)
2009-01-09 11:00:11 -08:00
Jeremy Huddleston
6c635faa6f XQuartz: update quoting in case X11.app is moved to a directory with a space.
(cherry picked from commit cc805dc799)
(cherry picked from commit ecc3a7b609)
2009-01-09 11:00:05 -08:00
Jeremy Huddleston
14d9ccf0ce XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
(cherry picked from commit b62ed1f8ea)
(cherry picked from commit c3812aec97)
2009-01-09 10:59:56 -08:00
Jeremy Huddleston
87df8e6819 XQuartz: Get rid of white rectangle bug
(cherry picked from commit 3269959033)
(cherry picked from commit fd6fb6a277)
2009-01-09 10:59:32 -08:00
Jeremy Huddleston
5ff6b1e7ed XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fc)
(cherry picked from commit 102abeda37)
2009-01-09 10:59:25 -08:00
Maarten Maathuis
ffdf013905 randr/xfree86: Fix a one off error in the panning calculations.
- Example: mode 1280x1024, panned area 1281x1024
           panned_area.x2 = 1281
           mode.width = 1280
  If you substract 1280 from 1281, then that leaves you with one.
  Which is the one pixel that you need to move to actually see the last pixel collumn.
  Substracting 1 from this will consistently prevent you from seeing the right and bottom edge.
(cherry picked from commit aedd2f566d)
2009-01-09 10:59:05 -08:00
Jeremy Huddleston
2a822c2311 mi: Reuse memory in mieqProcessInputEvents rather than making excessive calls to calloc()
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit a939368ab8)
2009-01-09 10:30:58 -08:00
Peter Hutterer
a067bd907e mi: Clean up CopyGetMasterEvent, re-use the memory.
Alloc an EventList once and then re-use instead of allocing a new event each
time we need a master event.
There's a trick included: because all the event processing handlers only take
an xEvent, init a size 1 EventList and squash the events into this one.

Events that have count > 1 must be squished into an xEvent array anyway before
passing into the event handlers, so we don't lose anything here.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit d281866b74)
2009-01-09 10:30:27 -08:00
Peter Hutterer
3519f83f50 dix: move MAX_VALUATOR_EVENTS into include/input.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0b4fef6337)
2009-01-09 10:30:26 -08:00
Francis Giraldeau
3ec3b502e3 Don't log audit messages when -audit 0 specified
make the auditTrailLevel check more general and don't log when not
using DTRACE and -audit 0 is set.
(cherry picked from commit d61e902aab)
2009-01-09 09:59:54 -08:00
Colin Guthrie
053f32d928 Fix compilation with -Werror=format-security
(cherry picked from commit 6d8ea5104c)
2009-01-09 09:59:01 -08:00
Adam Jackson
8ed4ca2801 XAA: Disable offscreen pixmaps by default.
Say Option "XaaOffscreenPixmaps" to turn them back on.

Apropos of bugs #13795 and #15098.  But this still isn't correct.
(cherry picked from commit 0c6987df3b)
2009-01-09 09:57:46 -08:00
Robert Noland
32e81074b9 Support -sharevts on FreeBSD
Bugzilla #11179

Submitted-by: Nathan Whitehorn

Signed-off-by: Robert Noland <rnoland@2hip.net>
(cherry picked from commit 7aa29b9d66)
2008-12-16 12:05:53 -08:00
Ian Romanick
4c68079c2a GLX: Changes resulting from changes to Mesa generator scripts / data
Several recent Mesa commits (listed below) make modifications to the
protocol generator data and scripts.  This commit represents the
changes to the generated files resulting from the previous changes.

    - 0f73302d24f4201813da2939742c5bcb6964b3b1
      GLX: Fix protocol for glTexSubImage#D

    - 1709ab01ef24279c782e420568e9257b4b92b224
      Return 0 as the request size when the pixels parameter is NULL

    - 63cca2ba10ce7dcc8481cfa4be3872dfc269dded
      GLX: Include glapi.h before glapitable.h

This is the server-side part of the fix for bugzilla #11003.
(cherry picked from commit f1c9b5ab23)
2008-12-16 12:03:06 -08:00
Cooper Yuan
75bad86992 Fix typo in xf86PickCrtcs()
(cherry picked from commit 2a61397d17)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
f427d3aaa7 XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce)
(cherry picked from commit 73987010b2)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
d0eb4337e3 XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
(cherry picked from commit 748d9e5bd7)
(cherry picked from commit fd31984e0c)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
d9e1fdcd40 XQuartz: Fix path to executable
(cherry picked from commit 7e9d3698e0)
(cherry picked from commit 5926b213b3)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
e93daf4e71 XQuartz: fixed make dist
(cherry picked from commit 2d52367ab9)
(cherry picked from commit 13eff12902)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
1cf76f23c7 XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start the app, so it will inherit the right environment
(cherry picked from commit f4b7ad9cc6)
(cherry picked from commit fdf6425612)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
22d3ecda18 XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
(cherry picked from commit b959727f38)
(cherry picked from commit 9cbed0a325)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
9eb5f30929 XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e9658)
(cherry picked from commit 99b2cbf061)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
19e6f73710 XQuartz: Removed some debug spew
(cherry picked from commit 370dcf11b3)
(cherry picked from commit 8065953ea8)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
ced368287b XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
(cherry picked from commit a41e7f75de)
(cherry picked from commit 70930f6d31)
2008-12-16 12:03:04 -08:00
Jeremy Huddleston
b5687a9d12 XQuartz: Corrected name/command labels in the customization widget
(cherry picked from commit a689c23f17)
(cherry picked from commit 9ac2e68d86)
2008-12-16 12:03:04 -08:00
Jeremy Huddleston
53d93d0d29 Removed unised option from configure.ac for launchd
(cherry picked from commit 87e4de0a9a)
(cherry picked from commit 451050b1e2)
2008-12-16 12:03:04 -08:00
Jeremy Huddleston
df3f23fe8d XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dc)
(cherry picked from commit cbb9ee57f8)
2008-12-16 12:03:04 -08:00
Peter Hutterer
6e8626f2eb Xi: silence compiler warning
Don't mix declarations and statements.
(cherry picked from commit fb2a8d0e59)
2008-12-16 12:03:04 -08:00
Peter Hutterer
e56059dfa5 xfree86: fix compiler warning (use of uninitialized variable)
drv and idev are only set for SDs, but are only dereferenced for SDs too, so
initializing them to NULL is safe.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 8e32791349)
2008-12-16 12:03:04 -08:00
Peter Hutterer
0d12c44d83 xfree86: don't render SW cursors for devices attached to VCP (#16805)
When leaving 3D games such as quake3 or sauerbraten, a cursor may stay on the
screen. This is caused by one run of SW rendering for the SD, even though the
SD was attached to the VCP and thus has HW rendering capabilities.

Check for the SD's attachment (like in all other functions) before deciding on
SW or HW rendering.

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

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit bb072019fa)
2008-12-16 12:03:04 -08:00
Peter Hutterer
63b3bf85ed xkb: Allow NULL as rulesFile in XkbSetRulesDflts.
If no rules file is given, simply re-use the previous one. If no RF is given
the first time this function is called, use the built-in default.
This includes fixing the built-in default to something that actually exists.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 463e02e7de)
2008-12-16 12:03:04 -08:00
Peter Hutterer
9a44cc619f Xi: don't update VCP's valuators from DeviceValuator events #18882
The VCP doesn't need to update the valuators anyway since it cannot send XI
events. Just skip that bit.

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

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-16 12:03:04 -08:00
Stuart Bennett
c7fffe9e13 dolt: allow older versions of bash to compile the xserver (#19031)
Signed-off-by: James Cloos <cloos@jhcloos.com>
(cherry picked from commit 7be6520d94)
2008-12-16 12:03:03 -08:00
Adam Jackson
ca56d764d2 xsync: Fix wakeup storm in idletime counter.
Wakeup scheduling only considered the threshold values, and not whether
the trigger was edge or level.

See also:
https://bugzilla.redhat.com/show_bug.cgi?id=474586
http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup
(cherry picked from commit 1f4fb0225b)
2008-12-16 09:55:27 -05:00
Adam Jackson
a82f10c5dd randr: clear primaryOutput when the output is deleted
(cherry picked from commit 86c64ddf21)
2008-12-16 09:55:24 -05:00
Adam Jackson
2bc53ce668 randr: use primary output for RRFirstOutput()
(cherry picked from commit fe65f400ed)
2008-12-16 09:55:20 -05:00
Adam Jackson
f0234a9eb8 randr: Mangle GetScreenResources sort order based on primary output
(cherry picked from commit cdcb516e56)
2008-12-16 09:55:17 -05:00
Adam Jackson
2ef02833d6 randr: Mangle compat Xinerama reply based on primary output
(cherry picked from commit d7b316e82b)
2008-12-16 09:55:14 -05:00
Adam Jackson
0bdfdaa7df randr: Add [GS]etOutputPrimary
(cherry picked from commit 9d58d2a319)
2008-12-16 09:55:09 -05:00
Keith Packard
09039fb89f Patch brown-bag fix for bug 19017 (scrn->virtualX/virtualY 0 before PreInit)
When a driver uses a crtc during device detection, the scrn has not yet been
configured and virtualX/virtualY are still zero. This caused the X server
to try and allocate a shadow frame buffer, which couldn't work.

Detect this by checking for zero virtualX/virtualY values.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 063eb6743c)
2008-12-15 20:12:33 -08:00
Keith Packard
ae2cbbff9f Use scrn->virtualX/virtualY in xf86CrtcFitsScreen. Fix bug 19017.
pScreen->width/height are not initialized when doing initial mode setting,
which makes this function incorrectly fail. Using scrn->virtualX should work
in all cases though.

Bug 19017 reports a crash in xf86CrtcSetModeTransform when doing a modeset
for output probing, long before the screen array is initialized; that was
caused by a work-around to set pScreen->width/height so that xf86CrtcFitsScreen
could find the right values.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit fde2f96103)
2008-12-15 11:47:57 -08:00
Keith Packard
6d671b2dee When disabling SIGIO tracking, use SIG_IGN instead of SIG_DFL.
This avoids a race condition for drivers which mis-order the fd close and
signal disable.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 29a5b0596b)
2008-12-15 11:47:12 -08:00
Keith Packard
8f17a31aa7 Clean up rotation data when crtc is turned off
The shadow frame buffer and other data used for rotation need to be freed
when the crtc is disabled, not just when rotation is disabled.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 1ba4cbb159)
2008-12-15 11:46:47 -08:00
Keith Packard
523aae1fa6 Bump version to 1.5.99.3 (1.6 beta3)
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 22:10:56 -08:00