Pass new dimensions into ttyresize

[st.git] / x.c

diff --git a/x.c b/x.c
index 191e5dc..1b656ac 100644 (file)
--- a/x.c
+++ b/x.c
@@ -15,13 +15,10 @@
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
 
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
 

+static char *argv0;

 #include "arg.h"
 #include "arg.h"

-
-#define Glyph Glyph_
-#define Font Font_
-
-#include "win.h"

 #include "st.h"
 #include "st.h"

+#include "win.h"

 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4


@@ -34,6 +31,7 @@
 
 typedef XftDraw *Draw;
 typedef XftColor Color;
 
 typedef XftDraw *Draw;
 typedef XftColor Color;

+typedef XftGlyphFontSpec GlyphFontSpec;

 
 /* Purely graphic info */
 typedef struct {
 
 /* Purely graphic info */
 typedef struct {


@@ -41,6 +39,7 @@ typedef struct {
        Colormap cmap;
        Window win;
        Drawable buf;
        Colormap cmap;
        Window win;
        Drawable buf;

+       GlyphFontSpec *specbuf; /* font spec buffer used for rendering */

        Atom xembed, wmdeletewin, netwmname, netwmpid;
        XIM xim;
        XIC xic;
        Atom xembed, wmdeletewin, netwmname, netwmpid;
        XIM xim;
        XIC xic;


@@ -58,6 +57,7 @@ typedef struct {
 } XSelection;
 
 /* Font structure */
 } XSelection;
 
 /* Font structure */

+#define Font Font_

 typedef struct {
        int height;
        int width;
 typedef struct {
        int height;
        int width;


@@ -87,8 +87,17 @@ static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static int xgeommasktogravity(int);
 static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static int xgeommasktogravity(int);

+static void xinit(void);
+static void cresize(int, int);
+static void xresize(int, int);

 static int xloadfont(Font *, FcPattern *);
 static int xloadfont(Font *, FcPattern *);

+static void xloadfonts(char *, double);

 static void xunloadfont(Font *);
 static void xunloadfont(Font *);

+static void xunloadfonts(void);
+static void xsetenv(void);
+static void xseturgency(int);
+static int x2col(int);
+static int y2row(int);

 
 static void expose(XEvent *);
 static void visibility(XEvent *);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);


@@ -104,11 +113,13 @@ static void propnotify(XEvent *);
 static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
 static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);

-

 static void selcopy(Time);
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 
 static void selcopy(Time);
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 

+static void run(void);
+static void usage(void);
+

 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
        [ClientMessage] = cmessage,
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
        [ClientMessage] = cmessage,


@@ -140,6 +151,11 @@ static DC dc;
 static XWindow xw;
 static XSelection xsel;
 
 static XWindow xw;
 static XSelection xsel;
 

+enum window_state {
+       WIN_VISIBLE = 1,
+       WIN_FOCUSED = 2
+};
+

 /* Font Ring Cache */
 enum {
        FRC_NORMAL,
 /* Font Ring Cache */
 enum {
        FRC_NORMAL,


@@ -157,6 +173,58 @@ typedef struct {
 /* Fontcache is an array now. A new font will be appended to the array. */
 static Fontcache frc[16];
 static int frclen = 0;
 /* Fontcache is an array now. A new font will be appended to the array. */
 static Fontcache frc[16];
 static int frclen = 0;

+static char *usedfont = NULL;
+static double usedfontsize = 0;
+static double defaultfontsize = 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(win.tw, win.th);
+       redraw();
+       xhints();
+}
+
+void
+zoomreset(const Arg *arg)
+{
+       Arg larg;
+
+       if (defaultfontsize > 0) {
+               larg.f = defaultfontsize;
+               zoomabs(&larg);
+       }
+}
+
+int
+x2col(int x)
+{
+       x -= borderpx;
+       x /= win.cw;
+
+       return LIMIT(x, 0, term.col-1);
+}
+
+int
+y2row(int y)
+{
+       y -= borderpx;
+       y /= win.ch;
+
+       return LIMIT(y, 0, term.row-1);
+}

 
 void
 getbuttoninfo(XEvent *e)
 
 void
 getbuttoninfo(XEvent *e)


@@ -554,6 +622,23 @@ bmotion(XEvent *e)
                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 }
 
                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 }
 

+void
+cresize(int width, int height)
+{
+       int col, row;
+
+       if (width != 0)
+               win.w = width;
+       if (height != 0)
+               win.h = height;
+
+       col = (win.w - 2 * borderpx) / win.cw;
+       row = (win.h - 2 * borderpx) / win.ch;
+
+       tresize(col, row);
+       xresize(col, row);
+}
+

 void
 xresize(int col, int row)
 {
 void
 xresize(int col, int row)
 {


@@ -565,6 +650,9 @@ xresize(int col, int row)
                        DefaultDepth(xw.dpy, xw.scr));
        XftDrawChange(xw.draw, xw.buf);
        xclear(0, 0, win.w, win.h);
                        DefaultDepth(xw.dpy, xw.scr));
        XftDrawChange(xw.draw, xw.buf);
        xclear(0, 0, win.w, win.h);

+
+       /* resize to new width */
+       xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));

 }
 
 ushort
 }
 
 ushort


