mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-27 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restructure and add a hiearchy of commands

Browse source
This commit is contained in:
Samuel Grahn 2019-01-23 03:41:29 +01:00
parent cb94176e27
commit ba2020aebd
10 changed files with 177 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/sway/commands.h
View file

@ -280,6 +280,12 @@ sway_cmd seat_cmd_fallback;
sway_cmd seat_cmd_hide_cursor;
sway_cmd seat_cmd_pointer_constraint;
sway_cmd touch_cmd_gesture;
sway_cmd touch_cmd_binding;
sway_cmd touch_gesture_cmd_touch;
sway_cmd cmd_ipc_cmd;
sway_cmd cmd_ipc_events;
sway_cmd cmd_ipc_event_cmd;

27
include/sway/config.h
View file

@ -53,12 +53,6 @@ struct sway_binding {
uint32_t modifiers;
char *command;
};
struct sway_gesture_binding {
struct libtouch_gesture *gesture;
char *command;
};
/**
* A mouse binding and an associated command.
*/
@ -106,6 +100,13 @@ struct input_config_mapped_from_region {
bool mm;
};
struct gesture_config {
char *identifier;
struct libtouch_gesture *gesture;
char *command;
};
/**
* options for input devices
*/
@ -426,6 +427,7 @@ struct sway_config {
list_t *output_configs;
list_t *input_configs;
list_t *input_type_configs;
list_t *gesture_configs;
list_t *seat_configs;
list_t *criteria;
list_t *no_focus;
@ -513,7 +515,8 @@ struct sway_config {
list_t *command_policies;
list_t *feature_policies;
list_t *ipc_policies;
struct libtouch_engine *gesture_engine;
// Context for command handlers
struct {
struct input_config *input_config;
@ -523,6 +526,10 @@ struct sway_config {
struct sway_node *node;
struct sway_container *container;
struct sway_workspace *workspace;
struct gesture_config *current_gesture;
bool using_criteria;
struct {
int argc;
@ -647,6 +654,12 @@ void free_bar_binding(struct bar_binding *binding);
void free_workspace_config(struct workspace_config *wsc);
int gesture_identifier_cmp(const void *item, const void *data);
struct gesture_config *get_gesture_config(const char *identifier);
struct gesture_config *new_gesture_config(const char *identifier);
/**
* Updates the value of config->font_height based on the max title height
* reported by each container. If recalculate is true, the containers will