comparison src/xterm.c @ 1530:a7f8a1fe258e

* xterm.c (x_convert_modifiers): Declare this to return an unsigned int, not a Lisp_Object. Remember that the quiescent value for part is Qnil, not zero, that x_mouse_x and x_mouse_y are ints, not Lisp_Objects, and that RESULT->x and RESULT->y are Lisp_Objects, not ints. (XTread_socket): Declare this to return int, not Lisp_Object. When calling construct_mouse_click on a non-scrollbar click, pass PART as Qnil, not zero. (x_calc_absolute_position): Remember that x_screen_width and x_screen_height are ints, not Lisp_Objects. e

1529:d73ee126c15d

/* Convert a set of X modifier bits to the proper form for a
   struct input_event modifiers value.  */

static Lisp_Object
x_convert_modifiers (state)
     unsigned int state;
{
  return (  ((state & (ShiftMask | x_shift_lock_mask)) ? shift_modifier : 0)
	  | ((state & ControlMask)		       ? ctrl_modifier  : 0)

      x_mouse_grabbed &= ~(1 << event->button);
      if (!x_mouse_grabbed)
	Vmouse_depressed = Qnil;
    }

  if (part)			/* Scrollbar event */
    {
      int pos, len;

      pos = event->y - (f->display.x->v_scrollbar_width - 2);
      XSET (x_mouse_x, Lisp_Int, pos);
      len = ((FONT_HEIGHT (f->display.x->font) * f->height)
	     + f->display.x->internal_border_width
	     - (2 * (f->display.x->v_scrollbar_width - 2)));
      XSET (x_mouse_y, Lisp_Int, len);

      result->kind = scrollbar_click;
      result->part = part;
      XSET (result->x, Lisp_Int, (f->display.x->top_pos - event->y));
      XSET (result->y, Lisp_Int, f->display.x->pixel_height);

    {
      int row, column;

      pixel_to_glyph_coords (f, event->x, event->y, &column, &row, NULL);
      result->kind = mouse_click;
      result->x = column;
      result->y = row;
      result->frame = f;
    }
}

   thus pretending to be `read'.

   WAITP is nonzero if we should block until input arrives.
   EXPECTED is nonzero if the caller knows input is available.  */

Lisp_Object
XTread_socket (sd, bufp, numchars, waitp, expected)
     register int sd;
     register struct input_event *bufp;
     register int numchars;
     int waitp;

	    f = x_window_to_frame (event.xbutton.window);
	    if (f)
	      if (!x_focus_frame || (f == x_focus_frame))
		construct_mouse_click (&emacs_event,
				       &event, f, 0, 0);
	      else
		continue;
	    else
	      if ((f = x_window_to_scrollbar (event.xbutton.window,
					      &part, &prefix)))

     struct frame *f;
{
#ifdef HAVE_X11
  if (f->display.x->left_pos < 0)
    f->display.x->left_pos
      = XINT (x_screen_width) - PIXEL_WIDTH (f) + f->display.x->left_pos;

  if (f->display.x->top_pos < 0)
    f->display.x->top_pos
      = XINT (x_screen_height) - PIXEL_HEIGHT (f) + f->display.x->top_pos;
#else /* ! defined (HAVE_X11) */
  WINDOWINFO_TYPE parentinfo;

  XGetWindowInfo (FRAME_X_WINDOW (f), &parentinfo);

1530:a7f8a1fe258e

/* Convert a set of X modifier bits to the proper form for a
   struct input_event modifiers value.  */

static unsigned int
x_convert_modifiers (state)
     unsigned int state;
{
  return (  ((state & (ShiftMask | x_shift_lock_mask)) ? shift_modifier : 0)
	  | ((state & ControlMask)		       ? ctrl_modifier  : 0)

      x_mouse_grabbed &= ~(1 << event->button);
      if (!x_mouse_grabbed)
	Vmouse_depressed = Qnil;
    }

  if (! NILP (part))		/* Scrollbar event */
    {
      int pos, len;

      pos = event->y - (f->display.x->v_scrollbar_width - 2);
      x_mouse_x = pos;
      len = ((FONT_HEIGHT (f->display.x->font) * f->height)
	     + f->display.x->internal_border_width
	     - (2 * (f->display.x->v_scrollbar_width - 2)));
      x_mouse_y = len;

      result->kind = scrollbar_click;
      result->part = part;
      XSET (result->x, Lisp_Int, (f->display.x->top_pos - event->y));
      XSET (result->y, Lisp_Int, f->display.x->pixel_height);

    {
      int row, column;

      pixel_to_glyph_coords (f, event->x, event->y, &column, &row, NULL);
      result->kind = mouse_click;
      XFASTINT (result->x) = column;
      XFASTINT (result->y) = row;
      result->frame = f;
    }
}

   thus pretending to be `read'.

   WAITP is nonzero if we should block until input arrives.
   EXPECTED is nonzero if the caller knows input is available.  */

int
XTread_socket (sd, bufp, numchars, waitp, expected)
     register int sd;
     register struct input_event *bufp;
     register int numchars;
     int waitp;

	    f = x_window_to_frame (event.xbutton.window);
	    if (f)
	      if (!x_focus_frame || (f == x_focus_frame))
		construct_mouse_click (&emacs_event,
				       &event, f, Qnil, 0);
	      else
		continue;
	    else
	      if ((f = x_window_to_scrollbar (event.xbutton.window,
					      &part, &prefix)))

     struct frame *f;
{
#ifdef HAVE_X11
  if (f->display.x->left_pos < 0)
    f->display.x->left_pos
      = x_screen_width - PIXEL_WIDTH (f) + f->display.x->left_pos;

  if (f->display.x->top_pos < 0)
    f->display.x->top_pos
      = x_screen_height - PIXEL_HEIGHT (f) + f->display.x->top_pos;
#else /* ! defined (HAVE_X11) */
  WINDOWINFO_TYPE parentinfo;

  XGetWindowInfo (FRAME_X_WINDOW (f), &parentinfo);