arg.h wasn't used for dist.

[st.git] / st.c

diff --git a/st.c b/st.c
index 142a152..836ae21 100644 (file)
--- a/st.c
+++ b/st.c
@@ -63,8 +63,6 @@ char *argv0;
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 

-#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
-

 /* macros */
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 /* macros */
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))


@@ -292,7 +290,7 @@ typedef struct {
                int x, y;
        } nb, ne, ob, oe;
 
                int x, y;
        } nb, ne, ob, oe;
 

-       char *clip;
+       char *primary, *clipboard;

        Atom xtarget;
        bool alt;
        struct timespec tclick1;
        Atom xtarget;
        bool alt;
        struct timespec tclick1;


@@ -314,6 +312,7 @@ typedef struct {
 } Shortcut;
 
 /* function definitions used in config.h */
 } Shortcut;
 
 /* function definitions used in config.h */

+static void clipcopy(const Arg *);

 static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);


@@ -349,7 +348,7 @@ typedef struct {
 
 static void die(const char *, ...);
 static void draw(void);
 
 static void die(const char *, ...);
 static void draw(void);

-static void redraw(int);
+static void redraw(void);

 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);


@@ -481,7 +480,11 @@ static void (*handler[LASTEvent])(XEvent *) = {
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,

-       [SelectionClear] = selclear,
+/*
+ * Uncomment if you want the selection to disappear when you select something
+ * different in another window.
+ */
+/*     [SelectionClear] = selclear, */

        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };
        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };


@@ -524,6 +527,7 @@ enum {
 typedef struct {
        XftFont *font;
        int flags;
 typedef struct {
        XftFont *font;
        int flags;

+       long unicodep;

 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */
 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */


@@ -641,7 +645,8 @@ selinit(void) {
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.ob.x = -1;
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.ob.x = -1;

-       sel.clip = NULL;
+       sel.primary = NULL;
+       sel.clipboard = NULL;

        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
                sel.xtarget = XA_STRING;
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
                sel.xtarget = XA_STRING;


@@ -986,12 +991,17 @@ selnotify(XEvent *e) {
        int format;
        uchar *data, *last, *repl;
        Atom type;
        int format;
        uchar *data, *last, *repl;
        Atom type;

+       XSelectionEvent *xsev;

 
        ofs = 0;
 
        ofs = 0;

+       xsev = (XSelectionEvent *)e;
+       if (xsev->property == None)
+           return;

        do {
        do {

-               if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
-                                       False, AnyPropertyType, &type, &format,
-                                       &nitems, &rem, &data)) {
+               if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
+                                       BUFSIZ/4, False, AnyPropertyType,
+                                       &type, &format, &nitems, &rem,
+                                       &data)) {

                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }
                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }


@@ -1026,12 +1036,26 @@ selpaste(const Arg *dummy) {
                        xw.win, CurrentTime);
 }
 
                        xw.win, CurrentTime);
 }
 

+void
+clipcopy(const Arg *dummy) {
+       Atom clipboard;
+
+       if(sel.clipboard != NULL)
+               free(sel.clipboard);
+
+       if(sel.primary != NULL) {
+               sel.clipboard = xstrdup(sel.primary);
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+       }
+}
+

 void
 clippaste(const Arg *dummy) {
        Atom clipboard;
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
 void
 clippaste(const Arg *dummy) {
        Atom clipboard;
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);

-       XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY,
+       XConvertSelection(xw.dpy, clipboard, sel.xtarget, clipboard,

                        xw.win, CurrentTime);
 }
 
                        xw.win, CurrentTime);
 }
 


@@ -1047,7 +1071,8 @@ void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;

-       Atom xa_targets, string;
+       Atom xa_targets, string, clipboard;
+       char *seltext;

 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;
 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;


@@ -1066,11 +1091,29 @@ selrequest(XEvent *e) {
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;

-       } else if(xsre->target == sel.xtarget && sel.clip != NULL) {
-               XChangeProperty(xsre->display, xsre->requestor, xsre->property,
-                               xsre->target, 8, PropModeReplace,
-                               (uchar *) sel.clip, strlen(sel.clip));
-               xev.property = xsre->property;
+       } else if(xsre->target == sel.xtarget || xsre->target == XA_STRING) {
+               /*
+                * xith XA_STRING non ascii characters may be incorrect in the
+                * requestor. It is not our problem, use utf8.
+                */
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               if(xsre->selection == XA_PRIMARY) {
+                       seltext = sel.primary;
+               } else if(xsre->selection == clipboard) {
+                       seltext = sel.clipboard;
+               } else {
+                       fprintf(stderr,
+                               "Unhandled clipboard selection 0x%lx\n",
+                               xsre->selection);
+                       return;
+               }
+               if(seltext != NULL) {
+                       XChangeProperty(xsre->display, xsre->requestor,
+                                       xsre->property, xsre->target,
+                                       8, PropModeReplace,
+                                       (uchar *)seltext, strlen(seltext));
+                       xev.property = xsre->property;
+               }

        }
 
        /* all done, send a notification to the listener */
        }
 
        /* all done, send a notification to the listener */


