JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
gitweb / st.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
clean button selection code.
[st.git] / st.c
diff --git a/st.c b/st.c
index ed5481d..5d5ac30 100644 (file)
--- a/st.c
+++ b/st.c
@@ -104,8 +104,11 @@ typedef struct {
 /* Purely graphic info */
 typedef struct {
        Display* dis;
+       Colormap cmap;
        Window win;
        Pixmap buf;
+       XIM xim;
+       XIC xic;
        int scr;
        int w;  /* window width  */
        int h;  /* window height */
@@ -113,7 +116,8 @@ typedef struct {
        int bufh; /* pixmap height */
        int ch; /* char height */
        int cw; /* char width  */
-       int hasfocus;
+       int focus;
+       int vis; /* is visible */
 } XWindow; 
 
 typedef struct {
@@ -186,6 +190,8 @@ static void xloadcols(void);
 static void xseturgency(int);
 
 static void expose(XEvent *);
+static void visibility(XEvent *);
+static void unmap(XEvent *);
 static char* kmap(KeySym);
 static void kpress(XEvent *);
 static void resize(XEvent *);
@@ -197,8 +203,10 @@ static void bmotion(XEvent *);
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
-       [Expose] = expose,
        [ConfigureNotify] = resize,
+       [VisibilityNotify] = visibility,
+       [UnmapNotify] = unmap,
+       [Expose] = expose,
        [FocusIn] = focus,
        [FocusOut] = focus,
        [MotionNotify] = bmotion,
@@ -235,8 +243,9 @@ static inline int selected(int x, int y) {
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
-       if(b) *b = e->xbutton.state,
-               *b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
+       if(b) 
+               *b = e->xbutton.button;
+
        *x = e->xbutton.x/xw.cw;
        *y = e->xbutton.y/xw.ch;
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
@@ -677,7 +686,8 @@ tsetattr(int *attr, int l) {
                        else if(BETWEEN(attr[i], 100, 107))
                                term.c.attr.fg = attr[i] - 100 + 8;
                        else 
-                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 
+                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
+                       
                        break;
                }
        }
@@ -795,6 +805,8 @@ csihandle(void) {
                        case 1:
                                term.mode &= ~MODE_APPKEYPAD;
                                break;
+                       case 5: /* TODO: DECSCNM -- Remove reverse video */
+                               break;
                        case 7:
                                term.mode &= ~MODE_WRAP;
                                break;
@@ -850,11 +862,16 @@ csihandle(void) {
                        case 1:
                                term.mode |= MODE_APPKEYPAD;
                                break;
+                       case 5: /* DECSCNM -- Reverve video */
+                               /* TODO: set REVERSE on the whole screen (f) */
+                               break;
                        case 7:
                                term.mode |= MODE_WRAP;
                                break;
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
-                               break;
+                                /* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */
+                               if(escseq.narg > 1 && escseq.arg[1] != 25)
+                                       break;
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;
@@ -1029,7 +1046,7 @@ tputc(char c) {
                        tnewline();
                        break;
                case '\a':
-                       if(!xw.hasfocus)
+                       if(!xw.focus)
                                xseturgency(1);
                        break;
                case '\033':
@@ -1113,11 +1130,10 @@ void
 xloadcols(void) {
        int i, r, g, b;
        XColor color;
-       Colormap cmap = DefaultColormap(xw.dis, xw.scr);
        unsigned long white = WhitePixel(xw.dis, xw.scr);
 
        for(i = 0; i < 16; i++) {
-               if (!XAllocNamedColor(xw.dis, cmap, colorname[i], &color, &color)) {
+               if (!XAllocNamedColor(xw.dis, xw.cmap, colorname[i], &color, &color)) {
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
                } else
@@ -1131,7 +1147,7 @@ xloadcols(void) {
                                color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                                color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
-                               if (!XAllocColor(xw.dis, cmap, &color)) {
+                               if (!XAllocColor(xw.dis, xw.cmap, &color)) {
                                        dc.col[i] = white;
                                        fprintf(stderr, "Could not allocate color %d\n", i);
                                } else
@@ -1141,7 +1157,7 @@ xloadcols(void) {
 
        for(r = 0; r < 24; r++, i++) {
                color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
-               if (!XAllocColor(xw.dis, cmap, &color)) {
+               if (!XAllocColor(xw.dis, xw.cmap, &color)) {
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color %d\n", i);
                } else
@@ -1176,6 +1192,8 @@ xhints(void)
 
 void
 xinit(void) {
+       XSetWindowAttributes attrs;
+
        if(!(xw.dis = XOpenDisplay(NULL)))
                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dis);
@@ -1189,25 +1207,39 @@ xinit(void) {
        xw.ch = dc.font->ascent + dc.font->descent;
 
        /* colors */
+       xw.cmap = XDefaultColormap(xw.dis, xw.scr);
        xloadcols();
 
-       /* windows */
-       xw.bufh = term.row * xw.ch;
-       xw.bufw = term.col * xw.cw;
+       /* window - default size */
+       xw.bufh = 24 * xw.ch;
+       xw.bufw = 80 * xw.cw;
        xw.h = xw.bufh + 2*BORDER;
        xw.w = xw.bufw + 2*BORDER;
-       xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-                       xw.w, xw.h, 0,
-                       dc.col[DefaultBG],
-                       dc.col[DefaultBG]);
+
+       attrs.background_pixel = dc.col[DefaultBG];
+       attrs.border_pixel = dc.col[DefaultBG];
+       attrs.bit_gravity = NorthWestGravity;
+       attrs.event_mask = FocusChangeMask | KeyPressMask
+               | ExposureMask | VisibilityChangeMask | StructureNotifyMask
+               | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+       attrs.colormap = xw.cmap;
+
+       xw.win = XCreateWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
+                       xw.w, xw.h, 0, XDefaultDepth(xw.dis, xw.scr), InputOutput,
+                       XDefaultVisual(xw.dis, xw.scr),
+                       CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
+                       | CWColormap,
+                       &attrs);
        xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+
+
+       /* input methods */
+       xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
+       xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing 
+                                          | XIMStatusNothing, XNClientWindow, xw.win, 
+                                          XNFocusWindow, xw.win, NULL);
        /* gc */
        dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
-
-       /* event mask */
-       XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
-               | StructureNotifyMask | FocusChangeMask | PointerMotionMask
-               | ButtonPressMask | ButtonReleaseMask);
        
        XMapWindow(xw.dis, xw.win);
        xhints();
@@ -1230,8 +1262,13 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
        XSetForeground(xw.dis, dc.gc, xfg);
        
        if(base.mode & ATTR_GFX)
-               for(i = 0; i < len; i++)
-                       s[i] = gfx[(int)s[i]];
+               for(i = 0; i < len; i++) {
+                       char c = gfx[(unsigned int)s[i] % 256];
+                       if(c)
+                               s[i] = c;
+                       else if(s[i] > 0x5f)
+                               s[i] -= 0x5f;
+               }
 
        XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
        XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
@@ -1259,7 +1296,7 @@ xdrawcursor(void) {
                xclear(oldx, oldy, oldx, oldy);
        
        /* draw the new one */
-       if(!(term.c.state & CURSOR_HIDE) && xw.hasfocus) {
+       if(!(term.c.state & CURSOR_HIDE) && xw.focus) {
                xdraws(&g.c, g, term.c.x, term.c.y, 1);
                oldx = term.c.x, oldy = term.c.y;
        }
@@ -1299,8 +1336,10 @@ draw(int redraw_all) {
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
 
-       XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
-       XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);
+       if(!xw.vis)
+               return;
+
+       xclear(0, 0, term.col-1, term.row-1);
        for(y = 0; y < term.row; y++) {
                base = term.line[y][0];
                i = ox = 0;
@@ -1337,6 +1376,19 @@ expose(XEvent *ev) {
 }
 
 void
+visibility(XEvent *ev) {
+       XVisibilityEvent *e = &ev->xvisibility;
+       /* XXX if this goes from 0 to 1, need a full redraw for next Expose,
+        * not just a buf copy */
+       xw.vis = e->state != VisibilityFullyObscured;
+}
+
+void
+unmap(XEvent *ev) {
+       xw.vis = 0;
+}
+
+void
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dis, xw.win);
        h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
@@ -1346,7 +1398,7 @@ xseturgency(int add) {
 
 void
 focus(XEvent *ev) {
-       if((xw.hasfocus = ev->type == FocusIn))
+       if((xw.focus = ev->type == FocusIn))
                xseturgency(0);
        draw(SCREEN_UPDATE);
 }
@@ -1369,10 +1421,11 @@ kpress(XEvent *ev) {
        int len;
        int meta;
        int shift;
+       Status status;
 
        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
-       len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
+       len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
 
        if((customkey = kmap(ksym)))
                ttywrite(customkey, strlen(customkey));
@@ -1419,7 +1472,6 @@ resize(XEvent *e) {
        xw.bufw = MAX(1, xw.bufw);
        XFreePixmap(xw.dis, xw.buf);
        xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
-       draw(SCREEN_REDRAW);
 }
 
 void
@@ -1443,6 +1495,8 @@ run(void) {
                }
                while(XPending(xw.dis)) {
                        XNextEvent(xw.dis, &ev);
+                       if (XFilterEvent(&ev, xw.win))
+                               continue;
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);
                }
st; my hacks to st (simple terminal) http://st.suckless.org/