summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
* Merge pull request #874 from yohanesu75/ipc-client-fixLibravatar Drew DeVault2016-08-30
|\ | | | | Fix to make ipc client code FreeBSD compatible.
| * Fix to make ipc client code FreeBSD compatible.Libravatar Johannes Lundberg2016-08-30
|/
* Merge pull request #869 from Hummer12007/patch-1Libravatar Drew DeVault2016-08-22
|\ | | | | Fix a format string
| * Fix a format stringLibravatar Hummer120072016-08-22
|/
* Merge pull request #867 from kb100/fix-865Libravatar Drew DeVault2016-08-20
|\ | | | | Avoid dereferencing null configuration
| * Avoid dereferencing null configurationLibravatar James Murphy2016-08-20
|/ | | | Fixes: https://github.com/SirCmpwn/sway/issues/865
* Merge pull request #862 from goetzc/masterLibravatar Drew DeVault2016-08-18
|\ | | | | Add input example section to config
| * Add input example section to configLibravatar Götz Christ2016-08-18
|/ | | | Also improve sway-input(5) description to be more consistent with sway-bar(5).
* Merge pull request #853 from guiniol/indicator-colorLibravatar Drew DeVault2016-08-11
|\ | | | | Implement indicator color
| * Update man pageLibravatar Guillaume Brogi2016-08-12
| | | | | | | | | | The man page mentioned that "indicator" wasn't implemented, this isn't the case anymore.
| * Rerender after every split commandLibravatar Guillaume Brogi2016-08-12
| |
| * Add support for indicator colorLibravatar Guillaume Brogi2016-08-11
|/
* Merge pull request #851 from thejan2009/output-disable-during-runtimeLibravatar Drew DeVault2016-08-10
|\ | | | | Handle output disabling during runtime
| * Handle output disabling during runtimeLibravatar D.B2016-08-10
|/ | | | | Output now gets disabled if disable command is invoked via bindsym or IPC.
* Merge pull request #846 from mmlb/doc-all-xkb-env-varsLibravatar Drew DeVault2016-08-09
|\ | | | | document all xkb settings handled by wlc
| * document all xkb settings handled by wlcLibravatar Manuel Mendez2016-08-09
|/
* Merge pull request #843 from thejan2009/bug/move-container-819Libravatar Drew DeVault2016-08-07
|\ | | | | Fix container move when workspace is focused
| * Fix container move when workspace is focusedLibravatar D.B2016-08-07
| | | | | | | | | | | | Fixes #819. If workspace is focused and command 'move container to workspace/output' is issued, workspace child containers are wrapped in a new container and moved according to command.
* | Merge pull request #842 from thejan2009/bug/move-workspace-sort-outputLibravatar Drew DeVault2016-08-07
|\ \ | |/ |/| Sort workspaces when moving workspace to output
| * Sort workspaces when moving workspace to outputLibravatar D.B2016-08-07
|/ | | | This should fix #839
* Merge pull request #841 from thejan2009/tabbed-title-avoiding-nullLibravatar Drew DeVault2016-08-07
|\ | | | | Display class in container title if app_id is null
| * Display class in tab title if app_id is nullLibravatar D.B2016-08-07
|/ | | | | | This is a feature that can't work the same as i3, because there is no real window classes in wayland. This way, we avoid null titles as much as possible.
* Merge pull request #840 from minus7/man-inputsLibravatar Drew DeVault2016-08-05
|\ | | | | added get_inputs hint to man 5 sway-input
| * added get_inputs hint to man 5 sway-inputLibravatar minus2016-08-05
| |
* | Merge pull request #838 from thejan2009/bug/workspace-switch-bugLibravatar Drew DeVault2016-08-05
|\ \ | | | | | | Fix switch to prev ws on handle_view_created
| * | Fix switch to prev ws on handle_view_createdLibravatar D.B2016-08-05
|/ / | | | | | | | | Switching back to original workspace should be done only if workspace was switched while appending new view.
* | Merge pull request #837 from acrisci/feature/log-eventsLibravatar Drew DeVault2016-08-04
|\ \ | | | | | | ipc: log sending of events
| * | ipc: log sending of eventsLibravatar Tony Crisci2016-08-04
|/ / | | | | | | | | Log the sending of the events in the debug log. This makes ipc server events easier to verify.
* | Merge pull request #836 from acrisci/feature/ipc-recursive-workspaceLibravatar Drew DeVault2016-08-04
|\ \ | | | | | | ipc: recursive workspace containers in event
| * | ipc: recursive workspace containers in eventLibravatar Tony Crisci2016-08-04
|/ / | | | | | | | | Recursively describe workspace containers in the workspace event. This is for compatability with i3 and i3ipc libraries.
* | Merge pull request #835 from acrisci/feature/ipc-view-include-nodesLibravatar Drew DeVault2016-08-04
|\ \ | | | | | | ipc: always include nodes in views
| * | ipc: always include nodes in viewsLibravatar Tony Crisci2016-08-04
|/ / | | | | | | This is for i3 (and i3ipc library) compatability.
* | Merge pull request #834 from Hummer12007/swapfixLibravatar Drew DeVault2016-08-04
|\ \ | | | | | | Arrange windows after swapping containers
| * | Arrange windows after swapping containersLibravatar Mykyta Holubakha2016-08-05
|/ / | | | | | | Fixes #833
* | Merge pull request #832 from thejan2009/bug/workspace-back-and-forthLibravatar Drew DeVault2016-08-04
|\ \ | | | | | | Fix 'workspace back_and_forth' and workspace_auto_back_and_forth clash
| * | Fix 'workspace back_and_forth' and workspace_auto_back_and_forth clashLibravatar D.B2016-08-04
|/ / | | | | | | | | | | | | | | When workspace_auto_back_and_forth is enabled, workspaces get switched twice with previously mentioned command, which is not the expected behavior. Removes one redundant creation of previous workspace.
* | Merge pull request #831 from progandy/fix_colorsLibravatar Drew DeVault2016-08-04
|\ \ | | | | | | common: use strtoul in parse_color to avoid clamp
| * | common: use strtoul in parse_color to avoid clampLibravatar progandy2016-08-04
|/ / | | | | | | | | Some implementations of strtol may clamp the values to LONG_MAX instead of wrapping around to negative values, so use strtoul instead to parse colors.
* | Merge pull request #830 from acrisci/feature/simplify-set-focusLibravatar Drew DeVault2016-08-04
|\ \ | | | | | | Simplify focus setting
| * | Simplify focus settingLibravatar Tony Crisci2016-08-03
|/ / | | | | | | | | Merge the main rendering paths of all containers to make focus setting a bit simpler and easier to follow.
* | Merge pull request #827 from acrisci/bug/ipc-id-uintLibravatar Drew DeVault2016-08-03
|\ \ | | | | | | Use uintptr_t for ipc container id
| * | Use uintptr_t for ipc container idLibravatar Tony Crisci2016-08-03
|/ / | | | | | | This is for compatability with i3.
* | Merge pull request #822 from mayhewj/add-resize-to-configLibravatar Drew DeVault2016-08-03
|\ \ | | | | | | Add resize mode to the default config file
| * | Add resize mode to configLibravatar Justin Mayhew2016-08-03
| | | | | | | | | | | | These are the default keybindings in i3.
| * | Don't repeat direction keys in configLibravatar Justin Mayhew2016-08-02
|/ / | | | | | | | | | | I really didn't want to have to repeat the direction keys again for resize mode, and this makes it easier to change all of the relevant keybindings if you don't like the defaults (or prefer i3's).
* | Merge pull request #820 from minus7/bar-wrap-scroll-fixLibravatar Drew DeVault2016-08-02
|\ \ | |/ |/| fixed uninitialized bar.wrap_scroll
| * fixed uninitialized bar.wrap_scrollLibravatar minus2016-08-02
|/
* Merge pull request #817 from zandrmartin/fix-unmanaged-node-jsonLibravatar Drew DeVault2016-08-02
|\ | | | | remove unmanaged nodes from get_tree
| * remove unmanaged nodes from get_treeLibravatar Zandr Martin2016-08-02
| |
* | Merge pull request #810 from acrisci/feature/swaymsg-prettyLibravatar Drew DeVault2016-08-02
|\ \ | |/ |/| swaymsg: pretty print ipc response