commit 3bb900cd6c1c7a5364bd79bce63fdd8711bc878b from: Devin J. Pohly date: Mon Feb 26 03:53:24 2018 UTC Remove Time argument from xsetsel This is an X type and should be internal to x.c. The selcopy() function was a single line and only used in one place, so it was inlined to reduce LOC. Signed-off-by: Devin J. Pohly commit - 323d38da20c8a1d295ab1dbc0fc7ce947ef824e1 commit + 3bb900cd6c1c7a5364bd79bce63fdd8711bc878b blob - fdf697bfe14f9b943b7ffd62d09222120ec5e73e blob + bcb64732947a484a682febd25f31fa828dd0fb7b --- st.c +++ st.c @@ -1747,7 +1747,7 @@ strhandle(void) dec = base64dec(strescseq.args[2]); if (dec) { - xsetsel(dec, CurrentTime); + xsetsel(dec); xclipcopy(); } else { fprintf(stderr, "erresc: invalid base64\n"); blob - c6a5337680adec0e2a4544fc42e582a56d232a5b blob + f95a6790db7a19936b2ab84f0079ef6d6ce78d60 --- win.h +++ win.h @@ -16,4 +16,4 @@ int xsetcolorname(int, const char *); void xsettitle(char *); int xsetcursor(int); void xsetpointermotion(int); -void xsetsel(char *, Time); +void xsetsel(char *); blob - 04e2e053b9f4a505c5fe2fa255d4ed6a9806cfce blob + a332ac9386272404aa3d563cfd11ed7740959484 --- x.c +++ x.c @@ -148,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); @@ -441,12 +441,6 @@ bpress(XEvent *e) } void -selcopy(Time t) -{ - xsetsel(getsel(), t); -} - -void propnotify(XEvent *e) { XPropertyEvent *xpev; @@ -620,7 +614,7 @@ selrequest(XEvent *e) } void -xsetsel(char *str, Time t) +setsel(char *str, Time t) { free(sel.primary); sel.primary = str; @@ -631,6 +625,12 @@ xsetsel(char *str, Time t) } void +xsetsel(char *str) +{ + setsel(str, CurrentTime); +} + +void brelease(XEvent *e) { if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { @@ -643,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;