renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

have waitForEvent use two separate arguments for s and us

Browse Source
This commit is contained in:
HW
2012-04-23 22:27:30 +02:00
parent 08278d6beb
commit 97589bc9ba
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
input.c
View File

@@ -139,14 +139,15 @@ static int closeInputDevices(lua_State *L) {
static int waitForInput(lua_State *L) {
int usecs = luaL_optint(L, 1, -1); // we check for <0 later
int secs = luaL_optint(L, 2, 0);
#ifndef EMULATE_READER
fd_set fds;
struct timeval timeout;
int i, num, nfds;
timeout.tv_sec = (usecs/1000000);
timeout.tv_usec = (usecs%1000000);
timeout.tv_sec = secs;
timeout.tv_usec = usecs;
nfds = 0;
@@ -196,11 +197,11 @@ static int waitForInput(lua_State *L) {
if (usecs < 0)
SDL_WaitEvent(&event);
else {
while (SDL_GetTicks()-ticks <= usecs/1000) {
while (SDL_GetTicks()-ticks <= secs * 1000 + usecs/1000) {
if (SDL_PollEvent(&event)) break;
SDL_Delay(10);
}
if (SDL_GetTicks()-ticks > usecs/1000)
if (SDL_GetTicks()-ticks > secs * 1000 + usecs/1000)
return luaL_error(L, "Waiting for input failed: timeout\n");
}
switch(event.type) {