Michael Stapelberg
commit
12e840b24d
142
i3bar/src/xcb.c
142
i3bar/src/xcb.c
|
|
@ -174,7 +174,7 @@ void refresh_statusline(void) {
|
|||
realloc_sl_buffer();
|
||||
|
||||
/* Clear the statusline pixmap. */
|
||||
xcb_rectangle_t rect = {0, 0, root_screen->width_in_pixels, bar_height};
|
||||
xcb_rectangle_t rect = {0, 0, MAX(root_screen->width_in_pixels, statusline_width), bar_height};
|
||||
xcb_poly_fill_rectangle(xcb_connection, statusline_pm, statusline_clear, 1, &rect);
|
||||
|
||||
/* Draw the text of each block. */
|
||||
|
|
@ -273,7 +273,7 @@ void unhide_bars(void) {
|
|||
values[2] = walk->rect.w;
|
||||
values[3] = bar_height;
|
||||
values[4] = XCB_STACK_MODE_ABOVE;
|
||||
DLOG("Reconfiguring Window for output %s to %d,%d\n", walk->name, values[0], values[1]);
|
||||
DLOG("Reconfiguring window for output %s to %d,%d\n", walk->name, values[0], values[1]);
|
||||
cookie = xcb_configure_window_checked(xcb_connection,
|
||||
walk->bar,
|
||||
mask,
|
||||
|
|
@ -323,8 +323,6 @@ void init_colors(const struct xcb_color_strings_t *new_colors) {
|
|||
*
|
||||
*/
|
||||
void handle_button(xcb_button_press_event_t *event) {
|
||||
i3_ws *cur_ws;
|
||||
|
||||
/* Determine, which bar was clicked */
|
||||
i3_output *walk;
|
||||
xcb_window_t bar = event->event;
|
||||
|
|
@ -335,16 +333,28 @@ void handle_button(xcb_button_press_event_t *event) {
|
|||
}
|
||||
|
||||
if (walk == NULL) {
|
||||
DLOG("Unknown Bar klicked!\n");
|
||||
DLOG("Unknown bar clicked!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
int32_t x = event->event_x >= 0 ? event->event_x : 0;
|
||||
int32_t original_x = x;
|
||||
|
||||
DLOG("Got Button %d\n", event->detail);
|
||||
DLOG("Got button %d\n", event->detail);
|
||||
|
||||
if (child_want_click_events()) {
|
||||
int workspace_width = 0;
|
||||
i3_ws *cur_ws = NULL, *clicked_ws = NULL, *ws_walk;
|
||||
|
||||
TAILQ_FOREACH(ws_walk, walk->workspaces, tailq) {
|
||||
int w = logical_px(10) + ws_walk->name_width;
|
||||
if (x >= workspace_width && x <= workspace_width + w)
|
||||
clicked_ws = ws_walk;
|
||||
if (ws_walk->visible)
|
||||
cur_ws = ws_walk;
|
||||
workspace_width += w + logical_px(1);
|
||||
}
|
||||
|
||||
if (x > workspace_width && child_want_click_events()) {
|
||||
/* If the child asked for click events,
|
||||
* check if a status block has been clicked. */
|
||||
|
||||
|
|
@ -385,15 +395,8 @@ void handle_button(xcb_button_press_event_t *event) {
|
|||
x = original_x;
|
||||
}
|
||||
|
||||
/* TODO: Move this to extern get_ws_for_output() */
|
||||
TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) {
|
||||
if (cur_ws->visible) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (cur_ws == NULL) {
|
||||
DLOG("No Workspace active?\n");
|
||||
DLOG("No workspace active?\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -435,17 +438,10 @@ void handle_button(xcb_button_press_event_t *event) {
|
|||
cur_ws = TAILQ_NEXT(cur_ws, tailq);
|
||||
break;
|
||||
case 1:
|
||||
/* Check if this event regards a workspace button */
|
||||
TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) {
|
||||
DLOG("x = %d\n", x);
|
||||
if (x >= 0 && x < cur_ws->name_width + logical_px(10)) {
|
||||
break;
|
||||
}
|
||||
x -= cur_ws->name_width + logical_px(11);
|
||||
}
|
||||
cur_ws = clicked_ws;
|
||||
|
||||
/* Otherwise, focus our currently visible workspace if it is not
|
||||
* already focused */
|
||||
/* if no workspace was clicked, focus our currently visible
|
||||
* workspace if it is not already focused */
|
||||
if (cur_ws == NULL) {
|
||||
TAILQ_FOREACH(cur_ws, walk->workspaces, tailq) {
|
||||
if (cur_ws->visible && !cur_ws->focused)
|
||||
|
|
@ -1170,7 +1166,7 @@ void init_xcb_late(char *fontname) {
|
|||
/* Load the font */
|
||||
font = load_font(fontname, true);
|
||||
set_font(&font);
|
||||
DLOG("Calculated Font-height: %d\n", font.height);
|
||||
DLOG("Calculated font height: %d\n", font.height);
|
||||
bar_height = font.height + logical_px(6);
|
||||
|
||||
xcb_flush(xcb_connection);
|
||||
|
|
@ -1369,7 +1365,7 @@ void get_atoms(void) {
|
|||
free(reply);
|
||||
|
||||
#include "xcb_atoms.def"
|
||||
DLOG("Got Atoms\n");
|
||||
DLOG("Got atoms\n");
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1495,7 +1491,7 @@ void reconfig_windows(bool redraw_bars) {
|
|||
continue;
|
||||
}
|
||||
if (walk->bar == XCB_NONE) {
|
||||
DLOG("Creating Window for output %s\n", walk->name);
|
||||
DLOG("Creating window for output %s\n", walk->name);
|
||||
|
||||
walk->bar = xcb_generate_id(xcb_connection);
|
||||
walk->buffer = xcb_generate_id(xcb_connection);
|
||||
|
|
@ -1677,7 +1673,7 @@ void reconfig_windows(bool redraw_bars) {
|
|||
DLOG("Destroying buffer for output %s\n", walk->name);
|
||||
xcb_free_pixmap(xcb_connection, walk->buffer);
|
||||
|
||||
DLOG("Reconfiguring Window for output %s to %d,%d\n", walk->name, values[0], values[1]);
|
||||
DLOG("Reconfiguring window for output %s to %d,%d\n", walk->name, values[0], values[1]);
|
||||
xcb_void_cookie_t cfg_cookie = xcb_configure_window_checked(xcb_connection,
|
||||
walk->bar,
|
||||
mask,
|
||||
|
|
@ -1685,7 +1681,7 @@ void reconfig_windows(bool redraw_bars) {
|
|||
|
||||
mask = XCB_CW_OVERRIDE_REDIRECT;
|
||||
values[0] = (config.hide_on_modifier == M_DOCK ? 0 : 1);
|
||||
DLOG("Changing Window attribute override_redirect for output %s to %d\n", walk->name, values[0]);
|
||||
DLOG("Changing window attribute override_redirect for output %s to %d\n", walk->name, values[0]);
|
||||
xcb_void_cookie_t chg_cookie = xcb_change_window_attributes(xcb_connection,
|
||||
walk->bar,
|
||||
mask,
|
||||
|
|
@ -1735,8 +1731,8 @@ void reconfig_windows(bool redraw_bars) {
|
|||
*
|
||||
*/
|
||||
void draw_bars(bool unhide) {
|
||||
DLOG("Drawing Bars...\n");
|
||||
int i = 0;
|
||||
DLOG("Drawing bars...\n");
|
||||
int workspace_width = 0;
|
||||
|
||||
refresh_statusline();
|
||||
|
||||
|
|
@ -1763,39 +1759,11 @@ void draw_bars(bool unhide) {
|
|||
1,
|
||||
&rect);
|
||||
|
||||
if (!TAILQ_EMPTY(&statusline_head)) {
|
||||
DLOG("Printing statusline!\n");
|
||||
|
||||
/* Luckily we already prepared a seperate pixmap containing the rendered
|
||||
* statusline, we just have to copy the relevant parts to the relevant
|
||||
* position */
|
||||
trayclient *trayclient;
|
||||
int traypx = 0;
|
||||
TAILQ_FOREACH(trayclient, outputs_walk->trayclients, tailq) {
|
||||
if (!trayclient->mapped)
|
||||
continue;
|
||||
/* We assume the tray icons are quadratic (we use the font
|
||||
* *height* as *width* of the icons) because we configured them
|
||||
* like this. */
|
||||
traypx += font.height + logical_px(2);
|
||||
}
|
||||
/* Add 2px of padding if there are any tray icons */
|
||||
if (traypx > 0)
|
||||
traypx += logical_px(2);
|
||||
xcb_copy_area(xcb_connection,
|
||||
statusline_pm,
|
||||
outputs_walk->buffer,
|
||||
outputs_walk->bargc,
|
||||
MAX(0, (int16_t)(statusline_width - outputs_walk->rect.w + logical_px(4))), 0,
|
||||
MAX(0, (int16_t)(outputs_walk->rect.w - statusline_width - traypx - logical_px(4))), 0,
|
||||
MIN(outputs_walk->rect.w - traypx - logical_px(4), (int)statusline_width), bar_height);
|
||||
}
|
||||
|
||||
if (!config.disable_ws) {
|
||||
i3_ws *ws_walk;
|
||||
TAILQ_FOREACH(ws_walk, outputs_walk->workspaces, tailq) {
|
||||
DLOG("Drawing Button for WS %s at x = %d, len = %d\n",
|
||||
i3string_as_utf8(ws_walk->name), i, ws_walk->name_width);
|
||||
DLOG("Drawing button for WS %s at x = %d, len = %d\n",
|
||||
i3string_as_utf8(ws_walk->name), workspace_width, ws_walk->name_width);
|
||||
uint32_t fg_color = colors.inactive_ws_fg;
|
||||
uint32_t bg_color = colors.inactive_ws_bg;
|
||||
uint32_t border_color = colors.inactive_ws_border;
|
||||
|
|
@ -1823,7 +1791,7 @@ void draw_bars(bool unhide) {
|
|||
outputs_walk->bargc,
|
||||
mask,
|
||||
vals_border);
|
||||
xcb_rectangle_t rect_border = {i,
|
||||
xcb_rectangle_t rect_border = {workspace_width,
|
||||
logical_px(1),
|
||||
ws_walk->name_width + logical_px(10),
|
||||
font.height + logical_px(4)};
|
||||
|
|
@ -1837,7 +1805,7 @@ void draw_bars(bool unhide) {
|
|||
outputs_walk->bargc,
|
||||
mask,
|
||||
vals);
|
||||
xcb_rectangle_t rect = {i + logical_px(1),
|
||||
xcb_rectangle_t rect = {workspace_width + logical_px(1),
|
||||
2 * logical_px(1),
|
||||
ws_walk->name_width + logical_px(8),
|
||||
font.height + logical_px(2)};
|
||||
|
|
@ -1848,8 +1816,8 @@ void draw_bars(bool unhide) {
|
|||
&rect);
|
||||
set_font_colors(outputs_walk->bargc, fg_color, bg_color);
|
||||
draw_text(ws_walk->name, outputs_walk->buffer, outputs_walk->bargc,
|
||||
i + logical_px(5), 3 * logical_px(1), ws_walk->name_width);
|
||||
i += logical_px(10) + ws_walk->name_width + logical_px(1);
|
||||
workspace_width + logical_px(5), 3 * logical_px(1), ws_walk->name_width);
|
||||
workspace_width += logical_px(10) + ws_walk->name_width + logical_px(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1863,7 +1831,7 @@ void draw_bars(bool unhide) {
|
|||
outputs_walk->bargc,
|
||||
mask,
|
||||
vals_border);
|
||||
xcb_rectangle_t rect_border = {i, 1, binding.width + 10, font.height + 4};
|
||||
xcb_rectangle_t rect_border = {workspace_width, 1, binding.width + 10, font.height + 4};
|
||||
xcb_poly_fill_rectangle(xcb_connection,
|
||||
outputs_walk->buffer,
|
||||
outputs_walk->bargc,
|
||||
|
|
@ -1875,7 +1843,7 @@ void draw_bars(bool unhide) {
|
|||
outputs_walk->bargc,
|
||||
mask,
|
||||
vals);
|
||||
xcb_rectangle_t rect = {i + 1, 2, binding.width + 8, font.height + 2};
|
||||
xcb_rectangle_t rect = {workspace_width + 1, 2, binding.width + 8, font.height + 2};
|
||||
xcb_poly_fill_rectangle(xcb_connection,
|
||||
outputs_walk->buffer,
|
||||
outputs_walk->bargc,
|
||||
|
|
@ -1883,12 +1851,46 @@ void draw_bars(bool unhide) {
|
|||
&rect);
|
||||
|
||||
set_font_colors(outputs_walk->bargc, fg_color, bg_color);
|
||||
draw_text(binding.name, outputs_walk->buffer, outputs_walk->bargc, i + 5, 3, binding.width);
|
||||
draw_text(binding.name, outputs_walk->buffer, outputs_walk->bargc, workspace_width + 5, 3, binding.width);
|
||||
|
||||
unhide = true;
|
||||
workspace_width += logical_px(10) + binding.width + logical_px(1);
|
||||
}
|
||||
|
||||
i = 0;
|
||||
if (!TAILQ_EMPTY(&statusline_head)) {
|
||||
DLOG("Printing statusline!\n");
|
||||
|
||||
/* Luckily we already prepared a seperate pixmap containing the rendered
|
||||
* statusline, we just have to copy the relevant parts to the relevant
|
||||
* position */
|
||||
trayclient *trayclient;
|
||||
int traypx = 0;
|
||||
TAILQ_FOREACH(trayclient, outputs_walk->trayclients, tailq) {
|
||||
if (!trayclient->mapped)
|
||||
continue;
|
||||
/* We assume the tray icons are quadratic (we use the font
|
||||
* *height* as *width* of the icons) because we configured them
|
||||
* like this. */
|
||||
traypx += font.height + logical_px(2);
|
||||
}
|
||||
/* Add 2px of padding if there are any tray icons */
|
||||
if (traypx > 0)
|
||||
traypx += logical_px(2);
|
||||
|
||||
int edge_offset = logical_px(4);
|
||||
int visible_statusline_width = MIN(statusline_width,
|
||||
outputs_walk->rect.w - workspace_width - traypx - 2*edge_offset);
|
||||
|
||||
xcb_copy_area(xcb_connection,
|
||||
statusline_pm,
|
||||
outputs_walk->buffer,
|
||||
outputs_walk->bargc,
|
||||
(int16_t)(statusline_width - visible_statusline_width), 0,
|
||||
(int16_t)(outputs_walk->rect.w - traypx - edge_offset - visible_statusline_width), 0,
|
||||
(int16_t)visible_statusline_width, (int16_t)bar_height);
|
||||
}
|
||||
|
||||
workspace_width = 0;
|
||||
}
|
||||
|
||||
/* Assure the bar is hidden/unhidden according to the specified hidden_state and mode */
|
||||
|
|
|
|||
Loading…
Reference in New Issue