gstreamer-omap:xserver.git
6 years agoRemove unused ClientStateAuthenticating
Alan Coopersmith [Wed, 1 Jun 2011 02:54:33 +0000 (19:54 -0700)]
Remove unused ClientStateAuthenticating

Appears to be leftover from the Kerberos code deleted in 2007
(commit dfbe32b5b828cc4e3da36a0e2e6ad641164eaa5e).
Nothing left ever set clientState to ClientStateAuthenticating

Skipped over 1 to preserve existing enum numbering.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
6 years agoRemove unused ClientStateCheckingSecurity & ClientStateCheckedSecurity
Alan Coopersmith [Wed, 1 Jun 2011 02:42:48 +0000 (19:42 -0700)]
Remove unused ClientStateCheckingSecurity & ClientStateCheckedSecurity

Appear to be leftovers from the XC-QUERY-SECURITY code deleted in 2007
(commit 375864cb74cced40ae688078b1f7750998972535).
Nothing left ever set clientState to ClientStateCheckingSecurity.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
6 years agosun_init.c: Implement novtswitch & sharevts for Solaris
Alan Coopersmith [Fri, 20 May 2011 06:26:31 +0000 (23:26 -0700)]
sun_init.c: Implement novtswitch & sharevts for Solaris

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: John Martin <john.m.martin@oracle.com>
6 years agosun_init.c: Move vt switches to a switch_to helper function like lnx_init.c
Alan Coopersmith [Fri, 20 May 2011 06:22:27 +0000 (23:22 -0700)]
sun_init.c: Move vt switches to a switch_to helper function like lnx_init.c

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
6 years agoXorg.man: Add -novtswitch and -sharevts options
Alan Coopersmith [Fri, 20 May 2011 05:43:56 +0000 (22:43 -0700)]
Xorg.man: Add -novtswitch and -sharevts options

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
6 years agoxfree86: move -novtswitch & -sharevts argument handling up to common layer
Alan Coopersmith [Fri, 20 May 2011 05:39:09 +0000 (22:39 -0700)]
xfree86: move -novtswitch & -sharevts argument handling up to common layer

Stop duplicating in each os-support variant before it gets replicated
even further.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
6 years agoVersion bumped to 1.11
Keith Packard [Fri, 26 Aug 2011 23:46:13 +0000 (16:46 -0700)]
Version bumped to 1.11

Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agofb: Fix memcpy abuse
Adam Jackson [Thu, 21 Apr 2011 20:37:11 +0000 (16:37 -0400)]
fb: Fix memcpy abuse

The memcpy fast path implicitly assumes that the copy walks
left-to-right.  That's not something memcpy guarantees, and newer glibc
on some processors will indeed break that assumption.  Since we walk a
line at a time, check the source and destination against the width of
the blit to determine whether we can be sloppy enough to allow memcpy.
(Having done this, we can remove the check for !reverse as well.)

On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in
NoAccel, the broken code and various fixes for -copywinwin{10,100,500}
gives (edited to fit in 80 columns):

1: Disable the fastpath entirely
2: Replace memcpy with memmove
3: This fix
4: The code before this fix

  1            2                 3                 4           Operation
------   ---------------   ---------------   ---------------   ------------
258000   269000 (  1.04)   544000 (  2.11)   552000 (  2.14)   Copy 10x10
 21300    23000 (  1.08)    43700 (  2.05)    47100 (  2.21)   Copy 100x100
   960      962 (  1.00)     1990 (  2.09)     1990 (  2.07)   Copy 500x500

So it's a modest performance hit, but correctness demands it, and it's
probably worth keeping the 2x speedup from having the fast path in the
first place.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoXQuartz: Initialize darwin pointer valuators
Pelle Johansson [Mon, 15 Aug 2011 00:44:40 +0000 (17:44 -0700)]
XQuartz: Initialize darwin pointer valuators

This fixes a regression introduced by: 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde

http://xquartz.macosforge.org/trac/ticket/498

Signed-off-by: Pelle Johansson <pelle@morth.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoEXA/mixed: Update sys_pitch in MPH even when there's no system memory copy.
Michel Dänzer [Wed, 10 Aug 2011 09:36:16 +0000 (11:36 +0200)]
EXA/mixed: Update sys_pitch in MPH even when there's no system memory copy.

Otherwise sys_pitch will be stale when a system memory copy is allocated.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38322 and a crash when
unlocking the screen with xscreensaver, reported by Janne Huttunen.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Janne Huttunen <jahuttun@gmail.com>
Tested-by: Jan Kriho <Erbureth@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoXephyr/dri: register screen and window privates on init
Julien Cristau [Thu, 7 Jul 2011 17:18:03 +0000 (19:18 +0200)]
Xephyr/dri: register screen and window privates on init

Fixes assertion failure when calling dixSetPrivate
Debian bug#632549 <http://bugs.debian.org/632549>

Reported-and-tested-by: Mohammed Sameer <msameer@foolab.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoVersion bumped to 1.10.99.902 (1.11 RC2)
Keith Packard [Thu, 4 Aug 2011 03:57:03 +0000 (20:57 -0700)]
Version bumped to 1.10.99.902 (1.11 RC2)

