mirror/sway
1
1
Fork 0
mirror of https://github.com/swaywm/sway synced 2024-11-18 04:33:59 +01:00
Code Issues
3,776 Commits 11 Branches 96 Tags 42 MiB
4de28bba68
Commit Graph

3776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
emersion
4de28bba68
Fix floating views not receiving frame events 
That happened when they were in tabbed or stacked containers.

Fixes #2161
 2018-06-30 09:49:51 +01:00
Drew DeVault
d3ea07f828
Merge pull request #2172 from apreiml/fix-keybinding-modifier-handling 
fix handling key modifiers if not pressed at first
 2018-06-28 16:16:31 -07:00
Armin Preiml
1eede432fc fix handling key modifiers if not pressed at first 
fixes #2169
 2018-06-28 15:23:26 +02:00
emersion
92e81df470
Merge pull request #2170 from apreiml/master 
fix accidently removing borders on XCB_CONFIGURE_REQUEST
 2018-06-27 17:11:35 +01:00
Armin Preiml
c4b900c1e0 fix accidently removing borders on XCB_CONFIGURE_REQUEST 
The view was configured with the container coordinates.
Although they were right on the first configure, they
changed after a XCB_CONFIGURE_REQUEST, when the
border was already drawn.
 2018-06-27 17:56:53 +02:00
emersion
1579fc1d91
Merge pull request #2168 from BlueGone/input-cmd-arg-nb 
Check if command input has at least 2 arguments
 2018-06-27 15:13:14 +01:00
Thomas Plaçais
9a3c6d2dbe Check if command input has at least 2 arguments 2018-06-27 15:58:53 +02:00
Drew DeVault
152ccd7fb1
Merge pull request #2145 from emersion/xwayland-wants-float 
Automatically float xwayland windows
 2018-06-26 20:31:32 -07:00
Ryan Dwyer
bf38081382
Merge branch 'master' into xwayland-wants-float 2018-06-27 13:21:00 +10:00
Drew DeVault
f0f50c31d5
Merge pull request #2162 from martinetd/float_xdg_shell 
xdg_shell: make view floating if a parent has been set
 2018-06-26 07:26:07 -07:00
emersion
ecd748d240
Merge branch 'master' into float_xdg_shell 2018-06-26 15:13:03 +01:00
Drew DeVault
50ad949185
Merge pull request #2164 from ael-code/background_fixes 
output bg command: fix memleak and refactoring
 2018-06-26 06:53:18 -07:00
ael-code
a4578815f1
cleanup output-background subcommand handling 
- fixes a double-free error when access() failed.

- refactor code to make memory managment (alloc/free) more straightforward
   - do not bring the temporary wordexp_t struct around
   - do not postpone errors handling
 2018-06-26 15:40:32 +02:00
ael-code
4550cb2b3e
fix memleak on background cmd error 
- src must be free after join_args()
- wordfree must bee used after wordexp
 2018-06-26 15:37:39 +02:00
Ryan Dwyer
af0f0375ef
Merge pull request #2163 from martinetd/use-after-free 
layer shell: fix some use after free on destroy
 2018-06-26 22:51:38 +10:00
Dominique Martinet
6856866a61 layer_shell: order destroying before sway_output 
Both sway_output and sway_layer_shell listen to wlr's output destroy event,
but sway_layer_shell needs to access into sway_output's data strucure and needs
to be destroyed first.

Resolve this by making sway_layer_shell listen to a new event that happens at
start of sway_output's destroy handler
 2018-06-26 21:20:56 +09:00
Dominique Martinet
08800c8ee2 layer_shell: cleanup output link on output destroy 
Fixes this kind of use-after-free:
==1795==ERROR: AddressSanitizer: heap-use-after-free on address 0x612000191ef0 at pc 0x00000048c388 bp 0x7ffe308f0410 sp 0x7ffe308f0400
WRITE of size 8 at 0x612000191ef0 thread T0
    #0 0x48c387 in wl_list_remove ../common/list.c:157
    #1 0x42196b in handle_destroy ../sway/desktop/layer_shell.c:275
    #2 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29
    #3 0x7f55cc22cf68 in layer_surface_destroy ../types/wlr_layer_shell.c:182
    #4 0x7f55cc22d084 in layer_surface_resource_destroy ../types/wlr_layer_shell.c:196
    #5 0x7f55cc4ca025 in destroy_resource src/wayland-server.c:688
    #6 0x7f55cc4ca091 in wl_resource_destroy src/wayland-server.c:705
    #7 0x7f55cc22c3a2 in resource_handle_destroy ../types/wlr_layer_shell.c:18
    #8 0x7f55c8ef103d in ffi_call_unix64 (/lib64/libffi.so.6+0x603d)
    #9 0x7f55c8ef09fe in ffi_call (/lib64/libffi.so.6+0x59fe)
    #10 0x7f55cc4cdf2c  (/lib64/libwayland-server.so.0+0xbf2c)
    #11 0x7f55cc4ca3de in wl_client_connection_data src/wayland-server.c:420
    #12 0x7f55cc4cbf01 in wl_event_loop_dispatch src/event-loop.c:641
    #13 0x7f55cc4ca601 in wl_display_run src/wayland-server.c:1260
    #14 0x40bb1e in server_run ../sway/server.c:141
    #15 0x40ab2f in main ../sway/main.c:432
    #16 0x7f55cb97318a in __libc_start_main ../csu/libc-start.c:308
    #17 0x408d29 in _start (/opt/wayland/bin/sway+0x408d29)

