Mercurial > emacs
comparison src/xterm.c @ 83113:1a68e4b22355
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-241
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-242
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-243
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-244
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-245
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-246
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-250
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-251
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-252
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-253
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-254
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-255
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-153
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 27 Apr 2004 15:53:30 +0000 |
parents | 30dd490f06f2 535ccf62b57f |
children | 8d02e70dd3cc |
comparison
equal
deleted
inserted
replaced
83112:30dd490f06f2 | 83113:1a68e4b22355 |
---|---|
7259 y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y); | 7259 y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y); |
7260 | 7260 |
7261 /* Compute the proper height and ascent of the rectangle, based | 7261 /* Compute the proper height and ascent of the rectangle, based |
7262 on the actual glyph. Using the full height of the row looks | 7262 on the actual glyph. Using the full height of the row looks |
7263 bad when there are tall images on that row. */ | 7263 bad when there are tall images on that row. */ |
7264 h = max (FRAME_LINE_HEIGHT (f), cursor_glyph->ascent + cursor_glyph->descent); | 7264 h = max (min (FRAME_LINE_HEIGHT (f), row->height), |
7265 cursor_glyph->ascent + cursor_glyph->descent); | |
7265 if (h < row->height) | 7266 if (h < row->height) |
7266 y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h; | 7267 y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h; |
7267 h--; | 7268 h--; |
7268 | 7269 |
7269 /* The foreground of cursor_gc is typically the same as the normal | 7270 /* The foreground of cursor_gc is typically the same as the normal |