emacs: src/nsterm.m comparison

comparison src/nsterm.m @ 112396:e79e716435f4

Make Nextstep port handle multiple screens for resize and move. * nsterm.h (ns_output): Add dont_constrain and zooming. (EmacsView): Add ns_userRect. * nsterm.m (keyDown): If ns_right_alternate_modifier is Qleft, check if ns_alternate_modifier is none. * nsterm.m (x_set_offset, windowDidMove): When calculating y, use first screen, not the window screen. (x_set_window_size): Remove constraints. Calculate origin.y only if zooming is 0 and without referring to a screen. (windowWillResize): Don't modify frameSize. (windowDidBecomeKey, mouseDown): Set dont_constrain to 1. (initFrameFromEmacs): Initialize ns_userRect. (windowShouldZoom): Set zooming to one. Remove all other code. (windowWillUseStandardFrame): Move static ns_userRect to EmacsView. Zero it after restore. (constrainFrameRect): New method for EmacsWindow. (mouseDragged): Always post NSWindowDidResizeNotification after call to windowWillResize.

author	Jan D. <jan.h.d@swipnet.se>
date	Fri, 21 Jan 2011 15:19:44 +0100
parents	f1de024f822c
children	4b27e6d58d2c

comparison

equal deleted inserted replaced

-:f1de024f822c
+:e79e716435f4
 x_set_offset (struct frame *f, int xoff, int yoff, int change_grav)
 /* --------------------------------------------------------------------------
 External: Position the window
 -------------------------------------------------------------------------- */
 {
-NSScreen *screen;
 NSView *view = FRAME_NS_VIEW (f);
+NSArray *screens = [NSScreen screens];
+NSScreen *fscreen = [screens objectAtIndex: 0];
+NSScreen *screen = [[view window] screen];
 NSTRACE (x_set_offset);
 BLOCK_INPUT;
 f->left_pos = xoff;
 f->top_pos = yoff;
-if (view != nil && (screen = [[view window] screen]))
+if (view != nil && screen && fscreen)
 {
 f->left_pos = f->size_hint_flags & XNegative
 ? [screen visibleFrame].size.width + f->left_pos - FRAME_PIXEL_WIDTH (f)
 : f->left_pos;
 /* We use visibleFrame here to take menu bar into account.
 if (f->left_pos < 100)
 f->left_pos = 100;  /* don't overlap menu */
 #endif
 [[view window] setFrameTopLeftPoint:
 NSMakePoint (SCREENMAXBOUND (f->left_pos),
-SCREENMAXBOUND ([screen frame].size.height
+SCREENMAXBOUND ([fscreen frame].size.height
 - NS_TOP_POS (f)))];
 f->size_hint_flags &= ~(XNegative|YNegative);
 }
 UNBLOCK_INPUT;
 void
 x_set_window_size (struct frame *f, int change_grav, int cols, int rows)
 /* --------------------------------------------------------------------------
 Adjust window pixel size based on given character grid size
 Impl is a bit more complex than other terms, need to do some
-internal clipping and also pay attention to screen constraints.
+internal clipping.
 -------------------------------------------------------------------------- */
 {
 EmacsView *view = FRAME_NS_VIEW (f);
 EmacsToolbar *toolbar = [view toolbar];
 NSWindow *window = [view window];
-NSScreen *screen = [window screen];
 NSRect wr = [window frame];
 int tb = FRAME_EXTERNAL_TOOL_BAR (f);
 int pixelwidth, pixelheight;
 static int oldRows, oldCols, oldFontWidth, oldFontHeight;
 static int oldTB;
 wr.size.width = pixelwidth + f->border_width;
 wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f)
 + FRAME_TOOLBAR_HEIGHT (f);
-/* constrain to screen if we can */
+/* Do not try to constrain to this screen.  We may have multiple
-if (screen)
+screens, and want Emacs to span those.  Constraining to screen
-{
+prevents that, and that is not nice to the user.  */
-NSSize sz = [screen visibleFrame].size;
+if (f->output_data.ns->zooming)
-NSSize ez = { wr.size.width - sz.width, wr.size.height - sz.height };
+f->output_data.ns->zooming = 0;
-if (ez.width > 0)
+else
-{
+wr.origin.y += FRAME_PIXEL_HEIGHT (f) - pixelheight;
-int cr = ez.width / FRAME_COLUMN_WIDTH (f) + 1;
-cols -= cr;
-oldCols = cols;
-wr.size.width -= cr * FRAME_COLUMN_WIDTH (f);
-pixelwidth -= cr * FRAME_COLUMN_WIDTH (f);
-}
-if (ez.height > 0)
-{
-int rr = ez.height / FRAME_LINE_HEIGHT (f) + 1;
-rows -= rr;
-oldRows = rows;
-wr.size.height -= rr * FRAME_LINE_HEIGHT (f);
-pixelheight -= rr * FRAME_LINE_HEIGHT (f);
-}
-wr.origin.x = f->left_pos;
-wr.origin.y = [screen frame].size.height - NS_TOP_POS (f)
-- wr.size.height;
-}
 [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); */
 #else
 frameSize.width);
 #endif
 if (cols < MINWIDTH)
 cols = MINWIDTH;
