mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-28 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace broken debuglog command with log_level command.

Browse source
This commit is contained in:
Geoff Greer 2019-02-15 13:45:37 -08:00
parent cdbf8e8b25
commit 9f504f07f3
5 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -112,7 +112,6 @@ sway_cmd cmd_client_placeholder;
sway_cmd cmd_client_background; sway_cmd cmd_client_background;
sway_cmd cmd_commands; sway_cmd cmd_commands;
sway_cmd cmd_create_output; sway_cmd cmd_create_output;
sway_cmd cmd_debuglog;
sway_cmd cmd_default_border; sway_cmd cmd_default_border;
sway_cmd cmd_default_floating_border; sway_cmd cmd_default_floating_border;
sway_cmd cmd_default_orientation; sway_cmd cmd_default_orientation;
@ -142,6 +141,7 @@ sway_cmd cmd_ipc;
sway_cmd cmd_kill; sway_cmd cmd_kill;
sway_cmd cmd_layout; sway_cmd cmd_layout;
sway_cmd cmd_log_colors; sway_cmd cmd_log_colors;
sway_cmd cmd_log_level;
sway_cmd cmd_mark; sway_cmd cmd_mark;
sway_cmd cmd_mode; sway_cmd cmd_mode;
sway_cmd cmd_mouse_warping; sway_cmd cmd_mouse_warping;

1
sway/commands.c
View file

@ -74,6 +74,7 @@ static struct cmd_handler handlers[] = {
{ "hide_edge_borders", cmd_hide_edge_borders }, { "hide_edge_borders", cmd_hide_edge_borders },
{ "include", cmd_include }, { "include", cmd_include },
{ "input", cmd_input }, { "input", cmd_input },
{ "log_level", cmd_log_level },
{ "mode", cmd_mode }, { "mode", cmd_mode },
{ "mouse_warping", cmd_mouse_warping }, { "mouse_warping", cmd_mouse_warping },
{ "new_float", cmd_default_floating_border }, { "new_float", cmd_default_floating_border },

27
sway/commands/log_level.c Normal file
View file

@ -0,0 +1,27 @@
#include <stdlib.h>
#include "sway/commands.h"
#include "log.h"
struct cmd_results *cmd_log_level(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "log_level", EXPECTED_EQUAL_TO, 1))) {
return error;
}
sway_log_importance_t verbosity;
if (strcmp(*argv, "debug") == 0) {
verbosity = SWAY_DEBUG;
} else if (strcmp(*argv, "info") == 0) {
verbosity = SWAY_INFO;
} else if (strcmp(*argv, "error") == 0) {
verbosity = SWAY_ERROR;
} else if (strcmp(*argv, "silent") == 0) {
verbosity = SWAY_SILENT;
} else {
return cmd_results_new(CMD_INVALID, "Invalid log_level option.");
}
sway_log_init(verbosity, NULL);
return cmd_results_new(CMD_SUCCESS, NULL);
}

1
sway/meson.build
View file

@ -68,6 +68,7 @@ sway_sources = files(
'commands/include.c', 'commands/include.c',
'commands/input.c', 'commands/input.c',
'commands/layout.c', 'commands/layout.c',
'commands/log_level.c',
'commands/mode.c', 'commands/mode.c',
'commands/mouse_warping.c', 'commands/mouse_warping.c',
'commands/move.c', 'commands/move.c',

7
sway/sway.5.scd
View file

@ -413,10 +413,6 @@ The default colors are:
: #0c0c0c : #0c0c0c
*debuglog* on|off|toggle
Enables, disables or toggles debug logging. _toggle_ cannot be used in the
configuration file.
*default_border* normal|none|pixel [<n>] *default_border* normal|none|pixel [<n>]
Set default border style for new tiled windows. Set default border style for new tiled windows.
@ -506,6 +502,9 @@ The default colors are:
devices. A list of input device names may be obtained via *swaymsg -t devices. A list of input device names may be obtained via *swaymsg -t
get_inputs*. get_inputs*.
*log_level* debug|info|error|silent
Sets the logging verbosity. Default is error.
*seat* <seat> <seat-subcommands...> *seat* <seat> <seat-subcommands...>
For details on seat subcommands, see *sway-input*(5). For details on seat subcommands, see *sway-input*(5).