mirror/sway
1
1
Fork 0
mirror of https://github.com/swaywm/sway synced 2024-11-18 19:03:59 +01:00
Code Issues
4,897 Commits 11 Branches 96 Tags 43 MiB
5e9c61ac23
Commit Graph

4897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Ashworth
5e9c61ac23 Only consider tiling views for gaps outer 2018-10-08 18:50:32 -04:00
Drew DeVault
4bebee620f
Merge pull request #2772 from RyanDwyer/improve-popup-damage 
Only damage popups when popups have damage
 2018-10-09 00:02:36 +02:00
Brian Ashworth
a999269e1c
Merge pull request #2782 from RyanDwyer/popup-during-fullscreen 
Implement popup_during_fullscreen
 2018-10-08 15:28:09 -04:00
Brian Ashworth
3f328b6276
Merge branch 'master' into popup-during-fullscreen 2018-10-08 15:18:49 -04:00
emersion
a03955f936
Merge pull request #2799 from ianyfan/commands 
commands: when setting urgency, check container is not null
 2018-10-08 19:17:40 +02:00
Ian Fan
efb123899f commands: when setting urgency, check container is not null 2018-10-08 17:48:25 +01:00
emersion
16e727a654
Merge pull request #2795 from RedSoxFan/swaynag-disable 
Allow swaynag to be disabled
 2018-10-08 16:24:46 +02:00
Brian Ashworth
09c3c33081 Allow swaynag to be disabled 2018-10-08 09:59:38 -04:00
emersion
45f2cd0c73
Merge pull request #2793 from emersion/disable-swaybg 
Allow swaybg to be disabled
 2018-10-08 15:50:56 +02:00
Ryan Dwyer
d21d2c8665 Remove duplicate code 2018-10-08 23:50:43 +10:00
emersion
1c1fbd49db
Merge pull request #2794 from johnae/fix-opacity-crashing-bug 
Check if there is a current container before setting its opacity
 2018-10-08 15:42:19 +02:00
Ryan Dwyer
b8002fc0c4 Look for any ancestor when checking for fullscreen exit 2018-10-08 23:39:35 +10:00
Ryan Dwyer
88317b59ce Use current state when rendering transient containers 2018-10-08 23:27:19 +10:00
emersion
ab3a397d58 Fix memory leak in status_command handler 2018-10-08 15:21:20 +02:00
John Axel Eriksson
08139daaa4
Check if there is a current container before setting it's opacity 2018-10-08 15:17:37 +02:00
emersion
c988b03d85 Allow swaybg to be disabled 
Same as #2791 but for swaybg.

Fixes #2790
 2018-10-08 15:08:33 +02:00
Ryan Dwyer
f23588de3c Introduce container_is_transient_for 2018-10-08 23:00:36 +10:00
Ryan Dwyer
832ebc8966 Implement popup_during_fullscreen 
This introduces a new view_impl function: is_transient_for. Similar to
container_has_ancestor but works using the surface parents rather than
the tree.

This patch modifies view_is_visible, container_at and so on to allow
transient views to function normally when they're in front of a
fullscreen view.
 2018-10-08 22:49:59 +10:00
Drew DeVault
6cb0e58c6d
Merge pull request #2791 from RyanDwyer/status-command-optional 
swaybar: allow null status_command
 2018-10-08 14:42:48 +02:00
Ryan Dwyer
5e1983660d Allow status_command to be disabled via IPC 2018-10-08 22:23:55 +10:00
Ryan Dwyer
26bebb9266 Add example status_command to default config 2018-10-08 22:23:55 +10:00
Ryan Dwyer
41bfd8c790 swaybar: allow null status_command 
Sway sets a default status_command which runs date every second. This
patch removes this behaviour so the user can have a NULL status bar if
desired.

I had to swap swaybar's event_loop_poll and wl_display_flush so that it
would map the initial surface.
 2018-10-08 22:23:55 +10:00
Ian Fan
b3b17280de
Merge pull request #2789 from RyanDwyer/reload-idle 
Reload config using idle event
 2018-10-08 12:05:18 +00:00
