diff options
| author | noname <noname@inventati.org> | 2015-04-08 23:24:06 +0000 |
|---|---|---|
| committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2015-04-10 23:31:53 +0200 |
| commit | 6f5f7701864e6987544cb7e7dc5f2d24db1a4537 (patch) | |
| tree | 46fc95799fbe6cae202e5171a0ba967bd72a958b | |
| parent | 6524f022f7d1d32f43208254e12f934bf64ed559 (diff) | |
| download | st-6f5f7701864e6987544cb7e7dc5f2d24db1a4537.tar.gz st-6f5f7701864e6987544cb7e7dc5f2d24db1a4537.zip | |
Remove 'xloadfontset' function.
It was used only once and its return value was ignored.
| -rw-r--r-- | st.c | 13 |
1 files changed, 2 insertions, 11 deletions
| @@ -419,7 +419,6 @@ static int xsetcolorname(int, const char *); | |||
| 419 | static int xgeommasktogravity(int); | 419 | static int xgeommasktogravity(int); |
| 420 | static int xloadfont(Font *, FcPattern *); | 420 | static int xloadfont(Font *, FcPattern *); |
| 421 | static void xloadfonts(char *, double); | 421 | static void xloadfonts(char *, double); |
| 422 | static int xloadfontset(Font *); | ||
| 423 | static void xsettitle(char *); | 422 | static void xsettitle(char *); |
| 424 | static void xresettitle(void); | 423 | static void xresettitle(void); |
| 425 | static void xsetpointermotion(int); | 424 | static void xsetpointermotion(int); |
| @@ -3116,15 +3115,6 @@ xloadfonts(char *fontstr, double fontsize) { | |||
| 3116 | FcPatternDestroy(pattern); | 3115 | FcPatternDestroy(pattern); |
| 3117 | } | 3116 | } |
| 3118 | 3117 | ||
| 3119 | int | ||
| 3120 | xloadfontset(Font *f) { | ||
| 3121 | FcResult result; | ||
| 3122 | |||
| 3123 | if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result))) | ||
| 3124 | return 1; | ||
| 3125 | return 0; | ||
| 3126 | } | ||
| 3127 | |||
| 3128 | void | 3118 | void |
| 3129 | xunloadfont(Font *f) { | 3119 | xunloadfont(Font *f) { |
| 3130 | XftFontClose(xw.dpy, f->match); | 3120 | XftFontClose(xw.dpy, f->match); |
| @@ -3472,7 +3462,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { | |||
| 3472 | /* Nothing was found. */ | 3462 | /* Nothing was found. */ |
| 3473 | if(i >= frclen) { | 3463 | if(i >= frclen) { |
| 3474 | if(!font->set) | 3464 | if(!font->set) |
| 3475 | xloadfontset(font); | 3465 | font->set = FcFontSort(0, font->pattern, |
| 3466 | FcTrue, 0, &fcres); | ||
| 3476 | fcsets[0] = font->set; | 3467 | fcsets[0] = font->set; |
| 3477 | 3468 | ||
| 3478 | /* | 3469 | /* |
