andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'jeremyhu/master'

Browse Source
This commit is contained in:
Keith Packard 2009-11-04 08:55:20 -08:00
commit 7442f3355a
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/events.c
View File

@ -1673,7 +1673,7 @@ AllowSome(ClientPtr client,
thisGrabbed = grabinfo->grab && SameClient(grabinfo->grab, client);
thisSynced = FALSE;
otherGrabbed = FALSE;
othersFrozen = TRUE;
othersFrozen = FALSE;
grabTime = grabinfo->grabTime;
for (dev = inputInfo.devices; dev; dev = dev->next)
{
@ -1689,11 +1689,9 @@ AllowSome(ClientPtr client,
otherGrabbed = TRUE;
if (grabinfo->sync.other == devgrabinfo->grab)
thisSynced = TRUE;
if (devgrabinfo->sync.state < FROZEN)
othersFrozen = FALSE;
if (devgrabinfo->sync.state >= FROZEN)
othersFrozen = TRUE;
}
else if (!devgrabinfo->sync.other || !SameClient(devgrabinfo->sync.other, client))
othersFrozen = FALSE;
}
if (!((thisGrabbed && grabinfo->sync.state >= FROZEN) || thisSynced))
return;

6
hw/xquartz/X11Application.m
View File

@ -961,6 +961,12 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
/* not reached */
}
void launch_client(const char *cmd) {
NSString *string = [[NSString alloc] initWithUTF8String:cmd];
[[X11App controller] launch_client:string];
[string release];
}
@implementation X11Application (Private)
#ifdef NX_DEVICELCMDKEYMASK

1
hw/xquartz/X11Controller.h
View File

@ -144,5 +144,6 @@ typedef unsigned int NSUInteger;
#endif /* __OBJC__ */
void X11ControllerMain(int argc, char **argv, char **envp);
void launch_client(const char *cmd);
#endif /* X11CONTROLLER_H */

23
hw/xquartz/quartzKeyboard.c
View File

@ -52,6 +52,8 @@
#include "quartzKeyboard.h"
#include "quartzAudio.h"
#include "X11Application.h"
#include "threadSafety.h"
#ifdef NDEBUG
@ -359,6 +361,10 @@ void DarwinKeyboardReloadHandler(void) {
CFIndex initialKeyRepeatValue, keyRepeatValue;
BOOL ok;
DeviceIntPtr pDev = darwinKeyboard;
const char *xmodmap = PROJECTROOT "/bin/xmodmap";
const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";
const char *homedir = getenv("HOME");
char usermodmap[PATH_MAX], cmd[PATH_MAX];
DEBUG_LOG("DarwinKeyboardReloadHandler\n");
@ -397,6 +403,23 @@ void DarwinKeyboardReloadHandler(void) {
}
}
} pthread_mutex_unlock(&keyInfo_mutex);
/* Check for system .Xmodmap */
if (access(xmodmap, F_OK) == 0) {
if (access(sysmodmap, F_OK) == 0) {
snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap);
launch_client(cmd);
}
}
/* Check for user's local .Xmodmap */
if (homedir != NULL) {
snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir);
if (access(usermodmap, F_OK) == 0) {
snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap);
launch_client(cmd);
}
}
}
//-----------------------------------------------------------------------------