At the close of the 1.11 non-critical fixes window.

Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agocomposite: Inhibit window background paint with manual subwindow redirection
Ville Syrjälä [Fri, 6 May 2011 15:19:34 +0000 (18:19 +0300)]
composite: Inhibit window background paint with manual subwindow redirection

The composite extension spec says that window background painting
should be inhibited when the subwindow redirection mode is set to
manual.

This eliminates the ugly flashing effect when compiz unredirects a
fullscreen window.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Owen Taylor <otaylor@fishsoup.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoRevert "composite: Don't backfill non-MapWindow allocations"
Pierre-Loup A. Griffais [Thu, 28 Jul 2011 22:17:59 +0000 (15:17 -0700)]
Revert "composite: Don't backfill non-MapWindow allocations"

This reverts commit db8840600e8e21356241eb87395031388d9b54d2.

It was an optimization for the resize case, but 193ecc8b453b22 made
it so that no backfilling takes place on resize if left in.

Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Conflicts:

composite/compalloc.c
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoXquartz: include new localization files in the tarball
Julien Cristau [Sun, 31 Jul 2011 19:14:59 +0000 (21:14 +0200)]
Xquartz: include new localization files in the tarball

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: xpr: Don't FatalError if xp_unlock_window fails
Jeremy Huddleston [Thu, 21 Jul 2011 17:33:58 +0000 (10:33 -0700)]
XQuartz: xpr: Don't FatalError if xp_unlock_window fails

We added the FatalError in 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8 but
it caused a regression http://xquartz.macosforge.org/trac/ticket/482

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Use CFSTR to avoid implicit cast warning of NSString * to CFStringRef
Jeremy Huddleston [Wed, 20 Jul 2011 07:16:42 +0000 (00:16 -0700)]
XQuartz: Use CFSTR to avoid implicit cast warning of NSString * to CFStringRef

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agorandr: Compare all the bytes in RRPostPendingProperties
Aaron Plattner [Fri, 29 Jul 2011 23:12:06 +0000 (16:12 -0700)]
randr: Compare all the bytes in RRPostPendingProperties

RRPostPendingProperties tries to compare the pending and current
property values to decide whether they're actually changing.  However,
it does this using a memcmp that passes in pending_value->size as the
number of bytes.  This is actually the number of elements, where each
element is (pending_value->format / 8) bytes long.  This causes the
pending value to not be propagated if the first pending_value->size
bytes are the same and only the end of it is changing.

Fix this by computing the total number of bytes to compare in the
memcmp.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoMerge remote-tracking branch 'whot/for-keith'
Keith Packard [Fri, 29 Jul 2011 21:58:58 +0000 (14:58 -0700)]
Merge remote-tracking branch 'whot/for-keith'

6 years agoTerminate the log with one last message.
Peter Hutterer [Wed, 20 Jul 2011 03:09:05 +0000 (13:09 +1000)]
Terminate the log with one last message.

Instead of just closing the log when everything is done, put one more
message in stating that we're actually terminating. Users or scripts that
look at the Xorg.log will then know that a) the server has terminated
properly and b) why the server terminated (to some degree, given that most
real-world errors will be caused by AbortServer()).

Acked-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoconfigure: set default xkb rules to evdev on Linux
Julien Cristau [Tue, 26 Jul 2011 18:40:38 +0000 (20:40 +0200)]
configure: set default xkb rules to evdev on Linux

If config/udev was enabled, this would default to base, which means that
after regen the devices would get the wrong rules, and hilarity would
ensue.

It's probably safe to default to evdev unconditionally on Linux by now.

Reported-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoInitialize the fd to -1 for xorg.conf input devices.
Peter Hutterer [Tue, 19 Jul 2011 23:00:18 +0000 (09:00 +1000)]
Initialize the fd to -1 for xorg.conf input devices.

For hotplugged devices, xf86AllocateInput does that for us but the xorg.conf
path is different. Since not all drivers reset the fd during PreInit but may
still call close(pInfo->fd) in all cases, this can terminate the logging
early.

Reproducible: add a wacom driver InputDevice section with no Option Device.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
6 years agoxfree86: NULL option values are technically valid, don't strdup them
Peter Hutterer [Mon, 4 Jul 2011 02:34:32 +0000 (12:34 +1000)]
xfree86: NULL option values are technically valid, don't strdup them

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
6 years agoxfree86: duplicate xorg.conf device information before xf86NewInputDevice
Peter Hutterer [Mon, 4 Jul 2011 04:14:39 +0000 (14:14 +1000)]
xfree86: duplicate xorg.conf device information before xf86NewInputDevice

xf86ConfigLayout.inputs contains the information from the xorg.conf
file. Passing this into xf86NewInputDevice means the device will get
cleaned up on exit and the pointers in xf86ConfigLayout.inputs are left
dangling. In the second server generation, this results in a server
crash.

Also, rename pDev to pInfo. pDev is pretty much reserved for DeviceIntPtr
types.

Reproducible: AutoAddDevices off and xorg.conf input sections, trigger
server regeneration.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
6 years agoxfree86: Remove devices that failed to enable on startup
Peter Hutterer [Mon, 27 Jun 2011 06:30:28 +0000 (16:30 +1000)]
xfree86: Remove devices that failed to enable on startup

