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
David S. Miller
ae869fc766
[SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
...
xf86getpagesize() was removed, but this one call site was
not fixed up.
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-27 07:34:09 +01:00
Jeremy Huddleston
beb29c605b
XQuartz: *REALLY* use CFStringCreateWithCString
...
I need sleep! Why am I making these stupid mistakes... sorry for pointless commit spam. ugg.
(cherry picked from commit b16351fc6457aabead328472d16dc25789032940)
2007-12-21 02:09:15 -08:00
Jeremy Huddleston
5dd895efa3
XQuartz: Use CFStringCreateWithCString
...
(cherry picked from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)
2007-12-21 02:07:07 -08:00
Jeremy Huddleston
2c24231fc2
XQuartz: Reduce code duplication in X11.app
...
(cherry picked from commit b81809cd91a9f90b7f2de77b1dcf514cee87c32d)
2007-12-21 01:58:03 -08:00
Jeremy Huddleston
f3042a63be
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
2007-12-21 01:24:43 -08:00
Jeremy Huddleston
fa9680a730
XQuartz: Added localization.
...
(cherry picked from commit 7a5cc7bfbb296a2c41a580b063324c448f7131db)
2007-12-20 19:38:49 -08:00
Jeremy Huddleston
603a8b73d4
XQuartz: Cleaned up command line arguments.
2007-12-20 18:29:57 -08:00
Jeremy Huddleston
4cf3002b60
XQuartz: Kill off server-main.c and launcher-main.c
...
Now using xinit
(cherry picked from commit 5d6ae3d299f72df714117948b3d31dcbddf6c0bc)
2007-12-20 18:09:24 -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
2d15d439f8
Xquartz: Use X11ControllerMain()
...
(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
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
Dave Airlie
7ef7727b80
entity sharing: make !shareable entity non-fatal.
...
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
2007-12-20 10:11:26 +10:00
Adam Jackson
7721d3e921
Reference cvt and gtf in the xorg.conf man page.
2007-12-18 19:14:26 -05:00
Jeremy Huddleston
bf20c4374a
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
...
(cherry picked from commit 767b4c9d9daa5d0ea59ac1f0d70146798da631cb)
2007-12-16 01:14:55 -08:00
Samuel Thibault
58c2898b62
xfree86: permit access to io port 0xffff on the hurd
2007-12-16 01:21:45 +01:00
Ben Byer
a3f7f7b60e
clarified debug message to indicate that we're sleeping
...
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf893f8f81bacd434b31408dfb38cb06)
2007-12-14 15:22:57 -08:00
Ben Byer
e0e59b3bbc
we need to link against CoreServices, not ApplicationServices
...
(cherry picked from commit ba4d2096e7953ef5b971682f0e28535da968acb1)
2007-12-14 15:22:49 -08:00
Ben Byer
062d9234e2
fixed bug in x11-exec that prevent icon from showing up
...
(cherry picked from commit e1f4a0c20d3a52d98954c4b28d0ec4d44564bc32)
2007-12-14 15:22:44 -08:00
Jeremy Huddleston
95c02adea8
Xquartz: Fixed cpprules include
2007-12-14 15:21:40 -08:00
Otavio Salvador
8673033700
kdrive/ati: use operating system input devices
2007-12-14 13:15:27 +02:00
Otavio Salvador
e110255501
kdrive/vesa: use operating system input devices
2007-12-14 13:15:27 +02:00
Otavio Salvador
863ba390e9
kdrive/fbdev: use operating system input devices
2007-12-14 13:15:27 +02:00
Arkadiusz Miskiewicz
ca59d3f7bd
Xprint: Clean up generated files
...
Remember to clean generated wrapper files.
2007-12-14 13:15:26 +02:00
Eamon Walsh
a2df51f8e9
Bump video driver ABI and extension ABI for devPrivates rework.
2007-12-14 00:53:54 -05:00
Eamon Walsh
86b2e59bfb
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
configure.ac
This is the last pull before merging to master.
2007-12-14 00:32:24 -05:00
Eamon Walsh
1c1a4bc970
devPrivates rework: more cleanup from previous merge operation.
2007-12-13 19:51:40 -05:00
Jeremy Huddleston
cb0d7e2c26
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
2007-12-13 16:29:40 -08:00
Jeremy Huddleston
c39212fd73
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
2007-12-13 16:29:09 -08:00
Ben Byer
82e1aff9fb
Modified X11 plist to use x11-exec
...
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
2007-12-13 16:28:35 -08:00
Ben Byer
1a5910588a
created x11-exec wrapper, which uses LaunchServices to find
...
(and then exec) X11.app
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
2007-12-13 16:28:30 -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
Adam Jackson
efcdc0d701
Correct the documentation comments in xf86Modes.c
...
Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
2007-12-13 15:38:41 -05:00
Adam Jackson
1768af38c7
Add infrastructure for validating modes by memory bandwidth.
2007-12-13 15:06:18 -05:00
Adam Jackson
4359193aaa
Explain a confusing #ifdef.
2007-12-13 10:59:48 -05:00
Adam Jackson
8cedbb0a53
Clean up some #if 0.
2007-12-13 10:57:35 -05:00
Aaron Plattner
a125ce4a84
Fix dist by including modeline2c.awk.
...
This was broken by commit cb44b6121c
, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
2007-12-12 12:24:29 -08:00
Aaron Plattner
6715923437
Get rid of xf86DefModes.c.
...
It's out of date and not included in the build. Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
2007-12-12 10:59:15 -08:00
Jeremy Huddleston
eab0c4e490
Xquartz: Pre-process Xquartz man page
...
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
2007-12-10 21:03:37 -08:00
Jeremy Huddleston
1ff945a8e4
Xquartz: Make Alt work with Xmodmap again
...
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
2007-12-10 21:03:30 -08:00
Jeremy Huddleston
7d61893b49
Xquartz: Removed Xplugin.h from EXTRA_DIST
...
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
2007-12-10 20:34:40 -08:00
Ben Byer
8f2eff643b
remove Xplugin.h, because we should use the one in /usr/include
...
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
2007-12-09 12:03:22 -08:00
Jeremy Huddleston
7b573ed436
Xquartz: Added missing link to libconfig.a
...
(cherry picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)
2007-12-09 12:02:15 -08:00
Jeremy Huddleston
020b0e92b0
Xquartz Added quartzKeyboard.h to EXTRA_DIST
...
(cherry picked from commit 37c9781fdb672229ceab101b080762e15512943f)
2007-12-08 11:49:55 -08:00
Ben Byer
5e016fa9b2
Added darwinEvents.h to EXTRA_DIST
...
(cherry picked from commit 45e5247564c423a2bf02cfec1993155858c91a14)
2007-12-08 11:33:54 -08:00
Jeremy Huddleston
6bb5dacc17
Xquartz: Actually add quartzForeground.[hc]
...
Sorry for the commit spam... I'm tired and was overly quick to commit... forgot to include a neccessary file.
(cherry picked from commit e564b7aeaab63e4c943445275af680b3b5898a94)
2007-12-08 01:42:03 -08:00
Jeremy Huddleston
02df036670
Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
...
(cherry picked from commit c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)
2007-12-08 01:28:49 -08:00
Jeremy Huddleston
740cc54f08
Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
...
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)
2007-12-08 01:25:13 -08: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
a1b0346853
XQuartz: Cleaned up configure, X11.app path in launchd script
...
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc331d1d621b2541492a3336f69d70a2)
2007-12-07 23:26:11 -08:00