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

Merge remote branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2010-06-10 13:36:35 -07:00
parent 4172aa137c 5e1ef1f4dd
commit 84190d2095
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/xquartz/quartzKeyboard.c
View File

@ -427,20 +427,28 @@ void DarwinKeyboardReloadHandler(void) {
} }
} pthread_mutex_unlock(&keyInfo_mutex); } pthread_mutex_unlock(&keyInfo_mutex);
/* Check for system .Xmodmap */ /* Modify with xmodmap */
if (access(xmodmap, F_OK) == 0) { if (access(xmodmap, F_OK) == 0) {
/* Check for system .Xmodmap */
if (access(sysmodmap, F_OK) == 0) { if (access(sysmodmap, F_OK) == 0) {
snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap); if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, sysmodmap) < sizeof(cmd)) {
X11ApplicationLaunchClient(cmd); X11ApplicationLaunchClient(cmd);
} else {
ErrorF("X11.app: Unable to create / execute xmodmap command line");
}
} }
}
/* Check for user's local .Xmodmap */ /* Check for user's local .Xmodmap */
if (homedir != NULL) { if ((homedir != NULL) && (snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir) < sizeof(usermodmap))) {
snprintf (usermodmap, sizeof(usermodmap), "%s/.Xmodmap", homedir); if (access(usermodmap, F_OK) == 0) {
if (access(usermodmap, F_OK) == 0) { if(snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap) < sizeof(cmd)) {
snprintf (cmd, sizeof(cmd), "%s %s", xmodmap, usermodmap); X11ApplicationLaunchClient(cmd);
X11ApplicationLaunchClient(cmd); } else {
ErrorF("X11.app: Unable to create / execute xmodmap command line");
}
}
} else {
ErrorF("X11.app: Unable to determine path to user's .Xmodmap");
} }
} }
} }

16
hw/xquartz/xpr/dri.c
View File

@ -205,14 +205,14 @@ DRIScreenInit(ScreenPtr pScreen)
DRIScreenPrivPtr pDRIPriv; DRIScreenPrivPtr pDRIPriv;
int i; int i;
if (!dixRegisterPrivateKey(&DRIScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))
return FALSE: return FALSE;
if (!dixRegisterPrivateKey(&DRIWindowPrivateKeyRec, PRIVATE_WINDOW, 0)) if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 0))
return FALSE: return FALSE;
if (!dixRegisterPrivateKey(&DRIPixmapPrivateKeyRec, PRIVATE_PIXMAP, 0)) if (!dixRegisterPrivateKey(&DRIPixmapPrivKeyRec, PRIVATE_PIXMAP, 0))
return FALSE: return FALSE;
if (!dixRegisterPrivateKey(&DRIPixmapBufferPrivateKeyRec, PRIVATE_PIXMAP, 0)) if (!dixRegisterPrivateKey(&DRIPixmapBufferPrivKeyRec, PRIVATE_PIXMAP, 0))
return FALSE: return FALSE;
pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec)); pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));
if (!pDRIPriv) { if (!pDRIPriv) {

10
hw/xquartz/xpr/driWrap.c
View File

@ -530,18 +530,12 @@ DRIWrapInit(ScreenPtr pScreen) {
if(!dixRegisterPrivateKey(&driGCKeyRec, PRIVATE_GC, sizeof(DRIGCRec))) if(!dixRegisterPrivateKey(&driGCKeyRec, PRIVATE_GC, sizeof(DRIGCRec)))
return FALSE; return FALSE;
if(!dixRegisterPrivateKey(&driWrapScreenKeyRec, PRIVATE_WINDOW, sizeof(DRIWrapScreenRec))) if(!dixRegisterPrivateKey(&driWrapScreenKeyRec, PRIVATE_SCREEN, sizeof(DRIWrapScreenRec)))
return FALSE;
pScreenPriv = malloc(sizeof(*pScreenPriv));
if(NULL == pScreenPriv)
return FALSE; return FALSE;
pScreenPriv = dixGetPrivateAddr(&pScreen->devPrivates, &driWrapScreenKeyRec);
pScreenPriv->CreateGC = pScreen->CreateGC; pScreenPriv->CreateGC = pScreen->CreateGC;
pScreen->CreateGC = DRICreateGC; pScreen->CreateGC = DRICreateGC;
dixSetPrivate(&pScreen->devPrivates, driWrapScreenKey, pScreenPriv);
return TRUE; return TRUE;
} }

4
hw/xquartz/xpr/xprCursor.c
View File

@ -58,7 +58,7 @@ typedef struct {
} QuartzCursorScreenRec, *QuartzCursorScreenPtr; } QuartzCursorScreenRec, *QuartzCursorScreenPtr;
static DevPrivateKeyRec darwinCursorScreenKeyRec; static DevPrivateKeyRec darwinCursorScreenKeyRec;
#define darwinCursorScreenKey (&darwinCursorScreenKey) #define darwinCursorScreenKey (&darwinCursorScreenKeyRec)
#define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \ #define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey)) dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))
@ -359,7 +359,7 @@ QuartzInitCursor(ScreenPtr pScreen)
if (!miDCInitialize(pScreen, &quartzScreenFuncsRec)) if (!miDCInitialize(pScreen, &quartzScreenFuncsRec))
return FALSE; return FALSE;
if (!dixRegisterPrivate(&darwinCursorScreenKeyRec, PRIVATE_SCREEN, 0)) if (!dixRegisterPrivateKey(&darwinCursorScreenKeyRec, PRIVATE_SCREEN, 0))
return FALSE; return FALSE;
ScreenPriv = calloc(1, sizeof(QuartzCursorScreenRec)); ScreenPriv = calloc(1, sizeof(QuartzCursorScreenRec));