#include <signal.h>
#include <math.h>
#include <setjmp.h>
+#include <c-strcase.h>
#include "lisp.h"
#include "blockinput.h"
#include "nsterm.h"
#include "window.h"
+#include "character.h"
#include "buffer.h"
#include "keyboard.h"
#include "termhooks.h"
#include "fontset.h"
-#include "character.h"
#include "font.h"
#if 0
static Lisp_Object as_script, *as_result;
static int as_status;
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
static ptrdiff_t image_cache_refcount;
#endif
else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
return;
- f->icon_name = arg;
+ FSET (f, icon_name, arg);
if (NILP (arg))
{
- if (!NILP (f->title))
- arg = 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 = f->name;
+ arg = FGET (f, name);
else
{
/* no explicit name and no icon-name ->
if ([[view window] miniwindowTitle] &&
([[[view window] miniwindowTitle]
isEqualToString: [NSString stringWithUTF8String:
- SDATA (arg)]]))
+ SSDATA (arg)]]))
return;
[[view window] setMiniwindowTitle:
- [NSString stringWithUTF8String: SDATA (arg)]];
+ [NSString stringWithUTF8String: SSDATA (arg)]];
}
static void
encoded_name = ENCODE_UTF_8 (name);
UNGCPRO;
- str = [NSString stringWithUTF8String: SDATA (encoded_name)];
+ str = [NSString stringWithUTF8String: SSDATA (encoded_name)];
/* Don't change the name if it's already NAME. */
if (! [[[view window] title] isEqualToString: str])
[[view window] setTitle: str];
- if (!STRINGP (f->icon_name))
+ if (!STRINGP (FGET (f, icon_name)))
encoded_icon_name = encoded_name;
else
- encoded_icon_name = ENCODE_UTF_8 (f->icon_name);
+ encoded_icon_name = ENCODE_UTF_8 (FGET (f, icon_name));
- str = [NSString stringWithUTF8String: SDATA (encoded_icon_name)];
+ str = [NSString stringWithUTF8String: SSDATA (encoded_icon_name)];
if ([[view window] miniwindowTitle] &&
! [[[view window] miniwindowTitle] isEqualToString: str])
static void
ns_set_name (struct frame *f, Lisp_Object name, int explicit)
{
- NSView *view;
NSTRACE (ns_set_name);
if (ns_in_resize)
CHECK_STRING (name);
/* Don't change the name if it's already NAME. */
- if (! NILP (Fstring_equal (name, f->name)))
+ if (! NILP (Fstring_equal (name, FGET (f, name))))
return;
- f->name = name;
+ FSET (f, name, name);
/* title overrides explicit name */
- if (! NILP (f->title))
- name = 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, f->title))
+ if (EQ (name, FGET (f, title)))
return;
update_mode_lines = 1;
- f->title = name;
+ FSET (f, title, name);
if (NILP (name))
- name = f->name;
+ name = FGET (f, name);
else
CHECK_STRING (name);
{
NSView *view;
Lisp_Object name, filename;
- Lisp_Object buf = XWINDOW (f->selected_window)->buffer;
+ Lisp_Object buf = WGET (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 (f->title) || ns_in_resize)
+ if (f->explicit_name || ! NILP (FGET (f, title)) || ns_in_resize)
return;
BLOCK_INPUT;
title = FRAME_ICONIFIED_P (f) ? [[[view window] miniwindowTitle] UTF8String]
: [[[view window] title] UTF8String];
- if (title && (! strcmp (title, SDATA (encoded_name))))
+ if (title && (! strcmp (title, SSDATA (encoded_name))))
{
[pool release];
UNBLOCK_INPUT;
return;
}
- str = [NSString stringWithUTF8String: SDATA (encoded_name)];
+ str = [NSString stringWithUTF8String: SSDATA (encoded_name)];
if (str == nil) str = @"Bad coding";
if (FRAME_ICONIFIED_P (f))
encoded_filename = ENCODE_UTF_8 (filename);
UNGCPRO;
- fstr = [NSString stringWithUTF8String: SDATA (encoded_filename)];
+ fstr = [NSString stringWithUTF8String: SSDATA (encoded_filename)];
if (fstr == nil) fstr = @"";
#ifdef NS_IMPL_COCOA
/* work around a bug observed on 10.3 and later where
[[view window] setRepresentedFilename: fstr];
[[view window] setTitle: str];
- f->name = name;
+ FSET (f, name, name);
}
[pool release];
{
NSView *view = FRAME_NS_VIEW (f);
NSAutoreleasePool *pool;
- if (!MINI_WINDOW_P (XWINDOW (f->selected_window)))
+ if (!MINI_WINDOW_P (XWINDOW (FGET (f, selected_window))))
{
BLOCK_INPUT;
pool = [[NSAutoreleasePool alloc] init];
x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{
int nlines;
- int olines = FRAME_MENU_BAR_LINES (f);
if (FRAME_MINIBUF_ONLY_P (f))
return;
x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{
int nlines;
- Lisp_Object root_window;
if (FRAME_MINIBUF_ONLY_P (f))
return;
BLOCK_INPUT;
pool = [[NSAutoreleasePool alloc] init];
if (f->output_data.ns->miniimage
- && [[NSString stringWithUTF8String: SDATA (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, 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) && SDATA (f->name)[0] == '/')
+ if (SYMBOLP (elt) && EQ (elt, Qt) && SSDATA (FGET (f, name))[0] == '/')
{
NSString *str
- = [NSString stringWithUTF8String: SDATA (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), f->name) >= 0)
+ fast_string_match (XCAR (elt), FGET (f, name)) >= 0)
{
image = [EmacsImage allocInitFromFile: XCDR (elt)];
if (image == nil)
image = [[NSImage imageNamed:
[NSString stringWithUTF8String:
- SDATA (XCDR (elt))]] retain];
+ SSDATA (XCDR (elt))]] retain];
}
}
if (!NILP (arg) && SYMBOLP (arg))
{
- arg =build_string (SDATA (SYMBOL_NAME (arg)));
+ arg =build_string (SSDATA (SYMBOL_NAME (arg)));
store_frame_param (f, Qicon_type, arg);
}
image = [EmacsImage allocInitFromFile: arg];
if (image == nil)
image =[NSImage imageNamed: [NSString stringWithUTF8String:
- SDATA (arg)]];
+ SSDATA (arg)]];
if (image == nil)
{
{
char *str;
if (XTYPE (arg) == Lisp_String)
- str = SDATA (arg);
+ str = SSDATA (arg);
else if (XTYPE (arg) == Lisp_Symbol)
- str = SDATA (SYMBOL_NAME (arg));
+ str = SSDATA (SYMBOL_NAME (arg));
else return -1;
if (!strcmp (str, "box")) return FILLED_BOX_CURSOR;
if (!strcmp (str, "hollow")) return HOLLOW_BOX_CURSOR;
/* If frame is ``official'', nothing to do. */
if (NILP (Fmemq (frame, Vframe_list)))
{
-#if GLYPH_DEBUG && XASSERTS
+#if defined GLYPH_DEBUG && defined ENABLE_CHECKING
struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
#endif
x_free_frame_resources (f);
free_glyphs (f);
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
/* Check that reference counts are indeed correct. */
- xassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
+ eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
#endif
return Qt;
}
f->terminal = dpyinfo->terminal;
f->output_method = output_ns;
- f->output_data.ns = (struct ns_output *)xmalloc (sizeof *(f->output_data.ns));
- memset (f->output_data.ns, 0, sizeof *(f->output_data.ns));
+ f->output_data.ns = xzalloc (sizeof *f->output_data.ns);
FRAME_FONTSET (f) = -1;
- f->icon_name = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title",
- RES_TYPE_STRING);
- if (! STRINGP (f->icon_name))
- 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))
{
- f->name = build_string ([ns_app_name UTF8String]);
+ FSET (f, name, build_string ([ns_app_name UTF8String]));
f->explicit_name = 0;
}
else
{
- f->name = name;
+ FSET (f, name, name);
f->explicit_name = 1;
specbind (Qx_resource_name, name);
}
x_default_parameter (f, parms, Qright_fringe, Qnil,
"rightFringe", "RightFringe", RES_TYPE_NUMBER);
-#if GLYPH_DEBUG
+#ifdef GLYPH_DEBUG
image_cache_refcount =
FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0;
#endif
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))))
- f->param_alist = Fcons (XCAR (tem), f->param_alist);
+ FSET (f, param_alist, Fcons (XCAR (tem), FGET (f, param_alist)));
UNGCPRO;
Lisp_Object fname;
NSString *promptS = NILP (prompt) || !STRINGP (prompt) ? nil :
- [NSString stringWithUTF8String: SDATA (prompt)];
+ [NSString stringWithUTF8String: SSDATA (prompt)];
NSString *dirS = NILP (dir) || !STRINGP (dir) ?
- [NSString stringWithUTF8String: SDATA (BVAR (current_buffer, directory))] :
- [NSString stringWithUTF8String: SDATA (dir)];
+ [NSString stringWithUTF8String: SSDATA (BVAR (current_buffer, directory))] :
+ [NSString stringWithUTF8String: SSDATA (dir)];
NSString *initS = NILP (init) || !STRINGP (init) ? nil :
- [NSString stringWithUTF8String: SDATA (init)];
+ [NSString stringWithUTF8String: SSDATA (init)];
check_ns ();
if (NILP (owner))
owner = build_string([ns_app_name UTF8String]);
CHECK_STRING (name);
-/*fprintf (stderr, "ns-get-resource checking resource '%s'\n", SDATA (name)); */
+/*fprintf (stderr, "ns-get-resource checking resource '%s'\n", SSDATA (name)); */
- value = ns_get_defaults_value (SDATA (name));
+ value = ns_get_defaults_value (SSDATA (name));
if (value)
return build_string (value);
if (NILP (value))
{
[[NSUserDefaults standardUserDefaults] removeObjectForKey:
- [NSString stringWithUTF8String: SDATA (name)]];
+ [NSString stringWithUTF8String: SSDATA (name)]];
}
else
{
CHECK_STRING (value);
[[NSUserDefaults standardUserDefaults] setObject:
- [NSString stringWithUTF8String: SDATA (value)]
+ [NSString stringWithUTF8String: SSDATA (value)]
forKey: [NSString stringWithUTF8String:
- SDATA (name)]];
+ SSDATA (name)]];
}
return Qnil;
{
if (!NILP (must_succeed))
fatal ("OpenStep on %s not responding.\n",
- SDATA (display));
+ SSDATA (display));
else
error ("OpenStep on %s not responding.\n",
- SDATA (display));
+ SSDATA (display));
}
/* Register our external input/output types, used for determining
{
char *nm;
CHECK_STRING (name);
- nm = SDATA (name);
+ nm = SSDATA (name);
if (nm[0] != '-')
return name;
if (strstr (nm, "fontset") && !strstr (nm, "fontset-startup"))
return name;
- return build_string (ns_xlfd_to_fontname (SDATA (name)));
+ return build_string (ns_xlfd_to_fontname (SSDATA (name)));
}
BLOCK_INPUT;
colorlists = [[NSColorList availableColorLists] objectEnumerator];
- while (clist = [colorlists nextObject])
+ while ((clist = [colorlists nextObject]))
{
if ([[clist name] length] < 7 ||
[[clist name] rangeOfString: @"PANTONE"].location == 0)
{
NSEnumerator *cnames = [[clist allKeys] reverseObjectEnumerator];
NSString *cname;
- while (cname = [cnames nextObject])
+ while ((cname = [cnames nextObject]))
list = Fcons (build_string ([cname UTF8String]), list);
/* for (i = [[clist allKeys] count] - 1; i >= 0; i--)
list = Fcons (build_string ([[[clist allKeys] objectAtIndex: i]
id pb;
NSString *svcName;
char *utfStr;
- int len;
CHECK_STRING (service);
check_ns ();
- utfStr = SDATA (service);
+ utfStr = SSDATA (service);
svcName = [NSString stringWithUTF8String: utfStr];
pb =[NSPasteboard pasteboardWithUniqueName];
NSString *utfStr;
CHECK_STRING (str);
- utfStr = [NSString stringWithUTF8String: SDATA (str)];
+ utfStr = [NSString stringWithUTF8String: SSDATA (str)];
if (![utfStr respondsToSelector:
@selector (precomposedStringWithCanonicalMapping)])
{
NSAppleScript* scriptObject =
[[NSAppleScript alloc] initWithSource:
- [NSString stringWithUTF8String: SDATA (script)]];
+ [NSString stringWithUTF8String: SSDATA (script)]];
returnDescriptor = [scriptObject executeAndReturnError: &errorDict];
[scriptObject release];
else if (!STRINGP (result))
error ("AppleScript error %d", status);
else
- error ("%s", SDATA (result));
+ error ("%s", SSDATA (result));
}
#endif
res = ns_get_defaults_value (toCheck);
return !res ? NULL :
- (!strncasecmp (res, "YES", 3) ? "true" :
- (!strncasecmp (res, "NO", 2) ? "false" : res));
+ (!c_strncasecmp (res, "YES", 3) ? "true" :
+ (!c_strncasecmp (res, "NO", 2) ? "false" : res));
}
that stands for the selected frame's display. */)
(Lisp_Object display)
{
- int top;
NSScreen *screen;
NSRect vScreen;
GCPRO4 (string, parms, frame, timeout);
CHECK_STRING (string);
- str = SDATA (string);
+ str = SSDATA (string);
f = check_x_frame (frame);
if (NILP (timeout))
timeout = make_number (5);
void
syms_of_nsfns (void)
{
- int i;
-
Qfontsize = intern_c_string ("fontsize");
staticpro (&Qfontsize);
HCoop / bpt / emacs.git / blobdiff