nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #708 from cdown/mouse_fallback

Browse Source 
follow=keyboard: Fall back to follow=mouse instead of XDefaultScreen()
This commit is contained in:
Nikos Tsipinakis 2020-04-27 17:40:49 +02:00 committed by GitHub
commit 6b60c52ee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/x11/screen.c
View File

@ -303,6 +303,7 @@ bool window_is_fullscreen(Window window)
struct screen_info *get_active_screen(void) struct screen_info *get_active_screen(void)
{ {
int ret = 0; int ret = 0;
bool force_follow_mouse = false;
if (settings.monitor > 0 && settings.monitor < screens_len) { if (settings.monitor > 0 && settings.monitor < screens_len) {
ret = settings.monitor; ret = settings.monitor;
goto sc_cleanup; goto sc_cleanup;
@ -321,7 +322,26 @@ struct screen_info *get_active_screen(void)
Window root = Window root =
RootWindow(xctx.dpy, DefaultScreen(xctx.dpy)); RootWindow(xctx.dpy, DefaultScreen(xctx.dpy));
if (settings.f_mode == FOLLOW_MOUSE) { if (settings.f_mode == FOLLOW_KEYBOARD) {
Window focused = get_focused_window();
if (focused == 0) {
/*
* This can happen in the case that the user
* just has the root window open, eg. in empty
* tags in dwm or similar window managers. In
* that case, fall back to FOLLOW_MOUSE, since
* it probably still has the right screen.
*/
force_follow_mouse = true;
} else {
Window child_return;
XTranslateCoordinates(xctx.dpy, focused, root,
0, 0, &x, &y, &child_return);
}
}
if (settings.f_mode == FOLLOW_MOUSE || force_follow_mouse) {
int dummy; int dummy;
unsigned int dummy_ui; unsigned int dummy_ui;
Window dummy_win; Window dummy_win;
@ -337,21 +357,6 @@ struct screen_info *get_active_screen(void)
&dummy_ui); &dummy_ui);
} }
if (settings.f_mode == FOLLOW_KEYBOARD) {
Window focused = get_focused_window();
if (focused == 0) {
/* something went wrong. Fall back to default */
ret = XDefaultScreen(xctx.dpy);
goto sc_cleanup;
}
Window child_return;
XTranslateCoordinates(xctx.dpy, focused, root,
0, 0, &x, &y, &child_return);
}
for (int i = 0; i < screens_len; i++) { for (int i = 0; i < screens_len; i++) {
if (INRECT(x, y, screens[i].x, screens[i].y, if (INRECT(x, y, screens[i].x, screens[i].y,
screens[i].w, screens[i].h)) { screens[i].w, screens[i].h)) {