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

Merge branch 'fix_raise_hell' of git://github.com/wavexx/dunst into pull_requests

Browse Source
This commit is contained in:
Sascha Kruse 2014-03-08 11:35:49 +01:00
commit 79e6b3f349
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
x.c
View File

@ -581,10 +581,6 @@ gboolean x_mainloop_fd_dispatch(GSource * source, GSourceFunc callback,
case SelectionNotify: case SelectionNotify:
if (ev.xselection.property == xctx.utf8) if (ev.xselection.property == xctx.utf8)
break; break;
case VisibilityNotify:
if (ev.xvisibility.state != VisibilityUnobscured)
XRaiseWindow(xctx.dpy, xctx.win);
break;
case ButtonPress: case ButtonPress:
if (ev.xbutton.window == xctx.win) { if (ev.xbutton.window == xctx.win) {
x_handle_click(ev); x_handle_click(ev);
@ -854,23 +850,29 @@ void x_setup(void)
} }
static void x_set_win_type(Window win) static void x_set_wm(Window win)
{ {
long data[2]; Atom data[2];
/* set window type */
Atom net_wm_window_type = Atom net_wm_window_type =
XInternAtom(xctx.dpy, "_NET_WM_WINDOW_TYPE", false); XInternAtom(xctx.dpy, "_NET_WM_WINDOW_TYPE", false);
Atom net_wm_window_type_notification =
XInternAtom(xctx.dpy, "_NET_WM_WINDOW_TYPE_NOTIFICATION", false);
Atom net_wm_window_type_utility =
XInternAtom(xctx.dpy, "_NET_WM_WINDOW_TYPE_UTILITY", false);
data[0] = net_wm_window_type_notification; data[0] = XInternAtom(xctx.dpy, "_NET_WM_WINDOW_TYPE_NOTIFICATION", false);
data[1] = net_wm_window_type_utility; data[1] = XInternAtom(xctx.dpy, "_NET_WM_WINDOW_TYPE_UTILITY", false);
XChangeProperty(xctx.dpy, win, net_wm_window_type, XA_ATOM, 32, XChangeProperty(xctx.dpy, win, net_wm_window_type, XA_ATOM, 32,
PropModeReplace, (unsigned char *) &data, 1L); PropModeReplace, (unsigned char *) data, 2L);
/* set state above */
Atom net_wm_state =
XInternAtom(xctx.dpy, "_NET_WM_STATE", false);
data[0] = XInternAtom(xctx.dpy, "_NET_WM_STATE_ABOVE", false);
XChangeProperty(xctx.dpy, win, net_wm_state, XA_ATOM, 32,
PropModeReplace, (unsigned char *) data, 1L);
} }
/* /*
@ -906,7 +908,7 @@ static void x_win_setup(void)
DefaultScreen(xctx.dpy)), DefaultScreen(xctx.dpy)),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
x_set_win_type(xctx.win); x_set_wm(xctx.win);
settings.transparency = settings.transparency =
settings.transparency > 100 ? 100 : settings.transparency; settings.transparency > 100 ? 100 : settings.transparency;
setopacity(xctx.win, setopacity(xctx.win,