Mercurial > emacs
changeset 34135:2d899d158741
(x_estimate_mode_line_height): If `mode-line' face hasn't a font, use
that of the frame, as drawing glyphs does.
(note_mouse_highlight): Change the cursor shape on the vertical
border between windows [not enabled].
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sat, 02 Dec 2000 21:04:10 +0000 |
| parents | 296bbdedee11 |
| children | 5f2ff75f5199 |
| files | src/w32term.c |
| diffstat | 1 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32term.c Sat Dec 02 21:02:59 2000 +0000 +++ b/src/w32term.c Sat Dec 02 21:04:10 2000 +0000 @@ -2511,7 +2511,7 @@ struct frame *f; enum face_id face_id; { - int height = 1; + int height = FONT_HEIGHT (FRAME_FONT (f)); /* This function is called so early when Emacs starts that the face cache and mode line face are not yet initialized. */ @@ -2519,7 +2519,12 @@ { struct face *face = FACE_FROM_ID (f, face_id); if (face) - height = FONT_HEIGHT (face->font) + 2 * face->box_line_width; + { + if (face->font) + height = FONT_HEIGHT (face->font); + height += 2 * face->box_line_width; + } + } return height; @@ -6365,6 +6370,9 @@ return; } #if 0 /* TODO: mouse cursor */ + else if (portion == 2) + XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), + f->output_data.x->horizontal_drag_cursor); else XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), f->output_data.x->text_cursor);