Don't let ifdef's confuse the editor's function lookup.
Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14693 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -135,10 +135,11 @@ InputServer::InputServer(void) : BApplication(INPUTSERVER_SIGNATURE),
|
|||||||
size_t parameterLength = sizeof(parameter);
|
size_t parameterLength = sizeof(parameter);
|
||||||
|
|
||||||
#ifdef COMPILE_FOR_R5
|
#ifdef COMPILE_FOR_R5
|
||||||
if (_kget_safemode_option_(B_SAFEMODE_SAFE_MODE, parameter, ¶meterLength) == B_OK) {
|
if (_kget_safemode_option_(B_SAFEMODE_SAFE_MODE, parameter, ¶meterLength) == B_OK)
|
||||||
#else
|
#else
|
||||||
if (_kern_get_safemode_option(B_SAFEMODE_SAFE_MODE, parameter, ¶meterLength) == B_OK) {
|
if (_kern_get_safemode_option(B_SAFEMODE_SAFE_MODE, parameter, ¶meterLength) == B_OK)
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on")
|
if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on")
|
||||||
|| !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes")
|
|| !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes")
|
||||||
|| !strcasecmp(parameter, "enable") || !strcmp(parameter, "1"))
|
|| !strcasecmp(parameter, "enable") || !strcmp(parameter, "1"))
|
||||||
@@ -1175,10 +1176,9 @@ InputServer::DispatchEvents(BList *eventList)
|
|||||||
}
|
}
|
||||||
|
|
||||||
fEventsCache.MakeEmpty();
|
fEventsCache.MakeEmpty();
|
||||||
|
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}// end DispatchEvents()
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
@@ -1633,7 +1633,7 @@ InputServer::WatchPort()
|
|||||||
delete event;
|
delete event;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is where the message should be processed.
|
// This is where the message should be processed.
|
||||||
|
|
||||||
// here we test for a message coming from app_server, screen resolution change could have happened
|
// here we test for a message coming from app_server, screen resolution change could have happened
|
||||||
@@ -1645,15 +1645,14 @@ InputServer::WatchPort()
|
|||||||
fFrame = frame;
|
fFrame = frame;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
HandleSetMousePosition(event, event);
|
HandleSetMousePosition(event, event);
|
||||||
|
|
||||||
BList list;
|
BList list;
|
||||||
list.AddItem(event);
|
list.AddItem(event);
|
||||||
DispatchEvents(&list);
|
DispatchEvents(&list);
|
||||||
|
|
||||||
PRINT(("Event written to port\n"));
|
PRINT(("Event written to port\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user