Commit graph

4539 commits

Author SHA1 Message Date
Jeremy Huddleston
4bcc5e78c0 Rootless: Abstract some of the Xplugin specific stuff which has crept into rootlessWindow.c
The rootless extension now directly calls some Xplugin functions, and relies
on types defined in Xplugin.h, which isn't very abstracted :-)

This patch is a start at abstracting some of the Xplugin specific stuff which
has crept into rootlessWindow.c.  This has been done in a pretty mindless fashion,
without much thought as to if the additions to the generic rootless interface are
the correct ones

There is some confusion as to if RootlesscolormapCallback() returns a Bool or
xp_error_enum value (not so abstact), but I have no way of checking, of finding
out if Xplugin actually checks the result :-)

Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
(cherry picked from commit 6980f77892)
2009-10-18 15:55:47 -07:00
Jeremy Huddleston
b5dea63fdb XQuartz: Fix a possible minor memory leak
(cherry picked from commit 24e640e1fa)
2009-10-02 19:21:37 -07:00
Jeremy Huddleston
530e7afd4b XQuartz: Send mouse location with scroll events.
This fixes the problem where (0, 0) was sent as the mouse location with scroll
button events causing the event to not reach the client.
(cherry picked from commit c4886fbabc)
2009-10-02 19:17:56 -07:00
Peter Hutterer
d88d16730e render: rename SetBit to RenderSetBit.
Avoiding namespace collision with the SetBit macro soon to be used in the
input code.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 8460425740)
2009-10-02 18:14:34 -07:00
Jeremy Huddleston
9af39f090a 1.4.2-apple49 2009-10-01 13:36:06 -07:00
Jeremy Huddleston
246fcc7bbb XQuartz: Dead code removal: quartzPasteboard.[hc]
(cherry picked from commit 9936b5b188)
2009-10-01 13:34:28 -07:00
Jeremy Huddleston
2a4a79a225 XQuartz: Set the proper bitmap for key repeats...
XkbSetRepeatKeys lies and doesn't do what it says it will...
(cherry picked from commit 873467adad)
2009-10-01 13:12:53 -07:00
Peter Hutterer
ba21bbf550 dix: add SetBit(arr, bit) and ClearBit(arr, bit) to include/inputstr.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 5e0967f5fc)
2009-10-01 13:12:53 -07:00
Jeremy Huddleston
bc530267b7 XQuartz: Cleaned up keymap setting for easier maintenance
(cherry picked from commit b9dfed9e88)
2009-09-29 00:11:42 -07:00
Jeremy Huddleston
35dfe0bd9a XQuartz: Push kXquartzReloadKeymap into DarwinEventHandler
(cherry picked from commit 9604e0925a)
2009-09-28 23:56:28 -07:00
Jeremy Huddleston
3218bc7eb5 XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d8)
2009-09-28 23:13:20 -07:00
Jeremy Huddleston
828672ef0d XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50)
2009-09-28 23:13:16 -07:00
Ben Byer
2b023a0947 Add (ok, fix) support for DTrace under OS X
(cherry picked from commit 8428a57184)
2009-09-27 23:32:32 -07:00
Jeremy Huddleston
e39bd3ddd1 XQuartz: Fix a bunch of compilation warnings about style
(cherry picked from commit 54000bdcbc)
2009-09-27 23:29:26 -07:00
Jeremy Huddleston
46442b4d46 XQuartz: Nuke TSM
It's deprecated in SnowLeopard.  Ben and I both have no idea what it is for.  It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
(cherry picked from commit 29cb904e4d)
2009-09-27 23:25:57 -07:00
Jeremy Huddleston
e14d09d20b XQuartz: Fix inverse map from mode_switch to alt
(cherry picked from commit de6cee11e1)
2009-09-27 23:25:37 -07:00
Jeremy Huddleston
11ea4b47c2 XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this.
(cherry picked from commit ceaa5c779c)
2009-09-27 23:24:59 -07:00
Jeremy Huddleston
a7a499a48e XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
(cherry picked from commit 9f5bdd8960)
2009-09-26 23:45:11 -07:00
Jeremy Huddleston
ea4d8b66a5 1.4.2-apple48 2009-09-23 17:43:03 -07:00
Jeremy Huddleston
b591e30cea XQuartz: bundle version 2.3.5 2009-09-23 17:42:45 -07:00
Jeremy Huddleston
e9e63a2118 XQuartz: GLX capabilities: Allow 16bit accumulation buffers
http://xquartz.macosforge.org/trac/ticket/308
2009-09-23 17:41:28 -07:00
Jeremy Huddleston
8ce7b56e15 XQuartz: pbproxy: Remove debugging XBell()
(cherry picked from commit 1fd7c1fd47)
2009-09-14 14:29:04 -07:00
Jeremy Huddleston
245baef283 XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
(cherry picked from commit 647c871dc9)
2009-09-06 14:06:22 -07:00
Jeremy Huddleston
aa591b3d21 XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a97)
2009-09-06 14:06:10 -07:00
Jeremy Huddleston
9c7869265f XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
(cherry picked from commit 1b659cda1a)
2009-09-06 14:06:01 -07:00
Jeremy Huddleston
fb55aa6bab XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3e)
2009-09-05 02:54:03 -07:00
Jeremy Huddleston
0ad3d2d709 XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649)
2009-09-04 00:43:48 -07:00
Jeremy Huddleston
c06834cdff XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce3)
2009-09-04 00:43:04 -07:00
Jeremy Huddleston
2f0c992103 XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab00)
2009-09-04 00:43:04 -07:00
Jeremy Huddleston
d1f9aa40cd 1.4.2-apple47 2009-08-05 17:47:31 -07:00
Jeremy Huddleston
64c336b7ba CheckWindowOptionalNeed: Ensure w->optional is set to avoid SEGFAULT
If CheckWindowOptionalNeed is called consecutively (and the first removes optional), then
we will SEGFAULT.  This can happen in XQuartz because ReparentWindow will call
pScreen->ReparentWindow which can DeleteProperty which will CheckWindowOptionalNeed... then
ReparentWindow will call it again later indiscriminantly.
(cherry picked from commit b608c864cc)
2009-08-05 17:46:46 -07:00
Jeremy Huddleston
bd0ecd5b50 XQuartz: GLX: Update visualConfigs.c to look more like the 1.5 server's for easier patching. 2009-08-05 16:30:22 -07:00
Jeremy Huddleston
6769ffb2f8 XQuartz: Only save lastpt on mouse/tablet events
(cherry picked from commit 552be074e5)
2009-08-05 16:17:28 -07:00
Jeremy Huddleston
cba52fa3e3 XQuartz: Use mouseLocation rather than locationInWindow when setting lastpt
I don't understand the *why* ... I just see that it works better this way for games like Quake2 through wine.  It *should* be better the other way, but somehow it's not.

