rename config apply cmds

18 files changed, 35 insertions, 19 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 7485f2f6..3fb1842d 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -57,7 +57,7 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type
 	return error;
 }
 
-void input_cmd_apply(struct input_config *input) {
+void apply_input_config(struct input_config *input) {
 	int i;
 	i = list_seq_find(config->input_configs, input_identifier_cmp, input->identifier);
 	if (i >= 0) {
@@ -74,7 +74,7 @@ void input_cmd_apply(struct input_config *input) {
 	sway_input_manager_apply_input_config(input_manager, input);
 }
 
-void seat_cmd_apply(struct seat_config *seat) {
+void apply_seat_config(struct seat_config *seat) {
 	int i;
 	i = list_seq_find(config->seat_configs, seat_name_cmp, seat->name);
 	if (i >= 0) {
diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
index 9b5fb7a2..f72b7d48 100644
--- a/sway/commands/input/accel_profile.c
+++ b/sway/commands/input/accel_profile.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
 				"Expected 'accel_profile <adaptive|flat>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index a0e3bddf..dcf64c1a 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -1,6 +1,7 @@
 #include <string.h>
 #include <strings.h>
 #include "sway/commands.h"
+#include "sway/config.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
 
@@ -29,6 +30,6 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) {
 			"Expected 'click_method <none|button_areas|clickfinger'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
index 149a6183..1783978a 100644
--- a/sway/commands/input/drag_lock.c
+++ b/sway/commands/input/drag_lock.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
 			"Expected 'drag_lock <enabled|disabled>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
index 0954575c..8108a110 100644
--- a/sway/commands/input/dwt.c
+++ b/sway/commands/input/dwt.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -23,6 +24,6 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) {
 			"Expected 'dwt <enabled|disabled>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index f44c0ec7..8a74c11e 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -30,6 +31,6 @@ struct cmd_results *input_cmd_events(int argc, char **argv) {
 			"Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c
index dc8fcd56..35740df3 100644
--- a/sway/commands/input/left_handed.c
+++ b/sway/commands/input/left_handed.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
 			"Expected 'left_handed <enabled|disabled>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
index e19964d8..7bc08ae6 100644
--- a/sway/commands/input/middle_emulation.c
+++ b/sway/commands/input/middle_emulation.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -25,6 +26,6 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
 			"Expected 'middle_emulation <enabled|disabled>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
index 8272c5b3..a7dcdc2c 100644
--- a/sway/commands/input/natural_scroll.c
+++ b/sway/commands/input/natural_scroll.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
 			"Expected 'natural_scroll <enabled|disabled>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
index 2c9db5bf..d2261a63 100644
--- a/sway/commands/input/pointer_accel.c
+++ b/sway/commands/input/pointer_accel.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -22,6 +23,6 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
 	}
 	new_config->pointer_accel = pointer_accel;
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
index 40277155..035262cf 100644
--- a/sway/commands/input/scroll_method.c
+++ b/sway/commands/input/scroll_method.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 
@@ -28,6 +29,6 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
 			"Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
 	}
 
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index 18a54087..8547c0cd 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <strings.h>
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -27,6 +28,6 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) {
 
 	sway_log(L_DEBUG, "apply-tap for device: %s",
 		current_input_config->identifier);
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 9a9ce044..4470fb1d 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -1,4 +1,5 @@
 #define _XOPEN_SOURCE 700
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
 
 	sway_log(L_DEBUG, "apply-xkb_layout for device: %s",
 		current_input_config->identifier);
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index 14a50ffb..167ce2e7 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -1,4 +1,5 @@
 #define _XOPEN_SOURCE 700
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
 
 	sway_log(L_DEBUG, "apply-xkb_model for device: %s",
 		current_input_config->identifier);
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index 67eb5342..180f40d5 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -1,4 +1,5 @@
 #define _XOPEN_SOURCE 700
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
 
 	sway_log(L_DEBUG, "apply-xkb_options for device: %s",
 		current_input_config->identifier);
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index 3eda0bdd..047e8c84 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -1,4 +1,5 @@
 #define _XOPEN_SOURCE 700
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
 
 	sway_log(L_DEBUG, "apply-xkb_rules for device: %s",
 		current_input_config->identifier);
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index c7f93ad4..0e998457 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -1,4 +1,5 @@
 #define _XOPEN_SOURCE 700
+#include "sway/config.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {
 
 	sway_log(L_DEBUG, "apply-xkb_variant for device: %s",
 		current_input_config->identifier);
-	input_cmd_apply(new_config);
+	apply_input_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 996c1bda..80ec63ce 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -21,6 +21,6 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
 	new_attachment->identifier = strdup(argv[0]);
 	list_add(new_config->attachments, new_attachment);
 
-	seat_cmd_apply(new_config);
+	apply_seat_config(new_config);
 	return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }