add paste from clipboard

master
Connor Lane Smith 13 years ago
parent 7b1493a631
commit dc77337ef3
  1. 6
      dmenu.c

@ -52,7 +52,7 @@ static const char *selfgcolor = "#ffffff";
static unsigned int lines = 0; static unsigned int lines = 0;
static unsigned long normcol[ColLast]; static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast]; static unsigned long selcol[ColLast];
static Atom utf8; static Atom clip, utf8;
static Bool topbar = True; static Bool topbar = True;
static DC *dc; static DC *dc;
static Item *items = NULL; static Item *items = NULL;
@ -275,7 +275,8 @@ keypress(XKeyEvent *ev) {
insert(NULL, nextrune(-1) - cursor); insert(NULL, nextrune(-1) - cursor);
break; break;
case XK_y: /* paste selection */ case XK_y: /* paste selection */
XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); XConvertSelection(dc->dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
utf8, utf8, win, CurrentTime);
return; return;
default: default:
return; return;
@ -517,6 +518,7 @@ setup(void) {
selcol[ColBG] = getcolor(dc, selbgcolor); selcol[ColBG] = getcolor(dc, selbgcolor);
selcol[ColFG] = getcolor(dc, selfgcolor); selcol[ColFG] = getcolor(dc, selfgcolor);
clip = XInternAtom(dc->dpy, "CLIPBOARD", False);
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
/* calculate menu geometry */ /* calculate menu geometry */

Loading…
Cancel
Save