I guess this will go in my list of puzzles to unravel.
(cherry picked from commit 65ae2d00e1)
2009-08-05 16:17:16 -07:00
Jeremy Huddleston
6a2c4d5959 XQuartz: Don't use location delta for tablets since NSEvent does not give a precise delta.
(cherry picked from commit 6c5bf756a7)
2009-08-05 16:16:22 -07:00
Jeremy Huddleston
f99b27bc6e XQuartz: Purge redundant QuartzBell
(cherry picked from commit de14a63d20)
2009-08-05 16:16:10 -07:00
Jeremy Huddleston
291b8efd79 XQuartz: Added a reminder not to purge a stub that can lead to a crash 2009-08-05 16:13:10 -07:00
Jeremy Huddleston
dc7a527563 XQuartz: Unify how we set our bitmasks for visuals
(cherry picked from commit c230b52c27)
2009-07-31 15:51:21 -07:00
Jeremy Huddleston
fe248642ce XQuartz: Dead code removal for StaticColor visual
(cherry picked from commit e457a44e87)
2009-07-31 15:35:31 -07:00
Jeremy Huddleston
182b228e0b XQuartz: no DirectColor
(cherry picked from commit df2fbc410f)
2009-07-31 15:35:08 -07:00
Jeremy Huddleston
129d3f93d8 XQuartz: Define DDXRingBell
(cherry picked from commit 1133473812)
2009-07-31 15:35:02 -07:00
Jeremy Huddleston
f430cda0fd XQuartz: Avoid a possible spinlock in applicationWillTerminate 2009-07-28 22:52:33 -07:00
Jeremy Huddleston
227c6e01a6 XQuartz: Avoid namespace collission for BOOL in Sparkle 2009-07-28 13:40:15 -07:00
Jeremy Huddleston
7e40fdf255 1.4.2-apple46 2009-07-28 13:07:19 -07:00
Jeremy Huddleston
d246ac4b27 XQuartz: xpr: Added missing include for RootlessHideAllWindows
(cherry picked from commit 75e1047308)
2009-07-25 15:23:15 -07:00
Jeremy Huddleston
b0859c2b2b XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated relaunch." change
This was in place to work around the issue that was correctly solved with the
previous commit (changing the Windows menu behavior).  Reverting this change
no longer causes crashing, so it's safe to show the dialog now.
(cherry picked from commit 023cef31bb)
2009-07-24 09:42:11 -07:00
Jeremy Huddleston
aecf944f2e XQuartz: Change handling of Windows menu to workaround a bug triggered by mixing Sparkle and X11 windows
<rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
(cherry picked from commit 27ac513526)
2009-07-24 09:41:52 -07:00
Jeremy Huddleston
d86d06201c XQuartz: Set can_quit to true during a Sparkle-initiated relaunch.
(cherry picked from commit b2e9a77111)
2009-07-24 09:41:42 -07:00
Jeremy Huddleston
02f6723c96 XQuartz: Added a "Check for X11 Updates..." menu item.
(cherry picked from commit 305144bfa4)
2009-07-24 09:41:16 -07:00
Jeremy Huddleston
58c3026499 XQuartz: Initial support for automatic updates through Sparkle
(cherry picked from commit c45f1be364)
2009-07-20 22:04:08 -07:00