summaryrefslogtreecommitdiff
path: root/dix/main.c
AgeCommit message (Collapse)AuthorFilesLines
2008-10-26Nuke unused variablesJulien Cristau1-1/+0
2008-10-03Remove unused wrapping for visual initialization.Adam Jackson1-1/+0
2008-10-03const cleanupAdam Jackson1-1/+1
2008-10-02Don't inherit XAUTHORITY from the environment.Adam Jackson1-4/+0
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-08-20Centralize declaration of ConnectionInfo.Adam Jackson1-1/+0
2008-08-13Eviscerate save-under support.Adam Jackson1-1/+1
Use a compositing manager already. Plus I really wanted to use 'eviscerate' in a commit message.
2008-08-05Redefine clients as a fixed arrayTomas Carnecky1-4/+1
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-05Redefine WindowTable as a fixed arrayTomas Carnecky1-6/+1
Instead of xalloc'ing it every server generation. The array is always the same size (MAXSCREENS), anyway.
2008-07-21dix: Remove insane BC hacksDaniel Stone1-12/+1
If your DDX needs a 1bpp mode and doesn't set it up, your DDX is incompetent.
2008-07-17Nuke some ancient code for commandline-challenged OSes.Adam Jackson1-4/+0
This appears to have been dead code even in 6.7.
2008-07-16Remove the numVideoScreens xprintism.Adam Jackson1-3/+0
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-06-25dix: free memory associated with the EventList. #16507Peter Hutterer1-0/+1
Un-deprecates CloseDownEvents. X.Org Bug 16507 <http://bugs.freedesktop.org/show_bug.cgi?id=16507>
2008-05-26Merge branch 'master' into mpxPeter Hutterer1-1/+0
2008-05-21drop xprint remnants: InitGlobalsGeorge Sapountzis1-1/+0
2008-05-20dix: shut up two compiler warnings.Peter Hutterer1-1/+1
2008-05-20Merge branch 'master' into mpxPeter Hutterer1-21/+2
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-14Simplify default font path setup.Adam Jackson1-7/+2
2008-05-14Remove global argc/argv variables.Adam Jackson1-5/+0
Was only used in the logging code anymore, and uselessly so there.
2008-05-14dix: InitAndStartDevices doesn't need a window parameter.Peter Hutterer1-1/+1
Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
2008-05-12X n'est pas une print API.Adam Jackson1-9/+0
2008-05-02Merge branch 'master' into mpxPeter Hutterer1-12/+7
Conflicts: Xi/exevents.c dix/devices.c
2008-04-26XQuartz: Cleaned up startup and thread creation a tad.Jeremy Huddleston1-12/+4
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
2008-04-25dix: remove obsolete InitWindowPrivates().Peter Hutterer1-2/+0
2008-04-24dix: NULL out WindowTable after freeing all the windows.Peter Hutterer1-0/+3
CloseDownDevices() tries to send PresenceNotify events. If the windows are already freed, then we are accessing dangling pointers.
2008-04-22Merge branch 'master' into mpxPeter Hutterer1-14/+0
Conflicts: Xext/EVI.c Xext/appgroup.c Xext/cup.c Xext/mitmisc.c Xext/sampleEVI.c dix/window.c
2008-04-17removed Xquartz debugging code that leaked into master. Our Bad.Ben Byer1-14/+0
2008-04-07Merge branch 'master' into dcdc_reworkPeter Hutterer1-0/+16
Conflicts: Xext/xevie.c dix/dispatch.c
2008-04-02shovelling code around ...Ben Byer1-0/+14
(cherry picked from commit 2143182ba49195bbb2e9163ea6872fd68e7a4a85)
2008-03-04Merge branch 'master' into mpxPeter Hutterer1-9/+0
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-02-29dix: Refactoring of selection code to allow for polyinstantiation.Eamon Walsh1-0/+2
Introduces dixLookupSelection() API. Removes NumCurrentSelections from API.
2008-02-17main(): Remove uncredible failureDaniel Stone1-9/+0
NO, NO, NO. NO. The only way this could possibly be worse is if you were viewing it in Comic Sans.
2008-01-03Merge branch 'master' into mpxPeter Hutterer1-51/+21
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
2007-12-20Xquartz: General CleanupJeremy Huddleston1-0/+4
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 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
2007-12-13Merge branch 'master' into XACE-SELINUXEamon Walsh1-1/+1
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-11-21Darwin: Dead code removal, Code cleanup, Added launcherJeremy Huddleston1-1/+1
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-20Remove some duplicate include statements.Eamon Walsh1-1/+0
2007-11-19xace: restore the old SaveScreens function and introduce new API, since theEamon Walsh1-2/+2
old version is called from drivers...
2007-11-07Merge branch 'master' into mpxPeter Hutterer1-1/+3
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-05Merge branch 'master' into XACE-SELINUXEamon Walsh1-0/+2
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c
2007-11-02Move SIGUSR1 notification as late as possible.Adam Jackson1-0/+2
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-10-11dix: Add a new "registry" mechanism for registering string names of things.Eamon Walsh1-0/+2
Supports protocol requests, events, and errors, and resource names. Modify XRES extension to use it.
2007-10-10dix: pass a valid ClientPtr to SetFontPath in all cases.Eamon Walsh1-3/+3
2007-09-26dix: unify ErrorFs. prepend all with [dix].Peter Hutterer1-1/+1
2007-09-19Merge branch 'master' into XACE-SELINUXEamon Walsh1-1/+1
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-05Fix server version reporting to be the server package version.Eric Anholt1-1/+1
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-08-28devPrivates rework: since API is already broken, switch everythingEamon Walsh1-47/+7
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-16xace: add hooks + new access codes: core protocol screensaver requestsEamon Walsh1-2/+2
2007-08-12Merge branch 'master' into mpxPeter Hutterer1-23/+7
Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c
2007-08-02Merge branch 'master' into XACE-SELINUXEamon Walsh1-23/+7
Conflicts: dix/devices.c dix/property.c include/dix.h
2007-08-01DIX: Clean up null root cursor handlingDaniel Stone1-13/+1
Move the null root cursor handling out of main() and into CreateRootCursor.