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

26 Commits

Author SHA1 Message Date
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 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
Jeremy Huddleston b37e1f1f5c Don't need the fink-friendly printf in the DDX anymore. 
(cherry picked from commit fe2279440450c795d67ba5a2234b0797d0bfe39c)
 2008-05-14 01:15:54 -07:00
Peter Hutterer 3344569529 Merge branch 'master' into mpx 
Conflicts:

	Xi/exevents.c
	dix/devices.c
 2008-05-02 11:00:14 +09:30
Ben Byer b71b51c982 xquartz: created darwinTablet, to represent tablet events 
(cherry picked from commit 50641bce730ee03738fa0c4beb8125b34fda556f)
 2008-04-29 23:59:34 -07:00
Ben Byer 519581b0ba xquartz: remove unused params from DarwinEQInit 
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
 2008-04-29 23:59:31 -07:00
Peter Hutterer e251c9e75a Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac 2008-04-25 16:49:35 +09:30
Jeremy Huddleston 0209e46249 XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging. 
(cherry picked from commit 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
 2008-04-24 23:50:23 -07:00
Jeremy Huddleston d13828797f XQuartz: Cleaned up some casting to get rid of compiler warnings 
(cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
 2008-04-20 01:24:51 -07:00
Jeremy Huddleston a3d40f0549 XQuartz: Include version info for CrashReporter 
(cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
 2008-04-17 11:57:45 -07:00
Jeremy Huddleston dcf4f917cc merged darwinKeyboard.[ch] into quartzKeyboard 
(cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
 2008-04-17 11:03:31 -07:00
Ben Byer a440eebf25 add support for horizontal scrolling (buttons 6 and 7) 
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
 2008-04-17 10:41:50 -07:00
Ben Byer 985c631b2e just a bit of juggling headers around -- we're preparing 
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa727e22316e8ca456f7218bea9ee0313)
 2008-04-02 17:47:57 -07:00
Ben Byer 19ff23ab0e Remove calls to InitValuatorAxisStruct -- these are now handled in dix by 
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
 2008-03-31 16:44:21 -07:00
Jeremy Huddleston b8ea9f2a25 XQuartz: Fixed names of enums to be more consistent 
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
 2008-03-28 17:03:20 -07:00
Jeremy Huddleston 7d226d6a25 XQuartz: Cleanup for strict-prototyping 
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4beb7a427b00b18097f548876ad3c11d7)
 2008-01-05 03:17:27 -08:00
Jeremy Huddleston e46d559739 XQuartz: Cleaned up color map configuration. 
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27c053d22882f54337cfd09203aa5383)
 2008-01-03 13:25:56 -08:00
Jeremy Huddleston 603a8b73d4 XQuartz: Cleaned up command line arguments. 2007-12-20 18:29:57 -08:00
Jeremy Huddleston 1f74bef1ad XQuartz: Don't fork to exec app_to_run. 
Plus other housecleaning...
(cherry picked from commit ae302db472f127be082d05b418ede332fae8ccc5)
 2007-12-20 17:38:39 -08:00
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 1c1a4bc970 devPrivates rework: more cleanup from previous merge operation. 2007-12-13 19:51:40 -05: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 41a0aeaae9 XQuartz: Fixed "Multiple Dock Icons" 
BAM!
(cherry picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31)
(cherry picked from commit 0502955a2af487b51bf22916ac02e497c2d96aba)
 2007-12-08 00:35:14 -08:00
Jeremy Huddleston 8a8239f2e2 Darwin: Renamed DarwinModeBlah to QuartzBlah 
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
 2007-12-05 21:26:16 -08:00
Jeremy Huddleston bc65a24393 Darwin: Flattened quartz into darwin, renamed darwin xquartz 
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
 2007-12-05 20:32:40 -08:00