Ryan Dwyer
e168e8f0ff Don't apply seat config when validating 2018-10-08 21:18:30 +10:00
Ryan Dwyer
88a5e26c6e Remove unneeded variable 2018-10-08 20:40:47 +10:00
Ryan Dwyer
82423991a8 Reload config using idle event 
This patch makes it so when you run reload, the actual reloading is
deferred to the next time the event loop becomes idle. This avoids
several use-after-frees and removes the workarounds we have to avoid
them.

When you run reload, we validate the config before creating the idle
event. This is so the reload command will still return an error if there
are validation errors. To allow this, load_main_config has been adjusted
so it doesn't apply the config if validating is true rather than
applying it unconditionally.

This also fixes a memory leak in the reload command where if the config
failed to load, the bar_ids list would not be freed.
 2018-10-08 19:28:53 +10:00
Drew DeVault
89f4ebef06
Merge pull request #2786 from swaywm/no-op-client-commands 
Shim client.background and client.placeholder
 2018-10-07 23:30:05 +02:00
Drew DeVault
92e1fc00fd Shim client.background and client.placeholder 
These are not supported by sway, but are valid i3 commands and should not
cause config errors.

Also includes a couple of minor touch-ups.
 2018-10-07 14:44:37 -04:00
Drew DeVault
7252c7f715 swaynag: s/Toggle Details/Toggle details/ 2018-10-07 14:37:53 -04:00
emersion
06fade1c8b
Merge pull request #2783 from martinetd/swaynag_uaf 
swaynag: fix use-after-free in wl_display_dispatch
 2018-10-07 09:57:51 +02:00
Dominique Martinet
e5ece5f8b3 swaynag: fix use-after-free in wl_display_dispatch 
When destroying swaynag from within wl_display_dispatch, we cannot
disconnect the display as that will free the queue's event_list.
Free it after running the loop instead.

Fixes this use-after-free:
==7312==ERROR: AddressSanitizer: heap-use-after-free on address 0x612000000110 at pc 0x000000412a9f bp 0x7ffd4e811760 sp 0x7ffd4e811750
READ of size 8 at 0x612000000110 thread T0
    #0 0x412a9e in wl_list_empty ../common/list.c:206
    #1 0x7f5b58f0d42f in dispatch_queue src/wayland-client.c:1572
    #2 0x7f5b58f0d42f in wl_display_dispatch_queue_pending src/wayland-client.c:1815
    #3 0x40f465 in swaynag_run ../swaynag/swaynag.c:390
    #4 0x407576 in main ../swaynag/main.c:123
    #5 0x7f5b58bb9412 in __libc_start_main ../csu/libc-start.c:308
    #6 0x404a3d in _start (/opt/wayland/bin/swaynag+0x404a3d)

0x612000000110 is located 208 bytes inside of 320-byte region [0x612000000040,0x612000000180)
freed by thread T0 here:
    #0 0x7f5b594ab480 in free (/lib64/libasan.so.5+0xef480)
    #1 0x40faff in swaynag_destroy ../swaynag/swaynag.c:454
    #2 0x40cbb4 in layer_surface_closed ../swaynag/swaynag.c:82
    #3 0x7f5b583e1acd in ffi_call_unix64 (/lib64/libffi.so.6+0x6acd)

previously allocated by thread T0 here:
    #0 0x7f5b594aba50 in __interceptor_calloc (/lib64/libasan.so.5+0xefa50)
    #1 0x7f5b58f0c902 in wl_display_connect_to_fd src/wayland-private.h:236

(you need a wayland compiled with asan, my wl_list hack, or running
with valgrind to see this trace)
 2018-10-07 16:35:10 +09:00
Ryan Dwyer
caed15af82 Handle subsurfaces in view_child_damage 2018-10-07 11:07:29 +10:00
Ryan Dwyer
59ba528bd9 Use wlr_xdg_popup_get_toplevel_coords 2018-10-07 11:07:29 +10:00
Ryan Dwyer
1059e173f4 Only damage popups when popups have damage 
The previous behaviour was to damage the entire view, which would
recurse into each popup. This patch makes it damage only the popup's
surface, and respect the surface damage given by the client.

