Move opt_* into same file as main()/run()

[st.git] / x.c

diff --git a/x.c b/x.c
index 01ef1b0..e267961 100644 (file)
--- a/x.c
+++ b/x.c
@@ -116,6 +116,8 @@ 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 char *kmap(KeySym, uint);
+static int match(uint, uint);

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


@@ -177,6 +179,15 @@ static char *usedfont = NULL;
 static double usedfontsize = 0;
 static double defaultfontsize = 0;
 
 static double usedfontsize = 0;
 static double defaultfontsize = 0;
 

+static char *opt_class = NULL;
+static char **opt_cmd  = NULL;
+static char *opt_embed = NULL;
+static char *opt_font  = NULL;
+static char *opt_io    = NULL;
+static char *opt_line  = NULL;
+static char *opt_name  = NULL;
+static char *opt_title = NULL;
+

 void
 zoom(const Arg *arg)
 {
 void
 zoom(const Arg *arg)
 {


@@ -192,7 +203,7 @@ zoomabs(const Arg *arg)
        xunloadfonts();
        xloadfonts(usedfont, arg->f);
        cresize(0, 0);
        xunloadfonts();
        xloadfonts(usedfont, arg->f);
        cresize(0, 0);

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

        redraw();
        xhints();
 }
        redraw();
        xhints();
 }


@@ -1471,6 +1482,7 @@ void
 xsettitle(char *p)
 {
        XTextProperty prop;
 xsettitle(char *p)
 {
        XTextProperty prop;

+       DEFAULT(p, "st");

 
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
 
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);


@@ -1603,6 +1615,52 @@ focus(XEvent *ev)
        }
 }
 
        }
 }
 

+int
+match(uint mask, uint state)
+{
+       return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
+}
+
+char*
+kmap(KeySym k, uint state)
+{
+       Key *kp;
+       int i;
+
+       /* Check for mapped keys out of X11 function keys. */
+       for (i = 0; i < mappedkeyslen; i++) {
+               if (mappedkeys[i] == k)
+                       break;
+       }
+       if (i == mappedkeyslen) {
+               if ((k & 0xFFFF) < 0xFD00)
+                       return NULL;
+       }
+
+       for (kp = key; kp < key + keyslen; kp++) {
+               if (kp->k != k)
+                       continue;
+
+               if (!match(kp->mask, state))
+                       continue;
+
+               if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+                       continue;
+               if (term.numlock && kp->appkey == 2)
+                       continue;
+
+               if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
+                       continue;
+
+               if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
+                       continue;
+
+               return kp->s;
+       }
+
+       return NULL;
+}
+

 void
 kpress(XEvent *ev)
 {
 void
 kpress(XEvent *ev)
 {


@@ -1679,7 +1737,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


@@ -1709,8 +1767,8 @@ run(void)
        } while (ev.type != MapNotify);
 
        cresize(w, h);
        } while (ev.type != MapNotify);
 
        cresize(w, h);

-       ttynew();
-       ttyresize();
+       ttynew(opt_line, opt_io, opt_cmd);
+       ttyresize(win.tw, win.th);

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