aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2018-10-04Remove obsolete base64.c fileIan Fan
2018-10-04Fix #2763Drew DeVault
2018-10-04Merge pull request #2760 from RyanDwyer/swaylock-handle-output-disconnectemersion
Give focus to another swaylock surface when output is disconnected
2018-10-04Merge pull request #2761 from RyanDwyer/seat-op-ignore-buttonsemersion
Ignore unrelated cursor buttons while doing seat operations
2018-10-04Ignore unrelated cursor buttons while doing seat operationsRyan Dwyer
* Click and hold a scrollbar * Drag the cursor onto another surface * While still holding the original button, press and release another cursor button * Things get weird There's two ways to fix this. Either cancel the seat operation and do the other click, or continue the seat operation and ignore the other click. I opted for the latter (ignoring the click) because it's easier to implement, and I suspect a second click during a seat operation is probably unintentional anyway.
2018-10-04Give focus to another swaylock surface when output is disconnectedRyan Dwyer
* Have multiple outputs * Launch swaylock * Unplug an output (possibly has to be the last "connected" one) * The swaylock surface on the remaining output would not respond to key events This was happening because when the output destroys, focus was not given to the other swaylock surface. This patch makes focus be transferred to another surface owned by the same Wayland client, but only if input was inhibited by the surface being destroyed, and only if it's in the overlay layer. I figure it's best to be overly specific and relax the requirements later if needed. This patch removes a check in seat_set_focus_surface which was preventing focus from being passed from a layer surface to any other surface. I don't know of a use case for this check, but it's possible that this change could produce issues.
2018-10-03Merge pull request #2759 from minus7/fix-view-container-nullemersion
Fix crash if view has no container
2018-10-03Merge pull request #2709 from BuJo/feature/raise_floatingDrew DeVault
raise floating
2018-10-03Fix crash if view has no containerminus
2018-10-03Reenable popup-handling for determining focusJonathan Buch
This reenables the popup-handling code before the floating-window focus change.
2018-10-03Use "raycasting" for determining focus for floating windowsJonathan Buch
Floating containers and their surfaces are ordered in "raised last". This is used to detect the topmost surface and thus the focus.
2018-10-03Fix focusing topmost floating windowsJonathan Buch
Re-focus on the container on which the cursor hovers over. A special case is, if there are menus or other subsurfaces open in the focused container. It will prefer the focused container as long as there are subsurfaces. This commit starts caching the previous node as well as the previous x/y cursor position. Re-calculating the previous focused node by looking at the current state of the cursor position does not work, if the environment changes.
2018-10-03Add manpage documentatioon for raise_floatingJonathan Buch
2018-10-03Simplify raising a container in seatJonathan Buch
* Factor out raising a floating window into s separate function to enable reuse.
2018-10-03Add configuration for raising containers on focusJonathan Buch
* New configuration option: raise_floating (From the discussion on https://github.com/i3/i3/issues/2990) * By default, it still raises the window on focus, otherwise it will raise the window on click.
2018-10-03Merge pull request #2757 from RyanDwyer/check-focus-stack-emptyemersion
Add sanity check for empty focus stack
2018-10-03Add sanity check for empty focus stackRyan Dwyer
2018-10-03Remove HACKING.mdDrew DeVault
Half of this is outdated and the other half is questionable.
2018-10-03Fix some missing commands in sway-input(5)Drew DeVault
2018-10-03Merge pull request #2703 from RyanDwyer/csd-borderDrew DeVault
Add CSD to border modes
2018-10-03Merge pull request #2755 from RyanDwyer/fix-tiling-criteriaDrew DeVault
Fix tiling criteria
2018-10-03Fix tiling criteriaRyan Dwyer
2018-10-02Merge pull request #2749 from ianyfan/swaybarDrew DeVault
swaybar: add leading comma to click event JSON
2018-10-02swaybar: add leading comma to click event JSONIan Fan
2018-10-02Merge pull request #2745 from RyanDwyer/fix-focus-inactive-on-destroyDrew DeVault
Set focus_inactive on a sibling when a container closes in an inactive workspace
2018-10-02Set focus_inactive on a sibling when a container closes in an inactive workspaceRyan Dwyer
To reproduce the problem, create layout H[view V[view view view-focused]], then switch to another workspace and have the previously focused view in the vsplit close (eg. using criteria, or an mpv video finishing). Return to the workspace using `$mod+<num>` and the entire vsplit would be focused. This happens because handle_seat_node_destroy would only set a new focus if the currently focused view or a parent was being destroyed. To fix it, it needs to set a sibling of the destroying container to focus_inactive regardless of the current focus, then restore current focus if needed. This patch changes the function accordingly. Additionally: * The function now makes an early return if the node being destroyed is a workspace. * set_focus has been renamed to needs_new_focus. This variable is true if the head focus needs to be changed.
2018-10-02Merge pull request #2740 from RedSoxFan/gap-bordersRyan Dwyer
Handle gap borders
2018-10-01Handle border options for gapsBrian Ashworth
Fixes `hide_edge_borders smart` when gaps are in use. Implements `hide_edge_borders smart_no_gaps` and `smart_borders on|no_gaps|off`. Since `smart_borders on` is equivalent to `hide_edge_borders smart` and `smart_borders no_gaps` is equivalent to `hide_edge_borders smart_no_gaps`, I opted to just save the last value set for `hide_edge_borders` and restore that on `smart_borders off`. This simplifies the conditions for setting the border.
2018-10-02Merge pull request #2739 from RedSoxFan/fix-2653Ryan Dwyer
Fix smart gaps
2018-10-02Merge branch 'master' into fix-2653Ryan Dwyer