mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 08:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2352 from RedSoxFan/implement-2335

Browse source 
Implement floating_modifier <mod> [inverse|normal]
This commit is contained in:
emersion 2018-07-25 00:04:38 +01:00 committed by GitHub
parent 817d37c950 3a75bb7f32
commit cdc4ad2b4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/config.h
View file

@ -320,6 +320,7 @@ struct sway_config {
struct bar_config *current_bar; struct bar_config *current_bar;
char *swaybg_command; char *swaybg_command;
uint32_t floating_mod; uint32_t floating_mod;
bool floating_mod_inverse;
uint32_t dragging_key; uint32_t dragging_key;
uint32_t resizing_key; uint32_t resizing_key;
char *floating_scroll_up_cmd; char *floating_scroll_up_cmd;

12
sway/commands/floating_modifier.c
View file

@ -1,10 +1,11 @@
#include "strings.h"
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/config.h" #include "sway/config.h"
#include "util.h" #include "util.h"
struct cmd_results *cmd_floating_modifier(int argc, char **argv) { struct cmd_results *cmd_floating_modifier(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "floating_modifier", EXPECTED_EQUAL_TO, 1))) { if ((error = checkarg(argc, "floating_modifier", EXPECTED_AT_LEAST, 1))) {
return error; return error;
} }
@ -14,6 +15,15 @@ struct cmd_results *cmd_floating_modifier(int argc, char **argv) {
"Invalid modifier"); "Invalid modifier");
} }
if (argc == 1 || strcasecmp(argv[1], "normal") == 0) {
config->floating_mod_inverse = false;
} else if (strcasecmp(argv[1], "inverse") == 0) {
config->floating_mod_inverse = true;
} else {
return cmd_results_new(CMD_INVALID, "floating_modifier",
"Usage: floating_modifier <mod> [inverse|normal]");
}
config->floating_mod = mod; config->floating_mod = mod;
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

1
sway/config.c
View file

@ -180,6 +180,7 @@ static void config_defaults(struct sway_config *config) {
list_add(config->modes, config->current_mode); list_add(config->modes, config->current_mode);
config->floating_mod = 0; config->floating_mod = 0;
config->floating_mod_inverse = false;
config->dragging_key = BTN_LEFT; config->dragging_key = BTN_LEFT;
config->resizing_key = BTN_RIGHT; config->resizing_key = BTN_RIGHT;

8
sway/input/cursor.c
View file

@ -449,15 +449,17 @@ static void dispatch_cursor_button_floating(struct sway_cursor *cursor,
bool over_title = edge == WLR_EDGE_NONE && !surface; bool over_title = edge == WLR_EDGE_NONE && !surface;
// Check for beginning move // Check for beginning move
if (button == BTN_LEFT && state == WLR_BUTTON_PRESSED && uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
if (button == btn_move && state == WLR_BUTTON_PRESSED &&
(mod_pressed || over_title)) { (mod_pressed || over_title)) {
seat_begin_move(seat, cont, BTN_LEFT); seat_begin_move(seat, cont, button);
return; return;
} }
// Check for beginning resize // Check for beginning resize
bool resizing_via_border = button == BTN_LEFT && edge != WLR_EDGE_NONE; bool resizing_via_border = button == BTN_LEFT && edge != WLR_EDGE_NONE;
bool resizing_via_mod = button == BTN_RIGHT && mod_pressed; uint32_t btn_resize = config->floating_mod_inverse ? BTN_LEFT : BTN_RIGHT;
bool resizing_via_mod = button == btn_resize && mod_pressed;
if ((resizing_via_border || resizing_via_mod) && if ((resizing_via_border || resizing_via_mod) &&
state == WLR_BUTTON_PRESSED) { state == WLR_BUTTON_PRESSED) {
if (edge == WLR_EDGE_NONE) { if (edge == WLR_EDGE_NONE) {