tonitch/st
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

selection code cleanup.

Browse Source
This commit is contained in:
Aurélien Aptel 2010-11-08 19:49:13 +01:00
parent b1e6099220
commit d581bfccd7
1 changed files with 24 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
st.c
View File

@ -286,35 +286,24 @@ static char *getseltext() {
static void selection_notify(XEvent *e) { static void selection_notify(XEvent *e) {
unsigned long nitems; unsigned long nitems;
unsigned long length; unsigned long ofs, rem;
int format, res; int format;
unsigned char *data; unsigned char *data;
Atom type; Atom type;
res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, 0, False, ofs = 0;
AnyPropertyType, &type, &format, &nitems, &length, &data); do {
switch(res) { if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
case BadAtom: False, AnyPropertyType, &type, &format,
case BadValue: &nitems, &rem, &data)) {
case BadWindow: fprintf(stderr, "Clipboard allocation failed\n");
fprintf(stderr, "Invalid paste, XGetWindowProperty0");
return; return;
} }
res = XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, 0, length, False,
AnyPropertyType, &type, &format, &nitems, &length, &data);
switch(res) {
case BadAtom:
case BadValue:
case BadWindow:
fprintf(stderr, "Invalid paste, XGetWindowProperty0");
return;
}
if(data) {
ttywrite((const char *) data, nitems * format / 8); ttywrite((const char *) data, nitems * format / 8);
XFree(data); XFree(data);
} /* number of 32-bit chunks returned */
ofs += nitems * format / 32;
} while(rem > 0);
} }
static void selpaste() { static void selpaste() {
@ -325,7 +314,6 @@ static void selection_request(XEvent *e)
{ {
XSelectionRequestEvent *xsre; XSelectionRequestEvent *xsre;
XSelectionEvent xev; XSelectionEvent xev;
int res;
Atom xa_targets; Atom xa_targets;
xsre = (XSelectionRequestEvent *) e; xsre = (XSelectionRequestEvent *) e;
@ -341,70 +329,33 @@ static void selection_request(XEvent *e)
if(xsre->target == xa_targets) { if(xsre->target == xa_targets) {
/* respond with the supported type */ /* respond with the supported type */
Atom string = XA_STRING; Atom string = XA_STRING;
res = XChangeProperty(xsre->display, xsre->requestor, xsre->property, XA_ATOM, 32, XChangeProperty(xsre->display, xsre->requestor, xsre->property,
PropModeReplace, (unsigned char *) &string, 1); XA_ATOM, 32, PropModeReplace,
switch(res) { (unsigned char *) &string, 1);
case BadAlloc: xev.property = xsre->property;
case BadAtom:
case BadMatch:
case BadValue:
case BadWindow:
fprintf(stderr, "Error in selection_request, TARGETS");
break;
default:
xev.property = xsre->property;
}
} else if(xsre->target == XA_STRING) { } else if(xsre->target == XA_STRING) {
res = XChangeProperty(xsre->display, xsre->requestor, xsre->property, XChangeProperty(xsre->display, xsre->requestor, xsre->property,
xsre->target, 8, PropModeReplace, (unsigned char *) sel.clip, xsre->target, 8, PropModeReplace,
strlen(sel.clip)); (unsigned char *) sel.clip, strlen(sel.clip));
switch(res) { xev.property = xsre->property;
case BadAlloc:
case BadAtom:
case BadMatch:
case BadValue:
case BadWindow:
fprintf(stderr, "Error in selection_request, XA_STRING");
break;
default:
xev.property = xsre->property;
}
} }
/* all done, send a notification to the listener */ /* all done, send a notification to the listener */
res = XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev); if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev))
switch(res) { fprintf(stderr, "Error sending SelectionNotify event\n");
case 0:
case BadValue:
case BadWindow:
fprintf(stderr, "Error in selection_requested, XSendEvent");
}
} }
static void selcopy(char *str) { static void selcopy(char *str) {
/* register the selection for both the clipboard and the primary */ /* register the selection for both the clipboard and the primary */
Atom clipboard; Atom clipboard;
int res;
free(sel.clip); free(sel.clip);
sel.clip = str; sel.clip = str;
res = XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime); XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
switch(res) {
case BadAtom:
case BadWindow:
fprintf(stderr, "Invalid copy, XSetSelectionOwner");
return;
}
clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0); clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
res = XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime); XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
switch(res) {
case BadAtom:
case BadWindow:
fprintf(stderr, "Invalid copy, XSetSelectionOwner");
return;
}
XFlush(xw.dis); XFlush(xw.dis);
} }