Fixes, fixes, fixes:

i3-input: restore input focus on exit()
(upstream git commit 5779f573e7316664e4bff9d3ff17a234edc9d337)

Repect AR environment variable
(upstream git commit ef81bd183b579688b9f1a46a41c817b577d0b39e)

Fix scrolling on a tabbed titlebar which contains split cons
(upstream git commit 721fa7bdadac6d7f0c78f8c1eac0e66252ba2dc6)

Bugfix: ignore ConfigureRequests for scratchpad windows
(upstream git commit 36b106a9d39727b06909113e3f11552f2f1b6abe)

Bugfix: handle MapRequests sent between i3 registering as a wm and
handling events
(upstream git commit 625401d1628757a67a2ab4eeaa68be965683889c)

Bugfix: draw right tab border for split containers
(upstream git commit ae605bdd394bdf83a8015ac626b222fd40e35b04)

x11/i3/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.54 2012/12/17 08:51:12 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.55 2012/12/27 19:58:05 dcoppa Exp $
 
 COMMENT =	improved dynamic tiling window manager
 
 DISTNAME =	i3-4.4
-REVISION =	0
+REVISION =	1
 CATEGORIES =	x11
 
 EXTRACT_SUFX =	.tar.bz2

x11/i3/patches/patch-i3-input_main_c

@@ -0,0 +1,58 @@
+$OpenBSD: patch-i3-input_main_c,v 1.1 2012/12/27 19:58:05 dcoppa Exp $
+
+Bugfix: restore input focus on exit()
+(upstream git commit 5779f573e7316664e4bff9d3ff17a234edc9d337)
+
+--- i3-input/main.c.orig	Wed Dec 12 00:08:22 2012
++++ i3-input/main.c	Thu Dec 27 15:08:34 2012
+@@ -54,6 +54,7 @@ static int limit;
+ xcb_window_t root;
+ xcb_connection_t *conn;
+ xcb_screen_t *root_screen;
++static xcb_get_input_focus_cookie_t focus_cookie;
+ 
+ /*
+  * Having verboselog() and errorlog() is necessary when using libi3.
+@@ -282,6 +283,24 @@ static int handle_key_press(void *ignored, xcb_connect
+     return 1;
+ }
+ 
++/*
++ * Restores the X11 input focus to whereever it was before.
++ * This is necessary because i3-input's window has override_redirect=1
++ * (unmanaged by the window manager) and thus i3-input changes focus itself.
++ * This function is called on exit().
++ *
++ */
++static void restore_input_focus(void) {
++    xcb_generic_error_t *error;
++    xcb_get_input_focus_reply_t *reply = xcb_get_input_focus_reply(conn, focus_cookie, &error);
++    if (error != NULL) {
++        fprintf(stderr, "[i3-input] ERROR: Could not restore input focus (X error %d)\n", error->error_code);
++        return;
++    }
++    xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, reply->focus, XCB_CURRENT_TIME);
++    xcb_flush(conn);
++}
++
+ int main(int argc, char *argv[]) {
+     format = strdup("%s");
+     socket_path = getenv("I3SOCK");
+@@ -357,6 +376,9 @@ int main(int argc, char *argv[]) {
+     if (!conn || xcb_connection_has_error(conn))
+         die("Cannot open display\n");
+ 
++    /* Request the current InputFocus to restore when i3-input exits. */
++    focus_cookie = xcb_get_input_focus(conn);
++
+     root_screen = xcb_aux_get_screen(conn, screens);
+     root = root_screen->root;
+ 
+@@ -398,6 +420,7 @@ int main(int argc, char *argv[]) {
+     /* Set input focus (we have override_redirect=1, so the wm will not do
+      * this for us) */
+     xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, win, XCB_CURRENT_TIME);
++    atexit(restore_input_focus);
+ 
+     /* Grab the keyboard to get all input */
+     xcb_flush(conn);

x11/i3/patches/patch-libi3_libi3_mk

@@ -0,0 +1,16 @@
+$OpenBSD: patch-libi3_libi3_mk,v 1.1 2012/12/27 19:58:05 dcoppa Exp $
+
+Repect AR environment variable
+(upstream git commit ef81bd183b579688b9f1a46a41c817b577d0b39e)
+
+--- libi3/libi3.mk.orig	Thu Dec 27 15:01:05 2012
++++ libi3/libi3.mk	Thu Dec 27 15:01:40 2012
+@@ -14,7 +14,7 @@ libi3/%.o: libi3/%.c $(libi3_HEADERS)
+ 
+ libi3.a: $(libi3_OBJECTS)
+ 	echo "[libi3] AR libi3.a"
+-	ar rcs $@ $^ $(libi3_LIBS)
++	$(AR) rcs $@ $^ $(libi3_LIBS)
+ 
+ clean-libi3:
+ 	echo "[libi3] Clean"

x11/i3/patches/patch-src_click_c

@@ -0,0 +1,25 @@
+$OpenBSD: patch-src_click_c,v 1.8 2012/12/27 19:58:05 dcoppa Exp $
+
+Fix scrolling on a tabbed titlebar which contains split cons
+(upstream git commit 721fa7bdadac6d7f0c78f8c1eac0e66252ba2dc6)
+
+--- src/click.c.orig	Wed Dec 12 00:08:17 2012
++++ src/click.c	Thu Dec 27 15:26:45 2012
+@@ -211,9 +211,16 @@ static int route_click(Con *con, xcb_button_press_even
+          event->detail == XCB_BUTTON_INDEX_5)) {
+         DLOG("Scrolling on a window decoration\n");
+         orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ);
++        /* Focus the currently focused container on the same level that the
++         * user scrolled on. e.g. the tabbed decoration contains
++         * "urxvt | i3: V[xterm geeqie] | firefox",
++         * focus is on the xterm, but the user scrolled on urxvt.
++         * The splitv container will be focused. */
++        Con *focused = con->parent;
++        focused = TAILQ_FIRST(&(focused->focus_head));
++        con_focus(focused);
+         /* To prevent scrolling from going outside the container (see ticket
+          * #557), we first check if scrolling is possible at all. */
+-        Con *focused = con_descend_focused(con->parent);
+         bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL);
+         bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL);
+         if (event->detail == XCB_BUTTON_INDEX_4 && scroll_prev_possible)

