frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Call xp_window_bring_all_to_front if available in libXplugin 

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2012-07-25 11:40:33 -07:00
parent 3b7f313b3d
commit fd228d3184
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/xquartz/xpr/xprEvent.c
View File

@ -52,9 +52,20 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_LIBDISPATCH
#include <dispatch/dispatch.h>
#endif
#include "rootlessWindow.h" #include "rootlessWindow.h"
#include "xprEvent.h" #include "xprEvent.h"
/* This is important enough to declare here if building against an old
* libXplugin, so we pick it up whenever libXplugin starts to support it.
*/
#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION < 6
extern xp_error xp_window_bring_all_to_front(void) __attribute__((weak_import));
#endif
Bool Bool
QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev) QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
{ {
@ -72,7 +83,28 @@ QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
case kXquartzBringAllToFront: case kXquartzBringAllToFront:
DEBUG_LOG("kXquartzBringAllToFront\n"); DEBUG_LOG("kXquartzBringAllToFront\n");
/* There's no need to do xp_window_bring_all_to_front on Leopard,
* and we don't care about the result, so just do it async.
*/
#if defined(HAVE_LIBDISPATCH)
#if (defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED >= 6) || \
(!defined(XPLUGIN_VERSION_MIN_REQUIRED) && defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 6)
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
xp_window_bring_all_to_front();
});
#else
if (&xp_window_bring_all_to_front) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
xp_window_bring_all_to_front();
});
} else {
RootlessOrderAllWindows(e->data[0]); RootlessOrderAllWindows(e->data[0]);
}
#endif
#else
RootlessOrderAllWindows(e->data[0]);
#endif
return TRUE; return TRUE;
default: default: