Christoph Gysin
bf5244b49c
Fix using last output config if none matched
2015-12-02 23:05:04 +02:00
Drew DeVault
7a1c8c2939
Merge pull request #291 from christophgysin/libs
...
cmake: build common code only once
2015-12-02 05:34:18 -05:00
Christoph Gysin
cce9c338c0
cmake: build common code only once
...
This creates (static) libraries for protocols/, common/, and wayland/.
2015-12-02 12:15:57 +02:00
Drew DeVault
f76b7f5385
Merge pull request #290 from christophgysin/cmake
...
cmake: fix indentation and manpage dependencies
2015-12-02 04:42:14 -05:00
Christoph Gysin
6ce4bba6eb
cmake: fix manpage dependencies
...
fixes #289
2015-12-02 07:12:41 +02:00
Christoph Gysin
ad22b072bc
cmake: fix indentation
2015-12-02 07:06:32 +02:00
Drew DeVault
9b9d968cbf
Fix for_window [...] move scratchpad correctly
2015-12-01 18:09:37 -05:00
Drew DeVault
d098c620fe
Revert "Fix bug with for_window [...] move scratchpad"
...
This reverts commit 0796b0c475
2015-12-01 18:05:37 -05:00
Drew DeVault
0796b0c475
Fix bug with for_window [...] move scratchpad
2015-12-01 18:00:46 -05:00
Drew DeVault
98ff23b497
Fix busted install of /etc/sway/config
2015-12-01 16:57:03 -05:00
Drew DeVault
fc01f04c93
Merge pull request #287 from christophgysin/cmake
...
cmake: extract config from toplevel CMakeLists.txt
2015-12-01 15:57:03 -05:00
Christoph Gysin
38d4ee9f50
cmake: remove extra space
2015-12-01 22:47:22 +02:00
Christoph Gysin
c9ce15aa18
cmake: remove subprojects
2015-12-01 22:47:22 +02:00
Christoph Gysin
92a3538381
cmake: extract sway
2015-12-01 22:47:22 +02:00
Christoph Gysin
4277070a7b
cmake: extract add_manpage()
2015-12-01 22:47:22 +02:00
Drew DeVault
297d8b3f02
Remove build badge (Travis is broken, not sway)
2015-12-01 15:27:41 -05:00
Drew DeVault
5dd88cd6b6
Update .gitignore
2015-12-01 15:27:08 -05:00
Drew DeVault
1fbabc6c74
Merge pull request #285 from christophgysin/cmake
...
cmake configuration cleanup
2015-12-01 15:25:41 -05:00
Drew DeVault
ef9258bd66
Merge pull request #286 from mikkeloscar/wlc-origin-point
...
Use wlc_point instead of deprecated wlc_origin
2015-12-01 15:17:07 -05:00
Mikkel Oscar Lyderik
3658777e47
Use wlc_point instead of deprecated wlc_origin
...
Struct was renamed in wlc, use the new name.
2015-12-01 21:04:34 +01:00
Christoph Gysin
55b3532fe0
cmake: remove unnecessary quotes
2015-12-01 22:03:53 +02:00
Christoph Gysin
8f00eac07b
cmake: remove old-style endif condition
2015-12-01 22:03:09 +02:00
Christoph Gysin
2dedf206d7
cmake: use out-of-source build
2015-12-01 22:03:09 +02:00
Christoph Gysin
a043c9030c
cmake: separate C flags and preprocesser definitions
2015-12-01 22:03:09 +02:00
Christoph Gysin
f7ec3d00a0
cmake: use tabs instead of spaces
2015-12-01 22:03:09 +02:00
Christoph Gysin
905966bcae
cmake: style consistency
2015-12-01 22:03:09 +02:00
Christoph Gysin
2429266e3e
cmake: convert all cmake commands to lowercase
2015-12-01 22:03:09 +02:00
Drew DeVault
76a3868ce8
Merge pull request #284 from gpyh/master
...
FALLBACK_CONFIG_DIR did not work. Fixed.
2015-12-01 13:56:26 -05:00
Yacine Hmito
f3f77f9ff1
FALLBACK_CONFIG_DIR did not work. Fixed.
...
- Flag was ignored. Now it's taken into account.
- Missing trailing slashes in path now behaves properly.
2015-12-01 19:41:44 +01:00
Drew DeVault
3075b4a61d
Merge pull request #281 from gpyh/master
...
Can customize fallback config directory
2015-11-30 19:16:47 -05:00
Yacine Hmito
09feef89ee
Can customize config fallback directory
...
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-12-01 01:07:48 +01:00
Drew DeVault
44d0f731c3
Add framework for switching command sets
...
This will allow the bar {} block to have a different command set (and
also bar { colors { } }.
2015-11-29 17:20:27 -05:00
Drew DeVault
4f89735fc4
Add bar config struct and defaults
2015-11-29 17:05:04 -05:00
Drew DeVault
3f950b6e52
Merge pull request #278 from christophgysin/merge
...
cmd_output: Merge instead of replace output config
2015-11-29 16:26:11 -05:00
Christoph Gysin
b1bd3ae6f3
cmd_output: Merge instead of replace output config
2015-11-29 23:17:56 +02:00
Christoph Gysin
ae7ed79573
config: Store 'enabled' as int
2015-11-29 23:17:55 +02:00
Drew DeVault
e906b4e240
Merge pull request #277 from christophgysin/cmd_output
...
cmd_output: check for missing subcommand arguments
2015-11-29 15:41:43 -05:00
Christoph Gysin
3c8763af22
cmd_output: check for missing subcommand arguments
2015-11-29 22:36:17 +02:00
Drew DeVault
82d464bb90
Add text rendering support to wayland clients
2015-11-29 15:27:28 -05:00
Drew DeVault
5a369b3132
Only strip comments at the start of a line
...
This is necessary because i3 config files use CSS notation for colors
(i.e. #rrggbb).
2015-11-29 14:02:58 -05:00
Drew DeVault
ef91764bc7
Fix output adjustment for panels
2015-11-29 13:59:12 -05:00
Drew DeVault
e59cffcea2
Support desktop shell panels in compositor
2015-11-29 12:03:13 -05:00
Drew DeVault
60e76cf932
Add swaybar basics
...
This should make the bar open and appear as the panel, once sway
supports panels. Right now it crashes sway!
2015-11-29 10:58:18 -05:00
Drew DeVault
63cf8e48c4
Add swaybar subproject
2015-11-29 10:26:50 -05:00
Drew DeVault
fd4cf52518
Add suid instructions to readme
2015-11-29 10:18:02 -05:00
Drew DeVault
9d2bbe2640
Merge pull request #274 from sce/fix_stray_floats
...
cmd_floating: Don't add non-float as sibling to float.
2015-11-29 09:10:29 -05:00
Drew DeVault
25ad3181f5
Merge pull request #276 from sce/earlier_logging
...
main: Setup logging before wlc_init.
2015-11-29 09:08:56 -05:00
Drew DeVault
4c1fad95b9
Remove trailing semicolon
2015-11-29 09:07:50 -05:00
Drew DeVault
c942f1624e
Merge pull request #275 from christophgysin/cmd_output
...
refactor cmd_output
2015-11-29 09:07:22 -05:00
Drew DeVault
0af15cc19e
Merge pull request #269 from christophgysin/usage
...
Add --help to print usage
2015-11-29 09:04:39 -05:00
