Commit dacc9715 authored by Dmitry Antipov's avatar Dmitry Antipov

* font.h (FONT_WIDTH, FONT_HEIGHT, FONT_BASE, FONT_DESCENT):

Define here to unify between...
* nsterm.h, w32term.h, xterm.h: ...port-specific headers.
* w32term.h (CHECK_W32_FRAME): Remove unused macro.
parent 0518b057
2013-12-02 Dmitry Antipov <dmantipov@yandex.ru>
* font.h (FONT_WIDTH, FONT_HEIGHT, FONT_BASE, FONT_DESCENT):
Define here to unify between...
* nsterm.h, w32term.h, xterm.h: ...port-specific headers.
* w32term.h (CHECK_W32_FRAME): Remove unused macro.
2013-12-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xterm.h (struct scroll_bar): Remove member `fringe_extended_p'.
......
......@@ -234,6 +234,11 @@ enum font_property_index
#define FONT_SET_STYLE(font, prop, val) \
ASET ((font), prop, make_number (font_style_to_value (prop, val, 1)))
#define FONT_WIDTH(f) ((f)->max_width)
#define FONT_HEIGHT(f) ((f)->height)
#define FONT_BASE(f) ((f)->ascent)
#define FONT_DESCENT(f) ((f)->descent)
extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript;
extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity;
extern Lisp_Object Qp;
......
......@@ -720,11 +720,6 @@ struct x_output
#define FRAME_NS_TITLEBAR_HEIGHT(f) ((f)->output_data.ns->titlebar_height)
#define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.ns->toolbar_height)
#define FONT_WIDTH(f) ((f)->max_width)
#define FONT_HEIGHT(f) ((f)->height)
#define FONT_BASE(f) ((f)->ascent)
#define FONT_DESCENT(f) ((f)->descent)
#define FRAME_DEFAULT_FACE(f) FACE_FROM_ID (f, DEFAULT_FACE_ID)
#define FRAME_NS_VIEW(f) ((f)->output_data.ns->view)
......
......@@ -26,23 +26,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BLACK_PIX_DEFAULT(f) PALETTERGB(0,0,0)
#define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255)
#define FONT_WIDTH(f) ((f)->max_width)
#define FONT_HEIGHT(f) ((f)->height)
#define FONT_BASE(f) ((f)->ascent)
#define FONT_DESCENT(f) ((f)->descent)
#define CP_DEFAULT 1004
#define CHECK_W32_FRAME(f, frame) \
if (NILP (frame)) \
f = SELECTED_FRAME (); \
else \
{ \
CHECK_LIVE_FRAME (frame, 0); \
f = XFRAME (frame); \
} \
if (! FRAME_W32_P (f))
/* Indicates whether we are in the readsocket call and the message we
are processing in the current loop */
......
......@@ -84,11 +84,6 @@ typedef GtkWidget *xt_or_gtk_widget;
#define WHITE_PIX_DEFAULT(f) \
WhitePixel (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f))
#define FONT_WIDTH(f) ((f)->max_width)
#define FONT_HEIGHT(f) ((f)->ascent + (f)->descent)
#define FONT_BASE(f) ((f)->ascent)
#define FONT_DESCENT(f) ((f)->descent)
/* The mask of events that text windows always want to receive. This
includes mouse movement events, since handling the mouse-font text property
means that we must track mouse motion all the time. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment