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

Merge branch 'master' into xft-port

Browse Source 
* master:
  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:34:02 +01:00
commit 9323151793
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bar.c
View File

@ -177,10 +177,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];
@ -277,11 +277,9 @@ draw_char (monitor_t *mon, font_t *cur_font, int x, int align, uint16_t ch)
if (cur_font->xft_ft) { if (cur_font->xft_ft) {
XftDrawString16 (xft_draw, &sel_fg, cur_font->xft_ft, x,y, &ch, 1); XftDrawString16 (xft_draw, &sel_fg, cur_font->xft_ft, x,y, &ch, 1);
} else { } else {
char c_ = ch > 127 ? ' ' : ch;
/* 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);
/* String baseline coordinates */
xcb_image_text_8(c, 1, mon->pixmap, gc[GC_DRAW], x,y, &c_);
// The coordinates here are those of the baseline // The coordinates here are those of the baseline
xcb_poly_text_16_simple(c, mon->pixmap, gc[GC_DRAW], xcb_poly_text_16_simple(c, mon->pixmap, gc[GC_DRAW],
x, bh / 2 + cur_font->height / 2 - cur_font->descent, x, bh / 2 + cur_font->height / 2 - cur_font->descent,
@ -418,9 +416,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;
} }
} }
} }