aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* 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
| * | commands: replace EXPECTED_LESS_THAN with EXPECTED_AT_MOSTLibravatar Ian Fan2018-10-23
| | | | | | | | | | | | This makes it a bit more obvious what the expected number of arguments is.
| * | commands: clean-up checkarg functionLibravatar Ian Fan2018-10-23
| | | | | | | | | | | | | | | Consolidates logic and fixes mistake that used argc instead of val for determining plural.
| * | commands: remove EXPECTED_MORE_THANLibravatar Ian Fan2018-10-23
| | | | | | | | | | | | Its uses have been replaced with EXPECTED_AT_LEAST.
| * | commands: print correct command on error for exec and opacityLibravatar Ian Fan2018-10-23
|/ /
* | Merge pull request #2940 from RyanDwyer/fix-swaybar-crashLibravatar emersion2018-10-23
|\ \ | | | | | | Fix swaybar crash when there's no status_command
| * | Fix swaybar crash when there's no status_commandLibravatar Ryan Dwyer2018-10-23
|/ /
* | Advertize dependency on gitLibravatar Arnaud Vallette d'Osia2018-10-23
| |
* | Merge pull request #2936 from RedSoxFan/fix-swaynag-commandLibravatar emersion2018-10-23
|\ \ | | | | | | cmd_swaynag_command: fix typo in variable
| * | cmd_swaynag_command: fix typo in variableLibravatar Brian Ashworth2018-10-22
|/ / | | | | | | | | The custom swaynag_command was being stored as config->swaybg_command instead of config->swaynag_command.
* | Merge pull request #2935 from mteyssier/ref-output-docsLibravatar Drew DeVault2018-10-23
|\ \ | | | | | | Add references to sway-output(5) in sway(5)
| * | Add references to sway-output(5) in sway(5)Libravatar mteyssier2018-10-23
| | | | | | | | | | | | | | | | | | - update ref in the swaybg_command description - add ref to sway-output(5) in See Also - add an `output` command description
* | | Merge pull request #2934 from RedSoxFan/config-log-cleanupLibravatar Ryan Dwyer2018-10-23
|\ \ \ | |/ / |/| | config: remove peeked + expanded line log entries
| * | config: remove peeked + expanded line log entriesLibravatar Brian Ashworth2018-10-22
|/ / | | | | | | | | | | | | | | The peeked and expanded line log entries were useful during the switch to generic code blocks and subcommands. However, it has been a while since those were introduced and the log entries are no longer helpful for any remaining issues with config parsing. Instead of keeping them as clutter in the log, they can just be removed.
* | Merge pull request #2929 from RyanDwyer/fix-scratchpad-resizeLibravatar Drew DeVault2018-10-22
|\ \ | | | | | | Fix crash when resizing container hidden in the scratchpad