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

Allow to disable insecure protocols at compile-time

Browse source
This commit is contained in:
Yaroslav Isakov 2020-07-28 20:28:39 +02:00
parent b20d52f71d
commit 4124571b25
5 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -87,6 +87,8 @@ if get_option('tray').enabled() and not tray_deps_found
endif endif
have_tray = (not get_option('tray').disabled()) and tray_deps_found have_tray = (not get_option('tray').disabled()) and tray_deps_found
use_insecure_protocols = get_option('use-insecure-protocols')
conf_data = configuration_data() conf_data = configuration_data()
conf_data.set10('HAVE_XWAYLAND', have_xwayland) conf_data.set10('HAVE_XWAYLAND', have_xwayland)
@ -94,6 +96,7 @@ conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found())
conf_data.set10('HAVE_SYSTEMD', systemd.found()) conf_data.set10('HAVE_SYSTEMD', systemd.found())
conf_data.set10('HAVE_ELOGIND', elogind.found()) conf_data.set10('HAVE_ELOGIND', elogind.found())
conf_data.set10('HAVE_TRAY', have_tray) conf_data.set10('HAVE_TRAY', have_tray)
conf_data.set10('USE_INSECURE_PROTOCOLS', use_insecure_protocols)
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
if scdoc.found() if scdoc.found()
@ -283,6 +286,7 @@ summary({
'elogind': elogind.found(), 'elogind': elogind.found(),
'tray': have_tray, 'tray': have_tray,
'man-pages': scdoc.found(), 'man-pages': scdoc.found(),
'use-insecure-protocols': use_insecure_protocols
}, bool_yn: true) }, bool_yn: true)
if not systemd.found() and not elogind.found() if not systemd.found() and not elogind.found()

1
meson_options.txt
View file

@ -6,3 +6,4 @@ option('xwayland', type: 'feature', value: 'auto', description: 'Enable support
option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray')
option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg') option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg')
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
option('use-insecure-protocols', type: 'boolean', value: true, description: 'Disable insecure protocols')

6
sway/input/seat.c
View file

@ -180,7 +180,9 @@ static void seat_send_focus(struct sway_node *node, struct sway_seat *seat) {
seat_keyboard_notify_enter(seat, view->surface); seat_keyboard_notify_enter(seat, view->surface);
seat_tablet_pads_notify_enter(seat, view->surface); seat_tablet_pads_notify_enter(seat, view->surface);
#if USE_INSECURE_PROTOCOLS
sway_input_method_relay_set_focus(&seat->im_relay, view->surface); sway_input_method_relay_set_focus(&seat->im_relay, view->surface);
#endif
struct wlr_pointer_constraint_v1 *constraint = struct wlr_pointer_constraint_v1 *constraint =
wlr_pointer_constraints_v1_constraint_for_surface( wlr_pointer_constraints_v1_constraint_for_surface(
@ -592,7 +594,9 @@ struct sway_seat *seat_create(const char *seat_name) {
wl_list_init(&seat->keyboard_groups); wl_list_init(&seat->keyboard_groups);
wl_list_init(&seat->keyboard_shortcuts_inhibitors); wl_list_init(&seat->keyboard_shortcuts_inhibitors);
#if USE_INSECURE_PROTOCOLS
sway_input_method_relay_init(seat, &seat->im_relay); sway_input_method_relay_init(seat, &seat->im_relay);
#endif
bool first = wl_list_empty(&server.input->seats); bool first = wl_list_empty(&server.input->seats);
wl_list_insert(&server.input->seats, &seat->link); wl_list_insert(&server.input->seats, &seat->link);
@ -1069,7 +1073,9 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
view_close_popups(last_focus->sway_container->view); view_close_popups(last_focus->sway_container->view);
} }
seat_send_unfocus(last_focus, seat); seat_send_unfocus(last_focus, seat);
#if USE_INSECURE_PROTOCOLS
sway_input_method_relay_set_focus(&seat->im_relay, NULL); sway_input_method_relay_set_focus(&seat->im_relay, NULL);
#endif
seat->has_focus = false; seat->has_focus = false;
return; return;
} }

5
sway/meson.build
View file

@ -32,7 +32,6 @@ sway_sources = files(
'input/seatop_resize_tiling.c', 'input/seatop_resize_tiling.c',
'input/switch.c', 'input/switch.c',
'input/tablet.c', 'input/tablet.c',
'input/text_input.c',
'config/bar.c', 'config/bar.c',
'config/output.c', 'config/output.c',
@ -221,6 +220,10 @@ if have_xwayland
sway_deps += xcb sway_deps += xcb
endif endif
if use_insecure_protocols
sway_sources += 'input/text_input.c'
endif
executable( executable(
'sway', 'sway',
sway_sources, sway_sources,

7
sway/server.c
View file

@ -140,13 +140,14 @@ bool server_init(struct sway_server *server) {
handle_output_power_manager_set_mode; handle_output_power_manager_set_mode;
wl_signal_add(&server->output_power_manager_v1->events.set_mode, wl_signal_add(&server->output_power_manager_v1->events.set_mode,
&server->output_power_manager_set_mode); &server->output_power_manager_set_mode);
#if USE_INSECURE_PROTOCOLS
server->input_method = wlr_input_method_manager_v2_create(server->wl_display); server->input_method = wlr_input_method_manager_v2_create(server->wl_display);
server->text_input = wlr_text_input_manager_v3_create(server->wl_display); server->text_input = wlr_text_input_manager_v3_create(server->wl_display);
server->foreign_toplevel_manager =
wlr_foreign_toplevel_manager_v1_create(server->wl_display);
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);
#endif
server->foreign_toplevel_manager =
wlr_foreign_toplevel_manager_v1_create(server->wl_display);
wlr_data_control_manager_v1_create(server->wl_display); wlr_data_control_manager_v1_create(server->wl_display);
wlr_primary_selection_v1_device_manager_create(server->wl_display); wlr_primary_selection_v1_device_manager_create(server->wl_display);
wlr_viewporter_create(server->wl_display); wlr_viewporter_create(server->wl_display);