-frameSize.width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (emacsframe, cols);
 rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (emacsframe, frameSize.height
 #ifdef NS_IMPL_GNUSTEP
 - FRAME_NS_TITLEBAR_HEIGHT (emacsframe) + 3
 - FRAME_TOOLBAR_HEIGHT (emacsframe));
 - FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
 - FRAME_TOOLBAR_HEIGHT (emacsframe));
 #endif
 if (rows < MINHEIGHT)
 rows = MINHEIGHT;
-frameSize.height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (emacsframe, rows)
-+ FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
-+ FRAME_TOOLBAR_HEIGHT (emacsframe);
 #ifdef NS_IMPL_COCOA
 {
 /* this sets window title to have size in it; the wm does this under GS */
 NSRect r = [[self window] frame];
 if (r.size.height == frameSize.height && r.size.width == frameSize.width)
 /* Avoid loop under GNUstep due to call at beginning of this function.
 (x_set_window_size causes a resize which causes
 a "windowDidResize" which calls x_set_window_size).  */
 #ifndef NS_IMPL_GNUSTEP
 if (cols > 0 && rows > 0)
 x_set_window_size (emacsframe, 0, cols, rows);
 #endif
 ns_send_appdefined (-1);
 }
 struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (emacsframe);
 struct frame *old_focus = dpyinfo->x_focus_frame;
 NSTRACE (windowDidBecomeKey);
+emacsframe->output_data.ns->dont_constrain = 1;
 if (emacsframe != old_focus)
 dpyinfo->x_focus_frame = emacsframe;
 ns_frame_rehighlight (emacsframe);
 processingCompose = NO;
 scrollbarsNeedingUpdate = 0;
 /*fprintf (stderr,"init with %d, %d\n",f->text_cols, f->text_lines); */
+ns_userRect = NSMakeRect (0, 0, 0, 0);
 r = NSMakeRect (0, 0, FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, f->text_cols),
 FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, f->text_lines));
 [self initWithFrame: r];
 [self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
 - (void)windowDidMove: sender
 {
 NSWindow *win = [self window];
 NSRect r = [win frame];
-NSScreen *screen = [win screen];
+NSArray *screens = [NSScreen screens];
+NSScreen *screen = [screens objectAtIndex: 0];
 NSTRACE (windowDidMove);
 if (!emacsframe->output_data.ns)
 return;
 /* Called AFTER method below, but before our windowWillResize call there leads
 to windowDidResize -> x_set_window_size.  Update emacs' notion of frame
 location so set_window_size moves the frame. */
 - (BOOL)windowShouldZoom: (NSWindow *)sender toFrame: (NSRect)newFrame
 {
-NSTRACE (windowShouldZoom);
+emacsframe->output_data.ns->zooming = 1;
-emacsframe->left_pos = (int)newFrame.origin.x;
-emacsframe->top_pos = [[sender screen] frame].size.height
-- (newFrame.origin.y+newFrame.size.height);
 return YES;
 }
 /* Override to do something slightly nonstandard, but nice.  First click on
 returns to original. */
 - (NSRect)windowWillUseStandardFrame:(NSWindow *)sender
 defaultFrame:(NSRect)defaultFrame
 {
 NSRect result = [sender frame];
-static NSRect ns_userRect = { 0, 0, 0, 0 };
 NSTRACE (windowWillUseStandardFrame);
 if (abs (defaultFrame.size.height - result.size.height)
 > FRAME_LINE_HEIGHT (emacsframe))
 {
 if (abs (defaultFrame.size.width - result.size.width)
 > FRAME_COLUMN_WIDTH (emacsframe))
 result = defaultFrame;  /* second click */
 else
-result = ns_userRect.size.height ? ns_userRect : result;  /* restore */
+{
+/* restore */
+result = ns_userRect.size.height ? ns_userRect : result;
+ns_userRect = NSMakeRect (0, 0, 0, 0);
+}
 }
 [self windowWillResize: sender toSize: result.size];
 return result;
 }
 ========================================================================== */
 @implementation EmacsWindow
+/* If we have multiple monitors, one above the other, we don't want to
+restrict the height to just one monitor.  So we override this.  */
+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
+{
+/* When making the frame visible for the first time, we want to
+constrain.  Other times not.  */
+struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
+if (f->output_data.ns->dont_constrain)
+return frameRect;
+return [super constrainFrameRect:frameRect toScreen:screen];
+}
 /* called only on resize clicks by special case in EmacsApp-sendEvent */
 - (void)mouseDown: (NSEvent *)theEvent
 {
+struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
+f->output_data.ns->dont_constrain = 1;
 if (ns_in_resize)
 {
 NSSize size = [[theEvent window] frame].size;
 grabOffset = [theEvent locationInWindow];
 grabOffset.x = size.width - grabOffset.x;
 if (size.width == origSize.width && size.height == origSize.height)
 return;
 vettedSize = [[self delegate] windowWillResize: self toSize: size];
-if (vettedSize.width != size.width || vettedSize.height != size.height)
+[[NSNotificationCenter defaultCenter]
-{
-[[NSNotificationCenter defaultCenter]
 postNotificationName: NSWindowDidResizeNotification
 object: self];
-}
 }
 else
 [super mouseDragged: theEvent];
 }

Mercurial > emacs

comparison src/nsterm.m @ 112396:e79e716435f4