Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add WM_CLASS atom #187

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add WM_CLASS atom #187

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b64dd42
Add WM_CLASS atom
tryone144 Jun 8, 2016
d7520a6
Change WM_CLASS atom to "instance", "class"
tryone144 Jun 8, 2016
49b2cc5
Changed WM_CLASS class from "bar" to "Bar"
tryone144 Oct 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions lemonbar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,7 @@ set_ewmh_atoms (void)
xcb_change_property(c, XCB_PROP_MODE_REPLACE, mon->window, atom_list[NET_WM_STRUT_PARTIAL], XCB_ATOM_CARDINAL, 32, 12, strut);
xcb_change_property(c, XCB_PROP_MODE_REPLACE, mon->window, atom_list[NET_WM_STRUT], XCB_ATOM_CARDINAL, 32, 4, strut);
xcb_change_property(c, XCB_PROP_MODE_REPLACE, mon->window, XCB_ATOM_WM_NAME, XCB_ATOM_STRING, 8, 3, "bar");
xcb_change_property(c, XCB_PROP_MODE_REPLACE, mon->window, XCB_ATOM_WM_CLASS, XCB_ATOM_STRING, 8, 12, "lemonbar\0bar");
}
}

Expand Down Expand Up @@ -1114,7 +1115,7 @@ xconn (void)
}

void
init (char *wm_name)
init (char *wm_name, char *wm_instance)
{
// Try to load a default font
if (!font_count)
Expand Down Expand Up @@ -1209,6 +1210,24 @@ init (char *wm_name)
// Set the WM_NAME atom to the user specified value
if (wm_name)
xcb_change_property(c, XCB_PROP_MODE_REPLACE, mon->window, XCB_ATOM_WM_NAME, XCB_ATOM_STRING, 8 ,strlen(wm_name), wm_name);

// set the WM_CLASS atom instance to the executable name
if (wm_instance) {
char *wm_class;
int wm_class_offset, wm_class_len;

// WM_CLASS is nullbyte seperated: wm_instance + "\0bar\0"
wm_class_offset = strlen(wm_instance) + 1;
wm_class_len = wm_class_offset + 4;

wm_class = calloc(1, wm_class_len + 1);
strcpy(wm_class, wm_instance);
strcpy(wm_class+wm_class_offset, "bar");

xcb_change_property(c, XCB_PROP_MODE_REPLACE, mon->window, XCB_ATOM_WM_CLASS, XCB_ATOM_STRING, 8, wm_class_len, wm_class);

free(wm_class);
}
}

xcb_flush(c);
Expand Down Expand Up @@ -1245,6 +1264,21 @@ cleanup (void)
xcb_disconnect(c);
}

char*
strip_path(char *path)
{
char *slash;

if (path == NULL || *path == '\0')
return strdup("lemonbar");

slash = strrchr(path, '/');
if (slash != NULL)
return strndup(slash + 1, 31);

return strndup(path, 31);
}

void
sighandle (int signal)
{
Expand All @@ -1267,6 +1301,7 @@ main (int argc, char **argv)
int geom_v[4] = { -1, -1, 0, 0 };
int ch, areas;
char *wm_name;
char *instance_name;

// Install the parachute!
atexit(cleanup);
Expand All @@ -1282,6 +1317,8 @@ main (int argc, char **argv)
areas = 10;
wm_name = NULL;

instance_name = strip_path(argv[0]);

// Connect to the Xserver and initialize scr
xconn();

Expand Down Expand Up @@ -1338,9 +1375,11 @@ main (int argc, char **argv)
by = geom_v[3];

// Do the heavy lifting
init(wm_name);
init(wm_name, instance_name);
// The string is strdup'd when the command line arguments are parsed
free(wm_name);
// The string is strdup'd when stripping argv[0]
free(instance_name);
// Get the fd to Xserver
pollin[1].fd = xcb_get_file_descriptor(c);

Expand Down