|
|
|
#ifndef _SWAY_CONFIG_H
|
|
|
|
#define _SWAY_CONFIG_H
|
|
|
|
#include <libinput.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <wlr/types/wlr_box.h>
|
|
|
|
#include <xkbcommon/xkbcommon.h>
|
|
|
|
#include "list.h"
|
|
|
|
#include "swaynag.h"
|
|
|
|
#include "tree/container.h"
|
|
|
|
#include "sway/tree/root.h"
|
|
|
|
#include "wlr-layer-shell-unstable-v1-protocol.h"
|
|
|
|
|
|
|
|
// TODO: Refactor this shit
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Describes a variable created via the `set` command.
|
|
|
|
*/
|
|
|
|
struct sway_variable {
|
|
|
|
char *name;
|
|
|
|
char *value;
|
|
|
|
};
|
|
|
|
|
Parse mouse binding options
First, the existing sway_binding structure is given an
enumerated type code. As all flags to bindsym/bindcode
are boolean, a single uint32 is used to hold all flags.
The _BORDER, _CONTENTS, _TITLEBAR flags, when active,
indicate in which part of a container the binding can
trigger; to localize complexity, they do not overlap
with the command line arguments, which center around
_TITLEBAR being set by default.
The keyboard handling code is adjusted for this change,
as is binding_key_compare; note that BINDING_LOCKED
is *not* part of the key portion of the binding.
Next, list of mouse bindings is introduced and cleaned up.
Finally, the binding command parsing code is extended
to handle the case where bindsym is used to describe
a mouse binding rather than a keysym binding; the
difference between the two may be detected as late as
when the first key/button is parsed, or as early as
the first flag. As bindings can have multiple
keycodes/keysyms/buttons, mixed keysym/button sequences
are prohibited.
6 years ago
|
|
|
|
|
|
|
enum binding_input_type {
|
|
|
|
BINDING_KEYCODE,
|
|
|
|
BINDING_KEYSYM,
|
|
|
|
BINDING_MOUSE,
|
|
|
|
};
|
|
|
|
|
|
|
|
enum binding_flags {
|
|
|
|
BINDING_RELEASE=1,
|
|
|
|
BINDING_LOCKED=2, // keyboard only
|
|
|
|
BINDING_BORDER=4, // mouse only; trigger on container border
|
|
|
|
BINDING_CONTENTS=8, // mouse only; trigger on container contents
|
|
|
|
BINDING_TITLEBAR=16, // mouse only; trigger on container titlebar
|
|
|
|
BINDING_RELOAD=32, // the binding runs the reload command
|
Parse mouse binding options
First, the existing sway_binding structure is given an
enumerated type code. As all flags to bindsym/bindcode
are boolean, a single uint32 is used to hold all flags.
The _BORDER, _CONTENTS, _TITLEBAR flags, when active,
indicate in which part of a container the binding can
trigger; to localize complexity, they do not overlap
with the command line arguments, which center around
_TITLEBAR being set by default.
The keyboard handling code is adjusted for this change,
as is binding_key_compare; note that BINDING_LOCKED
is *not* part of the key portion of the binding.
Next, list of mouse bindings is introduced and cleaned up.
Finally, the binding command parsing code is extended
to handle the case where bindsym is used to describe
a mouse binding rather than a keysym binding; the
difference between the two may be detected as late as
when the first key/button is parsed, or as early as
the first flag. As bindings can have multiple
keycodes/keysyms/buttons, mixed keysym/button sequences
are prohibited.
6 years ago
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A key binding and an associated command.
|
|
|
|
*/
|
|
|
|
struct sway_binding {
|
Parse mouse binding options
First, the existing sway_binding structure is given an
enumerated type code. As all flags to bindsym/bindcode
are boolean, a single uint32 is used to hold all flags.
The _BORDER, _CONTENTS, _TITLEBAR flags, when active,
indicate in which part of a container the binding can
trigger; to localize complexity, they do not overlap
with the command line arguments, which center around
_TITLEBAR being set by default.
The keyboard handling code is adjusted for this change,
as is binding_key_compare; note that BINDING_LOCKED
is *not* part of the key portion of the binding.
Next, list of mouse bindings is introduced and cleaned up.
Finally, the binding command parsing code is extended
to handle the case where bindsym is used to describe
a mouse binding rather than a keysym binding; the
difference between the two may be detected as late as
when the first key/button is parsed, or as early as
the first flag. As bindings can have multiple
keycodes/keysyms/buttons, mixed keysym/button sequences
are prohibited.
6 years ago
|
|
|
enum binding_input_type type;
|
|
|
|
int order;
|
Parse mouse binding options
First, the existing sway_binding structure is given an
enumerated type code. As all flags to bindsym/bindcode
are boolean, a single uint32 is used to hold all flags.
The _BORDER, _CONTENTS, _TITLEBAR flags, when active,
indicate in which part of a container the binding can
trigger; to localize complexity, they do not overlap
with the command line arguments, which center around
_TITLEBAR being set by default.
The keyboard handling code is adjusted for this change,
as is binding_key_compare; note that BINDING_LOCKED
is *not* part of the key portion of the binding.
Next, list of mouse bindings is introduced and cleaned up.
Finally, the binding command parsing code is extended
to handle the case where bindsym is used to describe
a mouse binding rather than a keysym binding; the
difference between the two may be detected as late as
when the first key/button is parsed, or as early as
the first flag. As bindings can have multiple
keycodes/keysyms/buttons, mixed keysym/button sequences
are prohibited.
6 years ago
|
|
|
uint32_t flags;
|
|
|
|
list_t *keys; // sorted in ascending order
|
|
|
|
uint32_t modifiers;
|
|
|
|
char *command;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A mouse binding and an associated command.
|
|
|
|
*/
|
|
|
|
struct sway_mouse_binding {
|
|
|
|
uint32_t button;
|
|
|
|
char *command;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Focus on window activation.
|
|
|
|
*/
|
|
|
|
enum sway_fowa {
|
|
|
|
FOWA_SMART,
|
|
|
|
FOWA_URGENT,
|
|
|
|
FOWA_FOCUS,
|
|
|
|
FOWA_NONE,
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A "mode" of keybindings created via the `mode` command.
|
|
|
|
*/
|
|
|
|
struct sway_mode {
|
|
|
|
char *name;
|
|
|
|
list_t *keysym_bindings;
|
|
|
|
list_t *keycode_bindings;
|
Parse mouse binding options
First, the existing sway_binding structure is given an
enumerated type code. As all flags to bindsym/bindcode
are boolean, a single uint32 is used to hold all flags.
The _BORDER, _CONTENTS, _TITLEBAR flags, when active,
indicate in which part of a container the binding can
trigger; to localize complexity, they do not overlap
with the command line arguments, which center around
_TITLEBAR being set by default.
The keyboard handling code is adjusted for this change,
as is binding_key_compare; note that BINDING_LOCKED
is *not* part of the key portion of the binding.
Next, list of mouse bindings is introduced and cleaned up.
Finally, the binding command parsing code is extended
to handle the case where bindsym is used to describe
a mouse binding rather than a keysym binding; the
difference between the two may be detected as late as
when the first key/button is parsed, or as early as
the first flag. As bindings can have multiple
keycodes/keysyms/buttons, mixed keysym/button sequences
are prohibited.
6 years ago
|
|
|
list_t *mouse_bindings;
|
|
|
|
bool pango;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct input_config_mapped_from_region {
|
|
|
|
double x1, y1;
|
|
|
|
double x2, y2;
|
|
|
|
bool mm;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* options for input devices
|
|
|
|
*/
|
|
|
|
struct input_config {
|
|
|
|
char *identifier;
|
|
|
|
|
|
|
|
int accel_profile;
|
|
|
|
int click_method;
|
|
|
|
int drag;
|
|
|
|
int drag_lock;
|
|
|
|
int dwt;
|
|
|
|
int left_handed;
|
|
|
|
int middle_emulation;
|
|
|
|
int natural_scroll;
|
|
|
|
float pointer_accel;
|
|
|
|
int repeat_delay;
|
|
|
|
int repeat_rate;
|
|
|
|
int scroll_button;
|
|
|
|
int scroll_method;
|
|
|
|
int send_events;
|
|
|
|
int tap;
|
|
|
|
int tap_button_map;
|
|
|
|
|
|
|
|
char *xkb_layout;
|
|
|
|
char *xkb_model;
|
|
|
|
char *xkb_options;
|
|
|
|
char *xkb_rules;
|
|
|
|
char *xkb_variant;
|
|
|
|
|
|
|
|
int xkb_numlock;
|
|
|
|
int xkb_capslock;
|
|
|
|
|
|
|
|
struct input_config_mapped_from_region *mapped_from_region;
|
|
|
|
char *mapped_to_output;
|
|
|
|
|
|
|
|
bool capturable;
|
|
|
|
struct wlr_box region;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Options for misc device configurations that happen in the seat block
|
|
|
|
*/
|
|
|
|
struct seat_attachment_config {
|
|
|
|
char *identifier;
|
|
|
|
// TODO other things are configured here for some reason
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Options for multiseat and other misc device configurations
|
|
|
|
*/
|
|
|
|
struct seat_config {
|
|
|
|
char *name;
|
|
|
|
int fallback; // -1 means not set
|
|
|
|
list_t *attachments; // list of seat_attachment configs
|
|
|
|
};
|
|
|
|
|
|
|
|
enum config_dpms {
|
|
|
|
DPMS_IGNORE,
|
|
|
|
DPMS_ON,
|
|
|
|
DPMS_OFF
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Size and position configuration for a particular output.
|
|
|
|
*
|
|
|
|
* This is set via the `output` command.
|
|
|
|
*/
|
|
|
|
struct output_config {
|
|
|
|
char *name;
|
|
|
|
int enabled;
|
|
|
|
int width, height;
|
|
|
|
float refresh_rate;
|
|
|
|
int x, y;
|
|
|
|
float scale;
|
|
|
|
int32_t transform;
|
|
|
|
|
|
|
|
char *background;
|
|
|
|
char *background_option;
|
|
|
|
char *background_fallback;
|
|
|
|
enum config_dpms dpms_state;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Stores configuration for a workspace, regardless of whether the workspace
|
|
|
|
* exists.
|
|
|
|
*/
|
|
|
|
struct workspace_config {
|
|
|
|
char *workspace;
|
|
|
|
char *output;
|
|
|
|
int gaps_inner;
|
|
|
|
int gaps_outer;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct bar_config {
|
|
|
|
/**
|
|
|
|
* One of "dock", "hide", "invisible"
|
|
|
|
*
|
|
|
|
* Always visible in dock mode. Visible only when modifier key is held in hide mode.
|
|
|
|
* Never visible in invisible mode.
|
|
|
|
*/
|
|
|
|
char *mode;
|
|
|
|
/**
|
|
|
|
* One of "show" or "hide".
|
|
|
|
*
|
|
|
|
* In "show" mode, it will always be shown on top of the active workspace.
|
|
|
|
*/
|
|
|
|
char *hidden_state;
|
|
|
|
/**
|
|
|
|
* Id name used to identify the bar through IPC.
|
|
|
|
*
|
|
|
|
* Defaults to bar-x, where x corresponds to the position of the
|
|
|
|
* embedding bar block in the config file (bar-0, bar-1, ...).
|
|
|
|
*/
|
|
|
|
char *id;
|
|
|
|
uint32_t modifier;
|
|
|
|
list_t *outputs;
|
|
|
|
char *position;
|
|
|
|
list_t *bindings;
|
|
|
|
char *status_command;
|
|
|
|
bool pango_markup;
|
|
|
|
char *swaybar_command;
|
|
|
|
char *font;
|
|
|
|
int height; // -1 not defined
|
|
|
|
bool workspace_buttons;
|
|
|
|
bool wrap_scroll;
|
|
|
|
char *separator_symbol;
|
|
|
|
bool strip_workspace_numbers;
|
|
|
|
bool binding_mode_indicator;
|
|
|
|
bool verbose;
|
|
|
|
pid_t pid;
|
|
|
|
struct {
|
|
|
|
char *background;
|
|
|
|
char *statusline;
|
|
|
|
char *separator;
|
|
|
|
char *focused_background;
|
|
|
|
char *focused_statusline;
|
|
|
|
char *focused_separator;
|
|
|
|
char *focused_workspace_border;
|
|
|
|
char *focused_workspace_bg;
|
|
|
|
char *focused_workspace_text;
|
|
|
|
char *active_workspace_border;
|
|
|
|
char *active_workspace_bg;
|
|
|
|
char *active_workspace_text;
|
|
|
|
char *inactive_workspace_border;
|
|
|
|
char *inactive_workspace_bg;
|
|
|
|
char *inactive_workspace_text;
|
|
|
|
char *urgent_workspace_border;
|
|
|
|
char *urgent_workspace_bg;
|
|
|
|
char *urgent_workspace_text;
|
|
|
|
char *binding_mode_border;
|
|
|
|
char *binding_mode_bg;
|
|
|
|
char *binding_mode_text;
|
|
|
|
} colors;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct border_colors {
|
|
|
|
float border[4];
|
|
|
|
float background[4];
|
|
|
|
float text[4];
|
|
|
|
float indicator[4];
|
|
|
|
float child_border[4];
|
|
|
|
};
|
|
|
|
|
|
|
|
enum edge_border_types {
|
|
|
|
E_NONE, /**< Don't hide edge borders */
|
|
|
|
E_VERTICAL, /**< hide vertical edge borders */
|
|
|
|
E_HORIZONTAL, /**< hide horizontal edge borders */
|
|
|
|
E_BOTH, /**< hide vertical and horizontal edge borders */
|
|
|
|
E_SMART /**< hide both if precisely one window is present in workspace */
|
|
|
|
};
|
|
|
|
|
|
|
|
enum command_context {
|
|
|
|
CONTEXT_CONFIG = 1,
|
|
|
|
CONTEXT_BINDING = 2,
|
|
|
|
CONTEXT_IPC = 4,
|
|
|
|
CONTEXT_CRITERIA = 8,
|
|
|
|
CONTEXT_ALL = 0xFFFFFFFF,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct command_policy {
|
|
|
|
char *command;
|
|
|
|
uint32_t context;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum secure_feature {
|
|
|
|
FEATURE_LOCK = 1,
|
|
|
|
FEATURE_PANEL = 2,
|
|
|
|
FEATURE_BACKGROUND = 4,
|
|
|
|
FEATURE_SCREENSHOT = 8,
|
|
|
|
FEATURE_FULLSCREEN = 16,
|
|
|
|
FEATURE_KEYBOARD = 32,
|
|
|
|
FEATURE_MOUSE = 64,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct feature_policy {
|
|
|
|
char *program;
|
|
|
|
uint32_t features;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum ipc_feature {
|
|
|
|
IPC_FEATURE_COMMAND = 1,
|
|
|
|
IPC_FEATURE_GET_WORKSPACES = 2,
|
|
|
|
IPC_FEATURE_GET_OUTPUTS = 4,
|
|
|
|
IPC_FEATURE_GET_TREE = 8,
|
|
|
|
IPC_FEATURE_GET_MARKS = 16,
|
|
|
|
IPC_FEATURE_GET_BAR_CONFIG = 32,
|
|
|
|
IPC_FEATURE_GET_VERSION = 64,
|
|
|
|
IPC_FEATURE_GET_INPUTS = 128,
|
|
|
|
IPC_FEATURE_EVENT_WORKSPACE = 256,
|
|
|
|
IPC_FEATURE_EVENT_OUTPUT = 512,
|
|
|
|
IPC_FEATURE_EVENT_MODE = 1024,
|
|
|
|
IPC_FEATURE_EVENT_WINDOW = 2048,
|
|
|
|
IPC_FEATURE_EVENT_BINDING = 4096,
|
|
|
|
IPC_FEATURE_EVENT_INPUT = 8192,
|
|
|
|
IPC_FEATURE_GET_SEATS = 16384,
|
|
|
|
|
|
|
|
IPC_FEATURE_ALL_COMMANDS =
|
|
|
|
1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 | 16384,
|
|
|
|
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;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum focus_wrapping_mode {
|
|
|
|
WRAP_NO,
|
|
|
|
WRAP_YES,
|
|
|
|
WRAP_FORCE
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The configuration struct. The result of loading a config file.
|
|
|
|
*/
|
|
|
|
struct sway_config {
|
|
|
|
char *swaynag_command;
|
|
|
|
struct swaynag_instance swaynag_config_errors;
|
|
|
|
list_t *symbols;
|
|
|
|
list_t *modes;
|
|
|
|
list_t *bars;
|
|
|
|
list_t *cmd_queue;
|
|
|
|
list_t *workspace_configs;
|
|
|
|
list_t *output_configs;
|
|
|
|
list_t *input_configs;
|
|
|
|
list_t *seat_configs;
|
|
|
|
list_t *criteria;
|
|
|
|
list_t *no_focus;
|
|
|
|
list_t *active_bar_modifiers;
|
|
|
|
struct sway_mode *current_mode;
|
|
|
|
struct bar_config *current_bar;
|
|
|
|
char *swaybg_command;
|
|
|
|
uint32_t floating_mod;
|
|
|
|
bool floating_mod_inverse;
|
|
|
|
uint32_t dragging_key;
|
|
|
|
uint32_t resizing_key;
|
|
|
|
char *floating_scroll_up_cmd;
|
|
|
|
char *floating_scroll_down_cmd;
|
|
|
|
char *floating_scroll_left_cmd;
|
|
|
|
char *floating_scroll_right_cmd;
|
|
|
|
enum sway_container_layout default_orientation;
|
|
|
|
enum sway_container_layout default_layout;
|
|
|
|
char *font;
|
|
|
|
size_t font_height;
|
|
|
|
size_t font_baseline;
|
|
|
|
bool pango_markup;
|
|
|
|
size_t urgent_timeout;
|
|
|
|
enum sway_fowa focus_on_window_activation;
|
|
|
|
|
|
|
|
// Flags
|
|
|
|
bool focus_follows_mouse;
|
|
|
|
bool mouse_warping;
|
|
|
|
enum focus_wrapping_mode focus_wrapping;
|
|
|
|
bool active;
|
|
|
|
bool failed;
|
|
|
|
bool reloading;
|
|
|
|
bool reading;
|
|
|
|
bool validating;
|
|
|
|
bool auto_back_and_forth;
|
|
|
|
bool show_marks;
|
|
|
|
bool tiling_drag;
|
|
|
|
|
|
|
|
bool edge_gaps;
|
|
|
|
bool smart_gaps;
|
|
|
|
int gaps_inner;
|
|
|
|
int gaps_outer;
|
|
|
|
|
|
|
|
list_t *config_chain;
|
|
|
|
const char *current_config_path;
|
|
|
|
const char *current_config;
|
|
|
|
|
|
|
|
enum sway_container_border border;
|
|
|
|
enum sway_container_border floating_border;
|
|
|
|
int border_thickness;
|
|
|
|
int floating_border_thickness;
|
|
|
|
enum edge_border_types hide_edge_borders;
|
|
|
|
|
|
|
|
// border colors
|
|
|
|
struct {
|
|
|
|
struct border_colors focused;
|
|
|
|
struct border_colors focused_inactive;
|
|
|
|
struct border_colors unfocused;
|
|
|
|
struct border_colors urgent;
|
|
|
|
struct border_colors placeholder;
|
|
|
|
float background[4];
|
|
|
|
} border_colors;
|
|
|
|
|
|
|
|
// floating view
|
|
|
|
int32_t floating_maximum_width;
|
|
|
|
int32_t floating_maximum_height;
|
|
|
|
int32_t floating_minimum_width;
|
|
|
|
int32_t floating_minimum_height;
|
|
|
|
|
|
|
|
// Security
|
|
|
|
list_t *command_policies;
|
|
|
|
list_t *feature_policies;
|
|
|
|
list_t *ipc_policies;
|
|
|
|
|
|
|
|
// Context for command handlers
|
|
|
|
struct {
|
|
|
|
struct input_config *input_config;
|
|
|
|
struct output_config *output_config;
|
|
|
|
struct seat_config *seat_config;
|
|
|
|
struct sway_seat *seat;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
struct sway_node *node;
|
|
|
|
struct sway_container *container;
|
|
|
|
struct sway_workspace *workspace;
|
|
|
|
bool using_criteria;
|
|
|
|
struct {
|
|
|
|
int argc;
|
|
|
|
char **argv;
|
|
|
|
} leftovers;
|
|
|
|
} handler_context;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Loads the main config from the given path. is_active should be true when
|
|
|
|
* reloading the config.
|
|
|
|
*/
|
|
|
|
bool load_main_config(const char *path, bool is_active, bool validating);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Loads an included config. Can only be used after load_main_config.
|
|
|
|
*/
|
|
|
|
bool load_include_configs(const char *path, struct sway_config *config,
|
|
|
|
struct swaynag_instance *swaynag);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Reads the config from the given FILE.
|
|
|
|
*/
|
|
|
|
bool read_config(FILE *file, struct sway_config *config,
|
|
|
|
struct swaynag_instance *swaynag);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Free config struct
|
|
|
|
*/
|
|
|
|
void free_config(struct sway_config *config);
|
|
|
|
|
|
|
|
void free_sway_variable(struct sway_variable *var);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Does variable replacement for a string based on the config's currently loaded variables.
|
|
|
|
*/
|
|
|
|
char *do_var_replacement(char *str);
|
|
|
|
|
|
|
|
int input_identifier_cmp(const void *item, const void *data);
|
|
|
|
|
|
|
|
struct input_config *new_input_config(const char* identifier);
|
|
|
|
|
|
|
|
void merge_input_config(struct input_config *dst, struct input_config *src);
|
|
|
|
|
|
|
|
struct input_config *store_input_config(struct input_config *ic);
|
|
|
|
|
|
|
|
void free_input_config(struct input_config *ic);
|
|
|
|
|
|
|
|
int seat_name_cmp(const void *item, const void *data);
|
|
|
|
|
|
|
|
struct seat_config *new_seat_config(const char* name);
|
|
|
|
|
|
|
|
void merge_seat_config(struct seat_config *dst, struct seat_config *src);
|
|
|
|
|
|
|
|
struct seat_config *copy_seat_config(struct seat_config *seat);
|
|
|
|
|
|
|
|
void free_seat_config(struct seat_config *ic);
|
|
|
|
|
|
|
|
struct seat_attachment_config *seat_attachment_config_new(void);
|
|
|
|
|
|
|
|
struct seat_attachment_config *seat_config_get_attachment(
|
|
|
|
struct seat_config *seat_config, char *identifier);
|
|
|
|
|
|
|
|
void apply_seat_config(struct seat_config *seat);
|
|
|
|
|
|
|
|
int output_name_cmp(const void *item, const void *data);
|
|
|
|
|
|
|
|
void output_get_identifier(char *identifier, size_t len,
|
|
|
|
struct sway_output *output);
|
|
|
|
|
|
|
|
struct output_config *new_output_config(const char *name);
|
|
|
|
|
|
|
|
void merge_output_config(struct output_config *dst, struct output_config *src);
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
void apply_output_config(struct output_config *oc, struct sway_output *output);
|
|
|
|
|
|
|
|
struct output_config *store_output_config(struct output_config *oc);
|
|
|
|
|
|
|
|
void apply_output_config_to_outputs(struct output_config *oc);
|
|
|
|
|
|
|
|
void free_output_config(struct output_config *oc);
|
|
|
|
|
|
|
|
void create_default_output_configs(void);
|
|
|
|
|
|
|
|
int workspace_output_cmp_workspace(const void *a, const void *b);
|
|
|
|
|
|
|
|
int sway_binding_cmp(const void *a, const void *b);
|
|
|
|
|
|
|
|
int sway_binding_cmp_qsort(const void *a, const void *b);
|
|
|
|
|
|
|
|
int sway_binding_cmp_keys(const void *a, const void *b);
|
|
|
|
|
|
|
|
void free_sway_binding(struct sway_binding *sb);
|
|
|
|
|
|
|
|
void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding);
|
|
|
|
|
|
|
|
void load_swaybars(void);
|
|
|
|
|
|
|
|
void terminate_swaybg(pid_t pid);
|
|
|
|
|
|
|
|
struct bar_config *default_bar_config(void);
|
|
|
|
|
|
|
|
void free_bar_config(struct bar_config *bar);
|
|
|
|
|
|
|
|
void free_workspace_config(struct workspace_config *wsc);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Updates the value of config->font_height based on the max title height
|
|
|
|
* reported by each container. If recalculate is true, the containers will
|
|
|
|
* recalculate their heights before reporting.
|
|
|
|
*
|
|
|
|
* If the height has changed, all containers will be rearranged to take on the
|
|
|
|
* new size.
|
|
|
|
*/
|
|
|
|
void config_update_font_height(bool recalculate);
|
|
|
|
|
|
|
|
/* Global config singleton. */
|
|
|
|
extern struct sway_config *config;
|
|
|
|
|
|
|
|
#endif
|