else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
return;
- FVAR (f, icon_name) = arg;
+ FSET (f, icon_name, arg);
if (NILP (arg))
{
- if (!NILP (FVAR (f, title)))
- arg = FVAR (f, title);
+ if (!NILP (FGET (f, title)))
+ arg = FGET (f, title);
else
/* explicit name and no icon-name -> explicit_name */
if (f->explicit_name)
- arg = FVAR (f, name);
+ arg = FGET (f, name);
else
{
/* no explicit name and no icon-name ->
if (! [[[view window] title] isEqualToString: str])
[[view window] setTitle: str];
- if (!STRINGP (FVAR (f, icon_name)))
+ if (!STRINGP (FGET (f, icon_name)))
encoded_icon_name = encoded_name;
else
- encoded_icon_name = ENCODE_UTF_8 (FVAR (f, icon_name));
+ encoded_icon_name = ENCODE_UTF_8 (FGET (f, icon_name));
str = [NSString stringWithUTF8String: SSDATA (encoded_icon_name)];
CHECK_STRING (name);
/* Don't change the name if it's already NAME. */
- if (! NILP (Fstring_equal (name, FVAR (f, name))))
+ if (! NILP (Fstring_equal (name, FGET (f, name))))
return;
- FVAR (f, name) = name;
+ FSET (f, name, name);
/* title overrides explicit name */
- if (! NILP (FVAR (f, title)))
- name = FVAR (f, title);
+ if (! NILP (FGET (f, title)))
+ name = FGET (f, title);
ns_set_name_internal (f, name);
}
{
NSTRACE (x_set_title);
/* Don't change the title if it's already NAME. */
- if (EQ (name, FVAR (f, title)))
+ if (EQ (name, FGET (f, title)))
return;
update_mode_lines = 1;
- FVAR (f, title) = name;
+ FSET (f, title, name);
if (NILP (name))
- name = FVAR (f, name);
+ name = FGET (f, name);
else
CHECK_STRING (name);
{
NSView *view;
Lisp_Object name, filename;
- Lisp_Object buf = WVAR (XWINDOW (FVAR (f, selected_window)), buffer);
+ Lisp_Object buf = WVAR (XWINDOW (FGET (f, selected_window)), buffer);
const char *title;
NSAutoreleasePool *pool;
struct gcpro gcpro1;
NSString *str;
NSTRACE (ns_set_name_as_filename);
- if (f->explicit_name || ! NILP (FVAR (f, title)) || ns_in_resize)
+ if (f->explicit_name || ! NILP (FGET (f, title)) || ns_in_resize)
return;
BLOCK_INPUT;
[[view window] setRepresentedFilename: fstr];
[[view window] setTitle: str];
- FVAR (f, name) = name;
+ FSET (f, name, name);
}
[pool release];
{
NSView *view = FRAME_NS_VIEW (f);
NSAutoreleasePool *pool;
- if (!MINI_WINDOW_P (XWINDOW (FVAR (f, selected_window))))
+ if (!MINI_WINDOW_P (XWINDOW (FGET (f, selected_window))))
{
BLOCK_INPUT;
pool = [[NSAutoreleasePool alloc] init];
BLOCK_INPUT;
pool = [[NSAutoreleasePool alloc] init];
if (f->output_data.ns->miniimage
- && [[NSString stringWithUTF8String: SSDATA (FVAR (f, name))]
+ && [[NSString stringWithUTF8String: SSDATA (FGET (f, name))]
isEqualToString: [(NSImage *)f->output_data.ns->miniimage name]])
{
[pool release];
return;
}
- tem = assq_no_quit (Qicon_type, FVAR (f, param_alist));
+ tem = assq_no_quit (Qicon_type, FGET (f, param_alist));
if (CONSP (tem) && ! NILP (XCDR (tem)))
{
[pool release];
{
elt = XCAR (chain);
/* special case: 't' means go by file type */
- if (SYMBOLP (elt) && EQ (elt, Qt) && SSDATA (FVAR (f, name))[0] == '/')
+ if (SYMBOLP (elt) && EQ (elt, Qt) && SSDATA (FGET (f, name))[0] == '/')
{
NSString *str
- = [NSString stringWithUTF8String: SSDATA (FVAR (f, name))];
+ = [NSString stringWithUTF8String: SSDATA (FGET (f, name))];
if ([[NSFileManager defaultManager] fileExistsAtPath: str])
image = [[[NSWorkspace sharedWorkspace] iconForFile: str] retain];
}
else if (CONSP (elt) &&
STRINGP (XCAR (elt)) &&
STRINGP (XCDR (elt)) &&
- fast_string_match (XCAR (elt), FVAR (f, name)) >= 0)
+ fast_string_match (XCAR (elt), FGET (f, name)) >= 0)
{
image = [EmacsImage allocInitFromFile: XCDR (elt)];
if (image == nil)
FRAME_FONTSET (f) = -1;
- FVAR (f, icon_name) = x_get_arg (dpyinfo, parms, Qicon_name,
- "iconName", "Title",
- RES_TYPE_STRING);
- if (! STRINGP (FVAR (f, icon_name)))
- FVAR (f, icon_name) = Qnil;
+ FSET (f, icon_name, x_get_arg (dpyinfo, parms, Qicon_name,
+ "iconName", "Title",
+ RES_TYPE_STRING));
+ if (! STRINGP (FGET (f, icon_name)))
+ FSET (f, icon_name, Qnil);
FRAME_NS_DISPLAY_INFO (f) = dpyinfo;
be set. */
if (EQ (name, Qunbound) || NILP (name) || ! STRINGP (name))
{
- FVAR (f, name) = build_string ([ns_app_name UTF8String]);
+ FSET (f, name, build_string ([ns_app_name UTF8String]));
f->explicit_name = 0;
}
else
{
- FVAR (f, name) = name;
+ FSET (f, name, name);
f->explicit_name = 1;
specbind (Qx_resource_name, name);
}
by x_get_arg and friends, now go in the misc. alist of the frame. */
for (tem = parms; CONSP (tem); tem = XCDR (tem))
if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
- FVAR (f, param_alist) = Fcons (XCAR (tem), FVAR (f, param_alist));
+ FSET (f, param_alist, Fcons (XCAR (tem), FGET (f, param_alist)));
UNGCPRO;