Commit 250cfece authored by Jason Rumney's avatar Jason Rumney

(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].
parent f03fad22
......@@ -4,6 +4,20 @@
correctly for single byte character case.
(w32_per_char_metric): Do not try to make any assumptions about
the metrics of BDF fonts.
(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].
* w32term.h (struct w32_output): Add member horizontal_drag_cursor.
* w32fns.c (Fx_create_frame): Reintroduce the call to
face-set-after-frame-defaults.
(Vx_window_horizontal_drag_shape): New variable.
(syms_of_xfns): DEFVAR_LISP it.
(x_set_mouse_color): Create frame's horizontal_drag_cursor [not
enabled].
2000-12-02 Simon Josefsson <simon@josefsson.org>
......
......@@ -2511,7 +2511,7 @@ x_estimate_mode_line_height (f, face_id)
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 @@ x_estimate_mode_line_height (f, face_id)
{
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 @@ note_mouse_highlight (f, x, y)
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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment