Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh

diff --combined src/nsterm.m
index be860610b47495def343b2cfa0815ef32828dfcf,ba205f53f4b75e5abe4da4d2b80cfc40d6bec5a4..925e9af30a73c63fdfb5d544072e78441935b8e9
--- 1/src/nsterm.m
--- 2/src/nsterm.m
+++ b/src/nsterm.m
@@@ -844,8 -844,6 +844,8 @@@ ns_constrain_all_frames (void
  
    NSTRACE ("ns_constrain_all_frames");
  
 +  block_input ();
 +
    FOR_EACH_FRAME (tail, frame)
      {
        struct frame *f = XFRAME (frame);
@@@ -857,8 -855,6 +857,8 @@@
                            display:NO];
          }
      }
 +
 +  unblock_input ();
  }
  
  
@@@ -1501,7 -1497,7 +1501,7 @@@ x_set_window_size (struct frame *f
    if (view == nil)
      return;
  
-   NSTRACE_RECT ("input", wr);
+   NSTRACE_RECT ("current", wr);
  
  /*fprintf (stderr, "\tsetWindowSize: %d x %d, pixelwise %d, font size %d x %d\n", width, height, pixelwise, FRAME_COLUMN_WIDTH (f), FRAME_LINE_HEIGHT (f));*/
  
@@@ -1563,7 -1559,6 +1563,6 @@@
           make_number (FRAME_NS_TITLEBAR_HEIGHT (f)),
           make_number (FRAME_TOOLBAR_HEIGHT (f))));
  
-   [view setRows: rows andColumns: cols];
    NSTRACE_RECT ("setFrame", wr);
    [window setFrame: wr display: YES];
  
