summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
| * | tree/view.c: fix uninitialized variables warningLibravatar Cole Mickens2018-10-26
|/ /
* | Merge pull request #2994 from RyanDwyer/respect-lone-child-borderLibravatar Drew DeVault2018-10-27
|\ \ | | | | | | Respect border settings when rendering lone tabbed/stacked child
| * | Respect border settings when rendering lone tabbed/stacked childLibravatar Ryan Dwyer2018-10-27
|/ / | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2993 from mwenzkowski/fix-2992Libravatar Brian Ashworth2018-10-26
|\ \ | | | | | | Fix #2992
| * | Fix #2992Libravatar mwenzkowski2018-10-26
|/ / | | | | | | Move a function call, such that data it depends on is initialized before.
* | Merge pull request #2989 from RyanDwyer/fix-focus-glitchinessLibravatar Drew DeVault2018-10-26
|\ \ | | | | | | Fix focus after a non-visible workspace's last container is destroyed
| * | Fix focus after a non-visible workspace's last container is destroyedLibravatar Ryan Dwyer2018-10-26
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2985 from mihaicmn/fix-retilingLibravatar Drew DeVault2018-10-26
|\ \ | | | | | | Fix re-tiling for floating containers
| * | Fix re-tiling for floating containersLibravatar Mihai Coman2018-10-25
| | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2984 from Ferdi265/masterLibravatar emersion2018-10-25
|\ \ \ | |/ / |/| / | |/ sway-ipc: don't log errno if unneeded and add more descriptive errors
| * sway-ipc: don't log errno if unneeded and add more descriptive errorsLibravatar Ferdinand Bachmann2018-10-25
|/
* Merge pull request #2982 from Toromtomtom/masterLibravatar Drew DeVault2018-10-25
|\ | | | | protect newline
| * protect newlineLibravatar Tom Warnke2018-10-25
|/
* Merge pull request #2980 from ppascher/allow_workspace_missing_outputLibravatar Drew DeVault2018-10-25
|\ | | | | Update workspace.c
| * Update workspace.cLibravatar ppascher2018-10-25
| | | | | | re-added missing output check after config load
| * Update workspace.cLibravatar ppascher2018-10-25
|/ | | Remove output requirement for workspace command
* Merge pull request #2973 from ianyfan/swaybarLibravatar emersion2018-10-25
|\ | | | | swaybar: fix scrolling behaviour
| * swaybar: when scrolling, check that there are workspaces to scroll onLibravatar Ian Fan2018-10-25
| |
| * swaybar: fix scrolling behaviourLibravatar Ian Fan2018-10-25
| | | | | | | | | | 1. wrap_scroll has been fixed 2. release bindings are checked when returning early
| * swaybar: reverse order of workspaces listLibravatar Ian Fan2018-10-25
| | | | | | | | | | This makes it congruent with its visual appearance, making it easier to reason about.
* | Merge pull request #2975 from RyanDwyer/deny-commands-when-no-outputsLibravatar Drew DeVault2018-10-25
|\ \ | | | | | | Deny several commands when there's no outputs connected
| * | Deny several commands when there's no outputs connectedLibravatar Ryan Dwyer2018-10-26
| | |
* | | Merge pull request #2974 from RyanDwyer/cursor-rebase-after-txn-applyLibravatar emersion2018-10-25
|\ \ \ | |/ / |/| | Rebase the cursor after applying transactions
| * | Rebase the cursor after applying transactionsLibravatar Ryan Dwyer2018-10-25
|/ / | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2950 from emersion/presentation-timeLibravatar Drew DeVault2018-10-25
|\ \ | |/ |/| Implement the presentation-time protocol
| * Implement the presentation-time protocolLibravatar emersion2018-10-23
| |
* | Merge pull request #2971 from RyanDwyer/document-output-identifiersLibravatar emersion2018-10-25
|\ \ | | | | | | Document how to identify outputs by make, model and serial
| * | Document how to identify outputs by make, model and serialLibravatar Ryan Dwyer2018-10-25
| | |
* | | Merge pull request #2970 from RyanDwyer/fix-scratchpad-sizeLibravatar emersion2018-10-25
|\ \ \ | |/ / |/| | Fix containers not being resized when entering scratchpad
| * | Fix containers not being resized when entering scratchpadLibravatar Ryan Dwyer2018-10-25
|/ / | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2925 from ianyfan/swaylockLibravatar Drew DeVault2018-10-24
|\ \ | | | | | | swaylock: exit early if unable to get input inhibitor
| * | swaybar: exit on display errorLibravatar Ian Fan2018-10-23
| | |
| * | swaylock: exit on display errorLibravatar Ian Fan2018-10-23
| | |
| * | swaylock: exit early if unable to inhibit inputLibravatar Ian Fan2018-10-23
| | | | | | | | | | | | This stops the program from going into a spinlock without exiting
* | | Merge pull request #2964 from RyanDwyer/tab-wheel-focus-inactiveLibravatar Drew DeVault2018-10-24
|\ \ \ | | | | | | | | When scrolling on a tab titlebar, set focus_inactive if not focused
| * | | When scrolling on a tab titlebar, set focus_inactive if not focusedLibravatar Ryan Dwyer2018-10-24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2957 from RyanDwyer/rebase-cursor-after-mapLibravatar Drew DeVault2018-10-24
|\ \ \ | | | | | | | | Rebase the cursor after mapping a view
| * | | Rebase the cursor after mapping a viewLibravatar Ryan Dwyer2018-10-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #2954 from RyanDwyer/cursor-rebase-after-focus-directionLibravatar Drew DeVault2018-10-24
|\ \ \ \ | | | | | | | | | | Rebase the cursor after focusing in a direction
| * | | | Rebase the cursor after focusing in a directionLibravatar Ryan Dwyer2018-10-24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch, creating a tabbed container with two views, switching tab and then scrolling without motion would cause the scroll events to be sent to the old focus. To fix this, rebasing the cursor is needed after changing focus.
* | | | Merge pull request #2961 from RyanDwyer/swaylock-multiseatLibravatar emersion2018-10-24
|\ \ \ \ | |/ / / |/| | | Add multiseat support to swaylock
| * | | Add multiseat support to swaylockLibravatar Ryan Dwyer2018-10-24
|/ / /
* | | Merge pull request #2933 from Snaipe/xwayland-window-propertiesLibravatar Drew DeVault2018-10-24
|\ \ \ | |_|/ |/| | xwayland: populate window_properties in json for views
| * | xwayland: populate window_properties in json for viewsLibravatar Franklin "Snaipe" Mathieu2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | window_properties is documented to contain a subset of the X11 properties of a window (its title, class, instance, role, and transient ID). This commit adds the missing json object from the get_tree output for xwayland windows only. This is a follow-up of #2911. Signed-off-by: Franklin "Snaipe" Mathieu <me@snai.pe>
* | | Merge pull request #2942 from ianyfan/swaybarLibravatar Drew DeVault2018-10-23
|\ \ \ | | | | | | | | swaybar: absorb bar_init function into bar_setup
| * | | swaybar: absorb bar_init function into bar_setupLibravatar Ian Fan2018-10-23
| | |/ | |/|
* | | Merge pull request #2944 from RyanDwyer/fix-multiseat-dormant-cursorLibravatar Drew DeVault2018-10-23
|\ \ \ | |/ / |/| | Fix dormant cursor when using multiple seats
| * | seat_update_capabilities: Set cursor image while we have the capabilityLibravatar Ryan Dwyer2018-10-23
| | |
| * | Fix dormant cursor when using multiple seatsLibravatar Ryan Dwyer2018-10-23
|/ / | | | | | | | | | | The cursor's image would be removed or set when the seat's capabilities were updated, but there was nothing to prevent the image from being set at other times.
* | Merge pull request #2941 from ianyfan/commandsLibravatar Ryan Dwyer2018-10-23
|\ \ | | | | | | commands: clean up checkargs function +other small changes