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 <djpohly@gmail.com>
This commit is contained in:
parent
323d38da20
commit
3bb900cd6c
2
st.c
2
st.c
|
@ -1747,7 +1747,7 @@ strhandle(void)
|
||||||
|
|
||||||
dec = base64dec(strescseq.args[2]);
|
dec = base64dec(strescseq.args[2]);
|
||||||
if (dec) {
|
if (dec) {
|
||||||
xsetsel(dec, CurrentTime);
|
xsetsel(dec);
|
||||||
xclipcopy();
|
xclipcopy();
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "erresc: invalid base64\n");
|
fprintf(stderr, "erresc: invalid base64\n");
|
||||||
|
|
2
win.h
2
win.h
|
@ -16,4 +16,4 @@ int xsetcolorname(int, const char *);
|
||||||
void xsettitle(char *);
|
void xsettitle(char *);
|
||||||
int xsetcursor(int);
|
int xsetcursor(int);
|
||||||
void xsetpointermotion(int);
|
void xsetpointermotion(int);
|
||||||
void xsetsel(char *, Time);
|
void xsetsel(char *);
|
||||||
|
|
18
x.c
18
x.c
|
@ -148,7 +148,7 @@ static void propnotify(XEvent *);
|
||||||
static void selnotify(XEvent *);
|
static void selnotify(XEvent *);
|
||||||
static void selclear_(XEvent *);
|
static void selclear_(XEvent *);
|
||||||
static void selrequest(XEvent *);
|
static void selrequest(XEvent *);
|
||||||
static void selcopy(Time);
|
static void setsel(char *, Time);
|
||||||
static void getbuttoninfo(XEvent *);
|
static void getbuttoninfo(XEvent *);
|
||||||
static void mousereport(XEvent *);
|
static void mousereport(XEvent *);
|
||||||
static char *kmap(KeySym, uint);
|
static char *kmap(KeySym, uint);
|
||||||
|
@ -440,12 +440,6 @@ bpress(XEvent *e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
selcopy(Time t)
|
|
||||||
{
|
|
||||||
xsetsel(getsel(), t);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
propnotify(XEvent *e)
|
propnotify(XEvent *e)
|
||||||
{
|
{
|
||||||
|
@ -620,7 +614,7 @@ selrequest(XEvent *e)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
xsetsel(char *str, Time t)
|
setsel(char *str, Time t)
|
||||||
{
|
{
|
||||||
free(sel.primary);
|
free(sel.primary);
|
||||||
sel.primary = str;
|
sel.primary = str;
|
||||||
|
@ -630,6 +624,12 @@ xsetsel(char *str, Time t)
|
||||||
selclear_(NULL);
|
selclear_(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
xsetsel(char *str)
|
||||||
|
{
|
||||||
|
setsel(str, CurrentTime);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
brelease(XEvent *e)
|
brelease(XEvent *e)
|
||||||
{
|
{
|
||||||
|
@ -643,7 +643,7 @@ brelease(XEvent *e)
|
||||||
} else if (e->xbutton.button == Button1) {
|
} else if (e->xbutton.button == Button1) {
|
||||||
if (sel.mode == SEL_READY) {
|
if (sel.mode == SEL_READY) {
|
||||||
getbuttoninfo(e);
|
getbuttoninfo(e);
|
||||||
selcopy(e->xbutton.time);
|
setsel(getsel(), e->xbutton.time);
|
||||||
} else
|
} else
|
||||||
selclear_(NULL);
|
selclear_(NULL);
|
||||||
sel.mode = SEL_IDLE;
|
sel.mode = SEL_IDLE;
|
||||||
|
|
Loading…
Reference in New Issue