# HG changeset patch # User Matti Hamalainen # Date 1526186849 -10800 # Node ID 61495ea0767e9a3a32112d6a59ca61ca17ebabeb # Parent e81c8c7a348fbe760e6604ed24b9cd885a2d34b1 Rename some variables to be more meaningful. diff -r e81c8c7a348f -r 61495ea0767e tools/ppl.c --- a/tools/ppl.c Sun May 13 07:36:47 2018 +0300 +++ b/tools/ppl.c Sun May 13 07:47:29 2018 +0300 @@ -724,8 +724,8 @@ while (!engine.exitFlag) { currTick = SDL_GetTicks(); - BOOL force = (currTick - prevTick > 500), - updated = FALSE; + BOOL needUpdate = (currTick - prevTick > 500), + needRender = FALSE; while (SDL_PollEvent(&engine.event)) switch (engine.event.type) @@ -734,6 +734,7 @@ switch (engine.event.key.keysym.sym) { case SDLK_ESCAPE: + case SDLK_q: engine.exitFlag = TRUE; break; @@ -746,7 +747,7 @@ if (engine.actChannel > 0) { engine.actChannel--; - force = TRUE; + needUpdate = TRUE; } break; @@ -754,7 +755,7 @@ if (engine.actChannel < engine.mod->nchannels - 1) { engine.actChannel++; - force = TRUE; + needUpdate = TRUE; } break; @@ -773,7 +774,7 @@ { jvmMute(engine.dev, engine.actChannel, !jvmGetMute(engine.dev, engine.actChannel)); } - force = TRUE; + needUpdate = TRUE; break; case SDLK_PAGEUP: @@ -782,7 +783,7 @@ jmpChangeOrder(engine.plr, dmClamp(engine.plr->order - 1, 0, engine.mod->norders)); JSS_UNLOCK(engine.plr); JSS_UNLOCK(engine.dev); - force = TRUE; + needUpdate = TRUE; break; case SDLK_PAGEDOWN: @@ -791,14 +792,14 @@ jmpChangeOrder(engine.plr, dmClamp(engine.plr->order + 1, 0, engine.mod->norders)); JSS_UNLOCK(engine.plr); JSS_UNLOCK(engine.dev); - force = TRUE; + needUpdate = TRUE; break; case SDLK_f: engine.optVFlags ^= SDL_WINDOW_FULLSCREEN_DESKTOP; if (SDL_SetWindowFullscreen(engine.window, engine.optVFlags) != 0) goto error_exit; - force = TRUE; + needUpdate = TRUE; break; default: @@ -811,7 +812,7 @@ switch (engine.event.window.event) { case SDL_WINDOWEVENT_EXPOSED: - force = TRUE; + needUpdate = TRUE; break; case SDL_WINDOWEVENT_RESIZED: @@ -820,7 +821,7 @@ if (!dmInitializeVideo()) goto error_exit; - force = TRUE; + needUpdate = TRUE; break; } break; @@ -839,14 +840,14 @@ engine.exitFlag = TRUE; JSS_UNLOCK(engine.plr); - if (currRow != prevRow || force) + if (currRow != prevRow || needUpdate) { prevRow = currRow; - force = TRUE; + needUpdate = TRUE; } // Draw frame - if (force) + if (needUpdate) { dmClearSurface(engine.screen, col.boxBg); @@ -870,24 +871,24 @@ engine.plr->order + 1, engine.mod->norders, engine.plr->npattern, engine.mod->npatterns); JSS_UNLOCK(engine.plr); - updated = TRUE; + needRender = TRUE; } - if (force || currTick - prevTick >= (engine.pauseFlag ? 100 : 20)) + if (needUpdate || currTick - prevTick >= (engine.pauseFlag ? 100 : 20)) { JSS_LOCK(engine.dev); dmDisplayChannels(engine.screen, 5, engine.screen->h * 0.8 + 5, engine.screen->w - 5, engine.screen->h - 5, engine.dev); JSS_UNLOCK(engine.dev); - updated = TRUE; + needRender = TRUE; } - if (force) + if (needUpdate) prevTick = currTick; #endif // Flip screen - if (updated) + if (needRender) { SDL_Surface dst; SDL_LockTexture(engine.texture, NULL, &dst.pixels, &dst.pitch);