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

Merge branch 'master' into disabled-no-modeset

Browse source
This commit is contained in:
Brian Ashworth 2018-09-03 00:24:28 -04:00 • committed by GitHub
commit afb6968874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 103 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sway/commands.c
View file

@ -106,6 +106,7 @@ static struct cmd_handler handlers[] = {
{ "floating_modifier", cmd_floating_modifier },
{ "focus", cmd_focus },
{ "focus_follows_mouse", cmd_focus_follows_mouse },
{ "focus_on_window_activation", cmd_focus_on_window_activation },
{ "focus_wrapping", cmd_focus_wrapping },
{ "font", cmd_font },
{ "for_window", cmd_for_window },

25
sway/commands/focus_on_window_activation.c Normal file
View file

@ -0,0 +1,25 @@
#include "sway/commands.h"
struct cmd_results *cmd_focus_on_window_activation(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "focus_on_window_activation",
EXPECTED_EQUAL_TO, 1))) {
return error;
}
if (strcmp(argv[0], "smart") == 0) {
config->focus_on_window_activation = FOWA_SMART;
} else if (strcmp(argv[0], "urgent") == 0) {
config->focus_on_window_activation = FOWA_URGENT;
} else if (strcmp(argv[0], "focus") == 0) {
config->focus_on_window_activation = FOWA_FOCUS;
} else if (strcmp(argv[0], "none") == 0) {
config->focus_on_window_activation = FOWA_NONE;
} else {
return cmd_results_new(CMD_INVALID, "focus_on_window_activation",
"Expected "
"'focus_on_window_activation smart|urgent|focus|none'");
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

22
sway/desktop/xwayland.c
View file

@ -218,7 +218,9 @@ static bool wants_floating(struct sway_view *view) {
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
struct sway_xwayland *xwayland = &server.xwayland;
// TODO: return true if the NET_WM_STATE is MODAL
if (surface->modal) {
return true;
}
for (size_t i = 0; i < surface->window_type_len; ++i) {
xcb_atom_t type = surface->window_type[i];
@ -335,6 +337,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&xwayland_view->request_fullscreen.link);
wl_list_remove(&xwayland_view->request_move.link);
wl_list_remove(&xwayland_view->request_resize.link);
wl_list_remove(&xwayland_view->request_activate.link);
wl_list_remove(&xwayland_view->set_title.link);
wl_list_remove(&xwayland_view->set_class.link);
wl_list_remove(&xwayland_view->set_window_type.link);
@ -461,6 +464,19 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
seat_begin_resize_floating(seat, view->swayc, seat->last_button, e->edges);
}
static void handle_request_activate(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, request_activate);
struct sway_view *view = &xwayland_view->view;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
if (!xsurface->mapped) {
return;
}
view_request_activate(view);
transaction_commit_dirty();
}
static void handle_set_title(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, set_title);
@ -553,6 +569,10 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
&xwayland_view->request_fullscreen);
xwayland_view->request_fullscreen.notify = handle_request_fullscreen;
wl_signal_add(&xsurface->events.request_activate,
&xwayland_view->request_activate);
xwayland_view->request_activate.notify = handle_request_activate;
wl_signal_add(&xsurface->events.request_move,
&xwayland_view->request_move);
xwayland_view->request_move.notify = handle_request_move;

2
sway/input/seat.c
View file

@ -635,7 +635,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
// find new output's old workspace, which might have to be removed if empty
struct sway_container *new_output_last_ws = NULL;
if (last_output != new_output) {
if (new_output && last_output != new_output) {
new_output_last_ws = seat_get_active_child(seat, new_output);
}

1
sway/meson.build
View file

@ -46,6 +46,7 @@ sway_sources = files(
'commands/floating_modifier.c',
'commands/focus.c',
'commands/focus_follows_mouse.c',
'commands/focus_on_window_activation.c',
'commands/focus_wrapping.c',
'commands/font.c',
'commands/for_window.c',

2
sway/server.c
View file

@ -12,7 +12,6 @@
#include <wlr/types/wlr_gamma_control_v1.h>
#include <wlr/types/wlr_idle.h>
#include <wlr/types/wlr_layer_shell.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_primary_selection.h>
#include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/types/wlr_server_decoration.h>
@ -117,7 +116,6 @@ bool server_init(struct sway_server *server) {
server->server_decoration.notify = handle_server_decoration;
wl_list_init(&server->decorations);
wlr_linux_dmabuf_v1_create(server->wl_display, renderer);
wlr_export_dmabuf_manager_v1_create(server->wl_display);
wlr_screencopy_manager_v1_create(server->wl_display);

23
sway/tree/view.c
View file

@ -280,6 +280,29 @@ void view_set_activated(struct sway_view *view, bool activated) {
}
}
void view_request_activate(struct sway_view *view) {
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
struct sway_seat *seat = input_manager_current_seat(input_manager);
switch (config->focus_on_window_activation) {
case FOWA_SMART:
if (workspace_is_visible(ws)) {
seat_set_focus(seat, view->swayc);
} else {
view_set_urgent(view, true);
}
break;
case FOWA_URGENT:
view_set_urgent(view, true);
break;
case FOWA_FOCUS:
seat_set_focus(seat, view->swayc);
break;
case FOWA_NONE:
break;
}
}
void view_set_tiled(struct sway_view *view, bool tiled) {
if (!tiled) {
view->using_csd = true;