Remove Time argument from xsetsel

[st.git] / x.c

diff --git a/x.c b/x.c
index 03555d1..a332ac9 100644 (file)
--- a/x.c
+++ b/x.c
@@ -20,6 +20,30 @@ static char *argv0;
 #include "st.h"
 #include "win.h"
 
+/* types used in config.h */
+typedef struct {
+       uint mod;
+       KeySym keysym;
+       void (*func)(const Arg *);
+       const Arg arg;
+} Shortcut;
+
+typedef struct {
+       uint b;
+       uint mask;
+       char *s;
+} MouseShortcut;
+
+typedef struct {
+       KeySym k;
+       uint mask;
+       char *s;
+       /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+       signed char appkey;    /* application keypad */
+       signed char appcursor; /* application cursor */
+       signed char crlf;      /* crlf mode          */
+} Key;
+
 /* function definitions used in config.h */
 static void clipcopy(const Arg *);
 static void clippaste(const Arg *);
@@ -124,7 +148,7 @@ static void propnotify(XEvent *);
 static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
-static void selcopy(Time);
+static void setsel(char *, Time);
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
@@ -163,6 +187,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
 static DC dc;
 static XWindow xw;
 static XSelection xsel;
+static TermWindow win;
 
 enum window_state {
        WIN_VISIBLE = 1,
@@ -415,12 +440,6 @@ bpress(XEvent *e)
        }
 }
 
-void
-selcopy(Time t)
-{
-       xsetsel(getsel(), t);
-}
-
 void
 propnotify(XEvent *e)
 {
@@ -595,7 +614,7 @@ selrequest(XEvent *e)
 }
 
 void
-xsetsel(char *str, Time t)
+setsel(char *str, Time t)
 {
        free(sel.primary);
        sel.primary = str;
@@ -605,6 +624,12 @@ xsetsel(char *str, Time t)
                selclear_(NULL);
 }
 
+void
+xsetsel(char *str)
+{
+       setsel(str, CurrentTime);
+}
+
 void
 brelease(XEvent *e)
 {
@@ -618,7 +643,7 @@ brelease(XEvent *e)
        } else if (e->xbutton.button == Button1) {
                if (sel.mode == SEL_READY) {
                        getbuttoninfo(e);
-                       selcopy(e->xbutton.time);
+                       setsel(getsel(), e->xbutton.time);
                } else
                        selclear_(NULL);
                sel.mode = SEL_IDLE;
@@ -1591,6 +1616,16 @@ xsetpointermotion(int set)
        XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
 }
 
+int
+xsetcursor(int cursor)
+{
+       DEFAULT(cursor, 1);
+       if (!BETWEEN(cursor, 0, 6))
+               return 1;
+       win.cursor = cursor;
+       return 0;
+}
+
 void
 xseturgency(int add)
 {