st

Simple Terminal
git clone git://r-36.net/st
Log | Files | Refs | README | LICENSE

commit 80f70f1c224ec6fb10f04c29ea2205f47ae553ff
parent 23cc3fc5715a650c91e3b99074c31aaf63e2102c
Author: Aurélien Aptel <aurelien.aptel@gmail.com>
Date:   Tue, 31 Aug 2010 14:52:52 +0200

use GLYPH_SET to test if a char is set; cleanup.

Diffstat:
st.c | 12++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/st.c b/st.c @@ -245,7 +245,7 @@ static char *getseltext() { ptr = str = malloc (sz); for(y = 0; y < term.row; y++) { for(x = 0; x < term.col; x++) { - if(term.line[y][x].c && (ls=selected(x, y))) { + if(term.line[y][x].state & GLYPH_SET && (ls=selected(x, y))) { *ptr = term.line[y][x].c; ptr++; } @@ -1421,11 +1421,9 @@ resize(XEvent *e) { row = xw.bufh / xw.ch; tresize(col, row); ttyresize(col, row); + xw.bufh = MAX(1, xw.bufh); + xw.bufw = MAX(1, xw.bufw); XFreePixmap(xw.dis, xw.buf); - if(xw.bufh<1) - xw.bufh = 1; - if(xw.bufw<1) - xw.bufw = 1; xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr)); draw(SCREEN_REDRAW); } @@ -1435,7 +1433,9 @@ run(void) { XEvent ev; fd_set rfd; int xfd = XConnectionNumber(xw.dis); - long mask = ExposureMask | KeyPressMask | StructureNotifyMask | FocusChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask; + long mask = ExposureMask | KeyPressMask | StructureNotifyMask + | FocusChangeMask | PointerMotionMask | ButtonPressMask + | ButtonReleaseMask; XSelectInput(xw.dis, xw.win, mask); XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */