mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
kdrive/src: revert fd2483745b
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
committed by
Enrico Weigelt
parent
885ba96ff6
commit
7a50b1dc3d
@@ -282,11 +282,7 @@ KdDisableInput(void)
|
||||
KdPointerInfo *pi;
|
||||
int found = 0, i = 0;
|
||||
|
||||
#ifndef KDRIVE_KBD
|
||||
input_lock();
|
||||
#else
|
||||
KdBlockSigio();
|
||||
#endif
|
||||
|
||||
for (ki = kdKeyboards; ki; ki = ki->next) {
|
||||
if (ki->driver && ki->driver->Disable)
|
||||
@@ -369,11 +365,7 @@ KdEnableInput(void)
|
||||
NoticeEventTime (&ev, pi->dixdev);
|
||||
}
|
||||
|
||||
#ifndef KDRIVE_KBD
|
||||
input_unlock();
|
||||
#else
|
||||
KdUnblockSigio();
|
||||
#endif
|
||||
}
|
||||
|
||||
static KdKeyboardDriver *
|
||||
@@ -1393,12 +1385,8 @@ KdInitInput(void)
|
||||
KdKeyboardInfo *ki;
|
||||
struct KdConfigDevice *dev;
|
||||
|
||||
#ifndef KDRIVE_KBD
|
||||
if (kdConfigPointers || kdConfigKeyboards)
|
||||
InputThreadPreInit();
|
||||
#else
|
||||
InputThreadEnable = FALSE;
|
||||
#endif
|
||||
|
||||
kdInputEnabled = TRUE;
|
||||
|
||||
@@ -2093,17 +2081,9 @@ KdWakeupHandler(ScreenPtr pScreen, int result)
|
||||
if (pi->timeoutPending) {
|
||||
if ((long) (GetTimeInMillis() - pi->emulationTimeout) >= 0) {
|
||||
pi->timeoutPending = FALSE;
|
||||
#ifndef KDRIVE_KBD
|
||||
input_lock();
|
||||
#else
|
||||
KdBlockSigio();
|
||||
#endif
|
||||
KdReceiveTimeout(pi);
|
||||
#ifndef KDRIVE_KBD
|
||||
input_unlock();
|
||||
#else
|
||||
KdUnblockSigio();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2199,18 +2179,9 @@ int KdCurScreen; /* current event screen */
|
||||
static void
|
||||
KdWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
|
||||
{
|
||||
#ifndef KDRIVE_KBD
|
||||
input_lock();
|
||||
#else
|
||||
KdBlockSigio();
|
||||
#endif
|
||||
KdCurScreen = pScreen->myNum;
|
||||
miPointerWarpCursor(pDev, pScreen, x, y);
|
||||
#ifndef KDRIVE_KBD
|
||||
input_unlock();
|
||||
#else
|
||||
KdUnblockSigio();
|
||||
#endif
|
||||
}
|
||||
|
||||
miPointerScreenFuncRec kdPointerScreenFuncs = {
|
||||
|
||||
Reference in New Issue
Block a user