AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 01:26:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

X11: Fix game never getting focused when focus follows pointer root

Browse Source
This commit is contained in:
UnknownShadow200 2021-01-21 22:46:05 +11:00
parent 8faf15855a
commit 18b2fcc9c8
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Window.c
View File

@ -1042,8 +1042,11 @@ static Atom net_wm_state_fullscreen;
static Atom xa_clipboard, xa_targets, xa_utf8_string, xa_data_sel;
static Atom xa_atom = 4;
static long win_eventMask;
static cc_bool grabCursor;
static long win_eventMask = StructureNotifyMask | /* SubstructureNotifyMask | */
ExposureMask | KeyReleaseMask | KeyPressMask | KeymapStateMask |
PointerMotionMask | FocusChangeMask | ButtonPressMask | ButtonReleaseMask |
EnterWindowMask | LeaveWindowMask | PropertyChangeMask;
static int MapNativeKey(KeySym key, unsigned int state) {
if (key >= XK_0 && key <= XK_9) { return '0' + (key - XK_0); }
@ -1276,11 +1279,6 @@ void Window_Create(int width, int height) {
x = Display_CentreX(width);
y = Display_CentreY(height);
RegisterAtoms();
win_eventMask = StructureNotifyMask /*| SubstructureNotifyMask*/ | ExposureMask |
KeyReleaseMask | KeyPressMask | KeymapStateMask | PointerMotionMask |
FocusChangeMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask |
LeaveWindowMask | PropertyChangeMask;
win_visual = GLContext_SelectVisual();
Platform_LogConst("Opening render window... ");
@ -1493,6 +1491,8 @@ static void HandleGenericEvent(XEvent* e);
void Window_ProcessEvents(void) {
XEvent e;
Window focus;
int focusRevert;
int i, btn, key, status;
while (WindowInfo.Exists) {
@ -1523,6 +1523,20 @@ void Window_ProcessEvents(void) {
if (e.xexpose.count == 0) Event_RaiseVoid(&WindowEvents.Redraw);
break;
case LeaveNotify:
XGetInputFocus(win_display, &focus, &focusRevert);
if (focus == PointerRoot) {
WindowInfo.Focused = false; Event_RaiseVoid(&WindowEvents.FocusChanged);
}
break;
case EnterNotify:
XGetInputFocus(win_display, &focus, &focusRevert);
if (focus == PointerRoot) {
WindowInfo.Focused = true; Event_RaiseVoid(&WindowEvents.FocusChanged);
}
break;
case KeyPress:
{
char data[64], c;