imlib.c (scrot-1.7.tar.bz2) | : | imlib.c (scrot-1.8) | ||
---|---|---|---|---|
/* imlib.c | /* imlib.c | |||
Copyright 1999-2000 Tom Gilbert | Copyright 1999-2000 Tom Gilbert | |||
Copyright 2020-2021 Daniel T. Borelli <danieltborelli@gmail.com> | Copyright 2020-2022 Daniel T. Borelli <danieltborelli@gmail.com> | |||
Copyright 2020 ideal <idealities@gmail.com> | Copyright 2020 ideal <idealities@gmail.com> | |||
Copyright 2020 Sean Brennan <zettix1@gmail.com> | Copyright 2020 Sean Brennan <zettix1@gmail.com> | |||
Copyright 2021 Christopher R. Nelson <christopher.nelson@languidnights.com> | Copyright 2021 Christopher R. Nelson <christopher.nelson@languidnights.com> | |||
Copyright 2021 Guilherme Janczak <guilherme.janczak@yandex.com> | ||||
Copyright 2021 Peter Wu <peterwu@hotmail.com> | Copyright 2021 Peter Wu <peterwu@hotmail.com> | |||
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 | |||
skipping to change at line 31 | skipping to change at line 32 | |||
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 "options.h" | #include <err.h> | |||
#include "scrot.h" | #include <stdlib.h> | |||
Display* disp = NULL; | #include <Imlib2.h> | |||
Visual* vis = NULL; | #include <X11/Xlib.h> | |||
Screen* scr = NULL; | ||||
#include "imlib.h" | ||||
/* Imlib stuff */ | ||||
Display *disp; | ||||
Visual *vis; | ||||
Colormap cm; | Colormap cm; | |||
int depth; | int depth; | |||
Window root = 0; | ||||
void initXAndImlib(char* dispStr, int screenNumber) | /* Thumbnail sizes */ | |||
Window root; | ||||
Window clientWindow; | ||||
Screen *scr; | ||||
void initXAndImlib(char *dispStr, int screenNumber) | ||||
{ | { | |||
disp = XOpenDisplay(dispStr); | disp = XOpenDisplay(dispStr); | |||
if (!disp) { | if (!disp) { | |||
char const* const format = "Can't open X display. It *is* running, " | const char *const format = "Can't open X display. It *is* running, " | |||
"yeah? [%s]"; | "yeah? [%s]"; | |||
char const* env = NULL; | const char *env = NULL; | |||
char const* const value = dispStr ? dispStr : | const char *const value = dispStr ? dispStr : | |||
(env = getenv("DISPLAY")) ? env : "NULL"; | (env = getenv("DISPLAY")) ? env : "NULL"; | |||
errx(EXIT_FAILURE, format, value); | errx(EXIT_FAILURE, format, value); | |||
} | } | |||
if (screenNumber) | if (screenNumber) | |||
scr = ScreenOfDisplay(disp, screenNumber); | scr = ScreenOfDisplay(disp, screenNumber); | |||
else | else | |||
scr = ScreenOfDisplay(disp, DefaultScreen(disp)); | scr = ScreenOfDisplay(disp, DefaultScreen(disp)); | |||
End of changes. 9 change blocks. | ||||
11 lines changed or deleted | 21 lines changed or added |