@@@ -3639,7 -3634,7 +3638,7 @@@ ns_send_appdefined (int value
                recognize and take as a command to halt the event loop.
     -------------------------------------------------------------------------- */
  {
 -  /*NSTRACE ("ns_send_appdefined"); */
 +  NSTRACE ("ns_send_appdefined");
  
  #ifdef NS_IMPL_GNUSTEP
    // GNUstep needs postEvent to happen on the main thread.
@@@ -4533,8 -4528,6 +4532,8 @@@ ns_term_init (Lisp_Object display_name
    if (ns_initialized) return x_display_list;
    ns_initialized = 1;
  
 +  block_input ();
 +
    NSTRACE ("ns_term_init");
  
    [outerpool release];
@@@ -4774,8 -4767,6 +4773,8 @@@
  
    NSTRACE_MSG ("ns_term_init done");
  
 +  unblock_input ();
 +
    return dpyinfo;
  }
  
@@@ -4811,8 -4802,6 +4810,8 @@@ ns_term_shutdown (int sig
  
  - (id)init
  {
 +  NSTRACE ("[EmacsApp init]");
 +
    if ((self = [super init]))
      {
  #ifdef NS_IMPL_COCOA
@@@ -4829,8 -4818,6 +4828,8 @@@
  #ifdef NS_IMPL_COCOA
  - (void)run
  {
 +  NSTRACE ("[EmacsApp run]");
 +
  #ifndef NSAppKitVersionNumber10_9
  #define NSAppKitVersionNumber10_9 1265
  #endif
@@@ -4867,8 -4854,6 +4866,8 @@@
  
  - (void)stop: (id)sender
  {
 +  NSTRACE ("[EmacsApp stop]");
 +
      shouldKeepRunning = NO;
      // Stop possible dialog also.  Noop if no dialog present.
      // The file dialog still leaks 7k - 10k on 10.9 though.
@@@ -4878,8 -4863,6 +4877,8 @@@
  
  - (void)logNotification: (NSNotification *)notification
  {
 +  NSTRACE ("[EmacsApp logNotification]");
 +
    const char *name = [[notification name] UTF8String];
    if (!strstr (name, "Update") && !strstr (name, "NSMenu")
        && !strstr (name, "WindowNumber"))
@@@ -4896,7 -4879,7 +4895,7 @@@
    int type = [theEvent type];
    NSWindow *window = [theEvent window];
  
 -/*  NSTRACE ("sendEvent"); */
 +  NSTRACE ("[EmacsApp sendEvent]");
  /*fprintf (stderr, "received event of type %d\t%d\n", type);*/
  
  #ifdef NS_IMPL_GNUSTEP
@@@ -5003,8 -4986,6 +5002,8 @@@
  
  - (void)newFrame: (id)sender
  {
 +  NSTRACE ("[EmacsApp newFrame]");
 +
    struct frame *emacsframe = SELECTED_FRAME ();
    NSEvent *theEvent = [NSApp currentEvent];
  
@@@ -5020,8 -5001,6 +5019,8 @@@
  /* Open a file (used by below, after going into queue read by ns_read_socket) */
  - (BOOL) openFile: (NSString *)fileName
  {
 +  NSTRACE ("[EmacsApp openFile]");
 +
    struct frame *emacsframe = SELECTED_FRAME ();
    NSEvent *theEvent = [NSApp currentEvent];
  
@@@ -5050,8 -5029,7 +5049,8 @@@
       When application is loaded, terminate event loop in ns_term_init
     -------------------------------------------------------------------------- */
  {
 -  NSTRACE ("applicationDidFinishLaunching");
 +  NSTRACE ("[EmacsApp applicationDidFinishLaunching]");
 +
  #ifdef NS_IMPL_GNUSTEP
    ((EmacsApp *)self)->applicationDidFinishLaunchingCalled = YES;
  #endif
@@@ -5100,8 -5078,6 +5099,8 @@@
  
  - (void) terminate: (id)sender
  {
 +  NSTRACE ("[EmacsApp terminate]");
 +
    struct frame *emacsframe = SELECTED_FRAME ();
  
    if (!emacs_event)
@@@ -5138,8 -5114,6 +5137,8 @@@ runAlertPanel(NSString *title
  
  - (NSApplicationTerminateReply)applicationShouldTerminate: (id)sender
  {
 +  NSTRACE ("[EmacsApp applicationShouldTerminate]");
 +
    bool ret;
  
    if (NILP (ns_confirm_quit)) //   || ns_shutdown_properly  --> TO DO
@@@ -5219,13 -5193,11 +5218,13 @@@ not_in_argv (NSString *arg
  /* TODO: these may help w/IO switching btwn terminal and NSApp */
  - (void)applicationWillBecomeActive: (NSNotification *)notification
  {
 +  NSTRACE ("[EmacsApp applicationWillBecomeActive]");
    //ns_app_active=YES;
  }
 +
  - (void)applicationDidBecomeActive: (NSNotification *)notification
  {
 -  NSTRACE ("applicationDidBecomeActive");
 +  NSTRACE ("[EmacsApp applicationDidBecomeActive]");
  
  #ifdef NS_IMPL_GNUSTEP
    if (! applicationDidFinishLaunchingCalled)
@@@ -5239,8 -5211,6 +5238,8 @@@
  }
  - (void)applicationDidResignActive: (NSNotification *)notification
  {
 +  NSTRACE ("[EmacsApp applicationDidResignActive]");
 +
    //ns_app_active=NO;
    ns_send_appdefined (-1);
  }
@@@ -6171,6 -6141,8 +6170,8 @@@
    NSTRACE ("updateFrameSize");
    NSTRACE_SIZE ("Original size", NSMakeSize (oldw, oldh));
    NSTRACE_RECT ("Original frame", wr);
+   NSTRACE_MSG  ("Original columns: %d", cols);
+   NSTRACE_MSG  ("Original rows: %d", rows);
  
    if (! [self isFullscreen])
      {
@@@ -6187,13 -6159,19 +6188,19 @@@
    if (wait_for_tool_bar)
      {
        if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0)
-         return;
+         {
+           NSTRACE_MSG ("Waiting for toolbar");
+           return;
+         }
        wait_for_tool_bar = NO;
      }
  
    neww = (int)wr.size.width - emacsframe->border_width;
    newh = (int)wr.size.height - extra;
  
+   NSTRACE_SIZE ("New size", NSMakeSize (neww, newh));
+   NSTRACE_MSG ("tool_bar_height: %d", emacsframe->tool_bar_height);
+ 
    cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (emacsframe, neww);
    rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (emacsframe, newh);
  
@@@ -6203,6 -6181,9 +6210,9 @@@
    if (rows < MINHEIGHT)
      rows = MINHEIGHT;
  
+   NSTRACE_MSG  ("New columns: %d", cols);
+   NSTRACE_MSG  ("New rows: %d", rows);
+ 
    if (oldr != rows || oldc != cols || neww != oldw || newh != oldh)
      {
        NSView *view = FRAME_NS_VIEW (emacsframe);
@@@ -6220,6 -6201,10 +6230,10 @@@
        [view setFrame: wr];
        [self windowDidMove:nil];   // Update top/left.
      }
+   else
+     {
+       NSTRACE_MSG ("No change");
+     }
  }
  
  - (NSSize)windowWillResize: (NSWindow *)sender toSize: (NSSize)frameSize
@@@ -6328,6 -6313,12 +6342,12 @@@
  {
    NSTRACE ("windowDidResize");
  
+   if (emacsframe->output_data.ns->in_animation)
+     {
+       NSTRACE_MSG ("Ignored (in animation)");
+       return;
+     }
+ 
    if (! [self fsIsNative])
      {
        NSWindow *theWindow = [notification object];
@@@ -7425,6 -7416,7 +7445,7 @@@
  
  - (void) setRows: (int) r andColumns: (int) c
  {
+   NSTRACE ("[EmacsView setRows:%d andColumns:%d]", r, c);
    rows = r;
    cols = c;
  }