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

Merge branch 'master' of github.com:LemonBoy/bar

Browse Source 
* 'master' of github.com:LemonBoy/bar:
  Fix a silly error when redrawing the background. Fixes #108 and #82
  fix non left alignments causing wrong clicks
This commit is contained in:
krypt-n 2015-03-03 15:28:28 +01:00
commit eb5d99467d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bar.c
View File

@ -147,10 +147,10 @@ xcb_void_cookie_t xcb_poly_text_16_simple(xcb_connection_t * c,
uint32_t len, const uint16_t *str) uint32_t len, const uint16_t *str)
{ {
static const xcb_protocol_request_t xcb_req = { static const xcb_protocol_request_t xcb_req = {
5, // count 5, // count
0, // ext 0, // ext
XCB_POLY_TEXT_16, // opcode XCB_POLY_TEXT_16, // opcode
1 // isvoid 1 // isvoid
}; };
struct iovec xcb_parts[7]; struct iovec xcb_parts[7];
uint8_t xcb_lendelta[2]; uint8_t xcb_lendelta[2];
@ -206,7 +206,7 @@ draw_char (monitor_t *mon, font_t *cur_font, int x, int align, uint16_t ch)
} }
// Draw the background first // Draw the background first
fill_rect(mon->pixmap, gc[GC_CLEAR], x, by, ch_width, bh); fill_rect(mon->pixmap, gc[GC_CLEAR], x, 0, ch_width, bh);
// xcb accepts string in UCS-2 BE, so swap // xcb accepts string in UCS-2 BE, so swap
ch = (ch >> 8) | (ch << 8); ch = (ch >> 8) | (ch << 8);
@ -340,9 +340,10 @@ area_shift (xcb_window_t win, const int align, int delta)
delta /= 2; delta /= 2;
for (int i = 0; i < astack.pos; i++) { for (int i = 0; i < astack.pos; i++) {
if (astack.slot[i].window == win && astack.slot[i].align == align) { area_t *a = &astack.slot[i];
astack.slot[i].begin -= delta; if (a->window == win && a->align == align && !a->active) {
astack.slot[i].end -= delta; a->begin -= delta;
a->end -= delta;
} }
} }
} }