aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorChong Yidong2011-05-27 12:17:59 -0400
committerChong Yidong2011-05-27 12:17:59 -0400
commita9f737eef69ffe03dd045df555300ae6b41d0edf (patch)
tree515b335a2f07a324ecc71b6a9331b7e0bc712586 /src/xterm.c
parentbe520aca79dd429d55012a1916bdc97f06773fc5 (diff)
downloademacs-a9f737eef69ffe03dd045df555300ae6b41d0edf.tar.gz
emacs-a9f737eef69ffe03dd045df555300ae6b41d0edf.zip
Support X clipboard managers.
* lisp/select.el (xselect-convert-to-targets): Add MULTIPLE target to list. (xselect-convert-to-save-targets): New function. * src/xselect.c: Support for clipboard managers. (Vselection_alist): Move to termhooks.h as terminal-local var. (LOCAL_SELECTION): New macro. (x_atom_to_symbol): Handle x_display_info_for_display fail case. (symbol_to_x_atom): Remove gratuitous arg. (x_handle_selection_request, lisp_data_to_selection_data) (x_get_foreign_selection, Fx_register_dnd_atom): Callers changed. (x_own_selection, x_get_local_selection, x_convert_selection): New arg, specifying work frame. Use terminal-local Vselection_alist. (some_frame_on_display): Delete unused function. (Fx_own_selection_internal, Fx_get_selection_internal) (Fx_disown_selection_internal, Fx_selection_owner_p) (Fx_selection_exists_p): New optional frame arg. (frame_for_x_selection, Fx_clipboard_manager_save): New functions. (x_handle_selection_clear): Don't treat other terminals with the same keyboard specially. Use the terminal-local Vselection_alist. (x_clear_frame_selections): Use Frun_hook_with_args. * src/termhooks.h (Vselection_alist): Make it terminal-local. * src/terminal.c (create_terminal): Initialize it. * src/xterm.c (x_term_init): Intern ATOM and CLIPBOARD_MANAGER atoms. * src/xterm.h: Add support for those atoms.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 64030a3151d..3b8112d972b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10186,7 +10186,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
10186 { "_EMACS_TMP_", &dpyinfo->Xatom_EMACS_TMP }, 10186 { "_EMACS_TMP_", &dpyinfo->Xatom_EMACS_TMP },
10187 { "TARGETS", &dpyinfo->Xatom_TARGETS }, 10187 { "TARGETS", &dpyinfo->Xatom_TARGETS },
10188 { "NULL", &dpyinfo->Xatom_NULL }, 10188 { "NULL", &dpyinfo->Xatom_NULL },
10189 { "ATOM", &dpyinfo->Xatom_ATOM },
10189 { "ATOM_PAIR", &dpyinfo->Xatom_ATOM_PAIR }, 10190 { "ATOM_PAIR", &dpyinfo->Xatom_ATOM_PAIR },
10191 { "CLIPBOARD_MANAGER", &dpyinfo->Xatom_CLIPBOARD_MANAGER },
10190 { "_XEMBED_INFO", &dpyinfo->Xatom_XEMBED_INFO }, 10192 { "_XEMBED_INFO", &dpyinfo->Xatom_XEMBED_INFO },
10191 /* For properties of font. */ 10193 /* For properties of font. */
10192 { "PIXEL_SIZE", &dpyinfo->Xatom_PIXEL_SIZE }, 10194 { "PIXEL_SIZE", &dpyinfo->Xatom_PIXEL_SIZE },