diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-11-11 11:58:43 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-11-11 11:58:43 -0500 |
| commit | 7eafcc75f6f8abd2346e0d72b063bc10ce24378f (patch) | |
| tree | ce8a4cebdf5bc484643ec78f3cf59e0943ce50e8 /sway/config.c | |
| parent | 0ba6554c4f6c923274062862d895240eea4de350 (diff) | |
Initialize outputs from backend and add to tree
Diffstat (limited to 'sway/config.c')
| -rw-r--r-- | sway/config.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sway/config.c b/sway/config.c index a33b8edc..78ab8f3b 100644 --- a/sway/config.c +++ b/sway/config.c @@ -15,6 +15,7 @@ #include <float.h> #include <dirent.h> #include <strings.h> +#include <wlr/types/wlr_output.h> #include "wayland-desktop-shell-server-protocol.h" #include "sway/commands.h" #include "sway/config.h" @@ -930,6 +931,7 @@ void merge_output_config(struct output_config *dst, struct output_config *src) { } static void invoke_swaybar(struct bar_config *bar) { + return; // TODO WLR // Pipe to communicate errors int filedes[2]; if (pipe(filedes) == -1) { @@ -1128,13 +1130,15 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { output->height = oc->height; sway_log(L_DEBUG, "Set %s size to %ix%i (%d)", oc->name, oc->width, oc->height, oc->scale); - struct wlc_size new_size = { .w = oc->width, .h = oc->height }; - wlc_output_set_resolution(output->handle, &new_size, (uint32_t)oc->scale); + // TODO WLR: modes + //struct wlc_size new_size = { .w = oc->width, .h = oc->height }; + //wlc_output_set_resolution(output->handle, &new_size, (uint32_t)oc->scale); } else if (oc) { - const struct wlc_size *new_size = wlc_output_get_resolution(output->handle); - wlc_output_set_resolution(output->handle, new_size, (uint32_t)oc->scale); + //const struct wlc_size *new_size = wlc_output_get_resolution(output->handle); + //wlc_output_set_resolution(output->handle, new_size, (uint32_t)oc->scale); } + // TODO WLR: wlr_output_layout // Find position for it if (oc && oc->x != -1 && oc->y != -1) { sway_log(L_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y); @@ -1170,6 +1174,7 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { } } + /* TODO WLR if (oc && oc->background) { if (output->bg_pid != 0) { terminate_swaybg(output->bg_pid); @@ -1195,6 +1200,7 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { execvp(cmd[0], cmd); } } + */ } char *do_var_replacement(char *str) { |