mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-09-30 06:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new_output_config, update root container size on output hotplug

Browse source
This commit is contained in:
emersion 2017-12-06 19:45:43 +01:00
parent 41dd291612
commit 8764dc26c6
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/config.h
View file

@ -364,10 +364,8 @@ void apply_input_config(struct input_config *ic, struct libinput_device *dev);
void free_input_config(struct input_config *ic); void free_input_config(struct input_config *ic);
int output_name_cmp(const void *item, const void *data); int output_name_cmp(const void *item, const void *data);
void output_config_defaults(struct output_config *oc); struct output_config *new_output_config();
void merge_output_config(struct output_config *dst, struct output_config *src); void merge_output_config(struct output_config *dst, struct output_config *src);
/** Sets up a WLC output handle based on a given output_config.
*/
void apply_output_config(struct output_config *oc, swayc_t *output); void apply_output_config(struct output_config *oc, swayc_t *output);
void free_output_config(struct output_config *oc); void free_output_config(struct output_config *oc);

3
sway/commands/output.c
View file

@ -27,11 +27,10 @@ struct cmd_results *cmd_output(int argc, char **argv) {
} }
const char *name = argv[0]; const char *name = argv[0];
struct output_config *output = calloc(1, sizeof(struct output_config)); struct output_config *output = new_output_config();
if (!output) { if (!output) {
return cmd_results_new(CMD_FAILURE, "output", "Unable to allocate output config"); return cmd_results_new(CMD_FAILURE, "output", "Unable to allocate output config");
} }
output_config_defaults(output);
output->name = strdup(name); output->name = strdup(name);
// TODO: atoi doesn't handle invalid numbers // TODO: atoi doesn't handle invalid numbers

7
sway/config/output.c
View file

@ -14,13 +14,18 @@ int output_name_cmp(const void *item, const void *data) {
return strcmp(output->name, name); return strcmp(output->name, name);
} }
void output_config_defaults(struct output_config *oc) { struct output_config *new_output_config() {
struct output_config *oc = calloc(1, sizeof(struct output_config));
if (oc == NULL) {
return NULL;
}
oc->enabled = -1; oc->enabled = -1;
oc->width = oc->height -1; oc->width = oc->height -1;
oc->refresh_rate = -1; oc->refresh_rate = -1;
oc->x = oc->y = -1; oc->x = oc->y = -1;
oc->scale = -1; oc->scale = -1;
oc->transform = -1; oc->transform = -1;
return oc;
} }
void merge_output_config(struct output_config *dst, struct output_config *src) { void merge_output_config(struct output_config *dst, struct output_config *src) {

1
sway/tree/container.c
View file

@ -93,6 +93,7 @@ swayc_t *new_output(struct sway_output *sway_output) {
sway_log(L_DEBUG, "Creating default workspace %s", ws_name); sway_log(L_DEBUG, "Creating default workspace %s", ws_name);
new_workspace(output, ws_name); new_workspace(output, ws_name);
free(ws_name); free(ws_name);
update_root_geometry();
return output; return output;
} }