aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2004-07-04 18:23:20 +0000
committerLuc Teirlinck2004-07-04 18:23:20 +0000
commit59db7d6e7f5480f9af8fb7d2c0eab6d699028f36 (patch)
treef1e6ec001780e26a152e4f6460ee3f5176ab35b0
parent8430818acab5f7abd40ec9504e907c67a4bb082b (diff)
downloademacs-59db7d6e7f5480f9af8fb7d2c0eab6d699028f36.tar.gz
emacs-59db7d6e7f5480f9af8fb7d2c0eab6d699028f36.zip
(Input Focus): Add documentation for `select-frame-set-input-focus'.
Replace refs to non-existent `switch-frame' with `select-frame'. Minor corrections and tidying up of text-only terminal stuff. From Alan Mackenzie.
-rw-r--r--lispref/ChangeLog7
-rw-r--r--lispref/frames.texi25
2 files changed, 24 insertions, 8 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index dfb558463fe..f8f492777cc 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,10 @@
12004-07-04 Alan Mackenzie <acm@muc.de>
2
3 * frames.texi (Input Focus): Add documentation for
4 `select-frame-set-input-focus'. Replace refs to non-existent
5 `switch-frame' with `select-frame'. Minor corrections and tidying
6 up of text-only terminal stuff.
7
12004-07-02 Richard M. Stallman <rms@gnu.org> 82004-07-02 Richard M. Stallman <rms@gnu.org>
2 9
3 * files.texi (Saving Buffers): Cleanup write-contents-function. 10 * files.texi (Saving Buffers): Cleanup write-contents-function.
diff --git a/lispref/frames.texi b/lispref/frames.texi
index fe3bca7c119..24540f471f8 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -1,6 +1,6 @@
1@c -*-texinfo-*- 1@c -*-texinfo-*-
2@c This is part of the GNU Emacs Lisp Reference Manual. 2@c This is part of the GNU Emacs Lisp Reference Manual.
3@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002 3@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2004
4@c Free Software Foundation, Inc. 4@c Free Software Foundation, Inc.
5@c See the file elisp.texi for copying conditions. 5@c See the file elisp.texi for copying conditions.
6@setfilename ../info/frames 6@setfilename ../info/frames
@@ -996,19 +996,28 @@ This function returns the selected frame.
996Some window systems and window managers direct keyboard input to the 996Some window systems and window managers direct keyboard input to the
997window object that the mouse is in; others require explicit clicks or 997window object that the mouse is in; others require explicit clicks or
998commands to @dfn{shift the focus} to various window objects. Either 998commands to @dfn{shift the focus} to various window objects. Either
999way, Emacs automatically keeps track of which frame has the focus. 999way, Emacs automatically keeps track of which frame has the focus. To
1000switch to a different frame from a lisp function, call
1001@code{select-frame-set-input-focus}.
1000 1002
1001Lisp programs can also switch frames ``temporarily'' by calling the 1003Lisp programs can also switch frames ``temporarily'' by calling the
1002function @code{select-frame}. This does not alter the window system's 1004function @code{select-frame}. This does not alter the window system's
1003concept of focus; rather, it escapes from the window manager's control 1005concept of focus; rather, it escapes from the window manager's control
1004until that control is somehow reasserted. 1006until that control is somehow reasserted.
1005 1007
1006When using a text-only terminal, only the selected terminal frame is 1008When using a text-only terminal, only one frame can be displayed at a
1007actually displayed on the terminal. @code{switch-frame} is the only way 1009time on the terminal, so @code{select-frame} actually displays the
1008to switch frames, and the change lasts until overridden by a subsequent 1010newly selected frame. This frame remains displayed until a subsequent
1009call to @code{switch-frame}. Each terminal screen except for the 1011call to @code{select-frame} or @code{select-frame-set-input-focus}.
1010initial one has a number, and the number of the selected frame appears 1012Each terminal frame has a number which appears in the mode line before
1011in the mode line before the buffer name (@pxref{Mode Line Variables}). 1013the buffer name (@pxref{Mode Line Variables}).
1014
1015@defun select-frame-set-input-focus frame
1016This function makes @var{frame} the selected frame, raises it (should
1017it happen to be obscured by other frames) and tries to give it the X
1018server's focus. On a text-only terminal, the new frame gets displayed
1019on the entire terminal screen.
1020@end defun
1012 1021
1013@c ??? This is not yet implemented properly. 1022@c ??? This is not yet implemented properly.
1014@defun select-frame frame 1023@defun select-frame frame