Commit Graph

956 Commits

Author SHA1 Message Date
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
S. Christoffer Eliesen
c26a4b42cf main: Setup logging before wlc_init.
If `wlc_init` fails the error message will never be logged or printed
anywhere.
2015-11-29 15:01:47 +01:00
Christoph Gysin
7059eccaa1 cmd_output: Log enable/disable state 2015-11-29 15:32:02 +02:00
Christoph Gysin
ffdfaaa985 apply_output_config: use list_seq_find() to find config 2015-11-29 15:31:58 +02:00
Christoph Gysin
7d82cd9c0a cmd_output: Use list_seq_find() to find matching config 2015-11-29 15:29:06 +02:00
Christoph Gysin
88f372a22a cmd_output: Cleanup cmd_output argument handling 2015-11-29 14:51:56 +02:00
S. Christoffer Eliesen
badfb4bb43 cmd_floating: Don't add non-float as sibling to float.
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-29 13:00:10 +01:00
Drew DeVault
01c5349e1a Merge pull request #272 from mikkeloscar/output-cmd-warnings
Add warnings about invalid output commands
2015-11-28 19:24:05 -05:00
Christoph Gysin
923c3245ac Fix option parsing
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-28 23:50:44 +02:00
Christoph Gysin
bf97a5ada5 swaymsg: Add --help option that prints usage 2015-11-28 23:50:44 +02:00
Christoph Gysin
12c8cf5bf6 swaygrab: Add --help option that prints usage 2015-11-28 23:50:44 +02:00
Christoph Gysin
2f2e1f3fc7 sway: Add --help option that prints usage 2015-11-28 23:50:44 +02:00
Christoph Gysin
0d55d1a067 swaymsg: Print usage and exit on unknown options 2015-11-28 23:50:44 +02:00
Christoph Gysin
b235ccd212 swaygrab: Print usage and exit on unknown options 2015-11-28 23:50:44 +02:00
Christoph Gysin
e48a16ce5e sway: Print usage and exit on unknown options 2015-11-28 23:50:44 +02:00
Christoph Gysin
3ba33321de Use macros for exit values 2015-11-28 23:50:10 +02:00
Mikkel Oscar Lyderik
c477bbf345 Add warnings about invalid output commands
This handles some cases where sway will crash if an output command is
invalid/missing an argument.
2015-11-28 22:02:06 +01:00
Drew DeVault
01617131f1 Merge pull request #271 from sce/move_wlc_init
sway/main: Move wlc init to after args are handled.
2015-11-28 14:39:46 -05:00
S. Christoffer Eliesen
20cb390323 sway/main: Move wlc init to after args are handled.
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-28 20:35:57 +01:00
Drew DeVault
1661edee28 Allow output config for output named *
Which will match any output.
2015-11-28 10:18:37 -05:00
Drew DeVault
2f192cceca Improve config file loading
This also makes it so that your i3 config is used before
/etc/sway/config.
2015-11-28 10:00:53 -05:00
Drew DeVault
4916e30378 Remove extraneous logging from swaygrab 2015-11-28 09:04:02 -05:00
Drew DeVault
8b1de6df30 Fix incorrect #include on ipc-client.c 2015-11-28 08:57:45 -05:00
Drew DeVault
e0cb8284fb Rearrange logging headers
Ref #270
2015-11-28 08:49:02 -05:00
Drew DeVault
9b62a98f3e Style fixes in swaybg
CONTRIBUTING.md's code example is sourced from this file, so I updated
it as well.
2015-11-27 16:16:54 -05:00
Drew DeVault
392bfcbfb7 Remove "See Also" from swaygrab man page 2015-11-27 16:02:04 -05:00
Drew DeVault
0bb872ab70 Fix uninitialized variable warning in swaygrab 2015-11-27 16:01:19 -05:00
Drew DeVault
2ef7cf9e97 Add ffmpeg capture to swaygrab (with limitations)
This needs to be multithreaded to have any sort of realistic expectation
of performance, due to issues with syncronous I/O.
2015-11-27 14:21:38 -05:00