Commit ee88f64d authored by Ken Raeburn's avatar Ken Raeburn
Browse files

(FOR_EACH_FRAME): Use XCAR and XCDR.

(PIXEL_X_FROM_CANON_X, PIXEL_Y_FROM_CANON_Y): Use XFLOAT_DATA.
parent e35efe89
...@@ -609,8 +609,8 @@ typedef struct frame *FRAME_PTR; ...@@ -609,8 +609,8 @@ typedef struct frame *FRAME_PTR;
#define FOR_EACH_FRAME(list_var, frame_var) \ #define FOR_EACH_FRAME(list_var, frame_var) \
for ((list_var) = Vframe_list; \ for ((list_var) = Vframe_list; \
(CONSP (list_var) \ (CONSP (list_var) \
&& (frame_var = XCONS (list_var)->car, 1)); \ && (frame_var = XCAR (list_var), 1)); \
list_var = XCONS (list_var)->cdr) list_var = XCDR (list_var))
extern Lisp_Object Qframep, Qframe_live_p, Qicon; extern Lisp_Object Qframep, Qframe_live_p, Qicon;
...@@ -708,7 +708,7 @@ extern Lisp_Object Vterminal_frame; ...@@ -708,7 +708,7 @@ extern Lisp_Object Vterminal_frame;
#define PIXEL_X_FROM_CANON_X(F, X) \ #define PIXEL_X_FROM_CANON_X(F, X) \
(INTEGERP (X) \ (INTEGERP (X) \
? XINT (X) * CANON_X_UNIT (F) \ ? XINT (X) * CANON_X_UNIT (F) \
: (int) (XFLOAT (X)->data * CANON_X_UNIT (F))) : (int) (XFLOAT_DATA (X) * CANON_X_UNIT (F)))
/* Convert canonical value Y to pixels. F is the frame whose /* Convert canonical value Y to pixels. F is the frame whose
canonical character height is to be used. X must be a Lisp integer canonical character height is to be used. X must be a Lisp integer
...@@ -717,7 +717,7 @@ extern Lisp_Object Vterminal_frame; ...@@ -717,7 +717,7 @@ extern Lisp_Object Vterminal_frame;
#define PIXEL_Y_FROM_CANON_Y(F, Y) \ #define PIXEL_Y_FROM_CANON_Y(F, Y) \
(INTEGERP (Y) \ (INTEGERP (Y) \
? XINT (Y) * CANON_Y_UNIT (F) \ ? XINT (Y) * CANON_Y_UNIT (F) \
: (int) (XFLOAT (Y)->data * CANON_Y_UNIT (F))) : (int) (XFLOAT_DATA (Y) * CANON_Y_UNIT (F)))
/* Convert pixel-value X to canonical units. F is the frame whose /* Convert pixel-value X to canonical units. F is the frame whose
canonical character width is to be used. X is a C integer. Result canonical character width is to be used. X is a C integer. Result
......
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