aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-26Merge pull request #544 from mikkeloscar/add-include-commandDrew DeVault
Add include command
2016-03-26Add config path to error msgMikkel Oscar Lyderik
2016-03-26Load correct config on reloadMikkel Oscar Lyderik
2016-03-26Document include commandMikkel Oscar Lyderik
2016-03-26Implement include commandMikkel Oscar Lyderik
The include command (`include <path>`) makes it possible to include sub config files from the main config file (or from within other sub config files). The include command uses the following rules for including config files: * the `path` can be either a full path or a path that is relative to the parent config. Shell expansion is supported, so it's possible to do `include ~/.config/sway.d/*`. * The same config file can only be included once (to prevent include cycles). If a config is included multiple times it will just be ignored after it has been included once. * Including a sub config file is the same as inserting the content of that file into the parent config, thus rules about overwriting bindsyms etc. works the same as for a single config. Implement #542
2016-03-25Update README.mdDrew DeVault
2016-03-25Update README.md packaging infoDrew DeVault
2016-03-25Fix link to PGP keyDrew DeVault
2016-03-25Merge pull request #543 from fluxchief/masterDrew DeVault
Add graphical feedback to swaylock (#526)
2016-03-25Add graphical feedback to swaylock (#526)Kevin Hamacher
2016-03-24Merge pull request #538 from nuew/display-imagesDrew DeVault
Add choice of display to --image.
2016-03-24Replace with in swaylockNuew
2016-03-24Merge branch 'master' into display-imagesEthan
2016-03-24Change 'display' to 'output' in swaylock error messages where necessaryNuew
2016-03-24Change 'display' to 'output' in swaylock docs where necessaryNuew
2016-03-24CMake: add missing wlc include dir for common and swaygrabDominique Martinet
2016-03-24Add choice of display to --image.Nuew
Additionally - Made background colors display when an image is enabled if a --color is specified. - Link CJson to swaylock. - Add the --socket option to swaylock.
2016-03-24Merge pull request #537 from mikkeloscar/exit-on-config-missingDrew DeVault
Gracefully exit when config is not found
2016-03-24Gracefully exit when config is not foundMikkel Oscar Lyderik
This makes sure that sway will gracefully exit if the config is not found or sway is unable to read it.
2016-03-24Make the nvidia warning louderDrew DeVault
2016-03-24Merge pull request #536 from jcaesar/masterDrew DeVault
swaylock: Interpret XKB_KEY_BackSpace as a deletion instead of a normal key.
2016-03-24swaylock: Interpret XKB_KEY_BackSpace as a deletion instead of a normal key.Julius Michaelis
2016-03-24Update READMEDrew DeVault
2016-03-24Don't set WLC_DIM on startupDrew DeVault
2016-03-24Update to new WLC APIDrew DeVault
2016-03-23Merge pull request #535 from mikkeloscar/fix-swaylock-crashDrew DeVault
swaylock: Fix crash when unable to connect to sway
2016-03-23swaylock: Fix crash when unable to connect to wlMikkel Oscar Lyderik
Prevent swaylock from crashing when it can't connect to wayland for whatever reason. i.e. XDG_RUNTIME_DIR not set. Fix #534
2016-03-22Merge pull request #530 from mikkeloscar/swaybar-kill-on-sway-crashDrew DeVault
swaybar: Abort when receiving 0 bytes in IPC call
2016-03-22Abort when receiving 0 bytes in IPC callMikkel Oscar Lyderik
When sway crashes a swaybar process is sometimes left behind running at 100% CPU. This was caused by the swaybar trying to retrieve an IPC response from the closed sway socket. This patch fixes the problem by aborting when the socket has been closed (recv return 0). Fix #528
2016-03-21Merge pull request #527 from gkbrk/swaylock_password_growDrew DeVault
swaylock: Grow the password buffer
2016-03-21swaylock: Grow the password bufferGökberk Yaltıraklı
2016-03-20Merge pull request #525 from mikkeloscar/fix-clang-warningDrew DeVault
Use correct type for keycode
2016-03-20Merge pull request #524 from mikkeloscar/smart-gapsDrew DeVault
Implement 'smart_gaps' feature from i3-gaps
2016-03-20Use correct type for keycodeMikkel Oscar Lyderik
2016-03-20Implement 'smart_gaps' feature from i3-gapsMikkel Oscar Lyderik
2016-03-19Merge pull request #523 from mikkeloscar/slack-key-handlerDrew DeVault
Make key handling less strict
2016-03-19Make key handling less strictMikkel Oscar Lyderik
Sway has been very strict when it comes to key handling. Only on an exact match would a bindsym be triggered. This patch makes it less strict by for instance allowing the key combo `$mod+1+2` to act as `$mod+2` if 2 was the last pressed key and `$mod+1` if 1 was the last pressed key. The new key handling uses the following algorithm: 1. List of bindings sorted by number of keys in binding (already the default) 2. Find all bindings covered by the current keyboard state and list them by same order as in 1. 3. Select the first binding from the list where the last pressed key is part of the binding. Addresses #452
2016-03-19Allow legal non-x11 keycodesMikkel Oscar Lyderik
2016-03-18Merge pull request #522 from mikkeloscar/workspace-layoutDrew DeVault
Add config option workspace_layout
2016-03-19Add config option workspace_layoutMikkel Oscar Lyderik
This implements the config parsing of `workspace_layout <default|stacking|tabbed>` http://i3wm.org/docs/userguide.html#_layout_mode_for_new_containers
2016-03-18New default wallpaper!Drew DeVault
2016-03-18Merge pull request #520 from aouelete/swaylockDrew DeVault
Add a manpage for swaylock
2016-03-18Merge branch 'master' of git://github.com/SirCmpwn/sway into swaylockAaron Ouellette
2016-03-18Merge pull request #519 from mikkeloscar/maintain-exec-quotesDrew DeVault
Don't strip quotes from exec args
2016-03-18Don't strip quotes from exec argsMikkel Oscar Lyderik
Before passing a command to a command handler the quotes are stripped from each argument in the command. This is usually the wanted behavior but causes a problem in the case of `exec` where quoted arguments can be required when passing the exec command to `/bin/sh -c`. This patch makes `exec` a special case and doesn't strip quotes from the arguments. It will just pass the exec command verbatim to the exec command handler. Fix #518
2016-03-17Merge pull request #516 from mikkeloscar/remove-panel_sizeDrew DeVault
Remove unused panel_size (and fix rearrange)
2016-03-17Remove unused panel_size (and fix rearrange)Mikkel Oscar Lyderik
desktop_shell.panel_size was only used to determine if sway should rearrange the output when rendering the panel in the output_pre_render hook. This is not needed since the output will have been arranged at that point. It also caused sway to rearrange all the time when running with two or more different monitors/resolutions because panel_size kept changing with every output_pre_render callback. Should fix #514
2016-03-17Merge pull request #515 from mikkeloscar/focus-correct-swaylock-viewDrew DeVault
Focus correct swaylock view in multimonitor setup
2016-03-17Focus correct swaylock view in multimonitor setupMikkel Oscar Lyderik
Swaylock spawns and focuses a view for each output in sway. This can sometimes move the focus to a new output after locking and unlocking the screens. This patch makes sure that the output which had focus when swaylock was invoked, will regain focus once swaylock is closed/unlocked. Fix #499
2016-03-17Merge pull request #513 from mikkeloscar/sway-bar-manpageDrew DeVault
Document swaybar commands