}
void
-bar_print(struct swm_region *r, char *s)
+bar_print(struct swm_region *r, const char *s)
{
int x = 0;
size_t len;
}
void
+bar_class_title_name(char *s, size_t sz, struct swm_region *r)
+{
+ if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
+ return;
+
+ bar_class_name(s, sz, r);
+ strlcat(s, ":", sz);
+ bar_title_name(s, sz, r);
+}
+
+void
+bar_window_float(char *s, size_t sz, struct swm_region *r)
+{
+ if (r == NULL || r ->ws == NULL || r->ws->focus == NULL)
+ return;
+ if (r->ws->focus->floating)
+ strlcat(s, "(f)", sz);
+}
+
+void
bar_window_name(char *s, size_t sz, struct swm_region *r)
{
unsigned char *title;
if ((title = get_win_name(r->ws->focus->id)) == NULL)
return;
- if (r->ws->focus->floating)
- strlcat(s, "(f) ", sz);
strlcat(s, (char *)title, sz);
- strlcat(s, " ", sz);
-
XFree(title);
}
/* build the default bar format according to the defined enabled options */
void
-bar_fmt(char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz)
+bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz)
{
/* if format provided, just copy the buffers */
if (bar_format != NULL) {
if (urgent_enabled)
strlcat(fmtnew, "* +U* ", sz);
- if (title_class_enabled)
+ if (title_class_enabled) {
strlcat(fmtnew, "+C", sz);
- if (title_name_enabled) {
- /* add a colon if showing the class and something is focused */
- if (title_class_enabled && r != NULL && r->ws != NULL &&
- r->ws->focus != NULL)
- strlcat(fmtnew, ":", sz);
- strlcat(fmtnew, "+T", sz);
+ if (title_name_enabled == 0)
+ strlcat(fmtnew, " ", sz);
}
- strlcat(fmtnew, " ", sz);
- if (window_name_enabled)
- strlcat(fmtnew, "+64W", sz);
+ /* checks needed by the colon and floating strlcat(3) calls below */
+ if (r != NULL && r->ws != NULL && r->ws->focus != NULL) {
+ if (title_name_enabled) {
+ if (title_class_enabled)
+ strlcat(fmtnew, ":", sz);
+ strlcat(fmtnew, "+T ", sz);
+ }
+ if (window_name_enabled) {
+ if (r->ws->focus->floating)
+ strlcat(fmtnew, "+F ", sz);
+ strlcat(fmtnew, "+64W ", sz);
+ }
+ }
/* finally add the action script output and the version */
- strlcat(fmtnew, " +A +V", sz);
+ strlcat(fmtnew, " +A +V", sz);
}
/* replaces the bar format character sequences (like in tmux(1)) */
case 'D':
bar_workspace_name(tmp, sizeof tmp, r);
break;
+ case 'F':
+ bar_window_float(tmp, sizeof tmp, r);
+ break;
case 'I':
snprintf(tmp, sizeof tmp, "%d", r->ws->idx + 1);
break;
case 'N':
snprintf(tmp, sizeof tmp, "%d", r->s->idx + 1);
break;
+ case 'P':
+ bar_class_title_name(tmp, sizeof tmp, r);
+ break;
case 'S':
snprintf(tmp, sizeof tmp, "%s", r->ws->stacker);
break;
enum keyfuncid funcid;
char *spawn_name;
};
-RB_HEAD(key_list, key);
+RB_HEAD(key_tree, key);
int
key_cmp(struct key *kp1, struct key *kp2)
return (0);
}
-RB_GENERATE_STATIC(key_list, key, entry, key_cmp);
-struct key_list keys;
+RB_GENERATE(key_tree, key, entry, key_cmp);
+struct key_tree keys;
/* mouse */
enum { client_click, root_click };
struct key *kp;
mod_key = mod;
- RB_FOREACH(kp, key_list, &keys)
+ RB_FOREACH(kp, key_tree, &keys)
if (kp->mod & ShiftMask)
kp->mod = mod | ShiftMask;
else
kp->keysym = ks;
kp->funcid = kfid;
kp->spawn_name = strdupsafe(spawn_name);
- RB_INSERT(key_list, &keys, kp);
+ RB_INSERT(key_tree, &keys, kp);
DNPRINTF(SWM_D_KEY, "key_insert: leave\n");
}
kp.keysym = ks;
kp.mod = mod;
- return (RB_FIND(key_list, &keys, &kp));
+ return (RB_FIND(key_tree, &keys, &kp));
}
void
{
DNPRINTF(SWM_D_KEY, "key_remove: %s\n", keyfuncs[kp->funcid].name);
- RB_REMOVE(key_list, &keys, kp);
+ RB_REMOVE(key_tree, &keys, kp);
free(kp->spawn_name);
free(kp);
if (TAILQ_EMPTY(&screens[k].rl))
continue;
XUngrabKey(display, AnyKey, AnyModifier, screens[k].root);
- RB_FOREACH(kp, key_list, &keys) {
+ RB_FOREACH(kp, key_tree, &keys) {
if ((code = XKeysymToKeycode(display, kp->keysym)))
for (j = 0; j < LENGTH(modifiers); j++)
XGrabKey(display, code,