Mercurial > emacs
comparison src/w32inevt.c @ 80615:ed3882ec9644
Backport of long term bug from trunk:
2008-07-18 David Robinow <drobinow@gmail.com> (tiny change)
* w32inevt.c: Include dispextern.h. Don't declare change_frame_size
here.
(maybe_generate_resize_event, resize_event): Call change_frame_size
with SAFE arg.
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Fri, 18 Jul 2008 08:59:50 +0000 |
parents | fc2bcd2a8aad |
children | 5b5b0194f293 |
comparison
equal
deleted
inserted
replaced
80614:fa8281092b2f | 80615:ed3882ec9644 |
---|---|
37 #endif | 37 #endif |
38 | 38 |
39 #include "lisp.h" | 39 #include "lisp.h" |
40 #include "keyboard.h" | 40 #include "keyboard.h" |
41 #include "frame.h" | 41 #include "frame.h" |
42 #include "dispextern.h" | |
42 #include "blockinput.h" | 43 #include "blockinput.h" |
43 #include "termhooks.h" | 44 #include "termhooks.h" |
44 #include "w32heap.h" | 45 #include "w32heap.h" |
45 #include "w32term.h" | 46 #include "w32term.h" |
46 | 47 |
51 static COORD movement_pos; | 52 static COORD movement_pos; |
52 static DWORD movement_time; | 53 static DWORD movement_time; |
53 | 54 |
54 /* from keyboard.c */ | 55 /* from keyboard.c */ |
55 extern void reinvoke_input_signal (void); | 56 extern void reinvoke_input_signal (void); |
56 | |
57 /* from dispnew.c */ | |
58 extern int change_frame_size (FRAME_PTR, int, int, int, int); | |
59 | 57 |
60 /* from w32console.c */ | 58 /* from w32console.c */ |
61 extern int w32_use_full_screen_buffer; | 59 extern int w32_use_full_screen_buffer; |
62 | 60 |
63 /* from w32fns.c */ | 61 /* from w32fns.c */ |
620 static void | 618 static void |
621 resize_event (WINDOW_BUFFER_SIZE_RECORD *event) | 619 resize_event (WINDOW_BUFFER_SIZE_RECORD *event) |
622 { | 620 { |
623 FRAME_PTR f = get_frame (); | 621 FRAME_PTR f = get_frame (); |
624 | 622 |
625 change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1); | 623 change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1, 0); |
626 SET_FRAME_GARBAGED (f); | 624 SET_FRAME_GARBAGED (f); |
627 } | 625 } |
628 | 626 |
629 static void | 627 static void |
630 maybe_generate_resize_event () | 628 maybe_generate_resize_event () |
637 /* It is okay to call this unconditionally, since it will do nothing | 635 /* It is okay to call this unconditionally, since it will do nothing |
638 if the size hasn't actually changed. */ | 636 if the size hasn't actually changed. */ |
639 change_frame_size (f, | 637 change_frame_size (f, |
640 1 + info.srWindow.Bottom - info.srWindow.Top, | 638 1 + info.srWindow.Bottom - info.srWindow.Top, |
641 1 + info.srWindow.Right - info.srWindow.Left, | 639 1 + info.srWindow.Right - info.srWindow.Left, |
642 0, 0); | 640 0, 0, 0); |
643 } | 641 } |
644 | 642 |
645 int | 643 int |
646 w32_console_read_socket (int sd, int expected, struct input_event *hold_quit) | 644 w32_console_read_socket (int sd, int expected, struct input_event *hold_quit) |
647 { | 645 { |