[Emacs-diffs] trunk r113621: Drop unnecessary functions that deals with frame pixel size.

[Dmitry Antipov]

------------------------------------------------------------
revno: 113621
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-07-31 16:50:59 +0400
message:
  Drop unnecessary functions that deals with frame pixel size.
  * frame.h, msdos.h, w32term.h, xterm.h (x_pixel_width)
  (x_pixel_height): Drop prototypes.
  * msdos.c, nsfns.m, w32fns.c, xfns.c (x_pixel_width)
  (x_pixel_height): Drop implementations.
  * frame.c (Fframe_pixel_height): Use FRAME_PIXEL_HEIGHT
  which should be always valid for window frame.
  (Frame_pixel_width): Likewise with FRAME_PIXEL_WIDTH.
  * w32menu.c (Fx_popup_dialog):
  * xmenu.c (Fx_popup_dialog): Likewise for both.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/msdos.c                    msdos.c-20091113204419-o5vbwnq5f7feedwu-656
  src/msdos.h                    msdos.h-20091113204419-o5vbwnq5f7feedwu-657
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
  src/w32menu.c                  w32menu.c-20091113204419-o5vbwnq5f7feedwu-947
  src/w32term.h                  w32term.h-20091113204419-o5vbwnq5f7feedwu-954
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274
  src/xmenu.c                    xmenu.c-20091113204419-o5vbwnq5f7feedwu-161
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-31 12:09:16 +0000
+++ b/src/ChangeLog     2013-07-31 12:50:59 +0000
@@ -1,5 +1,18 @@
 2013-07-31  Dmitry Antipov  <address@hidden>
 
+       Drop unnecessary functions that deals with frame pixel size.
+       * frame.h, msdos.h, w32term.h, xterm.h (x_pixel_width)
+       (x_pixel_height): Drop prototypes.
+       * msdos.c, nsfns.m, w32fns.c, xfns.c (x_pixel_width)
+       (x_pixel_height): Drop implementations.
+       * frame.c (Fframe_pixel_height): Use FRAME_PIXEL_HEIGHT
+       which should be always valid for window frame.
+       (Frame_pixel_width): Likewise with FRAME_PIXEL_WIDTH.
+       * w32menu.c (Fx_popup_dialog):
+       * xmenu.c (Fx_popup_dialog): Likewise for both.
+
+2013-07-31  Dmitry Antipov  <address@hidden>
+
        * frame.c (Fmake_terminal_frame): Use store_in_alist to setup
        frame parameters and call to Fmodify_frame_parameters just once.
        (Fset_frame_height, Fset_frame_width): Mention nil frame in docstring.

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-07-31 12:09:16 +0000
+++ b/src/frame.c       2013-07-31 12:50:59 +0000
@@ -2361,7 +2361,7 @@
 
 #ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
-    return make_number (x_pixel_height (f));
+    return make_number (FRAME_PIXEL_HEIGHT (f));
   else
 #endif
     return make_number (FRAME_LINES (f));
@@ -2378,7 +2378,7 @@
 
 #ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
-    return make_number (x_pixel_width (f));
+    return make_number (FRAME_PIXEL_WIDTH (f));
   else
 #endif
     return make_number (FRAME_COLS (f));

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-07-31 06:05:05 +0000
+++ b/src/frame.h       2013-07-31 12:50:59 +0000
@@ -1264,8 +1264,6 @@
 extern void x_make_frame_visible (struct frame *f);
 extern void x_make_frame_invisible (struct frame *f);
 extern void x_iconify_frame (struct frame *f);
-extern int x_pixel_width (struct frame *f);
-extern int x_pixel_height (struct frame *f);
 extern void x_set_frame_alpha (struct frame *f);
 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 extern void x_set_tool_bar_lines (struct frame *f,

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2013-04-07 04:41:19 +0000
+++ b/src/msdos.c       2013-07-31 12:50:59 +0000
@@ -3320,18 +3320,6 @@
   xfree (menu);
   menu_help_message = prev_menu_help_message = NULL;
 }
-
-int
-x_pixel_width (struct frame *f)
-{
-  return FRAME_COLS (f);
-}
-
-int
-x_pixel_height (struct frame *f)
-{
-  return FRAME_LINES (f);
-}
 #endif /* !HAVE_X_WINDOWS */
 
 /* ----------------------- DOS / UNIX conversion --------------------- */

