XFree86: Remove remnants of XFree86-Misc
HandleMessage: dear god, no.
This commit is contained in:
parent
95000e34df
commit
478d3918d5
|
@ -316,30 +316,6 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case ACTION_MESSAGE:
|
|
||||||
{
|
|
||||||
char *retstr, *message = (char *) arg;
|
|
||||||
ScrnInfoPtr pScr = XF86SCRNINFO(xf86Info.currentScreen);
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
ErrorF("ActionMessage: '%s'\n", message);
|
|
||||||
#endif
|
|
||||||
/* Okay the message made it to the ddx. The common layer */
|
|
||||||
/* can check for relevant messages here and react to any */
|
|
||||||
/* that have a global effect. For example: */
|
|
||||||
/* */
|
|
||||||
/* if (!strcmp(message, "foo") { */
|
|
||||||
/* do_foo(); break */
|
|
||||||
/* } */
|
|
||||||
/* */
|
|
||||||
/* otherwise fallback to sending a key event message to */
|
|
||||||
/* the current screen's driver: */
|
|
||||||
if (*pScr->HandleMessage != NULL) {
|
|
||||||
(void) (*pScr->HandleMessage)(pScr->scrnIndex,
|
|
||||||
"KeyEventMessage", message, &retstr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -851,7 +851,6 @@ typedef int xf86SetDGAModeProc (int, int, DGADevicePtr);
|
||||||
typedef int xf86ChangeGammaProc (int, Gamma);
|
typedef int xf86ChangeGammaProc (int, Gamma);
|
||||||
typedef void xf86PointerMovedProc (int, int, int);
|
typedef void xf86PointerMovedProc (int, int, int);
|
||||||
typedef Bool xf86PMEventProc (int, pmEvent, Bool);
|
typedef Bool xf86PMEventProc (int, pmEvent, Bool);
|
||||||
typedef int xf86HandleMessageProc (int, const char*, const char*, char**);
|
|
||||||
typedef void xf86DPMSSetProc (ScrnInfoPtr, int, int);
|
typedef void xf86DPMSSetProc (ScrnInfoPtr, int, int);
|
||||||
typedef void xf86LoadPaletteProc (ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
|
typedef void xf86LoadPaletteProc (ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
|
||||||
typedef void xf86SetOverscanProc (ScrnInfoPtr, int);
|
typedef void xf86SetOverscanProc (ScrnInfoPtr, int);
|
||||||
|
@ -1006,7 +1005,6 @@ typedef struct _ScrnInfoRec {
|
||||||
xf86ChangeGammaProc *ChangeGamma;
|
xf86ChangeGammaProc *ChangeGamma;
|
||||||
xf86PointerMovedProc *PointerMoved;
|
xf86PointerMovedProc *PointerMoved;
|
||||||
xf86PMEventProc *PMEvent;
|
xf86PMEventProc *PMEvent;
|
||||||
xf86HandleMessageProc *HandleMessage;
|
|
||||||
xf86DPMSSetProc *DPMSSet;
|
xf86DPMSSetProc *DPMSSet;
|
||||||
xf86LoadPaletteProc *LoadPalette;
|
xf86LoadPaletteProc *LoadPalette;
|
||||||
xf86SetOverscanProc *SetOverscan;
|
xf86SetOverscanProc *SetOverscan;
|
||||||
|
@ -1117,7 +1115,6 @@ typedef enum {
|
||||||
ACTION_SWITCHSCREEN = 100, /* VT switch */
|
ACTION_SWITCHSCREEN = 100, /* VT switch */
|
||||||
ACTION_SWITCHSCREEN_NEXT,
|
ACTION_SWITCHSCREEN_NEXT,
|
||||||
ACTION_SWITCHSCREEN_PREV,
|
ACTION_SWITCHSCREEN_PREV,
|
||||||
ACTION_MESSAGE = 9999 /* Generic message passing */
|
|
||||||
} ActionEvent;
|
} ActionEvent;
|
||||||
|
|
||||||
#endif /* _XF86STR_H */
|
#endif /* _XF86STR_H */
|
||||||
|
|
|
@ -33,8 +33,6 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act)
|
||||||
xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL);
|
xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL);
|
||||||
else if (strcasecmp(msgbuf, "clsgrb")==0)
|
else if (strcasecmp(msgbuf, "clsgrb")==0)
|
||||||
xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL);
|
xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL);
|
||||||
else
|
|
||||||
xf86ProcessActionEvent(ACTION_MESSAGE, (void *) msgbuf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user