aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-10Merge pull request #2811 from RyanDwyer/fix-floating-click-eventsDrew DeVault
Fix floating click events
2018-10-10Merge pull request #2812 from RyanDwyer/fix-version-messagesemersion
Fix program name in version strings
2018-10-10Fix program name in version stringsRyan Dwyer
When running swaymsg -v, the version returned is actually the version of swaymsg itself, yet the message displayed was "sway version <version>". This can create confusion if users update sway and swaymsg but don't restart sway, then use swaymsg to check the version. This patch changes the wording to be "swaymsg version <version>" instead, and likewise for swaybar. To get the version of a running sway instance, users should run swaymsg -t get_version.
2018-10-10Fix floating click eventsRyan Dwyer
* Set focus to a floating container when clicking its title bar. * Raise floating when user clicks title bar or decorations (in the seat_begin functions). * In container_at, it only returned a floating container if the user had clicked the surface. This makes it use floating_container_at instead.
2018-10-10Merge pull request #2810 from RyanDwyer/fix-docs-backandforthDrew DeVault
Fix back_and_forth documentation
2018-10-10Fix back_and_forth documentationRyan Dwyer
2018-10-10Merge pull request #2809 from mwenzkowski/fix-view_autoconfigureDrew DeVault
Fix undesirable height change of floating views
2018-10-09Fix undesirable height change of floating viewsmwenzkowski
In view_autoconfigure the height of the view is adjusted if the parent container has a tabbed/stacked layout. Previously this height change would also be applied to floating views, although it is not needed for them.
2018-10-09Merge pull request #2805 from RyanDwyer/fix-resize-return-valueDrew DeVault
resize: Determine if anything changed using before/after check
2018-10-09Merge pull request #2803 from RedSoxFan/fix-2802Drew DeVault
Only consider tiling views for gaps outer
2018-10-09resize: Determine if anything changed using before/after checkRyan Dwyer
Returning a boolean from container_resize_tiled and resize_tiled doesn't work in all cases. This patch changes it back to void and does a before/after check to see if the container was resized.
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-08Only consider tiling views for gaps outerBrian Ashworth
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