Devices that succeeded during PreInit and DEVICE_INIT but failed in
DEVICE_ON would be deleted through xf86DeleteInput but not removed from the
list of input devices (and not turned off). The result was a double free on
server shutdown.

Fix this by calling RemoveDevice if EnableDevice fails.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
6 years agoconfig: don't fail if a device vanished by the time we managed to look at it
Lennart Poettering [Mon, 18 Jul 2011 19:18:27 +0000 (21:18 +0200)]
config: don't fail if a device vanished by the time we managed to look at it

The nature of hotplug is that a device we enumerated might already be
gone by the time we look at it, so don't assume otherwise.

Signed-off-by: Lennart Poettering <lennart@poettering.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoconfig: limit the kernel subsystems we look for devices in
Lennart Poettering [Mon, 18 Jul 2011 19:17:49 +0000 (21:17 +0200)]
config: limit the kernel subsystems we look for devices in

Don't enumerate/monitor all devices of the system (since that can be
quite a few), but limit our search to devices from the "input"
subsystem, as well as the "tty" subsystem (to cover Wacom tablets).

This should make X start up a bit faster and reduce the number of
unnecessary wake-ups of the X server.

Signed-off-by: Lennart Poettering <lennart@poettering.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoconfig: process udev "changed" and "add" events in the same code paths
Lennart Poettering [Mon, 18 Jul 2011 19:17:10 +0000 (21:17 +0200)]
config: process udev "changed" and "add" events in the same code paths

udev gives no guarantee that before each "changed" event for a device
there's an "add" event, or that before each "remove" is an "add", or
that before each "add" there was no "add" already and so on. Users can
trigger these events at any time with "udevadm trigger", and netlink is
a lossy transport, hence the events can come in unexpected ordering.

With other words: regardless which event is generated, the X server must
not choke on it and make the best of it, hence make sure that if we get
an "add" event for an existing device we don't add the device a second
time.

Signed-off-by: Lennart Poettering <lennart@poettering.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoRemove hw/xwin/xlaunch
Jon TURNEY [Sat, 9 Jul 2011 12:21:04 +0000 (13:21 +0100)]
Remove hw/xwin/xlaunch

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
6 years agoXQuartz: Localization updates
Jeremy Huddleston [Wed, 20 Jul 2011 03:03:48 +0000 (20:03 -0700)]
XQuartz: Localization updates

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Add english NIB changes for scroll_in_device_direction
Jeremy Huddleston [Wed, 20 Jul 2011 03:02:33 +0000 (20:02 -0700)]
XQuartz: Add english NIB changes for scroll_in_device_direction

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Add GUI controls to toggle scroll_in_device_direction
Jeremy Huddleston [Wed, 20 Jul 2011 03:01:11 +0000 (20:01 -0700)]
XQuartz: Add GUI controls to toggle scroll_in_device_direction

Also cleaned up the wording for fullscreen_menu.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Add a scroll_in_device_direction preference
Jeremy Huddleston [Wed, 20 Jul 2011 03:00:27 +0000 (20:00 -0700)]
XQuartz: Add a scroll_in_device_direction preference

This preference allows users to override the related option in Mac OS X's
Mouse/Trackpad preferences.  This effectively lets the user determine
which "context" all of X11 fits into for context-based scrolling until
such API exists within X11 itself to pass along to X11 clients.

This is applicable to Mav OS X 10.7+

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Add diagnostic error checking to xp_destroy_surface.
George Staplin [Wed, 4 Mar 2009 09:03:52 +0000 (02:03 -0700)]
XQuartz: Add diagnostic error checking to xp_destroy_surface.

This occurred to me in hindsight after the last commit.  If the
original developer had done this, we would have noticed the
problem sooner.
(cherry picked from commit aa0a57996f3e7d16238f69976958c2526821388b)

6 years agoXQuartz: Fix a memory leak with surfaces that a new test found.
George Staplin [Wed, 4 Mar 2009 08:39:58 +0000 (01:39 -0700)]
XQuartz: Fix a memory leak with surfaces that a new test found.

xp_destroy_surface was called with a surface id of 0, due to some
premature cleanup that set it to 0.  This means the surfaces
weren't being destroyed until the window was.

The code that did that was: pDRIDrawablePriv->sid = 0;

In long running applications this leak may or may not have been
harmful.  With the old libGL the surfaces weren't destroyed until
the context was destroyed or a new context created.  In the new
libGL they are reference counted, and released much sooner, so we
ran into a resource leak more noticeably with some tests.

Make the Apple DRI code dispatch events to the client(s) for
destroyed surfaces, when a resource is destroyed.  This seems to
work in my tests, however this clearly wasn't working for a while,
so bugs may result in the future if it enables some new (unexpected)
side effects.

Also add a few helpful comments to aid in understanding the code
in the future.

Tested with the test suite, Pymol, and various Mesa demos.
(cherry picked from commit bede83eb19a1629396fcd5a46441f8476a8fcd1b)

6 years agoXQuartz: DRI: Dead code removal
Jeremy Huddleston [Wed, 20 Jul 2011 02:42:44 +0000 (19:42 -0700)]
XQuartz: DRI: Dead code removal

Also add some comments that weren't merged in from server-1.4-apple's
99babae1326485c27eb9253db83afdd6aef9e362

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Add some sanity checking and a fallback for the bundle id.
Jeremy Huddleston [Tue, 19 Jul 2011 05:54:21 +0000 (22:54 -0700)]
XQuartz: Add some sanity checking and a fallback for the bundle id.

