static int
separate_textual_runs (unsigned char *text_storage,
struct textual_run *run_storage,
- CONST Emchar *str, Charcount len)
+ const Emchar *str, Charcount len)
{
Lisp_Object prev_charset = Qunbound; /* not Qnil because that is a
possible valid charset when
x_text_width_single_run (struct face_cachel *cachel, struct textual_run *run)
{
Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset);
- struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
if (!fi->proportional_p)
return fi->width * run->len;
else
*/
static int
-x_text_width (struct frame *f, struct face_cachel *cachel, CONST Emchar *str,
+x_text_width (struct frame *f, struct face_cachel *cachel, const Emchar *str,
Charcount len)
{
int width_so_far = 0;
else if (rb->object.chr.ch == '\n')
{
/* Clear in case a cursor was formerly here. */
- redisplay_clear_region (window, findex, xpos,
+ redisplay_clear_region (window, findex, xpos,
DISPLAY_LINE_YPOS (dl),
- rb->width,
+ rb->width,
DISPLAY_LINE_HEIGHT (dl));
elt++;
}
findex = rb->findex;
if (IMAGE_INSTANCEP (instance))
- switch (XIMAGE_INSTANCE_TYPE (instance))
- {
- case IMAGE_TEXT:
+ {
+ switch (XIMAGE_INSTANCE_TYPE (instance))
{
- /* #### This is way losing. See the comment in
- add_glyph_rune(). */
- Lisp_Object string =
- XIMAGE_INSTANCE_TEXT_STRING (instance);
- convert_bufbyte_string_into_emchar_dynarr
- (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
-
- x_output_string (w, dl, buf, xpos,
- rb->object.dglyph.xoffset,
- start_pixpos, -1, findex,
- (rb->cursor_type == CURSOR_ON),
- cursor_start, cursor_width,
- cursor_height);
- Dynarr_reset (buf);
+ case IMAGE_TEXT:
+ {
+ /* #### This is way losing. See the comment in
+ add_glyph_rune(). */
+ Lisp_Object string =
+ XIMAGE_INSTANCE_TEXT_STRING (instance);
+ convert_bufbyte_string_into_emchar_dynarr
+ (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
+
+ x_output_string (w, dl, buf, xpos,
+ rb->object.dglyph.xoffset,
+ start_pixpos, -1, findex,
+ (rb->cursor_type == CURSOR_ON),
+ cursor_start, cursor_width,
+ cursor_height);
+ Dynarr_reset (buf);
+ }
+ break;
+
+ case IMAGE_MONO_PIXMAP:
+ case IMAGE_COLOR_PIXMAP:
+ redisplay_output_pixmap (w, instance, &dbox, &dga, findex,
+ cursor_start, cursor_width,
+ cursor_height, 0);
+ break;
+
+ case IMAGE_WIDGET:
+ case IMAGE_SUBWINDOW:
+ redisplay_output_subwindow (w, instance, &dbox, &dga, findex,
+ cursor_start, cursor_width,
+ cursor_height);
+ break;
+
+ case IMAGE_LAYOUT:
+ redisplay_output_layout (w, instance, &dbox, &dga, findex,
+ cursor_start, cursor_width,
+ cursor_height);
+ break;
+
+ case IMAGE_NOTHING:
+ /* nothing is as nothing does */
+ break;
+
+ case IMAGE_POINTER:
+ default:
+ abort ();
}
- break;
-
- case IMAGE_MONO_PIXMAP:
- case IMAGE_COLOR_PIXMAP:
- redisplay_output_pixmap (w, instance, &dbox, &dga, findex,
- cursor_start, cursor_width,
- cursor_height, 0);
- break;
-
- case IMAGE_WIDGET:
- case IMAGE_SUBWINDOW:
- redisplay_output_subwindow (w, instance, &dbox, &dga, findex,
- cursor_start, cursor_width,
- cursor_height);
- break;
-
- case IMAGE_LAYOUT:
- redisplay_output_layout (w, instance, &dbox, &dga, findex,
- cursor_start, cursor_width,
- cursor_height);
- break;
-
- case IMAGE_NOTHING:
- /* nothing is as nothing does */
- break;
-
- case IMAGE_POINTER:
- default:
- abort ();
- }
+ IMAGE_INSTANCE_OPTIMIZE_OUTPUT
+ (XIMAGE_INSTANCE (instance)) = 0;
+ }
xpos += rb->width;
elt++;
{
/* #### I fixed once case where this was getting it. It was a
bad macro expansion (compiler bug). */
- fprintf (stderr, "Help! x_get_gc got a bogus fg value! fg = ");
+ stderr_out ("Help! x_get_gc got a bogus fg value! fg = ");
debug_print (fg);
fg = Qnil;
}
for (i = 0; i < nruns; i++)
{
Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
- struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
int this_width;
int need_clipping;
}
void
-x_output_x_pixmap (struct frame *f, struct Lisp_Image_Instance *p, int x,
+x_output_x_pixmap (struct frame *f, Lisp_Image_Instance *p, int x,
int y, int xoffset, int yoffset,
- int width, int height, unsigned long fg, unsigned long bg,
+ int width, int height, unsigned long fg, unsigned long bg,
GC override_gc)
{
struct device *d = XDEVICE (f->device);
pixel values, instead of symbolic of fg/bg. */
if (IMAGE_INSTANCE_PIXMAP_DEPTH (p) > 0)
{
- XCopyArea (dpy,
- IMAGE_INSTANCE_X_PIXMAP_SLICE
+ XCopyArea (dpy,
+ IMAGE_INSTANCE_X_PIXMAP_SLICE
(p, IMAGE_INSTANCE_PIXMAP_SLICE (p)), x_win, gc, xoffset,
yoffset, width,
height, x, y);
}
else
{
- XCopyPlane (dpy, IMAGE_INSTANCE_X_PIXMAP_SLICE
+ XCopyPlane (dpy, IMAGE_INSTANCE_X_PIXMAP_SLICE
(p, IMAGE_INSTANCE_PIXMAP_SLICE (p)), x_win, gc,
xoffset, yoffset, width, height, x, y, 1L);
}
{
struct frame *f = XFRAME (w->frame);
struct device *d = XDEVICE (f->device);
- struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Display *dpy = DEVICE_X_DISPLAY (d);
Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f));
-
+
/* Output the pixmap. */
{
Lisp_Object tmp_pixel;
spacing = XINT (w->vertical_divider_spacing);
line_width = XINT (w->vertical_divider_line_width);
x = WINDOW_RIGHT (w) - width;
- y1 = WINDOW_TOP (w) + FRAME_TOP_GUTTER_BOUNDS (f);
- y2 = WINDOW_BOTTOM (w) + FRAME_BOTTOM_GUTTER_BOUNDS (f);
+ y1 = WINDOW_TOP (w);
+ y2 = WINDOW_BOTTOM (w);
memset (&gcv, ~0, sizeof (XGCValues));
{
int cursor_height, cursor_y;
int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
- struct Lisp_Font_Instance *fi;
+ Lisp_Font_Instance *fi;
fi = XFONT_INSTANCE (FACE_CACHEL_FONT
(WINDOW_FACE_CACHEL (w, rb->findex),
return;
}
- redisplay_clear_to_window_end (w, WINDOW_TEXT_TOP (w),
+ redisplay_clear_to_window_end (w, WINDOW_TEXT_TOP (w),
WINDOW_TEXT_BOTTOM (w));
}
struct frame *f = device_selected_frame (d);
struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f));
Widget shell = FRAME_X_SHELL_WIDGET (f);
+ int flash_height;
XSETFRAME (frame, f);
gcv.graphics_exposures = False;
gc = gc_cache_lookup (DEVICE_X_GC_CACHE (XDEVICE (f->device)), &gcv,
(GCForeground | GCFunction | GCGraphicsExposures));
- XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
- w->pixel_width, w->pixel_height);
+ default_face_height_and_width (frame, &flash_height, 0);
+
+ /* If window is tall, flash top and bottom line. */
+ if (EQ (Vvisible_bell, Qtop_bottom) && w->pixel_height > 3 * flash_height)
+ {
+ XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
+ w->pixel_width, flash_height);
+ XFillRectangle (dpy, win, gc, w->pixel_left,
+ w->pixel_top + w->pixel_height - flash_height,
+ w->pixel_width, flash_height);
+ }
+ else
+ /* If it is short, flash it all. */
+ XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
+ w->pixel_width, w->pixel_height);
+
XSync (dpy, False);
#ifdef HAVE_SELECT
#endif /* HAVE_POLL */
#endif /* HAVE_SELECT */
- XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
- w->pixel_width, w->pixel_height);
+ /* If window is tall, flash top and bottom line. */
+ if (EQ (Vvisible_bell, Qtop_bottom) && w->pixel_height > 3 * flash_height)
+ {
+ XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
+ w->pixel_width, flash_height);
+ XFillRectangle (dpy, win, gc, w->pixel_left,
+ w->pixel_top + w->pixel_height - flash_height,
+ w->pixel_width, flash_height);
+ }
+ else
+ /* If it is short, flash it all. */
+ XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
+ w->pixel_width, w->pixel_height);
+
XSync (dpy, False);
return 1;
projects / chise / xemacs-chise.git.1 / blobdiff