0x612000191ef0 is located 48 bytes inside of 312-byte region [0x612000191ec0,0x612000191ff8)
freed by thread T0 here:
    #0 0x7f55ce3bb880 in __interceptor_free (/lib64/libasan.so.5+0xee880)
    #1 0x42f1db in handle_destroy ../sway/desktop/output.c:1275
    #2 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29
    #3 0x7f55cc23b4c2 in wlr_output_destroy ../types/wlr_output.c:284
    #4 0x7f55cc1ddc20 in xdg_toplevel_handle_close ../backend/wayland/output.c:235
    #5 0x7f55c8ef103d in ffi_call_unix64 (/lib64/libffi.so.6+0x603d)

previously allocated by thread T0 here:
    #0 0x7f55ce3bbe50 in calloc (/lib64/libasan.so.5+0xeee50)
    #1 0x42f401 in handle_new_output ../sway/desktop/output.c:1308
    #2 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29
    #3 0x7f55cc1d6cbf in new_output_reemit ../backend/multi/backend.c:113
    #4 0x7f55cc2549fa in wlr_signal_emit_safe ../util/signal.c:29
    #5 0x7f55cc1deac7 in wlr_wl_output_create ../backend/wayland/output.c:327
    #6 0x7f55cc1db353 in backend_start ../backend/wayland/backend.c:55
    #7 0x7f55cc1bad55 in wlr_backend_start ../backend/backend.c:35
    #8 0x7f55cc1d67a0 in multi_backend_start ../backend/multi/backend.c:24
    #9 0x7f55cc1bad55 in wlr_backend_start ../backend/backend.c:35
    #10 0x40ba8a in server_run ../sway/server.c:136
    #11 0x40ab2f in main ../sway/main.c:432
    #12 0x7f55cb97318a in __libc_start_main ../csu/libc-start.c:308
 2018-06-26 21:20:56 +09:00
Dominique Martinet
c9be014557 xdg_shell: make view floating if a parent has been set 
Prompts e.g. authentication request from firefox-wayland ought to be
floating.

This is a bit coarse but just fixed size is not enough, here is what
firefox does:
[1285461.363]  -> xdg_wm_base@18.get_xdg_surface(new id xdg_surface@68, wl_surface@71)
[1285461.508]  -> xdg_surface@68.get_toplevel(new id xdg_toplevel@67)
[1285461.571]  -> xdg_toplevel@67.set_parent(xdg_toplevel@37)
[1285461.630]  -> xdg_toplevel@67.set_title("Authentication Required")
[1285461.736]  -> xdg_toplevel@67.set_app_id("firefox")
...
[1285476.549] xdg_toplevel@67.configure(0, 0, array)
...
[1285502.080]  -> xdg_toplevel@67.set_min_size(299, 187)
[1285502.140]  -> xdg_toplevel@67.set_max_size(1920, 32767)

This can also be observed with e.g. the open window of gedit
(gedit->open->other documents)
 2018-06-26 12:02:50 +09:00
Drew DeVault
59086fabbf
Merge pull request #2159 from acrisci/focus-dont-follow-keyboard-grab 
dont focus-follow-mouse when keyboard grab
 2018-06-24 17:45:03 -07:00
Tony Crisci
e9ad10c2d6 dont focus-follow-mouse when keyboard grab 2018-06-24 20:30:43 -04:00
emersion
eeb38d65cb
xwayland: accept configure requests from floating views 2018-06-24 19:21:02 +01:00
Drew DeVault
5222e14555
Merge pull request #2155 from ael-code/fix_output_command_failure 
bugfix: avoid access after free
 2018-06-22 06:53:17 -07:00
ael-code
ad085c1332
bugfix: avoid access after free 
if src is NULL due to a previous error we cannot use it in the command
result string.

Moreover if `src` points to `p.we_wordv[0]` we cannot use it after
`wordfree(&p)` in the command result string.

Bonus feature: If there was an error accessing the file, the string
rapresentation of the error is now included in the command result
string.
 2018-06-22 15:41:44 +02:00
Drew DeVault
e8fbda4d21
Merge pull request #2146 from tobiasblass/prepare_server_before_dropping_privileges 
Perform (partial) server initialization before dropping privileges.
 2018-06-22 06:41:34 -07:00
emersion
abdbf3c1d7
Merge pull request #2152 from atomnuker/master 
Init the dmabuf exporting protocol in wlroots
 2018-06-22 14:40:12 +01:00
