diff options
| author | Fabrice Popineau | 2014-01-25 15:04:48 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-01-25 15:04:48 +0200 |
| commit | 83682f3e4d196c68ed1d053f9eeab767d61b6d4f (patch) | |
| tree | e057fb93abd5a04555942d5825cffe3cb95c5dc1 /src | |
| parent | e96f7bf11ebeef086c48776ecfe8c41a1c0db7c4 (diff) | |
| download | emacs-83682f3e4d196c68ed1d053f9eeab767d61b6d4f.tar.gz emacs-83682f3e4d196c68ed1d053f9eeab767d61b6d4f.zip | |
Fix bug #16517 with display change on MS-Windows while in full-screen mode.
src/w32term.c (w32_read_socket): When the WM_DISPLAYCHANGE message
arrives, call x_check_fullscreen, in case the new display has a
different resolution.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32term.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 89b4c06def1..4f4f14e6020 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-01-25 Fabrice Popineau <fabrice.popineau@gmail.com> | ||
| 2 | |||
| 3 | * w32term.c (w32_read_socket): When the WM_DISPLAYCHANGE message | ||
| 4 | arrives, call x_check_fullscreen, in case the new display has a | ||
| 5 | different resolution. (Bug#16517) | ||
| 6 | |||
| 1 | 2014-01-25 Eli Zaretskii <eliz@gnu.org> | 7 | 2014-01-25 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * term.c (read_menu_input): If the selected frame changes, exit | 9 | * term.c (read_menu_input): If the selected frame changes, exit |
diff --git a/src/w32term.c b/src/w32term.c index a59d5d6edc0..03d5a0047bc 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -4841,6 +4841,10 @@ w32_read_socket (struct terminal *terminal, | |||
| 4841 | if (f) | 4841 | if (f) |
| 4842 | { | 4842 | { |
| 4843 | dpyinfo->n_cbits = msg.msg.wParam; | 4843 | dpyinfo->n_cbits = msg.msg.wParam; |
| 4844 | /* The new display could have a different resolution, in | ||
| 4845 | which case we must reconsider what fullscreen | ||
| 4846 | means. */ | ||
| 4847 | x_check_fullscreen (f); | ||
| 4844 | DebPrint (("display change: %d %d\n", | 4848 | DebPrint (("display change: %d %d\n", |
| 4845 | (short) LOWORD (msg.msg.lParam), | 4849 | (short) LOWORD (msg.msg.lParam), |
| 4846 | (short) HIWORD (msg.msg.lParam))); | 4850 | (short) HIWORD (msg.msg.lParam))); |