diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2011-05-27 12:17:59 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2011-05-27 12:17:59 -0400 |
commit | a9f737eef69ffe03dd045df555300ae6b41d0edf (patch) | |
tree | 515b335a2f07a324ecc71b6a9331b7e0bc712586 /src/terminal.c | |
parent | be520aca79dd429d55012a1916bdc97f06773fc5 (diff) | |
download | emacs-a9f737eef69ffe03dd045df555300ae6b41d0edf.tar.gz |
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/terminal.c')
-rw-r--r-- | src/terminal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/terminal.c b/src/terminal.c index c5185601fb6..c135c0f93ef 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -256,6 +256,8 @@ create_terminal (void) setup_coding_system (terminal_coding, terminal->terminal_coding); terminal->param_alist = Qnil; + terminal->charset_list = Qnil; + terminal->Vselection_alist = Qnil; return terminal; } |