aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorAlan Third2017-04-20 15:25:56 +0100
committerAlan Third2017-04-21 20:44:35 +0100
commitd812d20fbc3e1eff0f10443baed801adda9031cd (patch)
tree184f53fd04d4b5cae0bfe5297bd904043e9db3b9 /lisp
parenta3b8618d79657af0d7fea9cb6fd914ccf0f67849 (diff)
downloademacs-d812d20fbc3e1eff0f10443baed801adda9031cd.tar.gz
emacs-d812d20fbc3e1eff0f10443baed801adda9031cd.zip
Add no-accept-focus and frame-list-z-order to NS port
* lisp/frame.el (frame-list-z-order): Add NS. * src/nsfns.m: Add x_set_no_accept_focus to handler struct. (Fx_create_frame): Handle no-accept-focus parameter. (ns_window_is_ancestor): (Fns_frame_list_z_order): New functions. * src/nsterm.m (x_set_no_accept_focus): New function. (initFrameFromEmacs): Use EmacsWindow instead of EmacsFSWindow for non-fullscreen windows. (EmacsWindow:canBecomeKeyWindow): New function.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/frame.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index e632b5943fc..cec262499d1 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1500,6 +1500,7 @@ keys and their meanings."
1500 1500
1501(declare-function x-frame-list-z-order "xfns.c" (&optional display)) 1501(declare-function x-frame-list-z-order "xfns.c" (&optional display))
1502(declare-function w32-frame-list-z-order "w32fns.c" (&optional display)) 1502(declare-function w32-frame-list-z-order "w32fns.c" (&optional display))
1503(declare-function ns-frame-list-z-order "nsfns.m" (&optional display))
1503 1504
1504(defun frame-list-z-order (&optional display) 1505(defun frame-list-z-order (&optional display)
1505 "Return list of Emacs' frames, in Z (stacking) order. 1506 "Return list of Emacs' frames, in Z (stacking) order.
@@ -1517,10 +1518,13 @@ Return nil if DISPLAY contains no Emacs frame."
1517 ((eq frame-type 'x) 1518 ((eq frame-type 'x)
1518 (x-frame-list-z-order display)) 1519 (x-frame-list-z-order display))
1519 ((eq frame-type 'w32) 1520 ((eq frame-type 'w32)
1520 (w32-frame-list-z-order display))))) 1521 (w32-frame-list-z-order display))
1522 ((eq frame-type 'ns)
1523 (ns-frame-list-z-order display)))))
1521 1524
1522(declare-function x-frame-restack "xfns.c" (frame1 frame2 &optional above)) 1525(declare-function x-frame-restack "xfns.c" (frame1 frame2 &optional above))
1523(declare-function w32-frame-restack "w32fns.c" (frame1 frame2 &optional above)) 1526(declare-function w32-frame-restack "w32fns.c" (frame1 frame2 &optional above))
1527(declare-function ns-frame-restack "nsfns.m" (frame1 frame2 &optional above))
1524 1528
1525(defun frame-restack (frame1 frame2 &optional above) 1529(defun frame-restack (frame1 frame2 &optional above)
1526 "Restack FRAME1 below FRAME2. 1530 "Restack FRAME1 below FRAME2.