snark/st
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Making the copy and pasting consistent.

Browse source 
The copying and pasting in the terminald and GUI world is flawed. Due to the
discussion on the mailinglist it seems that sending '\n' is what GUIs expect
and '\r' what terminal applications want. St now implements that behaviour.
This commit is contained in:
Christoph Lohmann 2013-04-13 08:48:17 +02:00
parent ddd429ea24
commit 4018b2c507
1 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
st.c
View file

@ -788,9 +788,18 @@ selcopy(void) {
memcpy(ptr, p, size); memcpy(ptr, p, size);
ptr += size; ptr += size;
} }
/* \n at the end of every selected line except for the last one */
/*
* Copy and pasting of line endings is inconsistent
* in the inconsistent terminal and GUI world.
* The best solution seems like to produce '\n' when
* something is copied from st and convert '\n' to
* '\r', when something to be pasted is received by
* st.
* FIXME: Fix the computer world.
*/
if(is_selected && y < sel.e.y) if(is_selected && y < sel.e.y)
*ptr++ = '\r'; *ptr++ = '\n';
} }
*ptr = 0; *ptr = 0;
} }
@ -801,7 +810,7 @@ void
selnotify(XEvent *e) { selnotify(XEvent *e) {
ulong nitems, ofs, rem; ulong nitems, ofs, rem;
int format; int format;
uchar *data; uchar *data, *last, *repl;
Atom type; Atom type;
ofs = 0; ofs = 0;
@ -812,6 +821,24 @@ selnotify(XEvent *e) {
fprintf(stderr, "Clipboard allocation failed\n"); fprintf(stderr, "Clipboard allocation failed\n");
return; return;
} }
/*
* As seen in selcopy:
* Line endings are inconsistent in the terminal and GUI world
* copy and pasting. When receiving some selection data,
* replace all '\n' with '\r'.
* FIXME: Fix the computer world.
*/
repl = data;
last = data + nitems * format / 8;
while((repl = memchr(repl, '\n', last - repl))) {
*repl++ = '\r';
}
last = data + nitems * format / 8;
repl = 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 */ /* number of 32-bit chunks returned */