luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

X11: re-enable writing text to a graph if libxft is used

This commit is contained in:
Holger Vogt 2020-08-18 09:43:11 +02:00
parent 835471af1d
commit 8c1862cd8f
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontend/plotting/x11.c
View File

@ -361,9 +361,24 @@ handlekeypressed(Widget w, XtPointer client_data, XEvent *ev, Boolean *continue_
/* save it */ /* save it */
SaveText(graph, text, keyev->x, graph->absolute.height - keyev->y); SaveText(graph, text, keyev->x, graph->absolute.height - keyev->y);
/* warp mouse so user can type in sequence */ /* warp mouse so user can type in sequence */
#ifndef HAVE_LIBXFT
XWarpPointer(display, None, DEVDEP(graph).window, 0, 0, 0, 0, XWarpPointer(display, None, DEVDEP(graph).window, 0, 0, 0, 0,
keyev->x + XTextWidth(DEVDEP(graph).font, text, nbytes), keyev->x + XTextWidth(DEVDEP(graph).font, text, nbytes),
keyev->y); keyev->y);
#else
int wl, wh;
int ret = Xget_str_length("ABCD", &wl, &wh, NULL, DEVDEP(graph).fname, DEVDEP(graph).fsize);
if (ret == 1)
ret = Xget_str_length("我能吞下", &wl, &wh, NULL, DEVDEP(graph).fname, DEVDEP(graph).fsize);
if (ret == 1) {
fprintf(cp_err, "Error: Could not establish a font for %s\n", DEVDEP(graph).fname);
goto end;
}
XWarpPointer(display, None, DEVDEP(graph).window, 0, 0, 0, 0,
keyev->x + wl*nbytes/4,
keyev->y);
#endif
end:
PopGraphContext(); PopGraphContext();
} }