mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 01:20:37 -08:00
Code Issues Projects Releases Wiki Activity

<Qcompound_text_with_extensions>: New variable.

Browse source 
(syms_of_xselect): Intern and staticpro it.
(selection_data_to_lisp_data): Run post-read-conversion on decoded
selection text.
(lisp_data_to_selection_data): If next-selection-coding-system is
compound-text-with-extensions, set the type of selection to be
compound-text.
This commit is contained in:
Eli Zaretskii 2002-02-22 13:16:35 +00:00
parent b443e0bd7d
commit fbbe0aceda
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ChangeLog
View file

@ -1,3 +1,21 @@
2002-02-22 Eli Zaretskii <eliz@is.elta.co.il>
Support for ICCCM Extended Segments in X selections:
* xselect.c <Qcompound_text_with_extensions>: New variable.
(syms_of_xselect): Intern and staticpro it.
(selection_data_to_lisp_data): Run post-read-conversion on decoded
selection text.
(lisp_data_to_selection_data): If next-selection-coding-system is
compound-text-with-extensions, set the type of selection to be
compound-text.
* xterm.h (x_encode_text): Update prototype.
* xfns.c (x_encode_text): Accept additional arg SELECTIONP; all
callers changed. If SELECTIONP is non-zero, run the
pre-write-conversion function before encoding the selection text.
2002-02-21 Kim F. Storm <storm@cua.dk>
* frame.c (syms_of_frame): Change mouse-highlight default to t.

15
src/xselect.c
View file

@ -97,6 +97,8 @@ Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
Lisp_Object QCOMPOUND_TEXT; /* This is a type of selection. */
Lisp_Object Qcompound_text_with_extensions;
#ifdef CUT_BUFFER_SUPPORT
Lisp_Object QCUT_BUFFER0, QCUT_BUFFER1, QCUT_BUFFER2, QCUT_BUFFER3,
QCUT_BUFFER4, QCUT_BUFFER5, QCUT_BUFFER6, QCUT_BUFFER7;
@ -1650,6 +1652,10 @@ selection_data_to_lisp_data (display, data, size, type, format)
str = make_string_from_bytes ((char *) buf,
coding.produced_char, coding.produced);
xfree (buf);
if (SYMBOLP (coding.post_read_conversion)
&& !NILP (Ffboundp (coding.post_read_conversion)))
str = run_pre_post_conversion_on_str (str, coding, 0);
Vlast_coding_system_used = coding.symbol;
}
compose_chars_in_text (0, XSTRING (str)->size, str);
@ -1756,10 +1762,13 @@ lisp_data_to_selection_data (display, obj,
Vnext_selection_coding_system = Vselection_coding_system;
*format_ret = 8;
*data_ret = x_encode_text (obj, Vnext_selection_coding_system,
*data_ret = x_encode_text (obj, Vnext_selection_coding_system, 1,
(int *) size_ret, &stringp);
*nofree_ret = (*data_ret == XSTRING (obj)->data);
if (NILP (type))
if (EQ (Vnext_selection_coding_system,
Qcompound_text_with_extensions))
type = QCOMPOUND_TEXT;
else if (NILP (type))
type = (stringp ? QSTRING : QCOMPOUND_TEXT);
Vlast_coding_system_used = (*nofree_ret
? Qraw_text
@ -2426,6 +2435,8 @@ A value of 0 means wait as long as necessary. This is initialized from the
QATOM = intern ("ATOM"); staticpro (&QATOM);
QATOM_PAIR = intern ("ATOM_PAIR"); staticpro (&QATOM_PAIR);
QNULL = intern ("NULL"); staticpro (&QNULL);
Qcompound_text_with_extensions = intern ("compound-text-with-extensions");
staticpro (&Qcompound_text_with_extensions);
#ifdef CUT_BUFFER_SUPPORT
QCUT_BUFFER0 = intern ("CUT_BUFFER0"); staticpro (&QCUT_BUFFER0);