X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/771f48f0638f4832c882b2eab1bbc11e36ed5cf5..f5497e458ada626917620248ec1238dc44fa7fd1:/src/w32inevt.c diff --git a/src/w32inevt.c b/src/w32inevt.c index 17cfd38440..0e5d4dd1f2 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -1,13 +1,13 @@ /* Input event support for Emacs on the Microsoft W32 API. - Copyright (C) 1992, 1993, 1995, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1992, 1993, 1995, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008 Free Software Foundation, Inc. This file is part of GNU Emacs. -GNU Emacs is free software; you can redistribute it and/or modify +GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) -any later version. +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,10 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. +along with GNU Emacs. If not, see . */ +/* Drew Bliss 01-Oct-93 Adapted from ntkbd.c by Tim Fleehart */ @@ -39,6 +38,7 @@ Boston, MA 02110-1301, USA. #include "lisp.h" #include "keyboard.h" #include "frame.h" +#include "dispextern.h" #include "blockinput.h" #include "termhooks.h" #include "w32heap.h" @@ -54,9 +54,6 @@ static DWORD movement_time; /* from keyboard.c */ extern void reinvoke_input_signal (void); -/* from dispnew.c */ -extern int change_frame_size (FRAME_PTR, int, int, int, int); - /* from w32console.c */ extern int w32_use_full_screen_buffer; @@ -155,7 +152,7 @@ w32_kbd_mods_to_emacs (DWORD mods, WORD key) if (mods & SCROLLLOCK_ON) retval |= w32_key_to_modifier (VK_SCROLL); - /* Just in case someone wanted the original behaviour, make it + /* Just in case someone wanted the original behavior, make it optional by setting w32-capslock-is-shiftlock to t. */ if (NILP (Vw32_capslock_is_shiftlock) /* Keys that should _not_ be affected by CapsLock. */ @@ -622,7 +619,7 @@ resize_event (WINDOW_BUFFER_SIZE_RECORD *event) { FRAME_PTR f = get_frame (); - change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1); + change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1, 0); SET_FRAME_GARBAGED (f); } @@ -639,7 +636,7 @@ maybe_generate_resize_event () change_frame_size (f, 1 + info.srWindow.Bottom - info.srWindow.Top, 1 + info.srWindow.Right - info.srWindow.Left, - 0, 0); + 0, 0, 0); } int