aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/input
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-16 12:14:24 -0500
committerLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-16 12:14:24 -0500
commitf16aa3c0ad8328da0820e81c99a619835f36082f (patch)
tree4f9c99cfa6304fc5f0f3c8eef2cac17541782e55 /sway/commands/input
parentput seat and input config in their own files (diff)
downloadsway-f16aa3c0ad8328da0820e81c99a619835f36082f.tar.gz
sway-f16aa3c0ad8328da0820e81c99a619835f36082f.tar.zst
sway-f16aa3c0ad8328da0820e81c99a619835f36082f.zip
rename config apply cmds
Diffstat (limited to 'sway/commands/input')
-rw-r--r--sway/commands/input/accel_profile.c3
-rw-r--r--sway/commands/input/click_method.c3
-rw-r--r--sway/commands/input/drag_lock.c3
-rw-r--r--sway/commands/input/dwt.c3
-rw-r--r--sway/commands/input/events.c3
-rw-r--r--sway/commands/input/left_handed.c3
-rw-r--r--sway/commands/input/middle_emulation.c3
-rw-r--r--sway/commands/input/natural_scroll.c3
-rw-r--r--sway/commands/input/pointer_accel.c3
-rw-r--r--sway/commands/input/scroll_method.c3
-rw-r--r--sway/commands/input/tap.c3
-rw-r--r--sway/commands/input/xkb_layout.c3
-rw-r--r--sway/commands/input/xkb_model.c3
-rw-r--r--sway/commands/input/xkb_options.c3
-rw-r--r--sway/commands/input/xkb_rules.c3
-rw-r--r--sway/commands/input/xkb_variant.c3
16 files changed, 32 insertions, 16 deletions
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
24 "Expected 'accel_profile <adaptive|flat>'"); 25 "Expected 'accel_profile <adaptive|flat>'");
25 } 26 }
26 27
27 input_cmd_apply(new_config); 28 apply_input_config(new_config);
28 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 29 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
29} 30}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/commands.h" 3#include "sway/commands.h"
4#include "sway/config.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5#include "log.h" 6#include "log.h"
6 7
@@ -29,6 +30,6 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) {
29 "Expected 'click_method <none|button_areas|clickfinger'"); 30 "Expected 'click_method <none|button_areas|clickfinger'");
30 } 31 }
31 32
32 input_cmd_apply(new_config); 33 apply_input_config(new_config);
33 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 34 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
34} 35}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
24 "Expected 'drag_lock <enabled|disabled>'"); 25 "Expected 'drag_lock <enabled|disabled>'");
25 } 26 }
26 27
27 input_cmd_apply(new_config); 28 apply_input_config(new_config);
28 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 29 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
29} 30}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -23,6 +24,6 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) {
23 "Expected 'dwt <enabled|disabled>'"); 24 "Expected 'dwt <enabled|disabled>'");
24 } 25 }
25 26
26 input_cmd_apply(new_config); 27 apply_input_config(new_config);
27 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 28 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
28} 29}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5#include "log.h" 6#include "log.h"
@@ -30,6 +31,6 @@ struct cmd_results *input_cmd_events(int argc, char **argv) {
30 "Expected 'events <enabled|disabled|disabled_on_external_mouse>'"); 31 "Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
31 } 32 }
32 33
33 input_cmd_apply(new_config); 34 apply_input_config(new_config);
34 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 35 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
35} 36}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
24 "Expected 'left_handed <enabled|disabled>'"); 25 "Expected 'left_handed <enabled|disabled>'");
25 } 26 }
26 27
27 input_cmd_apply(new_config); 28 apply_input_config(new_config);
28 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 29 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
29} 30}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -25,6 +26,6 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
25 "Expected 'middle_emulation <enabled|disabled>'"); 26 "Expected 'middle_emulation <enabled|disabled>'");
26 } 27 }
27 28
28 input_cmd_apply(new_config); 29 apply_input_config(new_config);
29 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 30 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
30} 31}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -24,6 +25,6 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
24 "Expected 'natural_scroll <enabled|disabled>'"); 25 "Expected 'natural_scroll <enabled|disabled>'");
25 } 26 }
26 27
27 input_cmd_apply(new_config); 28 apply_input_config(new_config);
28 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 29 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
29} 30}
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 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <string.h> 2#include <string.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -22,6 +23,6 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
22 } 23 }
23 new_config->pointer_accel = pointer_accel; 24 new_config->pointer_accel = pointer_accel;
24 25
25 input_cmd_apply(new_config); 26 apply_input_config(new_config);
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 27 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
27} 28}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5 6
@@ -28,6 +29,6 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
28 "Expected 'scroll_method <none|two_finger|edge|on_button_down>'"); 29 "Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
29 } 30 }
30 31
31 input_cmd_apply(new_config); 32 apply_input_config(new_config);
32 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 33 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
33} 34}
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 @@
1#include <string.h> 1#include <string.h>
2#include <strings.h> 2#include <strings.h>
3#include "sway/config.h"
3#include "sway/commands.h" 4#include "sway/commands.h"
4#include "sway/input/input-manager.h" 5#include "sway/input/input-manager.h"
5#include "log.h" 6#include "log.h"
@@ -27,6 +28,6 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) {
27 28
28 sway_log(L_DEBUG, "apply-tap for device: %s", 29 sway_log(L_DEBUG, "apply-tap for device: %s",
29 current_input_config->identifier); 30 current_input_config->identifier);
30 input_cmd_apply(new_config); 31 apply_input_config(new_config);
31 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 32 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
32} 33}
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 @@
1#define _XOPEN_SOURCE 700 1#define _XOPEN_SOURCE 700
2#include "sway/config.h"
2#include "sway/commands.h" 3#include "sway/commands.h"
3#include "sway/input/input-manager.h" 4#include "sway/input/input-manager.h"
4#include "log.h" 5#include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
19 20
20 sway_log(L_DEBUG, "apply-xkb_layout for device: %s", 21 sway_log(L_DEBUG, "apply-xkb_layout for device: %s",
21 current_input_config->identifier); 22 current_input_config->identifier);
22 input_cmd_apply(new_config); 23 apply_input_config(new_config);
23 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
24} 25}
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 @@
1#define _XOPEN_SOURCE 700 1#define _XOPEN_SOURCE 700
2#include "sway/config.h"
2#include "sway/commands.h" 3#include "sway/commands.h"
3#include "sway/input/input-manager.h" 4#include "sway/input/input-manager.h"
4#include "log.h" 5#include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
19 20
20 sway_log(L_DEBUG, "apply-xkb_model for device: %s", 21 sway_log(L_DEBUG, "apply-xkb_model for device: %s",
21 current_input_config->identifier); 22 current_input_config->identifier);
22 input_cmd_apply(new_config); 23 apply_input_config(new_config);
23 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
24} 25}
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 @@
1#define _XOPEN_SOURCE 700 1#define _XOPEN_SOURCE 700
2#include "sway/config.h"
2#include "sway/commands.h" 3#include "sway/commands.h"
3#include "sway/input/input-manager.h" 4#include "sway/input/input-manager.h"
4#include "log.h" 5#include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
19 20
20 sway_log(L_DEBUG, "apply-xkb_options for device: %s", 21 sway_log(L_DEBUG, "apply-xkb_options for device: %s",
21 current_input_config->identifier); 22 current_input_config->identifier);
22 input_cmd_apply(new_config); 23 apply_input_config(new_config);
23 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
24} 25}
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 @@
1#define _XOPEN_SOURCE 700 1#define _XOPEN_SOURCE 700
2#include "sway/config.h"
2#include "sway/commands.h" 3#include "sway/commands.h"
3#include "sway/input/input-manager.h" 4#include "sway/input/input-manager.h"
4#include "log.h" 5#include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
19 20
20 sway_log(L_DEBUG, "apply-xkb_rules for device: %s", 21 sway_log(L_DEBUG, "apply-xkb_rules for device: %s",
21 current_input_config->identifier); 22 current_input_config->identifier);
22 input_cmd_apply(new_config); 23 apply_input_config(new_config);
23 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
24} 25}
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 @@
1#define _XOPEN_SOURCE 700 1#define _XOPEN_SOURCE 700
2#include "sway/config.h"
2#include "sway/commands.h" 3#include "sway/commands.h"
3#include "sway/input/input-manager.h" 4#include "sway/input/input-manager.h"
4#include "log.h" 5#include "log.h"
@@ -19,6 +20,6 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {
19 20
20 sway_log(L_DEBUG, "apply-xkb_variant for device: %s", 21 sway_log(L_DEBUG, "apply-xkb_variant for device: %s",
21 current_input_config->identifier); 22 current_input_config->identifier);
22 input_cmd_apply(new_config); 23 apply_input_config(new_config);
23 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
24} 25}
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-05-03 14:25:25 +0000