Rostislav Pehlivanov
aa9f058e3e Init the dmabuf exporting protocol in wlroots 
Allows desktop capture via the dmabuf-capture wlroots example client.
 2018-06-22 13:45:32 +01:00
Tobias Blass
a5c091e302 Perform (partial) server initialization before dropping privileges. 
Some operations during backend creation (e.g. becoming DRM master)
require CAP_SYS_ADMIN privileges. At this point, sway has dropped them
already, though. This patch splits the privileged part of server_init
into its own function and calls it before dropping its privileges.
This fixes the bug with minimal security implications.
 2018-06-19 00:19:57 +02:00
emersion
cda66e9a26
Automatically float xwayland windows 2018-06-18 22:52:10 +01:00
Drew DeVault
202ee51150
Merge pull request #2143 from vilhalmer/mark-pool-buffers-busy 
Set pool_buffers busy when handing them out
 2018-06-17 14:55:29 -07:00
vil
8884a063c1
Merge branch 'master' into mark-pool-buffers-busy 2018-06-17 17:37:58 -04:00
vilhalmer
54a5ee2747
Set pool_buffers busy when handing them out 2018-06-17 17:34:12 -04:00
Drew DeVault
7c44ca95f9
Merge pull request #2140 from Hello71/patch-2 
swayidle: fix stack overflow on sleep
 2018-06-17 11:26:57 -07:00
Alex Xu (Hello71)
7ed81cfd36 swayidle: fix stack overflow on sleep 2018-06-17 13:57:40 -04:00
Drew DeVault
378697b79d
Merge pull request #2135 from emersion/wlroots-1060 
Update for swaywm/wlroots#1060
 2018-06-16 14:07:25 -07:00
emersion
088cae45c8 Update for swaywm/wlroots#1060 2018-06-16 13:32:23 -04:00
Drew DeVault
55fe5fc580
Merge pull request #2130 from frsfnrrg/keyboard-tuning 
Clean up keyboard handling code
 2018-06-13 05:53:02 -07:00
frsfnrrg
ca061ba8bf Fix keyboard shortcut handling inconsistencies 
* Ensure that modifier keys are identified even when the next key does
  not produce a keysym. This requires that modifier change tracking
  be done for each sway_shortcut_state.

* Permit regular and --release shortcuts on the same key combination.
  Distinct bindings are identified for press and release cases; note
  that the release binding needs to be identified for both key press
  and key release events.

* Maintain ascending sort order for the shortcut state list, and keep
  track of the number of pressed key ids, for simpler (and hence
  faster) searching of the list of key bindings.

* Move binding duplicate detection into get_active_binding to avoid
  duplicating error messages.
 2018-06-12 20:26:57 -04:00
frsfnrrg
b23cd827cf Sort binding key lists 
Sort the list comprising the set of keys for the binding in ascending
order. (Keyboard shortcuts depend only on the set of simultaneously
pressed keys, not their order, so this change should have no external
effect.) This simplifies comparisons between bindings.
 2018-06-12 11:26:24 -04:00
Drew DeVault
867fb6aedb
Merge pull request #2124 from emersion/drag-icons 
Render drag icons
1.0-alpha.3 		2018-06-09 10:50:34 -07:00
Drew DeVault
d9fc381e02
Merge pull request #2047 from natesymer/master 
Implement Gaps
 2018-06-09 08:43:18 -07:00
Nate Symer
6a910b9ba5 Implement gaps (PR #2047) 2018-06-09 09:34:56 -04:00
emersion
cfd02918c0
Render drag icons 2018-06-09 13:26:03 +01:00
emersion
21d98d5bfb
Merge pull request #2123 from emersion/fix-disabled-outputs 
Fix compilation errors related to disabled outputs
 2018-06-09 12:09:16 +01:00
emersion
88cd7616db
Fix compilation errors related to disabled outputs 2018-06-09 11:38:16 +01:00
Ryan Dwyer
0b798ed954
Merge pull request #2115 from RedSoxFan/restore-workspaces 
Restore workspaces to output when re-enabled
 2018-06-09 08:43:57 +10:00
Brian Ashworth
e2b2fb0a0e Switch restore workspaces to a nested for-loop 2018-06-08 13:08:00 -04:00
Brian Ashworth
5c9a917df9 Restore workspaces to outputs based on priority 2018-06-08 13:08:00 -04:00
emersion
c65c84444e
Merge pull request #2121 from martinetd/swaylock-ctrl-u 
swaylock: implement ^U to clear buffer
 2018-06-08 16:03:50 +01:00
Dominique Martinet
c78ce0770a swaylock: implement ^U to clear buffer 
The whole state->xcb.modifiers thing didn't work at all (always 0)
The xkb doc says "[xkb_state_serialize_mods] should not be used in
regular clients; please use the xkb_state_mod_*_is_active API instead"
so here it is
 2018-06-08 22:42:15 +09:00
emersion
acf71fe805
Merge pull request #2119 from martinetd/gcc-strtruncation 
sway/criteria: gcc string truncation warning fix
 2018-06-08 14:41:33 +01:00