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

Replace the xresources DB on PropertyNotify

Browse Source 
When changing values with xrdb on the command line, an XEvent is
triggered on the "RESOURCE_MANAGER" atom.

But xlib just doesn't care. XResourceManagerString() will still report
the old values. Also XrmGetDatabase() won't help out.

So, when we receive a PropertyNotify for the resource manager atom, we
have to manually query its contents, convert it to a DB and replace it
in the display object.

This allows, that any method just can call XrmGetDatabase() and get the
latest values.
This commit is contained in:
Benedikt Heine 2019-03-06 20:13:56 +01:00 committed by Nikos Tsipinakis
parent 4b06d67605
commit 812d5a3b84
1 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/x11/x.c
View File

@ -17,6 +17,7 @@
#include <X11/X.h> #include <X11/X.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "../dbus.h" #include "../dbus.h"
@ -55,6 +56,8 @@ bool dunst_grab_errored = false;
static bool fullscreen_last = false; static bool fullscreen_last = false;
static void XRM_update_db(void);
static void x_shortcut_init(struct keyboard_shortcut *ks); static void x_shortcut_init(struct keyboard_shortcut *ks);
static int x_shortcut_grab(struct keyboard_shortcut *ks); static int x_shortcut_grab(struct keyboard_shortcut *ks);
static void x_shortcut_ungrab(struct keyboard_shortcut *ks); static void x_shortcut_ungrab(struct keyboard_shortcut *ks);
@ -333,9 +336,18 @@ gboolean x_mainloop_fd_dispatch(GSource *source, GSourceFunc callback, gpointer
ev.xcreatewindow.override_redirect == 0) ev.xcreatewindow.override_redirect == 0)
XRaiseWindow(xctx.dpy, win->xwin); XRaiseWindow(xctx.dpy, win->xwin);
break; break;
case PropertyNotify:
if (ev.xproperty.atom == XA_RESOURCE_MANAGER) {
LOG_D("XEvent: processing PropertyNotify for Resource manager");
XRM_update_db();
screen_dpi_xft_cache_purge();
draw();
break;
}
/* Explicitly fallthrough. Other PropertyNotify events, e.g. catching
* _NET_WM get handled in the Focus(In|Out) section */
case FocusIn: case FocusIn:
case FocusOut: case FocusOut:
case PropertyNotify:
LOG_D("XEvent: Checking for active screen changes"); LOG_D("XEvent: Checking for active screen changes");
fullscreen_now = have_fullscreen_window(); fullscreen_now = have_fullscreen_window();
scr = get_active_screen(); scr = get_active_screen();
@ -440,6 +452,47 @@ void x_free(void)
XCloseDisplay(xctx.dpy); XCloseDisplay(xctx.dpy);
} }
static int XErrorHandlerDB(Display *display, XErrorEvent *e)
{
char err_buf[BUFSIZ];
XGetErrorText(display, e->error_code, err_buf, BUFSIZ);
LOG_W("%s", err_buf);
return 0;
}
static void XRM_update_db(void)
{
XrmDatabase db;
XTextProperty prop;
Window root;
// We shouldn't destroy the first DB coming
// from the display object itself
static bool runonce = false;
XFlush(xctx.dpy);
XSetErrorHandler(XErrorHandlerDB);
root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy));
XLockDisplay(xctx.dpy);
if (XGetTextProperty(xctx.dpy, root, &prop, XA_RESOURCE_MANAGER)) {
if (runonce) {
db = XrmGetDatabase(xctx.dpy);
XrmDestroyDatabase(db);
}
db = XrmGetStringDatabase((const char*)prop.value);
XrmSetDatabase(xctx.dpy, db);
}
XUnlockDisplay(xctx.dpy);
runonce = true;
XFlush(xctx.dpy);
XSync(xctx.dpy, false);
XSetErrorHandler(NULL);
}
/* /*
* Setup X11 stuff * Setup X11 stuff
*/ */