mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-27 15:36:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

swaylock: Allow for transparent color values

Browse source 
There is only a slight issue. When using a transparent color the views
are arranged to make room for swaylock which we can now see. I tried removing
the arrange call but that just made it worse by putting in an opaque view on the
workspace and not making the lockoverlay color. Ill raise an issue if
this is not easily solved
This commit is contained in:
crondog 2016-01-28 11:41:57 +11:00
parent 3a4564a367
commit 73ec01d854
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
swaylock/main.c
View file

@ -211,12 +211,12 @@ int main(int argc, char **argv) {
const char *usage = const char *usage =
"Usage: swaylock [options...]\n" "Usage: swaylock [options...]\n"
"\n" "\n"
" -h, --help Show help message and quit.\n" " -h, --help Show help message and quit.\n"
" -c, --color <rrggbb> Turn the screen into the given color instead of white.\n" " -c, --color <rrggbb[aa]> Turn the screen into the given color instead of white.\n"
" -s, --scaling Scaling mode: stretch, fill, fit, center, tile.\n" " -s, --scaling Scaling mode: stretch, fill, fit, center, tile.\n"
" -t, --tiling Same as --scaling=tile.\n" " -t, --tiling Same as --scaling=tile.\n"
" -v, --version Show the version number and quit.\n" " -v, --version Show the version number and quit.\n"
" -i, --image <path> Display the given image.\n"; " -i, --image <path> Display the given image.\n";
int c; int c;
while (1) { while (1) {
@ -226,16 +226,22 @@ int main(int argc, char **argv) {
break; break;
} }
switch (c) { switch (c) {
case 'c': case 'c':
if (strlen(optarg) < 6) { {
fprintf(stderr, "color must be specified in 3 byte format, e.g. ff0000\n"); int colorlen = strlen(optarg);
if (colorlen < 6 || colorlen == 7 || colorlen > 8) {
fprintf(stderr, "color must be specified in 3 or 4 byte format, e.g. ff0000 or ff0000ff\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
color = strtol(optarg, NULL, 16); color = strtol(optarg, NULL, 16);
color <<= 8;
color |= 0xFF; if (colorlen == 6) {
color <<= 8;
color |= 0xFF;
}
sway_log(L_DEBUG, "color: 0x%x", color); sway_log(L_DEBUG, "color: 0x%x", color);
break; break;
}
case 'i': case 'i':
image_path = optarg; image_path = optarg;
break; break;