Merge branch 'next' (3.β is stable now)

diff --cc debian/control
index e0807987802586ece877b2780ff1be0bc7e659eb,bd37b89296dd072c366692b3c62fb7decbcdebb9..c8834deebe38d830adc0a84323b75fd2136aa9d2
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,10 -1,10 +1,10 @@@
  Source: i3-wm
  Section: utils
- Priority: optional
+ Priority: extra
  Maintainer: Michael Stapelberg <michael@stapelberg.de>
  DM-Upload-Allowed: yes
- Build-Depends: debhelper (>= 5), libx11-dev, libxcb-aux0-dev (>= 0.3.3), libxcb-keysyms1-dev, libxcb-xinerama0-dev (>= 1.1), libxcb-event1-dev (>= 0.3.3), libxcb-property1-dev (>= 0.3.3), libxcb-atom1-dev (>= 0.3.3), libxcb-icccm1-dev (>= 0.3.3), asciidoc (>= 8.4.4-1), xmlto, docbook-xml, pkg-config
- Standards-Version: 3.8.0
+ Build-Depends: debhelper (>= 5), libx11-dev, libxcb-aux0-dev (>= 0.3.3), libxcb-keysyms1-dev, libxcb-xinerama0-dev (>= 1.1), libxcb-event1-dev (>= 0.3.3), libxcb-property1-dev (>= 0.3.3), libxcb-atom1-dev (>= 0.3.3), libxcb-icccm1-dev (>= 0.3.3), asciidoc (>= 8.4.4-1), xmlto, docbook-xml, pkg-config, libev-dev
 -Standards-Version: 3.8.0
++Standards-Version: 3.8.2
  Homepage: http://i3.zekjur.net/
  
  Package: i3

diff --cc docs/hacking-howto
index 72796b0ca24687fe480cbfa9d30e726bea71bae4,ceff2a843ffe382ed2f403b036fb0325e49db4ce..22649c38b9faea189263494dc1bf11d4a7af0c84
--- 1/docs/hacking-howto
--- 2/docs/hacking-howto
+++ b/docs/hacking-howto
@@@ -107,27 -107,39 +107,42 @@@ Contains forward definitions for all pu
  comments (so if you want to get a bit more of the big picture, either browse all
  header files or use doxygen if you prefer that).
  
+ src/client.c::
+ Contains all functions which are specific to a certain client (make it
+ fullscreen, see if its class/name matches a pattern, kill it, …).
+ 
  src/commands.c::
- Parsing commands
+ Parsing commands and actually execute them (focussing, moving, …).
  
  src/config.c::
- Parses the configuration file
+ Parses the configuration file.
  
  src/debug.c::
- Contains debugging functions to print unhandled X events
+ Contains debugging functions to print unhandled X events.
+ 
+ src/floating.c::
+ Contains functions for floating mode (mostly resizing/dragging).
  
  src/handlers.c::
- Contains all handlers for all kind of X events
+ Contains all handlers for all kind of X events (new window title, new hints,
+ unmapping, key presses, button presses, …).
  
  src/layout.c::
- Renders your layout (screens, workspaces, containers)
+ Renders your layout (screens, workspaces, containers).
  
  src/mainx.c::
- Initializes the window manager
+ Initializes the window manager.
+ 
+ src/manage.c::
+ Looks at existing or new windows and decides whether to manage them. If so, it
+ reparents the window and inserts it into our data structures.
+ 
+ src/resize.c::
+ Contains the functions to resize columns/rows in the table.
  
 +src/resize.c::
 +Contains the functions to resize columns/rows in the table.
 +
  src/table.c::
  Manages the most important internal data structure, the design table.
  

diff --cc include/util.h
index 889dcf122f175b53d2b10815b23d425ee81cbaa2,c7209061f92ac3669dc86b2b8abc27abee4aff2c..3fd6b18a7aa537895c39cd101159c875374d270a
--- 1/include/util.h
--- 2/include/util.h
+++ b/include/util.h
@@@ -124,29 -124,22 +124,33 @@@ void check_error(xcb_connection_t *conn
  char *convert_utf8_to_ucs2(char *input, int *real_strlen);
  
  /**
-  * Removes the given client from the container, either because it will be inserted into another
-  * one or because it was unmapped
+  * Returns the client which comes next in focus stack (= was selected before) for
+  * the given container, optionally excluding the given client.
   *
   */
- void remove_client_from_container(xcb_connection_t *conn, Client *client, Container *container);
+ Client *get_last_focused_client(xcb_connection_t *conn, Container *container, Client *exclude);
  
  /**
-  * Returns the client which comes next in focus stack (= was selected before) for
-  * the given container, optionally excluding the given client.
+  * Unmaps all clients (and stack windows) of the given workspace.
+  *
+  * This needs to be called separately when temporarily rendering
+  * a workspace which is not the active workspace to force
+  * reconfiguration of all clients, like in src/xinerama.c when
+  * re-assigning a workspace to another screen.
   *
   */
- Client *get_last_focused_client(xcb_connection_t *conn, Container *container, Client *exclude);
+ void unmap_workspace(xcb_connection_t *conn, Workspace *u_ws);
 +
 +/**
 + * Unmaps all clients (and stack windows) of the given workspace.
 + *
 + * This needs to be called separately when temporarily rendering
 + * a workspace which is not the active workspace to force
 + * reconfiguration of all clients, like in src/xinerama.c when
 + * re-assigning a workspace to another screen.
 + *
 + */
 +void unmap_workspace(xcb_connection_t *conn, Workspace *u_ws);
  
  /**
   * Sets the given client as focused by updating the data structures correctly,

diff --cc src/handlers.c
Simple merge

diff --cc website/screenshots/index.html
index a7f95852e8fda88b78be8ba7055492e9b3b01ff0,1651286b9b3c68e73e98a4310bc4342f36431a04..a46ea8ebab6d2d943803a64dbea99f7f29760d39
--- 1/website/screenshots/index.html
--- 2/website/screenshots/index.html
+++ b/website/screenshots/index.html
@@@ -75,10 -75,7 +75,9 @@@ li 
    <li>
      <a href="/screenshots/i3-4.png">i3 v3.b (not yet released)</a>, Atsutane had too much free time and formed an i3 logo out of terminals :-)
    </li>
 -
 +  <li>
 +    <a href="/screenshots/i3-5.png">i3 v3.α-bf2</a>, mc, vim, xosview, mplayer, irssi, gajim, i3status
 +  </li>
- 
  </ul>
  
  <h2>Screencasts</h2>