XQuartz: misc 1.6 updates (still --disable-glx)
rlAccel is not longer compatable, and it's not worth fixing
Don't override DeviceCursorInitialize with a noop
Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
(cherry picked from commit c137f68168
)
This commit is contained in:
parent
69ddac2328
commit
671b71a6cb
|
@ -510,6 +510,17 @@ void InitInput( int argc, char **argv )
|
||||||
darwinTabletEraser->name = strdup("eraser");
|
darwinTabletEraser->name = strdup("eraser");
|
||||||
|
|
||||||
darwinTabletCurrent = darwinTabletStylus;
|
darwinTabletCurrent = darwinTabletStylus;
|
||||||
|
|
||||||
|
ActivateDevice(darwinKeyboard);
|
||||||
|
ActivateDevice(darwinPointer);
|
||||||
|
ActivateDevice(darwinTabletStylus);
|
||||||
|
ActivateDevice(darwinTabletCursor);
|
||||||
|
ActivateDevice(darwinTabletEraser);
|
||||||
|
EnableDevice(darwinKeyboard);
|
||||||
|
EnableDevice(darwinPointer);
|
||||||
|
EnableDevice(darwinTabletStylus);
|
||||||
|
EnableDevice(darwinTabletCursor);
|
||||||
|
EnableDevice(darwinTabletEraser);
|
||||||
|
|
||||||
DarwinEQInit();
|
DarwinEQInit();
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@ X11_bin_LDADD = \
|
||||||
$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
|
$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
|
||||||
$(top_builddir)/dix/dixfonts.lo \
|
$(top_builddir)/dix/dixfonts.lo \
|
||||||
$(top_builddir)/miext/rootless/librootless.la \
|
$(top_builddir)/miext/rootless/librootless.la \
|
||||||
$(top_builddir)/miext/rootless/accel/librlAccel.la \
|
|
||||||
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
|
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
|
||||||
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
|
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
|
||||||
|
|
||||||
|
|
|
@ -362,8 +362,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
|
||||||
|
|
||||||
XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
|
XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
|
||||||
}
|
}
|
||||||
// TODO: What do we do now in 1.6?
|
|
||||||
SwitchCoreKeyboard(pDev);
|
|
||||||
|
|
||||||
DarwinKeyboardSetDeviceKeyMap(&keySyms);
|
DarwinKeyboardSetDeviceKeyMap(&keySyms);
|
||||||
}
|
}
|
||||||
|
|
|
@ -239,7 +239,6 @@ QuartzSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* QuartzMoveCursor
|
* QuartzMoveCursor
|
||||||
* Move the cursor. This is a noop for us.
|
* Move the cursor. This is a noop for us.
|
||||||
|
@ -249,25 +248,6 @@ QuartzMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: New for 1.6 ... probably noop */
|
|
||||||
static Bool QuartzDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) {
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO: New for 1.6 ... probably noop */
|
|
||||||
static void QuartzDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) {
|
|
||||||
}
|
|
||||||
|
|
||||||
static miPointerSpriteFuncRec quartzSpriteFuncsRec = {
|
|
||||||
QuartzRealizeCursor,
|
|
||||||
QuartzUnrealizeCursor,
|
|
||||||
QuartzSetCursor,
|
|
||||||
QuartzMoveCursor,
|
|
||||||
QuartzDeviceCursorInitialize,
|
|
||||||
QuartzDeviceCursorCleanup
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
===========================================================================
|
===========================================================================
|
||||||
|
|
||||||
|
@ -387,13 +367,16 @@ QuartzInitCursor(ScreenPtr pScreen)
|
||||||
PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
|
PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
|
||||||
|
|
||||||
ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
|
ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
|
||||||
PointPriv->spriteFuncs = &quartzSpriteFuncsRec;
|
|
||||||
|
|
||||||
|
PointPriv->spriteFuncs->RealizeCursor = QuartzRealizeCursor;
|
||||||
|
PointPriv->spriteFuncs->UnrealizeCursor = QuartzUnrealizeCursor;
|
||||||
|
PointPriv->spriteFuncs->SetCursor = QuartzSetCursor;
|
||||||
|
PointPriv->spriteFuncs->MoveCursor = QuartzMoveCursor;
|
||||||
|
|
||||||
ScreenPriv->cursorVisible = TRUE;
|
ScreenPriv->cursorVisible = TRUE;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* QuartzSuspendXCursor
|
* QuartzSuspendXCursor
|
||||||
* X server is hiding. Restore the Aqua cursor.
|
* X server is hiding. Restore the Aqua cursor.
|
||||||
|
|
|
@ -364,7 +364,9 @@ xprSetupScreen(int index, ScreenPtr pScreen)
|
||||||
{
|
{
|
||||||
// Initialize accelerated rootless drawing
|
// Initialize accelerated rootless drawing
|
||||||
// Note that this must be done before DamageSetup().
|
// Note that this must be done before DamageSetup().
|
||||||
RootlessAccelInit(pScreen);
|
|
||||||
|
// These are crashing ugly... better to be stable and not crash for now.
|
||||||
|
//RootlessAccelInit(pScreen);
|
||||||
|
|
||||||
#ifdef DAMAGE
|
#ifdef DAMAGE
|
||||||
// The Damage extension needs to wrap underneath the
|
// The Damage extension needs to wrap underneath the
|
||||||
|
|
Loading…
Reference in New Issue
Block a user