This way we'll print an error and still mostly work rather than crashing if
someone installs XQuartz.app incorrectly or tries running the server within
the build system rather than the installed system.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: DarwinEQFini doesn't return Bool
Jeremy Huddleston [Fri, 15 Jul 2011 17:39:39 +0000 (10:39 -0700)]
XQuartz: DarwinEQFini doesn't return Bool

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXKB: Work around broken interps from old xkbcomp
Daniel Stone [Wed, 13 Jul 2011 11:08:04 +0000 (12:08 +0100)]
XKB: Work around broken interps from old xkbcomp

Bugfix for broken xkbcomp: if we encounter an XFree86Private action with
Any+AnyOfOrNone(All), then we skip the interp as broken.  Versions of
xkbcomp below 1.2.2 had a bug where they would interpret a symbol that
couldn't be found in an interpret as Any.  So, an
XF86LogWindowTree+AnyOfOrNone(All) interp that triggered the PrWins
action would make every key without an action trigger PrWins if libX11
didn't yet know about the XF86LogWindowTree keysym.  None too useful.

We only do this for XFree86 actions, as the current XKB dataset relies
on Any+AnyOfOrNone(All) -> SetMods for Ctrl in particular.

See xkbcomp commits 2a473b906943ffd807ad81960c47530ee7ae9a60 and
3caab5aa37decb7b5dc1642a0452efc3e1f5100e for more details.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoFix non-Composite builds in PrintWindowTree
Daniel Stone [Wed, 13 Jul 2011 11:08:03 +0000 (12:08 +0100)]
Fix non-Composite builds in PrintWindowTree

The previous patch accidentally introduced a hard dependency on
Composite.  Sorry, OS X.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoMerge remote-tracking branch 'jturney/master'
Keith Packard [Wed, 13 Jul 2011 18:44:15 +0000 (11:44 -0700)]
Merge remote-tracking branch 'jturney/master'

6 years agoXWinrc: replace hard coded section number with __filemansuffix__
Gaetan Nadon [Tue, 12 Jul 2011 23:50:05 +0000 (19:50 -0400)]
XWinrc: replace hard coded section number with __filemansuffix__

Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoXWinrc: replace hard coded section number with __filemansuffix__
Gaetan Nadon [Thu, 23 Jun 2011 11:45:13 +0000 (07:45 -0400)]
XWinrc: replace hard coded section number with __filemansuffix__

Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agoglx: Remove a few lingering traces of __GLXscreen.GLXVersion
Jon TURNEY [Mon, 24 Jan 2011 18:29:41 +0000 (18:29 +0000)]
glx: Remove a few lingering traces of __GLXscreen.GLXVersion

The GLXversion member of the __GLXscreen struct
is just cruft since commit ad5c0d9efa47476ed5cf75c82265c73919e468b4,
when we started returning the minimum GLX version supported by all
of the screens on the display, rather than the maximum version supported
by the server.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin: Add -wgl option to XWin manpage
Jon TURNEY [Thu, 20 Jan 2011 16:21:04 +0000 (16:21 +0000)]
hw/xwin: Add -wgl option to XWin manpage

Document the -[no]wgl options in the XWin manpage

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin: Add items to WGL AIGLX todo
Jon TURNEY [Tue, 2 Nov 2010 11:38:53 +0000 (11:38 +0000)]
hw/xwin: Add items to WGL AIGLX todo

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin: Report Window XIDs in Window debug messages
Jon TURNEY [Mon, 11 Oct 2010 15:22:49 +0000 (16:22 +0100)]
hw/xwin: Report Window XIDs in Window debug messages

Report Window XIDs in Window create/destroy/reparent debug messages

It's actually quite useful if you are trying to corrolate those events
with what a client is doing...

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin: Add a flag to track which windows have been drawn to using WGL.
Jon TURNEY [Mon, 11 Oct 2010 15:25:03 +0000 (16:25 +0100)]
hw/xwin: Add a flag to track which windows have been drawn to using WGL.

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin/glx: Fix some warnings in generated wrapper code
Colin Harrison [Thu, 24 Mar 2011 20:39:51 +0000 (20:39 +0000)]
hw/xwin/glx: Fix some warnings in generated wrapper code

Add a suitable cast to the generated code for glWinSetupDispatchTable()
so it doesn't generate screeds of warnings

Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin/glx: Handle failure to get any fbconfigs more gracefully.
Jon TURNEY [Mon, 24 Jan 2011 18:41:05 +0000 (18:41 +0000)]
hw/xwin/glx: Handle failure to get any fbconfigs more gracefully.

Handle failure to get any useful pixel formats for GLX fbconfigs
more gracefully:  If we didn't get any useful pixel formats from
wglGetPixelFormatAttribivARB(), fall back to using DescribePixelFormat().
If that doesn't give us any useful pixel formats, fallback to software
rendering.

This works around a problem with Intel 845G drivers, where
wglGetPixelFormatAttribivARB() doesn't seem to work as we expect it to...

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin/glx: Don't spam log with wglwrap symbol resolution status at startup
Jon TURNEY [Mon, 1 Nov 2010 19:53:42 +0000 (19:53 +0000)]
hw/xwin/glx: Don't spam log with wglwrap symbol resolution status at startup

