blankie
/
st
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Inline clipboard functions 

No need to keep a function that only calls another function in the same
file.

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
This commit is contained in:
Devin J. Pohly 2017-10-17 15:43:32 -05:00
parent 65976c1a29
commit 428f01969a
2 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
win.h
View File

@ -10,11 +10,9 @@ void drawregion(int, int, int, int);
void xbell(void); void xbell(void);
void xclipcopy(void); void xclipcopy(void);
void xclippaste(void);
void xhints(void); void xhints(void);
void xloadcols(void); void xloadcols(void);
int xsetcolorname(int, const char *); int xsetcolorname(int, const char *);
void xsettitle(char *); void xsettitle(char *);
void xsetpointermotion(int); void xsetpointermotion(int);
void xselpaste(void);
void xsetsel(char *, Time); void xsetsel(char *, Time);

50
x.c
View File

@ -210,19 +210,33 @@ static char *opt_title = NULL;
void void
clipcopy(const Arg *dummy) clipcopy(const Arg *dummy)
{ {
xclipcopy(); 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 void
clippaste(const Arg *dummy) clippaste(const Arg *dummy)
{ {
xclippaste(); Atom clipboard;
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
xw.win, CurrentTime);
} }
void void
selpaste(const Arg *dummy) selpaste(const Arg *dummy)
{ {
xselpaste(); XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
xw.win, CurrentTime);
} }
void void
@ -518,36 +532,10 @@ selnotify(XEvent *e)
XDeleteProperty(xw.dpy, xw.win, (int)property); XDeleteProperty(xw.dpy, xw.win, (int)property);
} }
void
xselpaste(void)
{
XConvertSelection(xw.dpy, XA_PRIMARY, xsel.xtarget, XA_PRIMARY,
xw.win, CurrentTime);
}
void void
xclipcopy(void) xclipcopy(void)
{ {
Atom clipboard; clipcopy(NULL);
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
xclippaste(void)
{
Atom clipboard;
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
xw.win, CurrentTime);
} }
void void
@ -634,7 +622,7 @@ brelease(XEvent *e)
} }
if (e->xbutton.button == Button2) { if (e->xbutton.button == Button2) {
xselpaste(); selpaste(NULL);
} 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);