pbentes/st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move zoom functions into x.c

Browse Source 
This makes x(un)loadfonts internal to x.c.  Needed to reorder includes
and move a typedef to keep the compiler happy.

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
This commit is contained in:
Devin J. Pohly
2017-10-10 11:30:36 -05:00
parent 3518dba2a5
commit d5275012b4
4 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
x.c
View File

@ -21,8 +21,8 @@ static char *argv0;
#define Glyph Glyph_
#define Font Font_
#include "win.h"
#include "st.h"
#include "win.h"
/* XEMBED messages */
#define XEMBED_FOCUS_IN 4
@ -90,7 +90,9 @@ static void xdrawcursor(void);
static int xgeommasktogravity(int);
static void xinit(void);
static int xloadfont(Font *, FcPattern *);
static void xloadfonts(char *, double);
static void xunloadfont(Font *);
static void xunloadfonts(void);
static void xsetenv(void);
static void expose(XEvent *);
@ -164,6 +166,37 @@ typedef struct {
static Fontcache frc[16];
static int frclen = 0;
void
zoom(const Arg *arg)
{
Arg larg;
larg.f = usedfontsize + arg->f;
zoomabs(&larg);
}
void
zoomabs(const Arg *arg)
{
xunloadfonts();
xloadfonts(usedfont, arg->f);
cresize(0, 0);
ttyresize();
redraw();
xhints();
}
void
zoomreset(const Arg *arg)
{
Arg larg;
if (defaultfontsize > 0) {
larg.f = defaultfontsize;
zoomabs(&larg);
}
}
void
getbuttoninfo(XEvent *e)
{