mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-01 22:58:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Refactor tree"

Browse source
This commit is contained in:
Drew DeVault 2018-03-29 23:29:29 -04:00 • committed by GitHub
parent 6b7841b11f
commit d0c7f66e95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 588 additions and 593 deletions
Download patch file Download diff file Expand all files Collapse all files

17
include/sway/config.h
View file

@ -10,8 +10,8 @@
#include <xkbcommon/xkbcommon.h>
#include <time.h>
#include "list.h"
#include "tree/layout.h"
#include "tree/container.h"
#include "layout.h"
#include "container.h"
/**
* Describes a variable created via the `set` command.
@ -299,8 +299,8 @@ struct sway_config {
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;
enum swayc_layouts default_orientation;
enum swayc_layouts default_layout;
char *font;
int font_height;
@ -324,8 +324,8 @@ struct sway_config {
list_t *config_chain;
const char *current_config;
enum sway_container_border border;
enum sway_container_border floating_border;
enum swayc_border_types border;
enum swayc_border_types floating_border;
int border_thickness;
int floating_border_thickness;
enum edge_border_types hide_edge_borders;
@ -356,7 +356,7 @@ struct sway_config {
struct input_config *input_config;
struct seat_config *seat_config;
struct sway_seat *seat;
struct sway_container *current_container;
swayc_t *current_container;
} handler_context;
};
@ -416,8 +416,7 @@ 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);
void apply_output_config(struct output_config *oc,
struct sway_container *output);
void apply_output_config(struct output_config *oc, swayc_t *output);
void free_output_config(struct output_config *oc);
/**