Commit Graph

4717 Commits

Author SHA1 Message Date
Michel Dänzer
d42f396051 EXA: Allow optimized migration to be enabled with mixed pixmaps.
This was always the intention, I only recently realized it wasn't the case
yet...

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-28 22:01:42 -08:00
Dan Nicholson
42e8c9224e xfree86: Introduce InputClass configuration
Currently Xorg uses hal's fdi files to decide what configuration options
are applied to automatically added input devices. This is sub-optimal
since it requires users to use a new and different configuration store
than xorg.conf.

The InputClass section attempts to provide a system similar to hal where
configuration can be applied to all devices with certain attributes. For
now, devices can be matched to:

* A substring of the product name via a MatchProduct entry
* A substring of the vendir name via a MatchVendor entry
* A pathname pattern of the device file via a MatchDevicePath entry
* A device type via boolean entries for MatchIsKeyboard, MatchIsPointer,
  MatchIsJoystick, MatchIsTablet, MatchIsTouchpad and MatchIsTouchscreen

See the INPUTCLASS section in xorg.conf(5) for more details.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-12-23 05:54:40 -08:00
Dan Nicholson
0711598dd3 config: Introduce InputAttributes in NewInputDeviceRequest
In order to give NewInputDeviceRequest more information, a new
InputAttributes type is introduced. Currently, this collects the product
and vendor name, device path, and sets booleans for attributes such as
having keys and/or a pointer. Only the HAL backend fills in the
attributes, though.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
2009-12-22 23:24:13 -08:00
Dan Nicholson
c6e8637e29 xfree86: Support non-Option boolean entries in configuration
Refactored code into the parser to allow the freeform boolean types used
in Option entries to be used in other configuration entries. This isn't
as powerful as allowing "No" to precede the option names, but it atleast
gives a common handling of "yes", "no", etc.

A type xf86TriState has been added to support an optional boolean. This
allows the boolean sense of the value to be kept while providing a means
to signal that it is unset.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
2009-12-22 23:24:02 -08:00
Peter Hutterer
e1165632bd xfree86: Add Option AutoServerLayout for input devices.
Any input device with this option will be automatically added to whichever
server layout is selected at startup. This removes the need to reference a
device from the ServerLayout section. The two following configuration are
identical:

CONFIG 1:
    Section "ServerLayout"
            InputDevice "foo"
    EndSection

    Section "InputDevice"
            Identifier "foo"
            ...
    EndSection

CONFIG 2:
    Section "InputDevice"
            Identifier "foo"
            Option "AutoServerLayout" "on"
            ...
    EndSection

The selection of the server layout affects both explicitly specified
layouts and the implicit layout.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
2009-12-22 23:22:09 -08:00
Dan Nicholson
592b20c517 xfree86: Allow config directory to be specified on command line
Add a new command line parameter, -configdir, to specify the config
directory to be used. Rules are the same as -config for root vs. user
privileges.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
2009-12-22 23:20:52 -08:00
Dan Nicholson
efa5269f23 xfree86: Use xorg.conf.d directory for multiple config files
Currently there is a single file, xorg.conf, for configuring the server.
This works fine most of the time, but it becomes a problem when packages
or system services need to adjust the configuration. Instead, allow
multiple configuration files to live in a directory. Typically this will
be /etc/X11/xorg.conf.d.

Files with a suffix of .conf will be read and added to the server
configuration after xorg.conf. The server won't fall back to using the
auto configuration unless there is no config file and there are no files
in the config directory.

Right now this uses a simpler search template than the config file
search path by not using the command line or environment variable
parameters. The matching code was refactored a bit to make this more
coherent. Any DDX wanting to read the config files will need to call
xf86initConfigFiles before opening/reading them. This is to allow
xf86openConfigFile without xf86openConfigDirFiles and vice-versa.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
2009-12-22 23:20:45 -08:00
Dan Nicholson
f1e869aca1 xfree86: Unexport configuration file symbols
These functions should not be used outside of DDXs, so no need to put
them in the ABI.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
2009-12-22 23:20:20 -08:00
Peter Hutterer
72286eae9f xfree86: remove LAYOUT_DEBUG section.
I don't think this one has been in use since 2003.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-22 21:28:40 -08:00
Peter Hutterer
38b5afb0b5 xfree86: remove some 'enable this later' and if 0 ifdefs
2003 called, they want their ifdefs back.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-22 21:27:54 -08:00
Keith Packard
7dc78db79e Merge remote branch 'whot/master' 2009-12-22 21:25:18 -08:00
Peter Hutterer
190610e0c6 xfree86: remove HistorySize from the xorg.conf man page.
This option isn't parsed by anything anymore.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
2009-12-22 15:34:02 +10:00
Peter Hutterer
094c6b9f97 xfree86: reword InputDevice man sections, deprecate CorePointer/CoreKeyboard
Reshuffle and reword - InputDevice sections are only necessary if
hotplugging is disabled. Put more emphasis on hotplugging and less on HAL
since we'll switch backends eventually.

CorePointer, CoreKeyboard, and AlwaysCore should be listed as deprecated
since they don't do what they used to since 1.4. These days, only
SendCoreEvents matters and it's enabled for any driver calling
xf86ProcessCommonOptions (== every driver).
It only controls the startup behavior too, so document this.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-12-22 15:34:01 +10:00
Alan Coopersmith
895f40792a Add type name argument to CreateNewResourceType
Convert all calls of CreateNewResourceType to pass name argument

Breaks DIX ABI.

ABI versions bumped:

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-18 17:44:12 -08:00
Alan Coopersmith
a11c58fa0c Ensure all resource types created have names registered
Calls RegisterResourceName to record the type name for
use by X-Resource, XACE/SELinux/XTsol, and DTrace.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
2009-12-18 16:51:45 -08:00
Alan Coopersmith
eb750f8b5e Check for failures from CreateNewResourceType
Make sure to check return value before setting bitmask flags.
For most calls, just fails to init the extension.   Since Xinput
already calls FatalError() on initialization failure, so does
failure to allocate Xinput's resource type.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
2009-12-18 16:51:45 -08:00
Alan Coopersmith
48749cc21b Add platform compatibility defines for Sun Studio compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-18 10:31:53 -08:00
Alan Coopersmith
b63912ed4c Convert checks for PC98 support from platform #ifdefs to configure flag
Default remains the same - on for most OS'es on i386 (except Solaris),
off for everyone else.   Can be manually toggled via --enable-pc98 or
--disable-pc98.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-18 10:30:53 -08:00
Peter Hutterer
801bc8075a xfree86: update man page for special keys handling.
SpecialKeyHandling was removed from the kbd driver with version 1.4.0. Since
this is the only version that will build against server 1.7+ it's not
reasonable to mention it in the man page. Reword, point to XKB instead and
make clear that some key combinations _may_ not be available in any given
config.

Reported-by: Derek Fawcus
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-12-18 10:53:26 +10:00
Peter Hutterer
753310837c xfree86: DontZap has been disabled for a while now, say so in the man page.
1.7 always shipped with DontZap disabled, it's just the default keymaps that
may not include the symbol to trigger it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-12-18 10:53:26 +10:00
Keith Packard
0cb638dc68 Merge remote branch 'alanc/master' 2009-12-16 21:58:44 -08:00
Keith Packard
6a6a041c2d Merge remote branch 'jeremyhu/master' 2009-12-16 21:57:32 -08:00
Ville Syrjälä
8127465f44 xf86xv: Fix off-by-one in viewport clipping
Most of the Xv Put/Get operations have an off by one error in the
viewport clipping.

