aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/commands/bar/bindsym.c60
-rw-r--r--sway/commands/mouse_warping.c8
-rw-r--r--sway/config.c2
-rw-r--r--sway/config/bar.c13
-rw-r--r--sway/input/cursor.c1
-rw-r--r--sway/input/seat.c21
-rw-r--r--sway/ipc-json.c16
-rw-r--r--sway/sway-bar.5.scd5
-rw-r--r--sway/sway.5.scd7
-rw-r--r--sway/tree/container.c12
-rw-r--r--sway/tree/view.c4
11 files changed, 127 insertions, 22 deletions
diff --git a/sway/commands/bar/bindsym.c b/sway/commands/bar/bindsym.c
index ac09a03f..4eea3e6a 100644
--- a/sway/commands/bar/bindsym.c
+++ b/sway/commands/bar/bindsym.c
@@ -1,5 +1,7 @@
+#define _XOPEN_SOURCE 500
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "list.h"
@@ -7,5 +9,61 @@
#include "stringop.h"
struct cmd_results *bar_cmd_bindsym(int argc, char **argv) {
- return cmd_results_new(CMD_FAILURE, "bindsym", "TODO"); // TODO
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "bar bindsym", EXPECTED_MORE_THAN, 1))) {
+ return error;
+ }
+ if (!config->current_bar) {
+ return cmd_results_new(CMD_FAILURE, "bar bindsym", "No bar defined.");
+ }
+
+ struct bar_binding *binding = calloc(1, sizeof(struct bar_binding));
+ if (!binding) {
+ return cmd_results_new(CMD_FAILURE, "bar bindsym",
+ "Unable to allocate bar binding");
+ }
+
+ binding->release = false;
+ if (strcmp("--release", argv[0]) == 0) {
+ binding->release = true;
+ argv++;
+ argc--;
+ }
+
+ binding->button = 0;
+ if (strncasecmp(argv[0], "button", strlen("button")) == 0 &&
+ strlen(argv[0]) == strlen("button0")) {
+ binding->button = argv[0][strlen("button")] - '0';
+ }
+ if (binding->button < 1 || binding->button > 9) {
+ free_bar_binding(binding);
+ return cmd_results_new(CMD_FAILURE, "bar bindsym",
+ "Only button<1-9> is supported");
+ }
+
+ binding->command = join_args(argv + 1, argc - 1);
+
+ list_t *bindings = config->current_bar->bindings;
+ bool overwritten = false;
+ for (int i = 0; i < bindings->length; i++) {
+ struct bar_binding *other = bindings->items[i];
+ if (other->button == binding->button &&
+ other->release == binding->release) {
+ overwritten = true;
+ bindings->items[i] = binding;
+ free_bar_binding(other);
+ wlr_log(WLR_DEBUG, "[bar %s] Updated binding for button%u%s",
+ config->current_bar->id, binding->button,
+ binding->release ? " (release)" : "");
+ break;
+ }
+ }
+ if (!overwritten) {
+ list_add(bindings, binding);
+ wlr_log(WLR_DEBUG, "[bar %s] Added binding for button%u%s",
+ config->current_bar->id, binding->button,
+ binding->release ? " (release)" : "");
+ }
+
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
diff --git a/sway/commands/mouse_warping.c b/sway/commands/mouse_warping.c
index eef32ce7..d067bc65 100644
--- a/sway/commands/mouse_warping.c
+++ b/sway/commands/mouse_warping.c
@@ -6,13 +6,15 @@ struct cmd_results *cmd_mouse_warping(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "mouse_warping", EXPECTED_EQUAL_TO, 1))) {
return error;
+ } else if (strcasecmp(argv[0], "container") == 0) {
+ config->mouse_warping = WARP_CONTAINER;
} else if (strcasecmp(argv[0], "output") == 0) {
- config->mouse_warping = true;
+ config->mouse_warping = WARP_OUTPUT;
} else if (strcasecmp(argv[0], "none") == 0) {
- config->mouse_warping = false;
+ config->mouse_warping = WARP_NO;
} else {
return cmd_results_new(CMD_FAILURE, "mouse_warping",
- "Expected 'mouse_warping output|none'");
+ "Expected 'mouse_warping output|container|none'");
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
diff --git a/sway/config.c b/sway/config.c
index 1926bc08..f239ba1d 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -223,7 +223,7 @@ static void config_defaults(struct sway_config *config) {
// Flags
config->focus_follows_mouse = true;
config->raise_floating = true;
- config->mouse_warping = true;
+ config->mouse_warping = WARP_OUTPUT;
config->focus_wrapping = WRAP_YES;
config->validating = false;
config->reloading = false;
diff --git a/sway/config/bar.c b/sway/config/bar.c
index b8695798..c6899f57 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -28,6 +28,14 @@ static void terminate_swaybar(pid_t pid) {
}
}
+void free_bar_binding(struct bar_binding *binding) {
+ if (!binding) {
+ return;
+ }
+ free(binding->command);
+ free(binding);
+}
+
void free_bar_config(struct bar_config *bar) {
if (!bar) {
return;
@@ -39,7 +47,10 @@ void free_bar_config(struct bar_config *bar) {
free(bar->status_command);
free(bar->font);
free(bar->separator_symbol);
- // TODO: Free mouse bindings
+ for (int i = 0; i < bar->bindings->length; i++) {
+ struct bar_binding *binding = bar->bindings->items[i];
+ free_bar_binding(binding);
+ }
list_free(bar->bindings);
if (bar->outputs) {
free_flat_list(bar->outputs);
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 6d57c45f..5c446299 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -877,6 +877,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
while (cont->parent) {
cont = cont->parent;
}
+ seat_set_focus_container(seat, cont);
seat_begin_move_floating(seat, cont, button);
return;
}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index f418785d..03ed638e 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -772,7 +772,9 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
}
if (last_focus) {
- if (config->mouse_warping && warp && new_output != last_output) {
+ if (config->mouse_warping && warp &&
+ (new_output != last_output ||
+ config->mouse_warping == WARP_CONTAINER)) {
double x = 0;
double y = 0;
if (container) {
@@ -782,9 +784,11 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
x = new_workspace->x + new_workspace->width / 2.0;
y = new_workspace->y + new_workspace->height / 2.0;
}
+
if (!wlr_output_layout_contains_point(root->output_layout,
new_output->wlr_output, seat->cursor->cursor->x,
- seat->cursor->cursor->y)) {
+ seat->cursor->cursor->y)
+ || config->mouse_warping == WARP_CONTAINER) {
wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
cursor_send_pointer_motion(seat->cursor, 0, true);
}
@@ -1038,7 +1042,7 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
seat->op_moved = false;
// In case the container was not raised by gaining focus, raise on click
- if (con && !config->raise_floating) {
+ if (!config->raise_floating) {
container_raise_floating(con);
}
}
@@ -1052,6 +1056,12 @@ void seat_begin_move_floating(struct sway_seat *seat,
seat->operation = OP_MOVE_FLOATING;
seat->op_container = con;
seat->op_button = button;
+
+ // In case the container was not raised by gaining focus, raise on click
+ if (!config->raise_floating) {
+ container_raise_floating(con);
+ }
+
cursor_set_image(seat->cursor, "grab", NULL);
}
@@ -1085,6 +1095,11 @@ void seat_begin_resize_floating(struct sway_seat *seat,
seat->op_ref_con_ly = con->y;
seat->op_ref_width = con->width;
seat->op_ref_height = con->height;
+ //
+ // In case the container was not raised by gaining focus, raise on click
+ if (!config->raise_floating) {
+ container_raise_floating(con);
+ }
const char *image = edge == WLR_EDGE_NONE ?
"se-resize" : wlr_xcursor_get_resize_name(edge);
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index f02f370b..54d611f2 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -623,6 +623,22 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
json_object_object_add(json, "colors", colors);
+ if (bar->bindings->length > 0) {
+ json_object *bindings = json_object_new_array();
+ for (int i = 0; i < bar->bindings->length; ++i) {
+ struct bar_binding *binding = bar->bindings->items[i];
+ json_object *bind = json_object_new_object();
+ json_object_object_add(bind, "input_code",
+ json_object_new_int(binding->button));
+ json_object_object_add(bind, "command",
+ json_object_new_string(binding->command));
+ json_object_object_add(bind, "release",
+ json_object_new_boolean(binding->release));
+ json_object_array_add(bindings, bind);
+ }
+ json_object_object_add(json, "bindings", bindings);
+ }
+
// Add outputs if defined
if (bar->outputs && bar->outputs->length > 0) {
json_object *outputs = json_object_new_array();
diff --git a/sway/sway-bar.5.scd b/sway/sway-bar.5.scd
index 8c7be8e7..6729c9ac 100644
--- a/sway/sway-bar.5.scd
+++ b/sway/sway-bar.5.scd
@@ -60,6 +60,11 @@ Sway allows configuring swaybar in the sway configuration file.
*height* <height>
Sets the height of the bar. Default height will match the font size.
+*bindsym* [--release] button<n> <command>
+ Executes _command_ when mouse button _n_ has been pressed (or if _released_
+ is given, when mouse button _n_ has been released). To disable the default
+ behavior for a button, use the command _nop_.
+
## TRAY
Swaybar provides a system tray where third-party applications may place icons.
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 28ab15df..240e0731 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -492,9 +492,10 @@ The default colors are:
If _--pango\_markup_ is given, then _mode_ will be interpreted as pango
markup.
-*mouse\_warping* output|none
+*mouse\_warping* output|container|none
If _output_ is specified, the mouse will be moved to new outputs as you
- move focus between them. Default is _output_.
+ move focus between them. If _container_ is specified, the mouse will be
+ moved to the middle of the container on switch. Default is _output_.
*no\_focus* <criteria>
Prevents windows matching <criteria> from being focused automatically when
@@ -598,7 +599,7 @@ match any output by using the output name "\*".
*workspace* prev\_on\_output|next\_on\_output
Switches to the next workspace on the current output.
-*workspace* back_and_forth
+*workspace* back\_and\_forth
Switches to the previously focused workspace.
*workspace* <name> gaps inner|outer <amount>
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 1664514a..f36fe4b0 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -358,7 +358,6 @@ struct sway_container *container_at(struct sway_workspace *workspace,
struct wlr_surface **surface, double *sx, double *sy) {
struct sway_container *c;
- // Focused view's popups
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = seat_get_focused_container(seat);
bool is_floating = focus && container_is_floating_or_child(focus);
@@ -370,14 +369,11 @@ struct sway_container *container_at(struct sway_workspace *workspace,
}
*surface = NULL;
}
- // Cast a ray to handle floating windows
- for (int i = workspace->floating->length - 1; i >= 0; --i) {
- struct sway_container *cn = workspace->floating->items[i];
- if (cn->view && (c = surface_at_view(cn, lx, ly, surface, sx, sy))) {
- return c;
- }
+ // Floating
+ if ((c = floating_container_at(lx, ly, surface ,sx ,sy))) {
+ return c;
}
- // If focused is tiling, focused view's non-popups
+ // Tiling (focused)
if (focus && focus->view && !is_floating) {
if ((c = surface_at_view(focus, lx, ly, surface, sx, sy))) {
return c;
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 1f00452d..e613ac0b 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -243,10 +243,10 @@ void view_autoconfigure(struct sway_view *view) {
// title area. We have to offset the surface y by the height of the title,
// bar, and disable any top border because we'll always have the title bar.
enum sway_container_layout layout = container_parent_layout(con);
- if (layout == L_TABBED) {
+ if (layout == L_TABBED && !container_is_floating(con)) {
y_offset = container_titlebar_height();
view->border_top = false;
- } else if (layout == L_STACKED) {
+ } else if (layout == L_STACKED && !container_is_floating(con)) {
list_t *siblings = container_get_siblings(con);
y_offset = container_titlebar_height() * siblings->length;
view->border_top = false;
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-31 06:37:30 +0000