Commit 0137dbf7 authored by Jim Blandy's avatar Jim Blandy

entered into RCS

parent ff11dfa1
......@@ -25,7 +25,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef standalone
#include "buffer.h"
#include "screen.h"
#include "frame.h"
#include "window.h"
#include "process.h"
#include "dispextern.h"
......@@ -159,7 +159,7 @@ glyph_to_str_cpy (glyphs, str)
#define PRINTCHAR(ch) printchar (ch, printcharfun)
/* Index of first unused element of SCREEN_MESSAGE_BUF(selected_screen). */
/* Index of first unused element of FRAME_MESSAGE_BUF(selected_frame). */
static int printbufidx;
static void
......@@ -190,17 +190,17 @@ printchar (ch, fun)
return;
}
if (echo_area_glyphs != SCREEN_MESSAGE_BUF (selected_screen)
if (echo_area_glyphs != FRAME_MESSAGE_BUF (selected_frame)
|| !message_buf_print)
{
echo_area_glyphs = SCREEN_MESSAGE_BUF (selected_screen);
echo_area_glyphs = FRAME_MESSAGE_BUF (selected_frame);
printbufidx = 0;
message_buf_print = 1;
}
if (printbufidx < SCREEN_WIDTH (selected_screen) - 1)
SCREEN_MESSAGE_BUF (selected_screen)[printbufidx++] = ch;
SCREEN_MESSAGE_BUF (selected_screen)[printbufidx] = 0;
if (printbufidx < FRAME_WIDTH (selected_frame) - 1)
FRAME_MESSAGE_BUF (selected_frame)[printbufidx++] = ch;
FRAME_MESSAGE_BUF (selected_frame)[printbufidx] = 0;
return;
}
......@@ -242,19 +242,19 @@ strout (ptr, size, printcharfun)
return;
}
if (echo_area_glyphs != SCREEN_MESSAGE_BUF (selected_screen)
if (echo_area_glyphs != FRAME_MESSAGE_BUF (selected_frame)
|| !message_buf_print)
{
echo_area_glyphs = SCREEN_MESSAGE_BUF (selected_screen);
echo_area_glyphs = FRAME_MESSAGE_BUF (selected_frame);
printbufidx = 0;
message_buf_print = 1;
}
if (i > SCREEN_WIDTH (selected_screen) - printbufidx - 1)
i = SCREEN_WIDTH (selected_screen) - printbufidx - 1;
bcopy (ptr, &SCREEN_MESSAGE_BUF (selected_screen) [printbufidx], i);
if (i > FRAME_WIDTH (selected_frame) - printbufidx - 1)
i = FRAME_WIDTH (selected_frame) - printbufidx - 1;
bcopy (ptr, &FRAME_MESSAGE_BUF (selected_frame) [printbufidx], i);
printbufidx += i;
SCREEN_MESSAGE_BUF (selected_screen) [printbufidx] = 0;
FRAME_MESSAGE_BUF (selected_frame) [printbufidx] = 0;
return;
}
......@@ -275,7 +275,7 @@ print_string (string, printcharfun)
Lisp_Object printcharfun;
{
if (EQ (printcharfun, Qnil) || EQ (printcharfun, Qt))
/* In predictable cases, strout is safe: output to buffer or screen. */
/* In predictable cases, strout is safe: output to buffer or frame. */
strout (XSTRING (string)->data, XSTRING (string)->size, printcharfun);
else
{
......@@ -887,17 +887,17 @@ print (obj, printcharfun, escapeflag)
strout ("#<window-configuration>", -1, printcharfun);
break;
#ifdef MULTI_SCREEN
case Lisp_Screen:
strout (((XSCREEN (obj)->display.nothing == 0)
? "#<dead screen " : "#<screen "),
#ifdef MULTI_FRAME
case Lisp_Frame:
strout ((FRAME_LIVE_P (XFRAME (obj))
? "#<frame " : "#<dead frame "),
-1, printcharfun);
print_string (XSCREEN (obj)->name, printcharfun);
sprintf (buf, " 0x%x", XFASTINT (XSCREEN (obj)));
print_string (XFRAME (obj)->name, printcharfun);
sprintf (buf, " 0x%x", XFASTINT (XFRAME (obj)));
strout (buf, -1, printcharfun);
strout (">", -1, printcharfun);
break;
#endif /* MULTI_SCREEN */
#endif /* MULTI_FRAME */
case Lisp_Marker:
strout ("#<marker ", -1, printcharfun);
......
This diff is collapsed.
......@@ -46,14 +46,14 @@ who first discovered the Menu_Base_Kludge.
#include "buffer.h"
#include "termhooks.h"
/* conversion to/from character & screen coordinates */
/* conversion to/from character & frame coordinates */
/* From Gosling Emacs SunWindow driver by Chris Torek */
/* Chars to screen coords. Note that we speak in zero origin. */
/* Chars to frame coords. Note that we speak in zero origin. */
#define CtoSX(cx) ((cx) * Sun_Font_Xsize)
#define CtoSY(cy) ((cy) * Sun_Font_Ysize)
/* Screen coords to chars */
/* Frame coords to chars */
#define StoCX(sx) ((sx) / Sun_Font_Xsize)
#define StoCY(sy) ((sy) / Sun_Font_Ysize)
......
......@@ -133,7 +133,7 @@ extern char *sys_errlist[];
extern int quit_char;
#include "screen.h"
#include "frame.h"
#include "window.h"
#include "termhooks.h"
#include "termchar.h"
......@@ -897,7 +897,7 @@ init_sys_modes ()
EMACS_SET_TTY (input_fd, &tty, 0);
/* This code added to insure that, if flow-control is not to be used,
we have an unlocked screen at the start. */
we have an unlocked terminal at the start. */
#ifdef TCXONC
if (!flow_control) ioctl (0, TCXONC, 1);
......@@ -966,10 +966,10 @@ init_sys_modes ()
}
else
{
screen_garbaged = 1;
#ifdef MULTI_SCREEN
if (SCREENP (Vterminal_screen))
SCREEN_GARBAGED_P (XSCREEN (Vterminal_screen)) = 1;
frame_garbaged = 1;
#ifdef MULTI_FRAME
if (FRAMEP (Vterminal_frame))
FRAME_GARBAGED_P (XFRAME (Vterminal_frame)) = 1;
#endif
}
......@@ -991,7 +991,7 @@ tabs_safe_p ()
Store number of lines into *heightp and width into *widthp.
If zero or a negative number is stored, the value is not valid. */
get_screen_size (widthp, heightp)
get_frame_size (widthp, heightp)
int *widthp, *heightp;
{
......@@ -1044,7 +1044,7 @@ get_screen_size (widthp, heightp)
/* Prepare the terminal for exiting Emacs; move the cursor to the
bottom of the screen, turn off interrupt-driven I/O, etc. */
bottom of the frame, turn off interrupt-driven I/O, etc. */
reset_sys_modes ()
{
if (noninteractive)
......@@ -1056,10 +1056,10 @@ reset_sys_modes ()
return;
if (read_socket_hook || !EQ (Vwindow_system, Qnil))
return;
cursor_to (SCREEN_HEIGHT (selected_screen) - 1, 0);
clear_end_of_line (SCREEN_WIDTH (selected_screen));
cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0);
clear_end_of_line (FRAME_WIDTH (selected_frame));
/* clear_end_of_line may move the cursor */
cursor_to (SCREEN_HEIGHT (selected_screen) - 1, 0);
cursor_to (FRAME_HEIGHT (selected_frame) - 1, 0);
#ifdef IBMR2AIX
{
/* HFT devices normally use ^J as a LF/CR. We forced it to
......@@ -1233,7 +1233,7 @@ kbd_input_ast ()
struct input_event e;
e.kind = ascii_keystroke;
XSET (buf[i].code, Lisp_Int, cbuf[i]);
e.screen = selected_screen;
e.frame = selected_frame;
kbd_buffer_store_event (&e);
}
......@@ -1729,7 +1729,7 @@ read_input_waiting ()
/* Scan the chars for C-g and store them in kbd_buffer. */
e.kind = ascii_keystroke;
e.screen = selected_screen;
e.frame = selected_frame;
for (i = 0; i < nread; i++)
{
XSET (e.code, Lisp_Int, buf[i]);
......@@ -3881,7 +3881,7 @@ rename_sans_version (from,to)
stat = sys$dassgn (chan);
if (!stat)
lib$signal (stat);
strcpy (vms_file_written, to_esn); /* We will write this to the screen*/
strcpy (vms_file_written, to_esn); /* We will write this to the terminal*/
return 0;
}
......
......@@ -30,14 +30,14 @@ extern int line_ins_del_ok; /* Terminal can insert and delete lines */
extern int char_ins_del_ok; /* Terminal can insert and delete chars */
extern int scroll_region_ok; /* Terminal supports setting the scroll
window */
extern int memory_below_screen; /* Terminal remembers lines scrolled
extern int memory_below_frame; /* Terminal remembers lines scrolled
off bottom */
extern int fast_clear_end_of_line; /* Terminal has a `ce' string */
extern int dont_calculate_costs; /* Nonzero means don't bother computing
various cost tables; we won't use them. */
/* Nonzero means no need to redraw the entire screen on resuming
/* Nonzero means no need to redraw the entire frame on resuming
a suspended Emacs. This is useful on terminals with multiple pages,
where one page is used for Emacs and another for all else. */
extern int no_redraw_on_reenter;
......@@ -23,7 +23,7 @@ extern int (*cursor_to_hook) ();
extern int (*raw_cursor_to_hook) ();
extern int (*clear_to_end_hook) ();
extern int (*clear_screen_hook) ();
extern int (*clear_frame_hook) ();
extern int (*clear_end_of_line_hook) ();
extern int (*ins_del_lines_hook) ();
......@@ -47,7 +47,7 @@ extern int (*read_socket_hook) ();
/* Return the current position of the mouse. This should clear
mouse_moved until the next motion event arrives. */
extern void (*mouse_position_hook) ( /* SCREEN_PTR *s,
extern void (*mouse_position_hook) ( /* FRAME_PTR *f,
Lisp_Object *x,
Lisp_Object *y,
unsigned long *time */ );
......@@ -57,10 +57,10 @@ extern void (*mouse_position_hook) ( /* SCREEN_PTR *s,
hook should clear this. */
extern int mouse_moved;
/* When a screen's focus redirection is changed, this hook tells the
/* When a frame's focus redirection is changed, this hook tells the
window system code to re-decide where to put the highlight. Under
X, this means that Emacs lies about where the focus is. */
extern void (*screen_rehighlight_hook) ( /* void */ );
extern void (*frame_rehighlight_hook) ( /* void */ );
/* If nonzero, send all terminal output characters to this stream also. */
extern FILE *termscript;
......@@ -82,7 +82,7 @@ struct input_event {
no_event, /* nothing happened. This should never
actually appear in the event queue. */
ascii_keystroke, /* The ASCII code is in .code.
.screen is the screen in which the key
.frame is the frame in which the key
was typed.
Note that this includes meta-keys, and
the modifiers field of the event
......@@ -97,7 +97,7 @@ struct input_event {
should feel free to add missing keys.
.modifiers holds the state of the
modifier keys.
.screen is the screen in which the key
.frame is the frame in which the key
was typed.
.timestamp gives a timestamp (in
milliseconds) for the keystroke. */
......@@ -106,7 +106,7 @@ struct input_event {
modifier keys.
.x and .y give the mouse position,
in characters, within the window.
.screen gives the screen the mouse
.frame gives the frame the mouse
click occurred in.
.timestamp gives a timestamp (in
milliseconds) for the click. */
......@@ -121,14 +121,14 @@ struct input_event {
.x gives the distance from the start
of the scroll bar of the click; .y gives
the total length of the scroll bar.
.screen gives the screen the click
.frame gives the frame the click
should apply to.
.timestamp gives a timestamp (in
milliseconds) for the click. */
#if 0
screen_selected, /* The user has moved the focus to another
screen.
.screen is the screen that should become
frame_selected, /* The user has moved the focus to another
frame.
.frame is the frame that should become
selected at the next convenient time. */
#endif
} kind;
......@@ -137,15 +137,15 @@ struct input_event {
Lisp_Object part;
/* This is obviously wrong, but I'm not sure what else I should do.
Obviously, this should be a SCREEN_PTR. But that would require that
every file which #includes this one should also #include "screen.h",
Obviously, this should be a FRAME_PTR. But that would require that
every file which #includes this one should also #include "frame.h",
which would mean that files like cm.c and other innocents would be
dragged into the set of screen.h users. Maybe the definition of this
dragged into the set of frame.h users. Maybe the definition of this
structure should be elsewhere? In its own file? */
#ifdef MULTI_SCREEN
struct screen *screen;
#ifdef MULTI_FRAME
struct frame *frame;
#else
int screen;
int frame;
#endif
int modifiers; /* See enum below for interpretation. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment