aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorLines
2015-12-01cmake: use tabs instead of spacesChristoph Gysin-123/+123
2015-12-01cmake: style consistencyChristoph Gysin-44/+90
2015-12-01cmake: convert all cmake commands to lowercaseChristoph Gysin-16/+16
2015-12-01Merge pull request #284 from gpyh/masterDrew DeVault-2/+3
FALLBACK_CONFIG_DIR did not work. Fixed.
2015-12-01FALLBACK_CONFIG_DIR did not work. Fixed.Yacine Hmito-2/+3
- Flag was ignored. Now it's taken into account. - Missing trailing slashes in path now behaves properly.
2015-11-30Merge pull request #281 from gpyh/masterDrew DeVault-9/+16
Can customize fallback config directory
2015-12-01Can customize config fallback directoryYacine Hmito-9/+16
CMake takes a `FALLBACK_CONFIG_DIR` flag which is the directory where the standard configuration file `config` is copied at installation. If loading from typical configuration directories fails, sway loads FALLBACK_CONFIG_DIR/config (/etc/sway/config by default).
2015-11-29Add framework for switching command setsDrew DeVault-7/+30
This will allow the bar {} block to have a different command set (and also bar { colors { } }.
2015-11-29Add bar config struct and defaultsDrew DeVault-1/+56
2015-11-29Merge pull request #278 from christophgysin/mergeDrew DeVault-9/+48
cmd_output: Merge instead of replace output config
2015-11-29cmd_output: Merge instead of replace output configChristoph Gysin-4/+43
2015-11-29config: Store 'enabled' as intChristoph Gysin-5/+5
2015-11-29Merge pull request #277 from christophgysin/cmd_outputDrew DeVault-5/+16
cmd_output: check for missing subcommand arguments
2015-11-29cmd_output: check for missing subcommand argumentsChristoph Gysin-5/+16
2015-11-29Add text rendering support to wayland clientsDrew DeVault-2/+87
2015-11-29Only strip comments at the start of a lineDrew DeVault-23/+5
This is necessary because i3 config files use CSS notation for colors (i.e. #rrggbb).
2015-11-29Fix output adjustment for panelsDrew DeVault-30/+34
2015-11-29Support desktop shell panels in compositorDrew DeVault-22/+130
2015-11-29Add swaybar basicsDrew DeVault-4/+97
This should make the bar open and appear as the panel, once sway supports panels. Right now it crashes sway!
2015-11-29Add swaybar subprojectDrew DeVault-0/+57
2015-11-29Add suid instructions to readmeDrew DeVault-0/+4
2015-11-29Merge pull request #274 from sce/fix_stray_floatsDrew DeVault-3/+1
cmd_floating: Don't add non-float as sibling to float.
2015-11-29Merge pull request #276 from sce/earlier_loggingDrew DeVault-8/+8
main: Setup logging before wlc_init.
2015-11-29Remove trailing semicolonDrew DeVault-1/+1
2015-11-29Merge pull request #275 from christophgysin/cmd_outputDrew DeVault-22/+31
refactor cmd_output
2015-11-29Merge pull request #269 from christophgysin/usageDrew DeVault-21/+75
Add --help to print usage
2015-11-29main: Setup logging before wlc_init.S. Christoffer Eliesen-8/+8
If `wlc_init` fails the error message will never be logged or printed anywhere.
2015-11-29cmd_output: Log enable/disable stateChristoph Gysin-3/+4
2015-11-29apply_output_config: use list_seq_find() to find configChristoph Gysin-5/+3
2015-11-29cmd_output: Use list_seq_find() to find matching configChristoph Gysin-7/+14
2015-11-29cmd_output: Cleanup cmd_output argument handlingChristoph Gysin-7/+10
2015-11-29cmd_floating: Don't add non-float as sibling to float.S. Christoffer Eliesen-3/+1
When turning a float to a non-float, `get_focused_container` might return another floating view, causing the active view to be inserted into the floating list on its workspace instead of the normal child list which it should. (Since it has `is_floating` as false the resulting discrepency triggered other bad behaviour eventually leading sway to crash.) This patch fixes that by simply checking floating status before making it a sibling.
2015-11-28Merge pull request #272 from mikkeloscar/output-cmd-warningsDrew DeVault-2/+8
Add warnings about invalid output commands
2015-11-28Fix option parsingChristoph Gysin-11/+8
Using 'flag' results in duplicate code paths for short and long options. This broke the -q short option in swaymsg, because there was: {"quiet", no_argument, &quiet, 'q'} Which will set quiet to 'q' and return 0, not 'q'.
2015-11-28swaymsg: Add --help option that prints usageChristoph Gysin-1/+6
2015-11-28swaygrab: Add --help option that prints usageChristoph Gysin-1/+6
2015-11-28sway: Add --help option that prints usageChristoph Gysin-1/+10
2015-11-28swaymsg: Print usage and exit on unknown optionsChristoph Gysin-0/+11
2015-11-28swaygrab: Print usage and exit on unknown optionsChristoph Gysin-0/+12
2015-11-28sway: Print usage and exit on unknown optionsChristoph Gysin-0/+15
2015-11-28Use macros for exit valuesChristoph Gysin-8/+8
2015-11-28Add warnings about invalid output commandsMikkel Oscar Lyderik-2/+8
This handles some cases where sway will crash if an output command is invalid/missing an argument.
2015-11-28Merge pull request #271 from sce/move_wlc_initDrew DeVault-14/+12
sway/main: Move wlc init to after args are handled.
2015-11-28sway/main: Move wlc init to after args are handled.S. Christoffer Eliesen-14/+12
First of all because it's not needed that early, and second of all because there's a bug where calling `sway --get-socketpath` via `popen` causes the child sway process to spin/hang instead of returning EOF. (Specifically `(unset SWAYSOCK; swaymsg)` hangs.) This patch fixes that. (Also note that this patch moves the "detailed review" comment, so I guess this patch requires extra detailed review?)
2015-11-28Allow output config for output named *Drew DeVault-1/+20
Which will match any output.
2015-11-28Improve config file loadingDrew DeVault-63/+27
This also makes it so that your i3 config is used before /etc/sway/config.
2015-11-28Remove extraneous logging from swaygrabDrew DeVault-1/+0
2015-11-28Fix incorrect #include on ipc-client.cDrew DeVault-1/+1
2015-11-28Rearrange logging headersDrew DeVault-4/+7
Ref #270
2015-11-27Style fixes in swaybgDrew DeVault-78/+78
CONTRIBUTING.md's code example is sourced from this file, so I updated it as well.