Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missed a few spaces in the default format.
[spectrwm.git]
/
spectrwm.c
diff --git
a/spectrwm.c
b/spectrwm.c
index
acbfded
..
2ecc60f
100644
(file)
--- a/
spectrwm.c
+++ b/
spectrwm.c
@@
-1304,7
+1304,7
@@
socket_setnonblock(int fd)
}
void
}
void
-bar_print(struct swm_region *r, char *s)
+bar_print(struct swm_region *r, const char *s)
{
int x = 0;
size_t len;
{
int x = 0;
size_t len;
@@
-1429,7
+1429,7
@@
bar_workspace_name(char *s, size_t sz, struct swm_region *r)
/* build the default bar format according to the defined enabled options */
void
/* 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 format provided, just copy the buffers */
if (bar_format != NULL) {
@@
-1459,8
+1459,12
@@
bar_fmt(char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz)
if (urgent_enabled)
strlcat(fmtnew, "* +U* ", sz);
if (urgent_enabled)
strlcat(fmtnew, "* +U* ", sz);
- if (title_class_enabled)
+ if (title_class_enabled) {
strlcat(fmtnew, "+C", sz);
strlcat(fmtnew, "+C", sz);
+ if (title_name_enabled == 0)
+ strlcat(fmtnew, " ", 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 &&
if (title_name_enabled) {
/* add a colon if showing the class and something is focused */
if (title_class_enabled && r != NULL && r->ws != NULL &&
@@
-4570,7
+4574,7
@@
struct key {
enum keyfuncid funcid;
char *spawn_name;
};
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)
int
key_cmp(struct key *kp1, struct key *kp2)
@@
-4588,8
+4592,8
@@
key_cmp(struct key *kp1, struct key *kp2)
return (0);
}
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 };
/* mouse */
enum { client_click, root_click };
@@
-4613,7
+4617,7
@@
update_modkey(unsigned int mod)
struct key *kp;
mod_key = mod;
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
if (kp->mod & ShiftMask)
kp->mod = mod | ShiftMask;
else
@@
-4981,7
+4985,7
@@
key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid, char *spawn_name)
kp->keysym = ks;
kp->funcid = kfid;
kp->spawn_name = strdupsafe(spawn_name);
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");
}
DNPRINTF(SWM_D_KEY, "key_insert: leave\n");
}
@@
-4994,7
+4998,7
@@
key_lookup(unsigned int mod, KeySym ks)
kp.keysym = ks;
kp.mod = mod;
kp.keysym = ks;
kp.mod = mod;
- return (RB_FIND(key_list, &keys, &kp));
+ return (RB_FIND(key_tree, &keys, &kp));
}
void
}
void
@@
-5002,7
+5006,7
@@
key_remove(struct key *kp)
{
DNPRINTF(SWM_D_KEY, "key_remove: %s\n", keyfuncs[kp->funcid].name);
{
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);
free(kp->spawn_name);
free(kp);
@@
-5265,7
+5269,7
@@
grabkeys(void)
if (TAILQ_EMPTY(&screens[k].rl))
continue;
XUngrabKey(display, AnyKey, AnyModifier, screens[k].root);
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,
if ((code = XKeysymToKeycode(display, kp->keysym)))
for (j = 0; j < LENGTH(modifiers); j++)
XGrabKey(display, code,