... instead just log if an attempt is made to call a wrapper for
a function which didn't resolve

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin/glx: Better handling of SetPixelFormat() failure
Jon TURNEY [Sat, 30 Oct 2010 16:23:52 +0000 (17:23 +0100)]
hw/xwin/glx: Better handling of SetPixelFormat() failure

Propagate and report the failure if SetPixelFormat() fails

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin/glx: Improvements to glxWinErrorMessage() reporting in WGL GLX provider
Jon TURNEY [Sat, 30 Oct 2010 16:22:33 +0000 (17:22 +0100)]
hw/xwin/glx: Improvements to glxWinErrorMessage() reporting in WGL GLX provider

Request the message using languageID 0 (best effort), rather than only using language neutral messages
Always report the numeric error code.
Trim any trailing \r from FormatMessage() output

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agohw/xwin/glx: Fix fbconfig dumper formatting for 3 digit index numbers
Jon TURNEY [Mon, 11 Oct 2010 15:21:40 +0000 (16:21 +0100)]
hw/xwin/glx: Fix fbconfig dumper formatting for 3 digit index numbers

Some graphics hardware supports hundreds of pixel formats, so adjust
formatting in fbconfig dumper for 3 digit index numbers

Also report the PFD_SUPPORT_DIRECTDRAW, PFD_DIRECT3D_ACCELERATED and
PFD_SUPPORT_COMPOSITION flags introduced with aero

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
6 years agoMerge remote-tracking branch 'whot/for-keith'
Keith Packard [Fri, 1 Jul 2011 22:45:45 +0000 (15:45 -0700)]
Merge remote-tracking branch 'whot/for-keith'