Apparently PutImage was fixed at some point but the same code was
already copy-pasted all over the place, and so the other operations
still suffer from the bug.

Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-16 21:53:18 -08:00
Peter Hutterer
faca1bc582 xfree86: belately init RandR12 if xinerama fails. (#24627)
On Fri, Dec 11, 2009 at 10:19:01AM -0800, Keith Packard wrote:
> On Wed, 9 Dec 2009 11:55:14 +1000, Peter Hutterer <peter.hutterer@who-t.net> wrote:
> > On Tue, Dec 08, 2009 at 05:24:06PM -0800, Aaron Plattner wrote:
> > > On Tue, Dec 08, 2009 at 03:52:27PM -0800, Peter Hutterer wrote:
> > > > Xorg +xinerama crashes immediately due to whacky dependency between Xinerama
> > > > and RandR12. The latter doesn't initialize if Xinerama is enabled, but if
> > > > only one screen is found, Xinerama is disabled again and RandR12 tries to
> > > > access data it never initialized.
>
> I'd sure like to have RandR get enabled when xinerama doesn't; is there
> an easy way of making that happen here? Perhaps having the RandR12 code
> disable Xinerama when only one screen is found? Or some other kludge?

you know the dependency better than I do so any hints are apreciated.
afaict, the screenInfo.numScreens (the check used by Xinerama) isn't
necessarily initialized at this point so we can't use the same check.
The following seems to work though:

From 670b3ebdb7312a6433a8f093d0820785db2aea20 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 14 Dec 2009 11:00:58 +1000
Subject: [PATCH] xfree86: if only one screen was found, disable Xinerama (#24627)

Xorg +xinerama crashes immediately due to whacky dependency between Xinerama
and RandR12. The latter doesn't initialize if Xinerama is enabled, but if
only one screen is found, Xinerama is disabled again and RandR12 tries to
access data it never initialized.

Dependency chain is:
- ProcessCommandLine sets noPanoramiXExtension to FALSE
- xf86RandR12Init() is a noop
- PanoramiXExtensionInit sets noPanoramiXExtension to TRUE
- xf86RandR12CreateScreenResources tries to use the devPrivates key it never
  initialized.

This hack checks if there's only one screen at the time RandR12 is
initialized. If so, we expect Xinerama to fail anyhow so we disable it
ourselves and proceed as planned.

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-16 21:50:00 -08:00
Tiago Vignatti
5f898ddbaa xfree86: fix -quiet option behaviour
Previously it was trying to set the same value as the default one. Sigh.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-16 21:49:31 -08:00
Tiago Vignatti
f57240a0a8 xfree86: spam output but with verbose level checked instead
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-16 21:49:22 -08:00
Alan Coopersmith
fbdf493a3e Add freetype & type1 to the LoadModules ignore list
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
2009-12-16 17:11:52 -08:00
Alan Coopersmith
c9726bbe31 Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-12-16 17:11:35 -08:00
Jeremy Huddleston
d503195504 Xfake: Nuke -Wl,-undefined=InitExtensions from LDFLAGS
This is not portable, and accodring to Paulo should not be required any more.

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-15 16:51:48 -08:00
Alan Coopersmith
dd2c83d03e Fix builds with --with-int10=stub
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
2009-12-15 10:23:16 -08:00
Keith Packard
d3e054ac07 Merge remote branch 'jeremyhu/master' 2009-12-11 09:22:22 -08:00
Peter Hutterer
9ac6a048ef xfree86: remove unused variable in configureDDMonitorSection.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
2009-12-11 11:37:37 +10:00
Jeremy Huddleston
97a6454ea5 XQuartz: pbproxy: Fix building of standalone xpbproxy executable
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-09 18:27:31 -08:00
Jeremy Huddleston
1b8f90aa8b Miscellaneous compilation warning fixes
main.c:134: warning: no previous prototype for 'dix_main'
rootlessScreen.c: In function 'RootlessMarkOverlappedWindows':
rootlessScreen.c:434: warning: function declaration isn't a prototype
backtrace.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
backtrace.c:54: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
set.c: In function 'RecordSetMemoryRequirements':
set.c:413: warning: old-style function definition
set.c: In function 'RecordCreateSet':
set.c:425: warning: old-style function definition
stub.c: In function ‘main’:
stub.c:236: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-08 15:50:28 -08:00
Keith Packard
98c8b75225 Merge remote branch 'whot/master' 2009-12-02 15:28:07 -08:00
Peter Hutterer
761ae22f88 xfree86: tell users to disable AutoAddDevices, not AllowEmptyInput.
Technically, disabling AEI is the right suggestion. AEI off forces the
server to init the built-in defaults for input devices (or pick the first
one from the config file). At the same time, hotplugging is still available
with AEI off.

Unfortunatly, in the vast majority of cases users want to simply disable
hotplugging or have a working server while the local HAL configuration is
broken or missing. Disabling AEI will lead to duplicate events, triple
keystrokes, etc. once the configuration works again.
It's not actually required to remove AEI once hotplugging works again,
though it will in many cases lead to a setup that appears broken.

Asking users to disable AutoAddDevices instead means those users disable
hotplugging, can then fix the HAL setup and they _must_ remove the config
line again to test if hotplugging works again. Which doesn't leave them with
a broken config once everything is working nice and dandy. Less bugreports,
everybody wins.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Rémi Cardona <remi@gentoo.org>
Acked-by: James Cloos <cloos@jhcloos.com>
2009-12-03 08:43:46 +10:00
Luc Verhaegen
0e084d8c71 Xv: Fix AdjustFrame when driver implements ReputImage.
Should probably also be applied to stabler xserver branches too.

Luc Verhaegen.

From a22bc20721bad506d8fa9772b1258568cbffe7d2 Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@skynet.be>
Date: Wed, 11 Nov 2009 15:52:39 +0100
Subject: [PATCH] Xv: Fix AdjustFrame when driver implements ReputImage.

Finally fixes fd.o #4653, filed more than 4 years ago.

Patch can be happily applied to all modular Xorg versions.

Signed-off-by: Luc Verhaegen <libv@skynet.be>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-02 08:41:03 -08:00
Jeremy Huddleston
f4fc340672 XQuartz: Drop calls to alloca
This makes us more consistent with the rest of the codebase, using xalloc/xfree

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-30 17:06:58 -08:00
Ingmar Vanhassel
b54bc14ce0 Update man-pages for new default font paths
Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-25 13:34:36 -08:00
Jeremy Huddleston
4677b5a800 XQuartz: Allow better compatability with older versions of xinit
If we are id="org.x" and the launchd socket is ":0", we will claim
the socket to match the old behavior before we prefixed the
socket name with our id.

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-23 18:00:31 -08:00
Zhao Yakui
19f7c15e20 xfree86: Edid quirk for Philips LCD LP154W01
v1->v2: Make one condition case for one quirk instead of merging them
together. This is based on the Keithp's suggestion.

Move the EDID quirk for Philips LCD LP154W01 as the panel reports the vertical
size in cm.

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

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-20 07:21:26 -08:00
Julien Cristau
30be7ceaf2 xfree86: set a sane umask before opening the log
Xorg creates its log file following the umask of the user running
startx, which may result in a world-writable log.  Set umask to 022 to
prevent this.

Debian bug#555308 <http://bugs.debian.org/555308>
See also http://thread.gmane.org/gmane.comp.security.oss.general/2299

Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-17 12:55:44 -08:00
Matt Turner
fb95090730 Use glibc's in/out routines
Let's let glibc do the right thing for dense/sparse selection.

The _alpha_iobase code has been unused since the switch to libpciaccess. It
really should have been killed by fba700f1f6.

Signed-off-by: Matt Turner <mattst88@gmail.com>
Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-16 20:17:29 -08:00
Gaetan Nadon
c739beb439 .gitignore: use common defaults with custom section #24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.

Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-11 21:40:20 -08:00
Jeremy Huddleston
9071b0d697 XQuartz: Explicitly pass a bellProc to make XBell() work again.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-11 18:00:19 -08:00
Jeremy Huddleston
e87a03fd53 XQuartz: pbproxy: Wait for the server to finish starting up, so display is valid.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-11 18:00:19 -08:00
Jeremy Huddleston
15fc56addc XQuartz: Buildfix for Leopard and older
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-11 18:00:19 -08:00
Chase Douglas
b5aa2e0a5f Move FD_CLR above pInfo->read_input
The event fd may be invalidated by the pInfo->read_input call. If it is
invalidated, the subsequent FD_CLR call will segfault. Thus, the FD_CLR
call must precede the pInfo->read_input call.

Signed-off-by: Chase Douglas <chasedouglas@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-10 18:33:05 -08:00
Jon TURNEY
ec5417b965 Cygwin/X: Ensure WM_STATE atom exists in multiwindow mode
Workaround a bug in iiimxcf (assuming the WM_STATE atom exists),
which can cause many Solaris clients to simply fail with a BadAtom
error

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09 20:33:51 +00:00
Yaakov Selkowitz
aa860552fd Cygwin/X: Enable clipboard integration by default
Enable clipboard integration by default, can be turned off with -noclipboard.
We still accept -clipboard for backwards compatibility.  If both are passed,
the last one is accepted (just as other arguments are handled).

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:50 +00:00
Jon TURNEY
87b00ced3d Cygwin/X: Setup screen layout in Xinerama mode
Setup screen layout according to the screen window native window
positions in Xinerama mode

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09 20:33:48 +00:00
Yaakov Selkowitz
26a69bbd9b Cygwin/X: Mount options have changed in cygwin-1.7
Mount options have changed in cygwin-1.7

Also fix a typo in the warning issued if /tmp is a textmode mount

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09 20:33:46 +00:00
Paul Loewenstein
35901ece6a Cygwin/X: Handle fake keypresses generated by speech recognizers
Apparently, fake keypresses generated by speech recognizers may not bother
with a scan code, so look up what scan code corresponds to the virtual key
code if this occurs.

Patch by Paul Loewenstein <paul.loewenstein@gmail.com>

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09 20:33:45 +00:00
Jon TURNEY
0866322b57 Cygwin/X: Always use an authorization cookie for internal clients
Don't conditionalize use of an authorization cookie for internal client
threads on XCSECURITY, always use one (this avoids certain problems
with XDMCP setups where the XDMCP host removes localhost from the access
list etc.)

Conditionalize the use of a XCSECURITY authorization descriptor on XCSECURITY

Consolidate the various places where the authorization cookie is set
for internal threads into a new function, winSetAuthorization()

Use authorization cookie for multiwindow WM X message thread as well

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:44 +00:00
Colin Harrison
72f81f4e44 Xming: Make -auth option work in with -multiwindow
Use an internally generated cookie for authentication of the internal
window manager client when using the -auth option in -multiwindow mode.

Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:42 +00:00
Colin Harrison
6dbf8f27c8 Xming: Tidy up code for initial native window positioning
Tidy up code for initial native window positioning and avoid a
duplicate call to winMultiWindowGetTransientFor()

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:41 +00:00
Colin Harrison
091cbbaed7 Xming: Fix UT8String and CompoundText clipboard text sharing with windows clipboard
XConvertSelection() in libX11 always returns 1, so there is no point in
testing it incorrectly against Success. This is possibly a bug in
XConvertSelection()

This should fix UTF8String and CompoundText selection via the clipboard.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:39 +00:00
Jon TURNEY
9657eae5d6 Cygwin/X: Clearly diagnose a timeout while waiting for SelectionNotify event
Clearly diagnose a timeout while waiting for SelectionNotify event
in the clipboard integration internal client.
(which seems to be behind some of the reported failures)

Turn useless #if 0/ErrorF()/#endif into useful winDebug()

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09 20:33:38 +00:00
Jon TURNEY
062f49a8e0 Cygwin/X: Add a workaround for a SWT/Motif bug to internal window manager
SWT/Motif expects all top-level windows to get reparented, and waits until they
do. So workaround that in our internal WM by forcing a reparent event to
occur, even though we don't actually need to reparent the window to
frame it (as the frame is a native window, not an X window)

http://sourceware.org/bugzilla/show_bug.cgi?id=9848
https://bugs.eclipse.org/bugs/show_bug.cgi?id=36806

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09 20:33:36 +00:00
Jon TURNEY
71519a572f Cygwin/X: Fix typo in g_fAnotherWMRunning and tidy up WM detection code
Tidy up code for detecting another WM is already running
Fix typo g_fAnotherWMRunnig -> g_fAnotherWMRunning
Remove some unused event mask macros

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09 20:33:35 +00:00
Colin Harrison
f3fad371cc Xming: Add FORCEEXIT option to configuration file
Add a new option to configuration file: FORCEEXIT, like SILENTEXIT
but ignores the client count. Unsaved client work may be lost with
this option but it is useful if you want no dialogs.

Add description of this new keyword to XWinrc man page

Also fix grammar of the exit confirmation dialog warning to be correct
when there is only one(1) client connected.

Also rearrange yacc tokens to one per line to make future merges
easier

Also amend default system.XWinrc so that SILENTEXIT is on by default

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:34 +00:00
Colin Harrison
019a601de6 Xming: Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion()
Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion(), as
they are in screen coordindates and may need to be scaled to the axis range
appropriately

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:33 +00:00
Colin Harrison
7af1240b57 Xming: Replace all the uses of deprecated functions in hw/xwin with current ones
Replace uses of LookupIDByType() and SecurityLookupIDByType()
with dixLookupResourceByType()

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:32 +00:00
Jon TURNEY
2a38f7c0db Cygwin/X: Remove a couple of extraneous '\n' in logged version info
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-09 20:33:31 +00:00
Dave Airlie
d85ab6b648 loader: actually stat something that has some chance of existing. (v2)
FindModuleInSubdir seems to expect a / at the end of the subdir its
finding for, so we add the / early, the stat will fail if its
not a subdir, I'm leaving the S_ISDIR in just in case there is another
reason it could return 0. This does look a bit silly in strace
but it seems to work fine.

I have a very intermittent issue where drivers loses its / that
I've been seeing on/off for a while, this may or may not fix it.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-09 08:24:39 -08:00
Adam Jackson
a5e59230de randr: Turn on ModeDebug during server setup
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-06 06:24:10 -08:00
Matt Turner
c61e77c77c Remove lnx_font.c and lnx.h
I couldn't find any version of the X xserver that ever used lnx_font.c
so let's delete it. I tried contacting its author, Egbert, multiple
times on IRC and email [*] but never got any response. It also hasn't
been seriously touched since January 2005.

[*] http://lists.x.org/archives/xorg-devel/2009-October/002855.html

Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-06 06:23:26 -08:00
Jeremy Huddleston
840a68dc5e 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>
2009-11-05 18:34:50 -08:00
Jeremy Huddleston
0e3ad44c3b XQuartz: Use dixLookupResourceByType instead of LookupIDByType
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-05 18:34:50 -08:00
Jeremy Huddleston
069fc6ce0a 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>
2009-11-05 18:34:50 -08:00
Jeremy Huddleston
6d6e8fb27f 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>
2009-11-05 18:34:50 -08:00
Alan Coopersmith
f77262513e 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>
2009-11-05 13:31:16 -08:00
Jeremy Huddleston
5e79976c13 XQuartz: Run xmodmap after programatically updating the keymap.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Martin Otte <otte@duke.edu>
2009-11-03 16:35:27 -08:00
Matt Turner
da923d0bc1 Make sys.c use unaligned access functions provided in compiler.
Favorite deleted line was definitely
	/* to cope with broken egcs-1.1.2 :-(((( */

Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-01 12:33:14 -08:00
Mikhail Gusarov
d306373399 Supply all code using dl*() with DLOPEN_LIBS
Previously DLOPEN_LIBS was managed in top-level configure.ac.
Instead bundle it with the code using dl*() functions to
avoid breakages in uncommon configurations.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-29 14:15:02 -07:00
Adam Jackson
ec98d7fc78 EDID: Extend the HDTV hack to handle "1368x769"
Hate televisions so much.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2009-10-29 14:06:00 -04:00
Adam Jackson
7c0803f555 modes: Fix duplicate detection, and do it more consistently
Signed-off-by: Adam Jackson <ajax@redhat.com>
2009-10-29 14:06:00 -04:00
Adam Jackson
ba2d39dd54 modes: De-duplicate a clock range check.
Signed-off-by: Adam Jackson <ajax@redhat.com>
2009-10-29 14:06:00 -04:00
Adam Jackson
25236d19e6 EDID: Fix interlaced detailed timings to be frame size, not field size
Signed-off-by: Adam Jackson <ajax@redhat.com>
2009-10-29 14:06:00 -04:00
Adam Jackson
fb86433d89 modes: Decorate interlaced mode names with a trailing 'i'
Signed-off-by: Adam Jackson <ajax@redhat.com>
2009-10-29 14:06:00 -04:00
Ma Ling
fc2ec95664 EDID: CEA extension support
Reviewed-by: Adam Jackson <ajax@redhat.com>
2009-10-29 14:04:55 -04:00
Jamey Sharp
fab74d1081 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>
2009-10-28 18:59:07 -07:00
Jamey Sharp
239435875d 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>
2009-10-28 18:56:42 -07:00
Mikhail Gusarov
662594aeff 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>
2009-10-28 18:27:40 -07:00
Jamey Sharp
83d520d86c Add video driver flag to indicate that console access is not needed.
Existing video drivers will get the console enabled by default.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-28 18:24:29 -07:00
Tormod Volden
757c11630d 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>
2009-10-28 15:57:21 -07:00
Hans Nieser
55f4c80a4c 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>
2009-10-27 23:34:11 -07:00
Jon TURNEY
50a5c32430 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>
2009-10-26 10:39:35 -07:00
Keith Packard
9a2f6135bf 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>
2009-10-23 10:04:57 +09:00
Marcin Baczyński
d886008c96 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>
2009-10-23 09:48:01 +09:00
Keith Packard
26f4d8a2c1 Make sure dmx docs are built for distribution.
Ok, dmx docs are driving me slightly nuts. We probably shouldn't
include the built versions in the tarball, but we do, so this is an
attempt to make that work by having both the 'all' and 'dist' targets
depends on the doxygen output.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-22 01:04:42 +09:00
Peter Hutterer
52bc6d9449 kdrive: Purge Xsdl
From the original Xsdl commit:
"sdl x server so that we can x-on-x the fb stuff for ease of debugging. if
anyone uses this in production, a big scary monster will eat them.
hrm, perhaps i should make it have a --i-know-what-i'm-doing
param that it doens't start without, heh"

That should be reason enough to not spend time maintaing it. Also, no more
elephants.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-20 13:32:47 +10:00
Lee Leahu
f713f447a2 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>
2009-10-20 13:32:21 +10:00
Lee Leahu
664a8e37fd dmx: when setting up device axis, use the correct counter number
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-20 13:32:19 +10:00
Peter Hutterer
010d5e2865 dmx: remove doxygen-generated files.
These can be recreated by simply running 'doxygen doxygen.conf' in
hw/dmx/doc. Some of the files do not exist anymore, these have been removed.
Some other files have a different naming scheme.
Doxygen warnings about missing links fixed, two warnings remain:

/home/whot/xorg/xserver/hw/dmx/dmxwindow.c:142: Warning: explicit link
request to 'dmxConfigureRootWindow' could not be resolved
/home/whot/xorg/xserver/hw/dmx/dmxwindow.c:119: Warning: explicit link
request to 'dmxConfigureScreenWindow()' could not be resolved

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-20 13:32:16 +10:00
Peter Hutterer
0b9dbd4bf2 Use the default XKB settings for dmx and kdrive.
Drop the dmx-specific defines, there's no reason to have separate ones
considering they're about as hardcoded as the default rules anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-20 13:32:11 +10:00
Peter Hutterer
e08d8a2b04 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>
2009-10-20 13:32:05 +10:00
Mikhail Gusarov
522ca8179a Remove unused LinuxFindPci and LinuxGetPciCfg
These two functions are not referenced from inside xserver.
Remove now-empty klinux.h too.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-20 06:38:06 +09:00
Yaakov Selkowitz
63f4bf3917 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>
2009-10-19 12:34:22 +09:00
Peter Hutterer
a32b2420d8 kdrive: fix Xfake build by removing the old keysym stuff
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-18 06:29:32 +09:00
Yaakov Selkowitz
9bc4e88d84 Define ddxBeforeReset stubs in platform-neutral DDXs
XWin uses ddxBeforeReset, which is called in DIX.  Other DDXs need to
define these in order to avoid an undefined symbol error at link time
when building alongside XWin.  Xnest and Xvfb already provide empty stubs;
this does the same for Xdmx and the platform-neutral KDrive servers.

Also add a prototype to avoid a warning in all DDXs.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-15 08:06:53 -07:00
Yaakov Selkowitz
a2f27b9790 Remove duplicates from Xfake_LDADD
KDRIVE_LIBS already contains the libs in XSERVER_LIBS, so linking against
both leads to multiple-definition errors when linking on Cygwin.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-15 08:06:46 -07:00
Jon TURNEY
22b38f513c Cygwin/X: Avoid a potential null pointer dereference before input initialization
Avoid a null pointer dereference if WM_MOUSEMOVE occurred before
the input device had been initialized (a timing sensitive bug
occassionally seen during initialization)

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-10-14 20:29:10 +01:00
Jon TURNEY
1b0dfd8dee Cygwin/X: Make -logverbose affect the verbosity of logging to the log file
Make -logverbose affect the verbosity of logging to the log file, not just the
verbosity of logging to the console

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-10-14 20:29:08 +01:00
Colin Harrison
83d120b904 Xming: Fix various 'ISO C90 forbids mixed declarations and code' warnings
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-14 20:28:11 +01:00
Colin Harrison
78c87bdad1 Xming: Remove unused X-boxed icon resource
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-14 11:00:30 +01:00
Colin Harrison
fdf7f7e95c Xming: update .rc file
Remove the obsolete DISCARDABLE flag in the .rc file
Replace the obsolete DIALOG resource with DIALOGEX in the .rc file

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-14 11:00:28 +01:00
Keith Packard
6e158003e8 Merge remote branch 'mattst88/master'
* mattst88/master:
  [alpha] assume we have __NR_pciconfig_iobase
  [alpha] don't return from void functions
  Fix undefined symbols on alpha
  Fix breakage on alpha caused by c7680befe5
  Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
2009-10-13 18:40:42 -07:00
Matt Turner
5e762f0e2f [alpha] assume we have __NR_pciconfig_iobase
The code path if we didn't have support has been broken since before we
switched to git.

The pciconfig_iobase syscall has been supported since 2000.

Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-13 20:42:14 -04:00
Matt Turner
46785c04bc [alpha] don't return from void functions
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-13 20:40:59 -04:00
Jeremy Huddleston
5b91dfac6f Rootless: Abstract some of the Xplugin specific stuff which has crept into rootlessWindow.c
The rootless extension now directly calls some Xplugin functions, and relies
on types defined in Xplugin.h, which isn't very abstracted :-)

This patch is a start at abstracting some of the Xplugin specific stuff which
has crept into rootlessWindow.c.  This has been done in a pretty mindless fashion,
without much thought as to if the additions to the generic rootless interface are
the correct ones

There is some confusion as to if RootlesscolormapCallback() returns a Bool or
xp_error_enum value (not so abstact), but I have no way of checking, of finding
out if Xplugin actually checks the result :-)

Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-13 13:59:57 -07:00
Jamey Sharp
b0dd6be2c8 Cast small-int values through intptr_t when passed as pointers
On 64-bit systems, int and pointers don't have the same size, so GCC gives
warnings about casts between int and pointer types. However, in the cases
covered by this patch, it's always a value that fits in int being stored
temporarily as a pointer and then converted back later, which is safe.
Casting through the pointer-sized integer type intptr_t convinces the
compiler that this is OK.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-08 13:38:44 +11:00
Martin Ettl
4df3e8c805 Resource leakage: 0 is a valid file descriptor
When testing if an fd is valid, the required construct is >= 0, not > 0.

[Daniel: Fixed up the Linux MTRR case as well.]

Signed-off-by: Martin Ettl <ettl.martin@gmx.de>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-08 13:27:30 +11:00
Michael Cree
34eddbbb73 Fix undefined symbols on alpha
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-07 18:33:29 -04:00
Alan Coopersmith
315aaef557 Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-06 19:40:20 -07:00
Alan Coopersmith
4b0911565d Add platform tests for Dtrace linker magic
Replaces special handling for Xquartz DDX and scales better to handling
the multiple platforms that now have some level of Dtrace support available.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2009-10-06 19:40:19 -07:00
Peter Hutterer
d2118c8ca9 xfree86: remove log-spamming DebugF
All input drivers use xf86PostKeyEventP indirectly now and have been since
it exists. I guess that qualifies it as tested - no need to spam the logs.

Reported-by: Felix Wenk
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-06 19:40:18 -07:00
Matt Turner
9625f6d328 Fix breakage on alpha caused by c7680befe5
Pinpointed by by Michael Cree.

Commit c7680befe5 removed Jensen support, but at the same time broke
support for dense memory systems.

Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-06 20:58:30 -04:00
Peter Hutterer
aa07957373 Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus.

This reverts commit 5ef53a94ce.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-06 20:40:20 -04:00
Peter Hutterer
bd7430a32e xfree86: remove log-spamming DebugF
All input drivers use xf86PostKeyEventP indirectly now and have been since
it exists. I guess that qualifies it as tested - no need to spam the logs.

Reported-by: Felix Wenk
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-06 10:17:51 +10:00
Jeremy Huddleston
24e640e1fa XQuartz: Fix a possible minor memory leak 2009-10-02 19:20:24 -07:00
Jeremy Huddleston
c4886fbabc XQuartz: Send mouse location with scroll events.
This fixes the problem where (0, 0) was sent as the mouse location with scroll
button events causing the event to not reach the client.
2009-10-02 18:58:35 -07:00
Dave Airlie
3ebb82d61c rotate: drop unwrapping inside block handler.
Keith has shown half the block handlers wrappers are wrong, also
dynamic wrapping/unwrapping from what I can see will happen after
the drivers, so its really accidental ABI, that we can't change
now without modifing drivers. So be safe for 1.7.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Declared-as-sane-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-02 12:15:58 +10:00
Jeremy Huddleston
3d7cf468df XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0
Is fink really _still_ relying on this X11R7.x version string?
2009-10-01 11:58:18 -07:00
Julien Cristau
85b831f701 xfree86: fix xorg.conf manpage formatting error 2009-10-01 17:27:11 +02:00
Keith Packard
db98b26ee1 Re-fix DGA removal.
Removing DGA ended up breaking any drivers calling into the old
xf86DiDGAInit function as it tried to see if DGA was already enabled
and ended up crashing if the VT wasn't completely initialized. Oops.

Also, if the driver initializes DGA itself, have the DiDGA
initialization overwrite that information as the DiDGA code will call
ReInit on mode detect.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-01 11:02:25 +10:00
Jeremy Huddleston
873467adad XQuartz: Set the proper bitmap for key repeats...
XkbSetRepeatKeys lies and doesn't do what it says it will...
2009-09-30 00:23:47 -07:00
Jeremy Huddleston
f11a356bce XQuartz: Cleaned up keymap setting for easier maintenance
(cherry picked from commit b9dfed9e88)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston
f3223c71cf XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d8)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston
9b98b88322 XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50)
2009-09-29 00:34:41 -07:00
Peter Hutterer
19be992d9d ephyr: if -parent is given, check for a trailing -screen. (#24144)
If -parent is given, don't open up a new window if -screen is given as well.
The commandline option -screen allows to set the depth of the embedded
Xephry instance, even though width and height are autoscaled on -parent.

This patch checks for a -screen parameter after -parent and - if one is
found - delays initializing the screen. The parent window id is stored
temporarily but re-set after a -screen argument.
The following command is thus valid:

Xephyr -parent 1234 -screen 640x480@8 -screen 1024x768

It embeds the first 8-bit screen into window 1234 and opens up a new window
for the second screen. Multiple parent arguments are possible, the screens
are embedded in-order.

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

Tested-by: Vic Lee
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-29 09:38:44 +10:00
Jeremy Huddleston
6df00917ca XQuartz: Fix QuartzSetCursor to match the expected prototype.
(cherry picked from commit dadab5a227)
2009-09-27 23:31:41 -07:00
Jeremy Huddleston
67a51cd9ef XQuartz: Fix a bunch of compilation warnings about style
(cherry picked from commit 54000bdcbc)
2009-09-27 23:31:35 -07:00
Jeremy Huddleston
96780eaf32 XQuartz: Nuke TSM
It's deprecated in SnowLeopard.  Ben and I both have no idea what it is for.  It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
(cherry picked from commit 29cb904e4d)
2009-09-27 23:31:29 -07:00
Jeremy Huddleston
15e15816a2 XQuartz: Fix inverse map from mode_switch to alt
(cherry picked from commit de6cee11e1)
2009-09-27 23:31:23 -07:00
Jeremy Huddleston
558d803b29 XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this.
(cherry picked from commit ceaa5c779c)
2009-09-27 23:31:16 -07:00
Jeremy Huddleston
226b1033b4 XQuartz: Transition from xEvent based mieq to InternalEvent
(cherry picked from commit a3dbde2de8)
2009-09-27 23:31:07 -07:00
Peter Hutterer
83023ffd09 xfree86: use the DDC size if either width or height of DisplaySize is bogus.
If either width or height of DisplaySize is invalid, assume that the
configuration is invalid and use the DDC-reported values instead.

See Comment 9, Bug 9758.
http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dave Airlie <airlied@redhat.com>
2009-09-28 14:51:39 +10:00
Samuel Thibault
78ad6ca9a9 xfree86: Hurd fix
I hadn't paid attention that the parameters order had changed, here is a
trivial patch, please apply.

Signed-off-by: Julien Cristau <jcristau@debian.org>
2009-09-28 00:58:23 +02:00
Jeremy Huddleston
a2cd211778 XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
(cherry picked from commit 9f5bdd8960)
2009-09-26 23:45:35 -07:00
Jeremy Huddleston
fbfbf93405 XQuartz: Add pressure/tilt property labels
(cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56)
2009-09-26 23:30:57 -07:00
Jeremy Huddleston
65f1484089 XQuartz: Fix a brain-o array indexing problem
/bop Peter
(cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb)
2009-09-26 23:30:51 -07:00
Jeremy Huddleston
7159381881 XQuartz: Nuke duplicate locks that make painful headaches
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
2009-09-26 23:30:46 -07:00
Jeremy Huddleston
dc1e1bebff XQuartz: Use internal xshm header for new xextproto
(cherry picked from commit 1755239330)
(cherry picked from commit 697be460d0)
2009-09-26 23:30:39 -07:00
Kevin E Martin
c9ec2bab2f dmx: undefine MITSHM, move undefs to miinitext.c.
This patch undefines MITSHM for dmx - we don't support the required
screen->ModifyPixmapHeaders. All undefines are moved from dmx-config to
miinitext.c, where they belong.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-26 13:14:50 +10:00
Kevin E Martin
fc9d733bab dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-26 13:09:52 +10:00
Peter Hutterer
e7c2598f56 dmx: core events are always in screen coordinates when passed to GPE.
This fixes input in dmx, the pointer appears at the right positions to the
clients now.

Also mark the spot where we pass in the button state as valuator to GPE
with a FIXME. (??)

Tested-by: Kevin Martin
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-26 12:25:19 +10:00
Peter Hutterer
a9c274df5c kdrive: plug two memory leaks when freeing the KdKeyboard/Pointer.
xkbRules, xkbModel and xkbLayout are strdup'd in KdNewKeyboard, need to be
freed.

The ephyr driver strdups the name on top of the already allocated
kdrive-assigned name. Memory must be freed beforehand.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-25 08:17:03 +10:00
Jeremy Huddleston
33bf9cb69d XQuartz: GLX capabilities: Allow 16bit accumulation buffers
http://xquartz.macosforge.org/trac/ticket/308
(cherry picked from commit e9e63a2118)
2009-09-23 18:21:48 -07:00
Kevin E Martin
66ece3bfb1 dmx: only free the default pixmaps that we actually allocated.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22 12:28:17 +10:00
Kevin E Martin
20fb8c2e2f dmx: disable Get/SetWindowPixmap, we don't support composite/redirected windows
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22 11:48:09 +10:00
Keith Packard
fcdc1d78cc Fix sporadic segfault on resume due to accidentally freeing cursor.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22 11:38:22 +10:00
Matthias Hopf
91e1fe5863 Revert fe31f9c + 977953b to fix issue for good.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22 11:38:17 +10:00
Peter Hutterer
90aa0e4a49 input: don't use typecasts to access members of InternalEvent.
To avoid confusion, the member names are now postfixed with _event.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22 11:15:32 +10:00
Matthias Hopf
977953bf14 Less intrusive workaround for sporadic segfault on resume.
Hopefully fixes fdo #24010 (memleak).
2009-09-21 16:41:49 +02:00
Peter Hutterer
55747d256d input: define server-supported protocol versions in one single file.
include/protocol-versions.h specifies each extension version as supported by
the server and sent back on the wire to the client.

This fixes up several issues with the server potentially reporting a higher
version of the protocol if recompiled against a newer version of the
protocol.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
2009-09-21 21:47:35 +10:00
Keith Packard
0b7c6c728c xfree86/modes: Remove all framebuffer support from DGA
This removes all rendering and mapping code from xf86DiDGA, leaving
just mode setting and raw input device access. The mapping code didn't
have the offset within /dev/mem for the frame buffer and the pixmap
support assumed that the framebuffer was never reallocated.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-21 16:20:25 +10:00
Peter Hutterer
b9ae1b91f3 dmx: silence 'implicit declaration of function ‘XFixesSetPictureClipRegion’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-21 09:23:16 +10:00
Peter Hutterer
20ccc66708 xfree86: silence warning: ‘ramplen’ may be used uninitialized
'ramplen' is only set and used if stuff->size > 0 but the compiler doesn't
pick that up.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-21 08:03:37 +10:00
Keith Packard
6086a60656 xf8CrtcSetModeTransform: free adjusted_mode name too
The adjusted mode was freed, but any name allocated for that was leaked.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 20:45:25 +10:00
Keith Packard
0881078273 LoaderSortExtensions: free graph nodes
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 20:45:25 +10:00
Keith Packard
d5959d37cd Free libpciaccess iterator in xf86PciProbe
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 20:45:25 +10:00
Keith Packard
ded35b7bf7 xf86Xinput.c: get DIX event queue pointer once at InitInput time
The DIX event queue is allocated before InitInput is called, so fetch
the pointer there and not randomly at other times. This avoids failing
to fetch the pointer sometimes during server regen and then smashing
memory through the stale pointer from the previous server generation.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 20:45:24 +10:00
Keith Packard
54f15a4141 probe_devices_from_device_sections: don't leak list of devices
xf86MatchDevice returned malloc'd storage containing the list of
devices to look at; make sure that gets freed.

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 20:45:24 +10:00
Peter Hutterer
c7987660fd xfree86: fix up wrong use of OptionRec for AutoAddDevices andAutoEnableDevices
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 20:45:24 +10:00
Peter Hutterer
2bb3f0c871 xfree86: remove now unused variable
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 19:15:49 +10:00
Tiago Vignatti
4982bbc3b4 xfree86: vgaarb: missing wrapping macro
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-09-18 12:53:45 +03:00
Martin-Éric Racine
af1af50de6 xserver: added more Geode oddities to xf86AutoConfig.c 2009-09-18 09:33:37 +03:00
Peter Hutterer
ec0ad408ef xfree86: use SendDevicePresenceEvents instead of manual event handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-18 08:23:33 +10:00
Shunichi Fuji
4d6b20c25a dri: use noPanoramiXExtension directly.
xf86LoaderCheckSymbol() is never useful if using externed variable directly.
noPanoramiXExtension will be just used through dlopen() like other extension modules.

Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-18 08:23:32 +10:00
Alan Coopersmith
3853314d13 Fix typo in Xephyr man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-09-17 08:12:47 -07:00
Dave Airlie
2edf967b00 xserver: SIGIO option handling was incorrect.
reported by a user on #radeon when DRI1 broke.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-17 15:24:51 +10:00
Alan Coopersmith
e2c6455180 Add configuration option for use of SIGIO handlers for input events
Boolean option to enable/disable SIGIO handlers is set by the first
of these found:
  - UseSIGIO option is set in xorg.conf ServerFlags
  - Default set at build time by ./configure --enable-use-sigio-by-default
  - Platform default value: Solaris = no, all others = yes

This matches the current settings on all platforms except Solaris.
This reverts Solaris (for now) to the settings used in Xorg 1.6, before
SIGIO support for Solaris was added, due to some system level bugs that
won't be resolved in time for Xorg 1.7 release, but allows us to enable
when those are resolved (or when we need to test if they're resolved).
See http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6879897

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-17 10:06:37 +10:00
Matthias Hopf
3bdf364761 Work around sporadic segfault on resume with intel/KMS due to cursor->bits == NULL.
Apparently SavedCursor is sometime tried to be set while already being set.
2009-09-16 16:05:36 +02:00
Alan Coopersmith
fe31f9c646 Change xf86dristr.h includes to use xf86driproto.h instead
Clears warnings about obsolete headers, but raises minimum
required version of xf86driproto to 2.1.0

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 12:06:07 +10:00
Peter Hutterer
159e032040 dmx: don't include panoramiXsrv.h if building w/o Xinerama
Reported-by: Marvin Schmidt
Tested-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:44:08 +10:00
Rémi Cardona
f56cbe1ef2 dix: append "built-ins" to the font path in SetDefaultFontPath
49b93df8a3 made the hard dependency on
a "fixed" font go away but only Xorg could use the built-ins fonts by
default.

With this commit, all DDXs get "built-ins" appended to their FontPath, not
just Xorg.

Tested with Xorg, Xvfb and Xnest.

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:44:08 +10:00
Alan Coopersmith
e320736c45 Fix module path in xorg.conf man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:04:25 +10:00
Tiago Vignatti
49b98d092e xfree86: vgaarb: rework wrapping function
No semantical changes.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:04:24 +10:00
Jeremy Huddleston
422cd7a674 XQuartz: pbproxy: Remove debugging XBell()
(cherry picked from commit 1fd7c1fd47)
2009-09-14 14:29:50 -07:00
Alan Coopersmith
2b00afec4b Update xorg.conf man page & sample for changes in Xorg 1.7
AllowMouseOpenFail description changed to reflect actual behaviour
and point to AllowEmptyInput for previously described behaviour.

Update default DPMS mode timeouts to match new defaults set
in April 2009 by commit d52fddefae

Update autoloaded module list to match ModuleDefaults in xf86Config.c
Update module subdir list to match stdSubdirs in loadmod.c

Add xorg.conf options that were added to the code:
- XkbDir option added in February 2009
  by commit 76f18b94bd
- DRI2 option added in April 2008
  by 35982bc109

Remove xorg.conf options that were removed from the code:
- XkbDisable option was removed in January 2009
  by commit 40877c6680
- PciProbe/Config options were removed in August 2008
  by commit fdf7c747a8
- EstimateSizesAggressively was removed in August 2008
  by commit cd1e8f2614
- loadable font modules were removed in July 2008
  by commit affec10635
- ModInDev options were removed in December 2008
  by commit 6de6ffff35

(Also strips some trailing whitespaces to make git happier.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 16:03:18 +10:00
Alan Coopersmith
b6f5c54fc6 xfree86: Change default font path to match configure.ac's --default-font-path.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 16:03:18 +10:00
Peter Hutterer
23dc4678e9 dmx: use top_builddir, not top_srcdir to get libxfixes.la
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Byeong-ryeol Kim <brofkims@gmail.com>
2009-09-14 14:40:37 +10:00
Peter Hutterer
c626a5578a xfree86: fix VT_WAITACTIVE control flow (#11477)
Move misplaced } to get the flow of

if (!ShareVTs)  {
   VT_ACTIVATE
   VT_WAITACTIVE
}

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
2009-09-14 12:10:13 +10:00
Kevin E Martin
e85775aa64 Include <X11/extensions/dmx.h> and remove _DMX_SERVER_ define.
Fixes build with newer dmx header files that have been split between dmx.h
and dmxext.h.  _DMX_SERVER_ is no longer needed with the split headers.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 09:32:53 +10:00
Peter Hutterer
72607960c1 dmx: Remove some dead code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:17 +10:00
Peter Hutterer
88187ad889 dmx: purge DMX EQ leftovers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:17 +10:00
Peter Hutterer
f3aaa46f27 dmx: formatting fix to improve readability
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:17 +10:00
Peter Hutterer
7a588c833e dmx: Default rules are now base, not xfree86
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
33243ae971 dmx: include xfixes lib, reshuffle include order to resolve linker errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
2d46678762 dmx: remove dmx-internal event queue.
The EQ is in the DIX now.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
545f11139d dmx: compiler warning fix (mixed declarations + code)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
7d703af74c dmx: get the state from XKB for dmxCheckSpecialKeys
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
6e52f92331 dmx: fix dmxKeySymToKeyCode to work with mandatory XKB.
Approach taken is inefficient, it converts the xkb symbol table to a core
symbol table first and then extracts the keycode from there.
Consider this a todo for a rainy afternoon when the beer fridge demands
emptying.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:16 +10:00
Peter Hutterer
61ae0a5ca5 dmx: fix up dmxKeyCodeToKeySym for XKB-only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
9caba3e2ab dmx: fix two calls to InitKeyboardDeviceStruct.
Takes RMLVO now instead of the keysyms directly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
29b9a10dad dmx: XkbComponentNamesRec doesn't have a keymap field anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
a6f3f6a63a dmx: switch lnx-input and usb-input over to xkb-only.
kbd*Convert are nearly identical, it just asks for merging. Not today
though.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Peter Hutterer
5d81aee5f7 dmx: include xkbsrv.h to silence compiler.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-13 10:30:15 +10:00
Alan Coopersmith
8fb3fa28a5 compiler.h: include <string.h> before using memmove()
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-09-11 11:21:26 -07:00
Tiago Vignatti
d908ee6e54 Revert "Make sys.c use compiler.h unaligned access functions"
This reverts commit 1b30545c04.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-11 15:31:04 +10:00
Tiago Vignatti
281ebb453d xfree86: vgaarb: close and cleanup vga arbiter
So far there are no apparently issues on not closing the fd. But let's do the
right job here.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-11 09:19:36 +10:00
Martin-Éric Racine
9871f9be4e Use lowercase PCI vendor ID for NSC. 2009-09-09 13:43:45 +03:00
Daniel Stone
f4350c66b4 fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
Apparently the kernel can't decide on an API to expose to userspace, so
let's just try both in the hope that one will work.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Michel Dänzer <michel@daenzer.net>
2009-09-09 15:59:00 +10:00
Peter Hutterer
72f6be5408 xfree86: remove now unused xf86CrtcShadowClear
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 11:36:37 +10:00
Peter Hutterer
1f24638985 kdrive: output meaningful error message for HAL devices.
kdrive ignores all devices from hal as they don't have the 'type' option
set. Instead of "Unrecognised device identifier!" print out "Ignoring
device from HAL." to indicate that the errors surrounding the device don't
really matter.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-09-09 10:47:11 +10:00
Peter Hutterer
ae812bb796 Xnest: set the default pointer accel to the host's values (#10013)
The defaultPointerControl holds compile-time defaults for pointer
acceleration. If an Xnest instance is started, it resets the hosts pointer
accel values to these built-in defaults instead of using the host values.

This patch queries the host for the values before initializing the device,
thus leaving the host values untouched.

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 10:47:08 +10:00
Peter Hutterer
447bd4ce90 kdrive: fix sdl build by removing old keySymsRec references.
These are set in kinput now through InitKeyboardDeviceStruct.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 10:31:15 +10:00
Peter Hutterer
e9a507acca kdrive: remove xkb member from KdKeyboardInfo
Wasn't being used by anyone.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-09 10:31:08 +10:00
Martin-Éric Racine
cafa7c5f90 Added comment with the PCI device ID of Geode SCx200 series. 2009-09-08 23:52:52 +03:00
Jeremy Huddleston
1e0caf9a2c XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
(cherry picked from commit 647c871dc9)
2009-09-06 14:06:28 -07:00
Jeremy Huddleston
081f72390a XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a97)
2009-09-06 14:06:16 -07:00
Jeremy Huddleston
7ece2cb220 XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
(cherry picked from commit 1b659cda1a)
2009-09-06 14:06:06 -07:00
Jeremy Huddleston
1747120043 XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3e)
2009-09-05 02:53:59 -07:00
Jeremy Huddleston
1f61bbeffd XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce3)
2009-09-04 00:42:44 -07:00
Jeremy Huddleston
0a361d0e5f XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab00)
2009-09-04 00:42:31 -07:00
Peter Hutterer
58d9a4c635 xfree86: fix make distcheck after removal of Domain.note and RAC.Notes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04 15:07:14 +10:00
Peter Hutterer
6fb01c8286 require xf86vidmodeproto 2.2.99.1 or newer. 2009-09-04 12:51:02 +10:00
Peter Hutterer
59e731ef66 xfree86: silence some xf86dgaproto compiler warnings
We already require xf86dgaproto > 2.0.99 since 6fffcd582

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04 12:51:02 +10:00
Peter Hutterer
ead57a1353 xfree86: silence 'unused variable' compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04 12:51:02 +10:00
Martin-Éric Racine
09f0ee1324 Formatted recent Geode PCI ID changes to fit a 80-column coding style. 2009-09-04 04:17:09 +03:00
Martin-Éric Racine
a17b50b130 Further explained what the Geode PCI ID is all about as comments. 2009-09-04 03:51:01 +03:00
Martin-Éric Racine
afd800dae4 Removed unnecessary curly braces for Geode LX PCI ID. 2009-09-04 03:41:08 +03:00
Martin-Éric Racine
842b7a47d5 Updated the PCI Vendor and Device IDs for all Geode variants.
In practice, some of the native drivers for older Geode products
have become deprecated due to lack of e.g. libpciaccess upgrade,
but that's OK, since most distributions don't ship them anymore.
In that case, we'll let X server fall back to good old VESA.
2009-09-04 03:25:32 +03:00
Adam Jackson
17545ed80e randr: Fix crtcs using set_mode_major()
We'd never mark the crtc as active, meaning (among other things) gamma
upload wouldn't work.
2009-09-02 14:40:07 -04:00
Dave Airlie
291408980f vgaarb: protect fini as well just in case 2009-09-02 20:14:30 +10:00
Dave Airlie
8aeadbff08 vgaarb: if arb init fails, make sure locking doesn't occur.
pointed out by Martin Jansa on irc.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-02 19:09:14 +10:00
Michael Witrant
1c37be8098 XFree86: Linux: Fix 100% CPU usage with ShareVTs and kbd
Leave consoleFd open over the course of the server, even though any use
of it in this context is likely to be disastrous.

