comparison src/msdos.c @ 51201:df6e2df16eb0

Make (several) trivial substitutions for renamed and new macros in dispextern.h, frame.h and window.h. (IT_note_mouse_highlight): Use updated window coordinates returned by window_from_coordinates, rather than adjusting them locally. (internal_terminal_init): No need to initialize line_height here; it now defaults to 1.

51200:be76b5735f96

      /* Record that some glyphs of this row are displayed in
         mouse-face.  */
      row->mouse_face_p = hl > 0;
      if (hl > 0)
	{
	  int vpos = row->y + WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w);
	  int kstart = start_hpos + WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w);
	  int nglyphs = end_hpos - start_hpos;
	  int offset = ScreenPrimary + 2*(vpos*screen_size_X + kstart) + 1;
	  int start_offset = offset;

	  if (termscript)

	    nglyphs = row->used[TEXT_AREA] - start_hpos;

	  /* IT_write_glyphs writes at cursor position, so we need to
	     temporarily move cursor coordinates to the beginning of
	     the highlight region.  */
	  new_pos_X = start_hpos + WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w);
	  new_pos_Y = row->y + WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w);

	  if (termscript)
	    fprintf (termscript, "<MH- %d-%d:%d>",
		     new_pos_X, new_pos_X + nglyphs - 1, new_pos_Y);
	  IT_write_glyphs (row->glyphs[TEXT_AREA] + start_hpos, nglyphs);

      extern Lisp_Object Qhelp_echo;
      struct glyph *glyph, *end;
      Lisp_Object help, map;

      /* Find the glyph under X.  */
      glyph = row->glyphs[TEXT_AREA]
	+ x - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f);
      end = glyph + row->used[TEXT_AREA];
      if (glyph < end
	  && STRINGP (glyph->object)
	  && STRING_INTERVALS (glyph->object)
	  && glyph->charpos >= 0

      dpyinfo->mouse_face_deferred_gc = 1;
      return;
    }

  /* Which window is that in?  */
  window = window_from_coordinates (f, x, y, &part, 0);

  /* If we were displaying active text in another window, clear that.  */
  if (! EQ (window, dpyinfo->mouse_face_window))
    clear_mouse_face (dpyinfo);

  if (!WINDOWP (window))
    return;

  /* Convert to window-relative coordinates.  */
  w = XWINDOW (window);
  x -= WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X (w);
  y -= WINDOW_DISPLAY_TOP_EDGE_PIXEL_Y (w);

  if (part == ON_MODE_LINE || part == ON_HEADER_LINE)
    {
      /* Mouse is on the mode or top line.  */
      IT_note_mode_line_highlight (w, x, part == ON_MODE_LINE);
      return;
    }
  else
    IT_set_mouse_pointer (0);

  /* Are we in a window whose display is up to date?
     And verify the buffer's text has not changed.  */
  if (part == ON_TEXT
      && EQ (w->window_end_valid, w->buffer)

  if (update_cursor_pos && previous_pos_X >= 0)
    previous_pos_X = -1;
  /* If we are in the echo area, put the cursor at the
     end of the echo area message.  */
  if (!update_cursor_pos
      && XFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top) <= new_pos_Y)
    {
      int tem_X = current_pos_X, dummy;

      if (echo_area_glyphs)
	{

      else if (isxdigit (colors[1]))
        colors[1] -= (isupper (colors[1]) ? 'A' : 'a') - 10;
      if (colors[1] >= 0 && colors[1] < 16)
        the_only_x_display.background_pixel = colors[1];
    }
  the_only_x_display.line_height = 1;
  the_only_x_display.font = (XFontStruct *)1;   /* must *not* be zero */
  the_only_x_display.display_info.mouse_face_mouse_frame = NULL;
  the_only_x_display.display_info.mouse_face_deferred_gc = 0;
  the_only_x_display.display_info.mouse_face_beg_row =
    the_only_x_display.display_info.mouse_face_beg_col = -1;

	  if (mouse_autoselect_window)
	    {
	      mouse_window = window_from_coordinates (SELECTED_FRAME(),
						      mouse_last_x,
						      mouse_last_y,
						      0, 0);
	      /* A window will be selected only when it is not
		 selected now, and the last mouse movement event was
		 not in it.  A minibuffer window will be selected iff
		 it is active.  */
	      if (WINDOWP (mouse_window)

}

int
x_pixel_width (struct frame *f)
{
  return FRAME_WIDTH (f);
}

int
x_pixel_height (struct frame *f)
{
  return FRAME_HEIGHT (f);
}
#endif /* !HAVE_X_WINDOWS */

/* ----------------------- DOS / UNIX conversion --------------------- */

51201:df6e2df16eb0

      /* Record that some glyphs of this row are displayed in
         mouse-face.  */
      row->mouse_face_p = hl > 0;
      if (hl > 0)
	{
	  int vpos = row->y + WINDOW_TOP_EDGE_Y (w);
	  int kstart = start_hpos + WINDOW_LEFT_EDGE_X (w);
	  int nglyphs = end_hpos - start_hpos;
	  int offset = ScreenPrimary + 2*(vpos*screen_size_X + kstart) + 1;
	  int start_offset = offset;

	  if (termscript)

	    nglyphs = row->used[TEXT_AREA] - start_hpos;

	  /* IT_write_glyphs writes at cursor position, so we need to
	     temporarily move cursor coordinates to the beginning of
	     the highlight region.  */
	  new_pos_X = start_hpos + WINDOW_LEFT_EDGE_X (w);
	  new_pos_Y = row->y + WINDOW_TOP_EDGE_Y (w);

	  if (termscript)
	    fprintf (termscript, "<MH- %d-%d:%d>",
		     new_pos_X, new_pos_X + nglyphs - 1, new_pos_Y);
	  IT_write_glyphs (row->glyphs[TEXT_AREA] + start_hpos, nglyphs);

      extern Lisp_Object Qhelp_echo;
      struct glyph *glyph, *end;
      Lisp_Object help, map;

      /* Find the glyph under X.  */
      glyph = (row->glyphs[TEXT_AREA]
	       + x
	       /* Does MS-DOG really support scroll-bars??  ++KFS */
	       - WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH (w));
      end = glyph + row->used[TEXT_AREA];
      if (glyph < end
	  && STRINGP (glyph->object)
	  && STRING_INTERVALS (glyph->object)
	  && glyph->charpos >= 0

      dpyinfo->mouse_face_deferred_gc = 1;
      return;
    }

  /* Which window is that in?  */
  window = window_from_coordinates (f, x, y, &part, &x, &y, 0);

  /* If we were displaying active text in another window, clear that.  */
  if (! EQ (window, dpyinfo->mouse_face_window))
    clear_mouse_face (dpyinfo);

  if (!WINDOWP (window))
    return;

  /* Convert to window-relative coordinates.  */
  w = XWINDOW (window);

  if (part == ON_MODE_LINE || part == ON_HEADER_LINE)
    {
      /* Mouse is on the mode or top line.  */
      IT_note_mode_line_highlight (w, x, part == ON_MODE_LINE);
      return;
    }

  IT_set_mouse_pointer (0);

  /* Are we in a window whose display is up to date?
     And verify the buffer's text has not changed.  */
  if (part == ON_TEXT
      && EQ (w->window_end_valid, w->buffer)

  if (update_cursor_pos && previous_pos_X >= 0)
    previous_pos_X = -1;
  /* If we are in the echo area, put the cursor at the
     end of the echo area message.  */
  if (!update_cursor_pos
      && WINDOW_TOP_EDGE_LINE (XWINDOW (FRAME_MINIBUF_WINDOW (f))) <= new_pos_Y)
    {
      int tem_X = current_pos_X, dummy;

      if (echo_area_glyphs)
	{

      else if (isxdigit (colors[1]))
        colors[1] -= (isupper (colors[1]) ? 'A' : 'a') - 10;
      if (colors[1] >= 0 && colors[1] < 16)
        the_only_x_display.background_pixel = colors[1];
    }
  the_only_x_display.font = (XFontStruct *)1;   /* must *not* be zero */
  the_only_x_display.display_info.mouse_face_mouse_frame = NULL;
  the_only_x_display.display_info.mouse_face_deferred_gc = 0;
  the_only_x_display.display_info.mouse_face_beg_row =
    the_only_x_display.display_info.mouse_face_beg_col = -1;

	  if (mouse_autoselect_window)
	    {
	      mouse_window = window_from_coordinates (SELECTED_FRAME(),
						      mouse_last_x,
						      mouse_last_y,
						      0, 0, 0, 0);
	      /* A window will be selected only when it is not
		 selected now, and the last mouse movement event was
		 not in it.  A minibuffer window will be selected iff
		 it is active.  */
	      if (WINDOWP (mouse_window)

}

int
x_pixel_width (struct frame *f)
{
  return FRAME_COLS (f);
}

int
x_pixel_height (struct frame *f)
{
  return FRAME_LINES (f);
}
#endif /* !HAVE_X_WINDOWS */

/* ----------------------- DOS / UNIX conversion --------------------- */