diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-02-22 00:45:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 00:45:51 -0500 |
| commit | 692768230385d7d63938d7a40e9253c0f028d1cb (patch) | |
| tree | 5b8222416cf425c2c2dee123a13dd774fd2a368c /include/sway/config.h | |
| parent | 46bd2bb5df02bd155bf92af6483c5b553afa7b6e (diff) | |
| parent | f68d2fb33c433d13def0921db561eb23d400683c (diff) | |
Merge branch 'master' into swaylock_colors
Diffstat (limited to 'include/sway/config.h')
| -rw-r--r-- | include/sway/config.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index febde63d..d77fbd51 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -203,7 +203,6 @@ enum secure_feature { FEATURE_FULLSCREEN = 16, FEATURE_KEYBOARD = 32, FEATURE_MOUSE = 64, - FEATURE_IPC = 128, }; struct feature_policy { @@ -225,7 +224,17 @@ enum ipc_feature { IPC_FEATURE_EVENT_MODE = 1024, IPC_FEATURE_EVENT_WINDOW = 2048, IPC_FEATURE_EVENT_BINDING = 4096, - IPC_FEATURE_EVENT_INPUT = 8192 + IPC_FEATURE_EVENT_INPUT = 8192, + + IPC_FEATURE_ALL_COMMANDS = 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, + IPC_FEATURE_ALL_EVENTS = 256 | 512 | 1024 | 2048 | 4096 | 8192, + + IPC_FEATURE_ALL = IPC_FEATURE_ALL_COMMANDS | IPC_FEATURE_ALL_EVENTS, +}; + +struct ipc_policy { + char *program; + uint32_t features; }; /** @@ -300,7 +309,7 @@ struct sway_config { // Security list_t *command_policies; list_t *feature_policies; - uint32_t ipc_policy; + list_t *ipc_policies; }; void pid_workspace_add(struct pid_workspace *pw); @@ -331,6 +340,8 @@ void free_config(struct sway_config *config); */ char *do_var_replacement(char *str); +struct cmd_results *check_security_config(); + int input_identifier_cmp(const void *item, const void *data); void merge_input_config(struct input_config *dst, struct input_config *src); void apply_input_config(struct input_config *ic, struct libinput_device *dev); |