mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Drop unnecessary functions that deals with frame pixel size.

Browse source 
* 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.
This commit is contained in:
Dmitry Antipov 2013-07-31 16:50:59 +04:00
parent 2412ee1af6
commit f435830ea4
12 changed files with 19 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ChangeLog
View file

@ -1,3 +1,16 @@
2013-07-31 Dmitry Antipov <dmantipov@yandex.ru>
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 <dmantipov@yandex.ru>
* frame.c (Fmake_terminal_frame): Use store_in_alist to setup

4
src/frame.c
View file

@ -2361,7 +2361,7 @@ to `frame-height'). */)
#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 @@ If FRAME is omitted or nil, the selected frame is used. */)
#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));

2
src/frame.h
View file

@ -1264,8 +1264,6 @@ extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
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,

12
src/msdos.c
View file

@ -3320,18 +3320,6 @@ XMenuDestroy (Display *foo, XMenu *menu)
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 --------------------- */

2
src/msdos.h
View file

@ -74,8 +74,6 @@ struct window;
/* 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)

15
src/nsfns.m
View file

@ -2231,21 +2231,6 @@ x_get_focus_frame (struct frame *frame)
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)
{

13
src/w32fns.c
View file

@ -5139,19 +5139,6 @@ SOUND is nil to use the normal beep. */)
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)
{

4
src/w32menu.c
View file

@ -206,8 +206,8 @@ otherwise it is "Question". */)
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)));

2
src/w32term.h
View file

@ -218,8 +218,6 @@ extern void x_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y);
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,

13
src/xfns.c
View file

@ -4325,19 +4325,6 @@ Internal use only, use `display-monitor-attributes-list' instead. */)
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
************************************************************************/

4
src/xmenu.c
View file

@ -294,8 +294,8 @@ for instance using the window manager, then this produces a quit and
{
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,

2
src/xterm.h
View file

@ -1031,8 +1031,6 @@ extern void destroy_frame_xic (struct frame *);
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 *);