Skip to content

N
nx-libs
Commit 3aedac17 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

XEVIE: Drop all Xserver code blocks that relate to removed XEVIE extension.

parent cd39f139
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 207 deletions
nx-X11/programs/Xserver/dix/events.c
View file @ 3aedac17
...@@ -143,20 +143,6 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); ...@@ -143,20 +143,6 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
#include <nx-X11/extensions/security.h> #include <nx-X11/extensions/security.h>
#endif #endif
#ifdef XEVIE
extern WindowPtr *WindowTable;
extern int xevieFlag;
extern int xevieClientIndex;
extern DeviceIntPtr xeviemouse;
extern DeviceIntPtr xeviekb;
extern Mask xevieMask;
extern Mask xevieFilters[128];
extern int xevieEventSent;
extern int xevieKBEventSent;
int xeviegrabState = 0;
xEvent *xeviexE;
#endif
#include <nx-X11/extensions/XIproto.h> #include <nx-X11/extensions/XIproto.h>
#include "exevents.h" #include "exevents.h"
#include "extnsionst.h" #include "extnsionst.h"
...@@ -253,11 +239,6 @@ static struct { ...@@ -253,11 +239,6 @@ static struct {
#endif #endif
} sprite; /* info about the cursor sprite */ } sprite; /* info about the cursor sprite */
#ifdef XEVIE
WindowPtr xeviewin;
HotSpot xeviehot;
#endif
static void DoEnterLeaveEvents( static void DoEnterLeaveEvents(
WindowPtr fromWin, WindowPtr fromWin,
WindowPtr toWin, WindowPtr toWin,
...@@ -462,13 +443,7 @@ XineramaCheckVirtualMotion( ...@@ -462,13 +443,7 @@ XineramaCheckVirtualMotion(
if (qe) if (qe)
{ {
sprite.hot.pScreen = qe->pScreen; /* should always be Screen 0 */ sprite.hot.pScreen = qe->pScreen; /* should always be Screen 0 */
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = qe->event->u.keyButtonPointer.rootX; sprite.hot.x = qe->event->u.keyButtonPointer.rootX;
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = qe->event->u.keyButtonPointer.rootY; sprite.hot.y = qe->event->u.keyButtonPointer.rootY;
pWin = inputInfo.pointer->grab ? inputInfo.pointer->grab->confineTo : pWin = inputInfo.pointer->grab ? inputInfo.pointer->grab->confineTo :
NullWindow; NullWindow;
...@@ -505,24 +480,12 @@ XineramaCheckVirtualMotion( ...@@ -505,24 +480,12 @@ XineramaCheckVirtualMotion(
lims = *RegionExtents(&sprite.Reg2); lims = *RegionExtents(&sprite.Reg2);
if (sprite.hot.x < lims.x1) if (sprite.hot.x < lims.x1)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = lims.x1; sprite.hot.x = lims.x1;
else if (sprite.hot.x >= lims.x2) else if (sprite.hot.x >= lims.x2)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = lims.x2 - 1; sprite.hot.x = lims.x2 - 1;
if (sprite.hot.y < lims.y1) if (sprite.hot.y < lims.y1)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = lims.y1; sprite.hot.y = lims.y1;
else if (sprite.hot.y >= lims.y2) else if (sprite.hot.y >= lims.y2)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = lims.y2 - 1; sprite.hot.y = lims.y2 - 1;
if (RegionNumRects(&sprite.Reg2) > 1) if (RegionNumRects(&sprite.Reg2) > 1)
...@@ -552,33 +515,15 @@ XineramaCheckMotion(xEvent *xE) ...@@ -552,33 +515,15 @@ XineramaCheckMotion(xEvent *xE)
panoramiXdataPtr[0].x; panoramiXdataPtr[0].x;
XE_KBPTR.rootY += panoramiXdataPtr[sprite.screen->myNum].y - XE_KBPTR.rootY += panoramiXdataPtr[sprite.screen->myNum].y -
panoramiXdataPtr[0].y; panoramiXdataPtr[0].y;
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = XE_KBPTR.rootX; sprite.hot.x = XE_KBPTR.rootX;
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = XE_KBPTR.rootY; sprite.hot.y = XE_KBPTR.rootY;
if (sprite.hot.x < sprite.physLimits.x1) if (sprite.hot.x < sprite.physLimits.x1)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = sprite.physLimits.x1; sprite.hot.x = sprite.physLimits.x1;
else if (sprite.hot.x >= sprite.physLimits.x2) else if (sprite.hot.x >= sprite.physLimits.x2)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = sprite.physLimits.x2 - 1; sprite.hot.x = sprite.physLimits.x2 - 1;
if (sprite.hot.y < sprite.physLimits.y1) if (sprite.hot.y < sprite.physLimits.y1)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = sprite.physLimits.y1; sprite.hot.y = sprite.physLimits.y1;
else if (sprite.hot.y >= sprite.physLimits.y2) else if (sprite.hot.y >= sprite.physLimits.y2)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = sprite.physLimits.y2 - 1; sprite.hot.y = sprite.physLimits.y2 - 1;
if (sprite.hotShape) if (sprite.hotShape)
...@@ -595,9 +540,6 @@ XineramaCheckMotion(xEvent *xE) ...@@ -595,9 +540,6 @@ XineramaCheckMotion(xEvent *xE)
XE_KBPTR.rootY = sprite.hot.y; XE_KBPTR.rootY = sprite.hot.y;
} }
#ifdef XEVIE
xeviewin =
#endif
sprite.win = XYToWindow(sprite.hot.x, sprite.hot.y); sprite.win = XYToWindow(sprite.hot.x, sprite.hot.y);
if (sprite.win != prevSpriteWin) if (sprite.win != prevSpriteWin)
...@@ -821,13 +763,7 @@ CheckVirtualMotion( ...@@ -821,13 +763,7 @@ CheckVirtualMotion(
if (qe) if (qe)
{ {
sprite.hot.pScreen = qe->pScreen; sprite.hot.pScreen = qe->pScreen;
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = qe->event->u.keyButtonPointer.rootX; sprite.hot.x = qe->event->u.keyButtonPointer.rootX;
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = qe->event->u.keyButtonPointer.rootY; sprite.hot.y = qe->event->u.keyButtonPointer.rootY;
pWin = inputInfo.pointer->grab ? inputInfo.pointer->grab->confineTo : pWin = inputInfo.pointer->grab ? inputInfo.pointer->grab->confineTo :
NullWindow; NullWindow;
...@@ -839,31 +775,16 @@ CheckVirtualMotion( ...@@ -839,31 +775,16 @@ CheckVirtualMotion(
if (sprite.hot.pScreen != pWin->drawable.pScreen) if (sprite.hot.pScreen != pWin->drawable.pScreen)
{ {
sprite.hot.pScreen = pWin->drawable.pScreen; sprite.hot.pScreen = pWin->drawable.pScreen;
#ifdef XEVIE
xeviehot.x = xeviehot.y = 0;
#endif
sprite.hot.x = sprite.hot.y = 0; sprite.hot.x = sprite.hot.y = 0;
} }
lims = *RegionExtents(&pWin->borderSize); lims = *RegionExtents(&pWin->borderSize);
if (sprite.hot.x < lims.x1) if (sprite.hot.x < lims.x1)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = lims.x1; sprite.hot.x = lims.x1;
else if (sprite.hot.x >= lims.x2) else if (sprite.hot.x >= lims.x2)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = lims.x2 - 1; sprite.hot.x = lims.x2 - 1;
if (sprite.hot.y < lims.y1) if (sprite.hot.y < lims.y1)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = lims.y1; sprite.hot.y = lims.y1;
else if (sprite.hot.y >= lims.y2) else if (sprite.hot.y >= lims.y2)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = lims.y2 - 1; sprite.hot.y = lims.y2 - 1;
#ifdef SHAPE #ifdef SHAPE
if (wBoundingShape(pWin)) if (wBoundingShape(pWin))
...@@ -2057,33 +1978,15 @@ CheckMotion(xEvent *xE) ...@@ -2057,33 +1978,15 @@ CheckMotion(xEvent *xE)
sprite.hot.pScreen = sprite.hotPhys.pScreen; sprite.hot.pScreen = sprite.hotPhys.pScreen;
ROOT = WindowTable[sprite.hot.pScreen->myNum]; ROOT = WindowTable[sprite.hot.pScreen->myNum];
} }
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = XE_KBPTR.rootX; sprite.hot.x = XE_KBPTR.rootX;
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = XE_KBPTR.rootY; sprite.hot.y = XE_KBPTR.rootY;
if (sprite.hot.x < sprite.physLimits.x1) if (sprite.hot.x < sprite.physLimits.x1)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = sprite.physLimits.x1; sprite.hot.x = sprite.physLimits.x1;
else if (sprite.hot.x >= sprite.physLimits.x2) else if (sprite.hot.x >= sprite.physLimits.x2)
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = sprite.physLimits.x2 - 1; sprite.hot.x = sprite.physLimits.x2 - 1;
if (sprite.hot.y < sprite.physLimits.y1) if (sprite.hot.y < sprite.physLimits.y1)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = sprite.physLimits.y1; sprite.hot.y = sprite.physLimits.y1;
else if (sprite.hot.y >= sprite.physLimits.y2) else if (sprite.hot.y >= sprite.physLimits.y2)
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = sprite.physLimits.y2 - 1; sprite.hot.y = sprite.physLimits.y2 - 1;
#ifdef SHAPE #ifdef SHAPE
if (sprite.hotShape) if (sprite.hotShape)
...@@ -2101,9 +2004,6 @@ CheckMotion(xEvent *xE) ...@@ -2101,9 +2004,6 @@ CheckMotion(xEvent *xE)
XE_KBPTR.rootY = sprite.hot.y; XE_KBPTR.rootY = sprite.hot.y;
} }
#ifdef XEVIE
xeviewin =
#endif
sprite.win = XYToWindow(sprite.hot.x, sprite.hot.y); sprite.win = XYToWindow(sprite.hot.x, sprite.hot.y);
#ifdef notyet #ifdef notyet
if (!(sprite.win->deliverableEvents & if (!(sprite.win->deliverableEvents &
...@@ -2183,9 +2083,6 @@ DefineInitialRootWindow(register WindowPtr win) ...@@ -2183,9 +2083,6 @@ DefineInitialRootWindow(register WindowPtr win)
sprite.hot = sprite.hotPhys; sprite.hot = sprite.hotPhys;
sprite.hotLimits.x2 = pScreen->width; sprite.hotLimits.x2 = pScreen->width;
sprite.hotLimits.y2 = pScreen->height; sprite.hotLimits.y2 = pScreen->height;
#ifdef XEVIE
xeviewin =
#endif
sprite.win = win; sprite.win = win;
sprite.current = wCursor (win); sprite.current = wCursor (win);
sprite.current->refcnt++; sprite.current->refcnt++;
...@@ -2764,45 +2661,6 @@ ProcessKeyboardEvent (register xEvent *xE, register DeviceIntPtr keybd, int coun ...@@ -2764,45 +2661,6 @@ ProcessKeyboardEvent (register xEvent *xE, register DeviceIntPtr keybd, int coun
GrabPtr grab = keybd->grab; GrabPtr grab = keybd->grab;
Bool deactivateGrab = FALSE; Bool deactivateGrab = FALSE;
register KeyClassPtr keyc = keybd->key; register KeyClassPtr keyc = keybd->key;
#ifdef XEVIE
static Window rootWin = 0;
if(!xeviegrabState && xevieFlag && clients[xevieClientIndex] &&
(xevieMask & xevieFilters[xE->u.u.type])) {
key = xE->u.u.detail;
kptr = &keyc->down[key >> 3];
bit = 1 << (key & 7);
if((xE->u.u.type == KeyPress && (*kptr & bit)) ||
(xE->u.u.type == KeyRelease && !(*kptr & bit)))
{} else {
#ifdef XKB
if(!noXkbExtension)
xevieKBEventSent = 1;
#endif
if(!xevieKBEventSent)
{
xeviekb = keybd;
if(!rootWin) {
rootWin = GetCurrentRootWindow()->drawable.id;
}
xE->u.keyButtonPointer.event = xeviewin->drawable.id;
xE->u.keyButtonPointer.root = rootWin;
xE->u.keyButtonPointer.child = (xeviewin->firstChild) ? xeviewin->firstChild->
drawable.id:0;
xE->u.keyButtonPointer.rootX = xeviehot.x;
xE->u.keyButtonPointer.rootY = xeviehot.y;
xE->u.keyButtonPointer.state = keyc->state;
WriteToClient(clients[xevieClientIndex], sizeof(xEvent), (char *)xE);
#ifdef XKB
if(noXkbExtension)
#endif
return;
} else {
xevieKBEventSent = 0;
}
}
}
#endif
if (!syncEvents.playingEvents) if (!syncEvents.playingEvents)
{ {
...@@ -2815,15 +2673,6 @@ drawable.id:0; ...@@ -2815,15 +2673,6 @@ drawable.id:0;
CallCallbacks(&DeviceEventCallback, (void *)&eventinfo); CallCallbacks(&DeviceEventCallback, (void *)&eventinfo);
} }
} }
#ifdef XEVIE
/* fix for bug5094030: don't change the state bit if the event is from XEvIE client */
if(!(!xeviegrabState && xevieFlag && clients[xevieClientIndex] &&
(xevieMask & xevieFilters[xE->u.u.type]
#ifdef XKB
&& !noXkbExtension
#endif
)))
#endif
XE_KBPTR.state = (keyc->state | inputInfo.pointer->button->state); XE_KBPTR.state = (keyc->state | inputInfo.pointer->button->state);
XE_KBPTR.rootX = sprite.hot.x; XE_KBPTR.rootX = sprite.hot.x;
XE_KBPTR.rootY = sprite.hot.y; XE_KBPTR.rootY = sprite.hot.y;
...@@ -2831,16 +2680,6 @@ drawable.id:0; ...@@ -2831,16 +2680,6 @@ drawable.id:0;
kptr = &keyc->down[key >> 3]; kptr = &keyc->down[key >> 3];
bit = 1 << (key & 7); bit = 1 << (key & 7);
modifiers = keyc->modifierMap[key]; modifiers = keyc->modifierMap[key];
#if defined(XKB) && defined(XEVIE)
if(!noXkbExtension && !xeviegrabState &&
xevieFlag && clients[xevieClientIndex] &&
(xevieMask & xevieFilters[xE->u.u.type])) {
switch(xE->u.u.type) {
case KeyPress: *kptr &= ~bit; break;
case KeyRelease: *kptr |= bit; break;
}
}
#endif
#ifdef DEBUG #ifdef DEBUG
if ((xkbDebugFlags&0x4)&& if ((xkbDebugFlags&0x4)&&
...@@ -2963,18 +2802,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count ...@@ -2963,18 +2802,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
#ifdef XKB #ifdef XKB
XkbSrvInfoPtr xkbi= inputInfo.keyboard->key->xkbInfo; XkbSrvInfoPtr xkbi= inputInfo.keyboard->key->xkbInfo;
#endif #endif
#ifdef XEVIE
if(xevieFlag && clients[xevieClientIndex] && !xeviegrabState &&
(xevieMask & xevieFilters[xE->u.u.type])) {
if(xevieEventSent)
xevieEventSent = 0;
else {
xeviemouse = mouse;
WriteToClient(clients[xevieClientIndex], sizeof(xEvent), (char *)xE);
return;
}
}
#endif
if (!syncEvents.playingEvents) if (!syncEvents.playingEvents)
NoticeTime(xE) NoticeTime(xE)
...@@ -4104,9 +3931,6 @@ InitEvents() ...@@ -4104,9 +3931,6 @@ InitEvents()
spriteTraceGood = 0; spriteTraceGood = 0;
lastEventMask = OwnerGrabButtonMask; lastEventMask = OwnerGrabButtonMask;
filters[MotionNotify] = PointerMotionMask; filters[MotionNotify] = PointerMotionMask;
#ifdef XEVIE
xeviewin =
#endif
sprite.win = NullWindow; sprite.win = NullWindow;
sprite.current = NullCursor; sprite.current = NullCursor;
sprite.hotLimits.x1 = 0; sprite.hotLimits.x1 = 0;
......
nx-X11/programs/Xserver/include/cursorstr.h
View file @ 3aedac17
...@@ -92,7 +92,4 @@ typedef struct { ...@@ -92,7 +92,4 @@ typedef struct {
ScreenPtr pScreen; ScreenPtr pScreen;
} HotSpot; } HotSpot;
#ifdef XEVIE
extern HotSpot xeviehot;
#endif
#endif /* CURSORSTRUCT_H */ #endif /* CURSORSTRUCT_H */
nx-X11/programs/Xserver/include/globals.h
View file @ 3aedac17
...@@ -133,10 +133,6 @@ extern Bool noResExtension; ...@@ -133,10 +133,6 @@ extern Bool noResExtension;
extern Bool noXCMiscExtension; extern Bool noXCMiscExtension;
#endif #endif
#ifdef XEVIE
extern Bool noXevieExtension;
#endif
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
extern Bool noXFree86BigfontExtension; extern Bool noXFree86BigfontExtension;
#endif #endif
......
nx-X11/programs/Xserver/include/windowstr.h
View file @ 3aedac17
...@@ -254,8 +254,4 @@ extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS]; ...@@ -254,8 +254,4 @@ extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
extern int numSaveUndersViewable; extern int numSaveUndersViewable;
extern int deltaSaveUndersViewable; extern int deltaSaveUndersViewable;
#ifdef XEVIE
extern WindowPtr xeviewin;
#endif
#endif /* WINDOWSTRUCT_H */ #endif /* WINDOWSTRUCT_H */
nx-X11/programs/Xserver/mi/miinitext.c
View file @ 3aedac17
...@@ -138,9 +138,6 @@ extern Bool noResExtension; ...@@ -138,9 +138,6 @@ extern Bool noResExtension;
#ifdef XCMISC #ifdef XCMISC
extern Bool noXCMiscExtension; extern Bool noXCMiscExtension;
#endif #endif
#ifdef XEVIE
extern Bool noXevieExtension;
#endif
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
extern Bool noXFree86BigfontExtension; extern Bool noXFree86BigfontExtension;
#endif #endif
...@@ -322,9 +319,6 @@ extern void ResExtensionInit(INITARGS); ...@@ -322,9 +319,6 @@ extern void ResExtensionInit(INITARGS);
#ifdef DMXEXT #ifdef DMXEXT
extern void DMXExtensionInit(INITARGS); extern void DMXExtensionInit(INITARGS);
#endif #endif
#ifdef XEVIE
extern void XevieExtensionInit(INITARGS);
#endif
#ifdef XFIXES #ifdef XFIXES
extern void XFixesExtensionInit(INITARGS); extern void XFixesExtensionInit(INITARGS);
#endif #endif
...@@ -409,9 +403,6 @@ static ExtensionToggle ExtensionToggleList[] = ...@@ -409,9 +403,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef XCMISC #ifdef XCMISC
{ "XC-MISC", &noXCMiscExtension }, { "XC-MISC", &noXCMiscExtension },
#endif #endif
#ifdef XEVIE
{ "XEVIE", &noXevieExtension },
#endif
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
{ "XFree86-Bigfont", &noXFree86BigfontExtension }, { "XFree86-Bigfont", &noXFree86BigfontExtension },
#endif #endif
...@@ -593,9 +584,6 @@ InitExtensions(argc, argv) ...@@ -593,9 +584,6 @@ InitExtensions(argc, argv)
#ifdef DMXEXT #ifdef DMXEXT
DMXExtensionInit(); /* server-specific extension, cannot be disabled */ DMXExtensionInit(); /* server-specific extension, cannot be disabled */
#endif #endif
#ifdef XEVIE
if (!noXevieExtension) XevieExtensionInit();
#endif
#ifdef COMPOSITE #ifdef COMPOSITE
if (!noCompositeExtension) CompositeExtensionInit(); if (!noCompositeExtension) CompositeExtensionInit();
#endif #endif
...@@ -666,9 +654,6 @@ static ExtensionModule staticExtensions[] = { ...@@ -666,9 +654,6 @@ static ExtensionModule staticExtensions[] = {
#ifdef DAMAGE #ifdef DAMAGE
{ DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL }, { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
#endif #endif
#ifdef XEVIE
{ XevieExtensionInit, "XEVIE", &noXevieExtension, NULL },
#endif
{ NULL, NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL, NULL }
}; };
......
nx-X11/programs/Xserver/os/utils.c
View file @ 3aedac17
...@@ -213,11 +213,6 @@ Bool noResExtension = FALSE; ...@@ -213,11 +213,6 @@ Bool noResExtension = FALSE;
#ifdef XCMISC #ifdef XCMISC
Bool noXCMiscExtension = FALSE; Bool noXCMiscExtension = FALSE;
#endif #endif
#ifdef XEVIE
/* Xevie is disabled by default for now until the
* interface is stable */
Bool noXevieExtension = TRUE;
#endif
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
Bool noXFree86BigfontExtension = FALSE; Bool noXFree86BigfontExtension = FALSE;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment