Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8e713be6
Commit
8e713be6
authored
Sep 12, 1999
by
Ken Raeburn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use XCAR and XCDR instead of explicit member references.
parent
70949dac
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
309 additions
and
309 deletions
+309
-309
src/w32faces.c
src/w32faces.c
+12
-12
src/w32fns.c
src/w32fns.c
+96
-96
src/w32menu.c
src/w32menu.c
+10
-10
src/w32proc.c
src/w32proc.c
+4
-4
src/w32term.c
src/w32term.c
+10
-10
src/xfns.c
src/xfns.c
+55
-55
src/xmenu.c
src/xmenu.c
+10
-10
src/xselect.c
src/xselect.c
+67
-67
src/xterm.c
src/xterm.c
+45
-45
No files found.
src/w32faces.c
View file @
8e713be6
...
...
@@ -302,16 +302,16 @@ DEFUN ("pixmap-spec-p", Fpixmap_spec_p, Spixmap_spec_p, 1, 1, 0,
return
((
STRINGP
(
object
)
||
(
CONSP
(
object
)
&&
CONSP
(
XC
ONS
(
object
)
->
cdr
)
&&
CONSP
(
XC
ONS
(
XC
ONS
(
object
)
->
cdr
)
->
cdr
)
&&
NILP
(
XC
ONS
(
XC
ONS
(
XC
ONS
(
object
)
->
cdr
)
->
cdr
)
->
cdr
)
&&
(
width
=
XC
ONS
(
object
)
->
car
,
INTEGERP
(
width
))
&&
(
height
=
XC
ONS
(
XC
ONS
(
object
)
->
cdr
)
->
car
,
INTEGERP
(
height
))
&&
STRINGP
(
XC
ONS
(
XC
ONS
(
XC
ONS
(
object
)
->
cdr
)
->
cdr
)
->
car
)
&&
CONSP
(
XC
DR
(
object
))
&&
CONSP
(
XC
DR
(
XC
DR
(
object
)
)
)
&&
NILP
(
XC
DR
(
XC
DR
(
XC
DR
(
object
)
))
)
&&
(
width
=
XC
AR
(
object
),
INTEGERP
(
width
))
&&
(
height
=
XC
AR
(
XC
DR
(
object
)
)
,
INTEGERP
(
height
))
&&
STRINGP
(
XC
AR
(
XC
DR
(
XC
DR
(
object
)
))
)
&&
XINT
(
width
)
>
0
&&
XINT
(
height
)
>
0
/* The string must have enough bits for width * height. */
&&
((
XSTRING
(
XC
ONS
(
XC
ONS
(
XC
ONS
(
object
)
->
cdr
)
->
cdr
)
->
car
)
->
size
&&
((
XSTRING
(
XC
AR
(
XC
DR
(
XC
DR
(
object
)
))
)
->
size
*
(
BITS_PER_INT
/
sizeof
(
int
)))
>=
XFASTINT
(
width
)
*
XFASTINT
(
height
))))
?
Qt
:
Qnil
);
...
...
@@ -828,7 +828,7 @@ merge_face_list (f, face, prop)
int
j
;
if
(
CONSP
(
prop
)
&&
!
STRINGP
(
XC
ONS
(
prop
)
->
cdr
))
&&
!
STRINGP
(
XC
DR
(
prop
)))
{
/* We have a list of faces, merge them in reverse order. */
...
...
@@ -855,10 +855,10 @@ merge_face_list (f, face, prop)
{
if
(
CONSP
(
faces
[
j
]))
{
if
(
EQ
(
XC
ONS
(
faces
[
j
])
->
car
,
Qbackground_color
))
face
->
background
=
load_color
(
f
,
XC
ONS
(
faces
[
j
])
->
cdr
);
if
(
EQ
(
XC
ONS
(
faces
[
j
])
->
car
,
Qforeground_color
))
face
->
foreground
=
load_color
(
f
,
XC
ONS
(
faces
[
j
])
->
cdr
);
if
(
EQ
(
XC
AR
(
faces
[
j
]),
Qbackground_color
))
face
->
background
=
load_color
(
f
,
XC
DR
(
faces
[
j
]));
if
(
EQ
(
XC
AR
(
faces
[
j
]),
Qforeground_color
))
face
->
foreground
=
load_color
(
f
,
XC
DR
(
faces
[
j
]));
}
else
{
...
...
src/w32fns.c
View file @
8e713be6
...
...
@@ -341,9 +341,9 @@ x_window_to_frame (dpyinfo, wdesc)
Lisp_Object tail, frame;
struct frame *f;
for (tail = Vframe_list; GC_CONSP (tail); tail = XC
ONS
(tail)
->cdr
)
for (tail = Vframe_list; GC_CONSP (tail); tail = XC
DR
(tail))
{
frame = XC
ONS
(tail)
->car
;
frame = XC
AR
(tail);
if (!GC_FRAMEP (frame))
continue;
f = XFRAME (frame);
...
...
@@ -867,18 +867,18 @@ x_set_frame_parameters (f, alist)
if (leftpos < 0)
f->output_data.w32->size_hint_flags |= XNegative;
}
else if (CONSP (left) && EQ (XC
ONS
(left)
->car
, Qminus)
&& CONSP (XC
ONS
(left)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(left)
->cdr)->car
))
else if (CONSP (left) && EQ (XC
AR
(left), Qminus)
&& CONSP (XC
DR
(left))
&& INTEGERP (XC
AR
(XC
DR
(left)
)
))
{
leftpos = - XINT (XC
ONS
(XC
ONS
(left)
->cdr)->car
);
leftpos = - XINT (XC
AR
(XC
DR
(left)
)
);
f->output_data.w32->size_hint_flags |= XNegative;
}
else if (CONSP (left) && EQ (XC
ONS
(left)
->car
, Qplus)
&& CONSP (XC
ONS
(left)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(left)
->cdr)->car
))
else if (CONSP (left) && EQ (XC
AR
(left), Qplus)
&& CONSP (XC
DR
(left))
&& INTEGERP (XC
AR
(XC
DR
(left)
)
))
{
leftpos = XINT (XC
ONS
(XC
ONS
(left)
->cdr)->car
);
leftpos = XINT (XC
AR
(XC
DR
(left)
)
);
}
if (EQ (top, Qminus))
...
...
@@ -889,18 +889,18 @@ x_set_frame_parameters (f, alist)
if (toppos < 0)
f->output_data.w32->size_hint_flags |= YNegative;
}
else if (CONSP (top) && EQ (XC
ONS
(top)
->car
, Qminus)
&& CONSP (XC
ONS
(top)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(top)
->cdr)->car
))
else if (CONSP (top) && EQ (XC
AR
(top), Qminus)
&& CONSP (XC
DR
(top))
&& INTEGERP (XC
AR
(XC
DR
(top)
)
))
{
toppos = - XINT (XC
ONS
(XC
ONS
(top)
->cdr)->car
);
toppos = - XINT (XC
AR
(XC
DR
(top)
)
);
f->output_data.w32->size_hint_flags |= YNegative;
}
else if (CONSP (top) && EQ (XC
ONS
(top)
->car
, Qplus)
&& CONSP (XC
ONS
(top)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(top)
->cdr)->car
))
else if (CONSP (top) && EQ (XC
AR
(top), Qplus)
&& CONSP (XC
DR
(top))
&& INTEGERP (XC
AR
(XC
DR
(top)
)
))
{
toppos = XINT (XC
ONS
(XC
ONS
(top)
->cdr)->car
);
toppos = XINT (XC
AR
(XC
DR
(top)
)
);
}
...
...
@@ -989,7 +989,7 @@ x_report_frame_params (f, alistptr)
(FRAME_VISIBLE_P (f) ? Qt
: FRAME_ICONIFIED_P (f) ? Qicon : Qnil));
store_in_alist (alistptr, Qdisplay,
XC
ONS
(FRAME_W32_DISPLAY_INFO (f)->name_list_element)
->car
);
XC
AR
(FRAME_W32_DISPLAY_INFO (f)->name_list_element));
}
...
...
@@ -2049,11 +2049,11 @@ x_set_cursor_type (f, arg, oldval)
FRAME_DESIRED_CURSOR (f) = bar_cursor;
f->output_data.w32->cursor_width = 2;
}
else if (CONSP (arg) && EQ (XC
ONS
(arg)
->car
, Qbar)
&& INTEGERP (XC
ONS
(arg)
->cdr
))
else if (CONSP (arg) && EQ (XC
AR
(arg), Qbar)
&& INTEGERP (XC
DR
(arg)))
{
FRAME_DESIRED_CURSOR (f) = bar_cursor;
f->output_data.w32->cursor_width = XINT (XC
ONS
(arg)
->cdr
);
f->output_data.w32->cursor_width = XINT (XC
DR
(arg));
}
else
/* Treat anything unknown as "box cursor".
...
...
@@ -2105,7 +2105,7 @@ x_icon_type (f)
tem = assq_no_quit (Qicon_type, f->param_alist);
if (CONSP (tem))
return XC
ONS
(tem)
->cdr
;
return XC
DR
(tem);
else
return Qnil;
}
...
...
@@ -2885,18 +2885,18 @@ x_figure_window_size (f, parms)
f->output_data.w32->top_pos = 0;
window_prompting |= YNegative;
}
else if (CONSP (tem0) && EQ (XC
ONS
(tem0)
->car
, Qminus)
&& CONSP (XC
ONS
(tem0)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(tem0)
->cdr)->car
))
else if (CONSP (tem0) && EQ (XC
AR
(tem0), Qminus)
&& CONSP (XC
DR
(tem0))
&& INTEGERP (XC
AR
(XC
DR
(tem0)
)
))
{
f->output_data.w32->top_pos = - XINT (XC
ONS
(XC
ONS
(tem0)
->cdr)->car
);
f->output_data.w32->top_pos = - XINT (XC
AR
(XC
DR
(tem0)
)
);
window_prompting |= YNegative;
}
else if (CONSP (tem0) && EQ (XC
ONS
(tem0)
->car
, Qplus)
&& CONSP (XC
ONS
(tem0)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(tem0)
->cdr)->car
))
else if (CONSP (tem0) && EQ (XC
AR
(tem0), Qplus)
&& CONSP (XC
DR
(tem0))
&& INTEGERP (XC
AR
(XC
DR
(tem0)
)
))
{
f->output_data.w32->top_pos = XINT (XC
ONS
(XC
ONS
(tem0)
->cdr)->car
);
f->output_data.w32->top_pos = XINT (XC
AR
(XC
DR
(tem0)
)
);
}
else if (EQ (tem0, Qunbound))
f->output_data.w32->top_pos = 0;
...
...
@@ -2913,18 +2913,18 @@ x_figure_window_size (f, parms)
f->output_data.w32->left_pos = 0;
window_prompting |= XNegative;
}
else if (CONSP (tem1) && EQ (XC
ONS
(tem1)
->car
, Qminus)
&& CONSP (XC
ONS
(tem1)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(tem1)
->cdr)->car
))
else if (CONSP (tem1) && EQ (XC
AR
(tem1), Qminus)
&& CONSP (XC
DR
(tem1))
&& INTEGERP (XC
AR
(XC
DR
(tem1)
)
))
{
f->output_data.w32->left_pos = - XINT (XC
ONS
(XC
ONS
(tem1)
->cdr)->car
);
f->output_data.w32->left_pos = - XINT (XC
AR
(XC
DR
(tem1)
)
);
window_prompting |= XNegative;
}
else if (CONSP (tem1) && EQ (XC
ONS
(tem1)
->car
, Qplus)
&& CONSP (XC
ONS
(tem1)
->cdr
)
&& INTEGERP (XC
ONS
(XC
ONS
(tem1)
->cdr)->car
))
else if (CONSP (tem1) && EQ (XC
AR
(tem1), Qplus)
&& CONSP (XC
DR
(tem1))
&& INTEGERP (XC
AR
(XC
DR
(tem1)
)
))
{
f->output_data.w32->left_pos = XINT (XC
ONS
(XC
ONS
(tem1)
->cdr)->car
);
f->output_data.w32->left_pos = XINT (XC
AR
(XC
DR
(tem1)
)
);
}
else if (EQ (tem1, Qunbound))
f->output_data.w32->left_pos = 0;
...
...
@@ -4833,8 +4833,8 @@ This function is an internal primitive--use `make-frame' instead.")
}
/* Create fontsets from `global_fontset_alist' before handling fonts. */
for (tem = Vglobal_fontset_alist; CONSP (tem); tem = XC
ONS
(tem)
->cdr
)
fs_register_fontset (f, XC
ONS
(tem)
->car
);
for (tem = Vglobal_fontset_alist; CONSP (tem); tem = XC
DR
(tem))
fs_register_fontset (f, XC
AR
(tem));
/* Extract the window parameters from the supplied values
that are needed to determine window geometry. */
...
...
@@ -5052,14 +5052,14 @@ w32_load_system_font (f,fontname,size)
/* First check if any are already loaded, as that is cheaper
than loading another one. */
for (i = 0; i < dpyinfo->n_fonts; i++)
for (tail = font_names; CONSP (tail); tail = XC
ONS
(tail)
->cdr
)
for (tail = font_names; CONSP (tail); tail = XC
DR
(tail))
if (!strcmp (dpyinfo->font_table[i].name,
XSTRING (XC
ONS
(tail)
->car
)->data)
XSTRING (XC
AR
(tail))->data)
|| !strcmp (dpyinfo->font_table[i].full_name,
XSTRING (XC
ONS
(tail)
->car
)->data))
XSTRING (XC
AR
(tail))->data))
return (dpyinfo->font_table + i);
#endif
fontname = (char *) XSTRING (XC
ONS
(font_names)
->car
)->data;
fontname = (char *) XSTRING (XC
AR
(font_names))->data;
}
else if (w32_strict_fontnames)
{
...
...
@@ -5234,13 +5234,13 @@ int size;
char *bdf_name, *bdf_file;
Lisp_Object bdf_pair;
bdf_name = XSTRING (XC
ONS
(bdf_fonts)
->car
)->data;
bdf_pair = Fassoc (XC
ONS
(bdf_fonts)
->car
, Vw32_bdf_filename_alist);
bdf_file = XSTRING (XC
ONS
(bdf_pair)
->cdr
)->data;
bdf_name = XSTRING (XC
AR
(bdf_fonts))->data;
bdf_pair = Fassoc (XC
AR
(bdf_fonts), Vw32_bdf_filename_alist);
bdf_file = XSTRING (XC
DR
(bdf_pair))->data;
retval = w32_load_bdf_font (f, bdf_name, size, bdf_file);
bdf_fonts = XC
ONS
(bdf_fonts)
->cdr
;
bdf_fonts = XC
DR
(bdf_fonts);
}
if (retval)
...
...
@@ -5831,7 +5831,7 @@ enum_font_cb2 (lplf, lptm, FontType, lpef)
|| w32_font_match (buf, XSTRING (*(lpef->pattern))->data))
{
*lpef->tail = Fcons (Fcons (build_string (buf), width), Qnil);
lpef->tail = &(XC
ONS
(*lpef->tail)
->cdr
);
lpef->tail = &(XC
DR
(*lpef->tail));
lpef->numFonts++;
}
}
...
...
@@ -5899,11 +5899,11 @@ Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names)
list = Vw32_bdf_filename_alist;
ptnstr = XSTRING (pattern)->data;
for ( ; CONSP (list); list = XC
ONS
(list)
->cdr
)
for ( ; CONSP (list); list = XC
DR
(list))
{
tem = XC
ONS
(list)
->car
;
tem = XC
AR
(list);
if (CONSP (tem))
fontname = XSTRING (XC
ONS
(tem)
->car
)->data;
fontname = XSTRING (XC
AR
(tem))->data;
else if (STRINGP (tem))
fontname = XSTRING (tem)->data;
else
...
...
@@ -5911,7 +5911,7 @@ Lisp_Object w32_list_bdf_fonts (Lisp_Object pattern, int max_names)
if (w32_font_match (fontname, ptnstr))
{
newlist = Fcons (XC
ONS
(tem)
->car
, newlist);
newlist = Fcons (XC
AR
(tem), newlist);
n_fonts++;
if (n_fonts >= max_names)
break;
...
...
@@ -5943,17 +5943,17 @@ w32_list_fonts (FRAME_PTR f, Lisp_Object pattern, int size, int maxnames )
if (NILP (patterns))
patterns = Fcons (pattern, Qnil);
for (; CONSP (patterns); patterns = XC
ONS
(patterns)
->cdr
)
for (; CONSP (patterns); patterns = XC
DR
(patterns))
{
enumfont_t ef;
tpat = XC
ONS
(patterns)
->car
;
tpat = XC
AR
(patterns);
/* See if we cached the result for this particular query.
The cache is an alist of the form:
((PATTERN (FONTNAME . WIDTH) ...) ...)
*/
if (tem = XC
ONS
(dpyinfo->name_list_element)
->cdr
,
if (tem = XC
DR
(dpyinfo->name_list_element),
!NILP (list = Fassoc (tpat, tem)))
{
list = Fcdr_safe (list);
...
...
@@ -6004,9 +6004,9 @@ w32_list_fonts (FRAME_PTR f, Lisp_Object pattern, int size, int maxnames )
/* Make a list of the fonts we got back.
Store that in the font cache for the display. */
XC
ONS
(dpyinfo->name_list_element)
->cdr
XC
DR
(dpyinfo->name_list_element)
= Fcons (Fcons (tpat, list),
XC
ONS
(dpyinfo->name_list_element)
->cdr
);
XC
DR
(dpyinfo->name_list_element));
label_cached:
if (NILP (list)) continue; /* Try the remaining alternatives. */
...
...
@@ -6014,25 +6014,25 @@ w32_list_fonts (FRAME_PTR f, Lisp_Object pattern, int size, int maxnames )
newlist = second_best = Qnil;
/* Make a list of the fonts that have the right width. */
for (; CONSP (list); list = XC
ONS
(list)
->cdr
)
for (; CONSP (list); list = XC
DR
(list))
{
int found_size;
tem = XC
ONS
(list)
->car
;
tem = XC
AR
(list);
if (!CONSP (tem))
continue;
if (NILP (XC
ONS
(tem)
->car
))
if (NILP (XC
AR
(tem)))
continue;
if (!size)
{
newlist = Fcons (XC
ONS
(tem)
->car
, newlist);
newlist = Fcons (XC
AR
(tem), newlist);
n_fonts++;
if (n_fonts >= maxnames)
break;
else
continue;
}
if (!INTEGERP (XC
ONS
(tem)
->cdr
))
if (!INTEGERP (XC
DR
(tem)))
{
/* Since we don't yet know the size of the font, we must
load it and try GetTextMetrics. */
...
...
@@ -6041,7 +6041,7 @@ w32_list_fonts (FRAME_PTR f, Lisp_Object pattern, int size, int maxnames )
HDC hdc;
HANDLE oldobj;
if (!x_to_w32_font (XSTRING (XC
ONS
(tem)
->car
)->data, &lf))
if (!x_to_w32_font (XSTRING (XC
AR
(tem))->data, &lf))
continue;
BLOCK_INPUT;
...
...
@@ -6053,18 +6053,18 @@ w32_list_fonts (FRAME_PTR f, Lisp_Object pattern, int size, int maxnames )
hdc = GetDC (dpyinfo->root_window);
oldobj = SelectObject (hdc, thisinfo.hfont);
if (GetTextMetrics (hdc, &thisinfo.tm))
XC
ONS
(tem)
->cdr
= make_number (FONT_WIDTH (&thisinfo));
XC
DR
(tem) = make_number (FONT_WIDTH (&thisinfo));
else
XC
ONS
(tem)
->cdr
= make_number (0);
XC
DR
(tem) = make_number (0);
SelectObject (hdc, oldobj);
ReleaseDC (dpyinfo->root_window, hdc);
DeleteObject(thisinfo.hfont);
UNBLOCK_INPUT;
}
found_size = XINT (XC
ONS
(tem)
->cdr
);
found_size = XINT (XC
DR
(tem));
if (found_size == size)
{
newlist = Fcons (XC
ONS
(tem)
->car
, newlist);
newlist = Fcons (XC
AR
(tem), newlist);
n_fonts++;
if (n_fonts >= maxnames)
break;
...
...
@@ -6078,14 +6078,14 @@ w32_list_fonts (FRAME_PTR f, Lisp_Object pattern, int size, int maxnames )
else if (found_size < size)
{
if (XINT (XC
ONS
(second_best)
->cdr
) > size
|| XINT (XC
ONS
(second_best)
->cdr
) < found_size)
if (XINT (XC
DR
(second_best)) > size
|| XINT (XC
DR
(second_best)) < found_size)
second_best = tem;
}
else
{
if (XINT (XC
ONS
(second_best)
->cdr
) > size
&& XINT (XC
ONS
(second_best)
->cdr
) >
if (XINT (XC
DR
(second_best)) > size
&& XINT (XC
DR
(second_best)) >
found_size)
second_best = tem;
}
...
...
@@ -6096,7 +6096,7 @@ w32_list_fonts (FRAME_PTR f, Lisp_Object pattern, int size, int maxnames )
break;
else if (!NILP (second_best))
{
newlist = Fcons (XC
ONS
(second_best)
->car
, Qnil);
newlist = Fcons (XC
AR
(second_best), Qnil);
break;
}
}
...
...
@@ -6150,9 +6150,9 @@ w32_list_synthesized_fonts (f, pattern, size, max_names)
matches = w32_list_fonts (f, build_string (new_pattn), size, max_names);
for ( ; CONSP (matches); matches = XC
ONS
(matches)
->cdr
)
for ( ; CONSP (matches); matches = XC
DR
(matches))
{
tem = XC
ONS
(matches)
->car
;
tem = XC
AR
(matches);
if (!STRINGP (tem))
continue;
...
...
@@ -6208,12 +6208,12 @@ w32_find_ccl_program (fontp)
{
Lisp_Object list, elt;
for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XC
ONS
(list)
->cdr
)
for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XC
DR
(list))
{
elt = XC
ONS
(list)
->car
;
elt = XC
AR
(list);
if (CONSP (elt)
&& STRINGP (XC
ONS
(elt)
->car
)
&& (fast_c_string_match_ignore_case (XC
ONS
(elt)
->car
, fontp->name)
&& STRINGP (XC
AR
(elt))
&& (fast_c_string_match_ignore_case (XC
AR
(elt), fontp->name)
>= 0))
break;
}
...
...
@@ -6222,7 +6222,7 @@ w32_find_ccl_program (fontp)
struct ccl_program *ccl
= (struct ccl_program *) xmalloc (sizeof (struct ccl_program));
if (setup_ccl_program (ccl, XC
ONS
(elt)
->cdr
) < 0)
if (setup_ccl_program (ccl, XC
DR
(elt)) < 0)
xfree (ccl);
else
fontp->font_encoder = ccl;
...
...
@@ -6297,7 +6297,7 @@ fonts to match. The first MAXIMUM fonts are reported.")
/* See if we cached the result for this particular query. */
list = Fassoc (pattern,
XC
ONS
(FRAME_W32_DISPLAY_INFO (f)->name_list_element)
->cdr
);
XC
DR
(FRAME_W32_DISPLAY_INFO (f)->name_list_element));
/* We have info in the cache for this PATTERN. */
if (!NILP (list))
...
...
@@ -6305,7 +6305,7 @@ fonts to match. The first MAXIMUM fonts are reported.")
Lisp_Object tem, newlist;
/* We have info about this pattern. */
list = XC
ONS
(list)
->cdr
;
list = XC
DR
(list);
if (size_ref == 0)
return list;
...
...
@@ -6314,16 +6314,16 @@ fonts to match. The first MAXIMUM fonts are reported.")
/* Filter the cached info and return just the fonts that match FACE. */
newlist = Qnil;
for (tem = list; CONSP (tem); tem = XC
ONS
(tem)
->cdr
)
for (tem = list; CONSP (tem); tem = XC
DR
(tem))
{
struct font_info *fontinf;
XFontStruct *thisinfo = NULL;
fontinf = w32_load_font (f, XSTRING (XC
ONS
(tem)
->car
)->data, 0);
fontinf = w32_load_font (f, XSTRING (XC
AR
(tem))->data, 0);
if (fontinf)
thisinfo = (XFontStruct *)fontinf->font;
if (thisinfo && same_size_fonts (thisinfo, size_ref))
newlist = Fcons (XC
ONS
(tem)
->car
, newlist);
newlist = Fcons (XC
AR
(tem), newlist);
w32_unload_font (FRAME_W32_DISPLAY_INFO (f), thisinfo);
}
...
...
@@ -6358,9 +6358,9 @@ fonts to match. The first MAXIMUM fonts are reported.")
/* Make a list of all the fonts we got back.
Store that in the font cache for the display. */
XC
ONS
(FRAME_W32_DISPLAY_INFO (f)->name_list_element)
->cdr
XC
DR
(FRAME_W32_DISPLAY_INFO (f)->name_list_element)
= Fcons (Fcons (pattern, namelist),
XC
ONS
(FRAME_W32_DISPLAY_INFO (f)->name_list_element)
->cdr
);
XC
DR
(FRAME_W32_DISPLAY_INFO (f)->name_list_element));
/* Make a list of the fonts that have the right width. */
list = Qnil;
...
...
@@ -6413,13 +6413,13 @@ will not be included in the list. DIR may be a list of directories.")
if (!CONSP (directory))
return w32_find_bdf_fonts_in_dir (directory);
for ( ; CONSP (directory); directory = XC
ONS
(directory)
->cdr
)
for ( ; CONSP (directory); directory = XC
DR
(directory))
{
Lisp_Object pair[2];
pair[0] = list;
pair[1] = Qnil;
GCPRO2 (directory, list);
pair[1] = w32_find_bdf_fonts_in_dir( XC
ONS
(directory)
->car
);
pair[1] = w32_find_bdf_fonts_in_dir( XC
AR
(directory) );
list = Fnconc( 2, pair );
UNGCPRO;
}
...
...
@@ -6439,9 +6439,9 @@ Lisp_Object w32_find_bdf_fonts_in_dir( Lisp_Object directory )
filelist = Fdirectory_files (directory, Qt,
build_string (".*\\.[bB][dD][fF]"), Qt);
for ( ; CONSP(filelist); filelist = XC
ONS
(filelist)
->cdr
)
for ( ; CONSP(filelist); filelist = XC
DR
(filelist))
{
Lisp_Object filename = XC
ONS
(filelist)
->car
;
Lisp_Object filename = XC
AR
(filelist);
if (w32_BDF_to_x_font (XSTRING (filename)->data, fontname, 100))
store_in_alist (&list, build_string (fontname), filename);
}
...
...
@@ -6803,10 +6803,10 @@ x_display_info_for_name (name)
for (dpyinfo = &one_w32_display_info, names = w32_display_name_list;
dpyinfo;
dpyinfo = dpyinfo->next, names = XC
ONS
(names)
->cdr
)
dpyinfo = dpyinfo->next, names = XC
DR
(names))
{
Lisp_Object tem;
tem = Fstring_equal (XC
ONS
(XC
ONS
(names)
->car)->car
, name);
tem = Fstring_equal (XC
AR
(XC
AR
(names)
)
, name);
if (!NILP (tem))
return dpyinfo;
}
...
...
@@ -6949,8 +6949,8 @@ DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0,
Lisp_Object tail, result;
result = Qnil;
for (tail = w32_display_name_list; ! NILP (tail); tail = XC
ONS
(tail)
->cdr
)
result = Fcons (XC
ONS
(XC
ONS
(tail)
->car)->car
, result);
for (tail = w32_display_name_list; ! NILP (tail); tail = XC
DR
(tail))
result = Fcons (XC
AR
(XC
AR
(tail)
)
, result);
return result;
}
...
...
src/w32menu.c
View file @
8e713be6
...
...
@@ -214,9 +214,9 @@ menubar_id_to_frame (HMENU menu)
Lisp_Object
tail
,
frame
;
FRAME_PTR
f
;
for
(
tail
=
Vframe_list
;
GC_CONSP
(
tail
);
tail
=
XC
ONS
(
tail
)
->
cdr
)
for
(
tail
=
Vframe_list
;
GC_CONSP
(
tail
);
tail
=
XC
DR
(
tail
))
{
frame
=
XC
ONS
(
tail
)
->
car
;
frame
=
XC
AR
(
tail
);
if
(
!
GC_FRAMEP
(
frame
))
continue
;
f
=
XFRAME
(
frame
);
...
...
@@ -416,14 +416,14 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)
notbuttons
=
menu_items_used
;
#endif
for
(
tail
=
keymap
;
CONSP
(
tail
);
tail
=
XC
ONS
(
tail
)
->
cdr
)
for
(
tail
=
keymap
;
CONSP
(
tail
);
tail
=
XC
DR
(
tail
))
{
GCPRO2
(
keymap
,
pending_maps
);
/* Look at each key binding, and if it is a menu item add it
to this menu. */
item
=
XC
ONS
(
tail
)
->
car
;
item
=
XC
AR
(
tail
);
if
(
CONSP
(
item
))
single_menu_item
(
XC
ONS
(
item
)
->
car
,
XC
ONS
(
item
)
->
cdr
,
single_menu_item
(
XC
AR
(
item
),
XC
DR
(
item
),
&
pending_maps
,
notreal
,
maxdepth
,
&
notbuttons
);
else
if
(
VECTORP
(
item
))
{
...
...
@@ -446,12 +446,12 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)
{
Lisp_Object
elt
,
eltcdr
,
string
;
elt
=
Fcar
(
pending_maps
);
eltcdr
=
XC
ONS
(
elt
)
->
cdr
;
string
=
XC
ONS
(
eltcdr
)
->
car
;
eltcdr
=
XC
DR
(
elt
);
string
=
XC
AR
(
eltcdr
);
/* We no longer discard the @ from the beginning of the string here.
Instead, we do this in w32_menu_show. */
single_keymap_panes
(
Fcar
(
elt
),
string
,
XC
ONS
(
eltcdr
)
->
cdr
,
notreal
,
maxdepth
-
1
);
XC
DR
(
eltcdr
),
notreal
,
maxdepth
-
1
);
pending_maps
=
Fcdr
(
pending_maps
);
}
}
...
...
@@ -702,7 +702,7 @@ cached information about equivalent key sequences.")
/* Decode the first argument: find the window and the coordinates. */
if
(
EQ
(
position
,
Qt
)
||
(
CONSP
(
position
)
&&
EQ
(
XC
ONS
(
position
)
->
car
,
Qmenu_bar
)))
||
(
CONSP
(
position
)
&&
EQ
(
XC
AR
(
position
),
Qmenu_bar
)))
{
/* Use the mouse's current position. */
FRAME_PTR
new_f
=
selected_frame
;
...
...
@@ -900,7 +900,7 @@ on the left of the dialog box and all following items on the right.\n\
/* Decode the first argument: find the window or frame to use. */
if
(
EQ
(
position
,
Qt
)
||
(
CONSP
(
position
)
&&
EQ
(
XC
ONS
(
position
)
->
car
,
Qmenu_bar
)))
||
(
CONSP
(
position
)
&&
EQ
(
XC
AR
(
position
),
Qmenu_bar
)))
{
#if 0 /* Using the frame the mouse is on may not be right. */
/* Use the mouse's current position. */
...
...
src/w32proc.c
View file @
8e713be6
...
...
@@ -2068,11 +2068,11 @@ If successful, the new layout id is returned, otherwise nil.")
DWORD
kl
;
CHECK_CONS
(
layout
,
0
);
CHECK_NUMBER
(
XC
ONS
(
layout
)
->
car
,
0
);
CHECK_NUMBER
(
XC
ONS
(
layout
)
->
cdr
,
0
);
CHECK_NUMBER
(
XC
AR
(
layout
),
0
);
CHECK_NUMBER
(
XC
DR
(
layout
),
0
);
kl
=
(
XINT
(
XC
ONS
(
layout
)
->
car
)
&
0xffff
)
|
(
XINT
(
XC
ONS
(
layout
)
->
cdr
)
<<
16
);
kl
=
(
XINT
(
XC
AR
(
layout
))
&
0xffff
)
|
(
XINT
(
XC
DR
(
layout
))
<<
16
);
/* Synchronize layout with input thread. */
if
(
dwWindowsThreadId
)
...
...
src/w32term.c
View file @
8e713be6
...
...
@@ -2588,11 +2588,11 @@ x_window_to_scroll_bar (window_id)
for
(
tail
=
Vframe_list
;
XGCTYPE
(
tail
)
==
Lisp_Cons
;
tail
=
XC
ONS
(
tail
)
->
cdr
)
tail
=
XC
DR
(
tail
))
{
Lisp_Object
frame
,
bar
,
condemned
;
frame
=
XC
ONS
(
tail
)
->
car
;
frame
=
XC
AR
(
tail
);
/* All elements of Vframe_list should be frames. */
if
(
!
GC_FRAMEP
(
frame
))
abort
();
...
...
@@ -3473,7 +3473,7 @@ w32_read_socket (sd, bufp, numchars, expected)
numchars
--
;
}
else
if
(
!
NILP
(
Vframe_list
)
&&
!
NILP
(
XC
ONS
(
Vframe_list
)
->
cdr
))
&&
!
NILP
(
XC
DR
(
Vframe_list
)))
/* Force a redisplay sooner or later to update the
frame titles in case this is the second frame. */
record_asynch_buffer_change
();
...
...
@@ -4981,7 +4981,7 @@ w32_term_init (display_name, xrm_option, resource_name)
/* Put it on w32_display_name_list as well, to keep them parallel. */
w32_display_name_list
=
Fcons
(
Fcons
(
display_name
,
Qnil
),
w32_display_name_list
);
dpyinfo
->
name_list_element
=
XC
ONS
(
w32_display_name_list
)
->
car
;
dpyinfo
->
name_list_element
=
XC
AR
(
w32_display_name_list
);
dpyinfo
->
w32_id_name
=
(
char
*
)
xmalloc
(
XSTRING
(
Vinvocation_name
)
->
size
...
...
@@ -5071,22 +5071,22 @@ x_delete_display (dpyinfo)
/* Discard this display from w32_display_name_list and w32_display_list.
We can't use Fdelq because that can quit. */
if
(
!
NILP
(
w32_display_name_list
)
&&
EQ
(
XC
ONS
(
w32_display_name_list
)
->
car
,
dpyinfo
->
name_list_element
))
w32_display_name_list
=
XC
ONS
(
w32_display_name_list
)
->
cdr
;
&&
EQ
(
XC
AR
(
w32_display_name_list
),
dpyinfo
->
name_list_element
))
w32_display_name_list
=
XC
DR
(
w32_display_name_list
);
else
{