|
@@ -261,6 +261,7 @@ typedef struct {
|
|
|
|
|
|
/* function definitions used in config.h */
|
|
/* function definitions used in config.h */
|
|
static void xzoom(const Arg *);
|
|
static void xzoom(const Arg *);
|
|
|
|
+static void selpaste(const Arg *);
|
|
|
|
|
|
/* Config.h for applying patches and the configuration. */
|
|
/* Config.h for applying patches and the configuration. */
|
|
#include "config.h"
|
|
#include "config.h"
|
|
@@ -360,7 +361,6 @@ static void selrequest(XEvent *);
|
|
static void selinit(void);
|
|
static void selinit(void);
|
|
static inline bool selected(int, int);
|
|
static inline bool selected(int, int);
|
|
static void selcopy(void);
|
|
static void selcopy(void);
|
|
-static void selpaste(void);
|
|
|
|
static void selscroll(int, int);
|
|
static void selscroll(int, int);
|
|
|
|
|
|
static int utf8decode(char *, long *);
|
|
static int utf8decode(char *, long *);
|
|
@@ -750,7 +750,7 @@ selnotify(XEvent *e) {
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
void
|
|
-selpaste(void) {
|
|
|
|
|
|
+selpaste(const Arg *dummy) {
|
|
XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
|
|
XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
|
|
xw.win, CurrentTime);
|
|
xw.win, CurrentTime);
|
|
}
|
|
}
|
|
@@ -821,7 +821,7 @@ brelease(XEvent *e) {
|
|
}
|
|
}
|
|
|
|
|
|
if(e->xbutton.button == Button2) {
|
|
if(e->xbutton.button == Button2) {
|
|
- selpaste();
|
|
|
|
|
|
+ selpaste(NULL);
|
|
} else if(e->xbutton.button == Button1) {
|
|
} else if(e->xbutton.button == Button1) {
|
|
sel.mode = 0;
|
|
sel.mode = 0;
|
|
getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
|
|
getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
|
|
@@ -2743,13 +2743,6 @@ kpress(XEvent *ev) {
|
|
(shift ? "dacb":"DACB")[ksym - XK_Left]);
|
|
(shift ? "dacb":"DACB")[ksym - XK_Left]);
|
|
len = 3;
|
|
len = 3;
|
|
break;
|
|
break;
|
|
- case XK_Insert:
|
|
|
|
- if(shift) {
|
|
|
|
- selpaste();
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- memcpy(buf, xstr, len);
|
|
|
|
- break;
|
|
|
|
case XK_Return:
|
|
case XK_Return:
|
|
len = 0;
|
|
len = 0;
|
|
if(meta)
|
|
if(meta)
|