mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-08 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into usr-lib

Browse source
This commit is contained in:
emersion 2018-05-05 20:03:46 +01:00 • committed by GitHub
commit 786727d8bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 199 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sway/commands/font.c
View file

@ -2,7 +2,6 @@
#include <string.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/tree/arrange.h"
#include "log.h"
#include "stringop.h"
@ -14,9 +13,6 @@ struct cmd_results *cmd_font(int argc, char **argv) {
char *font = join_args(argv, argc);
free(config->font);
config->font = strdup(font);
config_find_font_height(true);
if (!config->reading) {
arrange_root();
}
config_update_font_height(true);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

29
sway/commands/title_format.c Normal file
View file

@ -0,0 +1,29 @@
#define _POSIX_C_SOURCE 200809L
#include <string.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/tree/view.h"
#include "log.h"
#include "stringop.h"
struct cmd_results *cmd_title_format(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "title_format", EXPECTED_AT_LEAST, 1))) {
return error;
}
struct sway_container *container =
config->handler_context.current_container;
if (container->type != C_VIEW) {
return cmd_results_new(CMD_INVALID, "title_format",
"Only views can have a title_format");
}
struct sway_view *view = container->sway_view;
char *format = join_args(argv, argc);
if (view->title_format) {
free(view->title_format);
}
view->title_format = format;
view_update_title(view, true);
config_update_font_height(true);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}