From 01dfcb7c879831b5cf2614e35f9f610dfadb13a0 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 2 Jan 2020 09:35:49 +0100 Subject: Fix removal of frame decorations on Windows (Bug#38705) * src/w32fns.c (w32_set_undecorated): Actualize f->output_data.w32->dwStyle for subsequent calls of AdjustWindowRect (Bug#38705). * src/w32term.h (struct w32_output): Add comment for dwstyle slot. --- src/w32fns.c | 3 +++ src/w32term.h | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'src') diff --git a/src/w32fns.c b/src/w32fns.c index 75e0d531a23..61e22e57009 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2146,6 +2146,9 @@ w32_set_undecorated (struct frame *f, Lisp_Object new_value, Lisp_Object old_val | SWP_FRAMECHANGED); FRAME_UNDECORATED (f) = false; } + + f->output_data.w32->dwStyle = GetWindowLong (hwnd, GWL_STYLE); + unblock_input (); } diff --git a/src/w32term.h b/src/w32term.h index 5a54f542365..737764b8942 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -371,6 +371,10 @@ struct w32_output /* Non-hourglass cursor that is currently active. */ HCURSOR current_cursor; + /* The window style for this frame. Set up when the frame is + created and updated when adding/removing decorations in + w32_set_undecorated. Used by w32_set_window_size to adjust the + frame's window rectangle. */ DWORD dwStyle; /* This is the Emacs structure for the display this frame is on. */ -- cgit v1.3 From 1420906b812852fab3ee37393db813afdf9e75b7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 2 Jan 2020 19:34:30 +0200 Subject: * src/fileio.c (Fwrite_region): Improve the doc string. --- src/fileio.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/fileio.c b/src/fileio.c index 6e2fe2f0b82..34934dd6df6 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4975,6 +4975,7 @@ Optional fourth argument APPEND if non-nil means Optional fifth argument VISIT, if t or a string, means set the last-save-file-modtime of buffer to this file's modtime and mark buffer not modified. +If VISIT is t, the buffer is marked as visiting FILENAME. If VISIT is a string, it is a second file name; the output goes to FILENAME, but the buffer is marked as visiting VISIT. VISIT is also the file name to lock and unlock for clash detection. -- cgit v1.3 From 37f9182b68c62ee1912cf28d4ea0c30b4f8d59e0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 3 Jan 2020 09:28:35 +0200 Subject: Fix redisplay when mode-line-format changes mode-line's height * lisp/frame.el (top-level): Add mode-line-format, tab-line-format, and header-line-format to the list of variables that should trigger an immediate redisplay of the buffer's window. This fixes redisplay of windows when the mode line changes its height. * src/xdisp.c (window_box_height): Use the window's mode_line_height, tab_line_height, and header_line_height fields in preference to CURRENT_MODE_LINE_HEIGHT, CURRENT_TAB_LINE_HEIGHT, and CURRENT_HEADER_LINE_HEIGHT, respectively. This fixes display of vertical scroll bar when the height of the window's mode line changes. * src/dispnew.c (adjust_glyph_matrix): When resizing a window's matrix, reset the mode_line_p flag of the previous mode-line row, so that the window_box_height, CURRENT_MODE_LINE_HEIGHT, and their ilk won't use stale info. (Bug#38828) --- lisp/frame.el | 3 +++ src/dispnew.c | 7 +++++++ src/xdisp.c | 65 ++++++++++++++++++++++++++++++++++++----------------------- 3 files changed, 50 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/lisp/frame.el b/lisp/frame.el index c533e5a23fb..16ee7580f89 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -2725,6 +2725,9 @@ See also `toggle-frame-maximized'." line-prefix wrap-prefix truncate-lines + mode-line-format + header-line-format + tab-line-format display-line-numbers display-line-numbers-width display-line-numbers-current-absolute diff --git a/src/dispnew.c b/src/dispnew.c index b2a257090cc..ed8c5552e75 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -534,6 +534,13 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y eassert (left >= 0 && right >= 0); matrix->left_margin_glyphs = left; matrix->right_margin_glyphs = right; + + /* If we are resizing a window, make sure the previous mode-line + row of the window's current matrix is no longer marked as such. */ + if (w && matrix == w->current_matrix + && dim.height != matrix->nrows + && matrix->nrows <= matrix->rows_allocated) + MATRIX_MODE_LINE_ROW (matrix)->mode_line_p = false; } /* Number of rows to be used by MATRIX. */ diff --git a/src/xdisp.c b/src/xdisp.c index 6b677b63ae4..4856a7b13b6 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1093,44 +1093,59 @@ window_box_height (struct window *w) /* Note: the code below that determines the mode-line/header-line/tab-line height is essentially the same as that contained in the macro - CURRENT_{MODE,HEADER}_LINE_HEIGHT, except that it checks whether - the appropriate glyph row has its `mode_line_p' flag set, - and if it doesn't, uses estimate_mode_line_height instead. */ + CURRENT_{MODE,HEADER,TAB}_LINE_HEIGHT, except that it checks whether + the appropriate glyph row has its `mode_line_p' flag set, and if + it doesn't, uses estimate_mode_line_height instead. */ if (window_wants_mode_line (w)) { - struct glyph_row *ml_row - = (w->current_matrix && w->current_matrix->rows - ? MATRIX_MODE_LINE_ROW (w->current_matrix) - : 0); - if (ml_row && ml_row->mode_line_p) - height -= ml_row->height; + if (w->mode_line_height >= 0) + height -= w->mode_line_height; else - height -= estimate_mode_line_height (f, CURRENT_MODE_LINE_FACE_ID (w)); + { + struct glyph_row *ml_row + = (w->current_matrix && w->current_matrix->rows + ? MATRIX_MODE_LINE_ROW (w->current_matrix) + : 0); + if (ml_row && ml_row->mode_line_p) + height -= ml_row->height; + else + height -= estimate_mode_line_height (f, + CURRENT_MODE_LINE_FACE_ID (w)); + } } if (window_wants_tab_line (w)) { - struct glyph_row *tl_row - = (w->current_matrix && w->current_matrix->rows - ? MATRIX_TAB_LINE_ROW (w->current_matrix) - : 0); - if (tl_row && tl_row->mode_line_p) - height -= tl_row->height; + if (w->tab_line_height >= 0) + height -= w->tab_line_height; else - height -= estimate_mode_line_height (f, TAB_LINE_FACE_ID); + { + struct glyph_row *tl_row + = (w->current_matrix && w->current_matrix->rows + ? MATRIX_TAB_LINE_ROW (w->current_matrix) + : 0); + if (tl_row && tl_row->mode_line_p) + height -= tl_row->height; + else + height -= estimate_mode_line_height (f, TAB_LINE_FACE_ID); + } } if (window_wants_header_line (w)) { - struct glyph_row *hl_row - = (w->current_matrix && w->current_matrix->rows - ? MATRIX_HEADER_LINE_ROW (w->current_matrix) - : 0); - if (hl_row && hl_row->mode_line_p) - height -= hl_row->height; - else - height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); + if (w->header_line_height >= 0) + height -= w->header_line_height; + { + struct glyph_row *hl_row + = (w->current_matrix && w->current_matrix->rows + ? MATRIX_HEADER_LINE_ROW (w->current_matrix) + : 0); + if (hl_row && hl_row->mode_line_p) + height -= hl_row->height; + else + height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); + } } /* With a very small font and a mode-line that's taller than -- cgit v1.3 From 09b65707cc7c4b401c7a4fb817749355b781da1a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 3 Jan 2020 10:19:23 +0200 Subject: ; * src/dispnew.c (adjust_glyph_matrix): Fix last change. --- src/dispnew.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/dispnew.c b/src/dispnew.c index ed8c5552e75..9af1ce259d4 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -538,6 +538,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y /* If we are resizing a window, make sure the previous mode-line row of the window's current matrix is no longer marked as such. */ if (w && matrix == w->current_matrix + && matrix->nrows > 0 && dim.height != matrix->nrows && matrix->nrows <= matrix->rows_allocated) MATRIX_MODE_LINE_ROW (matrix)->mode_line_p = false; -- cgit v1.3