frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,725 Commits 293 Branches 13 Tags 61 MiB
Commit Graph

66 Commits

Author SHA1 Message Date
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 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
 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
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
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
Eamon Walsh e34fcd2bf4 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h
 2007-08-02 14:27:03 -04:00
Daniel Stone 0afeb0241a DIX: Clean up null root cursor handling 
Move the null root cursor handling out of main() and into CreateRootCursor.
 2007-08-01 01:53:31 +03:00
Daniel Stone 4d3379d418 Fonts: Fix builtin fonts 
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
 2007-08-01 01:53:31 +03:00
Daniel Stone 1cdadc2f43 Hotplug: Separate D-Bus into core and hotplug API components 
Break up D-Bus into two components: a D-Bus core that can be used by any
part of the server (for the moment, just the D-Bus hotplug API, and the
forthcoming HAL hotplug API), and the old D-Bus hotplug API.
 2007-08-01 01:53:31 +03:00
Adam Jackson 4d76075dbb Death to RCS tags. 2007-06-29 14:06:52 -04:00
Eamon Walsh 2a4aa63a23 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	include/miscstruct.h
 2007-05-22 14:50:26 -04:00
Soren Sandmann Pedersen dde0ceac4e Add new InitRegions() function called from dix/main 2007-05-15 11:13:15 -04:00
Eamon Walsh 1f06d32ef5 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/privates.c
 2007-04-17 12:10:22 -04:00
Stefan Huehner 1f6741db19 Bug #10560: Code-Cleanup: function declarations () -> (void) 
X.Org Bugzilla #10560: <https://bugs.freedesktop.org/show_bug.cgi?id=10560>
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511>
 2007-04-09 14:33:15 -07:00
Eamon Walsh 1d550bb2c5 devPrivates rework: minor fix; use calloc and avoid initialization. 2007-04-05 12:12:58 -04:00
Eamon Walsh 63e46e4fc3 devPrivates rework: properly free devPrivates on compatibility structures, 
excluding pixmap.
 2007-04-04 15:59:51 -04:00
Eamon Walsh c45f676208 devPrivates rework: hook up new mechanism in backwards-compatibility mode 
on existing structures that support devPrivates.
 2007-03-08 12:12:51 -05:00
Eamon Walsh aaef4d6a41 devPrivates rework: move reset functions into a single call. 2007-03-07 09:57:02 -05:00
Eamon Walsh bb111291d8 Merge branch 'master' into XACE-SELINUX 2007-03-07 09:03:46 -05:00
Eamon Walsh a7cd53deb9 remove PIXPRIV checks as this flag is always set. 2007-03-06 17:05:03 -05:00
Eamon Walsh e684824709 devPrivates rework: redo interface and implementation. 2007-03-05 11:50:45 -05:00
Eamon Walsh 81372f9096 devPrivates rework: hook up new interface in resource system; add new 
resource-adding function that takes an additional ScreenPtr argument.
 2007-02-23 13:23:12 -05:00
Daniel Stone 0c5dab5c8e config: move config.h to hotplug.h 
Also, move configInitialise to after OsInit, since the next commit will
make it use a timer.
 2006-12-06 23:24:24 +02:00
Alan Hourihane 33ff4cec5f Issue CloseDownDevices() in os/log.c and remove from dix/main.c. 
This ensures that all calls to FatalError() will shutdown the input devices.
 2006-11-21 21:23:17 +00:00
Alan Hourihane c9a5f9d391 Shutdown input devices if FatalError occurs during startup. 
Fixes Xdmx problems when the input device has been initialized
and the keyboard map has been destroyed.
 2006-11-18 19:55:42 +00:00
Daniel Stone 6716488fa2 dix: remove unused debug code 2006-11-08 15:29:16 +02:00
Daniel Stone 51813d77bf dix: remove unused variable 2006-11-08 15:29:15 +02:00
Daniel Stone 335b503c5e Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-13 18:10:45 +03:00
Eamon Walsh 52ba722e4c Merge branch 'XACE-modular' into my-XACE-modular 2006-08-21 18:49:31 -04:00
Daniel Stone a56b98bb04 dix: enable null root cursor 
Enable a blank root cursor, selectable with --enable-null-root-cursor at
configure time.
 2006-08-18 18:10:09 +03:00
Eamon Walsh b04d648547 Added devPrivates support to the ExtensionEntry structure. 2006-07-31 19:35:08 -04:00
Daniel Stone 7465010d59 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:05:41 -04:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Daniel Stone 1987af8c49 add virtual core devices to DIX 
Add virtual core devices, with proper keymaps etc, to the DIX.
 2006-07-21 15:19:53 -04:00
Daniel Stone ecfad74c48 add support for built-in fonts 
Use --enable-builtin-fonts to only use built-in fonts, and avoid loading
fonts.
 2006-07-21 15:19:52 -04:00
Daniel Stone 02a9531156 add basic D-BUS configuration mechanism 
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device).  Does not
link without an implemented NIDR.
 2006-07-21 15:19:49 -04:00
Fredrik Höglund ae935832fa Refactored the screensaver and DPMS timer code to use the screensaver timer 
for both screensaver and DPMS. Removed the SetDPMSTimers() and
    FreeDPMSTimers() functions.
 2006-03-24 20:50:13 +00:00
Adam Jackson f105b8da11 Mark everything in dixsym.c as _X_EXPORT. 2006-02-15 20:44:13 +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
Alan Coopersmith 62343f5162 Bugzilla #2800 <https://bugs.freedesktop.org/show_bug.cgi?id=2800> Xevie 
extension crash with signal 11 on keyboard Bugzilla #1205
    <https://bugs.freedesktop.org/show_bug.cgi?id=1205> Xevie client
    receives two KeyPress events on consumed keys when XKB is enabled
Patch #2223 <https://bugs.freedesktop.org/attachment.cgi?id=2223> Fixes for
    both of these and some other Xevie bugs (Derek Wang - Sun Microsystems)
 2005-05-22 01:12:49 +00:00