Mercurial > hg > xemacs-beta

diff src/event-msw.c @ 1279:cd0abfdb9e9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-02-09 09:33:42 by ben] walk-windows, redisplay fixes console-stream.c: Abort when any attempts to output a stream console are made. Should be caught sooner. event-msw.c: Don't redisplay() during sizing when the frame has not yet been initialized completely. event-stream.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h: Restore in_menu_callback. Bind it in menubar-{msw,x}.c when calling filter functions and the like. Conditionalize on it, not in_modal_loop, when issuing error in `next-event', otherwise we bite the dust immediately -- event-msw.c purposely calls Fnext_event() in a modal loop, and knows what it's doing. redisplay-output.c: Formatting fixes. redisplay.c, window.c, winslots.h: Delete lots of carcasses of attempts to add redisplay support for font-lock -- `pre/post-redisplay-hook', unimplemented junk from FSF (redisplay-end-trigger, `window-scroll-functions', `window-size-change-functions'). If we want to port some redisplay support from FSF, port the `fontified' property. redisplay.c: Put in a check here (as well as redisplay_device()) for a stream frame. We can get here directly through Lisp fun `redisplay-frame'. Abort if frame not initialized. redisplay.c: Check for stream frames/devices. window.el: walk-windows was broken when a frame was given to WHICH-FRAMES. it would loop forever. The FSF version fixes this but i didn't sync to them because (a) it conses (bad for lazy-lock), (b) it calls select-window.
author ben
date Sun, 09 Feb 2003 09:33:48 +0000
parents fffe735e63ee
children f3437b56874d
line wrap: on
line diff
--- a/src/event-msw.c	Sun Feb 09 07:03:07 2003 +0000
+++ b/src/event-msw.c	Sun Feb 09 09:33:48 2003 +0000
@@ -3366,9 +3366,9 @@
 	    }
 	  else
 	    {
-	      GetClientRect(hwnd, &rect);
-	      FRAME_PIXWIDTH(frame) = rect.right;
-	      FRAME_PIXHEIGHT(frame) = rect.bottom;
+	      GetClientRect (hwnd, &rect);
+	      FRAME_PIXWIDTH (frame) = rect.right;
+	      FRAME_PIXHEIGHT (frame) = rect.bottom;
 
 	      pixel_to_real_char_size (frame, rect.right, rect.bottom,
 				       &FRAME_MSWINDOWS_CHARWIDTH (frame),
@@ -3406,7 +3406,8 @@
                       FRAME_VISIBLE_P (frame) = 1;
                     }
 
-		  if (!msframe->sizing || mswindows_dynamic_frame_resize)
+		  if (frame->init_finished &&
+		      (!msframe->sizing || mswindows_dynamic_frame_resize))
 		    redisplay ();
 		}
 	    }
@@ -3428,11 +3429,11 @@
 	   efficiency, the code below has about one in 4 billion
 	   probability that the HDC is not recreated, provided that
 	   XEmacs is running sufficiently longer than 52 days. */
-	if (DEVICE_MSWINDOWS_UPDATE_TICK(d) != message_tick)
+	if (DEVICE_MSWINDOWS_UPDATE_TICK (d) != message_tick)
 	  {
-	    DEVICE_MSWINDOWS_UPDATE_TICK(d) = message_tick;
-	    DeleteDC (DEVICE_MSWINDOWS_HCDC(d));
-	    DEVICE_MSWINDOWS_HCDC(d) = CreateCompatibleDC (NULL);
+	    DEVICE_MSWINDOWS_UPDATE_TICK (d) = message_tick;
+	    DeleteDC (DEVICE_MSWINDOWS_HCDC (d));
+	    DEVICE_MSWINDOWS_HCDC (d) = CreateCompatibleDC (NULL);
 	  }
       }
       break;
@@ -3507,8 +3508,8 @@
     case WM_HSCROLL:
       {
 	/* Direction of scroll is determined by scrollbar instance. */
-	int code = (int) LOWORD(wParam);
-	int pos = (short int) HIWORD(wParam);
+	int code = (int) LOWORD (wParam);
+	int pos = (short int) HIWORD (wParam);
 	HWND hwndScrollBar = (HWND) lParam;
 	struct gcpro gcpro1, gcpro2;