@@ -1080,16 +1123,10 @@ selrequest(XEvent *e) {
 
 void
 xsetsel(char *str) {
 
 void
 xsetsel(char *str) {

-       /* register the selection for both the clipboard and the primary */
-       Atom clipboard;
-
-       free(sel.clip);
-       sel.clip = str;
+       free(sel.primary);
+       sel.primary = str;

 
        XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
 
        XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);

-
-       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-       XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);

 }
 
 void
 }
 
 void


@@ -1826,7 +1863,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)

-                                       redraw(REDRAW_TIMEOUT);
+                                       redraw();

                                break;
                        case 6: /* DECOM -- Origin */
                                MODBIT(term.c.state, set, CURSOR_ORIGIN);
                                break;
                        case 6: /* DECOM -- Origin */
                                MODBIT(term.c.state, set, CURSOR_ORIGIN);


@@ -2200,7 +2237,7 @@ strhandle(void) {
                                 * TODO if defaultbg color is changed, borders
                                 * are dirty
                                 */
                                 * TODO if defaultbg color is changed, borders
                                 * are dirty
                                 */

-                               redraw(0);
+                               redraw();

                        }
                        return;
                }
                        }
                        return;
                }


@@ -3093,7 +3130,7 @@ xzoomabs(const Arg *arg) {
        xunloadfonts();
        xloadfonts(usedfont, arg->i);
        cresize(0, 0);
        xunloadfonts();
        xloadfonts(usedfont, arg->i);
        cresize(0, 0);

-       redraw(0);
+       redraw();

        xhints();
 }
 
        xhints();
 }
 


@@ -3210,7 +3247,7 @@ void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
            width = charlen * xw.cw, xp, i;
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
            width = charlen * xw.cw, xp, i;

-       int frcflags;
+       int frcflags, charexists;

        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
        long unicodep;
        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
        long unicodep;


@@ -3393,8 +3430,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {

-                       if(XftCharExists(xw.dpy, frc[i].font, unicodep)
-                                       && frc[i].flags == frcflags) {
+                       charexists = XftCharExists(xw.dpy, frc[i].font, unicodep);
+                       /* Everything correct. */
+                       if(charexists && frc[i].flags == frcflags)
+                               break;
+                       /* We got a default font for a not found glyph. */
+                       if(!charexists && frc[i].flags == frcflags \
+                                       && frc[i].unicodep == unicodep) {

                                break;
                        }
                }
                                break;
                        }
                }


@@ -3425,8 +3467,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                        FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);
 
                                        FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);
 

-                       fontpattern = FcFontSetMatch(0, fcsets,
-                                       FcTrue, fcpattern, &fcres);
+                       fontpattern = FcFontSetMatch(0, fcsets, 1,
+                                       fcpattern, &fcres);

 
                        /*
                         * Overwrite or create the new cache entry.
 
                        /*
                         * Overwrite or create the new cache entry.


@@ -3434,11 +3476,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        if(frclen >= LEN(frc)) {
                                frclen = LEN(frc) - 1;
                                XftFontClose(xw.dpy, frc[frclen].font);
                        if(frclen >= LEN(frc)) {
                                frclen = LEN(frc) - 1;
                                XftFontClose(xw.dpy, frc[frclen].font);

+                               frc[frclen].unicodep = 0;

                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);
                        frc[frclen].flags = frcflags;
                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);
                        frc[frclen].flags = frcflags;

+                       frc[frclen].unicodep = unicodep;

 
                        i = frclen;
                        frclen++;
 
                        i = frclen;
                        frclen++;


@@ -3558,16 +3602,9 @@ xresettitle(void) {
 }
 
 void
 }
 
 void

-redraw(int timeout) {
-       struct timespec tv = {0, timeout * 1000};
-
+redraw(void) {

        tfulldirt();
        draw();
        tfulldirt();
        draw();

-
-       if(timeout > 0) {
-               nanosleep(&tv, NULL);
-               XSync(xw.dpy, False); /* necessary for a good tput flash */
-       }

 }
 
 void
 }
 
 void


@@ -3634,7 +3671,7 @@ expose(XEvent *ev) {
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        }
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        }

-       redraw(0);
+       redraw();

 }
 
 void
 }
 
 void


@@ -3938,7 +3975,7 @@ run(void) {
 
 void
 usage(void) {
 
 void
 usage(void) {

-       die("%s " VERSION " (c) 2010-2014 st engineers\n" \
+       die("%s " VERSION " (c) 2010-2015 st engineers\n" \

        "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
        "          [-i] [-t title] [-w windowid] [-e command ...]\n", argv0);
 }
        "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
        "          [-i] [-t title] [-w windowid] [-e command ...]\n", argv0);
 }