#include <sys/file.h>
+#include "lisp.h"
#include "systty.h" /* For emacs_tty in termchar.h */
#include "termchar.h"
#include "termopts.h"
-#include "lisp.h"
#include "charset.h"
#include "coding.h"
#include "keyboard.h"
void (*write_glyphs_hook) P_ ((struct glyph *, int));
void (*delete_glyphs_hook) P_ ((int));
-int (*read_socket_hook) P_ ((int, struct input_event *, int, int));
+int (*read_socket_hook) P_ ((struct input_event *, int, int));
void (*frame_up_to_date_hook) P_ ((struct frame *));
}
else
{ /* have to do it the hard way */
- struct frame *sf = XFRAME (selected_frame);
turn_off_insert ();
/* Do not write in last row last col with Auto-wrap on. */
- if (AutoWrap && curY == FRAME_LINES (sf) - 1
- && first_unused_hpos == FRAME_COLS (sf))
+ if (AutoWrap && curY == FRAME_LINES (f) - 1
+ && first_unused_hpos == FRAME_COLS (f))
first_unused_hpos--;
for (i = curX; i < first_unused_hpos; i++)
register int len;
{
int produced, consumed;
- struct frame *sf = XFRAME (selected_frame);
- struct frame *f = updating_frame ? updating_frame : sf;
+ struct frame *f = updating_frame ? updating_frame : XFRAME (selected_frame);
unsigned char conversion_buffer[1024];
int conversion_buffer_size = sizeof conversion_buffer;
since that would scroll the whole frame on some terminals. */
if (AutoWrap
- && curY + 1 == FRAME_LINES (sf)
- && (curX + len) == FRAME_COLS (sf))
+ && curY + 1 == FRAME_LINES (f)
+ && (curX + len) == FRAME_COLS (f))
len --;
if (len <= 0)
return;
{
char *buf;
struct glyph *glyph = NULL;
- struct frame *f, *sf;
+ struct frame *f;
if (len <= 0)
return;
return;
}
- sf = XFRAME (selected_frame);
- f = updating_frame ? updating_frame : sf;
+ f = updating_frame ? updating_frame : XFRAME (selected_frame);
if (TS_ins_multi_chars)
{
char *multi = n > 0 ? TS_ins_multi_lines : TS_del_multi_lines;
char *single = n > 0 ? TS_ins_line : TS_del_line;
char *scroll = n > 0 ? TS_rev_scroll : TS_fwd_scroll;
- struct frame *sf;
+ struct frame *f;
register int i = n > 0 ? n : -n;
register char *buf;
return;
}
- sf = XFRAME (selected_frame);
+ f = (updating_frame ? updating_frame : XFRAME (selected_frame));
/* If the lines below the insertion are being pushed
into the end of the window, this is the same as clearing;
/* If the lines below the deletion are blank lines coming
out of the end of the window, don't bother,
as there will be a matching inslines later that will flush them. */
- if (TTY_SCROLL_REGION_OK (FRAME_TTY (sf))
+ if (TTY_SCROLL_REGION_OK (FRAME_TTY (f))
&& vpos + i >= specified_window)
return;
- if (!TTY_MEMORY_BELOW_FRAME (FRAME_TTY (sf))
- && vpos + i >= FRAME_LINES (sf))
+ if (!TTY_MEMORY_BELOW_FRAME (FRAME_TTY (f))
+ && vpos + i >= FRAME_LINES (f))
return;
if (multi)
raw_cursor_to (vpos, 0);
background_highlight ();
buf = tparam (multi, 0, 0, i);
- OUTPUT (FRAME_TTY (sf), buf);
+ OUTPUT (FRAME_TTY (f), buf);
xfree (buf);
}
else if (single)
raw_cursor_to (vpos, 0);
background_highlight ();
while (--i >= 0)
- OUTPUT (FRAME_TTY (sf), single);
+ OUTPUT (FRAME_TTY (f), single);
if (TF_teleray)
curX = 0;
}
raw_cursor_to (vpos, 0);
background_highlight ();
while (--i >= 0)
- OUTPUTL (FRAME_TTY (sf), scroll, specified_window - vpos);
+ OUTPUTL (FRAME_TTY (f), scroll, specified_window - vpos);
set_scroll_region (0, specified_window);
}
- if (!TTY_SCROLL_REGION_OK (FRAME_TTY (sf))
- && TTY_MEMORY_BELOW_FRAME (FRAME_TTY (sf))
+ if (!TTY_SCROLL_REGION_OK (FRAME_TTY (f))
+ && TTY_MEMORY_BELOW_FRAME (FRAME_TTY (f))
&& n < 0)
{
- cursor_to (FRAME_LINES (sf) + n, 0);
+ cursor_to (FRAME_LINES (f) + n, 0);
clear_to_end ();
}
}
/* Get frame size from system, or else from termcap. */
{
int height, width;
- get_frame_size (&width, &height);
+ get_tty_size (tty, &width, &height);
FRAME_COLS (sf) = width;
FRAME_LINES (sf) = height;
}