aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-09Implement bar bindsymBrian Ashworth
2018-10-09Merge pull request #2804 from Emantor/swaynag-double-freeDrew DeVault
config: remove double free of config->swaynag_command
2018-10-09config: remove double free of config->swaynag_commandRouven Czerwinski
Fixes #2796
2018-10-09Merge pull request #2772 from RyanDwyer/improve-popup-damageDrew DeVault
Only damage popups when popups have damage
2018-10-08Merge pull request #2782 from RyanDwyer/popup-during-fullscreenBrian Ashworth
Implement popup_during_fullscreen
2018-10-08Merge branch 'master' into popup-during-fullscreenBrian Ashworth
2018-10-08Merge pull request #2799 from ianyfan/commandsemersion
commands: when setting urgency, check container is not null
2018-10-08commands: when setting urgency, check container is not nullIan Fan
2018-10-08Merge pull request #2795 from RedSoxFan/swaynag-disableemersion
Allow swaynag to be disabled
2018-10-08Allow swaynag to be disabledBrian Ashworth
2018-10-08Merge pull request #2793 from emersion/disable-swaybgemersion
Allow swaybg to be disabled
2018-10-08Remove duplicate codeRyan Dwyer
2018-10-08Merge pull request #2794 from johnae/fix-opacity-crashing-bugemersion
Check if there is a current container before setting its opacity
2018-10-08Look for any ancestor when checking for fullscreen exitRyan Dwyer
2018-10-08Use current state when rendering transient containersRyan Dwyer
2018-10-08Fix memory leak in status_command handleremersion
2018-10-08Check if there is a current container before setting it's opacityJohn Axel Eriksson
2018-10-08Allow swaybg to be disabledemersion
Same as #2791 but for swaybg. Fixes #2790
2018-10-08Introduce container_is_transient_forRyan Dwyer
2018-10-08Implement popup_during_fullscreenRyan Dwyer
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-08Merge pull request #2791 from RyanDwyer/status-command-optionalDrew DeVault
swaybar: allow null status_command
2018-10-08Allow status_command to be disabled via IPCRyan Dwyer
2018-10-08Add example status_command to default configRyan Dwyer
2018-10-08swaybar: allow null status_commandRyan Dwyer
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-08Merge pull request #2789 from RyanDwyer/reload-idleIan Fan
Reload config using idle event
2018-10-08Don't apply seat config when validatingRyan Dwyer
2018-10-08Remove unneeded variableRyan Dwyer
2018-10-08Reload config using idle eventRyan Dwyer
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-07Merge pull request #2786 from swaywm/no-op-client-commandsDrew DeVault
Shim client.background and client.placeholder
2018-10-07Shim client.background and client.placeholderDrew DeVault
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-07swaynag: s/Toggle Details/Toggle details/Drew DeVault
2018-10-07Merge pull request #2783 from martinetd/swaynag_uafemersion
swaynag: fix use-after-free in wl_display_dispatch
2018-10-07swaynag: fix use-after-free in wl_display_dispatchDominique Martinet
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-07Handle subsurfaces in view_child_damageRyan Dwyer
2018-10-07Use wlr_xdg_popup_get_toplevel_coordsRyan Dwyer
2018-10-07Only damage popups when popups have damageRyan Dwyer
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-06Merge pull request #2778 from emersion/swaybar-seat-pointerDrew DeVault
swaybar: fix binding to wl_pointer multiple times
2018-10-06Merge pull request #2779 from ianyfan/ipcemersion
ipc: set "type" of floating containers to "floating_con"
2018-10-06swaybar: fix binding to wl_pointer multiple timesemersion
2018-10-06ipc: set "type" of floating containers to "floating_con"Ian Fan
2018-10-06Merge pull request #2776 from swaywm/swaylock-setuidemersion
Fix swaylock w/shadow on glibc, improve security
2018-10-06Fix swaylock w/shadow on glibc, improve securityDrew DeVault
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-06Update CONTRIBUTING.mdDrew DeVault
2018-10-06Merge pull request #2693 from RyanDwyer/move-sticky-in-seatemersion
Move sticky containers when switching workspace via criteria
2018-10-06Move sticky containers when switching workspace via criteriaRyan Dwyer
* 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-06Merge pull request #2771 from RyanDwyer/swaylock-seat-capabilitiesDrew DeVault
swaylock: Support keyboard and pointer disconnects and reconnects
2018-10-06swaylock: Support keyboard and pointer disconnects and reconnectsRyan Dwyer
2018-10-05Merge pull request #2768 from RyanDwyer/fix-flatten-crashemersion
Fix crash when flattening container after moving
2018-10-05Fix crash when flattening container after movingRyan Dwyer
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-04Merge pull request #2764 from ianyfan/rm-base64emersion
Remove obsolete base64.c file