Mercurial > emacs
changeset 25682:f8543a6d88ca
(XTcursor_to): Change for Lisp_Object selected_frame.
(x_clear_frame, XTring_bell, XTmouse_position, XTread_socket): Ditto.
(XRINGBELL): Removed.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 13 Sep 1999 11:14:29 +0000 |
| parents | 3e56c05edfab |
| children | d1179efb4e87 |
| files | src/xterm.c |
| diffstat | 1 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Mon Sep 13 11:14:26 1999 +0000 +++ b/src/xterm.c Mon Sep 13 11:14:29 1999 +0000 @@ -1076,7 +1076,7 @@ { BLOCK_INPUT; x_display_cursor (w, 1, hpos, vpos, x, y); - XFlush (FRAME_X_DISPLAY (selected_frame)); + XFlush (FRAME_X_DISPLAY (SELECTED_FRAME ())); UNBLOCK_INPUT; } } @@ -4739,7 +4739,7 @@ /* Clear entire frame. If updating_frame is non-null, clear that - frame. Otherwise clear selected_frame. */ + frame. Otherwise clear the selected frame. */ static void x_clear_frame () @@ -4749,7 +4749,7 @@ if (updating_frame) f = updating_frame; else - f = selected_frame; + f = SELECTED_FRAME (); /* Clearing the frame will erase any cursor, so mark them all as no longer visible. */ @@ -4946,24 +4946,24 @@ /* Make audible bell. */ -#define XRINGBELL XBell (FRAME_X_DISPLAY (selected_frame), 0) - void XTring_bell () { - if (FRAME_X_DISPLAY (selected_frame) == 0) - return; - + struct frame *f = SELECTED_FRAME (); + + if (FRAME_X_DISPLAY (f)) + { #if defined (HAVE_TIMEVAL) && defined (HAVE_SELECT) - if (visible_bell) - XTflash (selected_frame); - else -#endif - { - BLOCK_INPUT; - XRINGBELL; - XFlush (FRAME_X_DISPLAY (selected_frame)); - UNBLOCK_INPUT; + if (visible_bell) + XTflash (f); + else +#endif + { + BLOCK_INPUT; + XBell (FRAME_X_DISPLAY (f), 0); + XFlush (FRAME_X_DISPLAY (f)); + UNBLOCK_INPUT; + } } } @@ -6979,7 +6979,7 @@ } if (f1 == 0 && insist > 0) - f1 = selected_frame; + f1 = SELECTED_FRAME (); if (f1) { @@ -8765,7 +8765,7 @@ /* This is just so we only give real data once for a single Emacs process. */ - if (f == selected_frame) + if (f == SELECTED_FRAME ()) XSetCommand (FRAME_X_DISPLAY (f), event.xclient.window, initial_argv, initial_argc);