[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/msdos.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/msdos.c |
Date: |
Sat, 24 May 2003 18:02:52 -0400 |
Index: emacs/src/msdos.c
diff -c emacs/src/msdos.c:1.182 emacs/src/msdos.c:1.183
*** emacs/src/msdos.c:1.182 Fri Mar 21 17:56:52 2003
--- emacs/src/msdos.c Sat May 24 18:02:52 2003
***************
*** 1260,1267 ****
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;
--- 1260,1267 ----
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;
***************
*** 1303,1310 ****
/* 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>",
--- 1303,1310 ----
/* 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>",
***************
*** 1433,1440 ****
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)
--- 1433,1442 ----
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)
***************
*** 1492,1498 ****
}
/* 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))
--- 1494,1500 ----
}
/* 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))
***************
*** 1504,1511 ****
/* 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)
{
--- 1506,1511 ----
***************
*** 1513,1520 ****
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. */
--- 1513,1520 ----
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. */
***************
*** 1881,1887 ****
/* 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;
--- 1881,1887 ----
/* 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;
***************
*** 2548,2554 ****
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;
--- 2548,2553 ----
***************
*** 3383,3389 ****
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
--- 3382,3388 ----
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
***************
*** 4011,4023 ****
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 */
--- 4010,4022 ----
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 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/msdos.c,
Kim F. Storm <=