aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorLines
2015-12-02cmake: build common code only onceChristoph Gysin-78/+93
This creates (static) libraries for protocols/, common/, and wayland/.
2015-12-02Merge pull request #290 from christophgysin/cmakeDrew DeVault-14/+14
cmake: fix indentation and manpage dependencies
2015-12-02cmake: fix manpage dependenciesChristoph Gysin-2/+2
fixes #289
2015-12-02cmake: fix indentationChristoph Gysin-14/+14
2015-12-01Fix for_window [...] move scratchpad correctlyDrew DeVault-1/+2
2015-12-01Revert "Fix bug with for_window [...] move scratchpad"Drew DeVault-2/+1
This reverts commit 0796b0c475bb46095d14a5291d62dd8e7d098262.
2015-12-01Fix bug with for_window [...] move scratchpadDrew DeVault-1/+2
2015-12-01Fix busted install of /etc/sway/configDrew DeVault-1/+1
2015-12-01Merge pull request #287 from christophgysin/cmakeDrew DeVault-103/+96
cmake: extract config from toplevel CMakeLists.txt
2015-12-01cmake: remove extra spaceChristoph Gysin-1/+1
2015-12-01cmake: remove subprojectsChristoph Gysin-22/+14
2015-12-01cmake: extract swayChristoph Gysin-49/+49
2015-12-01cmake: extract add_manpage()Christoph Gysin-31/+32
2015-12-01Remove build badge (Travis is broken, not sway)Drew DeVault-1/+1
2015-12-01Update .gitignoreDrew DeVault-0/+1
2015-12-01Merge pull request #285 from christophgysin/cmakeDrew DeVault-135/+182
cmake configuration cleanup
2015-12-01Merge pull request #286 from mikkeloscar/wlc-origin-pointDrew DeVault-5/+5
Use wlc_point instead of deprecated wlc_origin
2015-12-01Use wlc_point instead of deprecated wlc_originMikkel Oscar Lyderik-5/+5
Struct was renamed in wlc, use the new name.
2015-12-01cmake: remove unnecessary quotesChristoph Gysin-30/+30
2015-12-01cmake: remove old-style endif conditionChristoph Gysin-1/+1
2015-12-01cmake: use out-of-source buildChristoph Gysin-9/+4
2015-12-01cmake: separate C flags and preprocesser definitionsChristoph Gysin-1/+7
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