Commit Graph

8692 Commits

Author SHA1 Message Date
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
d3a3c904e5 configure: resourceproto is optional.
Although a --disable-xres flag is provided, resourceproto was listed in
REQUIRED_MODULES since 2005 (5b218617fa).
Remove, make conditional on the xres flag only.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-21 12:12:22 +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
aa71e268f5 Xext: silence 'warning: no previous prototype' for sync, bigreq and xcmisc.
xcmisc and bigreq don't have their own header so just declare it here to
shut up the compiler.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-21 09:17:56 +10:00
Peter Hutterer
00dfe69aab randr: reply with the server or client version, whichever is lower.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-21 08:12:02 +10:00
Peter Hutterer
8b75d0f9d3 render: reply with the server or client version, whichever is lower.
Protocol requires that the lower of [server version, client version] is
returned to the client.

The other part of the issue discussed in reply to [1] remains.
[1] http://lists.freedesktop.org/archives/xorg-devel/2009-September/001990.html

Reported-by: Julien Cristau

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-21 08:12:00 +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
2df10a4986 RRDestroyOutputProperty: Free randr property valid values
These were leaked when the property was destroyed.

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
d3a84906c0 Free randr crtc and output pointer arrays
All of the crts and outputs were freed, but not the arrays full of
pointers to them.

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
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
Keith Packard
8b5086250a Eliminate bogus event resizing.
Now that all event queues hold internal events only, they never need
to be resized. Resizing them led to memory corruption as they would
get sized for an appropriate xEvent, not an internal event.

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
Thomas Jaeger
971d4eac12 Xext: include security protocol header instead of client header
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 19:57:01 +10:00
Thomas Jaeger
a62664bc07 Bump fixesproto requirement to 4.1
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 19:56:48 +10:00
Thomas Jaeger
2a890d85e9 fixes: Make sure invisible cursor is inialized with zero src/mask
This fixes a regression introduced in 9040dab761.

Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-20 19:15:52 +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
Carl Worth
1888d7d3e3 configure: Fix broken quoting for initialization of REQUIRED_MODULES
A recent change switched to C-style automatic string concatenation,
(presumably for better readability and maintainability), but this
doesn't actually work for the shell. So we revert to the previously
working initialization.

This commit reverts one hunk of c947605eda
2009-09-18 11:10:53 -07: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
Peter Hutterer
d044027510 Require dmxproto 2.2.99.1
This requirement was introduced in code with commit
e85775aa64.

Reported-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-18 08:23:33 +10:00
Peter Hutterer
c947605eda configure.ac: move all protocol requirements to a single location.
Protocol requirements were spread throughout configure.ac, leaving us with a
few locations where one DDX asked for a different version of the package
than another.
For each protocol, define <NAME>PROTO="[<name>proto >= version]" and
assemble REQUIRED_MODULES based on these.

Future changes to protocol versions need to only be done in a single place.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-18 08:23:32 +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
715953bf5c Check for -wrap support in the linker
Allows unit tests to be built with non-gnu-linkers that
also have -wrap support

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
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
139368f7ae Fix num_masks/length overflow test for XiSelectEvents
Have to set windowid to a valid value first, since that check
appears earlier in the code than the masks/length check.

Also have to have data[] set large enough so that reading mask
data for 0xFFFF masks doesn't overflow past the end of the array
into uninitialized data.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-16 11:44:08 +10:00
Alan Coopersmith
13decf5efe test_convert_XIRawEvent: Don't write more data than the struct holds
sizeof(in.valuators.mask) * 8 == 40, but the valuators arrays only
holds 36 entries, so the test was smashing the stack when 36 < i < 40
(leading to core dumps on Solaris x86, since the return address was
 overwritten with an invalid pointer).

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
Alan Coopersmith
38a61e9a7c Remove stray semi-colon in protocol-common.c
Caused Sun compilers to issue warning:
"protocol-common.c", line 141: warning: syntax error:  empty declaration

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
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
Peter Hutterer
663807ce0e xserver 1.6.99.901 (xserver 1.7 RC1)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 16:44:52 +10:00
Soeren Sandmann
f450be9992 Add xoff and yoff to drawable->x and drawable->y in create_bits_picture().
These are 0, except when the drawable is a redirected window.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 16:09:37 +10: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
4650e6ebe6 xkb: drop key presses for already repeating keys. (#23889)
The event sequence for continuously pressed keys with the keyboard driver is
PRESS - PRESS - PRESS - ... - RELEASE.
The first press sets the repeatKey to the keycode and the matching timer.
The second press (on the same keycode) can be silently dropped instead of
overwriting the timer again.

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
2009-09-14 12:54:27 +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
Peter Hutterer
d3c66d6b69 dix: FindChildForEvent needs init child to None.
silences compiler warning:
events.c: In function 'FixUpEventFromWindow':
events.c:2262: warning: 'child' may be used uninitialized in this function

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-14 09:32:53 +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