#include "dispextern.h"
#include "buffer.h"
#include "blockinput.h"
+#include "termhooks.h"
#ifdef HAVE_WINDOW_SYSTEM
break;
}
- rif->draw_fringe_bitmap (w, row, &p);
+ FRAME_RIF (f)->draw_fringe_bitmap (w, row, &p);
}
void
fbp = &fringe_bitmaps[n];
if (*fbp && (*fbp)->dynamic)
{
- if (rif->destroy_fringe_bitmap)
- rif->destroy_fringe_bitmap (n);
+ /* XXX Is SELECTED_FRAME OK here? */
+ if (FRAME_RIF (SELECTED_FRAME ())->destroy_fringe_bitmap)
+ FRAME_RIF (SELECTED_FRAME ())->destroy_fringe_bitmap (n);
xfree (*fbp);
*fbp = NULL;
}
#if defined (MAC_OS) && defined (WORDS_BIG_ENDIAN)
unsigned short *bits = fb->bits;
+ int j;
for (j = 0; j < fb->height; j++)
{
unsigned short b = *bits;
{
Fdestroy_fringe_bitmap (make_number (which));
- if (rif->define_fringe_bitmap)
- rif->define_fringe_bitmap (which, fb->bits, fb->height, fb->width);
+ /* XXX Is SELECTED_FRAME OK here? */
+ if (FRAME_RIF (SELECTED_FRAME ())->define_fringe_bitmap)
+ FRAME_RIF (SELECTED_FRAME ())->define_fringe_bitmap (which, fb->bits, fb->height, fb->width);
fringe_bitmaps[which] = fb;
if (which >= max_used_fringe_bitmap)
if (NILP (which))
{
if (max_used_fringe_bitmap < MAX_FRINGE_BITMAPS)
- n = make_number (max_used_fringe_bitmap++);
+ n = max_used_fringe_bitmap++;
else
{
for (n = MAX_STANDARD_FRINGE_BITMAPS;
{
for (i = 0; i < fill1 && j < fb.height; i++)
b[j++] = 0;
- for (i = 0; i < h & j < fb.height; i++)
+ for (i = 0; i < h && j < fb.height; i++)
{
Lisp_Object elt = Faref (bits, make_number (i));
b[j++] = NUMBERP (elt) ? XINT (elt) : 0;