comparison src/xterm.c @ 1803:5752a95053f2

* xterm.c (x_window_to_scrollbar): Search frames' condemned_scrollbars list as well; input might arrive during redisplay. (x_scrollbar_report_motion): Don't forget to BLOCK_INPUT. (XTjudge_scrollbars): Clear the condemned scrollbar list before traversing it, so we don't try to process an event on a scrollbar we've killed.

1802:456ebec04db7

  Lisp_Object tail, frame;

  for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
    {
      Lisp_Object frame = XCONS (tail)->car;
      Lisp_Object bar;

      /* All elements of Vframe_list should be frames.  */
      if (XTYPE (frame) != Lisp_Frame)
	abort ();

      /* Scan this frame's scrollbar list for a scrollbar with the
         right window ID.  */
      for (bar = FRAME_SCROLLBARS (XFRAME (frame));
	   ! NILP (bar);
	   bar = XSCROLLBAR(bar)->next)
	if (SCROLLBAR_X_WINDOW (XSCROLLBAR (bar)) == window_id)
	  return XSCROLLBAR (bar);
    }

XTjudge_scrollbars (f)
     FRAME_PTR f;
{
  Lisp_Object bar, next;

  for (bar = FRAME_CONDEMNED_SCROLLBARS (f);
       ! NILP (bar);
       bar = next)
    {
      struct scrollbar *b = XSCROLLBAR (bar);

      x_scrollbar_remove (b);

      next = b->next;
      b->next = b->prev = Qnil;
    }

  FRAME_CONDEMNED_SCROLLBARS (f) = Qnil;

  /* Now there should be no references to the condemned scrollbars,
     and they should get garbage-collected.  */
}

     unsigned long *time;
{
  struct scrollbar *bar = XSCROLLBAR (last_mouse_scrollbar);
  int win_x, win_y;

  /* Get the mouse's position relative to the scrollbar window, and
     report that.  */
  {
    Window dummy_window;
    int dummy_coord;

			 /* Mouse buttons and modifier keys.  */
			 &dummy_mask))
      {
	*f = 0;
	return;
      }
  }

  {
    int inside_height = VERTICAL_SCROLLBAR_INSIDE_HEIGHT (XINT (bar->height));

    *time = last_mouse_movement_time;
  }

  mouse_moved = 0;
  last_mouse_scrollbar = Qnil;
}



/* The main X event-reading loop - XTread_socket.  */

1803:5752a95053f2

  Lisp_Object tail, frame;

  for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
    {
      Lisp_Object frame = XCONS (tail)->car;
      Lisp_Object bar, condemned;

      /* All elements of Vframe_list should be frames.  */
      if (XTYPE (frame) != Lisp_Frame)
	abort ();

      /* Scan this frame's scrollbar list for a scrollbar with the
         right window ID.  */
      condemned = FRAME_CONDEMNED_SCROLLBARS (XFRAME (frame));
      for (bar = FRAME_SCROLLBARS (XFRAME (frame));
	   /* This trick allows us to search both the ordinary and
              condemned scrollbar lists with one loop.  */
	   ! NILP (bar) || (bar = condemned, condemned = Qnil, ! NILP (bar));
	   bar = XSCROLLBAR(bar)->next)
	if (SCROLLBAR_X_WINDOW (XSCROLLBAR (bar)) == window_id)
	  return XSCROLLBAR (bar);
    }

XTjudge_scrollbars (f)
     FRAME_PTR f;
{
  Lisp_Object bar, next;

  bar = FRAME_CONDEMNED_SCROLLBARS (f);

  /* Clear out the condemned list now so we won't try to process any
     more events on the hapless scrollbars.  */
  FRAME_CONDEMNED_SCROLLBARS (f) = Qnil;

  for (; ! NILP (bar); bar = next)
    {
      struct scrollbar *b = XSCROLLBAR (bar);

      x_scrollbar_remove (b);

      next = b->next;
      b->next = b->prev = Qnil;
    }

  /* Now there should be no references to the condemned scrollbars,
     and they should get garbage-collected.  */
}

     unsigned long *time;
{
  struct scrollbar *bar = XSCROLLBAR (last_mouse_scrollbar);
  int win_x, win_y;

  BLOCK_INPUT;

  /* Get the mouse's position relative to the scrollbar window, and
     report that.  */
  {
    Window dummy_window;
    int dummy_coord;

			 /* Mouse buttons and modifier keys.  */
			 &dummy_mask))
      {
	*f = 0;
	goto done;
      }
  }

  {
    int inside_height = VERTICAL_SCROLLBAR_INSIDE_HEIGHT (XINT (bar->height));

    *time = last_mouse_movement_time;
  }

  mouse_moved = 0;
  last_mouse_scrollbar = Qnil;

 done:
  UNBLOCK_INPUT;
}



/* The main X event-reading loop - XTread_socket.  */