summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Update default config to suggest includeLibravatar Drew DeVault2016-03-26
|
* Merge pull request #546 from mikkeloscar/include-handle-dirLibravatar Drew DeVault2016-03-26
|\ | | | | Don't try to read config if not a file.
| * Don't try to read config if not a file.Libravatar Mikkel Oscar Lyderik2016-03-26
|/
* Merge pull request #544 from mikkeloscar/add-include-commandLibravatar Drew DeVault2016-03-26
|\ | | | | Add include command
| * Add config path to error msgLibravatar Mikkel Oscar Lyderik2016-03-26
| |
| * Load correct config on reloadLibravatar Mikkel Oscar Lyderik2016-03-26
| |
| * Document include commandLibravatar Mikkel Oscar Lyderik2016-03-26
| |
| * Implement include commandLibravatar Mikkel Oscar Lyderik2016-03-26
|/ | | | | | | | | | | | | | | | | | | | 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
* Update README.mdLibravatar Drew DeVault2016-03-25
|
* Update README.md packaging infoLibravatar Drew DeVault2016-03-25
|
* Fix link to PGP keyLibravatar Drew DeVault2016-03-25
|
* Merge pull request #543 from fluxchief/masterLibravatar Drew DeVault2016-03-25
|\ | | | | Add graphical feedback to swaylock (#526)
| * Add graphical feedback to swaylock (#526)Libravatar Kevin Hamacher2016-03-25
|/
* Merge pull request #538 from nuew/display-imagesLibravatar Drew DeVault2016-03-24
|\ | | | | Add choice of display to --image.
| * Replace with in swaylockLibravatar Nuew2016-03-24
| |
| * Merge branch 'master' into display-imagesLibravatar Ethan2016-03-24
| |\ | |/ |/|
* | CMake: add missing wlc include dir for common and swaygrabLibravatar Dominique Martinet2016-03-24
| |
| * Change 'display' to 'output' in swaylock error messages where necessaryLibravatar Nuew2016-03-24
| |
| * Change 'display' to 'output' in swaylock docs where necessaryLibravatar Nuew2016-03-24
| |
| * Add choice of display to --image.Libravatar Nuew2016-03-24
|/ | | | | | | | 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.
* Merge pull request #537 from mikkeloscar/exit-on-config-missingLibravatar Drew DeVault2016-03-24
|\ | | | | Gracefully exit when config is not found
| * Gracefully exit when config is not foundLibravatar Mikkel Oscar Lyderik2016-03-24
|/ | | | | This makes sure that sway will gracefully exit if the config is not found or sway is unable to read it.
* Make the nvidia warning louderLibravatar Drew DeVault2016-03-24
|
* Merge pull request #536 from jcaesar/masterLibravatar Drew DeVault2016-03-24
|\ | | | | swaylock: Interpret XKB_KEY_BackSpace as a deletion instead of a normal key.
| * swaylock: Interpret XKB_KEY_BackSpace as a deletion instead of a normal key.Libravatar Julius Michaelis2016-03-24
|/
* Update READMELibravatar Drew DeVault2016-03-24
|
* Don't set WLC_DIM on startup0.1Libravatar Drew DeVault2016-03-24
|
* Update to new WLC APILibravatar Drew DeVault2016-03-24
|
* Merge pull request #535 from mikkeloscar/fix-swaylock-crashLibravatar Drew DeVault2016-03-23
|\ | | | | swaylock: Fix crash when unable to connect to sway
| * swaylock: Fix crash when unable to connect to wlLibravatar Mikkel Oscar Lyderik2016-03-23
|/ | | | | | | Prevent swaylock from crashing when it can't connect to wayland for whatever reason. i.e. XDG_RUNTIME_DIR not set. Fix #534
* Merge pull request #530 from mikkeloscar/swaybar-kill-on-sway-crashLibravatar Drew DeVault2016-03-22
|\ | | | | swaybar: Abort when receiving 0 bytes in IPC call
| * Abort when receiving 0 bytes in IPC callLibravatar Mikkel Oscar Lyderik2016-03-22
|/ | | | | | | | | | | 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
* Merge pull request #527 from gkbrk/swaylock_password_growLibravatar Drew DeVault2016-03-21
|\ | | | | swaylock: Grow the password buffer
| * swaylock: Grow the password bufferLibravatar Gökberk Yaltıraklı2016-03-21
|/
* Merge pull request #525 from mikkeloscar/fix-clang-warningLibravatar Drew DeVault2016-03-20
|\ | | | | Use correct type for keycode
| * Use correct type for keycodeLibravatar Mikkel Oscar Lyderik2016-03-20
| |
* | Merge pull request #524 from mikkeloscar/smart-gapsLibravatar Drew DeVault2016-03-20
|\ \ | |/ |/| Implement 'smart_gaps' feature from i3-gaps
| * Implement 'smart_gaps' feature from i3-gapsLibravatar Mikkel Oscar Lyderik2016-03-20
|/
* Merge pull request #523 from mikkeloscar/slack-key-handlerLibravatar Drew DeVault2016-03-19
|\ | | | | Make key handling less strict
| * Make key handling less strictLibravatar Mikkel Oscar Lyderik2016-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Allow legal non-x11 keycodesLibravatar Mikkel Oscar Lyderik2016-03-19
|/
* Merge pull request #522 from mikkeloscar/workspace-layoutLibravatar Drew DeVault2016-03-18
|\ | | | | Add config option workspace_layout
| * Add config option workspace_layoutLibravatar Mikkel Oscar Lyderik2016-03-19
|/ | | | | | | This implements the config parsing of `workspace_layout <default|stacking|tabbed>` http://i3wm.org/docs/userguide.html#_layout_mode_for_new_containers
* New default wallpaper!Libravatar Drew DeVault2016-03-18
|
* Merge pull request #520 from aouelete/swaylockLibravatar Drew DeVault2016-03-18
|\ | | | | Add a manpage for swaylock
| * Merge branch 'master' of git://github.com/SirCmpwn/sway into swaylockLibravatar Aaron Ouellette2016-03-18
| |\ | |/ |/|
* | Merge pull request #519 from mikkeloscar/maintain-exec-quotesLibravatar Drew DeVault2016-03-18
|\ \ | | | | | | Don't strip quotes from exec args
| * | Don't strip quotes from exec argsLibravatar Mikkel Oscar Lyderik2016-03-18
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #516 from mikkeloscar/remove-panel_sizeLibravatar Drew DeVault2016-03-17
|\ \ | | | | | | Remove unused panel_size (and fix rearrange)
| * | Remove unused panel_size (and fix rearrange)Libravatar Mikkel Oscar Lyderik2016-03-17
|/ / | | | | | | | | | | | | | | | | | | | | | | 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