nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Add a system of clipboard identifiers.

Browse Source 
This lays some groundwork for making PuTTY's cut and paste handling
more flexible in the area of which clipboard(s) it reads and writes,
if more than one is available on the system.

I've introduced a system of list macros which define an enumeration of
integer clipboard ids, some defined centrally in putty.h (at present
just a CLIP_NULL which never has any text in it, because that seems
like the sort of thing that will come in useful for configuring a
given copy or paste UI action to be ignored) and some defined per
platform. All the front end functions that copy and paste take a
clipboard id, and the Terminal structure is now configured at startup
to tell it which clipboard id it should paste from on a mouse click,
and which it should copy from on a selection.

However, I haven't actually added _real_ support for multiple X11
clipboards, in that the Unix front end supports a single CLIP_SYSTEM
regardless of whether it's in OS X or GTK mode. So this is currently a
NFC refactoring which does nothing but prepare the way for real
changes to come.
This commit is contained in:
Simon Tatham
2017-12-09 12:00:13 +00:00
parent 9bff5595a2
commit 1829719639
10 changed files with 115 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
terminal.c
View File

@ -1703,6 +1703,11 @@ Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata,
term->basic_erase_char.truecolour.bg = optionalrgb_none;
term->erase_char = term->basic_erase_char;
/* frontends will typically overwrite these with clipboard ids they
* know about */
term->mouse_select_clipboard = CLIP_NULL;
term->mouse_paste_clipboard = CLIP_NULL;
return term;
}
@ -5638,7 +5643,8 @@ static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr, truecolour tc)
b->bufpos++;
}
static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel,
int clipboard)
{
clip_workbuf buf;
int old_top_x;
@ -5799,13 +5805,14 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
clip_addchar(&buf, 0, 0, term->basic_erase_char.truecolour);
#endif
/* Finally, transfer all that to the clipboard. */
write_clip(term->frontend, buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos, desel);
write_clip(term->frontend, clipboard,
buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos, desel);
sfree(buf.textbuf);
sfree(buf.attrbuf);
sfree(buf.tcbuf);
}
void term_copyall(Terminal *term)
void term_copyall(Terminal *term, int clipboard)
{
pos top;
pos bottom;
@ -5814,7 +5821,14 @@ void term_copyall(Terminal *term)
top.x = 0;
bottom.y = find_last_nonempty_line(term, screen);
bottom.x = term->cols;
clipme(term, top, bottom, 0, TRUE);
clipme(term, top, bottom, 0, TRUE, clipboard);
}
void term_request_paste(Terminal *term, int clipboard)
{
if (clipboard == CLIP_NULL)
return;
frontend_request_paste(term->frontend, clipboard);
}
/*
@ -6397,7 +6411,8 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
* data to the clipboard.
*/
clipme(term, term->selstart, term->selend,
(term->seltype == RECTANGULAR), FALSE);
(term->seltype == RECTANGULAR), FALSE,
term->mouse_select_clipboard);
term->selstate = SELECTED;
} else
term->selstate = NO_SELECTION;
@ -6407,7 +6422,7 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
|| a == MA_2CLK || a == MA_3CLK
#endif
)) {
request_paste(term->frontend);
term_request_paste(term, term->mouse_paste_clipboard);
}
/*
@ -6471,8 +6486,11 @@ static void deselect(Terminal *term)
term->selstart.x = term->selstart.y = term->selend.x = term->selend.y = 0;
}
void term_deselect(Terminal *term)
void term_lost_clipboard_ownership(Terminal *term, int clipboard)
{
if (clipboard != term->mouse_select_clipboard)
return;
deselect(term);
term_update(term);