Keith Packard
d4096abb59
Merge remote-tracking branch 'whot/for-keith'
2011-07-01 15:45:45 -07:00
Peter Hutterer
87d4f90bfc
input: free the EQ allocated memory on shutdown ( #38634 )
...
mieqFini() already does the right thing, but it needs to be called by the
various DDXs and the XTest Extension.
X.Org Bug 38634 <http://bugs.freedesktop.org/show_bug.cgi?id=38634 >
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01 08:46:28 +10:00
Jeremy Huddleston
bea57392c7
XQuartz: Fix Makefile dependencies
...
automake generates _DEPENDENCIES from _LIBADD, but it strips out variables.
This resulted in not relinking if some components were rebuilt (like
libdix, libos, etc).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28 13:07:20 -07:00
Jeremy Huddleston
c8b80a82d9
XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
...
In addition, this change will not call into the X11 activation unless an X11
window was active when we deactivated. We can't rely on the event and current
key windows because the key window will be nil until activated, and the event
will only reference the window if the window was clicked (whereas it will be
nil if we activated via dock or cmd-tab).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28 13:07:19 -07:00
Jeremy Huddleston
778309fd0e
XQuartz: GLX: Fix a -Wformat-security compilation warning
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-15 14:00:52 -07:00
Jeremy Huddleston
34e2598f0a
XQuartz: GLX: Use _glapi_create_table_from_handle to create out dispatch table
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-15 14:00:52 -07:00
Jeremy Huddleston
c3df4df407
XQuartz: Add missing include for <pthread.h>
...
BuildFix for Leopard and earlier.
https://trac.macports.org/ticket/29717
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-15 08:17:26 -07:00
Jeremy Huddleston
feab04397d
XQuartz: AIGLX: Remove unnecessary includes in indirect.c
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-03 16:01:18 -04:00
Jeremy Huddleston
3fa5d27e46
XQuartz: AIGLX: Setup dispatch table based on runtime capabilities rather than buildtime
...
This will allow XQuartz built on older systems to pickup capabilities on
newer systems and prevent runtime failures when building on newer systems and
running on older ones.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-03 16:01:18 -04:00
Jeremy Huddleston
dd5d91fc95
XQuartz: Remove explicit link against libGL
...
This was indented to force a link against OpenGL.framework's libGL, but it
actually resulted in linking against mesa's libGL due to the ordering of -L
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-03 16:01:18 -04:00
Jeremy Huddleston
48b4b778f6
XQuartz: xpbproxy: Correct NSUInteger format strings
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:57:52 -07:00
Jeremy Huddleston
971193b275
XQuartz: ASL: Use xpbproxy subsystem for logging xpbproxy messages
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:57:52 -07:00
Jeremy Huddleston
7dfd65705c
XQuartz: ASL: Use GLXAqua subsystem for logging GLXAqua messages
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:18:47 -07:00
Jeremy Huddleston
19020b23ef
XQuartz: ASL: Use xpr subsystem for logging xpr messages
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:18:44 -07:00
Jeremy Huddleston
a66400f8db
XQuartz: ASL: Update logging to support differnet levels and subsystems
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 21:07:56 -07:00
Jeremy Huddleston
c0077b41b4
XQuartz: Add a semicolon after DEBUG_LOG
...
Don't rely on the macro to provide it
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 20:56:18 -07:00
Jeremy Huddleston
fbc8aae8e9
XQuartz: Move -lXplugin to LDFLAGS from LDADD
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 20:41:11 -07:00
Jeremy Huddleston
38df706c6b
XQuartz: GLX: Create a new dispatch table rather than modifying the existing one
...
Fixes regression introduced by b0c665ac0f
0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684
1 X11.bin 0x00000001001315b0 DoCreateContext + 163
2 X11.bin 0x000000010013509f __glXDispatch + 211
3 X11.bin 0x00000001000c7dad Dispatch + 785
4 X11.bin 0x00000001000b97e5 dix_main + 1022
5 X11.bin 0x00000001000122bc server_thread + 50
6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331
7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13
http://lists.apple.com/archives/X11-users/2011/May/msg00045.html
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2011-06-01 20:41:11 -07:00
Jeremy Huddleston
1fb501ad15
XQuartz: Don't crash if CG increases our display resolution
...
miPaintWindow would cause fbFill() to overwrite pScreen's pixmap which was
sized for the old resolution.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-22 11:17:59 -07:00
Jeremy Huddleston
60af79e35e
XQuartz: RandR: Don't crash if X11 is launched while there are no attached displays
...
If CG reports no displays when launching, we could crash in RandR. Instead, just
provide a fake 800x600 display until we are notified about displays being attached.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-22 11:17:59 -07:00
Jeremy Huddleston
f25ca898c5
XQuartz: Mark functions _X_NORETURN
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-22 11:17:59 -07:00
Jeremy Huddleston
7413886d65
XQuartz: Silence clang warnings about shadow declarations
...
X11Application.m:1272:26: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
xp_error e;
^
X11Application.m:1098:36: note: previous declaration is here
- (void) sendX11NSEvent:(NSEvent *)e {
^
1 warning generated.
bundle-main.c:648:36: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
int max_files, i;
^
bundle-main.c:594:9: note: previous declaration is here
int i;
^
1 warning generated.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-22 11:17:59 -07:00
Jeremy Huddleston
96ac4e61f4
XQuartz: Update DEBUG_LOG to report to ASL
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-22 11:17:59 -07:00
Jeremy Huddleston
384eb45b94
XQuartz: RandR: Avoid over-releasing if we are unable to determine the current display mode.
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-14 19:15:27 -07:00
Jeremy Huddleston
25191648b8
XQuartz: Don't call mieqEnqueue during server shutdown
...
Found-by: GuardMalloc
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-14 19:15:27 -07:00
Jeremy Huddleston
fd5f630bc4
XQuartz: Fix an array-index-out-of-bounds crasher
...
Found-by: GuardMalloc
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-14 19:15:26 -07:00
Keith Packard
ba5540221f
Merge remote-tracking branch 'whot/for-keith'
2011-05-13 13:59:36 -07:00
Jeremy Huddleston
f144fb771f
XQuartz: Don't circumvent NDEBUG
...
If someone wants to turn off asserts with NDEBUG, let them.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-13 09:10:42 -07:00
Jeremy Huddleston
f46835a096
XQuartz: Redirect stdout/stderr to asl
...
In order to improve logging in XQuartz, stdout and stderr should be redirected
to asl (syslog).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-12 20:19:40 -07:00
Jeremy Huddleston
5bc05d96f8
XQuartz: Add a LOGGING section to our man page
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-12 19:28:32 -07:00
Jeremy Huddleston
c18b7165f9
XQuartz: stub: Log directly to ASL rather than stdout/stderr
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-12 19:28:32 -07:00
Jeremy Huddleston
d694601591
Fix a typo: laucnd instead of launchd
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-12 18:31:14 -07:00
Jeremy Huddleston
c89a6f824e
XQuartz: Don't call into CoreFoundation after fork() and before exec()
...
After fork()ing, we should just limit ourselves to setting up
the environment, file descriptors, and exec()ing.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-10 23:55:19 -07:00
Peter Hutterer
20fb07f436
input: remove DDX event list handling
...
The current approach to event posting required the DDX to request the event
list (allocated by the DIX) and then pass that list into QueuePointerEvent
and friends.
Remove this step and use the DIX event list directly. This means that
QueuePointerEvent is not reentrant but it wasn't before anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-11 14:27:36 +10:00
Peter Hutterer
8670c46bdf
input: replace EventListPtr with InternalEvent array
...
EventListPtr is a relic from pre-1.6, when we had protocol events in the
event queue and thus events of varying size.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-11 14:27:36 +10:00
Peter Hutterer
e7150db535
input: Provide Queue{Button|Keyboard|Proximity}Event helpers
...
Don't require every caller to use GPE + mieqEnqueue, provide matching
Queue...Event functions instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-11 14:27:33 +10:00
Jeremy Huddleston
3ac220d6cc
XQuartz: prefs_copy_url and prefs_get_copy return retained objects
...
No functional change. This just annotates the return policy.
Found-by: clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-03 10:54:09 -07:00
Jeremy Huddleston
bac8d12555
XQuartz: Ensure that {CF,NS}_RETURNS{,_NOT}_RETAINED are defined
...
These will be used in subsequent patches to denote proper retain counts in XQuartz
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-03 10:39:31 -07:00
Jeremy Huddleston
0fc7ec6dd5
XQuartz: Fix incorrect typedefs with XPLUGIN_VERSION < 4
...
Ok, this time for sure... how many brown bags can I fit over my face?
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-29 11:06:18 -07:00
Jeremy Huddleston
29d471663e
XQuartz: Use a rwlock instead of a mutex to protect window_hash in the pthread case
...
Concurrent reads are acceptable, so using an rwlock should be better.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-29 11:04:42 -07:00
Jeremy Huddleston
0f284f0f42
XQuartz: BuildFix to build correctly with XPLUGIN_VERSION < 4
...
This fixes a regression introduced by d79cc14a51
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-27 22:12:59 -07:00
Jeremy Huddleston
6f29dbf5e3
XQuartz: Use ErrorF rather than fprintf to log errors
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 22:00:41 -07:00
Jeremy Huddleston
cb083b05c4
XQuartz: stub: Dead code removal
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 21:25:10 -07:00
Emanuele Giaquinta
72ed7551f4
XQuartz: pbproxy: LP64: Fix itteration through XGetWindowProperty where sizeof(long) != 4
...
http://xquartz.macosforge.org/trac/ticket/476
Signed-off-by: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:04 -07:00
Jeremy Huddleston
0a60192a85
XQuartz: Enable logging to a file for better debugging
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:04 -07:00
Jeremy Huddleston
de4023f194
XQuartz: Rename launchd-id-prefix to bundle-id-prefix
...
It's used many other places than just for launchd.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:04 -07:00
Jeremy Huddleston
e466745109
XQuartz: Dead code removal
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:04 -07:00
Jeremy Huddleston
f1d867c0a1
XQuartz: Silence clang static analyzer
...
Call to 'malloc' has an allocation size of 0 bytes.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:03 -07:00
Jeremy Huddleston
913223e9dd
XQuartz: xpr: Dead code removal
...
Assigned value is always the same as the existing value.
Found by clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:03 -07:00
Jeremy Huddleston
d0caa0e4cd
XQuartz: Silence warnings about deprecated functionality where it is an intended fallback
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-25 18:57:03 -07:00