Merge pull request #2264 from ianyfan/ipc

IPC Events (1.0)

5 files changed, 8 insertions, 5 deletions

diff --git a/include/ipc.h b/include/ipc.h
index 0010718b..a3f60e19 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -15,6 +15,7 @@ enum ipc_command_type {
         IPC_GET_VERSION = 7,
         IPC_GET_BINDING_MODES = 8,
         IPC_GET_CONFIG = 9,
+        IPC_SEND_TICK = 10,
 
         // sway-specific command types
         IPC_GET_INPUTS = 100,
@@ -27,8 +28,8 @@ enum ipc_command_type {
         IPC_EVENT_WINDOW = ((1<<31) | 3),
         IPC_EVENT_BARCONFIG_UPDATE = ((1<<31) | 4),
         IPC_EVENT_BINDING = ((1<<31) | 5),
-        IPC_EVENT_MODIFIER = ((1<<31) | 6),
-        IPC_EVENT_INPUT = ((1<<31) | 7),
+        IPC_EVENT_SHUTDOWN = ((1<<31) | 6),
+        IPC_EVENT_TICK = ((1<<31) | 7),
 };
 
 #endif
diff --git a/include/sway/config.h b/include/sway/config.h
index 0f74b439..909b6827 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -488,8 +488,6 @@ int sway_binding_cmp_keys(const void *a, const void *b);
 
 void free_sway_binding(struct sway_binding *sb);
 
-struct sway_binding *sway_binding_dup(struct sway_binding *sb);
-
 void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding);
 
 void load_swaybars();
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 07febe2c..92387601 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -99,7 +99,7 @@ void seat_configure_xcursor(struct sway_seat *seat);
 void seat_set_focus(struct sway_seat *seat, struct sway_container *container);
 
 void seat_set_focus_warp(struct sway_seat *seat,
-                struct sway_container *container, bool warp);
+                struct sway_container *container, bool warp, bool notify);
 
 void seat_set_focus_surface(struct sway_seat *seat,
                 struct wlr_surface *surface, bool unfocus);
diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h
index 6469f097..4b6d0e25 100644
--- a/include/sway/ipc-server.h
+++ b/include/sway/ipc-server.h
@@ -16,5 +16,7 @@ void ipc_event_workspace(struct sway_container *old,
 void ipc_event_window(struct sway_container *window, const char *change);
 void ipc_event_barconfig_update(struct bar_config *bar);
 void ipc_event_mode(const char *mode, bool pango);
+void ipc_event_shutdown(const char *reason);
+void ipc_event_binding(struct sway_binding *binding);
 
 #endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 0152ed55..800df073 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -311,6 +311,8 @@ void view_clear_marks(struct sway_view *view);
 
 bool view_has_mark(struct sway_view *view, char *mark);
 
+void view_add_mark(struct sway_view *view, char *mark);
+
 void view_update_marks_textures(struct sway_view *view);
 
 /**