6 years agoinput: free the EQ allocated memory on shutdown (#38634)
Peter Hutterer [Sun, 26 Jun 2011 23:10:42 +0000 (09:10 +1000)]
input: free the EQ allocated memory on shutdown (#38634)

mieqFini() already does the right thing, but it needs to be called by the
various DDXs and the XTest Extension.

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoInput: Reset SD remainder when copying co-ords from MD
Daniel Stone [Wed, 2 Mar 2011 14:52:42 +0000 (14:52 +0000)]
Input: Reset SD remainder when copying co-ords from MD

In updateSlaveDeviceCoords, pDev->last.valuators was being copied from
the master, but pDev->last.remainder wasn't.  Make sure we copy both, to
avoid minor inconsistencies.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoinput: add POINTER_NORAW to avoid generation of raw events (#30068)
Peter Hutterer [Fri, 24 Jun 2011 01:02:23 +0000 (11:02 +1000)]
input: add POINTER_NORAW to avoid generation of raw events (#30068)

RawEvents are supposed to be events coming from the driver. When warping the
pointer, this should not generate a raw event.

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoTest: Input: Only ever set up to MAX_VALUATORS valuators
Daniel Stone [Tue, 1 Mar 2011 11:11:22 +0000 (11:11 +0000)]
Test: Input: Only ever set up to MAX_VALUATORS valuators

Previously, the input tests were working up to sizeof(mask) * 8, which
could be more than the arrays; the latter only being sized as
MAX_VALUATORS.

Hypothetically, if you were switching the stored valuator values to
double instead of uint32_t, and you attempted to set the 39th member of
a MAX_VALUATORS-sized (36) array, you'd probably end up smashing
ev->key_repeat into oblivion and then tripping the check for invalid
flags because you haven't yet put XIPointerEmulated into the valid flags
for XI_Motion.  Probably.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoTest: Ensure libxservertest gets relinked when necessary
Daniel Stone [Fri, 17 Jun 2011 15:28:05 +0000 (16:28 +0100)]
Test: Ensure libxservertest gets relinked when necessary

Similar to how we link Xorg, make sure that whenever any of the
component libraries changes, we relink libxservertest and the tests.
Not much use testing anything other than the actual source in your tree.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoKDrive: Remove useless miPointerUpdateSprite call
Daniel Stone [Fri, 17 Jun 2011 12:20:19 +0000 (13:20 +0100)]
KDrive: Remove useless miPointerUpdateSprite call

miPointerUpdateSprite is already called from mieqProcessInputEvents, so
calling it by hand immediately after isn't massively helpful.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoDMX: Remove useless miPointerUpdateSprite call
Daniel Stone [Fri, 17 Jun 2011 12:19:46 +0000 (13:19 +0100)]
DMX: Remove useless miPointerUpdateSprite call

miPointerUpdateSprite is already called from mieqProcessInputEvents, so
calling it by hand immediately after isn't massively helpful.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoXWin: Remove executable bit from headers
Daniel Stone [Fri, 17 Jun 2011 14:29:44 +0000 (15:29 +0100)]
XWin: Remove executable bit from headers

Headers don't really need to be mode 0755.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoXKB: Add debug key actions for grabs & window tree
Daniel Stone [Wed, 29 Dec 2010 12:03:01 +0000 (12:03 +0000)]
XKB: Add debug key actions for grabs & window tree

Add four new private XKB actions for debugging:
    * PrGrbs: print active grabs to the log file
    * Ungrab: ungrab all currently active grabs
    * ClsGrb: kill clients with active grabs
    * PrWins: dump the current window tree to the log file

To use these, you need to modify your XKB maps, e.g. the following to
have Ctrl+Alt+(F9-F12) mapped to the above:
 - compat/xfree86:
    interpret XF86LogGrabInfo {
        action = Private(type=0x86, data="PrGrbs");
    };
    interpret XF86Ungrab {
        action = Private(type=0x86, data="Ungrab");
    }
    interpret XF86ClearGrab {
        action = Private(type=0x86, data="ClsGrb");
    }
    interpret XF86LogWindowTree {
        action = Private(type=0x86, data="PrWins");
    }

 - symbols/pc:
    key <FK09> {        type="CTRL+ALT", [ Return, XF86LogGrabInfo      ]   };
    key <FK10> {        type="CTRL+ALT", [ Return, XF86Ungrab           ]   };
    key <FK11> {        type="CTRL+ALT", [ Return, XF86ClearGrab        ]   };
    key <FK12> {        type="CTRL+ALT", [ Return, XF86LogWindowTree    ]   };

At the moment, this only works if the grabbing client continues to call
AllowEvents, as the server does no event processing at all when a device
is frozen.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoDIX: Make PrintWindowTree actually useful
Daniel Stone [Tue, 13 Oct 2009 08:56:57 +0000 (19:56 +1100)]
DIX: Make PrintWindowTree actually useful

Rewrite PrintWindowTree to make it actually tell you what you want to
know.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoFix UTF-8 encoding
Matěj Cepl [Fri, 17 Jun 2011 14:26:17 +0000 (15:26 +0100)]
Fix UTF-8 encoding

Report to find out all non-UTF-8 files created by

cat extensions |xargs -I XXXX find . -name \*.XXXX |while read FILE ; do
    if ( iconv -f utf8 -t ucs2 $FILE >/dev/null 2>/dev/null ) ; then
        /bin/true
    else
        echo $FILE
    fi
done >>report

Signed-off-by: Matěj Cepl <mcepl@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
[Daniel: git am failed for me, so I redid it.  The method listed in the
         commit message also failed, so I just used file/grep/iconv.  The
         results are the same though.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agodix: avoid calling deleted block and wakeup handlers
Scott James Remnant [Tue, 14 Jun 2011 23:36:07 +0000 (16:36 -0700)]
dix: avoid calling deleted block and wakeup handlers

BlockHandler and WakeupHandlers may be removed within a different
BlockHandler or WakeupHandler, especially since config/udev uses
these and removes devices.

Calling the deleted handlers and passing potentially freed data
can result in the X server segfaulting after device removal, or
events that result in device removal such as undocking or suspend/
resume.

Signed-off-by: Scott James Remnant <scott@netsplit.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agodri2: restore Screen->ConfigNotify on close
Marcin Slusarz [Tue, 7 Jun 2011 19:22:15 +0000 (21:22 +0200)]
dri2: restore Screen->ConfigNotify on close

ConfigNotify is set by DRI2ScreenInit, but not restored to
previous state on close. Fix it.
(I'm preparing a patch for xf86-video-nouveau which detects GPU lockup
after dri2 init and it needs to reinitialize dri2)

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoMerge remote-tracking branch 'jturney/master'
Keith Packard [Thu, 30 Jun 2011 03:14:51 +0000 (20:14 -0700)]
Merge remote-tracking branch 'jturney/master'

6 years agoMerge remote-tracking branch 'jbarnes/master'
Keith Packard [Thu, 30 Jun 2011 03:08:32 +0000 (20:08 -0700)]
Merge remote-tracking branch 'jbarnes/master'

6 years agoRemove unused check for PERL program
Gaetan Nadon [Thu, 23 Jun 2011 17:37:45 +0000 (13:37 -0400)]
Remove unused check for PERL program

Unable to find any use of the PERL Automake variable.
It was used in hw/xfree86/scanpci around 2005.
Should it ever be needed, use XORG_WITH_PERL macro.

Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoMerge remote-tracking branch 'kibi/master'
Keith Packard [Thu, 30 Jun 2011 01:54:33 +0000 (18:54 -0700)]
Merge remote-tracking branch 'kibi/master'

6 years agoCygwin/X: Left-justify website link in About box
Yaakov Selkowitz [Tue, 23 Mar 2010 09:34:22 +0000 (04:34 -0500)]
Cygwin/X: Left-justify website link in About box

Left-justify website link in About box.  This is a cosmetic fix to make
the About box display correctly when Windows is configured with a
non-default DPI value

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
6 years agoCygwin/X: Preserve client area size and position on Windows window style change
Jon TURNEY [Thu, 12 Aug 2010 14:00:01 +0000 (15:00 +0100)]
Cygwin/X: Preserve client area size and position on Windows window style change

When the style changes, adjust the window size so the client area remains the same.

Otherwise the window size may change when sizing is reflected from Windows to X, and
some windows are drawn expecting them to be exactly the requested size (e.g. the
gmplayer control window)

Use DeferWindowPos to delay the resize to preserve client area on WM_STYLECHANGING
until after the style change has actually happened in WM_STYLECHANGED

As a consquence of this, we need to be more careful to create windows with exactly
the requested placement and client area initially, so the client area matches what
the X client requested

Also synchronize the X windows idea of the placement of a window which Windows is
allowed to place

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
6 years agoglx: Move GLX extension string utility functions
Jon TURNEY [Sat, 7 Nov 2009 19:34:12 +0000 (19:34 +0000)]
glx: Move GLX extension string utility functions

Move GLX extension string utility functions from the DRI1 convenience library
into the GLX extension convenience library, so other DDX which don't have DRI
can use them.

This is probably also needed if anyone actually tries to build an Xorg DDX
with only DRI2 support...

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
6 years agoDRI2/GLX: use new swap event types
Jesse Barnes [Thu, 5 May 2011 20:11:46 +0000 (13:11 -0700)]
DRI2/GLX: use new swap event types

Use the new event types so we can pass a valid SBC value to clients.
Fix up the completion calls to use CARD32 instead of CARD64 to match
the new field size.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
6 years agoGLX/DRI2: pass drawable correctly for indirect swap events
Jesse Barnes [Tue, 3 May 2011 17:36:44 +0000 (10:36 -0700)]
GLX/DRI2: pass drawable correctly for indirect swap events

Pass the right drawable pointer as data to the swap complete function.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
6 years agoglx: Fix fbconfigs with no corresponding visual
Adam Jackson [Tue, 12 Apr 2011 19:30:25 +0000 (15:30 -0400)]
glx: Fix fbconfigs with no corresponding visual

There are, in general, more fbconfig depths than visual depths.
fbconfigs need not support Window rendering, however any that do must
have an associated visual ID (which we got right), and any that do not
must not claim GLX_WINDOW_BIT in GLX_DRAWABLE_TYPE (which we got
wrong).

Fixes piglit/glx-fbconfig-sanity, assuming you have a sufficiently
recent piglit, as that test formerly wrongly required pixmap-capable
fbconfigs to have a visual.

v2: Additional check for fbconfigs that didn't have GLX_WINDOW_BIT in
    the first place, from previous patch by Jon TURNEY; also, also clear
    ->visualID.

Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
6 years agoGuard use of backtrace() with HAVE_BACKTRACE
Jon TURNEY [Mon, 27 Jun 2011 14:06:16 +0000 (15:06 +0100)]
Guard use of backtrace() with HAVE_BACKTRACE

Guard the use of backtrace() with HAVE_BACKTRACE, since we already
have the autoconf machinery for setting that.

For the moment, assume dladdr() is available when backtrace() is

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Fix Makefile dependencies
Jeremy Huddleston [Sat, 25 Jun 2011 18:29:53 +0000 (11:29 -0700)]
XQuartz: Fix Makefile dependencies

automake generates _DEPENDENCIES from _LIBADD, but it strips out variables.
This resulted in not relinking if some components were rebuilt (like
libdix, libos, etc).

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoXQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventT...
Jeremy Huddleston [Wed, 22 Jun 2011 04:14:46 +0000 (21:14 -0700)]
XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler

In addition, this change will not call into the X11 activation unless an X11
window was active when we deactivated.  We can't rely on the event and current
key windows because the key window will be nil until activated, and the event
will only reference the window if the window was clicked (whereas it will be
nil if we activated via dock or cmd-tab).

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
6 years agoCreate sdksyms.dep in the right place at configure time
Keith Packard [Tue, 28 Jun 2011 16:33:25 +0000 (09:33 -0700)]
Create sdksyms.dep in the right place at configure time

sdksyms moved from hw/xfree86/loader to hw/xfree86, so the
configure-time create of sdksyms.dep needs to reflect that
change. Otherwise, make might be confused by a missing file and (more
importantly to me) hw/xfree86/loader/sdksyms.dep will be left around
after 'make clean' causing 'make distcheck' to fail.

6 years agoMerge remote-tracking branch 'dbn/no-libxorg'
Keith Packard [Tue, 28 Jun 2011 16:10:14 +0000 (09:10 -0700)]
Merge remote-tracking branch 'dbn/no-libxorg'

6 years agoxfree86: Only log the serial bytes if debug is on.
Peter Hutterer [Mon, 27 Jun 2011 04:45:18 +0000 (14:45 +1000)]
xfree86: Only log the serial bytes if debug is on.

Introduced in e3f296d91dfe6b827195e1d387e1a04aa73b85c3, when the ifdef DEBUG
around the whole block was removed, but only two of the three ErrorF
switched to DebugF.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoxfree86: Remove libxorg convenience library to speed up build
Dan Nicholson [Wed, 15 Jun 2011 03:03:06 +0000 (20:03 -0700)]
xfree86: Remove libxorg convenience library to speed up build

libxorg.la served to collect all the Xorg convenience libraries into one
massive archive to link into Xorg. This made things easy for symbol
resolution, but it tremendously slowed down the build since each change
caused libxorg.la to be rebuilt. This is an extremely slow process of
extracting all the objects from the sub-libraries and recombining them.

Instead, the archives are linked directly into Xorg. The order of the
libraries had to be tweaked a bit to make symbols resolve correctly with
the lower level code moving later in the link command.

As a side effect, since the dtrace objects are now being linked
directly into Xorg, we don't need the SPECIAL_DTRACE_OBJECTS hack to
add them twice.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoxfree86: Move sdksyms generation to ddx toplevel
Dan Nicholson [Wed, 15 Jun 2011 02:47:02 +0000 (19:47 -0700)]
xfree86: Move sdksyms generation to ddx toplevel

The symbols in sdksyms.c cover the entire source tree. In order to make
them resolve when libxorg.la goes away, move the objects from libloader
to Xorg. Unfortunately, this means sdksyms needs to get built again for
the test code.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoDon't use empty source files
Dan Nicholson [Wed, 15 Jun 2011 00:21:48 +0000 (17:21 -0700)]
Don't use empty source files

When an empty _SOURCES variable is declared, automake will recognize that
only linking is needed.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoMerge remote-tracking branch 'alanc/master'
Keith Packard [Wed, 22 Jun 2011 18:03:37 +0000 (11:03 -0700)]
Merge remote-tracking branch 'alanc/master'

6 years agodocbook.am: --path is also required for xsltproc
Gaetan Nadon [Wed, 8 Jun 2011 19:18:12 +0000 (15:18 -0400)]
docbook.am: --path is also required for xsltproc

The XSLT processor also needs to know about the entities defined
in xserver.ent. It removes error messages.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoUpdate .gitignore as new tests have been added
Gaetan Nadon [Wed, 8 Jun 2011 19:17:59 +0000 (15:17 -0400)]
Update .gitignore as new tests have been added

Refactor to follow the pattern one Makefile, one .gitignore
where needed.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
6 years agoAdd xkeyboard-config to See Also of man pages referencing xkb
Alan Coopersmith [Tue, 21 Jun 2011 05:17:03 +0000 (22:17 -0700)]
Add xkeyboard-config to See Also of man pages referencing xkb

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoXdmx.man: convert section references to substituted forms
Alan Coopersmith [Tue, 21 Jun 2011 05:06:00 +0000 (22:06 -0700)]
Xdmx.man: convert section references to substituted forms

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoXdmx.man: additional updates to modernize XKB information
Alan Coopersmith [Sat, 11 Jun 2011 17:56:08 +0000 (10:56 -0700)]
Xdmx.man: additional updates to modernize XKB information

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
6 years agoXdmx.man: Show actual configured XKB defaults instead of old hardcoded values
Alan Coopersmith [Sat, 11 Jun 2011 17:41:48 +0000 (10:41 -0700)]
Xdmx.man: Show actual configured XKB defaults instead of old hardcoded values

Passed through from configure.ac via manpages.am

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
6 years agoInstall xml versions of specs even if HAVE_XMLTO is false
Gaetan Nadon [Fri, 17 Jun 2011 00:12:03 +0000 (20:12 -0400)]
Install xml versions of specs even if HAVE_XMLTO is false

DocBook/XML input source is also a useful output format that can be viewed
with an XML viewer or editor and by some O/S help system.

Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoInstall target dbs alongside generated documents
Gaetan Nadon [Fri, 17 Jun 2011 00:11:52 +0000 (20:11 -0400)]
Install target dbs alongside generated documents

This matches a change in xorg-sgml-docs whereby the masterdb will look for
the target dbs into the same location as the generated documents.

The target dbs are now installed alongside the generated documents.
Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
has the potential of installing outside the package prefix and cause
distcheck to fail when user does not have write permission in this package.

Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agoEXA: fix typo
Rob Clark [Tue, 14 Jun 2011 16:45:38 +0000 (11:45 -0500)]
EXA: fix typo

The incorrect drawable deltas were applied if dst was a redirected
window.  Resulting in a bogus region passed to prepare_access_reg().

Signed-off-by: Rob Clark <rob@ti.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
6 years agodmx/examples: Fix missing key_click_percent assignment.
Cyril Brulebois [Tue, 24 May 2011 16:33:18 +0000 (18:33 +0200)]
dmx/examples: Fix missing key_click_percent assignment.

Thanks to gcc's -Wunused-but-set-variable, stop ignoring the percent
parameter, and add it to the XKeyboardControl structure before the
XChangeKeyboardControl call.

This warning goes away accordingly:
|   CC     xbell-xbell.o
| xbell.c: In function ‘main’:
| xbell.c:74:22: warning: variable ‘percent’ set but not used [-Wunused-but-set-variable]

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
6 years agohw/dmx: Stop using variables for text widgets.
Cyril Brulebois [Tue, 24 May 2011 16:33:17 +0000 (18:33 +0200)]
hw/dmx: Stop using variables for text widgets.

They are unused in the sense they're not getting any callback set up, so
there's no point in storing them into variables. Keep the initial
alignment of the parameters to try and reduce the diff noise.

Those warnings go away accordingly:
|   CC     xdmxconfig-xdmxconfig.o
| xdmxconfig.c: In function ‘main’:
| xdmxconfig.c:881:29: warning: variable ‘quittext’ set but not used [-Wunused-but-set-variable]
| xdmxconfig.c:880:53: warning: variable ‘abouttext’ set but not used [-Wunused-but-set-variable]

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
6 years agoxfixes: Remove unused variable.
Cyril Brulebois [Tue, 24 May 2011 16:33:17 +0000 (18:33 +0200)]
xfixes: Remove unused variable.

The last use of pScreen in ProcXFixesSetPictureClipRegion was removed in
aa7096ca6f108e399d9916639cf20c57f9776305 so remove it entirely.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>