Jeremy Huddleston
0d61f6fca1
XQuartz: Fixed some missing prototypes
...
(cherry picked from commit 95056afc56
)
2008-04-17 13:21:13 -07:00
Jeremy Huddleston
dbd4c03156
XQuartz: Added framework for asserting which thread we're in.
...
(cherry picked from commit 00beb98251
)
2008-04-17 13:21:02 -07:00
Jeremy Huddleston
a3d40f0549
XQuartz: Include version info for CrashReporter
...
(cherry picked from commit b4992755c3
)
2008-04-17 11:57:45 -07:00
Jeremy Huddleston
6d11712c2a
XQuartz: Use strerror(errno)... cause I like text more than grepping header files
...
(cherry picked from commit 1b4c37d8f9
)
2008-04-17 11:07:20 -07:00
Jeremy Huddleston
dcf4f917cc
merged darwinKeyboard.[ch] into quartzKeyboard
...
(cherry picked from commit 57bb073209
)
2008-04-17 11:03:31 -07:00
Ben Byer
582397cd02
oops, missed a spot
...
(cherry picked from commit 19872a6aeb
)
2008-04-17 10:42:08 -07:00
Ben Byer
0bd1c369cc
formatting cleanup
...
(cherry picked from commit 769acd2934
)
2008-04-17 10:42:00 -07:00
Ben Byer
700e14c226
delete debugging spew
...
(cherry picked from commit f04f3af86a
)
2008-04-17 10:41:55 -07:00
Ben Byer
a440eebf25
add support for horizontal scrolling (buttons 6 and 7)
...
(cherry picked from commit f525a4a432
)
2008-04-17 10:41:50 -07:00
Ben Byer
612e901ef6
enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
...
(cherry picked from commit ab662c736e
)
2008-04-17 10:41:46 -07:00
Ben Byer
5bdfbfbedc
darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
...
(cherry picked from commit a8a090b853
)
2008-04-17 10:41:42 -07:00
Ben Byer
58e42683c9
hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
...
(cherry picked from commit cab54466a6
)
2008-04-17 10:41:38 -07:00
Ben Byer
cd3470a0cf
kludge: miEqEnqueue wants a device, even if we're passing custom messages,
...
so give it one
(cherry picked from commit a494ff04b2
)
2008-04-17 10:41:30 -07:00
Jeremy Huddleston
8716d081fd
XQuartz: Don't enable rootless accelerated functionality... crashy...
...
(cherry picked from commit cdb4c291d8
)
2008-04-16 23:14:06 -07:00
Jeremy Huddleston
2ffdb0eb64
XQuartz: Don't use composite.
...
(cherry picked from commit 6d3d344b5b
)
2008-04-16 21:54:00 -07:00
Jeremy Huddleston
757a1bf3a3
Xquartz: Don't need to link against rlAccel since we don't use it
...
(cherry picked from commit 180ec128ad
)
2008-04-16 21:53:03 -07:00
Jeremy Huddleston
9e7ced94a5
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
...
(cherry picked from commit cb27d5ca82
)
2008-04-15 12:06:07 -07:00
Jeremy Huddleston
b1f3f42840
Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
...
(cherry picked from commit 55d9973b05
)
2008-04-11 17:50:04 -07:00
Eric Anholt
a7e3ad1c6b
Remove NDEBUG (assert() disable) define from the X Server.
...
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead. There should be no ABI consequences
to this change.
The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h. As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
2008-04-10 10:35:14 -07:00
Ben Byer
1f8188656a
add missing dix-config include
...
(cherry picked from commit 126e9bc8c4
)
2008-04-08 21:25:15 -07:00
Jeremy Huddleston
3f51f493b6
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
...
(cherry picked from commit df21312c8b
)
(cherry picked from commit 2d4194a8d1
)
2008-04-08 17:03:18 -07:00
Jeremy Huddleston
2e42b67b82
XQuartz: Change reporting of space change to debug log rather than stderr
...
(cherry picked from commit ed15556a9f
)
2008-04-02 18:05:55 -07:00
Ben Byer
c737d04c75
The AppKit thread should not be calling directly into the X server
...
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806f
)
2008-04-02 17:48:24 -07:00
Ben Byer
15b0084f1a
formatting cleanup for X11Application.m (no code changes)
...
(cherry picked from commit eb083d3f68
)
2008-04-02 17:48:15 -07:00
Ben Byer
e9e2d88436
moved and renamed QuartzMessageServerThread to
...
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377ef
)
2008-04-02 17:48:01 -07:00
Ben Byer
c1be4e3379
shovelling code around ...
...
(cherry picked from commit 2143182ba4
)
2008-04-02 17:47:59 -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 4aedba5aa7
)
2008-04-02 17:47:57 -07:00
Ben Byer
89f1d880e8
nuke DarwinEventQueue
...
(cherry picked from commit 1e0ec02202
)
2008-04-02 17:47:52 -07:00
Jeremy Huddleston
8944b77ec0
continue with gutting darwinEvents.c
...
(cherry picked from commit c34fce7051
)
2008-04-02 17:47:42 -07:00
Jeremy Huddleston
aa6d12e93e
turns out we weren't actually using these files. oops
...
(cherry picked from commit bfec44d7b4
)
2008-04-02 17:46:59 -07:00
Ben Byer
6c5962e447
remove vestigal DarwinEQPointerPost etc
...
(cherry picked from commit a25704c423
)
2008-04-02 17:45:28 -07:00
Ben Byer
c6f0d5d1e5
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
...
(cherry picked from commit a9e081a60c
)
2008-04-02 17:45:23 -07:00
Ben Byer
5b6c273eaa
add prototype for DarwinEventHandler
...
(cherry picked from commit 9a03ae33c4
)
2008-04-02 17:45:20 -07:00
Ben Byer
3713be8b47
add logging of current thread ID to DEBUG_LOG macro
...
(cherry picked from commit 5848510cc5
)
2008-04-02 17:45:17 -07:00
Ben Byer
1400a51ae7
Begin to move all of our Xquartz DDX-specific event handlers
...
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f
)
2008-04-02 17:45:09 -07:00
Jeremy Huddleston
8746daa673
XQuartz: Fixed missing close-paren in preference pane text.
...
(cherry picked from commit ea37e151dc
)
2008-04-02 17:33:22 -07:00
Ben Byer
a4d0349411
Add code to track 5 valuators for pointing device, in preparation
...
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
2008-03-31 16:44:23 -07:00
Ben Byer
6648867d8b
add debug statements so we can see if/when our Xinput stubs are getting called.
...
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
2008-03-31 16:44:22 -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
bd28839eb8
=?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows
...
=20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-28 17:03:19 -07:00
Jeremy Huddleston
415e49b940
XQuartz: Sanity-check the removal of the 256-color option
...
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490
)
2008-03-27 19:22:07 -07:00
Ben Byer
c1d37efe9a
xquartz: copy in new stubs from Xi/stubs.c to replace our old
...
Xinput stubs. Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
2008-03-27 19:14:50 -07:00
Ben Byer
c4a616a741
prevent "fake mouse clicks" from generating spurious extra events
...
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
2008-03-27 19:14:39 -07:00
Jeremy Huddleston
6385947396
XQuartz: Disable 256 color option and fullscreen option
...
(cherry picked from commit 7c1964338a
)
2008-03-21 19:37:49 -07:00
Jeremy Huddleston
93daa3a3bf
Xquartz: Added separate preference tab for quartz-wm settings
...
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7
)
2008-03-21 19:37:46 -07:00
Jeremy Huddleston
c49e112683
XQuartz: Initial framework for dealing with spaces on OS-X
...
(cherry picked from commit 9831324998
)
2008-03-21 19:37:42 -07:00
Jeremy Huddleston
4c76607b69
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
...
(cherry picked from commit f03202ad15
)
2008-03-21 19:33:21 -07:00
Jeremy Huddleston
87c64cfd69
=?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2)
...
=20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-21 19:33:21 -07:00
Eamon Walsh
ef60632e20
dix: Modify callers of property and selection API to use new interfaces.
2008-02-29 18:01:37 -05:00
Eamon Walsh
27bcf40cda
XACE: Fix instances of DixUnknownAccess at hook callsites.
2008-02-28 16:43:43 -05:00
Jeremy Huddleston
6dc369028d
XQuartz: Quit now properly warns the user
...
(cherry picked from commit ed3d7b3959
)
2008-02-23 00:28:41 -08:00
Jeremy Huddleston
5f5ec5db35
XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
...
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471
)
2008-02-19 00:01:42 -08:00
Jeremy Huddleston
b95059c207
Added Xquartz.plist to EXTRA_DIST
...
(cherry picked from commit 70f9495e0c
)
2008-02-16 02:57:23 -08:00
Jeremy Huddleston
d103820bb8
Fixed unescaped newline in EXTRA_DIST
...
(cherry picked from commit 567c172c4d
)
2008-02-16 01:01:33 -08:00
Jeremy Huddleston
a7d936c4ac
XQuartz: Fixed EXTRA_DIST to include localization
...
(cherry picked from commit 1b338c2a93
)
2008-02-16 01:01:29 -08:00
Adam Jackson
f3b3b37ec6
Use strerror instead of errno values in user strings.
2008-02-14 07:52:02 +11:00
Jeremy Huddleston
8a244c2bc0
XQuartz: Fixed layout of Applications->Customize menu
...
Now resizing it won't produce weir overlaps of the widgets. Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d
)
2008-02-11 12:10:59 -08:00
Jeremy Huddleston
3570ca1cb7
XQuartz: Added option for setting quartz-wm click-through preference
...
(cherry picked from commit bf54c267cb
)
2008-02-10 18:30:52 -08:00
Jeremy Huddleston
8004e160fa
XQuartz: Converted interface to nib 3.x format
...
(cherry picked from commit 656aaab957
)
2008-02-10 18:30:48 -08:00
Jeremy Huddleston
23f3f0e27d
XQuartz: Moved SetFrontProcess haco to set_front_process
...
So it is done by the other thread...
(cherry picked from commit 7429379eb1
)
2008-01-17 09:49:25 -08:00
Jeremy Huddleston
180a5aba4d
XQuartz: Fixed copy-paste error with login_shell commit
...
(cherry picked from commit 6deec3acc6
)
2008-01-12 21:34:09 -08:00
Jeremy Huddleston
6fd4a5e2e4
XQuartz: Corrected copyright X.org Project -> X.org Foundation
...
(cherry picked from commit f216314448
)
2008-01-12 12:02:01 -08:00
Jeremy Huddleston
f72255639c
XQuartz: added 'login_shell' option to defaults
...
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18ce
)
2008-01-12 12:01:57 -08:00
Jeremy Huddleston
ec24a6b5aa
XQuartz: Fixed switching into XQuartz via expose.
...
(cherry picked from commit 627ed60ce5
)
2008-01-12 12:01:52 -08: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 4c5c30a4be
)
2008-01-05 03:17:27 -08:00
Jeremy Huddleston
11967dce11
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
2008-01-04 23:10:10 -08:00
Jeremy Huddleston
aca75f389e
XQuartz: Flush the debug log for easier debugging
...
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d42
)
2008-01-04 23:10:10 -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 6765949c27
)
2008-01-03 13:25:56 -08: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 b16351fc64
)
2007-12-21 02:09:15 -08:00
Jeremy Huddleston
5dd895efa3
XQuartz: Use CFStringCreateWithCString
...
(cherry picked from commit 79782b0e14
)
2007-12-21 02:07:07 -08:00
Jeremy Huddleston
2c24231fc2
XQuartz: Reduce code duplication in X11.app
...
(cherry picked from commit b81809cd91
)
2007-12-21 01:58:03 -08:00
Jeremy Huddleston
f3042a63be
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fed
)
2007-12-21 01:24:43 -08:00
Jeremy Huddleston
fa9680a730
XQuartz: Added localization.
...
(cherry picked from commit 7a5cc7bfbb
)
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 5d6ae3d299
)
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 ae302db472
)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
2d15d439f8
Xquartz: Use X11ControllerMain()
...
(cherry picked from commit a9ac932543
)
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 36922e8ff4
)
2007-12-20 13:18:17 -08:00
Jeremy Huddleston
bf20c4374a
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
...
(cherry picked from commit 767b4c9d9d
)
2007-12-16 01:14:55 -08: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 2eea3483cf
)
2007-12-14 15:22:57 -08:00
Ben Byer
e0e59b3bbc
we need to link against CoreServices, not ApplicationServices
...
(cherry picked from commit ba4d2096e7
)
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 e1f4a0c20d
)
2007-12-14 15:22:44 -08:00
Jeremy Huddleston
95c02adea8
Xquartz: Fixed cpprules include
2007-12-14 15:21:40 -08: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 67b479ef80
)
2007-12-13 16:29:40 -08:00
Jeremy Huddleston
c39212fd73
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fe
)
2007-12-13 16:29:09 -08:00
Ben Byer
82e1aff9fb
Modified X11 plist to use x11-exec
...
(cherry picked from commit 7d9a11329e
)
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 fc04c9759b
)
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
Jeremy Huddleston
eab0c4e490
Xquartz: Pre-process Xquartz man page
...
(cherry picked from commit dec2633c41
)
2007-12-10 21:03:37 -08:00
Jeremy Huddleston
1ff945a8e4
Xquartz: Make Alt work with Xmodmap again
...
(cherry picked from commit 0e017177dc
)
2007-12-10 21:03:30 -08:00
Jeremy Huddleston
7d61893b49
Xquartz: Removed Xplugin.h from EXTRA_DIST
...
(cherry picked from commit a746383eca
)
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 3e881032f3
)
2007-12-09 12:03:22 -08:00
Jeremy Huddleston
7b573ed436
Xquartz: Added missing link to libconfig.a
...
(cherry picked from commit 14ec1cf1cb
)
2007-12-09 12:02:15 -08:00
Jeremy Huddleston
020b0e92b0
Xquartz Added quartzKeyboard.h to EXTRA_DIST
...
(cherry picked from commit 37c9781fdb
)
2007-12-08 11:49:55 -08:00
Ben Byer
5e016fa9b2
Added darwinEvents.h to EXTRA_DIST
...
(cherry picked from commit 45e5247564
)
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 e564b7aeaa
)
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 c5ccb98d5d
)
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 a74c38bd9f
)
2007-12-08 01:25:13 -08:00
Jeremy Huddleston
41a0aeaae9
XQuartz: Fixed "Multiple Dock Icons"
...
BAM!
(cherry picked from commit d0dca8a885
)
(cherry picked from commit 0502955a2a
)
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 6b74c535dc
)
2007-12-07 23:26:11 -08:00
Jeremy Huddleston
c238ef06a2
Darwin: Dead coded removal
...
Kill off assert macro
(cherry picked from commit d6493abedb
)
2007-12-07 14:08:31 -08:00
Jeremy Huddleston
8a8239f2e2
Darwin: Renamed DarwinModeBlah to QuartzBlah
...
(cherry picked from commit 08ebf86d37
)
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 48e6a75fbd
)
2007-12-05 20:32:40 -08:00