MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only block keyboard events in OS X SDL_PollEvent hook without focus 

Blocking all events causes issues with window manager controls when the window
is not focused - for example, DF doesn't resize certain screen buffers, leading
to flickering in OpenGL print modes.
develop
lethosor 2016-03-13 10:33:25 -04:00
parent 2f86683d37
commit 76793045a9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Hooks-darwin.cpp
Unescape Escape View File

@ -47,6 +47,7 @@ typedef struct interpose_s
#include "DFHack.h" #include "DFHack.h"
#include "Core.h" #include "Core.h"
#include "Hooks.h" #include "Hooks.h"
#include "SDL_events.h"
#include <iostream> #include <iostream>
/*static const interpose_t interposers[] __attribute__ ((section("__DATA, __interpose"))) = /*static const interpose_t interposers[] __attribute__ ((section("__DATA, __interpose"))) =
@ -105,7 +106,8 @@ DFhackCExport int DFH_SDL_PollEvent(SDL::Event* event)
pollevent_again: pollevent_again:
// if SDL returns 0 here, it means there are no more events. return 0 // if SDL returns 0 here, it means there are no more events. return 0
int orig_return = SDL_PollEvent(event); int orig_return = SDL_PollEvent(event);
if(!orig_return || !(SDL_GetAppState() & SDL_APPINPUTFOCUS)) if(!orig_return || (!(SDL_GetAppState() & SDL_APPINPUTFOCUS) &&
(event->type == SDL::ET_KEYDOWN || event->type == SDL::ET_KEYUP)))
return 0; return 0;
// otherwise we have an event to filter // otherwise we have an event to filter
else if( event != 0 ) else if( event != 0 )