luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix grab screen window pathname calculation

This commit is contained in:
stefan schippers 2024-03-21 22:37:39 +01:00
parent 751c965e9f
commit 642ee525ac
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/callback.c
View File

@ -1800,7 +1800,6 @@ static int grabscreen(const char *winpath, int event, int mx, int my, KeySym key
} }
if(grab_state == 1 && event == ButtonRelease) { if(grab_state == 1 && event == ButtonRelease) {
char *top_path;
int grab_w = 0, grab_h = 0; int grab_w = 0, grab_h = 0;
cairo_surface_t *sfc = NULL, *subsfc = NULL; cairo_surface_t *sfc = NULL, *subsfc = NULL;
png_to_byte_closure_t closure; png_to_byte_closure_t closure;
@ -1808,7 +1807,6 @@ static int grabscreen(const char *winpath, int event, int mx, int my, KeySym key
size_t olength; size_t olength;
char *prop = NULL; char *prop = NULL;
top_path = xctx->top_path[0] ? xctx->top_path : ".";
grab_state = 0; grab_state = 0;
first_motion = 1; first_motion = 1;
@ -1817,7 +1815,7 @@ static int grabscreen(const char *winpath, int event, int mx, int my, KeySym key
x2 = rmx; x2 = rmx;
y2 = rmy; y2 = rmy;
INT_RECTORDER(x1, y1, x2, y2); INT_RECTORDER(x1, y1, x2, y2);
tclvareval("grab release ", top_path, "drw", NULL); tclvareval("grab release ", xctx->top_path, ".drw", NULL);
if(x2 - x1 > 10 && y2 -y1 > 10) { if(x2 - x1 > 10 && y2 -y1 > 10) {
grab_w = (x2 - x1 + 1); grab_w = (x2 - x1 + 1);
grab_h = (y2 - y1 + 1); grab_h = (y2 - y1 + 1);
@ -2850,10 +2848,8 @@ int rstate; /* (reduced state, without ShiftMask) */
} }
#if defined(__unix__) && HAS_CAIRO==1 #if defined(__unix__) && HAS_CAIRO==1
if(key == XK_Print) { if(key == XK_Print) {
char *top_path;
top_path = xctx->top_path[0] ? xctx->top_path : ".";
xctx->ui_state |= GRABSCREEN; xctx->ui_state |= GRABSCREEN;
tclvareval("grab set -global ", top_path, "drw", NULL); tclvareval("grab set -global ", xctx->top_path, ".drw", NULL);
break; break;
} }
#endif #endif

4
src/scheduler.c
View File

@ -1912,12 +1912,10 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
* grab root window */ * grab root window */
else if(!strcmp(argv[1], "grabscreen")) else if(!strcmp(argv[1], "grabscreen"))
{ {
char *top_path;
if(!xctx) {Tcl_SetResult(interp, not_avail, TCL_STATIC); return TCL_ERROR;} if(!xctx) {Tcl_SetResult(interp, not_avail, TCL_STATIC); return TCL_ERROR;}
top_path = xctx->top_path[0] ? xctx->top_path : ".";
#if defined(__unix__) && HAS_CAIRO==1 #if defined(__unix__) && HAS_CAIRO==1
xctx->ui_state |= GRABSCREEN; xctx->ui_state |= GRABSCREEN;
tclvareval("grab set -global ", top_path, "drw", NULL); tclvareval("grab set -global ", xctx->top_path, ".drw", NULL);
#endif #endif
Tcl_ResetResult(interp); Tcl_ResetResult(interp);
} }