Merge branch 'master' into next

2014-01-13 23:36:47 +01:00
parent cd0cd0c3d2 b8ba545733
commit 10d7c1a993
5 changed files with 133 additions and 38 deletions
--- a/include/ipc.h
+++ b/include/ipc.h
@ -80,3 +80,10 @@ void ipc_send_event(const char *event, uint32_t message_type, const char *payloa
 void ipc_shutdown(void);

 void dump_node(yajl_gen gen, Con *con, bool inplace_restart);
+
+/**
+ * For the workspace "focus" event we send, along the usual "change" field,
+ * also the current and previous workspace, in "current" and "old"
+ * respectively.
+ */
+void ipc_send_workspace_focus_event(Con *current, Con *old);