Jeremy Huddleston
94e417ac87
XQuartz: mieq: Wait for the server to finish initializing before letting other threads mieqEnqueue
...
Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
2009-01-16 13:54:08 -08:00
Peter Hutterer
e078901a4e
dix: Enable core devices in InitCoreDevices already.
...
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2008-11-24 10:17:40 +10:00
Julien Cristau
add946daed
Nuke unused variables
2008-10-26 11:44:10 +01:00
Adam Jackson
94825ad3c7
Remove unused wrapping for visual initialization.
2008-10-03 17:51:21 -04:00
Adam Jackson
e6b1c1fada
const cleanup
2008-10-03 17:51:19 -04:00
Adam Jackson
00f01f3945
Don't inherit XAUTHORITY from the environment.
...
It's not especially obvious, and unpleasantly overloaded for the Xnest
case. Typically this gives you a server that looks for its auth data in
the authority file you were using for the running X session, which
generally doesn't have an entry for the display you just started.
All the major dm's, and startx, pass -auth explicitly, so this shouldn't
cause too much upheaval.
2008-10-02 15:48:18 -04:00
Adam Jackson
64ef7ed072
Centralize declaration of ConnectionInfo.
2008-08-20 13:14:34 -04:00
Adam Jackson
0ce687634f
Eviscerate save-under support.
...
Use a compositing manager already. Plus I really wanted to use 'eviscerate'
in a commit message.
2008-08-13 17:28:08 -04:00
Tomas Carnecky
277a74bcbb
Redefine clients as a fixed array
...
This removes yet another xalloc() each server generation. Also, I
couldn't find the corresponding xfree() so I guess that used to be a
memory leak there.
2008-08-05 01:17:32 +03:00
Tomas Carnecky
5532d63488
Redefine WindowTable as a fixed array
...
Instead of xalloc'ing it every server generation. The array is always
the same size (MAXSCREENS), anyway.
2008-08-05 01:17:32 +03:00
Daniel Stone
6b5206e7cb
dix: Remove insane BC hacks
...
If your DDX needs a 1bpp mode and doesn't set it up, your DDX is
incompetent.
2008-07-21 03:50:15 +03:00
Adam Jackson
af2138bfce
Nuke some ancient code for commandline-challenged OSes.
...
This appears to have been dead code even in 6.7.
2008-07-17 10:39:29 -04:00
Adam Jackson
a82e6efb7b
Remove the numVideoScreens xprintism.
...
This was to account for cases where you had video and print screens in
the same server. Lunacy. Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
2008-07-16 14:19:04 -04:00
Peter Hutterer
a81b5ce452
dix: free memory associated with the EventList. #16507
...
Un-deprecates CloseDownEvents.
X.Org Bug 16507 <http://bugs.freedesktop.org/show_bug.cgi?id=16507 >
2008-06-25 20:03:31 +09:30
Peter Hutterer
26c1958c32
Merge branch 'master' into mpx
2008-05-26 17:37:31 +09:30
George Sapountzis
255142b61e
drop xprint remnants: InitGlobals
2008-05-21 18:13:09 +03:00
Peter Hutterer
7a550cefd9
dix: shut up two compiler warnings.
2008-05-20 11:07:39 +09:30
Peter Hutterer
99d28c3ef3
Merge branch 'master' into mpx
...
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
Adam Jackson
166177e36b
Simplify default font path setup.
2008-05-14 16:02:05 -04:00
Adam Jackson
2efe1abb6f
Remove global argc/argv variables.
...
Was only used in the logging code anymore, and uselessly so there.
2008-05-14 15:53:11 -04:00
Peter Hutterer
00db0f35ac
dix: InitAndStartDevices doesn't need a window parameter.
...
Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
2008-05-14 15:29:28 +09:30
Adam Jackson
1c8bd318fb
X n'est pas une print API.
2008-05-12 14:15:11 -04:00
Peter Hutterer
3344569529
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
2008-05-02 11:00:14 +09:30
Jeremy Huddleston
ef1c520537
XQuartz: Cleaned up startup and thread creation a tad.
...
(cherry picked from commit c861fe00e1
)
2008-04-26 19:21:05 -07:00
Peter Hutterer
89add4ee98
dix: remove obsolete InitWindowPrivates().
2008-04-25 14:30:26 +09:30
Peter Hutterer
aec485f2dc
dix: NULL out WindowTable after freeing all the windows.
...
CloseDownDevices() tries to send PresenceNotify events. If the windows are
already freed, then we are accessing dangling pointers.
2008-04-24 14:19:28 +09:30
Peter Hutterer
8190ef8754
Merge branch 'master' into mpx
...
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
2008-04-22 18:04:05 +09:30
Ben Byer
fa0645b452
removed Xquartz debugging code that leaked into master. Our Bad.
2008-04-17 12:27:12 -07:00
Peter Hutterer
fd06e8f8c1
Merge branch 'master' into dcdc_rework
...
Conflicts:
Xext/xevie.c
dix/dispatch.c
2008-04-07 07:56:41 +09:30
Ben Byer
c1be4e3379
shovelling code around ...
...
(cherry picked from commit 2143182ba4
)
2008-04-02 17:47:59 -07:00
Peter Hutterer
4f2cd0ed96
Merge branch 'master' into mpx
...
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
Eamon Walsh
34bf308a9e
dix: Refactoring of selection code to allow for polyinstantiation.
...
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
2008-02-29 18:01:37 -05:00
Daniel Stone
37867626e3
main(): Remove uncredible failure
...
NO, NO, NO.
NO.
The only way this could possibly be worse is if you were viewing it in
Comic Sans.
2008-02-17 22:52:06 +02:00
Peter Hutterer
8da83836b6
Merge branch 'master' into mpx
...
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
Jeremy Huddleston
42802a8e6b
Xquartz: General Cleanup
...
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4
)
2007-12-20 13:18:17 -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
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
709c1a70c8
Remove some duplicate include statements.
2007-11-20 15:18:02 -05:00
Eamon Walsh
60be452c2e
xace: restore the old SaveScreens function and introduce new API, since the
...
old version is called from drivers...
2007-11-19 16:59:34 -05: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
Adam Jackson
f01e149d1a
Move SIGUSR1 notification as late as possible.
...
If we inherited a signal mask from the parent process that ignores SIGUSR1,
then we will send SIGUSR1 to the parent to indicate when we're ready to
accept connections. Unfortunately, we send this notification way too
early, right after creating the sockets rather than just before entering
the main loop.
Move it to just before Dispatch() so we're not lying quite so much.
2007-11-02 11:54:16 -04:00
Eamon Walsh
6adeba1730
dix: Add a new "registry" mechanism for registering string names of things.
...
Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it.
2007-10-11 14:18:59 -04:00
Eamon Walsh
7e9e01a4a3
dix: pass a valid ClientPtr to SetFontPath in all cases.
2007-10-10 17:40:22 -04:00
Peter Hutterer
8b508f5d6b
dix: unify ErrorFs. prepend all with [dix].
2007-09-26 15:19:53 +09:30
Eamon Walsh
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04: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
Eamon Walsh
4017d31902
devPrivates rework: since API is already broken, switch everything
...
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
2007-08-28 09:28:25 -04:00
Eamon Walsh
b82557c9fb
xace: add hooks + new access codes: core protocol screensaver requests
2007-08-16 10:36:05 -04:00
Peter Hutterer
f367285fd5
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
dix/getevents.c
include/dix.h
mi/mieq.c
2007-08-12 15:31:10 +09:30