[Emacs-diffs] trunk r115407: Fix GNUStep issues with startup.

[Jan D.]

------------------------------------------------------------
revno: 115407
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-07 17:48:12 +0100
message:
  Fix GNUStep issues with startup.
  
  * nsterm.h (EmacsApp): Add applicationDidFinishLaunchingCalled.
  
  Pixel resize changes for NS.
  * nsterm.m (x_set_window_size): Change parameters rows/cols to
  height/width.  row/cols are locals.
  Pass pixelwise to check_frame_size.  Don't set FRAME_PIXEL_WIDTH/HEIGHT.
  (updateFrameSize:): Remove gsextra.  Adjust for pixelwise resize.
  (windowWillResize): Remove gsextra.  Calculate extra as in
  updateFrameSize.
  (x_new_font): Don't change frame size if fullscreen.  Change
  size pixelwise.
  
  * nsterm.m (x_set_window_size): Remove fprintf.
  (init): Define always.  Set applicationDidFinishLaunchingCalled
  for GNUStep.
  (applicationDidFinishLaunching:): Set
  applicationDidFinishLaunchingCalled,
  (applicationDidBecomeActive:): Call applicationDidFinishLaunching if
  not called.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.h                   nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-07 14:26:29 +0000
+++ b/src/ChangeLog     2013-12-07 16:48:12 +0000
@@ -1,5 +1,15 @@
 2013-12-07  Jan Djärv  <address@hidden>
 
+       * nsterm.m (x_set_window_size): Remove fprintf.
+       (init): Define always.  Set applicationDidFinishLaunchingCalled
+       for GNUStep.
+       (applicationDidFinishLaunching:): Set
+       applicationDidFinishLaunchingCalled,
+       (applicationDidBecomeActive:): Call applicationDidFinishLaunching if
+       not called.
+
+       * nsterm.h (EmacsApp): Add applicationDidFinishLaunchingCalled.
+
        Pixel resize changes for NS (Bug#16049).
        * nsterm.m (x_set_window_size): Change parameters rows/cols to
        height/width.  row/cols are locals.

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2013-12-02 13:35:53 +0000
+++ b/src/nsterm.h      2013-12-07 16:48:12 +0000
@@ -90,6 +90,7 @@
   BOOL isFirst;
 #endif
 #ifdef NS_IMPL_GNUSTEP
+  BOOL applicationDidFinishLaunchingCalled;
 @public
   int nextappdefined;
 #endif

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-12-07 14:21:53 +0000
+++ b/src/nsterm.m      2013-12-07 16:48:12 +0000
@@ -1320,8 +1320,6 @@
   [view setRows: rows andColumns: cols];
   [window setFrame: wr display: YES];
 
-  fprintf (stderr, "\tx_set_window_size %d, %d\t%d, %d\n", cols, rows, 
pixelwidth, pixelheight);
-
   /* This is a trick to compensate for Emacs' managing the scrollbar area
      as a fixed number of standard character columns.  Instead of leaving
      blank space for the extra, we chopped it off above.  Now for
@@ -4410,15 +4408,22 @@
 
 @implementation EmacsApp
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
 - (id)init
 {
   if (self = [super init])
-    self->isFirst = YES;
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
+      self->isFirst = YES;
+#endif
+#ifdef NS_IMPL_GNUSTEP
+      self->applicationDidFinishLaunchingCalled = NO;
+#endif
+    }
 
   return self;
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
 - (void)run
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -4605,6 +4610,9 @@
    -------------------------------------------------------------------------- 
*/
 {
   NSTRACE (applicationDidFinishLaunching);
+#ifdef NS_IMPL_GNUSTEP
+  ((EmacsApp *)self)->applicationDidFinishLaunchingCalled = YES;
+#endif
   [NSApp setServicesProvider: NSApp];
   ns_send_appdefined (-2);
 }
@@ -4732,6 +4740,10 @@
 {
   NSTRACE (applicationDidBecomeActive);
 
+#ifdef NS_IMPL_GNUSTEP
+  if (! applicationDidFinishLaunchingCalled)
+    [self applicationDidFinishLaunching:notification];
+#endif
   //ns_app_active=YES;
 
   ns_update_auto_hide_menu_bar ();