diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-02-05 13:16:35 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-02-05 13:16:35 +0100 |
| commit | 6871e574da7938313bbfd519c17035a6805a2305 (patch) | |
| tree | 711e1106eb57c7e851f7432805e2688e3b3ad69a /lisp | |
| parent | ed746aa721aa5712249946b6061041563f7138f3 (diff) | |
| download | emacs-6871e574da7938313bbfd519c17035a6805a2305.tar.gz | |
* lisp/cus-start.el (all): Add ns-use-native-fullscreen.
* src/nsmenu.m (update_frame_tool_bar): Check for negative tool bar
height.
* src/nsterm.h (HAVE_NATIVE_FS): Define if OSX => 10.7.
(EmacsView): Add fs_is_native, fsIsNative, isFullscreen and
updateCollectionBehaviour.
* src/nsterm.m (NEW_STYLE_FS): Remove.
(ns_last_use_native_fullscreen): New variable.
(x_make_frame_visible): Replace NEW_STYLE_FS with isFullscreen.
(x_set_window_size): Do not take title bar and tool bar into account
if isFullscreen returns YES.
(ns_fullscreen_hook): Replace NEW_STYLE_FS with isFullscreen.
(check_native_fs): New function.
(ns_select, ns_read_socket): Call check_native_fs if HAVE_NATIVE_FS.
(ns_term_init): Remove NEW_STYLE_FS.
(updateFrameSize:, windowWillResize:toSize:): Only adjust for title bar
and tool bar if isFullscreen returns NO.
(windowDidResize:): Replace NEW_STYLE_FS with fsIsNative.
(initFrameFromEmacs:): Initialize fs_is_native. Replace NEW_STYLE_FS
with HAVE_NATIVE_FS.
(window:willUseFullScreenPresentationOptions:): New method.
(windowDidEnterFullScreen:): Replace NEW_STYLE_FS with fsIsNative.
Hide toolbar if not enabled.
(windowDidExitFullScreen:): Call updateCollectionBehaviour.
Restore tool bar if enabled, hide it otherwise (Bug#13444).
(fsIsNative, isFullscreen, updateCollectionBehaviour): New methods.
(toggleFullScreen:): If fs_is_native, call toggleFullScreen on
window. Do no set FRAME_EXTERNAL_TOOL_BAR (f) to 0.
Check FRAME_EXTERNAL_TOOL_BAR (f) before restoring
FRAME_TOOLBAR_HEIGHT (f). Call updateFrameSize when going non-fs.
(syms_of_nsterm): Add ns-use-native-fullscreen.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/cus-start.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9fbc0e747fc..538206ae9d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-02-05 Jan Djärv <jan.h.d@swipnet.se> + + * cus-start.el (all): Add ns-use-native-fullscreen. + 2013-02-05 Glenn Morris <rgm@gnu.org> * profiler.el (profiler-report-mode-map): Add a restart menu entry. diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 62e91fafcbf..2bc47426332 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -398,6 +398,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 |