fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More EWMH goodness.

Browse Source
This commit is contained in:
LemonBoy 2012-07-22 12:44:19 +02:00
parent 4ecaa1c6c2
commit 5ea77f2242
2 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
bar.c
View File

@ -180,17 +180,20 @@ sighandle (int signal)
if (signal == SIGINT || signal == SIGTERM) exit (0); if (signal == SIGINT || signal == SIGTERM) exit (0);
} }
void int
set_ewmh_atoms (void) set_ewmh_atoms (void)
{ {
xcb_intern_atom_cookie_t cookies[4]; xcb_intern_atom_cookie_t cookies[5];
xcb_atom_t atoms[4];
xcb_intern_atom_reply_t *reply; xcb_intern_atom_reply_t *reply;
xcb_get_property_reply_t *reply1;
xcb_atom_t atoms[5];
int compliance_lvl;
cookies[0] = xcb_intern_atom (c, 0, strlen ("_NET_WM_WINDOW_TYPE") , "_NET_WM_WINDOW_TYPE"); cookies[0] = xcb_intern_atom (c, 0, strlen ("_NET_WM_WINDOW_TYPE") , "_NET_WM_WINDOW_TYPE");
cookies[1] = xcb_intern_atom (c, 0, strlen ("_NET_WM_WINDOW_TYPE_DOCK"), "_NET_WM_WINDOW_TYPE_DOCK"); cookies[1] = xcb_intern_atom (c, 0, strlen ("_NET_WM_WINDOW_TYPE_DOCK"), "_NET_WM_WINDOW_TYPE_DOCK");
cookies[2] = xcb_intern_atom (c, 0, strlen ("_NET_WM_DESKTOP") , "_NET_WM_DESKTOP"); cookies[2] = xcb_intern_atom (c, 0, strlen ("_NET_WM_DESKTOP") , "_NET_WM_DESKTOP");
cookies[3] = xcb_intern_atom (c, 0, strlen ("_NET_WM_STRUT_PARTIAL") , "_NET_WM_STRUT_PARTIAL"); cookies[3] = xcb_intern_atom (c, 0, strlen ("_NET_WM_STRUT_PARTIAL") , "_NET_WM_STRUT_PARTIAL");
cookies[4] = xcb_intern_atom (c, 0, strlen ("_NET_SUPPORTED") , "_NET_SUPPORTED");
reply = xcb_intern_atom_reply (c, cookies[0], NULL); reply = xcb_intern_atom_reply (c, cookies[0], NULL);
atoms[0] = reply->atom; free (reply); atoms[0] = reply->atom; free (reply);
@ -200,19 +203,45 @@ set_ewmh_atoms (void)
atoms[2] = reply->atom; free (reply); atoms[2] = reply->atom; free (reply);
reply = xcb_intern_atom_reply (c, cookies[3], NULL); reply = xcb_intern_atom_reply (c, cookies[3], NULL);
atoms[3] = reply->atom; free (reply); atoms[3] = reply->atom; free (reply);
reply = xcb_intern_atom_reply (c, cookies[4], NULL);
atoms[4] = reply->atom; free (reply);
/* Set the _NET_WM_WINDOW_TYPE_DOCK state */ /* Wait until the wm is spawned */
xcb_change_property (c, XCB_PROP_MODE_REPLACE, win, atoms[0], XCB_ATOM_ATOM, 32, 1, &atoms[1]); do {
/* Show on every desktop */ reply1 = xcb_get_property_reply (c, xcb_get_property (c, 0, root, atoms[4], XCB_ATOM_ATOM, 0, -1), NULL);
xcb_change_property (c, XCB_PROP_MODE_REPLACE, win, atoms[2], XCB_ATOM_CARDINAL, 32, 1, } while (!xcb_get_property_value_length (reply1));
(const unsigned []){ 0xffffffff } );
/* Set the window geometry */ compliance_lvl = 0;
xcb_change_property (c, XCB_PROP_MODE_REPLACE, win, atoms[3], XCB_ATOM_CARDINAL, 32, 12,
for (xcb_atom_t *a = xcb_get_property_value (reply1);
a != xcb_get_property_value_end (reply1).data;
a++)
{
/* Set the _NET_WM_WINDOW_TYPE_DOCK state */
if (*a == atoms[0]) {
xcb_change_property (c, XCB_PROP_MODE_REPLACE, win, atoms[0], XCB_ATOM_ATOM, 32, 1, &atoms[1]);
compliance_lvl++;
}
/* Show on every desktop */
if (*a == atoms[2]) {
xcb_change_property (c, XCB_PROP_MODE_REPLACE, win, atoms[2], XCB_ATOM_CARDINAL, 32, 1,
(const unsigned []){ 0xffffffff } );
compliance_lvl++;
}
/* Tell the WM that this space is for the bar */
if (*a == atoms[3]) {
xcb_change_property (c, XCB_PROP_MODE_REPLACE, win, atoms[3], XCB_ATOM_CARDINAL, 32, 12,
#if (BAR_BOTTOM == 1) #if (BAR_BOTTOM == 1)
(const unsigned []) { 0, 0, 0, BAR_HEIGHT, 0, 0, 0, 0, 0, 0, 0, bar_width } ); (const unsigned []) { 0, 0, 0, BAR_HEIGHT, 0, 0, 0, 0, 0, 0, 0, bar_width } );
#else #else
(const unsigned []) { 0, 0, BAR_HEIGHT, 0, 0, 0, 0, 0, bar_width, 0, 0, 0 } ); (const unsigned []) { 0, 0, BAR_HEIGHT, 0, 0, 0, 0, 0, bar_width, 0, 0, 0 } );
#endif #endif
compliance_lvl++;
}
}
/* If the wm supports at least 2 NET atoms then mark as compliant */
return (compliance_lvl > 1);
} }
void void
@ -253,10 +282,11 @@ init (void)
0, 0,
#endif #endif
bar_width, BAR_HEIGHT, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, scr->root_visual, bar_width, BAR_HEIGHT, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, scr->root_visual,
XCB_CW_BACK_PIXEL | XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK, XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK, (const unsigned []){ pal[0], XCB_EVENT_MASK_EXPOSURE });
(const unsigned []){ pal[0], !BAR_EWMH_DOCKING, XCB_EVENT_MASK_EXPOSURE });
/* Set EWMH hints */ /* Set EWMH hints */
set_ewmh_atoms (); int ewmh_docking = set_ewmh_atoms ();
/* Quirk for wm not supporting the EWMH docking method */
xcb_change_window_attributes (c, win, XCB_CW_OVERRIDE_REDIRECT, (const unsigned []){ !ewmh_docking });
/* Create a temporary canvas */ /* Create a temporary canvas */
canvas = xcb_generate_id (c); canvas = xcb_generate_id (c);
xcb_create_pixmap (c, scr->root_depth, canvas, root, bar_width, BAR_HEIGHT); xcb_create_pixmap (c, scr->root_depth, canvas, root, bar_width, BAR_HEIGHT);

5
config.def.h
View File

@ -2,11 +2,6 @@
#define BAR_HEIGHT 18 #define BAR_HEIGHT 18
/* The thickness of the underline (in pixels) */ /* The thickness of the underline (in pixels) */
#define BAR_UNDERLINE_HEIGHT 2 #define BAR_UNDERLINE_HEIGHT 2
/* Tell the WM to reserve the space we use.
* Some window managers don't respect the EWMH hints though and
* leave bar as a separate window. Just set this to 0 if it happens.
*/
#define BAR_EWMH_DOCKING 1
/* Whether to put the bar at the screen bottom or not */ /* Whether to put the bar at the screen bottom or not */
#define BAR_BOTTOM 0 #define BAR_BOTTOM 0
/* The font used for the bar */ /* The font used for the bar */