Jeremy Huddleston
f3042a63be
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fed
)
2007-12-21 01:24:43 -08:00
Eamon Walsh
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Peter Hutterer
3a058456e0
mi: unify ErrorFs, prepend [mi]
2007-12-07 20:23:36 +10:30
Keith Packard
33b94da632
Re-add call to XFixesExtensionInit for static servers.
...
This reverts a portion of bcbaf2a0ce
which
removed the call to XFixesExtensionInit and some cpp lines.
2007-11-23 16:01:11 -08:00
Jeremy Huddleston
bcbaf2a0ce
Darwin: Dead code removal, Code cleanup, Added launcher
...
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
2007-11-21 19:52:11 -08:00
Eamon Walsh
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
Ben Byer
ce7cfbe261
Fixed check to refer to DarwinApp, not all Darwin targets
2007-11-08 20:10:51 -08:00
Peter Hutterer
0b729051c0
Merge branch 'master' into mpx
...
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Kristian Høgsberg
a5546a99ac
Change the GLX module to initialize after COMPOSITE.
...
This changes the module initalization order so that the GLX module initializes
after COMPOSITE. The reason for this change is to be able to initialize a
GLX visual config for the COMPOSITE ARGB visual.
2007-10-29 18:14:18 -04:00
Eamon Walsh
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
Kristian Høgsberg
7d74690536
Simplify and clean up GLX visual initialization.
...
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
2007-10-18 21:03:43 -04:00
Eamon Walsh
baabae623b
xselinux: Started reworking extension using new XACE hooks.
2007-10-17 13:54:56 -04:00
Eamon Walsh
d445d2f22b
security: drop the "declare extension security" dix call. Use the
...
SecurityPolicy configuration file instead.
2007-08-03 10:56:18 -04:00
Peter Hutterer
5e43910929
Add GenericEvent extension to Xext.
...
This adds (unconditional) support for the GE extension. Anything from now on
that sends events in MPX will have to use the GE extension. No GE, no MPX
events. GE is not actually used yet from anywhere with this commit.
You will need to update x11proto, xextproto, libX11, libXext and xcb to the
matching xge branches. Things will _NOT_ work without the updated protocol
headers and libraries.
2007-04-30 12:57:42 +09:30
Eamon Walsh
23fc429aad
Merge branch 'master' into XACE-SELINUX
2007-03-05 12:18:54 -05:00
Ben Byer
d287b76471
cleaned up some linking ugliness in hw/darwin/quartz
2007-02-17 03:47:42 -08:00
Ben Byer
cf4994b0db
dix mods for Darwin
2007-02-17 01:21:43 -08:00
Eamon Walsh
a7f4bbea87
Add SELinux extension to the module/extension loader.
2006-12-12 13:27:02 -05:00
Eamon Walsh
5e946dd853
Bug #8937 : Extension setup functions not called on server resets
2006-11-07 13:50:19 -05:00
Daniel Stone
4dd91c45ab
miinitext: Xi and XKB are not hardware-only extensions
...
Xi is now a required extension, and XKB can be used without hardware,
so include them both when NO_HW_ONLY_EXTS is defined.
2006-10-23 02:50:03 +03:00
Alan Coopersmith
c2535f6792
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-10 10:37:59 -07:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Drew Parsons
bb3aa94845
Bug #7346 : Disable Composite extension in Xprt
...
Xorg Bug #7346 <https://bugs.freedesktop.org/show_bug.cgi?id=7346 >
Patch #6184 <https://bugs.freedesktop.org/attachment.cgi?id=6184 >
2006-07-11 18:26:55 -07:00
Alan Coopersmith
a46c06dab8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
Xext/appgroup.c
Xext/security.c
dix/devices.c
dix/dispatch.c
dix/dixutils.c
dix/events.c
dix/extension.c
dix/property.c
dix/window.c
os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith
d44b2a0a57
Move Xserver API for security extension to securitysrv.h
2006-06-20 18:22:51 -07:00
Eamon Walsh
8d9ccc90a5
Add XACE extension
...
(partially cherry picked from 8d4f21ab53
commit)
2006-06-19 16:35:03 -07:00
Greg Kroah-Hartman
96c19a3ec1
put function prototype for ShapeExtensionInit() in proper place
...
based on FIXME in mi/miinitext.c
2006-06-09 09:51:28 -07:00
Greg Kroah-Hartman
40fb7eecaf
fix noDamageExtension warning in Xprint/Init.c
...
Also took out duplicate definition of this variable in mi/miinitext.c
2006-06-08 10:11:17 -07:00
Daniel Stone
a9ed5a8790
Kill LBX, too.
2006-06-01 22:06:41 +00:00
Daniel Stone
a73e0f8cdf
Die XTESTEXT1, die!
2006-06-01 18:47:47 +00:00
Kristian Høgsberg
c3342c8000
Merge accel_indirect branch to HEAD.
2006-03-12 00:11:34 +00:00
Adam Jackson
3fe482c77e
Mark everything in misym.c as _X_EXPORT.
2006-02-15 19:05:55 +00:00
Adam Jackson
53dbd00a75
Remove remaining #ifdef DPSEXT stanzas.
2006-01-08 23:43:54 +00:00
Adam Jackson
13c9e0c094
Bug #5525 : Build a working Xprt. (Drew Parsons)
2006-01-06 23:06:15 +00:00
Eric Anholt
d6646307f0
Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in
...
miinitext in the XGL case. Prevents mismatched structure sizes on my
_XSERVER64 machine. At this point, with the uncommitted render/ diffs,
Xglx starts up but displays badly.
2005-12-29 00:19:33 +00:00
Adam Jackson
05c139d4cd
Enough build fixes to get {sdl,ephyr,fake} to link.
2005-12-28 10:02:54 +00:00
Kevin E Martin
5f81eb1d89
Fix the *-config.h includes so that it is possible to build modules without
...
having to use -include in the Makefile.
2005-07-16 03:49:59 +00:00
Kevin E Martin
6b546d0ec0
Add #include <xnest-config.h> to the Xnest source files for modularization.
2005-07-14 03:36:44 +00:00
Kevin E Martin
e348ac4b4d
Prepare Xdmx and Xvfb for modularization by adding appropriate #include
...
<{dix,dmx}-config.h> to the source files.
2005-07-12 00:52:48 +00:00
Daniel Stone
0bb669638f
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
2005-07-03 08:53:54 +00:00
Daniel Stone
e03198972c
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
...
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
Adam Jackson
ef4401ff8a
Bug #3334 : Clean up remnants from the PEX, XIE, and BEZIER extensions.
2005-05-19 18:53:51 +00:00
Roland Mainz
a369d390a8
xc/config/cf/X11.tmpl
...
xc/programs/Xserver/Xext/Imakefile
xc/programs/Xserver/dix/Imakefile
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/xpstubs.c
xc/programs/Xserver/mi/miinitext.c
//bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2526
(https://bugs.freedesktop.org/attachment.cgi?id=2526 ) bug 2792 part II:
Make Xprint headers in dix/, mi/, os/ and Xext/ conditional on whether
the Xprint extension is build or not. Patch by Egbert Eich
<eich@freedesktop.org> and Roland Mainz <roland.mainz@nrubsig.org>.
2005-04-24 01:10:12 +00:00
Daniel Stone
35cd168462
Change xf86bigfstr.h to X11/extensions/xf86bigfstr.h for includes.
2005-04-20 14:16:37 +00:00
Daniel Stone
292c4cff26
Fix includes right throughout the Xserver tree:
...
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
Roland Mainz
1d68ede0ee
//bugs.freedesktop.org/show_bug.cgi?id=2771) attachment #2148
...
(https://bugs.freedesktop.org/attachment.cgi?id=2148 ) Remove RENDER
extension from exclusion list for the standalone print server (Xprt) to
get this extension enabled if the print DDX support it.
2005-03-19 20:51:34 +00:00
Roland Mainz
b9476cd96f
//bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #938
...
(https://bugs.freedesktop.org/attachment.cgi?id=938 ): Allow more
extensions to be enabled/disabled.
2004-12-08 05:48:16 +00:00
Roland Mainz
a57e85b523
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1664 - RFE: Add
...
support for the DOUBLE-BUFFER extension to the Xprint server and DDX.
Additionally a "pixmap-scrubber" optimisation is added to the
PostScript DDX to remove all content from a vector pixmap when a
|PolyFillRect()| call covers the whole pixmap surface with a solid fill
(this avoids that a backbuffer vector pixmap gets constantly filled
even when the content is not visible anymore after |XdbeSwapBuffers()|
has cleared the hidden buffer with the background color).
2004-10-25 07:12:21 +00:00
Roland Mainz
d9df39ee2b
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow
...
enabling/disabling of more extensions
2004-09-14 00:51:25 +00:00
Eric Anholt
961333143e
Apply a kludge to initialize the composite wrapper before DamageSetup. If
...
not, DamageSetup will wrap some operations first, and the cw
initializes during ExtensionInit, so cw comes higher in the wrapping
chain. cw going first will result in damage getting confused when the
drawables get changed around.
2004-08-12 08:45:33 +00:00
Eric Anholt
b7ba272da0
The Damage extension has to wrap after (be called before) the Composite
...
extension so that the redirecting of drawables by the wrapper doesn't
confuse Damage.
2004-08-03 05:39:19 +00:00
Kevin E Martin
488be66119
Fix typo
2004-07-31 09:41:27 +00:00
Kevin E Martin
383b6b5986
Add "Extensions" section support to configuration parser
2004-07-31 09:14:06 +00:00
Eric Anholt
d690556d49
Integrate COMPOSITEWRAP branch including composite wrapper. This code still
...
has several issues, including:
- CopyWindow and PaintWindow wrappers missing (will be done soon)
- Some segfaults seen in the Render wrappers.
- Xprt server build breaks with Composite.
- DDXs must be recompiled for Composite due to VisualRec size change.
- Composite bugs pointed out by Deron Johnson in email.
Also, reorder XFixes initialization according to comments by Keith which
are also in xserver CVS.
2004-07-31 08:24:14 +00:00
Kevin E Martin
25bd6ff4a6
Add new extension enable/disable feature. This code is a small step in the
...
right direction -- i.e., moving towards full run-time config of
extensions. Currently, only XTEST, XINERAMA, RENDER, XKB, and XEVIE are
supported.
2004-07-31 04:23:21 +00:00
Stuart Kreitman
7542d8a17a
Turn on XEVIE https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified
...
Files: miinitext.c
2004-07-31 01:37:47 +00:00
Stuart Kreitman
274d5044ac
Integration of DAMAGE-XFIXES branch to trunk
...
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: Imakefile miinitext.c
2004-07-29 18:49:42 +00:00
Kevin E Martin
7976ee51af
Add Distributed Multihead X (DMX) support
2004-06-30 20:06:56 +00:00
Roland Mainz
85e4e54452
Work-in-progress for
...
http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=542 - GLX
support for PS DDX / part #1 : Fix visual setup (attachment #243 )
2004-04-26 11:07:03 +00:00
Egbert Eich
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
Egbert Eich
dae90c3af9
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2004-03-14 08:34:49 +00:00
Egbert Eich
867451f1ab
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
2004-03-03 12:12:50 +00:00
Egbert Eich
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
Egbert Eich
147aae87fd
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
2004-02-26 09:23:53 +00:00
Kaleb Keithley
d568221710
XFree86 4.3.0.1
2003-11-14 16:49:22 +00:00
Kaleb Keithley
ded6147bfb
R6.6 is the Xorg base-line
2003-11-14 15:54:54 +00:00