Merge branch 'master' into disabled-no-modeset

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

View file

@ -117,6 +117,7 @@ sway_cmd cmd_floating_modifier;
sway_cmd cmd_floating_scroll; sway_cmd cmd_floating_scroll;
sway_cmd cmd_focus; sway_cmd cmd_focus;
sway_cmd cmd_focus_follows_mouse; sway_cmd cmd_focus_follows_mouse;
sway_cmd cmd_focus_on_window_activation;
sway_cmd cmd_focus_wrapping; sway_cmd cmd_focus_wrapping;
sway_cmd cmd_font; sway_cmd cmd_font;
sway_cmd cmd_for_window; sway_cmd cmd_for_window;

View file

@ -57,6 +57,16 @@ struct sway_mouse_binding {
char *command; char *command;
}; };
/**
* Focus on window activation.
*/
enum sway_fowa {
FOWA_SMART,
FOWA_URGENT,
FOWA_FOCUS,
FOWA_NONE,
};
/** /**
* A "mode" of keybindings created via the `mode` command. * A "mode" of keybindings created via the `mode` command.
*/ */
@ -340,6 +350,7 @@ struct sway_config {
size_t font_height; size_t font_height;
bool pango_markup; bool pango_markup;
size_t urgent_timeout; size_t urgent_timeout;
enum sway_fowa focus_on_window_activation;
// Flags // Flags
bool focus_follows_mouse; bool focus_follows_mouse;

View file

@ -167,6 +167,7 @@ struct sway_xwayland_view {
struct wl_listener request_maximize; struct wl_listener request_maximize;
struct wl_listener request_configure; struct wl_listener request_configure;
struct wl_listener request_fullscreen; struct wl_listener request_fullscreen;
struct wl_listener request_activate;
struct wl_listener set_title; struct wl_listener set_title;
struct wl_listener set_class; struct wl_listener set_class;
struct wl_listener set_window_type; struct wl_listener set_window_type;
@ -259,6 +260,11 @@ void view_autoconfigure(struct sway_view *view);
void view_set_activated(struct sway_view *view, bool activated); void view_set_activated(struct sway_view *view, bool activated);
/**
* Called when the view requests to be focused.
*/
void view_request_activate(struct sway_view *view);
void view_set_tiled(struct sway_view *view, bool tiled); void view_set_tiled(struct sway_view *view, bool tiled);
void view_close(struct sway_view *view); void view_close(struct sway_view *view);

View file

@ -106,7 +106,7 @@ endif
add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
version = get_option('sway_version') version = get_option('sway-version')
if version != '' if version != ''
version = '"@0@"'.format(version) version = '"@0@"'.format(version)
else else
@ -120,6 +120,8 @@ else
endif endif
add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
add_project_arguments('-D_LD_LIBRARY_PATH="@0@"'.format(get_option('ld-library-path')), language: 'c')
sway_inc = include_directories('include') sway_inc = include_directories('include')
subdir('include') subdir('include')
@ -168,7 +170,7 @@ install_data(
install_dir: datadir + '/wayland-sessions' install_dir: datadir + '/wayland-sessions'
) )
if (get_option('default_wallpaper')) if (get_option('default-wallpaper'))
wallpaper_files = files( wallpaper_files = files(
'assets/Sway_Wallpaper_Blue_768x1024.png', 'assets/Sway_Wallpaper_Blue_768x1024.png',
'assets/Sway_Wallpaper_Blue_768x1024_Portrait.png', 'assets/Sway_Wallpaper_Blue_768x1024_Portrait.png',
@ -184,7 +186,7 @@ if (get_option('default_wallpaper'))
install_data(wallpaper_files, install_dir: wallpaper_install_dir) install_data(wallpaper_files, install_dir: wallpaper_install_dir)
endif endif
if (get_option('zsh_completions')) if (get_option('zsh-completions'))
zsh_files = files( zsh_files = files(
'completions/zsh/_sway', 'completions/zsh/_sway',
'completions/zsh/_swaylock', 'completions/zsh/_swaylock',
@ -195,7 +197,7 @@ if (get_option('zsh_completions'))
install_data(zsh_files, install_dir: zsh_install_dir) install_data(zsh_files, install_dir: zsh_install_dir)
endif endif
if (get_option('bash_completions')) if (get_option('bash-completions'))
bash_files = files( bash_files = files(
'completions/bash/sway', 'completions/bash/sway',
'completions/bash/swayidle', 'completions/bash/swayidle',
@ -207,7 +209,7 @@ if (get_option('bash_completions'))
install_data(bash_files, install_dir: bash_install_dir) install_data(bash_files, install_dir: bash_install_dir)
endif endif
if (get_option('fish_completions')) if (get_option('fish-completions'))
fish_files = files( fish_files = files(
'completions/fish/sway.fish', 'completions/fish/sway.fish',
'completions/fish/swaylock.fish', 'completions/fish/swaylock.fish',

View file

@ -1,6 +1,7 @@
option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.')
option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('ld-library-path', type: 'string', value: '', description: 'The LD_LIBRARY_PATH environment variable.')
option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('bash_completions', type: 'boolean', value: true, description: 'Install bash shell completions.') option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
option('fish_completions', type: 'boolean', value: true, description: 'Install fish shell completions.') option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.')
option('fish-completions', type: 'boolean', value: true, description: 'Install fish shell completions.')
option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications') option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications')

View file

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

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);
}

View file

@ -218,7 +218,9 @@ static bool wants_floating(struct sway_view *view) {
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface; struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
struct sway_xwayland *xwayland = &server.xwayland; 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) { for (size_t i = 0; i < surface->window_type_len; ++i) {
xcb_atom_t type = surface->window_type[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_fullscreen.link);
wl_list_remove(&xwayland_view->request_move.link); wl_list_remove(&xwayland_view->request_move.link);
wl_list_remove(&xwayland_view->request_resize.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_title.link);
wl_list_remove(&xwayland_view->set_class.link); wl_list_remove(&xwayland_view->set_class.link);
wl_list_remove(&xwayland_view->set_window_type.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); 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) { static void handle_set_title(struct wl_listener *listener, void *data) {
struct sway_xwayland_view *xwayland_view = struct sway_xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, set_title); 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);
xwayland_view->request_fullscreen.notify = handle_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, wl_signal_add(&xsurface->events.request_move,
&xwayland_view->request_move); &xwayland_view->request_move);
xwayland_view->request_move.notify = handle_request_move; xwayland_view->request_move.notify = handle_request_move;

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 // find new output's old workspace, which might have to be removed if empty
struct sway_container *new_output_last_ws = NULL; 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); new_output_last_ws = seat_get_active_child(seat, new_output);
} }

View file

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

View file

@ -12,7 +12,6 @@
#include <wlr/types/wlr_gamma_control_v1.h> #include <wlr/types/wlr_gamma_control_v1.h>
#include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_idle.h>
#include <wlr/types/wlr_layer_shell.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_primary_selection.h>
#include <wlr/types/wlr_screencopy_v1.h> #include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/types/wlr_server_decoration.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; server->server_decoration.notify = handle_server_decoration;
wl_list_init(&server->decorations); wl_list_init(&server->decorations);
wlr_linux_dmabuf_v1_create(server->wl_display, renderer);
wlr_export_dmabuf_manager_v1_create(server->wl_display); wlr_export_dmabuf_manager_v1_create(server->wl_display);
wlr_screencopy_manager_v1_create(server->wl_display); wlr_screencopy_manager_v1_create(server->wl_display);

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) { void view_set_tiled(struct sway_view *view, bool tiled) {
if (!tiled) { if (!tiled) {
view->using_csd = true; view->using_csd = true;