#include <stdio.h>
#include <ctype.h>
+#include "lisp.h"
#include "termchar.h"
#include "termopts.h"
#include "termhooks.h"
#include "cm.h"
-#include "lisp.h"
#include "dispextern.h"
#include "buffer.h"
#include "frame.h"
#include "commands.h"
#include "disptab.h"
#include "indent.h"
+#include "intervals.h"
#include "systty.h"
#include "systime.h"
exist inside frame objects lives in the following structure instead.
NOTE: the_only_frame is not checked for garbage collection; don't
- store collectable objects in any of its fields!
+ store collectible objects in any of its fields!
You're not/The only frame in town/... */
Lisp_Object tail, frame;
FOR_EACH_FRAME (tail, frame)
- /* If we simply redrew all visible frames, whether or not they
- were garbaged, then this would make all frames clear and
- nredraw whenever a new frame is created or an existing frame
- is de-iconified; those events set the global frame_garbaged
- flag, to which redisplay responds by calling this function.
-
- This used to redraw all visible frames; the only advantage of
- that approach is that if a frame changes from invisible to
- visible without setting its garbaged flag, it still gets
- redisplayed. But that should never happen; since invisible
- frames are not updated, they should always be marked as
- garbaged when they become visible again. If that doesn't
- happen, it's a bug in the visibility code, not a bug here. */
- if (FRAME_VISIBLE_P (XFRAME (frame))
- && FRAME_GARBAGED_P (XFRAME (frame)))
+ if (FRAME_VISIBLE_P (XFRAME (frame)))
Fredraw_frame (frame);
return Qnil;
}
+/* This is used when frame_garbaged is set.
+ Redraw the individual frames marked as garbaged. */
+
+void
+redraw_garbaged_frames ()
+{
+ Lisp_Object tail, frame;
+
+ FOR_EACH_FRAME (tail, frame)
+ if (FRAME_VISIBLE_P (XFRAME (frame))
+ && FRAME_GARBAGED_P (XFRAME (frame)))
+ Fredraw_frame (frame);
+}
+
\f
static struct frame_glyphs *
make_frame_glyphs (frame, empty)
/* Give up if buffer appears in two places. */
|| buffer_shared > 1
+#ifdef USE_TEXT_PROPERTIES
+ /* Intervals have already been adjusted, point is after the
+ character that was just inserted. */
+ /* Give up if character has is invisible. */
+ /* Give up if character has a face property.
+ At the moment we only lose at end of line or end of buffer
+ and only with faces that have some background */
+ /* Instead of wasting time, give up if character has any text properties */
+ || ! NILP (Ftext_properties_at (XFASTINT (point - 1), Qnil))
+#endif
+
/* Give up if w is minibuffer and a message is being displayed there */
|| (MINI_WINDOW_P (w) && echo_area_glyphs))
return 0;
{
#ifdef HAVE_X_WINDOWS
int dummy;
- int face = compute_char_face (frame, w, point, -1, -1, &dummy);
+ int face = compute_char_face (frame, w, point - 1, -1, -1, &dummy);
#else
int face = 0;
#endif
{
register FRAME_PTR frame = selected_frame;
register struct window *w = XWINDOW (selected_window);
-
+ int position;
+
/* Avoid losing if cursor is in invisible text off left margin
or about to go off either side of window. */
if ((FRAME_CURSOR_X (frame) == XFASTINT (w->left)
&& (FRAME_CURSOR_X (frame) + 1 >= window_internal_width (w) - 1))
|| cursor_in_echo_area)
return 0;
-
+
/* Can't use direct output if highlighting a region. */
if (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active))
return 0;
+#ifdef USE_TEXT_PROPERTIES
+ /* Don't use direct output next to an invisible character
+ since we might need to do something special. */
+
+ XFASTINT (position) = point + n;
+ if (! NILP (Fget_text_property (position,
+ Qinvisible,
+ Fcurrent_buffer ())))
+ return;
+
+ XFASTINT (position) = point + n - 1;
+ if (! NILP (Fget_text_property (position,
+ Qinvisible,
+ Fcurrent_buffer ())))
+ return;
+#endif
+
FRAME_CURSOR_X (frame) += n;
XFASTINT (w->last_point_x) = FRAME_CURSOR_X (frame);
XFASTINT (w->last_point) = point;
cursor_to (FRAME_CURSOR_Y (frame), FRAME_CURSOR_X (frame));
fflush (stdout);
+
return 1;
}
\f
register int downto, leftmost;
#endif
+ if (preempt_count <= 0)
+ preempt_count = 1;
+
if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */
detect_input_pending ();
outq = PENDING_OUTPUT_COUNT (stdout);
#endif
outq *= 10;
- sleep (outq / baud_rate);
+ if (baud_rate > 0)
+ sleep (outq / baud_rate);
}
}
if ((i - 1) % preempt_count == 0)
posn = compute_motion (startp, 0,
(window == XWINDOW (minibuf_window) && startp == 1
? minibuf_prompt_width : 0),
- ZV, line, col - window_left,
+ ZV, line, col,
window_width, XINT (window->hscroll), 0);
current_buffer = old_current_buffer;
{
int i,j;
+#if 0
+ if (FRAME_X_P (frame))
+ {
+ /* Under X, erase everything we are going to rewrite,
+ and rewrite everything from the first char that's changed.
+ This is part of supporting fonts like Courier
+ whose chars can overlap outside the char width. */
+ for (i = 0; i < nlen; i++)
+ if (i >= olen || nbody[i] != obody[i])
+ break;
+
+ cursor_to (vpos, i);
+ if (i != olen)
+ clear_end_of_line (olen);
+ write_glyphs (nbody + i, nlen - i);
+ }
+ else
+ {}
+#endif /* 0 */
for (i = 0; i < nlen; i++)
{
if (i >= olen || nbody[i] != obody[i]) /* A non-matching char. */
int height = FRAME_NEW_HEIGHT (f);
int width = FRAME_NEW_WIDTH (f);
-
- FRAME_NEW_HEIGHT (f) = 0;
- FRAME_NEW_WIDTH (f) = 0;
- if (height != 0)
+ if (height != 0 || width != 0)
change_frame_size (f, height, width, 0, 0);
}
}
FRAME_NEW_HEIGHT (frame) = 0;
FRAME_NEW_WIDTH (frame) = 0;
- /* If an arguments is zero, set it to the current value. */
+ /* If an argument is zero, set it to the current value. */
newheight || (newheight = FRAME_HEIGHT (frame));
newwidth || (newwidth = FRAME_WIDTH (frame));
HCoop / bpt / emacs.git / blobdiff