From: Kevin Murphy <kemurphy@xxxxxxxxxxxxxx>
---
i3bar/include/common.h | 3 +
i3bar/include/focus.h | 23 +++++++
i3bar/include/xcb.h | 6 ++
i3bar/src/focus.c | 111 ++++++++++++++++++++++++++++++++++
i3bar/src/ipc.c | 27 ++++++++-
i3bar/src/main.c | 1 +
i3bar/src/xcb.c | 158 +++++++++++++++++++++++++++++++++++++++++++------
7 files changed, 307 insertions(+), 22 deletions(-)
create mode 100644 i3bar/include/focus.h
create mode 100644 i3bar/src/focus.c
diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 870e6db..01bfdfa 100644
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -45,7 +45,10 @@ struct status_block {
TAILQ_HEAD(statusline_head, status_block) statusline_head;
+i3String *focused_title_text;
+
#include "child.h"
+#include "focus.h"
#include "ipc.h"
#include "outputs.h"
#include "util.h"
diff --git a/i3bar/include/focus.h b/i3bar/include/focus.h
new file mode 100644
index 0000000..29e4429
--- /dev/null
+++ b/i3bar/include/focus.h
@@ -0,0 +1,23 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
+ *
+ * focus.c: Maintaining the workspace-lists
+ *
+ */
+#ifndef FOCUS_H_
+#define FOCUS_H_
+
+#include <xcb/xproto.h>
+
+#include "common.h"
+
+/*
+ * Start parsing the received json-string
+ *
+ */
+void parse_focus_json(char *json);
+
+#endif
diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h
index 75019c8..db1f0bc 100644
--- a/i3bar/include/xcb.h
+++ b/i3bar/include/xcb.h
@@ -101,6 +101,12 @@ void destroy_window(i3_output *output);
void realloc_sl_buffer(void);
/*
+ * Reallocate the focused-title-buffer
+ *
+ */
+void realloc_ft_buffer();
+
+/*
* Reconfigure all bars and create new for newly activated outputs
*
*/
diff --git a/i3bar/src/focus.c b/i3bar/src/focus.c
new file mode 100644
index 0000000..8bea250
--- /dev/null
+++ b/i3bar/src/focus.c
@@ -0,0 +1,111 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
+ *
+ * focus.c: Maintaining the workspace-lists
+ *
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <yajl/yajl_parse.h>
+#include <yajl/yajl_version.h>
+
+#include "common.h"
+
+/*
+ * Parse a string (name, output)
+ *
+ */
+#if YAJL_MAJOR >= 2
+static int focus_string_cb(void *params_, const unsigned char *val, size_t
len) {
+#else
+static int focus_string_cb(void *params_, const unsigned char *val, unsigned
int len) {
+#endif
+ char *cur_key = *(char**)params_;
+
+ if (!strcmp(cur_key, "title")) {
+ focused_title_text = i3string_from_utf8_with_length((const char*)val,
len);
+
+ FREE(cur_key);
+ return 1;
+ }
+
+ FREE(cur_key);
+ return 0;
+}
+
+/*
+ * Parse a key.
+ *
+ */
+#if YAJL_MAJOR >= 2
+static int focus_map_key_cb(void *params_, const unsigned char *keyVal, size_t
keyLen) {
+#else
+static int focus_map_key_cb(void *params_, const unsigned char *keyVal,
unsigned int keyLen) {
+#endif
+ char **cur_key_p = (char**)params_;
+
+ char *cur_key = smalloc(sizeof(unsigned char) * (keyLen + 1));
+ strncpy(cur_key, (const char*) keyVal, keyLen);
+ cur_key[keyLen] = '\0';
+
+ *cur_key_p = cur_key;
+
+ return 1;
+}
+
+/* A datastructure to pass all these callbacks to yajl */
+yajl_callbacks focus_callbacks = {
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ &focus_string_cb,
+ NULL,
+ &focus_map_key_cb,
+ NULL,
+ NULL,
+ NULL
+};
+
+/*
+ * Start parsing the received json-string
+ *
+ */
+void parse_focus_json(char *json) {
+ /* FIXME: Fasciliate stream-processing, i.e. allow starting to interpret
+ * JSON in chunks */
+ yajl_handle handle;
+ yajl_status state;
+ char *cur_key = NULL;
+#if YAJL_MAJOR < 2
+ yajl_parser_config parse_conf = { 0, 0 };
+
+ handle = yajl_alloc(&focus_callbacks, &parse_conf, NULL, (void*) &cur_key);
+#else
+ handle = yajl_alloc(&focus_callbacks, NULL, (void*) &cur_key);
+#endif
+
+ state = yajl_parse(handle, (const unsigned char*) json, strlen(json));
+
+ /* FIXME: Propper errorhandling for JSON-parsing */
+ switch (state) {
+ case yajl_status_ok:
+ break;
+ case yajl_status_client_canceled:
+#if YAJL_MAJOR < 2
+ case yajl_status_insufficient_data:
+#endif
+ case yajl_status_error:
+ ELOG("Could not parse focus-reply!\n");
+ exit(EXIT_FAILURE);
+ break;
+ }
+
+ yajl_free(handle);
+}
diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c
index 2170e50..c9e909e 100644
--- a/i3bar/src/ipc.c
+++ b/i3bar/src/ipc.c
@@ -75,6 +75,16 @@ void got_output_reply(char *reply) {
}
/*
+ * Called, when we get a reply with workspaces-data
+ *
+ */
+void got_focus_reply(char *reply) {
+ DLOG("Got Focus-Data!\n");
+ parse_focus_json(reply);
+ draw_bars(false);
+}
+
+/*
* Called when we get the configuration for our bar instance
*
*/
@@ -115,6 +125,8 @@ handler_t reply_handlers[] = {
NULL,
NULL,
&got_bar_config,
+ NULL,
+ &got_focus_reply,
};
/*
@@ -148,12 +160,21 @@ void got_mode_event(char *event) {
draw_bars(false);
}
+/*
+ * Called, when a focus-event arrives (i.e. the focused window changed)
+ *
+ */
+void got_focus_event(char *event) {
+ DLOG("Got Focus Event!\n");
+ i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_FOCUS, NULL);
+}
/* Data-structure to easily call the reply-handlers later */
handler_t event_handlers[] = {
&got_workspace_event,
&got_output_event,
- &got_mode_event
+ &got_mode_event,
+ &got_focus_event,
};
/*
@@ -309,8 +330,8 @@ void destroy_connection(void) {
*/
void subscribe_events(void) {
if (config.disable_ws) {
- i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"output\", \"mode\" ]");
+ i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"output\", \"mode\",
\"focus\" ]");
} else {
- i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"workspace\",
\"output\", \"mode\" ]");
+ i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"workspace\",
\"output\", \"mode\", \"focus\" ]");
}
}
diff --git a/i3bar/src/main.c b/i3bar/src/main.c
index ea60564..b4ae08e 100644
--- a/i3bar/src/main.c
+++ b/i3bar/src/main.c
@@ -149,6 +149,7 @@ int main(int argc, char **argv) {
if (init_connection(socket_path)) {
/* Request the bar configuration. When it arrives, we fill the config
array. */
i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_BAR_CONFIG, config.bar_id);
+ i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_FOCUS, NULL);
}
/* We listen to SIGTERM/QUIT/INT and try to exit cleanly, by stopping the
main-loop.
diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 5ae8023..c20ff37 100644
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -68,6 +68,11 @@ xcb_gcontext_t statusline_clear;
xcb_pixmap_t statusline_pm;
uint32_t statusline_width;
+xcb_gcontext_t focused_title_ctx;
+xcb_gcontext_t focused_title_clear;
+xcb_pixmap_t focused_title_pm;
+uint32_t focused_title_width;
+
/* Event-Watchers, to interact with the user */
ev_prepare *xcb_prep;
ev_check *xcb_chk;
@@ -152,15 +157,48 @@ void refresh_statusline(void) {
if (TAILQ_NEXT(block, blocks) != NULL) {
/* This is not the last block, draw a separator. */
- set_font_colors(statusline_ctx, get_colorpixel("#666666"),
colors.bar_bg);
- xcb_poly_line(xcb_connection, XCB_COORD_MODE_ORIGIN, statusline_pm,
- statusline_ctx, 2,
- (xcb_point_t[]){ { x - 5, 2 }, { x - 5, font.height
- 2 } });
+ uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND;
+ uint32_t vals[] = { get_colorpixel("#222222"), colors.bar_bg };
+ xcb_change_gc(xcb_connection,
+ statusline_ctx,
+ mask,
+ vals);
+ xcb_poly_fill_rectangle(xcb_connection, statusline_pm,
+ statusline_ctx, 1,
+ (xcb_rectangle_t[]){ { x - 6, 0, 2,
font.height + 4 } });
}
}
}
/*
+ * Redraws the focused title to the buffer
+ *
+ */
+void refresh_focused_title() {
+ uint32_t old_focused_title_width = focused_title_width;
+ focused_title_width = 0;
+
+ if (focused_title_text)
+ focused_title_width = predict_text_width(focused_title_text);
+
+ /* If the title is bigger than our screen we need to make sure that
+ * the pixmap provides enough space, so re-allocate if the width grew */
+ if (focused_title_width > root_screen->width_in_pixels &&
+ focused_title_width > old_focused_title_width)
+ realloc_ft_buffer();
+
+ /* Clear the title pixmap. */
+ xcb_rectangle_t rect = { 0, 0, root_screen->width_in_pixels, font.height +
4 };
+ xcb_poly_fill_rectangle(xcb_connection, focused_title_pm,
focused_title_clear, 1, &rect);
+
+ /* Draw the text. */
+ if (focused_title_text) {
+ set_font_colors(focused_title_ctx, colors.bar_fg, colors.bar_bg);
+ draw_text(focused_title_text, focused_title_pm, focused_title_ctx, 0,
0, focused_title_width);
+ }
+}
+
+/*
* Hides all bars (unmaps them)
*
*/
@@ -843,6 +881,29 @@ char *init_xcb_early() {
uint32_t mask = XCB_GC_FOREGROUND;
uint32_t vals[] = { colors.bar_bg, colors.bar_bg };
+ focused_title_clear = xcb_generate_id(xcb_connection);
+ xcb_void_cookie_t ft_clear_ctx_cookie =
xcb_create_gc_checked(xcb_connection,
+
focused_title_clear,
+ xcb_root,
+ mask,
+ vals);
+
+ focused_title_ctx = xcb_generate_id(xcb_connection);
+ xcb_void_cookie_t ft_ctx_cookie = xcb_create_gc_checked(xcb_connection,
+ focused_title_ctx,
+ xcb_root,
+ 0,
+ NULL);
+
+ focused_title_pm = xcb_generate_id(xcb_connection);
+ xcb_void_cookie_t ft_pm_cookie = xcb_create_pixmap_checked(xcb_connection,
+
root_screen->root_depth,
+
focused_title_pm,
+ xcb_root,
+
root_screen->width_in_pixels,
+
root_screen->height_in_pixels);
+
+
statusline_clear = xcb_generate_id(xcb_connection);
xcb_void_cookie_t clear_ctx_cookie = xcb_create_gc_checked(xcb_connection,
statusline_clear,
@@ -902,8 +963,10 @@ char *init_xcb_early() {
}
}
-
- if (xcb_request_failed(sl_pm_cookie, "Could not allocate
statusline-buffer") ||
+ if (xcb_request_failed(ft_pm_cookie, "Could not allocate
focused-title-buffer") ||
+ xcb_request_failed(ft_clear_ctx_cookie, "Could not allocate
focused-title-buffer-clearcontext") ||
+ xcb_request_failed(ft_ctx_cookie, "Could not allocate
focused-title-buffer-context") ||
+ xcb_request_failed(sl_pm_cookie, "Could not allocate
statusline-buffer") ||
xcb_request_failed(clear_ctx_cookie, "Could not allocate
statusline-buffer-clearcontext") ||
xcb_request_failed(sl_ctx_cookie, "Could not allocate
statusline-buffer-context")) {
exit(EXIT_FAILURE);
@@ -1197,6 +1260,50 @@ void realloc_sl_buffer(void) {
}
/*
+ * Reallocate the focused-title-buffer
+ *
+ */
+void realloc_ft_buffer() {
+ DLOG("Re-allocating focused-title-buffer, focused_title_width = %d,
root_screen->width_in_pixels = %d\n",
+ focused_title_width, root_screen->width_in_pixels);
+ xcb_free_pixmap(xcb_connection, focused_title_pm);
+ focused_title_pm = xcb_generate_id(xcb_connection);
+ xcb_void_cookie_t ft_pm_cookie = xcb_create_pixmap_checked(xcb_connection,
+
root_screen->root_depth,
+
focused_title_pm,
+ xcb_root,
+
MAX(root_screen->width_in_pixels, focused_title_width),
+
root_screen->height_in_pixels);
+
+ uint32_t mask = XCB_GC_FOREGROUND;
+ uint32_t vals[2] = { colors.bar_bg, colors.bar_bg };
+ xcb_free_gc(xcb_connection, focused_title_clear);
+ focused_title_clear = xcb_generate_id(xcb_connection);
+ xcb_void_cookie_t ft_clear_ctx_cookie =
xcb_create_gc_checked(xcb_connection,
+
focused_title_clear,
+ xcb_root,
+ mask,
+ vals);
+
+ mask |= XCB_GC_BACKGROUND;
+ vals[0] = colors.bar_fg;
+ focused_title_ctx = xcb_generate_id(xcb_connection);
+ xcb_free_gc(xcb_connection, focused_title_ctx);
+ xcb_void_cookie_t ft_ctx_cookie = xcb_create_gc_checked(xcb_connection,
+ focused_title_ctx,
+ xcb_root,
+ mask,
+ vals);
+
+ if (xcb_request_failed(ft_pm_cookie, "Could not allocate
focused-title-buffer") ||
+ xcb_request_failed(ft_clear_ctx_cookie, "Could not allocate
focused-title-buffer-clearcontext") ||
+ xcb_request_failed(ft_ctx_cookie, "Could not allocate
focused-title-buffer-context")) {
+ exit(EXIT_FAILURE);
+ }
+
+}
+
+/*
* Reconfigure all bars and create new bars for recently activated outputs
*
*/
@@ -1414,6 +1521,7 @@ void draw_bars(bool unhide) {
int i = 0;
refresh_statusline();
+ refresh_focused_title();
static char *last_urgent_ws = NULL;
bool walks_away = true;
@@ -1441,25 +1549,28 @@ void draw_bars(bool unhide) {
1,
&rect);
+ /* Calculate the width of the tray area */
+ int traypx = 0;
+ trayclient *trayclient;
+ 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 + 2;
+ }
+
+ /* Add 2px of padding if there are any tray icons */
+ if (traypx > 0)
+ traypx += 2;
+
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 + 2;
- }
- /* Add 2px of padding if there are any tray icons */
- if (traypx > 0)
- traypx += 2;
xcb_copy_area(xcb_connection,
statusline_pm,
outputs_walk->buffer,
@@ -1567,6 +1678,15 @@ void draw_bars(bool unhide) {
draw_text(binding.name, outputs_walk->buffer, outputs_walk->bargc,
i + 5, 2, binding.width);
}
+ int16_t focused_title_constrained_width = outputs_walk->rect.w -
traypx - 4 - statusline_width - (2 * 4);
+ xcb_copy_area(xcb_connection,
+ focused_title_pm,
+ outputs_walk->buffer,
+ outputs_walk->bargc,
+ MAX(0, (int16_t)(focused_title_width -
focused_title_constrained_width)), 0,
+ i + 4, 2,
+ MIN(focused_title_constrained_width,
focused_title_width), font.height);
+
i = 0;
}
--
1.8.0