Signed-off-by: Michael Witrant <mike@lepton.fr>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2009-09-01 11:25:49 +10:00
Matt Turner
5ef53a94ce alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus
xf86SlowBCopyToBus and xf86SlowBCopyFromBus cause segfaults on my
system.

Also remove associated slowbcopy_tobus/slowbcopy_frombus macros.

Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 20:25:15 -04:00
Jeremy Huddleston
a8e634b86d XQuartz: GLX: Drawable does not contain resize anymore.
(cherry picked from commit 1e642f22fb)
2009-08-31 15:59:45 -07:00
Matt Turner
1b30545c04 Make sys.c use compiler.h unaligned access functions
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 16:16:02 -04:00
Matt Turner
9522ab9a98 Remove unused Delay.c
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 16:12:29 -04:00
Matt Turner
4fac13ff88 Remove unused BUSmemcpy.c
BUSmemcpy.c provides xf86BusToMem and xf86MemToBus, which are are memcpy
wrappers written to avoid glibc's memcpy on Alpha. glibc'c memcpy on
Alpha has improved much since this was written, so it's no longer
needed. Neither function is used inside the xserver, and no module on
my machine uses either as well.

Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 16:11:59 -04:00
Matt Turner
b65146fc84 Remove unused ia64_flush_cache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 16:11:10 -04:00
Matt Turner
f201705e29 Simplify unaligned access code
All architectures should be able to use the same unaligned access code,
regardless of whether they need special unaligned access instructions.
Let's let gcc do the heavy lifting.

