Fixing the calculation of the base tty pixel size.

[st.git] / st.c

diff --git a/st.c b/st.c
index 0a8382c..1647cbd 100644 (file)
--- a/st.c
+++ b/st.c
@@ -89,10 +89,6 @@ enum glyph_attribute {
 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {

-       CURSOR_UP,
-       CURSOR_DOWN,
-       CURSOR_LEFT,
-       CURSOR_RIGHT,

        CURSOR_SAVE,
        CURSOR_LOAD
 };
        CURSOR_SAVE,
        CURSOR_LOAD
 };


@@ -625,12 +621,9 @@ selected(int x, int y) {
 }
 
 void
 }
 
 void

-getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
-       if(b)
-               *b = e->xbutton.button;
-
-       *x = x2col(e->xbutton.x);
-       *y = y2row(e->xbutton.y);
+getbuttoninfo(XEvent *e) {
+       sel.ex = x2col(e->xbutton.x);
+       sel.ey = y2row(e->xbutton.y);

 
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
 
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);


@@ -828,7 +821,7 @@ brelease(XEvent *e) {
                selpaste(NULL);
        } else if(e->xbutton.button == Button1) {
                sel.mode = 0;
                selpaste(NULL);
        } else if(e->xbutton.button == Button1) {
                sel.mode = 0;

-               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+               getbuttoninfo(e);

                term.dirty[sel.ey] = 1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {
                        sel.bx = -1;
                term.dirty[sel.ey] = 1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {
                        sel.bx = -1;


@@ -877,7 +870,7 @@ bmotion(XEvent *e) {
        if(sel.mode) {
                oldey = sel.ey;
                oldex = sel.ex;
        if(sel.mode) {
                oldey = sel.ey;
                oldex = sel.ex;

-               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+               getbuttoninfo(e);

 
                if(oldey != sel.ey || oldex != sel.ex) {
                        starty = MIN(oldey, sel.ey);
 
                if(oldey != sel.ey || oldex != sel.ex) {
                        starty = MIN(oldey, sel.ey);


@@ -2086,7 +2079,7 @@ tputc(char *c, int len) {
                        }
                }
                /*
                        }
                }
                /*

-                * All characters which forms part of a sequence are not
+                * All characters which form part of a sequence are not

                 * printed
                 */
                return;
                 * printed
                 */
                return;


@@ -2189,8 +2182,8 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
 
 void
 xresize(int col, int row) {

-       xw.tw = MAX(1, 2*borderpx + col * xw.cw);
-       xw.th = MAX(1, 2*borderpx + row * xw.ch);
+       xw.tw = MAX(1, col * xw.cw);
+       xw.th = MAX(1, row * xw.ch);

 
        XftDrawChange(xw.draw, xw.buf);
 }
 
        XftDrawChange(xw.draw, xw.buf);
 }


@@ -2266,8 +2259,8 @@ xhints(void) {
                sizeh->width = xw.w;
                sizeh->height_inc = xw.ch;
                sizeh->width_inc = xw.cw;
                sizeh->width = xw.w;
                sizeh->height_inc = xw.ch;
                sizeh->width_inc = xw.cw;

-               sizeh->base_height = 2*borderpx;
-               sizeh->base_width = 2*borderpx;
+               sizeh->base_height = 2 * borderpx;
+               sizeh->base_width = 2 * borderpx;

        } else {
                sizeh->flags = PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.fw;
        } else {
                sizeh->flags = PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.fw;


@@ -2400,8 +2393,8 @@ xinit(void) {
                xw.w = xw.fw;
        } else {
                /* window - default size */
                xw.w = xw.fw;
        } else {
                /* window - default size */

-               xw.h = 2*borderpx + term.row * xw.ch;
-               xw.w = 2*borderpx + term.col * xw.cw;
+               xw.h = 2 * borderpx + term.row * xw.ch;
+               xw.w = 2 * borderpx + term.col * xw.cw;

                xw.fx = 0;
                xw.fy = 0;
        }
                xw.fx = 0;
                xw.fy = 0;
        }


@@ -2825,8 +2818,8 @@ cresize(int width, int height)
        if(height != 0)
                xw.h = height;
 
        if(height != 0)
                xw.h = height;
 

-       col = (xw.w - 2*borderpx) / xw.cw;
-       row = (xw.h - 2*borderpx) / xw.ch;
+       col = (xw.w - 2 * borderpx) / xw.cw;
+       row = (xw.h - 2 * borderpx) / xw.ch;

 
        tresize(col, row);
        xresize(col, row);
 
        tresize(col, row);
        xresize(col, row);