options.h (scrot-1.7.tar.bz2) | : | options.h (scrot-1.8) | ||
---|---|---|---|---|
/* options.h | /* options.h | |||
Copyright 1999-2000 Tom Gilbert <tom@linuxbrit.co.uk, | Copyright 1999-2000 Tom Gilbert <tom@linuxbrit.co.uk, | |||
gilbertt@linuxbrit.co.uk, | gilbertt@linuxbrit.co.uk, | |||
scrot_sucks@linuxbrit.co.uk> | scrot_sucks@linuxbrit.co.uk> | |||
Copyright 2009 James Cameron <quozl@us.netrek.org> | Copyright 2009 James Cameron <quozl@us.netrek.org> | |||
Copyright 2010 Ibragimov Rinat <ibragimovrinat@mail.ru> | Copyright 2010 Ibragimov Rinat <ibragimovrinat@mail.ru> | |||
Copyright 2017 Stoney Sauce <stoneysauce@gmail.com> | Copyright 2017 Stoney Sauce <stoneysauce@gmail.com> | |||
Copyright 2019-2021 Daniel T. Borelli <danieltborelli@gmail.com> | Copyright 2019-2022 Daniel T. Borelli <danieltborelli@gmail.com> | |||
Copyright 2020 Sean Brennan <zettix1@gmail.com> | Copyright 2020 Sean Brennan <zettix1@gmail.com> | |||
Copyright 2021-2023 Guilherme Janczak <guilherme.janczak@yandex.com> | ||||
Copyright 2021 IFo Hancroft <contact@ifohancroft.com> | Copyright 2021 IFo Hancroft <contact@ifohancroft.com> | |||
Copyright 2021 Peter Wu <peterwu@hotmail.com> | Copyright 2021 Peter Wu <peterwu@hotmail.com> | |||
Copyright 2021 Wilson Smith <01wsmith+gh@gmail.com> | Copyright 2021 Wilson Smith <01wsmith+gh@gmail.com> | |||
Copyright 2022 Zev Weiss <zev@bewilderbeest.net> | ||||
Permission is hereby granted, free of charge, to any person obtaining a copy | Permission is hereby granted, free of charge, to any person obtaining a copy | |||
of this software and associated documentation files (the "Software"), to | of this software and associated documentation files (the "Software"), to | |||
deal in the Software without restriction, including without limitation the | deal in the Software without restriction, including without limitation the | |||
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | |||
sell copies of the Software, and to permit persons to whom the Software is | sell copies of the Software, and to permit persons to whom the Software is | |||
furnished to do so, subject to the following conditions: | furnished to do so, subject to the following conditions: | |||
The above copyright notice and this permission notice shall be included in | The above copyright notice and this permission notice shall be included in | |||
all copies of the Software and its documentation and acknowledgment shall be | all copies of the Software and its documentation and acknowledgment shall be | |||
skipping to change at line 36 | skipping to change at line 38 | |||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | |||
THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | |||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
*/ | */ | |||
#include "structs.h" | ||||
#include "scrot_selection.h" | ||||
#pragma once | #pragma once | |||
#include "scrot_selection.h" | ||||
// General purpose enum | // General purpose enum | |||
enum Direction { | enum Direction { | |||
// see main.c:stalkImageConcat(...) | // see scrot.c:stalkImageConcat(...) | |||
HORIZONTAL, | HORIZONTAL, | |||
VERTICAL, | VERTICAL, | |||
}; | }; | |||
struct __ScrotOptions { | struct ScrotOptions { | |||
int delay; | int delay; | |||
int countdown; | int countdown; | |||
int focused; | int focused; | |||
int quality; | int quality; | |||
int border; | int border; | |||
int silent; | int silent; | |||
int multidisp; | int multidisp; | |||
int thumb; | /* If true, the --thumb option is in use. */ | |||
int thumbWidth; | int thumbWorP; | |||
int thumbHeight; | /* If thumbH is true, thumbWorP contains a width and thumbH contains a | |||
* height. Otherwise, thumbWorP contains a percentage. | ||||
*/ | ||||
int thumbH; | ||||
int pointer; | int pointer; | |||
int ignoreKeyboard; | int ignoreKeyboard; | |||
int freeze; | int freeze; | |||
int overwrite; | int overwrite; | |||
int lineStyle; | int lineStyle; | |||
int lineWidth; | int lineWidth; | |||
int lineOpacity; | int lineOpacity; | |||
int stack; | int stack; | |||
enum Direction stackDirection; | enum Direction stackDirection; | |||
char* lineColor; | char *lineColor; | |||
char* lineMode; | char *lineMode; | |||
char* outputFile; | char *outputFile; | |||
char* thumbFile; | char *thumbFile; | |||
char* exec; | char *exec; | |||
char* display; | char *display; | |||
char* note; | char *note; | |||
char* windowClassName; | char *windowClassName; | |||
char* script; | char *script; | |||
int autoselect; | int autoselect; | |||
int autoselectX; | int autoselectX; | |||
int autoselectY; | int autoselectY; | |||
int autoselectH; | int autoselectH; | |||
int autoselectW; | int autoselectW; | |||
SelectionMode selection; | SelectionMode selection; | |||
int monitor; | ||||
}; | }; | |||
void optionsParse(int, char**); | extern struct ScrotOptions opt; | |||
char* optionsNameThumbnail(const char*); | ||||
void optionsParseFileName(const char*); | void optionsParse(int, char **); | |||
void optionsParseThumbnail(char*); | char *optionsNameThumbnail(const char *); | |||
void optionsParseAutoselect(char*); | void optionsParseFileName(const char *); | |||
void optionsParseDisplay(char*); | void optionsParseAutoselect(char *); | |||
void optionsParseNote(char*); | void optionsParseDisplay(char *); | |||
int optionsParseRequiredNumber(char const *); | void optionsParseNote(char *); | |||
int optionsCompareWindowClassName(const char*); | long long optionsParseNum(const char *, long long, long long, | |||
int optionsParseRequireRange(int, int, int); | const char *[static 1]); | |||
extern ScrotOptions opt; | int optionsCompareWindowClassName(const char *); | |||
End of changes. 11 change blocks. | ||||
18 lines changed or deleted | 23 lines changed or added |