(struct redisplay_interface): Add active_p argument to

draw_window_cursor member.  All uses changed.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/macterm.c b/src/macterm.c
index 510269c8ca5..68c599caa3e 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4648,19 +4648,20 @@ mac_clear_frame_area (f, x, y, width, height)
 /* RIF: Draw cursor on window W.  */
 
 static void
-mac_draw_window_cursor (w, glyph_row, on, x, y, new_cursor_type, new_cursor_width)
+mac_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, active_p)
      struct window *w;
      struct glyph_row *glyph_row;
-     int on, x, y;
-     int new_cursor_type, new_cursor_width;
+     int x, y;
+     int cursor_type, cursor_width;
+     int on_p, active_p;
 {
-  if (on)
+  if (on_p)
     {
-      w->phys_cursor_type = new_cursor_type;
-      w->phys_cursor_width = new_cursor_width;
+      w->phys_cursor_type = cursor_type;
+      w->phys_cursor_width = cursor_width;
       w->phys_cursor_on_p = 1;
 
-      switch (new_cursor_type)
+      switch (cursor_type)
         {
         case HOLLOW_BOX_CURSOR:
           x_draw_hollow_cursor (w, glyph_row);
@@ -4673,7 +4674,7 @@ mac_draw_window_cursor (w, glyph_row, on, x, y, new_cursor_type, new_cursor_widt
         case HBAR_CURSOR:
           /* TODO.  For now, just draw bar cursor. */
         case BAR_CURSOR:
-          x_draw_bar_cursor (w, glyph_row, new_cursor_width);
+          x_draw_bar_cursor (w, glyph_row, cursor_width);
           break;
 
         case NO_CURSOR: