From 4b80f6746dc824f1ec36a96abe684480ed06e62e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 4 Jun 2011 17:02:42 -0400 Subject: [PATCH] Handle errors when saving to clipboard manager (Bug#8779). * src/xselect.c (x_clipboard_manager_save): Remove redundant arg. (x_clipboard_manager_save): Add return value. (x_clipboard_manager_error_1, x_clipboard_manager_error_2): New error handlers. (x_clipboard_manager_save_frame, x_clipboard_manager_save_all): Obey Vx_select_enable_clipboard_manager. Catch errors in x_clipboard_manager_save (Bug#8779). (Vx_select_enable_clipboard_manager): New variable. --- etc/NEWS | 3 +++ src/ChangeLog | 11 ++++++++++ src/xselect.c | 57 +++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 62 insertions(+), 9 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index d3758f8ed0a..b264972c688 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -400,6 +400,9 @@ between applications. *** Support for X clipboard managers has been added. +**** To inhibit use of the clipboard manager, set +`x-select-enable-clipboard-manager' to nil. + ** New command `rectangle-number-lines', bound to `C-x r N', numbers the lines in the current rectangle. With an prefix argument, this prompts for a number to count from and for a format string. diff --git a/src/ChangeLog b/src/ChangeLog index 2ce41e3b35b..a75fecc3d8e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2011-06-04 Chong Yidong + + * xselect.c (x_clipboard_manager_save): Remove redundant arg. + (x_clipboard_manager_save): Add return value. + (x_clipboard_manager_error_1, x_clipboard_manager_error_2): New + error handlers. + (x_clipboard_manager_save_frame, x_clipboard_manager_save_all): + Obey Vx_select_enable_clipboard_manager. Catch errors in + x_clipboard_manager_save (Bug#8779). + (Vx_select_enable_clipboard_manager): New variable. + 2011-06-04 Dan Nicolaescu * emacs.c (main): Warn when starting a GTK emacs in daemon mode. diff --git a/src/xselect.c b/src/xselect.c index 73ef4abc0a4..4e7c28fc9d8 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -2108,15 +2108,14 @@ frame's display, or the first available X display. */) } -/* Send the clipboard manager a SAVE_TARGETS request with a - UTF8_STRING property, as described by - http://www.freedesktop.org/wiki/ClipboardManager */ +/* Send clipboard manager a SAVE_TARGETS request with a UTF8_STRING + property (http://www.freedesktop.org/wiki/ClipboardManager). */ -static void -x_clipboard_manager_save (struct x_display_info *dpyinfo, - Lisp_Object frame) +static Lisp_Object +x_clipboard_manager_save (Lisp_Object frame) { struct frame *f = XFRAME (frame); + struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); Atom data = dpyinfo->Xatom_UTF8_STRING; XChangeProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), @@ -2125,6 +2124,31 @@ x_clipboard_manager_save (struct x_display_info *dpyinfo, (unsigned char *) &data, 1); x_get_foreign_selection (QCLIPBOARD_MANAGER, QSAVE_TARGETS, Qnil, frame); + return Qt; +} + +/* Error handler for x_clipboard_manager_save_frame. */ + +static Lisp_Object +x_clipboard_manager_error_1 (Lisp_Object err) +{ + Lisp_Object args[2]; + args[0] = build_string ("X clipboard manager error: %s\n\ +If the problem persists, set `x-select-enable-clipboard-manager' to nil."); + args[1] = CAR (CDR (err)); + Fmessage (2, args); + return Qnil; +} + +/* Error handler for x_clipboard_manager_save_all. */ + +static Lisp_Object +x_clipboard_manager_error_2 (Lisp_Object err) +{ + fprintf (stderr, "Error saving to X clipboard manager.\n\ +If the problem persists, set `x-select-enable-clipboard-manager' \ +to nil.\n"); + return Qnil; } /* Called from delete_frame: save any clipboard owned by FRAME to the @@ -2136,7 +2160,8 @@ x_clipboard_manager_save_frame (Lisp_Object frame) { struct frame *f; - if (FRAMEP (frame) + if (!NILP (Vx_select_enable_clipboard_manager) + && FRAMEP (frame) && (f = XFRAME (frame), FRAME_X_P (f)) && FRAME_LIVE_P (f)) { @@ -2148,7 +2173,8 @@ x_clipboard_manager_save_frame (Lisp_Object frame) && EQ (frame, XCAR (XCDR (XCDR (XCDR (local_selection))))) && XGetSelectionOwner (dpyinfo->display, dpyinfo->Xatom_CLIPBOARD_MANAGER)) - x_clipboard_manager_save (dpyinfo, frame); + internal_condition_case_1 (x_clipboard_manager_save, frame, Qt, + x_clipboard_manager_error_1); } } @@ -2162,6 +2188,10 @@ x_clipboard_manager_save_all (void) /* Loop through all X displays, saving owned clipboards. */ struct x_display_info *dpyinfo; Lisp_Object local_selection, local_frame; + + if (NILP (Vx_select_enable_clipboard_manager)) + return; + for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) { local_selection = LOCAL_SELECTION (QCLIPBOARD, dpyinfo); @@ -2172,7 +2202,8 @@ x_clipboard_manager_save_all (void) local_frame = XCAR (XCDR (XCDR (XCDR (local_selection)))); if (FRAME_LIVE_P (XFRAME (local_frame))) - x_clipboard_manager_save (dpyinfo, local_frame); + internal_condition_case_1 (x_clipboard_manager_save, local_frame, + Qt, x_clipboard_manager_error_2); } } @@ -2641,6 +2672,14 @@ This hook doesn't let you change the behavior of Emacs's selection replies, it merely informs you that they have happened. */); Vx_sent_selection_functions = Qnil; + DEFVAR_LISP ("x-select-enable-clipboard-manager", + Vx_select_enable_clipboard_manager, + doc: /* Whether to enable X clipboard manager support. +If non-nil, then whenever Emacs is killed or an Emacs frame is deleted +while owning the X clipboard, the clipboard contents are saved to the +clipboard manager if one is present. */); + Vx_select_enable_clipboard_manager = Qt; + DEFVAR_INT ("x-selection-timeout", x_selection_timeout, doc: /* Number of milliseconds to wait for a selection reply. If the selection owner doesn't reply in this time, we give up. -- 2.39.5