aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsfns.m
diff options
context:
space:
mode:
authorMartin Rudalics2015-08-21 11:00:59 +0200
committerMartin Rudalics2015-08-21 11:00:59 +0200
commitdf9b29eda0ba1ec7f751dfd538eefbfe56b2c043 (patch)
treec3797cfe3d7c8596438a88502838652f14703582 /src/nsfns.m
parent092e17b1978d804df99fae9436f24c0ea0d7e034 (diff)
downloademacs-df9b29eda0ba1ec7f751dfd538eefbfe56b2c043.tar.gz
emacs-df9b29eda0ba1ec7f751dfd538eefbfe56b2c043.zip
Sanitize frame geometry related functions
* src/nsfns.m (Fx_frame_geometry): Rename to Fns_frame_geometry. (Fx_frame_edges): Rename to Fns_frame_edges. * src/w32fns.c (Fx_frame_geometry): Rename to Fw32_frame_geometry. (Fx_frame_edges): Rename to Fw32_frame_edges. (Fx_mouse_absolute_pixel_position): Rename to Fw32_mouse_absolute_pixel_position. (Fx_set_mouse_absolute_pixel_position): Rename to Fw32_set_mouse_absolute_pixel_position. * lisp/frame.el (x-frame-geometry, w32-frame-geometry) (ns-frame-geometry, x-frame-edges, w32-frame-edges) (ns-frame-edges, w32-mouse-absolute-pixel-position) (x-mouse-absolute-pixel-position) (w32-set-mouse-absolute-pixel-position) (x-set-mouse-absolute-pixel-position): Declare. (frame-geometry, mouse-absolute-pixel-position) (set-mouse-absolute-pixel-position): New functions. (frame-edges): Rewrite in terms of x-/w32-/ns-frame-edges.
Diffstat (limited to 'src/nsfns.m')
-rw-r--r--src/nsfns.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index e9453604592..d317d48608c 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2906,7 +2906,7 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
2906 make_number (internal_border_width))); 2906 make_number (internal_border_width)));
2907} 2907}
2908 2908
2909DEFUN ("x-frame-geometry", Fx_frame_geometry, Sx_frame_geometry, 0, 1, 0, 2909DEFUN ("ns-frame-geometry", Fns_frame_geometry, Sns_frame_geometry, 0, 1, 0,
2910 doc: /* Return geometric attributes of FRAME. 2910 doc: /* Return geometric attributes of FRAME.
2911FRAME must be a live frame and defaults to the selected one. The return 2911FRAME must be a live frame and defaults to the selected one. The return
2912value is an association list of the attributes listed below. All height 2912value is an association list of the attributes listed below. All height
@@ -2950,7 +2950,7 @@ and width values are in pixels.
2950 return frame_geometry (frame, Qnil); 2950 return frame_geometry (frame, Qnil);
2951} 2951}
2952 2952
2953DEFUN ("x-frame-edges", Fx_frame_edges, Sx_frame_edges, 0, 2, 0, 2953DEFUN ("ns-frame-edges", Fns_frame_edges, Sns_frame_edges, 0, 2, 0,
2954 doc: /* Return edge coordinates of FRAME. 2954 doc: /* Return edge coordinates of FRAME.
2955FRAME must be a live frame and defaults to the selected one. The return 2955FRAME must be a live frame and defaults to the selected one. The return
2956value is a list of the form (LEFT, TOP, RIGHT, BOTTOM). All values are 2956value is a list of the form (LEFT, TOP, RIGHT, BOTTOM). All values are
@@ -3156,8 +3156,8 @@ be used as the image of the icon representing the frame. */);
3156 defsubr (&Sx_display_pixel_width); 3156 defsubr (&Sx_display_pixel_width);
3157 defsubr (&Sx_display_pixel_height); 3157 defsubr (&Sx_display_pixel_height);
3158 defsubr (&Sns_display_monitor_attributes_list); 3158 defsubr (&Sns_display_monitor_attributes_list);
3159 defsubr (&Sx_frame_geometry); 3159 defsubr (&Sns_frame_geometry);
3160 defsubr (&Sx_frame_edges); 3160 defsubr (&Sns_frame_edges);
3161 defsubr (&Sx_display_mm_width); 3161 defsubr (&Sx_display_mm_width);
3162 defsubr (&Sx_display_mm_height); 3162 defsubr (&Sx_display_mm_height);
3163 defsubr (&Sx_display_screens); 3163 defsubr (&Sx_display_screens);