marcel/kinto
1
0
Fork 0
mirror of https://github.com/rbreaves/kinto.git synced 2025-08-02 00:56:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from rbreaves/hotfix

Browse Source 
- Fixed BadWindow errors caused by Destroy and UnmapNotify in Xlib
This commit is contained in:
Ben Reaves
2020-03-30 16:25:22 -05:00
committed by GitHub
parent 6b6e448e76 40c8d20513
commit 6c46696bd4
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
kintox11/binary/kintox11
View File

Binary file not shown.

44
kintox11/src/kintox11.c
View File

@@ -194,7 +194,7 @@ Window get_focus_window(Display* d){
// a top window have the following specifications. // a top window have the following specifications.
// * the start window is contained the descendent windows. // * the start window is contained the descendent windows.
// * the parent window is the root window. // * the parent window is the root window.
Window get_top_window(Display* d, Window start){ Window get_top_window(Display* d, Window start, int etype, int last_event, char const *current_app){
Window w = start; Window w = start;
Window parent = start; Window parent = start;
Window root = None; Window root = None;
@@ -202,22 +202,27 @@ Window get_top_window(Display* d, Window start){
unsigned int nchildren; unsigned int nchildren;
Status s; Status s;
while (parent != root && parent != 0) { // Checking for Destroy and Unmap Notify events here too
// Sometimes they still get passed through and if so need
// to be ignored or XQueryTree will cause a segmentation fault
while (parent != root && parent != 0 && !(etype == 17 || etype == 18)) {
w = parent; w = parent;
s = XQueryTree(d, w, &root, &parent, &children, &nchildren); // see man s = XQueryTree(d, w, &root, &parent, &children, &nchildren); // see man
if (s) if (s)
XFree(children); XFree(children);
if(xerror){ if(xerror){
printf("fail to get top window: %ld\n",w); printf("fail to get top window: %ld, e.type: %d, last_event: %d, current_app: %s\n",w,etype,last_event, current_app);
exit(1); break;
} }
// printf(" get parent (window: %d)\n", (int)w); // printf(" get parent (window: %d)\n", (int)w);
} }
// printf("success (window: %d)\n", (int)w); // printf("success (window: %d)\n", (int)w);
// printf("hello\n");
return w; return w;
} }
@@ -431,7 +436,7 @@ int main(void){
// get active window // get active window
w = get_focus_window(d); w = get_focus_window(d);
w = get_top_window(d, w); w = get_top_window(d, w, 0, 0, current_app);
w = get_named_window(d, w); w = get_named_window(d, w);
// XFetchName(d, w, &name); // XFetchName(d, w, &name);
@@ -546,8 +551,35 @@ int main(void){
} }
} }
// if(strcicmp(current_app, "plasmashell") == 0){
// XNextEvent(d, &e);
// }
// if(strcicmp(current_app, "plasmashell") == 0 && e.type == 18 && last_event == 22){
// XNextEvent(d, &e);
// }
// if(strcicmp(prior_app, "plasmashell") == 0){
// XNextEvent(d, &e);
// }
// if(strcicmp(current_app, "dolphin") == 0){
// XNextEvent(d, &e);
// }
// if(strcicmp(prior_app, "dolphin") == 0){
// XNextEvent(d, &e);
// }
// if(strcicmp(current_app, "dolphin") == 0 && e.type == 18 && last_event == 16){
// XNextEvent(d, &e);
// }
// Reference http://www.rahul.net/kenton/xproto/xevents_errors.html
// event type 17 - DestroyNotify
// event type 18 - UnmapNotify
// Dismiss the following events by initiating another XNextEvent
while(e.type == 17 || e.type == 18){
XNextEvent(d, &e);
}
w = get_focus_window(d); w = get_focus_window(d);
w = get_top_window(d, w); w = get_top_window(d, w, e.type, last_event, current_app);
w = get_named_window(d, w); w = get_named_window(d, w);
} }
} }