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

Fixes and cleanup

Browse Source
This commit is contained in:
LemonBoy 2014-02-26 12:02:33 +00:00
parent 3c0583a5fc
commit 6977bb96d2
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bar.c
View File

@ -20,16 +20,14 @@
typedef struct font_t { typedef struct font_t {
xcb_font_t ptr; xcb_font_t ptr;
uint32_t descent; int descent, height;
uint32_t height;
uint16_t char_max; uint16_t char_max;
uint16_t char_min; uint16_t char_min;
xcb_charinfo_t *width_lut; xcb_charinfo_t *width_lut;
} font_t; } font_t;
typedef struct monitor_t { typedef struct monitor_t {
uint32_t x; int x, width;
uint32_t width;
xcb_window_t window; xcb_window_t window;
xcb_pixmap_t pixmap; xcb_pixmap_t pixmap;
struct monitor_t *prev, *next; struct monitor_t *prev, *next;
@ -68,7 +66,6 @@ enum {
static xcb_connection_t *c; static xcb_connection_t *c;
static xcb_screen_t *scr; static xcb_screen_t *scr;
static xcb_drawable_t canvas;
static xcb_gcontext_t gc[GC_MAX]; static xcb_gcontext_t gc[GC_MAX];
static xcb_visualid_t visual; static xcb_visualid_t visual;
static xcb_colormap_t colormap; static xcb_colormap_t colormap;
@ -298,7 +295,6 @@ parse (char *text)
pos_x = 0; pos_x = 0;
align = ALIGN_L; align = ALIGN_L;
cur_font = main_font;
cur_mon = monhead; cur_mon = monhead;
memset(&astack, 0, sizeof(area_stack_t)); memset(&astack, 0, sizeof(area_stack_t));
@ -597,7 +593,6 @@ monitor_create_chain (xcb_rectangle_t *rects, const int num)
void void
get_randr_monitors (void) get_randr_monitors (void)
{ {
xcb_generic_error_t *err;
xcb_randr_get_screen_resources_current_reply_t *rres_reply; xcb_randr_get_screen_resources_current_reply_t *rres_reply;
xcb_randr_output_t *outputs; xcb_randr_output_t *outputs;
int num, valid = 0; int num, valid = 0;
@ -689,7 +684,7 @@ get_xinerama_monitors (void)
{ {
xcb_xinerama_query_screens_reply_t *xqs_reply; xcb_xinerama_query_screens_reply_t *xqs_reply;
xcb_xinerama_screen_info_iterator_t iter; xcb_xinerama_screen_info_iterator_t iter;
int screens, width = bw; int screens;
xqs_reply = xcb_xinerama_query_screens_reply(c, xqs_reply = xcb_xinerama_query_screens_reply(c,
xcb_xinerama_query_screens_unchecked(c), NULL); xcb_xinerama_query_screens_unchecked(c), NULL);
@ -1011,8 +1006,6 @@ main (int argc, char **argv)
/* Get the fd to Xserver */ /* Get the fd to Xserver */
pollin[1].fd = xcb_get_file_descriptor(c); pollin[1].fd = xcb_get_file_descriptor(c);
area_t *a;
for (;;) { for (;;) {
bool redraw = false; bool redraw = false;
@ -1034,12 +1027,14 @@ main (int argc, char **argv)
switch (ev->response_type & 0x7F) { switch (ev->response_type & 0x7F) {
case XCB_EXPOSE: case XCB_EXPOSE:
if (expose_ev->count == 0) redraw = true; if (expose_ev->count == 0)
redraw = true;
break;
case XCB_BUTTON_PRESS: case XCB_BUTTON_PRESS:
press_ev = (xcb_button_press_event_t *)ev; press_ev = (xcb_button_press_event_t *)ev;
/* Respond to left click */
if (press_ev->detail == XCB_BUTTON_INDEX_1) { if (press_ev->detail == XCB_BUTTON_INDEX_1) {
a = area_get(press_ev->event, press_ev->event_x); area_t *a = area_get(press_ev->event, press_ev->event_x);
if (a) system(a->cmd); if (a) system(a->cmd);
} }
break; break;