Commit graph

2203 commits

Author SHA1 Message Date
José Fonseca
498020054a Fix merge. 2007-10-06 18:32:10 +01:00
Alan Hourihane
381be46465 Don't link XGL_LIBS in xgl
Link glucose in with libxgl to pull in symbols.
2007-09-28 16:56:42 +01:00
José Fonseca
ac41255d56 Factor-out glucose symlinked code from xgl into a common library. 2007-09-26 16:43:56 +00:00
José Fonseca
25363e5b83 Don't include compint.h when COMPOSITE is not defined. 2007-09-21 12:48:57 +01:00
José Fonseca
e72b8dd7c0 Merge commit 'origin/master' into glucose-2 2007-09-20 23:38:28 +01:00
José Fonseca
a2cf360909 Mimic the changes of the glx server interfaces in the wrapper functions
so that we can get the benefit of compiler type checking.
2007-09-20 23:21:32 +01:00
José Fonseca
8231b546d3 Use new __glXDrawableInit interface. 2007-09-20 14:10:09 +01:00
Ben Byer
c140d20f4a XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore 2007-09-19 05:58:22 -07:00
Ben Byer
bcb5e3e627 XDARWIN: More fixes to Makefile.am
At least on my system (10.5 with the latest and greatest modules),
Xquartz now builds out of the box.  It doesn't quite work yet, but
hey -- you have to start somewhere. ;)
2007-09-19 04:46:10 -07:00
José Fonseca
00d28c084f Dynamically load glxext.so with RTLD_DEEPBIND to avoid picking up duplicate
symbols from libGL.so.
2007-09-19 11:56:19 +01:00
Ben Byer
5e209b21f3 XNEST: removed obsolete hack to build under Darwin 2007-09-19 03:44:46 -07:00
Ben Byer
378c7ebef4 XVFB: Removed obsolete hack to build on Darwin 2007-09-19 03:43:40 -07:00
Ben Byer
7813392d1c XDarwin: changes to Makefile.am to use new conditionals 2007-09-19 01:53:18 -07:00
José Fonseca
41a5aee385 Prevent promotion to unsigned when calculating strides. 2007-09-17 19:11:03 +01:00
Tilman Sauerbeck
a0dafd95e1 Removed hw/xwin/winpntwin.c from Makefile.am.
winpntwin.c was removed in e4d11e58ce.
2007-09-17 17:40:28 +02:00
José Fonseca
79677d094c Update keyboard event code to prevent crash on key input. 2007-09-15 12:32:48 +01:00
José Fonseca
0bc3ae7052 Remove the __glXMesaProvider stub and references to it to avoid symbol clash at run-time. 2007-09-13 18:14:39 +01:00
José Fonseca
d503862a02 Bring more build fixes from xgl-0-0-1. 2007-09-13 12:31:16 +01:00
José Fonseca
0bfc278705 Add stubs to satisfy linking references. 2007-09-13 11:33:08 +01:00
Eric Anholt
e4d11e58ce Remove the PaintWindow optimization.
This was an attempt to avoid scratch gc creation and validation for paintwin
because that was expensive.  This is not the case in current servers, and the
danger of failure to implement it correctly (as seen in all previous
implementations) is high enough to justify removing it.  No performance
difference detected with x11perf -create -move -resize -circulate on Xvfb.
Leave the screen hooks for PaintWindow* in for now to avoid ABI change.
2007-09-13 00:08:53 +00:00
José Fonseca
1d7403a1c2 Revert xkbsrv.h include rename, per Daniel Stone. 2007-09-12 22:27:43 +01:00
José Fonseca
0362a4bbd2 Add dummy DDXRingBell. 2007-09-12 22:24:27 +01:00
José Fonseca
fcc1e37f36 Remove duplicate function. 2007-09-12 22:22:59 +01:00
José Fonseca
d40ddb9421 Bring GLX interface updates from xgl-0-0-1-branch. 2007-09-12 21:33:46 +01:00
David Reveman
623f5b0272 XVideo improvements 2007-09-12 20:54:54 +01:00
José Fonseca
e41c42a827 Bring GLX updates from xgl-0-0-1-branch.
Cherry-picking patches:

	9fb911fe06 and
	4341944d09
2007-09-12 20:48:53 +01:00
José Fonseca
a2f96d3135 Update for input interface changes. 2007-09-12 19:24:07 +01:00
José Fonseca
ff22e3d2a9 Use LIBDRM_CFLAGS. 2007-09-12 19:01:04 +01:00
José Fonseca
c13e2a941d Merge branch 'master' into glucose-2
Conflicts:

	fb/fb.h
	fb/fbcompose.c
	fb/fbmmx.c
	fb/fbmmx.h
	fb/fbpict.c
	fb/fbtile.c
	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
	hw/xgl/xglcompose.c
	render/picture.c
	render/picture.h
	render/picturestr.h