In the case that we're not using a gcc-compatible compiler, use memmove.

The xserver already requires pixman, so include pixman.h for its uint*_t
types.

Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 16:09:33 -04:00
Matt Turner
3718beb69c Clean up unaligned access functions on alpha
Checks for __GNUC__ are superfluous since the only other compiler for
the platform is Compaq C, and it doesn't support GCC style inline
assembly.

Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 16:08:52 -04:00
Matt Turner
e1fdd76713 Move unaligned access functions to common section
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 16:08:20 -04:00
Matt Turner
628b863bcc Remove unused arm_flush_cache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 15:53:41 -04:00
Matt Turner
a544139196 Remove unused ppc_flush_icache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 15:53:19 -04:00
Matt Turner
52aa049521 Replace 8 nops with proper sync instruction on mips
Cc: Ralf Baechle <ralf@linux-mips.org>
Acked-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 15:52:39 -04:00
Matt Turner
563fa1c5d7 Use sfence and mfence instructions on amd64
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 15:52:10 -04:00
Matt Turner
430c4af0d6 Add x86 barrier macros
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 15:51:41 -04:00
Matt Turner
0d87f77a3f define barrier macros as nops if not otherwise defined
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 15:51:05 -04:00
Matt Turner
1b43ee13b3 Move memory barrier macros into common section
alphabetize by architecture also.

Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-08-31 15:53:58 -04:00
Tiago Vignatti
295e598d9a xfree86: remove _more_ RAC junk
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-31 20:04:51 +03:00
Tiago Vignatti
38627b2eaf xfree86: shut up vgaarb warnings when server doesn't support it
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-31 19:40:25 +03:00
Tiago Vignatti
79182538b4 xfree86: removal of some dead code due VGA arbiter's inclusion
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-31 19:25:48 +03:00
Jeremy Huddleston
6f3cc08ec0 XQuartz: GL: Unset GL_EXT_gpu_program_parameters for Tiger/ppc
See http://trac.macports.org/ticket/20638
(cherry picked from commit 0f3a89d306)
2009-08-31 07:45:50 -07:00
Jeremy Huddleston
fdb29ebeed XQuartz: GL: Explicitly set GL_EXT symbols to 0 if they are not in OpenGL.framework to prevent X11's glext.h from setting them to 1.
(cherry picked from commit 7fe37137d8)
2009-08-31 07:45:40 -07:00
Eamon Walsh
24716b9254 xace: fix up access modes in dixLookupDrawable calls from dri2.
Referencing a screen through a drawable only requires GetAttr access.
Treat dri2 drawables as child windows (Add/Remove access).
Treat getting buffers as intent to read/write the drawable.

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-08-28 23:29:17 -04:00
Adam Jackson
3d17c4f6e1 EDID: Vendor detailed blocks aren't worth X_WARNING about 2009-08-28 12:12:52 -04:00
Adam Jackson
2c1a845521 EDID: Print 1152x864 in established timings, not x870
The spec says x870, but we actually use x864 because that's a real DMT
mode and x870 isn't.  This might or might not be wrong, but we should at
least tell the truth.
2009-08-28 12:09:57 -04:00
Dave Airlie
e454f106dc xf86 ddx: add vga arbiter support.
This adds support for using the libpciaccess interface for
vga arbitration support on top of a kernel which supports it.

