aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-25Merge pull request #2974 from RyanDwyer/cursor-rebase-after-txn-applyemersion
Rebase the cursor after applying transactions
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-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.
2018-10-24Rebase the cursor after focusing in a directionRyan Dwyer
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.
2018-10-24Merge pull request #2933 from Snaipe/xwayland-window-propertiesDrew DeVault
xwayland: populate window_properties in json for views
2018-10-23Implement the presentation-time protocolemersion
2018-10-23xwayland: populate window_properties in json for viewsFranklin "Snaipe" Mathieu
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>
2018-10-23Merge pull request #2942 from ianyfan/swaybarDrew DeVault
swaybar: absorb bar_init function into bar_setup
2018-10-23Merge pull request #2944 from RyanDwyer/fix-multiseat-dormant-cursorDrew DeVault
Fix dormant cursor when using multiple seats
2018-10-23seat_update_capabilities: Set cursor image while we have the capabilityRyan Dwyer
2018-10-23Fix dormant cursor when using multiple seatsRyan Dwyer
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.
2018-10-23swaybar: absorb bar_init function into bar_setupIan Fan
2018-10-23swaybar: exit on display errorIan Fan
2018-10-23swaylock: exit on display errorIan Fan
2018-10-23swaylock: exit early if unable to inhibit inputIan Fan
This stops the program from going into a spinlock without exiting
2018-10-23Merge pull request #2941 from ianyfan/commandsRyan Dwyer
commands: clean up checkargs function +other small changes
2018-10-23commands: replace EXPECTED_LESS_THAN with EXPECTED_AT_MOSTIan Fan
This makes it a bit more obvious what the expected number of arguments is.
2018-10-23commands: clean-up checkarg functionIan Fan
Consolidates logic and fixes mistake that used argc instead of val for determining plural.
2018-10-23commands: remove EXPECTED_MORE_THANIan Fan
Its uses have been replaced with EXPECTED_AT_LEAST.
2018-10-23commands: print correct command on error for exec and opacityIan Fan
2018-10-23Merge pull request #2940 from RyanDwyer/fix-swaybar-crashemersion
Fix swaybar crash when there's no status_command
2018-10-23Fix swaybar crash when there's no status_commandRyan Dwyer
2018-10-23Advertize dependency on gitArnaud Vallette d'Osia
2018-10-23Merge pull request #2936 from RedSoxFan/fix-swaynag-commandemersion
cmd_swaynag_command: fix typo in variable
2018-10-22cmd_swaynag_command: fix typo in variableBrian Ashworth
The custom swaynag_command was being stored as config->swaybg_command instead of config->swaynag_command.
2018-10-23Merge pull request #2935 from mteyssier/ref-output-docsDrew DeVault
Add references to sway-output(5) in sway(5)
2018-10-23Merge pull request #2934 from RedSoxFan/config-log-cleanupRyan Dwyer
config: remove peeked + expanded line log entries
2018-10-23Add references to sway-output(5) in sway(5)mteyssier
- update ref in the swaybg_command description - add ref to sway-output(5) in See Also - add an `output` command description
2018-10-22config: remove peeked + expanded line log entriesBrian Ashworth
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.
2018-10-22Merge pull request #2929 from RyanDwyer/fix-scratchpad-resizeDrew DeVault
Fix crash when resizing container hidden in the scratchpad
2018-10-22Merge branch 'master' into fix-scratchpad-resizeBrian Ashworth
2018-10-22Merge pull request #2926 from RyanDwyer/fix-xwayland-floating-logicDrew DeVault
Fix xwayland wants_floating logic
2018-10-23Fix crash when resizing container hidden in the scratchpadRyan Dwyer
Firstly, the container was wrongly identifying as a tiling container because it had no workspace. Secondly, when calculating the maximum possible size we can't use the workspace if it's not there, so we'll allow unlimited size in this case.
2018-10-22Merge pull request #2924 from RyanDwyer/fix-qt-menu-crashDrew DeVault
Fix crash when quitting a QT app on the wayland backend using menu
2018-10-22Merge pull request #2923 from RyanDwyer/fix-move-to-fullscreen-crashDrew DeVault
Fix crash when moving a container to a fullscreen workspace
2018-10-22Merge pull request #2922 from RedSoxFan/fix-2905Ryan Dwyer
cmd_reload: recalc font sizing + rebuild textures
2018-10-22Fix xwayland wants_floating logicRyan Dwyer
2018-10-22Fix crash when quitting a QT app on the wayland backend using menuRyan Dwyer
QT unmaps the view before destroying the popup. We destroyed the popup in response to the view unmapping, but then we'd attempt to destroy it a second time which caused a crash. The patch removes the listener. I tested it with GTK as well, and can confirm the popup is still being destroyed.