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

swaygrab: Add support for custom filetypes

Browse source 
Adds the option `-t, --type <filetype>` which can be used to select the
filetype of the produced image/video.

This will only take effect if you don't pass a filename to swaygrab e.g.
let swaygrab use the default date based filename.
This commit is contained in:
Mikkel Oscar Lyderik 2015-12-20 11:27:17 +01:00
parent 3777c8993b
commit 59c5aee1cc
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
swaygrab/main.c
View file

@ -151,6 +151,7 @@ char *default_filename(const char *extension) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
static int capture = 0, raw = 0; static int capture = 0, raw = 0;
char *socket_path = NULL; char *socket_path = NULL;
char *filetype = NULL;
char *output = NULL; char *output = NULL;
int framerate = 30; int framerate = 30;
@ -162,6 +163,7 @@ int main(int argc, char **argv) {
{"output", required_argument, NULL, 'o'}, {"output", required_argument, NULL, 'o'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},
{"socket", required_argument, NULL, 's'}, {"socket", required_argument, NULL, 's'},
{"type", required_argument, NULL, 't'},
{"raw", no_argument, NULL, 'r'}, {"raw", no_argument, NULL, 'r'},
{"rate", required_argument, NULL, 'R'}, {"rate", required_argument, NULL, 'R'},
{0, 0, 0, 0} {0, 0, 0, 0}
@ -175,13 +177,14 @@ int main(int argc, char **argv) {
" -o, --output <output> Output source.\n" " -o, --output <output> Output source.\n"
" -v, --version Show the version number and quit.\n" " -v, --version Show the version number and quit.\n"
" -s, --socket <socket> Use the specified socket.\n" " -s, --socket <socket> Use the specified socket.\n"
" -t, --type <filetype> Specify image/video filetype.\n"
" -R, --rate <rate> Specify framerate (default: 30)\n" " -R, --rate <rate> Specify framerate (default: 30)\n"
" -r, --raw Write raw rgba data to stdout.\n"; " -r, --raw Write raw rgba data to stdout.\n";
int c; int c;
while (1) { while (1) {
int option_index = 0; int option_index = 0;
c = getopt_long(argc, argv, "hco:vs:r", long_options, &option_index); c = getopt_long(argc, argv, "hco:vs:t:r", long_options, &option_index);
if (c == -1) { if (c == -1) {
break; break;
} }
@ -189,6 +192,9 @@ int main(int argc, char **argv) {
case 's': // Socket case 's': // Socket
socket_path = strdup(optarg); socket_path = strdup(optarg);
break; break;
case 't': // Filetype
filetype = strdup(optarg);
break;
case 'r': case 'r':
raw = 1; raw = 1;
break; break;
@ -240,9 +246,15 @@ int main(int argc, char **argv) {
if (!file) { if (!file) {
if (!capture) { if (!capture) {
file = default_filename("png"); if (!filetype) {
filetype = strdup("png");
}
file = default_filename(filetype);
} else { } else {
file = default_filename("webm"); if (!filetype) {
filetype = strdup("webm");
}
file = default_filename(filetype);
} }
} }
@ -254,6 +266,7 @@ int main(int argc, char **argv) {
free(output); free(output);
free(file); free(file);
free(filetype);
close(socketfd); close(socketfd);
return 0; return 0;
} }

5
swaygrab/swaygrab.1.txt
View file

@ -38,6 +38,11 @@ Options
Use the specified socket path. Otherwise, swaymsg will ask sway where the Use the specified socket path. Otherwise, swaymsg will ask sway where the
socket is (which is the value of $SWAYSOCK, then of $I3SOCK). socket is (which is the value of $SWAYSOCK, then of $I3SOCK).
*-t, --type* <filetype>::
Specify the image/video filetype to produce. If no type is defined it will
default to png for images and webm for videos. If _file_ is specified this
option will not take effect.
*-r, --rate* <rate>:: *-r, --rate* <rate>::
Specify a framerate (in frames per second). Used in combination with -c. Specify a framerate (in frames per second). Used in combination with -c.
Default is 30. Must be an integer. Default is 30. Must be an integer.