aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
| * | Merge branch 'master' into popup-during-fullscreenLibravatar Brian Ashworth2018-10-08
| |\ \ | |/ / |/| |
* | | Merge pull request #2799 from ianyfan/commandsLibravatar emersion2018-10-08
|\ \ \ | | | | | | | | commands: when setting urgency, check container is not null
| * | | commands: when setting urgency, check container is not nullLibravatar Ian Fan2018-10-08
|/ / /
* | | Merge pull request #2795 from RedSoxFan/swaynag-disableLibravatar emersion2018-10-08
|\ \ \ | | | | | | | | Allow swaynag to be disabled
| * | | Allow swaynag to be disabledLibravatar Brian Ashworth2018-10-08
|/ / /
* | | Merge pull request #2793 from emersion/disable-swaybgLibravatar emersion2018-10-08
|\ \ \ | | | | | | | | Allow swaybg to be disabled
| * | | Fix memory leak in status_command handlerLibravatar emersion2018-10-08
| | | |
| * | | Allow swaybg to be disabledLibravatar emersion2018-10-08
| | | | | | | | | | | | | | | | | | | | | | | | Same as #2791 but for swaybg. Fixes #2790
* | | | Merge pull request #2794 from johnae/fix-opacity-crashing-bugLibravatar emersion2018-10-08
|\ \ \ \ | |/ / / |/| | | Check if there is a current container before setting its opacity
| * | | Check if there is a current container before setting it's opacityLibravatar John Axel Eriksson2018-10-08
|/ / /
| * | Remove duplicate codeLibravatar Ryan Dwyer2018-10-08
| | |
| * | Look for any ancestor when checking for fullscreen exitLibravatar Ryan Dwyer2018-10-08
| | |
| * | Use current state when rendering transient containersLibravatar Ryan Dwyer2018-10-08
| | |
| * | Introduce container_is_transient_forLibravatar Ryan Dwyer2018-10-08
| | |
| * | Implement popup_during_fullscreenLibravatar Ryan Dwyer2018-10-08
|/ / | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2791 from RyanDwyer/status-command-optionalLibravatar Drew DeVault2018-10-08
|\ \ | | | | | | swaybar: allow null status_command
| * | Allow status_command to be disabled via IPCLibravatar Ryan Dwyer2018-10-08
| | |
| * | Add example status_command to default configLibravatar Ryan Dwyer2018-10-08
| | |
| * | swaybar: allow null status_commandLibravatar Ryan Dwyer2018-10-08
|/ / | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2789 from RyanDwyer/reload-idleLibravatar Ian Fan2018-10-08
|\ \ | | | | | | Reload config using idle event
| * | Don't apply seat config when validatingLibravatar Ryan Dwyer2018-10-08
| | |
| * | Remove unneeded variableLibravatar Ryan Dwyer2018-10-08
| | |
| * | Reload config using idle eventLibravatar Ryan Dwyer2018-10-08
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2786 from swaywm/no-op-client-commandsLibravatar Drew DeVault2018-10-07
|\ \ | | | | | | Shim client.background and client.placeholder
| * | Shim client.background and client.placeholderLibravatar Drew DeVault2018-10-07
|/ / | | | | | | | | | | | | 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.
* | swaynag: s/Toggle Details/Toggle details/Libravatar Drew DeVault2018-10-07
| |
* | Merge pull request #2783 from martinetd/swaynag_uafLibravatar emersion2018-10-07
|\ \ | |/ |/| swaynag: fix use-after-free in wl_display_dispatch
| * swaynag: fix use-after-free in wl_display_dispatchLibravatar Dominique Martinet2018-10-07
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* Merge pull request #2778 from emersion/swaybar-seat-pointerLibravatar Drew DeVault2018-10-06
|\ | | | | swaybar: fix binding to wl_pointer multiple times
| * swaybar: fix binding to wl_pointer multiple timesLibravatar emersion2018-10-06
| |
* | Merge pull request #2779 from ianyfan/ipcLibravatar emersion2018-10-06
|\ \ | |/ |/| ipc: set "type" of floating containers to "floating_con"
| * ipc: set "type" of floating containers to "floating_con"Libravatar Ian Fan2018-10-06
|/
* Merge pull request #2776 from swaywm/swaylock-setuidLibravatar emersion2018-10-06
|\ | | | | Fix swaylock w/shadow on glibc, improve security
| * Fix swaylock w/shadow on glibc, improve securityLibravatar Drew DeVault2018-10-06
|/ | | | | | | | | 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
* Update CONTRIBUTING.mdLibravatar Drew DeVault2018-10-06
|
* Merge pull request #2693 from RyanDwyer/move-sticky-in-seatLibravatar emersion2018-10-06
|\ | | | | Move sticky containers when switching workspace via criteria
| * Move sticky containers when switching workspace via criteriaLibravatar Ryan Dwyer2018-10-06
|/ | | | | | | | | | | | | | | | | | | | | | * 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.
* Merge pull request #2771 from RyanDwyer/swaylock-seat-capabilitiesLibravatar Drew DeVault2018-10-06
|\ | | | | swaylock: Support keyboard and pointer disconnects and reconnects
| * swaylock: Support keyboard and pointer disconnects and reconnectsLibravatar Ryan Dwyer2018-10-06
|/
* Merge pull request #2768 from RyanDwyer/fix-flatten-crashLibravatar emersion2018-10-05
|\ | | | | Fix crash when flattening container after moving
| * Fix crash when flattening container after movingLibravatar Ryan Dwyer2018-10-05
|/ | | | | | | | | | 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.
* Merge pull request #2764 from ianyfan/rm-base64Libravatar emersion2018-10-04
|\ | | | | Remove obsolete base64.c file
| * Remove obsolete base64.c fileLibravatar Ian Fan2018-10-04
|/
* Fix #2763Libravatar Drew DeVault2018-10-04
|
* Merge pull request #2760 from RyanDwyer/swaylock-handle-output-disconnectLibravatar emersion2018-10-04
|\ | | | | Give focus to another swaylock surface when output is disconnected
| * Give focus to another swaylock surface when output is disconnectedLibravatar Ryan Dwyer2018-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge pull request #2761 from RyanDwyer/seat-op-ignore-buttonsLibravatar emersion2018-10-04
|\ \ | |/ |/| Ignore unrelated cursor buttons while doing seat operations
| * Ignore unrelated cursor buttons while doing seat operationsLibravatar Ryan Dwyer2018-10-04
|/ | | | | | | | | | | | | | * 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.
* Merge pull request #2759 from minus7/fix-view-container-nullLibravatar emersion2018-10-03
|\ | | | | Fix crash if view has no container
| * Fix crash if view has no containerLibravatar minus2018-10-03
| |