x11/i3/patches/patch-src_handlers_c

@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_handlers_c,v 1.11 2012/12/27 19:58:05 dcoppa Exp $
+
+Bugfix: ignore ConfigureRequests for scratchpad windows
+(upstream git commit 36b106a9d39727b06909113e3f11552f2f1b6abe)
+
+--- src/handlers.c.orig	Wed Dec 12 00:08:17 2012
++++ src/handlers.c	Thu Dec 27 18:09:49 2012
+@@ -349,6 +349,11 @@ static void handle_configure_request(xcb_configure_req
+         }
+         Con *floatingcon = con->parent;
+ 
++        if (strcmp(con_get_workspace(floatingcon)->name, "__i3_scratch") == 0) {
++            DLOG("This is a scratchpad container, ignoring ConfigureRequest\n");
++            return;
++        }
++
+         Rect newrect = floatingcon->rect;
+ 
+         if (event->value_mask & XCB_CONFIG_WINDOW_X) {

x11/i3/patches/patch-src_main_c

@@ -1,9 +1,13 @@
-$OpenBSD: patch-src_main_c,v 1.6 2012/12/13 12:10:14 dcoppa Exp $
+$OpenBSD: patch-src_main_c,v 1.7 2012/12/27 19:58:05 dcoppa Exp $
 
 OpenBSD lacks POSIX shared memory support (shm_open() and friends)
 
+Bugfix: handle MapRequests sent between i3 registering as a wm and
+handling events
+(upstream git commit 625401d1628757a67a2ab4eeaa68be965683889c)
+
 --- src/main.c.orig	Wed Dec 12 00:08:17 2012
-+++ src/main.c	Thu Dec 13 10:26:26 2012
++++ src/main.c	Thu Dec 27 19:02:25 2012
 @@ -219,11 +219,13 @@ static void i3_exit(void) {
      ev_loop_destroy(main_loop);
  #endif
@@ -93,3 +97,24 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
  
      /* Try to enable core dumps by default when running a debug build */
      if (is_debug_build()) {
+@@ -777,6 +791,20 @@ int main(int argc, char *argv[]) {
+         xcb_aux_sync(conn);
+         xcb_generic_event_t *event;
+         while ((event = xcb_poll_for_event(conn)) != NULL) {
++            if (event->response_type == 0) {
++                free(event);
++                continue;
++            }
++
++            /* Strip off the highest bit (set if the event is generated) */
++            int type = (event->response_type & 0x7F);
++
++            /* We still need to handle MapRequests which are sent in the
++             * timespan starting from when we register as a window manager and
++             * this piece of code which drops events. */
++            if (type == XCB_MAP_REQUEST)
++                handle_event(type, event);
++
+             free(event);
+         }
+         manage_existing_windows(root);

x11/i3/patches/patch-src_x_c

@@ -1,10 +1,30 @@
-$OpenBSD: patch-src_x_c,v 1.10 2012/12/13 12:10:14 dcoppa Exp $
+$OpenBSD: patch-src_x_c,v 1.11 2012/12/27 19:58:05 dcoppa Exp $
+
+Bugfix: draw right tab border for split containers
+(upstream git commit ae605bdd394bdf83a8015ac626b222fd40e35b04)
 
 OpenBSD lacks POSIX shared memory support (shm_open() and friends)
 
 --- src/x.c.orig	Wed Dec 12 00:08:17 2012
-+++ src/x.c	Thu Dec 13 09:45:54 2012
-@@ -1057,8 +1057,10 @@ void x_set_i3_atoms(void) {
++++ src/x.c	Thu Dec 27 15:19:49 2012
+@@ -505,7 +505,7 @@ void x_draw_decoration(Con *con) {
+                 con->deco_rect.width - 2);
+         free(title);
+ 
+-        goto copy_pixmaps;
++        goto after_title;
+     }
+ 
+     if (win->name == NULL)
+@@ -533,6 +533,7 @@ void x_draw_decoration(Con *con) {
+             con->deco_rect.x + 2 + indent_px, con->deco_rect.y + text_offset_y,
+             con->deco_rect.width - 2 - indent_px);
+ 
++after_title:
+     /* Since we don’t clip the text at all, it might in some cases be painted
+      * on the border pixels on the right side of a window. Therefore, we draw
+      * the right border again after rendering the text (and the unconnected
+@@ -1057,8 +1058,10 @@ void x_set_i3_atoms(void) {
      xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_PID, XCB_ATOM_CARDINAL, 32, 1, &pid);
      xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
                          strlen(current_configpath), current_configpath);