itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mouse-bindings

Browse Source
master
Ryan Dwyer 6 years ago committed by GitHub
parent 94dd8823a0 6ccf2a2c66
commit e02a6718c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 146 additions and 161 deletions
Show Stats Download Patch File Download Diff File

16
common/util.c
Unescape View File

@ -123,6 +123,22 @@ uint32_t parse_color(const char *color) {
return res;
}
bool parse_boolean(const char *boolean, bool current) {
if (strcasecmp(boolean, "1") == 0
|| strcasecmp(boolean, "yes") == 0
|| strcasecmp(boolean, "on") == 0
|| strcasecmp(boolean, "true") == 0
|| strcasecmp(boolean, "enable") == 0
|| strcasecmp(boolean, "enabled") == 0
|| strcasecmp(boolean, "active") == 0) {
return true;
} else if (strcasecmp(boolean, "toggle") == 0) {
return !current;
}
// All other values are false to match i3
return false;
}
char* resolve_path(const char* path) {
struct stat sb;
ssize_t r;

8
include/util.h
Unescape View File

@ -50,6 +50,14 @@ pid_t get_parent_pid(pid_t pid);
*/
uint32_t parse_color(const char *color);
/**
* Given a string that represents a boolean, return the boolean value. This
* function also takes in the current boolean value to support toggling. If
* toggling is not desired, pass in true for current so that toggling values
* get parsed as not true.
*/
bool parse_boolean(const char *boolean, bool current);
/**
* Given a path string, recurseively resolves any symlinks to their targets
* (which may be a file, directory) and returns the result.

4
sway/commands/focus_follows_mouse.c
Unescape View File

@ -1,12 +1,14 @@
#include <string.h>
#include <strings.h>
#include "sway/commands.h"
#include "util.h"
struct cmd_results *cmd_focus_follows_mouse(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "focus_follows_mouse", EXPECTED_EQUAL_TO, 1))) {
return error;
}
config->focus_follows_mouse = !strcasecmp(argv[0], "yes");
config->focus_follows_mouse =
parse_boolean(argv[0], config->focus_follows_mouse);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

12
sway/commands/focus_wrapping.c
Unescape View File

@ -1,6 +1,7 @@
#include <strings.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "util.h"
struct cmd_results *cmd_focus_wrapping(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -8,15 +9,12 @@ struct cmd_results *cmd_focus_wrapping(int argc, char **argv) {
return error;
}
if (strcasecmp(argv[0], "no") == 0) {
config->focus_wrapping = WRAP_NO;
} else if (strcasecmp(argv[0], "yes") == 0) {
config->focus_wrapping = WRAP_YES;
} else if (strcasecmp(argv[0], "force") == 0) {
if (strcasecmp(argv[0], "force") == 0) {
config->focus_wrapping = WRAP_FORCE;
} else if (parse_boolean(argv[0], config->focus_wrapping == WRAP_YES)) {
config->focus_wrapping = WRAP_YES;
} else {
return cmd_results_new(CMD_INVALID, "focus_wrapping",
"Expected 'focus_wrapping yes|no|force'");
config->focus_wrapping = WRAP_NO;
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

8
sway/commands/force_focus_wrapping.c
Unescape View File

@ -1,6 +1,7 @@
#include <strings.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "util.h"
struct cmd_results *cmd_force_focus_wrapping(int argc, char **argv) {
struct cmd_results *error =
@ -9,13 +10,10 @@ struct cmd_results *cmd_force_focus_wrapping(int argc, char **argv) {
return error;
}
if (strcasecmp(argv[0], "no") == 0) {
config->focus_wrapping = WRAP_YES;
} else if (strcasecmp(argv[0], "yes") == 0) {
if (parse_boolean(argv[0], config->focus_wrapping == WRAP_FORCE)) {
config->focus_wrapping = WRAP_FORCE;
} else {
return cmd_results_new(CMD_INVALID, "force_focus_wrapping",
"Expected 'force_focus_wrapping yes|no'");
config->focus_wrapping = WRAP_YES;
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

14
sway/commands/fullscreen.c
Unescape View File

@ -5,6 +5,7 @@
#include "sway/tree/container.h"
#include "sway/tree/view.h"
#include "sway/tree/layout.h"
#include "util.h"
struct cmd_results *cmd_fullscreen(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -18,17 +19,10 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
"Only views can fullscreen");
}
struct sway_view *view = container->sway_view;
bool wants_fullscreen;
bool wants_fullscreen = !view->is_fullscreen;
if (argc == 0 || strcmp(argv[0], "toggle") == 0) {
wants_fullscreen = !view->is_fullscreen;
} else if (strcmp(argv[0], "enable") == 0) {
wants_fullscreen = true;
} else if (strcmp(argv[0], "disable") == 0) {
wants_fullscreen = false;
} else {
return cmd_results_new(CMD_INVALID, "fullscreen",
"Expected 'fullscreen' or 'fullscreen <enable|disable|toggle>'");
if (argc) {
wants_fullscreen = parse_boolean(argv[0], view->is_fullscreen);
}
view_set_fullscreen(view, wants_fullscreen);

9
sway/commands/input/drag_lock.c
Unescape View File

@ -3,6 +3,7 @@
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "util.h"
struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -18,14 +19,10 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
struct input_config *new_config =
new_input_config(current_input_config->identifier);
if (strcasecmp(argv[0], "enabled") == 0) {
if (parse_boolean(argv[0], true)) {
new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_ENABLED;
} else if (strcasecmp(argv[0], "disabled") == 0) {
new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED;
} else {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "drag_lock",
"Expected 'drag_lock <enabled|disabled>'");
new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED;
}
apply_input_config(new_config);

9
sway/commands/input/dwt.c
Unescape View File

@ -3,6 +3,7 @@
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "util.h"
struct cmd_results *input_cmd_dwt(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -17,14 +18,10 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) {
struct input_config *new_config =
new_input_config(current_input_config->identifier);
if (strcasecmp(argv[0], "enabled") == 0) {
if (parse_boolean(argv[0], true)) {
new_config->dwt = LIBINPUT_CONFIG_DWT_ENABLED;
} else if (strcasecmp(argv[0], "disabled") == 0) {
new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED;
} else {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "dwt",
"Expected 'dwt <enabled|disabled>'");
new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED;
}
apply_input_config(new_config);

11
sway/commands/input/left_handed.c
Unescape View File

@ -3,6 +3,7 @@
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "util.h"
struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -18,15 +19,7 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
struct input_config *new_config =
new_input_config(current_input_config->identifier);
if (strcasecmp(argv[0], "enabled") == 0) {
new_config->left_handed = 1;
} else if (strcasecmp(argv[0], "disabled") == 0) {
new_config->left_handed = 0;
} else {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "left_handed",
"Expected 'left_handed <enabled|disabled>'");
}
new_config->left_handed = parse_boolean(argv[0], true);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

9
sway/commands/input/middle_emulation.c
Unescape View File

@ -3,6 +3,7 @@
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "util.h"
struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -18,15 +19,11 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
struct input_config *new_config =
new_input_config(current_input_config->identifier);
if (strcasecmp(argv[0], "enabled") == 0) {
if (parse_boolean(argv[0], true)) {
new_config->middle_emulation = LIBINPUT_CONFIG_MIDDLE_EMULATION_ENABLED;
} else if (strcasecmp(argv[0], "disabled") == 0) {
} else {
new_config->middle_emulation =
LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED;
} else {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "middle_emulation",
"Expected 'middle_emulation <enabled|disabled>'");
}
apply_input_config(new_config);

11
sway/commands/input/natural_scroll.c
Unescape View File

@ -3,6 +3,7 @@
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "util.h"
struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -18,15 +19,7 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
struct input_config *new_config =
new_input_config(current_input_config->identifier);
if (strcasecmp(argv[0], "enabled") == 0) {
new_config->natural_scroll = 1;
} else if (strcasecmp(argv[0], "disabled") == 0) {
new_config->natural_scroll = 0;
} else {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "natural_scroll",
"Expected 'natural_scroll <enabled|disabled>'");
}
new_config->natural_scroll = parse_boolean(argv[0], true);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

9
sway/commands/input/tap.c
Unescape View File

@ -4,6 +4,7 @@
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "log.h"
#include "util.h"
struct cmd_results *input_cmd_tap(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -18,14 +19,10 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) {
struct input_config *new_config =
new_input_config(current_input_config->identifier);
if (strcasecmp(argv[0], "enabled") == 0) {
if (parse_boolean(argv[0], true)) {
new_config->tap = LIBINPUT_CONFIG_TAP_ENABLED;
} else if (strcasecmp(argv[0], "disabled") == 0) {
new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED;
} else {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "tap",
"Expected 'tap <enabled|disabled>'");
new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED;
}
wlr_log(WLR_DEBUG, "apply-tap for device: %s",

8
sway/commands/output/dpms.c
Unescape View File

@ -1,5 +1,6 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "util.h"
struct cmd_results *output_cmd_dpms(int argc, char **argv) {
if (!config->handler_context.output_config) {
@ -9,13 +10,10 @@ struct cmd_results *output_cmd_dpms(int argc, char **argv) {
return cmd_results_new(CMD_INVALID, "output", "Missing dpms argument.");
}
if (strcmp(*argv, "on") == 0) {
if (parse_boolean(argv[0], true)) {
config->handler_context.output_config->dpms_state = DPMS_ON;
} else if (strcmp(*argv, "off") == 0) {
config->handler_context.output_config->dpms_state = DPMS_OFF;
} else {
return cmd_results_new(CMD_INVALID, "output",
"Invalid dpms state, valid states are on/off.");
config->handler_context.output_config->dpms_state = DPMS_OFF;
}
config->handler_context.leftovers.argc = argc - 1;

10
sway/commands/show_marks.c
Unescape View File

@ -7,6 +7,7 @@
#include "list.h"
#include "log.h"
#include "stringop.h"
#include "util.h"
static void rebuild_marks_iterator(struct sway_container *con, void *data) {
if (con->type == C_VIEW) {
@ -20,14 +21,7 @@ struct cmd_results *cmd_show_marks(int argc, char **argv) {
return error;
}
if (strcmp(*argv, "yes") == 0) {
config->show_marks = true;
} else if (strcmp(*argv, "no") == 0) {
config->show_marks = false;
} else {
return cmd_results_new(CMD_INVALID, "show_marks",
"Expected 'show_marks <yes|no>'");
}
config->show_marks = parse_boolean(argv[0], config->show_marks);
if (config->show_marks) {
container_for_each_descendant_dfs(&root_container,

10
sway/commands/urgent.c
Unescape View File

@ -5,6 +5,7 @@
#include "sway/tree/container.h"
#include "sway/tree/view.h"
#include "sway/tree/layout.h"
#include "util.h"
struct cmd_results *cmd_urgent(int argc, char **argv) {
struct cmd_results *error = NULL;
@ -19,17 +20,12 @@ struct cmd_results *cmd_urgent(int argc, char **argv) {
}
struct sway_view *view = container->sway_view;
if (strcmp(argv[0], "enable") == 0) {
view_set_urgent(view, true);
} else if (strcmp(argv[0], "disable") == 0) {
view_set_urgent(view, false);
} else if (strcmp(argv[0], "allow") == 0) {
if (strcmp(argv[0], "allow") == 0) {
view->allow_request_urgent = true;
} else if (strcmp(argv[0], "deny") == 0) {
view->allow_request_urgent = false;
} else {
return cmd_results_new(CMD_INVALID, "urgent",
"Expected 'urgent <enable|disable|allow|deny>'");
view_set_urgent(view, parse_boolean(argv[0], view_is_urgent(view)));
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

51
sway/tree/workspace.c
Unescape View File

@ -107,18 +107,8 @@ static bool workspace_valid_on_output(const char *output_name,
return true;
}
char *workspace_next_name(const char *output_name) {
wlr_log(WLR_DEBUG, "Workspace: Generating new workspace name for output %s",
output_name);
// Scan all workspace bindings to find the next available workspace name,
// if none are found/available then default to a number
struct sway_mode *mode = config->current_mode;
// TODO: iterate over keycode bindings too
int order = INT_MAX;
char *target = NULL;
for (int i = 0; i < mode->keysym_bindings->length; ++i) {
struct sway_binding *binding = mode->keysym_bindings->items[i];
static void workspace_name_from_binding(const struct sway_binding * binding,
const char* output_name, int *min_order, char **earliest_name) {
char *cmdlist = strdup(binding->command);
char *dup = cmdlist;
char *name = NULL;
@ -147,11 +137,10 @@ char *workspace_next_name(const char *output_name) {
strcmp(_target, "prev_on_output") == 0 ||
strcmp(_target, "number") == 0 ||
strcmp(_target, "back_and_forth") == 0 ||
strcmp(_target, "current") == 0)
{
strcmp(_target, "current") == 0) {
free(_target);
free(dup);
continue;
return;
}
// If the command is workspace number <name>, isolate the name
@ -168,7 +157,7 @@ char *workspace_next_name(const char *output_name) {
if (workspace_by_number(_target)) {
free(_target);
free(dup);
continue;
return;
}
}
@ -176,7 +165,7 @@ char *workspace_next_name(const char *output_name) {
if (workspace_by_name(_target)) {
free(_target);
free(dup);
continue;
return;
}
// make sure that the workspace can appear on the given
@ -184,13 +173,13 @@ char *workspace_next_name(const char *output_name) {
if (!workspace_valid_on_output(output_name, _target)) {
free(_target);
free(dup);
continue;
return;
}
if (binding->order < order) {
order = binding->order;
free(target);
target = _target;
if (binding->order < *min_order) {
*min_order = binding->order;
free(*earliest_name);
*earliest_name = _target;
wlr_log(WLR_DEBUG, "Workspace: Found free name %s", _target);
} else {
free(_target);
@ -198,6 +187,24 @@ char *workspace_next_name(const char *output_name) {
}
free(dup);
}
char *workspace_next_name(const char *output_name) {
wlr_log(WLR_DEBUG, "Workspace: Generating new workspace name for output %s",
output_name);
// Scan all workspace bindings to find the next available workspace name,
// if none are found/available then default to a number
struct sway_mode *mode = config->current_mode;
int order = INT_MAX;
char *target = NULL;
for (int i = 0; i < mode->keysym_bindings->length; ++i) {
workspace_name_from_binding(mode->keysym_bindings->items[i],
output_name, &order, &target);
}
for (int i = 0; i < mode->keycode_bindings->length; ++i) {
workspace_name_from_binding(mode->keycode_bindings->items[i],
output_name, &order, &target);
}
if (target != NULL) {
return target;
}

Write Preview
Loading…
Cancel
Save