2007-09-12 17:43:33 +01:00
Brice Goglin
43dc410347 Replace a non-ascii char with the corresponding groff escape in exa.man.pre 2007-09-12 01:43:37 +02:00
Dodji Seketeli
e8c73ac697 Xephyr: fix compilation breakage.
* hw/kdrive/ephyr/ephyr_draw.c:
          (exaDDXDriverInit): pExaScr->hideOffscreenPixmapData does not exist
          anymore, so don't set it.
2007-09-11 00:20:45 +02:00
Ben Byer
0ff273fd1e XDARWIN: fixes to make Xquartz build again 2007-09-09 16:29:08 -07:00
Ben Byer
f8637137ab XDARWIN: build fix for quartz/pseudoramiX.c 2007-09-09 16:29:08 -07:00
Alan Hourihane
84eb7e6224 Fix Xdmx build 2007-09-06 13:37:24 +01:00
Ben Byer
35ec8b89f4 DDX changes for XDarwin
Creating a real DDX section for XDarwin instead of
stuffing it into the XORG section in a half-assed manner.
2007-09-06 05:34:14 -07:00
Daniel Stone
81c28ffd2b Fix key repeats during VT switch.
Add keyc->postdown, which represents the key state as of the last mieqEnqueue
call, and use it when we need to know the posted state, instead of the
processed state (keyc->down).  Add small functions to getevents.c to query and
modify key state in postdown and use them all through, eliminating previously
broken uses.
2007-09-05 17:46:23 -07:00
Keith Packard
accd71bda6 Deliver correct event when releasing keys on VT switch.
In commit 41bb9fce47, the event delivery loop
for Xinput enabled keyboards was changed and accidentally used the wrong
index variable, causing random events to be delivered when returning from VT
switch.

In addition, in commit aeba855b07,
SIGIO was blocked during delivery of these events, but not for the entire
period the xf86Events array was being used. Block SIGIO for the whole loop
to avoid other event delivery from trashing the key release events.
(cherry picked from commit aa7ed1f5f3)
2007-09-05 14:56:56 -07:00
Ben Byer
8b77dc7e80 XDARWIN: build breakage fix 2007-09-05 14:48:38 -07:00
Ben Byer
ff01e44e33 Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/xserver 2007-09-05 13:56:08 -07:00
Ben Byer
8ba8c16af7 build fixes for XDarwin 2007-09-05 13:46:30 -07:00
Eric Anholt
47300ed2be Fix server version reporting to be the server package version.
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense.  Instead, just
report the package version.

When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch).  The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).

This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now.  While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.
2007-09-05 12:43:28 -07:00
Dodji Seketeli
6c89d1237c Kdrive: unbreak kdrive linking
* configure.ac: re-sort Kdrive libs so that symbols get properly resolved.
          Basically, all some libs are present in both $KDRIVE_LIBS and $XSERVER_LIBS,
          and some libs orders are not correct. So I made sure Kdrive servers don't have
          to link against $KDRIVE_LIBS  *and* $XSERVER_LIBS. They just have to link
          against $KDRIVE_LIBS now.
        * hw/kdrive/*/Makefile.am: update those makefile to reflect the change in configure.ac
2007-09-05 17:46:49 +02:00
Ben Byer
28e48cd8e6 Another pathname fix for event_status_driver.h 2007-09-05 04:43:17 -07:00
Ben Byer
b6c0697fd6 fixed path for event_status_driver.h
(The path currently used is deprecated on Tiger and invalid on Leopard.)
2007-09-05 04:40:03 -07:00
Ademar de Souza Reis Jr
eb6a933dc6 Add xorg.conf man section about catalogue:<dir> FPE
catalogue:<dir> FPEs were introduced in libXfont 1.2.9
2007-09-04 17:20:27 -07:00
Gerte Hoogewerf
d67e210f34 Add stub symbols to make xprint build. 2007-09-04 16:09:38 -07:00
Eric Anholt
f7f79724fd Increase despair by fixing xprint build after my _DEPENDENCIES changes. 2007-09-04 16:08:13 -07:00
Ian Romanick
e89d16be07 Revert part of 529acb1754 because libtool is smart. 2007-09-04 14:49:49 -07:00
Egbert Eich
735da3dcd0 Fixing xf86I2CGetScreenBuses(), now dereferencing the correct pointer. 2007-09-04 16:42:57 +02:00
Egbert Eich
7c5de093d4 Fixing sig11 in xf86I2CGetScreenBuses().
Dereferencing a pointer once too often caused a
sig11 in xf86I2CGetScreenBuses().
2007-09-04 15:15:23 +02:00