This adds listeners to the popup's map and unmap events rather than
doing the damage in the create and destroy functions. To get the popup's
position relative to the view, a new child_impl function get_root_coords
has been introduced, which traverses up the parents.
 2018-10-07 11:07:29 +10:00
Drew DeVault
8393266eb5
Merge pull request #2778 from emersion/swaybar-seat-pointer 
swaybar: fix binding to wl_pointer multiple times
 2018-10-06 20:10:09 +02:00
emersion
f1d8ba69a6
Merge pull request #2779 from ianyfan/ipc 
ipc: set "type" of floating containers to "floating_con"
 2018-10-06 19:45:54 +02:00
emersion
d50f54fa42 swaybar: fix binding to wl_pointer multiple times 2018-10-06 19:13:44 +02:00
Ian Fan
2cda0b1fe1 ipc: set "type" of floating containers to "floating_con" 2018-10-06 18:11:05 +01:00
emersion
176832fe30
Merge pull request #2776 from swaywm/swaylock-setuid 
Fix swaylock w/shadow on glibc, improve security
 2018-10-06 18:47:34 +02:00
Drew DeVault
c89e00a97e Fix swaylock w/shadow on glibc, improve security 
Today I learned that GNU flaunts the POSIX standard in yet another
creative way. Additionally, this adds some security improvements,
namely:

- Zeroing out password buffers in the privileged child process
- setuid/setgid after reading /etc/shadow
 2018-10-06 12:20:12 -04:00
Drew DeVault
85961f63bf Update CONTRIBUTING.md 2018-10-06 11:52:28 -04:00
emersion
0f45aa4ea9
Merge pull request #2693 from RyanDwyer/move-sticky-in-seat 
Move sticky containers when switching workspace via criteria
 2018-10-06 14:53:09 +02:00
Ryan Dwyer
c620f76bea Move sticky containers when switching workspace via criteria 
* Create a view on workspace 1
* Switch to workspace 2 (on the same output) and create a floating
sticky view
* Use criteria to focus the view on workspace 1

Previously, we only moved the sticky containers when using
workspace_switch, but the above method of focusing doesn't call it. This
patch relocates the sticky-moving code into seat_set_focus_warp.

A side effect of this patch is that if you have a sticky container
focused and then switch workspaces, the sticky container will no longer
be focused. It would previously retain focus.

In seat_set_focus_warp, new_output_last_ws was only set when changing
outputs, but now it's always set. This means new_output_last_ws and
last_workspace might point to the same workspace, which means we have to
make sure we don't destroy it twice. It now checks to make sure they're
different, and to make this more obvious I've moved both calls to
workspace_consider_destroy to be next to each other.
 2018-10-06 19:16:41 +10:00
Drew DeVault
5d21c33f13
Merge pull request #2771 from RyanDwyer/swaylock-seat-capabilities 
swaylock: Support keyboard and pointer disconnects and reconnects
 2018-10-06 01:51:35 +02:00
Ryan Dwyer
b0393ae34b swaylock: Support keyboard and pointer disconnects and reconnects 2018-10-06 09:38:12 +10:00
emersion
c1f09939ae
Merge pull request #2768 from RyanDwyer/fix-flatten-crash 
Fix crash when flattening container after moving
 2018-10-05 09:40:05 +02:00
Ryan Dwyer
44b550298e Fix crash when flattening container after moving 
container_flatten removes the container from the tree (via
container_replace) before destroying it. When destroying, the recent
changes to handle_seat_node_destroy incorrectly assumes that the
container has a parent.

This adds a check for destroying a container which is no longer in the
tree. If this is the case, focus does not need to be changed.
 2018-10-05 16:39:20 +10:00
emersion
c8d1f376d3
Merge pull request #2764 from ianyfan/rm-base64 
Remove obsolete base64.c file
 2018-10-04 21:50:05 +02:00
Ian Fan
e2dc6dfcd8 Remove obsolete base64.c file 2018-10-04 20:17:19 +01:00
Drew DeVault
eecebcafc6 Fix #2763 2018-10-04 15:00:18 -04:00