ido not truncate font size when zooming - st - Simple Terminal Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/st//log.gph gopher.r-36.net 70 1Files /scm/st//files.gph gopher.r-36.net 70 1Refs /scm/st//refs.gph gopher.r-36.net 70 1README /scm/st//file/README.gph gopher.r-36.net 70 1LICENSE /scm/st//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit bdd649a10289ade364f3deab3bbf6ee3169d67ca /scm/st//commit/bdd649a10289ade364f3deab3bbf6ee3169d67ca.gph gopher.r-36.net 70 1parent 71fa10f613a22b3e75e0e897ee1be6667be3f449 /scm/st//commit/71fa10f613a22b3e75e0e897ee1be6667be3f449.gph gopher.r-36.net 70 hAuthor: Quentin Rameau URL:mailto:quinq@quinq.eu.org gopher.r-36.net 70 iDate: Sun, 31 May 2015 12:26:11 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 ido not truncate font size when zooming Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i config.def.h | 6 +++--- Err gopher.r-36.net 70 i st.c | 15 +++++++-------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i2 files changed, 10 insertions(+), 11 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/config.def.h b/config.def.h /scm/st//file/config.def.h.gph gopher.r-36.net 70 i@@ -120,9 +120,9 @@ static Shortcut shortcuts[] = { Err gopher.r-36.net 70 i { ControlMask, XK_Print, toggleprinter, {.i = 0} }, Err gopher.r-36.net 70 i { ShiftMask, XK_Print, printscreen, {.i = 0} }, Err gopher.r-36.net 70 i { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, Err gopher.r-36.net 70 i- { MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} }, Err gopher.r-36.net 70 i- { MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} }, Err gopher.r-36.net 70 i- { MODKEY|ShiftMask, XK_Home, xzoomreset, {.i = 0} }, Err gopher.r-36.net 70 i+ { MODKEY|ShiftMask, XK_Prior, xzoom, {.f = +1} }, Err gopher.r-36.net 70 i+ { MODKEY|ShiftMask, XK_Next, xzoom, {.f = -1} }, Err gopher.r-36.net 70 i+ { MODKEY|ShiftMask, XK_Home, xzoomreset, {.f = 0} }, Err gopher.r-36.net 70 i { ShiftMask, XK_Insert, selpaste, {.i = 0} }, Err gopher.r-36.net 70 i { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} }, Err gopher.r-36.net 70 i { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} }, Err gopher.r-36.net 70 1diff --git a/st.c b/st.c /scm/st//file/st.c.gph gopher.r-36.net 70 i@@ -3061,7 +3061,6 @@ xloadfont(Font *f, FcPattern *pattern) { Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i xloadfonts(char *fontstr, double fontsize) { Err gopher.r-36.net 70 i FcPattern *pattern; Err gopher.r-36.net 70 i- FcResult r_sz, r_psz; Err gopher.r-36.net 70 i double fontval; Err gopher.r-36.net 70 i float ceilf(float); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -3080,11 +3079,11 @@ xloadfonts(char *fontstr, double fontsize) { Err gopher.r-36.net 70 i FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize); Err gopher.r-36.net 70 i usedfontsize = fontsize; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval); Err gopher.r-36.net 70 i- r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval); Err gopher.r-36.net 70 i- if(r_psz == FcResultMatch) { Err gopher.r-36.net 70 i+ if(FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == Err gopher.r-36.net 70 i+ FcResultMatch) { Err gopher.r-36.net 70 i usedfontsize = fontval; Err gopher.r-36.net 70 i- } else if(r_sz == FcResultMatch) { Err gopher.r-36.net 70 i+ } else if(FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) == Err gopher.r-36.net 70 i+ FcResultMatch) { Err gopher.r-36.net 70 i usedfontsize = -1; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i@@ -3157,14 +3156,14 @@ void Err gopher.r-36.net 70 i xzoom(const Arg *arg) { Err gopher.r-36.net 70 i Arg larg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- larg.i = usedfontsize + arg->i; Err gopher.r-36.net 70 i+ larg.f = usedfontsize + arg->f; Err gopher.r-36.net 70 i xzoomabs(&larg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i xzoomabs(const Arg *arg) { Err gopher.r-36.net 70 i xunloadfonts(); Err gopher.r-36.net 70 i- xloadfonts(usedfont, arg->i); Err gopher.r-36.net 70 i+ xloadfonts(usedfont, arg->f); Err gopher.r-36.net 70 i cresize(0, 0); Err gopher.r-36.net 70 i redraw(); Err gopher.r-36.net 70 i xhints(); Err gopher.r-36.net 70 i@@ -3175,7 +3174,7 @@ xzoomreset(const Arg *arg) { Err gopher.r-36.net 70 i Arg larg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if(defaultfontsize > 0) { Err gopher.r-36.net 70 i- larg.i = defaultfontsize; Err gopher.r-36.net 70 i+ larg.f = defaultfontsize; Err gopher.r-36.net 70 i xzoomabs(&larg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 .