Currently patches are queued for kernel 2.6.32 in jbarnes
pci tree, and shipping in Fedora kernel.

Co-authors:
Tiago Vignatti <tiago.vignatti@nokia.com>

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-08-28 11:39:42 +10:00
Peter Hutterer
6fffcd5825 xfree86: require xf86dgaproto 2.0.99.1.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-27 14:26:09 +10:00
Peter Hutterer
16b7ebd7d8 xfree86: Remove xf86GetMotionEvents from public API.
This function was used as the default motion event queue API until
including XINPUT_ABI 2 (server 1.5).

This API was broken with 1883485 in May 2008 (wrong casting of parameters)
and isn't in use by input drivers past ABI 3.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-27 14:24:50 +10:00
Jeremy Huddleston
af76bddd7a XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649)
2009-08-25 20:17:41 -07:00
Jeremy Huddleston
07c935b72f XQuartz: Use applewmproto 1.4 updated headers.
(cherry picked from commit 203df06c0e)
2009-08-25 20:16:47 -07:00
Keith Packard
e7dd1efef4 Ensure that rotation updates happen frequently
The smart scheduler is designed to minimize scheduler overhead by
increasing the interval between WaitForSomething calls when a single
client is running. However, the software rotation code depends on
its BlockHandler being invoked for screen updates; the long delays
caused by the smart scheduler optimizations means that screen updates
can be delayed a long time as well.