@@ -925,6 +1013,9 @@ xinit(void)
        XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
        XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 
        XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
        XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 

+       /* font spec buffer */
+       xw.specbuf = xmalloc(term.col * sizeof(GlyphFontSpec));
+

        /* Xft rendering context */
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* Xft rendering context */
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 


@@ -1189,20 +1280,22 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
                }
        }
 
                }
        }
 

-       if (base.mode & ATTR_REVERSE) {
-               temp = fg;
-               fg = bg;
-               bg = temp;
-       }
-

        if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
                colfg.red = fg->color.red / 2;
                colfg.green = fg->color.green / 2;
                colfg.blue = fg->color.blue / 2;
        if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
                colfg.red = fg->color.red / 2;
                colfg.green = fg->color.green / 2;
                colfg.blue = fg->color.blue / 2;

+               colfg.alpha = fg->color.alpha;

                XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
                fg = &revfg;
        }
 
                XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
                fg = &revfg;
        }
 

+
+       if (base.mode & ATTR_REVERSE) {
+               temp = fg;
+               fg = bg;
+               bg = temp;
+       }
+

        if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
                fg = bg;
 
        if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
                fg = bg;
 


@@ -1414,7 +1507,7 @@ drawregion(int x1, int y1, int x2, int y2)
 
                term.dirty[y] = 0;
 
 
                term.dirty[y] = 0;
 

-               specs = term.specbuf;
+               specs = xw.specbuf;

                numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y);
 
                i = ox = 0;
                numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y);
 
                i = ox = 0;


@@ -1480,15 +1573,12 @@ xseturgency(int add)
 }
 
 void
 }
 
 void

-xbell(int vol)
-{
-       XkbBell(xw.dpy, xw.win, vol, (Atom)NULL);
-}
-
-unsigned long
-xwinid(void)
+xbell(void)

 {
 {

-       return xw.win;
+       if (!(win.state & WIN_FOCUSED))
+               xseturgency(1);
+       if (bellvolume)
+               XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);

 }
 
 void
 }
 
 void


@@ -1589,7 +1679,7 @@ resize(XEvent *e)
                return;
 
        cresize(e->xconfigure.width, e->xconfigure.height);
                return;
 
        cresize(e->xconfigure.width, e->xconfigure.height);

-       ttyresize();
+       ttyresize(win.tw, win.th);

 }
 
 void
 }
 
 void


@@ -1620,7 +1710,7 @@ run(void)
 
        cresize(w, h);
        ttynew();
 
        cresize(w, h);
        ttynew();

-       ttyresize();
+       ttyresize(win.tw, win.th);

 
        clock_gettime(CLOCK_MONOTONIC, &last);
        lastblink = last;
 
        clock_gettime(CLOCK_MONOTONIC, &last);
        lastblink = last;


@@ -1701,6 +1791,19 @@ run(void)
        }
 }
 
        }
 }
 

+void
+usage(void)
+{
+       die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid]"
+           " [[-e] command [args ...]]\n"
+           "       %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid] -l line"
+           " [stty_args ...]\n", argv0, argv0);
+}
+

 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {


@@ -1763,6 +1866,7 @@ run:
        XSetLocaleModifiers("");
        tnew(MAX(cols, 1), MAX(rows, 1));
        xinit();
        XSetLocaleModifiers("");
        tnew(MAX(cols, 1), MAX(rows, 1));
        xinit();

+       xsetenv();

        selinit();
        run();
 
        selinit();
        run();