sway

commit 14147ac05676a4f914960311e3b49e4451c0576a
parent 6392abe35b32c66c642c25a7c6911021862d3413
Author: Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
Date:   Fri,  8 Jan 2016 14:27:41 +0100

Reduce duplicate code

Diffstat:
M
sway/handlers.c
 | 
29
+++++++++++++----------------

1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/sway/handlers.c b/sway/handlers.c
@@ -336,6 +336,17 @@ static void handle_view_state_request(wlc_handle view, enum wlc_view_state_bit s
 	return;
 }
 
+static void handle_binding_command(struct sway_binding *binding) {
+		struct sway_binding *binding_copy = sway_binding_dup(binding);
+		struct cmd_results *res = handle_command(binding->command);
+		if (res->status != CMD_SUCCESS) {
+			sway_log(L_ERROR, "Command '%s' failed: %s", res->input, res->error);
+		}
+		ipc_event_binding_keyboard(binding_copy);
+		free_cmd_results(res);
+		free_sway_binding(binding_copy);
+}
+
 static bool handle_bindsym(struct sway_binding *binding) {
 	bool match = false;
 	int i;
@@ -347,14 +358,7 @@ static bool handle_bindsym(struct sway_binding *binding) {
 	}
 
 	if (match) {
-		struct sway_binding *binding_copy = sway_binding_dup(binding);
-		struct cmd_results *res = handle_command(binding->command);
-		if (res->status != CMD_SUCCESS) {
-			sway_log(L_ERROR, "Command '%s' failed: %s", res->input, res->error);
-		}
-		ipc_event_binding_keyboard(binding_copy);
-		free_cmd_results(res);
-		free_sway_binding(binding_copy);
+		handle_binding_command(binding);
 		return true;
 	}
 
@@ -365,14 +369,7 @@ static bool handle_bindsym_release(struct sway_binding *binding) {
 	if (binding->keys->length == 1) {
 		xkb_keysym_t *key = binding->keys->items[0];
 		if (check_released_key(*key)) {
-			struct sway_binding *binding_copy = sway_binding_dup(binding);
-			struct cmd_results *res = handle_command(binding->command);
-			if (res->status != CMD_SUCCESS) {
-				sway_log(L_ERROR, "Command '%s' failed: %s", res->input, res->error);
-			}
-			ipc_event_binding_keyboard(binding_copy);
-			free_cmd_results(res);
-			free_sway_binding(binding_copy);
+			handle_binding_command(binding);
 			return true;
 		}
 	}