Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Backport of Emacs master's fullscreen mode to Emacs 24.3
From 446fcea51c0b579d30d6bf3183fada2f2f70440e Mon Sep 17 00:00:00 2001
From: Scott Wheeler <scott@directededge.com>
Date: Tue, 29 Oct 2013 04:06:54 +0100
Subject: [PATCH 1/2] Backport patch from master to support
ns-use-native-fullscreen flag
The original patch is here:
http://bzr.savannah.gnu.org/lh/emacs/trunk/diff/111679
---
lisp/cus-start.el | 1 +
src/nsmenu.m | 2 +
src/nsterm.h | 11 +++
src/nsterm.m | 235 +++++++++++++++++++++++++++++++++++++-----------------
4 files changed, 177 insertions(+), 72 deletions(-)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 964c118..44f6df7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -385,6 +385,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(const super)) "23.1")
(ns-antialias-text ns boolean "23.1")
(ns-auto-hide-menu-bar ns boolean "24.0")
+ (ns-use-native-fullscreen ns boolean "24.4")
;; process.c
(delete-exited-processes processes-basics boolean)
;; syntax.c
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 39797d4..227a7a9 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1110,6 +1110,8 @@ update_frame_tool_bar (FRAME_PTR f)
FRAME_TOOLBAR_HEIGHT (f) =
NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
- FRAME_NS_TITLEBAR_HEIGHT (f);
+ if (FRAME_TOOLBAR_HEIGHT (f) < 0) // happens if frame is fullscreen.
+ FRAME_TOOLBAR_HEIGHT (f) = 0;
unblock_input ();
}
diff --git a/src/nsterm.h b/src/nsterm.h
index 806cfcc..6eb332d 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -42,6 +42,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef MAC_OS_X_VERSION_10_8
#define MAC_OS_X_VERSION_10_8 1080
#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+#define HAVE_NATIVE_FS
+#endif
+
#endif /* NS_IMPL_COCOA */
#ifdef __OBJC__
@@ -88,6 +93,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
int tibar_height, tobar_height, bwidth;
int maximized_width, maximized_height;
NSWindow *nonfs_window;
+ BOOL fs_is_native;
@public
struct frame *emacsframe;
int rows, cols;
@@ -115,6 +121,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
- (void) handleFS;
- (void) setFSValue: (int)value;
- (void) toggleFullScreen: (id) sender;
+- (BOOL) fsIsNative;
+- (BOOL) isFullscreen;
+#ifdef HAVE_NATIVE_FS
+- (void) updateCollectionBehaviour;
+#endif
#ifdef NS_IMPL_GNUSTEP
/* Not declared, but useful. */
diff --git a/src/nsterm.m b/src/nsterm.m
index a57e744..f2427db 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -71,11 +71,6 @@ int term_trace_num = 0;
#define NSTRACE(x)
#endif
-#if defined (NS_IMPL_COCOA) && \
- MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-#define NEW_STYLE_FS
-#endif
-
extern NSString *NSMenuDidBeginTrackingNotification;
/* ==========================================================================
@@ -208,6 +203,7 @@ static int n_emacs_events_pending = 0;
static NSMutableArray *ns_pending_files, *ns_pending_service_names,
*ns_pending_service_args;
static BOOL ns_do_open_file = NO;
+static BOOL ns_last_use_native_fullscreen;
static struct {
struct input_event *q;
@@ -1080,13 +1076,12 @@ x_make_frame_visible (struct frame *f)
f->async_visible = 1;
ns_raise_frame (f);
-#ifdef NEW_STYLE_FS
/* Making a new frame from a fullscreen frame will make the new frame
fullscreen also. So skip handleFS as this will print an error. */
- if (f->want_fullscreen == FULLSCREEN_BOTH
- && ([[view window] styleMask] & NSFullScreenWindowMask) != 0)
+ if ([view fsIsNative] && f->want_fullscreen == FULLSCREEN_BOTH
+ && [view isFullscreen])
return;
-#endif
+
if (f->want_fullscreen != FULLSCREEN_NONE)
{
block_input ();
@@ -1279,7 +1274,7 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows)
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
/* If we have a toolbar, take its height into account. */
- if (tb)
+ if (tb && ! [view isFullscreen])
/* NOTE: previously this would generate wrong result if toolbar not
yet displayed and fixing toolbar_height=32 helped, but
now (200903) seems no longer needed */
@@ -1290,8 +1285,10 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows)
FRAME_TOOLBAR_HEIGHT (f) = 0;
wr.size.width = pixelwidth + f->border_width;
- wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f)
- + FRAME_TOOLBAR_HEIGHT (f);
+ wr.size.height = pixelheight;
+ if (! [view isFullscreen])
+ wr.size.height += FRAME_NS_TITLEBAR_HEIGHT (f)
+ + FRAME_TOOLBAR_HEIGHT (f);
/* Do not try to constrain to this screen. We may have multiple
screens, and want Emacs to span those. Constraining to screen
@@ -1340,7 +1337,6 @@ ns_fullscreen_hook (FRAME_PTR f)
EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f);
if (! f->async_visible) return;
-#ifndef NEW_STYLE_FS
if (f->want_fullscreen == FULLSCREEN_BOTH)
{
/* Old style fs don't initiate correctly if created from
@@ -1351,7 +1347,6 @@ ns_fullscreen_hook (FRAME_PTR f)
userInfo: nil repeats: NO];
return;
}
-#endif
block_input ();
[view handleFS];
@@ -3357,6 +3352,30 @@ ns_send_appdefined (int value)
}
}
+#ifdef HAVE_NATIVE_FS
+static void
+check_native_fs ()
+{
+ Lisp_Object frame, tail;
+
+ if (ns_last_use_native_fullscreen == ns_use_native_fullscreen)
+ return;
+
+ ns_last_use_native_fullscreen = ns_use_native_fullscreen;
+
+ /* Clear the mouse-moved flag for every frame on this display. */
+ FOR_EACH_FRAME (tail, frame)
+ {
+ struct frame *f = XFRAME (frame);
+ if (FRAME_NS_P (f))
+ {
+ EmacsView *view = FRAME_NS_VIEW (f);
+ [view updateCollectionBehaviour];
+ }
+ }
+}
+#endif
+
static int
ns_read_socket (struct terminal *terminal, struct input_event *hold_quit)
/* --------------------------------------------------------------------------
@@ -3370,6 +3389,10 @@ ns_read_socket (struct terminal *terminal, struct input_event *hold_quit)
/* NSTRACE (ns_read_socket); */
+#ifdef HAVE_NATIVE_FS
+ check_native_fs ();
+#endif
+
if ([NSApp modalWindow] != nil)
return -1;
@@ -4229,11 +4252,9 @@ ns_term_init (Lisp_Object display_name)
NSColorPboardType,
NSFontPboardType, nil] retain];
-#ifndef NEW_STYLE_FS
/* If fullscreen is in init/default-frame-alist, focus isn't set
right for fullscreen windows, so set this. */
[NSApp activateIgnoringOtherApps:YES];
-#endif
[NSApp run];
ns_do_open_file = YES;
@@ -5381,10 +5402,10 @@ not_in_argv (NSString *arg)
{
NSWindow *window = [self window];
NSRect wr = [window frame];
-#ifdef NS_IMPL_GNUSTEP
- int extra = 3;
-#else
int extra = 0;
+ int gsextra = 0;
+#ifdef NS_IMPL_GNUSTEP
+ gsextra = 3;
#endif
int oldc = cols, oldr = rows;
@@ -5392,23 +5413,24 @@ not_in_argv (NSString *arg)
oldh = FRAME_PIXEL_HEIGHT (emacsframe);
int neww, newh;
- cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (emacsframe, wr.size.width + extra);
+ cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (emacsframe, wr.size.width + gsextra);
if (cols < MINWIDTH)
cols = MINWIDTH;
- rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES
- (emacsframe, wr.size.height
- - FRAME_NS_TITLEBAR_HEIGHT (emacsframe) + extra
- - FRAME_TOOLBAR_HEIGHT (emacsframe));
+ if (! [self isFullscreen])
+ {
+ extra = FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
+ + FRAME_TOOLBAR_HEIGHT (emacsframe) - gsextra;
+ }
+
+ rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (emacsframe, wr.size.height - extra);
if (rows < MINHEIGHT)
rows = MINHEIGHT;
neww = (int)wr.size.width - emacsframe->border_width;
- newh = ((int)wr.size.height
- - FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
- - FRAME_TOOLBAR_HEIGHT (emacsframe));
+ newh = (int)wr.size.height - extra;
if (oldr != rows || oldc != cols || neww != oldw || newh != oldh)
{
@@ -5426,6 +5448,12 @@ not_in_argv (NSString *arg)
- (NSSize)windowWillResize: (NSWindow *)sender toSize: (NSSize)frameSize
/* normalize frame to gridded text size */
{
+ int extra = 0;
+ int gsextra = 0;
+#ifdef NS_IMPL_GNUSTEP
+ gsextra = 3;
+#endif
+
NSTRACE (windowWillResize);
/*fprintf (stderr,"Window will resize: %.0f x %.0f\n",frameSize.width,frameSize.height); */
@@ -5443,22 +5471,12 @@ not_in_argv (NSString *arg)
maximized_width = maximized_height = -1;
cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (emacsframe,
-#ifdef NS_IMPL_GNUSTEP
- frameSize.width + 3);
-#else
- frameSize.width);
-#endif
+ frameSize.width + gsextra);
if (cols < MINWIDTH)
cols = MINWIDTH;
- rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (emacsframe, frameSize.height
-#ifdef NS_IMPL_GNUSTEP
- - FRAME_NS_TITLEBAR_HEIGHT (emacsframe) + 3
- - FRAME_TOOLBAR_HEIGHT (emacsframe));
-#else
- - FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
- - FRAME_TOOLBAR_HEIGHT (emacsframe));
-#endif
+ rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (emacsframe,
+ frameSize.height - extra);
if (rows < MINHEIGHT)
rows = MINHEIGHT;
#ifdef NS_IMPL_COCOA
@@ -5501,12 +5519,13 @@ not_in_argv (NSString *arg)
- (void)windowDidResize: (NSNotification *)notification
{
-
-#if !defined (NEW_STYLE_FS) && ! defined (NS_IMPL_GNUSTEP)
- NSWindow *theWindow = [notification object];
- /* We can get notification on the non-FS window when in fullscreen mode. */
- if ([self window] != theWindow) return;
-#endif
+ if (! [self fsIsNative])
+ {
+ NSWindow *theWindow = [notification object];
+ /* We can get notification on the non-FS window when in
+ fullscreen mode. */
+ if ([self window] != theWindow) return;
+ }
#ifdef NS_IMPL_GNUSTEP
NSWindow *theWindow = [notification object];
@@ -5622,6 +5641,11 @@ not_in_argv (NSString *arg)
scrollbarsNeedingUpdate = 0;
fs_state = FULLSCREEN_NONE;
fs_before_fs = next_maximized = -1;
+#ifdef HAVE_NATIVE_FS
+ fs_is_native = ns_use_native_fullscreen;
+#else
+ fs_is_native = NO;
+#endif
maximized_width = maximized_height = -1;
nonfs_window = nil;
@@ -5648,7 +5672,7 @@ not_in_argv (NSString *arg)
backing: NSBackingStoreBuffered
defer: YES];
-#ifdef NEW_STYLE_FS
+#ifdef HAVE_NATIVE_FS
[win setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
#endif
@@ -5855,6 +5879,15 @@ not_in_argv (NSString *arg)
}
}
+#ifdef HAVE_NATIVE_FS
+- (NSApplicationPresentationOptions)window:(NSWindow *)window
+ willUseFullScreenPresentationOptions:
+ (NSApplicationPresentationOptions)proposedOptions
+{
+ return proposedOptions|NSApplicationPresentationAutoHideToolbar;
+}
+#endif
+
- (void)windowWillEnterFullScreen:(NSNotification *)notification
{
fs_before_fs = fs_state;
@@ -5863,17 +5896,13 @@ not_in_argv (NSString *arg)
- (void)windowDidEnterFullScreen:(NSNotification *)notification
{
[self setFSValue: FULLSCREEN_BOTH];
-#ifdef NEW_STYLE_FS
- // Fix bad background.
- if ([toolbar isVisible])
+ if (! [self fsIsNative])
{
- [toolbar setVisible:NO];
- [toolbar setVisible:YES];
+ [self windowDidBecomeKey:notification];
+ [nonfs_window orderOut:self];
}
-#else
- [self windowDidBecomeKey:notification];
- [nonfs_window orderOut:self];
-#endif
+ else if (! FRAME_EXTERNAL_TOOL_BAR (emacsframe))
+ [toolbar setVisible:NO];
}
- (void)windowWillExitFullScreen:(NSNotification *)notification
@@ -5886,24 +5915,76 @@ not_in_argv (NSString *arg)
{
[self setFSValue: fs_before_fs];
fs_before_fs = -1;
+ [self updateCollectionBehaviour];
+ if (FRAME_EXTERNAL_TOOL_BAR (emacsframe))
+ {
+ [toolbar setVisible:YES];
+ update_frame_tool_bar (emacsframe);
+ [self updateFrameSize:YES];
+ [[self window] display];
+ }
+ else
+ [toolbar setVisible:NO];
+
if (next_maximized != -1)
[[self window] performZoom:self];
}
-- (void)toggleFullScreen: (id)sender
+- (BOOL)fsIsNative
{
-#ifdef NEW_STYLE_FS
- [[self window] toggleFullScreen:sender];
+ return fs_is_native;
+}
+
+- (BOOL)isFullscreen
+{
+ if (! fs_is_native) return nonfs_window != nil;
+#ifdef HAVE_NATIVE_FS
+ return ([[self window] styleMask] & NSFullScreenWindowMask) != 0;
#else
- NSWindow *w = [self window], *fw;
- BOOL onFirstScreen = [[w screen]
- isEqual:[[NSScreen screens] objectAtIndex:0]];
- struct frame *f = emacsframe;
+ return NO;
+#endif
+}
+
+#ifdef HAVE_NATIVE_FS
+- (void)updateCollectionBehaviour
+{
+ if (! [self isFullscreen])
+ {
+ NSWindow *win = [self window];
+ NSWindowCollectionBehavior b = [win collectionBehavior];
+ if (ns_use_native_fullscreen)
+ b |= NSWindowCollectionBehaviorFullScreenPrimary;
+ else
+ b &= ~NSWindowCollectionBehaviorFullScreenPrimary;
+
+ [win setCollectionBehavior: b];
+ fs_is_native = ns_use_native_fullscreen;
+ }
+}
+#endif
+
+- (void)toggleFullScreen: (id)sender
+{
+ NSWindow *w, *fw;
+ BOOL onFirstScreen;
+ struct frame *f;
NSSize sz;
- NSRect r, wr = [w frame];
- NSColor *col = ns_lookup_indexed_color (NS_FACE_BACKGROUND
- (FRAME_DEFAULT_FACE (f)),
- f);
+ NSRect r, wr;
+ NSColor *col;
+
+ if (fs_is_native)
+ {
+ [[self window] toggleFullScreen:sender];
+ return;
+ }
+
+ w = [self window];
+ onFirstScreen = [[w screen] isEqual:[[NSScreen screens] objectAtIndex:0]];
+ f = emacsframe;
+ wr = [w frame];
+ col = ns_lookup_indexed_color (NS_FACE_BACKGROUND
+ (FRAME_DEFAULT_FACE (f)),
+ f);
sz.width = FRAME_COLUMN_WIDTH (f);
sz.height = FRAME_LINE_HEIGHT (f);
@@ -5946,7 +6027,6 @@ not_in_argv (NSString *arg)
FRAME_NS_TITLEBAR_HEIGHT (f) = 0;
tobar_height = FRAME_TOOLBAR_HEIGHT (f);
FRAME_TOOLBAR_HEIGHT (f) = 0;
- FRAME_EXTERNAL_TOOL_BAR (f) = 0;
nonfs_window = w;
@@ -5983,17 +6063,16 @@ not_in_argv (NSString *arg)
f->border_width = bwidth;
FRAME_NS_TITLEBAR_HEIGHT (f) = tibar_height;
- FRAME_TOOLBAR_HEIGHT (f) = tobar_height;
- if (tobar_height)
- FRAME_EXTERNAL_TOOL_BAR (f) = 1;
+ if (FRAME_EXTERNAL_TOOL_BAR (f))
+ FRAME_TOOLBAR_HEIGHT (f) = tobar_height;
[self windowWillExitFullScreen:nil];
[fw setFrame: [w frame] display:YES animate:YES];
[fw close];
[w makeKeyAndOrderFront:NSApp];
[self windowDidExitFullScreen:nil];
+ [self updateFrameSize:YES];
}
-#endif
}
- (void)handleFS
@@ -7148,6 +7227,18 @@ allowing it to be used at a lower level for accented character entry.");
Only works on OSX 10.6 or later. */);
ns_auto_hide_menu_bar = Qnil;
+ DEFVAR_BOOL ("ns-use-native-fullscreen", ns_use_native_fullscreen,
+ doc: /*Non-nil means to use native fullscreen on OSX >= 10.7.
+Nil means use fullscreen the old (< 10.7) way. The old way works better with
+multiple monitors, but lacks tool bar. This variable is ignored on OSX < 10.7.
+Default is t for OSX >= 10.7, nil otherwise. */);
+#ifdef HAVE_NATIVE_FS
+ ns_use_native_fullscreen = YES;
+#else
+ ns_use_native_fullscreen = NO;
+#endif
+ ns_last_use_native_fullscreen = ns_use_native_fullscreen;
+
/* TODO: move to common code */
DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars,
doc: /* Which toolkit scroll bars Emacs uses, if any.
--
1.8.4
From 55b5bade817f30cf2c6c17557cab0fc4eed0a3c3 Mon Sep 17 00:00:00 2001
From: Scott Wheeler <scott@directededge.com>
Date: Tue, 29 Oct 2013 05:11:56 +0100
Subject: [PATCH 2/2] Add toggle-frame-fullscreen from master
---
lisp/frame.el | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/lisp/frame.el b/lisp/frame.el
index 6b6b7a2..5ff62e6 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1653,6 +1653,26 @@ terminals, cursor blinking is controlled by the terminal."
blink-cursor-delay
'blink-cursor-start))))
+(defun toggle-frame-fullscreen ()
+ "Toggle fullscreen mode of the selected frame.
+Enable fullscreen mode of the selected frame or disable if it is
+already fullscreen. Ignore window manager screen decorations.
+When turning on fullscreen mode, remember the previous value of the
+maximization state in the temporary frame parameter `maximized'.
+Restore the maximization state when turning off fullscreen mode.
+See also `toggle-frame-maximized'."
+ (interactive)
+ (modify-frame-parameters
+ nil
+ `((maximized
+ . ,(unless (memq (frame-parameter nil 'fullscreen) '(fullscreen fullboth))
+ (frame-parameter nil 'fullscreen)))
+ (fullscreen
+ . ,(if (memq (frame-parameter nil 'fullscreen) '(fullscreen fullboth))
+ (if (eq (frame-parameter nil 'maximized) 'maximized)
+ 'maximized)
+ 'fullscreen)))))
+
;;;; Key bindings
@@ -1660,6 +1680,7 @@ terminals, cursor blinking is controlled by the terminal."
(define-key ctl-x-5-map "1" 'delete-other-frames)
(define-key ctl-x-5-map "0" 'delete-frame)
(define-key ctl-x-5-map "o" 'other-frame)
+(define-key global-map [f11] 'toggle-frame-fullscreen)
;; Misc.
--
1.8.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.