=== modified file 'src/msdos.h'
--- a/src/msdos.h       2013-02-02 17:14:24 +0000
+++ b/src/msdos.h       2013-07-31 12:50:59 +0000
@@ -74,8 +74,6 @@
 /* Defined in xfns.c; emulated on msdos.c */
 
 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
-extern int x_pixel_width (struct frame *);
-extern int x_pixel_height (struct frame *);
 
 #define XFreeGC (void)
 #define x_destroy_bitmap(p1,p2)

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-07-31 06:05:05 +0000
+++ b/src/nsfns.m       2013-07-31 12:50:59 +0000
@@ -2231,21 +2231,6 @@
   return nsfocus;
 }
 
-
-int
-x_pixel_width (struct frame *f)
-{
-  return FRAME_PIXEL_WIDTH (f);
-}
-
-
-int
-x_pixel_height (struct frame *f)
-{
-  return FRAME_PIXEL_HEIGHT (f);
-}
-
-
 void
 x_sync (struct frame *f)
 {

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-07-28 15:22:27 +0000
+++ b/src/w32fns.c      2013-07-31 12:50:59 +0000
@@ -5139,19 +5139,6 @@
   return sound;
 }
 
-
-int
-x_pixel_width (register struct frame *f)
-{
-  return FRAME_PIXEL_WIDTH (f);
-}
-
-int
-x_pixel_height (register struct frame *f)
-{
-  return FRAME_PIXEL_HEIGHT (f);
-}
-
 int
 x_screen_planes (register struct frame *f)
 {

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2013-04-07 04:41:19 +0000
+++ b/src/w32menu.c     2013-07-31 12:50:59 +0000
@@ -206,8 +206,8 @@
           in the middle of frame F.  */
        Lisp_Object x, y, frame, newpos;
        XSETFRAME (frame, f);
-       XSETINT (x, x_pixel_width (f) / 2);
-       XSETINT (y, x_pixel_height (f) / 2);
+       XSETINT (x, FRAME_PIXEL_WIDTH (f) / 2);
+       XSETINT (y, FRAME_PIXEL_HEIGHT (f) / 2);
        newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil));
        return Fx_popup_menu (newpos,
                              Fcons (Fcar (contents), Fcons (contents, Qnil)));

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2013-06-20 17:36:24 +0000
+++ b/src/w32term.h     2013-07-31 12:50:59 +0000
@@ -218,8 +218,6 @@
 extern void x_make_frame_visible (struct frame *f);
 extern void x_make_frame_invisible (struct frame *f);
 extern void x_iconify_frame (struct frame *f);
-extern int x_pixel_width (struct frame *f);
-extern int x_pixel_height (struct frame *f);
 extern void x_set_frame_alpha (struct frame *f);
 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 extern void x_set_tool_bar_lines (struct frame *f,

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-07-30 05:56:18 +0000
+++ b/src/xfns.c        2013-07-31 12:50:59 +0000
@@ -4325,19 +4325,6 @@
   return attributes_list;
 }
 
-
-int
-x_pixel_width (register struct frame *f)
-{
-  return FRAME_PIXEL_WIDTH (f);
-}
-
-int
-x_pixel_height (register struct frame *f)
-{
-  return FRAME_PIXEL_HEIGHT (f);
-}
-
 /************************************************************************
                              X Displays
  ************************************************************************/

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2013-07-30 05:56:18 +0000
+++ b/src/xmenu.c       2013-07-31 12:50:59 +0000
@@ -294,8 +294,8 @@
   {
     Lisp_Object x, y, frame, newpos;
     XSETFRAME (frame, f);
-    XSETINT (x, x_pixel_width (f) / 2);
-    XSETINT (y, x_pixel_height (f) / 2);
+    XSETINT (x, FRAME_PIXEL_WIDTH (f) / 2);
+    XSETINT (y, FRAME_PIXEL_HEIGHT (f) / 2);
     newpos = list2 (list2 (x, y), frame);
 
     return Fx_popup_menu (newpos,

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2013-07-30 05:56:18 +0000
+++ b/src/xterm.h       2013-07-31 12:50:59 +0000
@@ -1031,8 +1031,6 @@
 extern void xic_set_preeditarea (struct window *, int, int);
 extern void xic_set_statusarea (struct frame *);
 extern void xic_set_xfontset (struct frame *, const char *);
-extern int x_pixel_width (struct frame *);
-extern int x_pixel_height (struct frame *);
 extern bool x_defined_color (struct frame *, const char *, XColor *, bool);
 #ifdef HAVE_X_I18N
 extern void free_frame_xic (struct frame *);