aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-27Merge pull request #3000 from Robinhuett/workspace_address_output_by_nameemersion
Use output identifier for workspace config
2018-10-27Merge pull request #3003 from Hi-Angel/masteremersion
seat: don't traverse the list to check if it's empty
2018-10-27seat: don't traverse the list to check if it's emptyKonstantin Kharlamov
Found by introspection. Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
2018-10-27Merge pull request #3001 from madblobfish/swaylock-completions-and-manpageDrew DeVault
Reworked fish completions and moved stuff in swaylock manpage
2018-10-27added fish completions for swaynagmadblobfish
2018-10-27added fish completions for swayidlemadblobfish
2018-10-27Use output identifier for workspace configRobinhuett
2018-10-27reordered swaylock manpagemadblobfish
2018-10-27updated fish completions for swaylockmadblobfish
2018-10-27Revert "Fix #2992"Drew DeVault
This reverts commit 94985146ea00b40f72cd6afaa191fd92a46e4fd3.
2018-10-27Merge pull request #2997 from RyanDwyer/fix-cursor-during-operationemersion
Don't reset cursor during mouse operations
2018-10-27Don't reset cursor during mouse operationsRyan Dwyer
2018-10-27Merge pull request #2995 from colemickens/uninit-warningsRyan Dwyer
tree/view.c: fix uninitialized variables warning
2018-10-26tree/view.c: fix uninitialized variables warningCole Mickens
2018-10-27Merge pull request #2994 from RyanDwyer/respect-lone-child-borderDrew DeVault
Respect border settings when rendering lone tabbed/stacked child
2018-10-27Respect border settings when rendering lone tabbed/stacked childRyan Dwyer
In i3, when a child of a tabbed or stacked container has no siblings, its border settings are respected. This patch achieves the same effect by rendering a lone tabbed/stacked child as if it's a linear container. This makes the border settings be respected. Over in view_autoconfigure, we compensate for this by only adjusting `y_offset` if there's multiple children.
2018-10-26Merge pull request #2993 from mwenzkowski/fix-2992Brian Ashworth
Fix #2992
2018-10-26Fix #2992mwenzkowski
Move a function call, such that data it depends on is initialized before.
2018-10-26Merge pull request #2989 from RyanDwyer/fix-focus-glitchinessDrew DeVault
Fix focus after a non-visible workspace's last container is destroyed
2018-10-26Fix focus after a non-visible workspace's last container is destroyedRyan Dwyer
The code being changed is responsible for updating the focus stack when a container is destroyed in a different part of the tree to where the real focus is. It's attempting to set focus_inactive to a sibling (or parent if no siblings) of the container that is being destroyed, then put our real focus back on the end of the focus stack. The problem occurs when the container being destroyed is in a different workspace. For example: * Have a focused view on workspace 1 * Have workspace 2 not visible with a single view that is unmapping * The first call to seat_set_raw_focus sets focus to workspace 2 because it's the parent * Prior to this patch, the second call to seat_set_raw_focus would set focus to the view on workspace 1 * Later, when using output_get_active_workspace, this function would return workspace 2 because it's the first workspace it finds in the focus stack. To fix this, workspace 1 must be placed on the focus stack between workspace 2 and the focused view. That's what this patch does. Lastly, it also uses seat_get_focus_inactive to choose the focus. This fixes a crash when a view unmaps while a non-container is focused (eg. swaylock), because focus is NULL.
2018-10-26Merge pull request #2985 from mihaicmn/fix-retilingDrew DeVault
Fix re-tiling for floating containers
2018-10-25Merge pull request #2984 from Ferdi265/masteremersion
sway-ipc: don't log errno if unneeded and add more descriptive errors
2018-10-25Fix re-tiling for floating containersMihai Coman
When a floating container is tiled (e.g.: 'floating toggle' or 'floating disable'), it should be placed after/below the inactive focused container from the tiling layout.
2018-10-25sway-ipc: don't log errno if unneeded and add more descriptive errorsFerdinand Bachmann
2018-10-25Merge pull request #2982 from Toromtomtom/masterDrew DeVault
protect newline
2018-10-25protect newlineTom Warnke
2018-10-25Merge pull request #2980 from ppascher/allow_workspace_missing_outputDrew DeVault
Update workspace.c
2018-10-25Update workspace.cppascher
re-added missing output check after config load
2018-10-25Update workspace.cppascher
Remove output requirement for workspace command
2018-10-25Merge pull request #2973 from ianyfan/swaybaremersion
swaybar: fix scrolling behaviour
2018-10-25Merge pull request #2975 from RyanDwyer/deny-commands-when-no-outputsDrew DeVault
Deny several commands when there's no outputs connected
2018-10-25Merge pull request #2974 from RyanDwyer/cursor-rebase-after-txn-applyemersion
Rebase the cursor after applying transactions
2018-10-26Deny several commands when there's no outputs connectedRyan Dwyer
2018-10-25Rebase the cursor after applying transactionsRyan Dwyer
This approaches cursor rebasing from a different angle. Rather than littering the codebase with cursor_rebase calls and using transaction callbacks, this just runs cursor_rebase after applying every transaction - but only if there's outputs connected, because otherwise it causes a crash during shutdown. There is one known case where we still need to call cursor_rebase directly, and that's when running `seat seat0 cursor move ...`. This command doesn't set anything as dirty so no transaction occurs.
2018-10-25Merge pull request #2950 from emersion/presentation-timeDrew DeVault
Implement the presentation-time protocol
2018-10-25swaybar: when scrolling, check that there are workspaces to scroll onIan Fan
2018-10-25swaybar: fix scrolling behaviourIan Fan
1. wrap_scroll has been fixed 2. release bindings are checked when returning early
2018-10-25swaybar: reverse order of workspaces listIan Fan
This makes it congruent with its visual appearance, making it easier to reason about.
2018-10-25Merge pull request #2971 from RyanDwyer/document-output-identifiersemersion
Document how to identify outputs by make, model and serial
2018-10-25Merge pull request #2970 from RyanDwyer/fix-scratchpad-sizeemersion
Fix containers not being resized when entering scratchpad
2018-10-25Document how to identify outputs by make, model and serialRyan Dwyer
2018-10-25Fix containers not being resized when entering scratchpadRyan Dwyer
This fixes a regression introduced by 662466e8db773926bf61b21280194a3540ae26ec. When adding a container to the scratchpad, setting container->scratchpad = true before container_set_floating made container_set_floating believe that the container was already floating. This fixes it by setting the property afterwards instead.
2018-10-24Merge pull request #2925 from ianyfan/swaylockDrew DeVault
swaylock: exit early if unable to get input inhibitor
2018-10-24Merge pull request #2964 from RyanDwyer/tab-wheel-focus-inactiveDrew DeVault
When scrolling on a tab titlebar, set focus_inactive if not focused
2018-10-24When scrolling on a tab titlebar, set focus_inactive if not focusedRyan Dwyer
For example, create layout H[view T[view view view]], focus the view in the hsplit and scroll the mouse wheel over the tab title bars. Prior to this patch, focus would be given to a descendant of the tabbed container. This patch keeps the focus on the hsplit view. This also renames some of the variables used in this part of the code to make it be easier to follow.
2018-10-24Merge pull request #2957 from RyanDwyer/rebase-cursor-after-mapDrew DeVault
Rebase the cursor after mapping a view
2018-10-24Merge pull request #2954 from RyanDwyer/cursor-rebase-after-focus-directionDrew DeVault
Rebase the cursor after focusing in a direction
2018-10-24Merge pull request #2961 from RyanDwyer/swaylock-multiseatemersion
Add multiseat support to swaylock
2018-10-24Add multiseat support to swaylockRyan Dwyer
2018-10-24Rebase the cursor after mapping a viewRyan Dwyer
I originally put the rebase at the end of view_map, but at this point the view is still at its native size and will ignore the motion event if it falls outside of its native size. The only way to do this properly is to rebase the cursor later - either after sending the configure, after the view commits with the new size, or after applying the transaction. I chose to do it after applying the transaction for simplicity. I then attempted to just call cursor_rebase after applying every transaction, but this causes crashes when exiting sway (and possibly other places) because cursor_rebase assumes the tree is in a valid state. So my chosen solution introduces transaction_commit_dirty_with_callback which allows handle_map to register a callback which will run when the transaction is applied.