Mercurial > hg > xemacs-beta
comparison src/redisplay-x.c @ 42:8b8b7f3559a2 r19-15b104
Import from CVS: tag r19-15b104
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:54:51 +0200 |
parents | d620409f5eb8 |
children | 131b0175ea99 |
comparison
equal
deleted
inserted
replaced
41:5d6df4963a99 | 42:8b8b7f3559a2 |
---|---|
2061 | 2061 |
2062 XSETWINDOW (window, w); | 2062 XSETWINDOW (window, w); |
2063 default_face_font_info (window, &defascent, 0, &defheight, 0, 0); | 2063 default_face_font_info (window, &defascent, 0, &defheight, 0, 0); |
2064 } | 2064 } |
2065 | 2065 |
2066 cursor_y = dl->ypos - defascent; | 2066 /* make sure the cursor is entirely contained between y and y+height */ |
2067 if (cursor_y < y) | 2067 cursor_height = min (defheight, height); |
2068 cursor_y = y; | 2068 cursor_y = max (y, min (y + height - cursor_height, |
2069 cursor_height = defheight; | 2069 dl->ypos - defascent)); |
2070 if (cursor_y + cursor_height > y + height) | |
2071 cursor_height = y + height - cursor_y; | |
2072 | 2070 |
2073 if (focus) | 2071 if (focus) |
2074 { | 2072 { |
2075 | 2073 |
2076 if (NILP (bar_cursor_value)) | 2074 if (NILP (bar_cursor_value)) |