aboutsummaryrefslogtreecommitdiffstats
path: root/window.h
diff options
context:
space:
mode:
authorBert Münnich <be.muennich@gmail.com>2013-01-27 18:03:07 +0100
committerBert Münnich <be.muennich@gmail.com>2013-01-27 18:03:07 +0100
commitaa6ccf42b8aace05154bf2eebcba8695524b0b17 (patch)
tree79229fc6dd0bbbf7fde51a4614172cc5677a7c64 /window.h
parent3a0a1ae889bc4de959cfe5079d541b0ec9119089 (diff)
parent9c0a53bc34c53424613ee203253fee526ba9f049 (diff)
downloadnsxiv-aa6ccf42b8aace05154bf2eebcba8695524b0b17.tar.zst
Merge branch 'userinfo'
Diffstat (limited to 'window.h')
-rw-r--r--window.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/window.h b/window.h
index 5e033e3..6bc6595 100644
--- a/window.h
+++ b/window.h
@@ -23,8 +23,6 @@
#include "types.h"
-#define BAR_SEPARATOR " | "
-
typedef struct {
Display *dpy;
int scr;
@@ -42,21 +40,23 @@ typedef struct {
unsigned long bgcol;
unsigned long fscol;
unsigned long selcol;
- unsigned long barbgcol;
- unsigned long barfgcol;
Pixmap pm;
int x;
int y;
unsigned int w;
unsigned int h; /* = win height - bar height */
- unsigned int barh;
unsigned int bw;
bool fullscreen;
- const char *lbar;
- const char *rbar;
+ struct {
+ unsigned int h;
+ char *l;
+ char *r;
+ unsigned long bgcol;
+ unsigned long fgcol;
+ } bar;
} win_t;
extern Atom wm_delete_win;
@@ -80,7 +80,7 @@ void win_draw_rect(win_t*, Pixmap, int, int, int, int, bool, int,
int win_textwidth(const char*, unsigned int, bool);
void win_set_title(win_t*, const char*);
-void win_set_bar_info(win_t*, const char*, const char*);
+void win_set_bar_info(win_t*, char*, char*);
void win_set_cursor(win_t*, cursor_t);
#endif /* WINDOW_H */