The change is simple -- prevent the smart scheduler from increasing
the scheduling interval while any screen is using software rotation.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25 18:14:19 -07:00
Keith Packard
1740cda7a3 Perform rotation redisplay before calling driver block handler (which may flush rendering)
The rotation block handler uses regular driver rendering functions to
repaint the screen, if those functions queue commands in the driver,
it's important that the driver block handler be invoked after the
rotated image is drawn.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25 18:14:19 -07:00
Keith Packard
4aab05e3b3 xf86_reload_cursors: fix cursor position to eliminate jumping after mode set
xf86_reload_cursors restores the cursor to the correct position, but
that must adjust for cursor hot spot and frame before calling down to
the hardware function, otherwise the cursor jumps to the wrong
position until it is repositioned by the user.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25 18:14:19 -07:00
Adam Jackson
ae68708ebe xfree86: dump /proc/cmdline in the log on Linux 2009-08-20 15:45:57 -04:00
Tiago Vignatti
792dee3854 xfree86: remove bus state change notification callback
No one is using bus notifications now. We hope that the kernel take care of
this properly.

For other not-so-urgent-notifications (ACPI wakeups, etc) we can just register
a handler on server's scheduler (using xf86AddGeneralHandler). And for
external applications, the "trend" is to use HAL to kick notifications. So
we're already provided of enough notification schemes.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2009-08-20 13:57:45 +03:00
Alan Coopersmith
2d34eace13 Sun bug 6872917: Xorg not querying /dev/fb when no xorg.conf exists
commit 48ee555833 (OpenSolaris VT support)
broke the autoconfiguration code in xf86AutoConfig.c that uses the
Solaris-specific VIS_GETIDENTIFIER ioctl on a frame buffer device like
/dev/fb by changing xf86Info.consoleFd from /dev/fb to a /dev/vt/*
device.

This fixes it by reworking the code to split the console device
(/dev/vt/*, the vtXX CLI option) from the frame buffer device
(/dev/fb, -dev option) to allow both VT and autoconfig to work.

It also fixes the console device to use /dev/fb when VT's are not
supported instead of throwing a Fatal Error because it can't open
/dev/vt/0.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-08-18 20:18:36 -07:00
Jesse Barnes
d225230148 xfree86/linux: don't change VT perms unless we're running as root
In non-setuid root installations, we shouldn't try to adjust VT/tty
ownership.  It will fail, and shouldn't be necessary anyway (since
startup scripts or PAM should be handling perms for us in that case).

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2009-08-18 12:15:32 -07:00
Tiago Vignatti
41884b8f4d xfree86: remove unused code (xf86Configure.c)
The xorg.conf generator was not assigning correctly the primary device
("bootable") as screen zero. So just skip this kind of routines for now.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-18 15:50:55 +03:00
Tiago Vignatti
097376266f xfree86: remove unaffected code (xf86Configure.c)
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-18 13:13:57 +03:00
Tiago Vignatti
dd8960a9f3 xfree86: remove stupid macro (xf86Configure.c)
It was confusing more instead helping.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-18 12:53:47 +03:00
Tiago Vignatti
4ec7667bb1 xfree86: remove wrong commentary
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-18 12:33:35 +03:00
Tiago Vignatti
2e8c2b8ae6 xfree86: header clean up (xf86Configure.c)
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-18 12:28:15 +03:00
Tiago Vignatti
2df414a333 xfree86: reorganize xf86Configure.c
No semantical changes. Only code moved around.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-18 12:19:35 +03:00
Tiago Vignatti
113e66a1ff xfree86: remove unused PCI header
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-18 12:19:34 +03:00
Aaron Zang
48ee555833 Add new VT support for OpenSolaris & future Solaris releases
Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-08-13 21:56:06 -07:00
Alan Coopersmith
613e76ff90 Remove support for Solaris x86 releases older than Solaris 8
If you want to run a pre-1999 kernel, you'll need a pre-2009 X server

[Some pre-Solaris 8 VT support is left by this patch to allow reuse by
 the new Solaris VT support that follows in the next patch.]

Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-08-13 21:56:05 -07:00
Matt Turner
8ce4fde76f Fix build on Alpha 2009-08-12 14:45:13 -04:00
Colin Harrison
a400dbb38f Xming: Add NET_WM_ICON to native icon conversion
fd.o bugzilla #4491
originally from a patch by Joe Krahn <jkrahn@nc.rr.com>

Convert a NET_WM_ICON to a native icon by converting to a native
bitmap and then using CreateIconIndirect()

Don't use icon alpha on Windows 2000 or if display isn't 32-bit, convert
alpha channel to a 1-bit transparency mask using a threshold value

Fix warning in winScaleXBitmapToWindows() about signedness of *iconData

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-08-12 17:56:06 +01:00
Dave Airlie
e94c7c42ce parser: make libxf86config_internal.la not installed. 2009-08-07 13:36:52 +10:00
Dave Airlie
5fb188b547 ddx: fix xf86Config.a generation
We were generating a shared library, but this lib is foobar, the parser
requires some symbols from the X server or from the program its being linked
into. If the program its being linked into (say a python .so) has symbol
visibility enabled then it will fail to dynamic link, also if this .so has
symbol visiblity enabled it will fail to dynamic link.

Screw it go back to a .a file really unless someone cleans it up properly.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-08-07 12:05:51 +10:00
Jeremy Huddleston
931160fcf3 XQuartz: AIGLX: Provide empty __glXAquaDrawableResize to avoid crashing in DoMakeCurrent
(cherry picked from commit 60a1d2c276)
2009-08-05 16:17:47 -07:00
Jeremy Huddleston
0fe639a314 XQuartz: Only save lastpt on mouse/tablet events
(cherry picked from commit 552be074e5)
2009-08-05 16:17:33 -07:00
Jeremy Huddleston
491c2d74c1 XQuartz: Use mouseLocation rather than locationInWindow when setting lastpt
I don't understand the *why* ... I just see that it works better this way for games like Quake2 through wine.  It *should* be better the other way, but somehow it's not.

I guess this will go in my list of puzzles to unravel.
(cherry picked from commit 65ae2d00e1)
2009-08-05 16:17:22 -07:00
Jeremy Huddleston
df6c013524 XQuartz: Don't use location delta for tablets since NSEvent does not give a precise delta.
(cherry picked from commit 6c5bf756a7)
2009-08-05 16:17:09 -07:00
Jeremy Huddleston
e360104880 XQuartz: Purge redundant QuartzBell
(cherry picked from commit de14a63d20)
2009-08-05 16:17:01 -07:00
Tiago Vignatti
8c0085c715 xfree86: remove more RAC junky
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-05 22:52:35 +03:00
Tiago Vignatti
444723273a xfree86: reorganize pci code
- xf86PciVideoInfo doesn't need to be global
- remove unused macros

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-05 22:48:02 +03:00
Tiago Vignatti
20169414e1 xfree86: remove unused functions
RAC trash.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-08-05 22:44:19 +03:00
Peter Hutterer
5904ef2ccd xnest: restore xnestUpdateModifierState
The meat of xnestUpdateModifierState was ifdef'd out in
6ef46c40e6. This resulted in stuck modifiers
when a modifier key release event wasn't sent to Xnest (e.g. Alt-Tab away).

See X.Org Bug 3664 <https://bugs.freedesktop.org/show_bug.cgi?id=3664> for
the original bug report.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 10:45:20 +10:00
Peter Hutterer
44afc7577a xnest: include exevents.h for XIGetKnownProperty.
Silences compiler warning.
Pointer.c: In function ‘xnestPointerProc’:
Pointer.c:64: warning: implicit declaration of function ‘XIGetKnownProperty’
Pointer.c:64: warning: nested extern declaration of ‘XIGetKnownProperty’

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 10:45:20 +10:00
Peter Hutterer
32ce5c83a5 xnest: use AllocDevicePair for Xnest device initalization
All Xnest needs is a single pointer+keyboard pair. AllocDevicePair sets them
up nicely with the name assigned etc.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 10:45:17 +10:00
Peter Hutterer
6a500fdd4d dmx: include exglobals.h for DeviceKeyPress and friends.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 08:02:17 +10:00
Peter Hutterer
591c2f8758 dmx: typecast to InternalEvent* before mieqEnqueue.
Silences a few compiler warnings.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 08:01:55 +10:00
Peter Hutterer
15b425b5a6 dmx: move 'state' around to silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 08:01:45 +10:00
Peter Hutterer
e10f802c82 dmx: include inputstr.h for inputInfo.pointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 08:01:37 +10:00
Peter Hutterer
9ffc3f280b dmx: don't call InitKbdFeedbackClassDeviceStruct - doesn't exist anymore.
InitKeyboardDeviceStruct does the same task now.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 08:01:28 +10:00
Peter Hutterer
63155cf985 dmx: pass button/axis labels into the init functions (currently unset)
Currently only None labels are passed in, in the future these labels should
be whatever the respective buttions/axes are.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 08:00:08 +10:00
Peter Hutterer
af85973a0a dmx: remove now-useless defines.
XI is mandatory so we can expect both to be defined.
2009-08-05 07:59:45 +10:00
Peter Hutterer
654d7a0260 Revert "dmx: claim we support XI 2."
XQueryInputVersion doesn't exist anymore and for now XI 1 support is good
enough.

This reverts commit 8da8a0fec4.
2009-08-05 07:59:39 +10:00
Peter Hutterer
e7c950c627 dmx: fix a call to XkbSetRulesDflts, takes XkbRMLVOSet now. 2009-08-05 07:59:33 +10:00
Peter Hutterer
2cde9208ff dmx: Enable/DisableDevice take a boolean variable now.
We want to send events here, so pass in TRUE.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-05 07:59:16 +10:00
Michel Dänzer
842373104d Add support for RENDER BGRA formats. 2009-08-04 23:23:21 +02:00
Alan Coopersmith
0bf7eaf305 Ansify function arguments in VTsw_noop.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-08-03 23:16:17 -07:00
Lee Leahu
b159a98f7f seg fault when initializing DMX screens
X.Org Bugzilla #18086: http://bugs.freedesktop.org/show_bug.cgi?id=18086
Patch #19837: http://bugs.freedesktop.org/attachment.cgi?id=19837
2009-08-03 20:23:33 -07:00
Alan Coopersmith
5da9b255a6 Fix blddir != srcdir builds of solaris-*.il files
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17509

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-08-03 19:54:57 -07:00
Peter Hutterer
1e69fd4a60 xnest: fix up parameters to InitKeyboardDeviceStruct.
IKDS takes a DeviceIntPtr as first argument, and an RMVLO struct as second.
The keysyms stuff is long gone now.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-03 12:04:11 +10:00
Peter Hutterer
008658049c xnest: silence compiler warnings by typecasing properly.
Events.c: In function ‘xnestQueueKeyEvent’:
Events.c:112: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c: In function ‘xnestCollectEvents’:
Events.c:141: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:150: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:160: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:193: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-03 12:01:23 +10:00
Oliver McFadden
b83c682e7e xf86Xinput: xf86PostButtonEventP must set POINTER_ACCELERATE for relative events.
Thanks to Peter Hutterer for spotting this bug.
2009-08-03 02:50:01 +03:00
Jeremy Huddleston
ae65daab08 XQuartz: Unify how we set our bitmasks for visuals
(cherry picked from commit c230b52c27)
2009-07-31 15:34:13 -07:00
Jeremy Huddleston
4a53fed41d XQuartz: Dead code removal for StaticColor visual
(cherry picked from commit e457a44e87)
2009-07-31 15:34:07 -07:00
Jeremy Huddleston
da0a274780 XQuartz: Cleanup the bitmask setting for GLX visuals.
(cherry picked from commit d32c3df258)
2009-07-31 15:34:03 -07:00
Jeremy Huddleston
70ac671af2 XQuartz: no DirectColor
(cherry picked from commit df2fbc410f)
2009-07-31 15:33:58 -07:00
Jeremy Huddleston
c0c72a866a XQuartz: Define DDXRingBell
(cherry picked from commit 1133473812)
2009-07-31 15:33:54 -07:00
Oliver McFadden
8da0ff2d51 xf86Xinput: Add the xf86Post(Proximity|Button|Key)EventP helper functions.
xf86PostKeyboardEvent also makes use of xf86PostKeyEventP to avoid code
duplication, and the valuator verification has been split into the
XI_VERIFY_VALUATORS macro.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-07-30 08:43:13 +10:00
Peter Hutterer
4e9b2938cd include: untangle events.h from the SDK headers.
InternalEvents shouldn't be used anywhere outside the X server itself. Split
up into events.h for opaque typedefs for the events needed by various
headers and eventstr.h for the actual struct definitions.

eventstr.h must only be included by code that requires internal events and
is not part of the SDK.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-07-30 08:43:13 +10:00
Colin Harrison
de2ae521ab Xming: Use RegisterClassEx() instead of superseded RegisterClass()
RegisterClass is supserseded by RegisterClassEx, so change to using that everywhere

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-07-29 17:05:17 +01:00
Colin Harrison
764ce6ee68 Xming: Use GetClassLongPtr() instead of superseded GetClassLong()
GetClassLong() is superseded by GetClassLongPtr(), so change to using that
2009-07-29 17:05:15 +01:00
Jeremy Huddleston
a85523dc50 XQuartz: Avoid a possible spinlock in applicationWillTerminate
(cherry picked from commit f430cda0fd)
2009-07-28 22:54:11 -07:00
Jeremy Huddleston
1e49c8d340 XQuartz: Avoid namespace collission for BOOL in Sparkle
(cherry picked from commit 227c6e01a6)
2009-07-28 22:54:06 -07:00
Tiago Vignatti
52e9ef5664 xfree86: remove some RAC junk
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-28 19:04:59 +03:00
Tiago Vignatti
d57361bb9a doc: remove outdated PCI/RAC/Domain notes
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-28 18:56:40 +03:00
Tiago Vignatti
7b3d05ebd5 xfree86: remove pci debug macros
there's no effect when their are enabled.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-28 18:45:16 +03:00
Tiago Vignatti
6089d9cfde xfree86: remove RAC/resource doc
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-28 18:29:35 +03:00
Tiago Vignatti
c553161e17 xfree86: delete devices probe code (-probe and -probeonly options)
Inside a windowing system, it's not the place to probe for devices. Goodbye
-probe and -probeonly.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-28 18:20:22 +03:00
Tiago Vignatti
c09779f95a xfree86: delete stupid video driver dump (-modalias option)
Such stupid and ugly way to dump PCI information! Oh boy... Anyway, this
doesn't belong to the X server at all. Go away!

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-28 18:20:18 +03:00
Colin Harrison
0524420622 Cygwin/X: use GWLP_WNDPROC, GWLP_USERDATA with Get/SetWindowLongPtr
Missed from commit b3751454cb

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-07-28 15:17:47 +01:00
Dave Airlie
8898203b0d sbus: fixup for rac removal 2009-07-28 19:35:37 +10:00
Dave Airlie
4b42448a23 xserver: remove RAC/resource handling code.
This changes the ABI, but since the video ABI is at 6 already
it should be fine.

driver changes are in the pipeline after this.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-07-28 15:14:28 +10:00
Dave Airlie
0a168401c4 pci: add support for pci is boot vga call.
This allows us to ask the kernel for the boot VGA device
instead of nasty guessing.
2009-07-28 14:19:24 +10:00
Colin Harrison
b3751454cb Cygwin/X: Update Get/SetWindowLong() to Get/SetWindowLongPtr() everywhere
Get/SetWindowLong() is superseded by Get/SetWindowLongPtr(), so change to
using that everywhere it remains

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-07-26 15:15:37 +01:00
Jeremy Huddleston
c81595e23b XQuartz: Overhaul setting up visuals
The main change is cleanup of the visualConfigs and setting up alpha correctly there to match the visuals being added earlier (so the default visual has a corresponding GLX visual)
(cherry picked from commit 7351db5c87)
2009-07-26 02:35:49 -07:00
Jeremy Huddleston
7f28c555b8 XQuartz: Use CopyKeyClass to copy the keymap to the virtual core keyboard.
(cherry picked from commit 9a801d1716)
2009-07-25 20:19:05 -07:00
Jeremy Huddleston
1031ac3a73 Revert "XQuartz: Copy the keyboard map to the core keyboard"
This reverts commit 795de791cf.
2009-07-25 20:18:38 -07:00
Jeremy Huddleston
48703083a1 XQuartz: Use pDev=NULL for DarwinSendDDXEvent
These events aren't really related to physical input devices anyways, so it doesn't make sense to use the pointer.
(cherry picked from commit bfe0b9cfa7)
2009-07-25 20:18:15 -07:00
Jeremy Huddleston
dab8de0368 XQuartz: Bump the reported version to X11R7.4
(cherry picked from commit c83f701aa7)
2009-07-25 15:25:35 -07:00
Jeremy Huddleston
9e74bb97ab XQuartz: xpr: Added missing include for RootlessHideAllWindows
(cherry picked from commit 75e1047308)
2009-07-25 15:25:23 -07:00
Jeremy Huddleston
09b024db63 XQuartz: Use the master device in DarwinSendDDXEvent to avoid duplicate events.
(cherry picked from commit 6fa62192af)
2009-07-25 15:25:17 -07:00
Jeremy Huddleston
795de791cf XQuartz: Copy the keyboard map to the core keyboard
This still doesn't handle the modifier map... gotta figure out what to do now that SwitchCoreKeyboard is gone
(cherry picked from commit 427e1aab41)
2009-07-25 15:25:06 -07:00
Jeremy Huddleston
fb46474feb XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated relaunch." change
This was in place to work around the issue that was correctly solved with the
previous commit (changing the Windows menu behavior).  Reverting this change
no longer causes crashing, so it's safe to show the dialog now.
(cherry picked from commit 023cef31bb)
2009-07-24 09:42:18 -07:00
Jeremy Huddleston
0d73893a57 XQuartz: Change handling of Windows menu to workaround a bug triggered by mixing Sparkle and X11 windows
<rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
(cherry picked from commit 27ac513526)
2009-07-24 09:42:00 -07:00
Jeremy Huddleston
171409cecb XQuartz: Set can_quit to true during a Sparkle-initiated relaunch.
(cherry picked from commit b2e9a77111)
2009-07-24 09:41:46 -07:00
Jeremy Huddleston
7ff84d350b XQuartz: Added a "Check for X11 Updates..." menu item.
(cherry picked from commit 305144bfa4)
2009-07-24 09:41:32 -07:00
Tiago Vignatti
1e1dbd1e46 xfree86: "Staticize" functions in xf86AutoConfig.c
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2009-07-24 13:25:42 +03:00
Jon TURNEY
afc3e3b595 Cygwin/X: winInitMultiWindowClass() should be static
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-07-21 16:19:40 +01:00
Michel Dänzer
9dc8106ba0 randr12: Add compatibility for XF86VidMode gamma ramps.
Fixes screensaver fadeout effects.

Also make all RandR 1.2 compatibility code for XF86VidMode operate only on the
CRTC associated with the compatibility output, not all CRTCs at once.
2009-07-21 14:34:47 +02:00
Jeremy Huddleston
be4dd35ffe XQuartz: Initial support for automatic updates through Sparkle
(cherry picked from commit c45f1be364)
2009-07-20 22:04:18 -07:00
Adam Jackson
a98acb2907 s/xf86EnableOutputs/xf86CollectEnabledOutputs/ for clarity 2009-07-17 15:23:39 -04:00
Adam Jackson
8fab7f72f2 randr: Add Option "Primary" to Monitor sections 2009-07-17 15:23:30 -04:00
Adam Jackson
053bb92145 xfree86: Remove xf86SetPriority
GetClocks is pretty doomed to begin with, this really isn't going to
make it worse.
2009-07-17 15:03:57 -04:00
Adam Jackson
3637945a45 loader: Remove a useless check. 2009-07-17 15:03:57 -04:00
Adam Jackson
ef2bb08c76 loader: remove dead LoaderCheckUnresolved 2009-07-17 15:03:57 -04:00
Adam Jackson
06a2784232 loader: Remove useless TestFree() macro 2009-07-17 15:03:57 -04:00
Adam Jackson
087745b809 fbdevhw: Remove pointless OS check, this never gets built on non-Linux 2009-07-17 15:03:56 -04:00