[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macfns.c
|
From: |
Ken Raeburn |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/macfns.c |
|
Date: |
Sun, 14 Jul 2002 20:00:53 -0400 |
Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.7 emacs/src/macfns.c:1.8
*** emacs/src/macfns.c:1.7 Thu Jul 11 10:13:09 2002
--- emacs/src/macfns.c Sun Jul 14 20:00:36 2002
***************
*** 534,540 ****
{
if (dpyinfo->bitmaps[id].refcount
&& dpyinfo->bitmaps[id].file
! && !strcmp (dpyinfo->bitmaps[id].file, (char *) XSTRING (file)->data))
{
++dpyinfo->bitmaps[id].refcount;
return id + 1;
--- 534,540 ----
{
if (dpyinfo->bitmaps[id].refcount
&& dpyinfo->bitmaps[id].file
! && !strcmp (dpyinfo->bitmaps[id].file, (char *) SDATA (file)))
{
++dpyinfo->bitmaps[id].refcount;
return id + 1;
***************
*** 550,556 ****
return -1;
emacs_close (fd);
! filename = (char *) XSTRING (found)->data;
hinst = LoadLibraryEx (filename, NULL, LOAD_LIBRARY_AS_DATAFILE);
--- 550,556 ----
return -1;
emacs_close (fd);
! filename = (char *) SDATA (found);
hinst = LoadLibraryEx (filename, NULL, LOAD_LIBRARY_AS_DATAFILE);
***************
*** 566,576 ****
id = x_allocate_bitmap_record (f);
dpyinfo->bitmaps[id - 1].pixmap = bitmap;
dpyinfo->bitmaps[id - 1].refcount = 1;
! dpyinfo->bitmaps[id - 1].file = (char *) xmalloc (XSTRING (file)->size + 1);
dpyinfo->bitmaps[id - 1].depth = 1;
dpyinfo->bitmaps[id - 1].height = height;
dpyinfo->bitmaps[id - 1].width = width;
! strcpy (dpyinfo->bitmaps[id - 1].file, XSTRING (file)->data);
return id;
#endif /* MAC_TODO */
--- 566,576 ----
id = x_allocate_bitmap_record (f);
dpyinfo->bitmaps[id - 1].pixmap = bitmap;
dpyinfo->bitmaps[id - 1].refcount = 1;
! dpyinfo->bitmaps[id - 1].file = (char *) xmalloc (SCHARS (file) + 1);
dpyinfo->bitmaps[id - 1].depth = 1;
dpyinfo->bitmaps[id - 1].height = height;
dpyinfo->bitmaps[id - 1].width = width;
! strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file));
return id;
#endif /* MAC_TODO */
***************
*** 2067,2075 ****
CHECK_STRING (arg);
! if (strcmp (XSTRING (arg)->data, "black") == 0)
return BLACK_PIX_DEFAULT (f);
! else if (strcmp (XSTRING (arg)->data, "white") == 0)
return WHITE_PIX_DEFAULT (f);
#if 0
--- 2067,2075 ----
CHECK_STRING (arg);
! if (strcmp (SDATA (arg), "black") == 0)
return BLACK_PIX_DEFAULT (f);
! else if (strcmp (SDATA (arg), "white") == 0)
return WHITE_PIX_DEFAULT (f);
#if 0
***************
*** 2078,2084 ****
return def;
#endif
! if (mac_defined_color (f, XSTRING (arg)->data, &cdef, 1))
return cdef.pixel;
/* defined_color failed; return an ultimate default. */
--- 2078,2084 ----
return def;
#endif
! if (mac_defined_color (f, SDATA (arg), &cdef, 1))
return cdef.pixel;
/* defined_color failed; return an ultimate default. */
***************
*** 2509,2519 ****
BLOCK_INPUT;
result = x_text_icon (f,
! (char *) XSTRING ((!NILP (f->icon_name)
! ? f->icon_name
! : !NILP (f->title)
! ? f->title
! : f->name))->data);
if (result)
{
--- 2509,2519 ----
BLOCK_INPUT;
result = x_text_icon (f,
! (char *) SDATA ((!NILP (f->icon_name)
! ? f->icon_name
! : !NILP (f->title)
! ? f->title
! : f->name)));
if (result)
{
***************
*** 2555,2566 ****
BLOCK_INPUT;
result = (STRINGP (fontset_name)
! ? x_new_fontset (f, XSTRING (fontset_name)->data)
! : x_new_font (f, XSTRING (arg)->data));
UNBLOCK_INPUT;
if (EQ (result, Qnil))
! error ("Font `%s' is not defined", XSTRING (arg)->data);
else if (EQ (result, Qt))
error ("The characters of the given font have varying widths");
else if (STRINGP (result))
--- 2555,2566 ----
BLOCK_INPUT;
result = (STRINGP (fontset_name)
! ? x_new_fontset (f, SDATA (fontset_name))
! : x_new_font (f, SDATA (arg)));
UNBLOCK_INPUT;
if (EQ (result, Qnil))
! error ("Font `%s' is not defined", SDATA (arg));
else if (EQ (result, Qt))
error ("The characters of the given font have varying widths");
else if (STRINGP (result))
***************
*** 2836,2842 ****
/* Check for no change needed in this very common case
before we do any consing. */
if (!strcmp (FRAME_MAC_DISPLAY_INFO (f)->mac_id_name,
! XSTRING (f->name)->data))
return;
name = build_string (FRAME_MAC_DISPLAY_INFO (f)->mac_id_name);
}
--- 2836,2842 ----
/* Check for no change needed in this very common case
before we do any consing. */
if (!strcmp (FRAME_MAC_DISPLAY_INFO (f)->mac_id_name,
! SDATA (f->name)))
return;
name = build_string (FRAME_MAC_DISPLAY_INFO (f)->mac_id_name);
}
***************
*** 2867,2875 ****
{
Str255 windowTitle;
! if (strlen (XSTRING (name)->data) < 255)
{
! strcpy (windowTitle, XSTRING (name)->data);
c2pstr (windowTitle);
SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
}
--- 2867,2875 ----
{
Str255 windowTitle;
! if (strlen (SDATA (name)) < 255)
{
! strcpy (windowTitle, SDATA (name));
c2pstr (windowTitle);
SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
}
***************
*** 2941,2949 ****
{
Str255 windowTitle;
! if (strlen (XSTRING (name)->data) < 255)
{
! strcpy (windowTitle, XSTRING (name)->data);
c2pstr (windowTitle);
SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
}
--- 2941,2949 ----
{
Str255 windowTitle;
! if (strlen (SDATA (name)) < 255)
{
! strcpy (windowTitle, SDATA (name));
c2pstr (windowTitle);
SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
}
***************
*** 3067,3076 ****
if (STRINGP (Vx_resource_name))
{
! unsigned char *p = XSTRING (Vx_resource_name)->data;
int i;
! len = STRING_BYTES (XSTRING (Vx_resource_name));
/* Only letters, digits, - and _ are valid in resource names.
Count the valid characters and count the invalid ones. */
--- 3067,3076 ----
if (STRINGP (Vx_resource_name))
{
! unsigned char *p = SDATA (Vx_resource_name);
int i;
! len = SBYTES (Vx_resource_name);
/* Only letters, digits, - and _ are valid in resource names.
Count the valid characters and count the invalid ones. */
***************
*** 3109,3120 ****
for (i = 0; i < len; i++)
{
! int c = XSTRING (new)->data[i];
if (! ((c >= 'a' && c <= 'z')
|| (c >= 'A' && c <= 'Z')
|| (c >= '0' && c <= '9')
|| c == '-' || c == '_'))
! XSTRING (new)->data[i] = '_';
}
}
--- 3109,3120 ----
for (i = 0; i < len; i++)
{
! int c = SREF (new, i);
if (! ((c >= 'a' && c <= 'z')
|| (c >= 'A' && c <= 'Z')
|| (c >= '0' && c <= '9')
|| c == '-' || c == '_'))
! SREF (new, i) = '_';
}
}
***************
*** 3153,3189 ****
/* Allocate space for the components, the dots which separate them,
and the final '\0'. Make them big enough for the worst case. */
! name_key = (char *) alloca (STRING_BYTES (XSTRING (Vx_resource_name))
+ (STRINGP (component)
! ? STRING_BYTES (XSTRING (component)) : 0)
! + STRING_BYTES (XSTRING (attribute))
+ 3);
class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1)
! + STRING_BYTES (XSTRING (class))
+ (STRINGP (subclass)
! ? STRING_BYTES (XSTRING (subclass)) : 0)
+ 3);
/* Start with emacs.FRAMENAME for the name (the specific one)
and with `Emacs' for the class key (the general one). */
! strcpy (name_key, XSTRING (Vx_resource_name)->data);
strcpy (class_key, EMACS_CLASS);
strcat (class_key, ".");
! strcat (class_key, XSTRING (class)->data);
if (!NILP (component))
{
strcat (class_key, ".");
! strcat (class_key, XSTRING (subclass)->data);
strcat (name_key, ".");
! strcat (name_key, XSTRING (component)->data);
}
strcat (name_key, ".");
! strcat (name_key, XSTRING (attribute)->data);
value = x_get_string_resource (Qnil,
name_key, class_key);
--- 3153,3189 ----
/* Allocate space for the components, the dots which separate them,
and the final '\0'. Make them big enough for the worst case. */
! name_key = (char *) alloca (SBYTES (Vx_resource_name)
+ (STRINGP (component)
! ? SBYTES (component) : 0)
! + SBYTES (attribute)
+ 3);
class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1)
! + SBYTES (class)
+ (STRINGP (subclass)
! ? SBYTES (subclass) : 0)
+ 3);
/* Start with emacs.FRAMENAME for the name (the specific one)
and with `Emacs' for the class key (the general one). */
! strcpy (name_key, SDATA (Vx_resource_name));
strcpy (class_key, EMACS_CLASS);
strcat (class_key, ".");
! strcat (class_key, SDATA (class));
if (!NILP (component))
{
strcat (class_key, ".");
! strcat (class_key, SDATA (subclass));
strcat (name_key, ".");
! strcat (name_key, SDATA (component));
}
strcat (name_key, ".");
! strcat (name_key, SDATA (attribute));
value = x_get_string_resource (Qnil,
name_key, class_key);
***************
*** 3206,3218 ****
/* Allocate space for the components, the dots which separate them,
and the final '\0'. */
! name_key = (char *) alloca (STRING_BYTES (XSTRING (Vinvocation_name))
+ strlen (attribute) + 2);
class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1)
+ strlen (class) + 2);
sprintf (name_key, "%s.%s",
! XSTRING (Vinvocation_name)->data,
attribute);
sprintf (class_key, "%s.%s", EMACS_CLASS, class);
--- 3206,3218 ----
/* Allocate space for the components, the dots which separate them,
and the final '\0'. */
! name_key = (char *) alloca (SBYTES (Vinvocation_name)
+ strlen (attribute) + 2);
class_key = (char *) alloca ((sizeof (EMACS_CLASS) - 1)
+ strlen (class) + 2);
sprintf (name_key, "%s.%s",
! SDATA (Vinvocation_name),
attribute);
sprintf (class_key, "%s.%s", EMACS_CLASS, class);
***************
*** 3269,3283 ****
switch (type)
{
case RES_TYPE_NUMBER:
! return make_number (atoi (XSTRING (tem)->data));
case RES_TYPE_FLOAT:
! return make_float (atof (XSTRING (tem)->data));
case RES_TYPE_BOOLEAN:
tem = Fdowncase (tem);
! if (!strcmp (XSTRING (tem)->data, "on")
! || !strcmp (XSTRING (tem)->data, "true"))
return Qt;
else
return Qnil;
--- 3269,3283 ----
switch (type)
{
case RES_TYPE_NUMBER:
! return make_number (atoi (SDATA (tem)));
case RES_TYPE_FLOAT:
! return make_float (atof (SDATA (tem)));
case RES_TYPE_BOOLEAN:
tem = Fdowncase (tem);
! if (!strcmp (SDATA (tem), "on")
! || !strcmp (SDATA (tem), "true"))
return Qt;
else
return Qnil;
***************
*** 3291,3301 ****
{
Lisp_Object lower;
lower = Fdowncase (tem);
! if (!strcmp (XSTRING (lower)->data, "on")
! || !strcmp (XSTRING (lower)->data, "true"))
return Qt;
! else if (!strcmp (XSTRING (lower)->data, "off")
! || !strcmp (XSTRING (lower)->data, "false"))
return Qnil;
else
return Fintern (tem, Qnil);
--- 3291,3301 ----
{
Lisp_Object lower;
lower = Fdowncase (tem);
! if (!strcmp (SDATA (lower), "on")
! || !strcmp (SDATA (lower), "true"))
return Qt;
! else if (!strcmp (SDATA (lower), "off")
! || !strcmp (SDATA (lower), "false"))
return Qnil;
else
return Fintern (tem, Qnil);
***************
*** 3490,3496 ****
CHECK_STRING (string);
! geometry = XParseGeometry ((char *) XSTRING (string)->data,
&x, &y, &width, &height);
result = Qnil;
--- 3490,3496 ----
CHECK_STRING (string);
! geometry = XParseGeometry ((char *) SDATA (string),
&x, &y, &width, &height);
result = Qnil;
***************
*** 3678,3684 ****
Elsewhere we specify the window name for the window manager. */
{
! char *str = (char *) XSTRING (Vx_resource_name)->data;
f->namebuf = (char *) xmalloc (strlen (str) + 1);
strcpy (f->namebuf, str);
}
--- 3678,3684 ----
Elsewhere we specify the window name for the window manager. */
{
! char *str = (char *) SDATA (Vx_resource_name);
f->namebuf = (char *) xmalloc (strlen (str) + 1);
strcpy (f->namebuf, str);
}
***************
*** 3752,3760 ****
? IconicState
: NormalState));
! x_text_icon (f, (char *) XSTRING ((!NILP (f->icon_name)
? f->icon_name
! : f->name))->data);
#endif
UNBLOCK_INPUT;
--- 3752,3760 ----
? IconicState
: NormalState));
! x_text_icon (f, (char *) SDATA ((!NILP (f->icon_name)
? f->icon_name
! : f->name)));
#endif
UNBLOCK_INPUT;
***************
*** 3964,3972 ****
{
tem = Fquery_fontset (font, Qnil);
if (STRINGP (tem))
! font = x_new_fontset (f, XSTRING (tem)->data);
else
! font = x_new_font (f, XSTRING (font)->data);
}
/* Try out a font which we hope has bold and italic variations. */
if (! STRINGP (font))
--- 3964,3972 ----
{
tem = Fquery_fontset (font, Qnil);
if (STRINGP (tem))
! font = x_new_fontset (f, SDATA (tem));
else
! font = x_new_font (f, SDATA (font));
}
/* Try out a font which we hope has bold and italic variations. */
if (! STRINGP (font))
***************
*** 4178,4184 ****
CHECK_STRING (color);
! if (mac_defined_color (f, XSTRING (color)->data, &foo, 0))
return Qt;
else
return Qnil;
--- 4178,4184 ----
CHECK_STRING (color);
! if (mac_defined_color (f, SDATA (color), &foo, 0))
return Qt;
else
return Qnil;
***************
*** 4194,4200 ****
CHECK_STRING (color);
! if (mac_defined_color (f, XSTRING (color)->data, &foo, 0))
{
Lisp_Object rgb[3];
--- 4194,4200 ----
CHECK_STRING (color);
! if (mac_defined_color (f, SDATA (color), &foo, 0))
{
Lisp_Object rgb[3];
***************
*** 4515,4524 ****
validate_x_resource_name ();
dpyinfo = mac_term_init (name, (unsigned char *) 0,
! (char *) XSTRING (Vx_resource_name)->data);
if (dpyinfo == 0)
! error ("Cannot connect to server %s", XSTRING (name)->data);
mac_in_use = 1;
XSETFASTINT (Vwindow_system_version, 3);
--- 4515,4524 ----
validate_x_resource_name ();
dpyinfo = mac_term_init (name, (unsigned char *) 0,
! (char *) SDATA (Vx_resource_name));
if (dpyinfo == 0)
! error ("Cannot connect to server %s", SDATA (name));
mac_in_use = 1;
XSETFASTINT (Vwindow_system_version, 3);
***************
*** 4548,4554 ****
error ("Not using Mac OS");
if (! NILP (xrm_string))
! xrm_option = (unsigned char *) XSTRING (xrm_string)->data;
else
xrm_option = (unsigned char *) 0;
--- 4548,4554 ----
error ("Not using Mac OS");
if (! NILP (xrm_string))
! xrm_option = (unsigned char *) SDATA (xrm_string);
else
xrm_option = (unsigned char *) 0;
***************
*** 4557,4571 ****
/* This is what opens the connection and sets x_current_display.
This also initializes many symbols, such as those used for input. */
dpyinfo = mac_term_init (display, xrm_option,
! (char *) XSTRING (Vx_resource_name)->data);
if (dpyinfo == 0)
{
if (!NILP (must_succeed))
fatal ("Cannot connect to server %s.\n",
! XSTRING (display)->data);
else
! error ("Cannot connect to server %s", XSTRING (display)->data);
}
mac_in_use = 1;
--- 4557,4571 ----
/* This is what opens the connection and sets x_current_display.
This also initializes many symbols, such as those used for input. */
dpyinfo = mac_term_init (display, xrm_option,
! (char *) SDATA (Vx_resource_name));
if (dpyinfo == 0)
{
if (!NILP (must_succeed))
fatal ("Cannot connect to server %s.\n",
! SDATA (display));
else
! error ("Cannot connect to server %s", SDATA (display));
}
mac_in_use = 1;
***************
*** 4842,4848 ****
/* Find key in KEYWORDS. Error if not found. */
for (i = 0; i < nkeywords; ++i)
! if (strcmp (keywords[i].name, XSTRING (SYMBOL_NAME (key))->data) == 0)
break;
if (i == nkeywords)
--- 4842,4848 ----
/* Find key in KEYWORDS. Error if not found. */
for (i = 0; i < nkeywords; ++i)
! if (strcmp (keywords[i].name, SDATA (SYMBOL_NAME (key))) == 0)
break;
if (i == nkeywords)
***************
*** 5152,5158 ****
xassert (STRINGP (color_name));
! if (w32_defined_color (f, XSTRING (color_name)->data, &color, 1))
{
/* This isn't called frequently so we get away with simply
reallocating the color vector to the needed size, here. */
--- 5152,5158 ----
xassert (STRINGP (color_name));
! if (w32_defined_color (f, SDATA (color_name), &color, 1))
{
/* This isn't called frequently so we get away with simply
reallocating the color vector to the needed size, here. */
***************
*** 5730,5736 ****
if (STRINGP (elt))
{
! if (XSTRING (elt)->size
< (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR)
return 0;
}
--- 5730,5736 ----
if (STRINGP (elt))
{
! if (SCHARS (elt)
< (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR)
return 0;
}
***************
*** 5745,5751 ****
}
else if (STRINGP (data))
{
! if (XSTRING (data)->size
< (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR * height)
return 0;
}
--- 5745,5751 ----
}
else if (STRINGP (data))
{
! if (SCHARS (data)
< (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR * height)
return 0;
}
***************
*** 6026,6032 ****
return 0;
}
! rc = xbm_read_bitmap_file_data (XSTRING (file)->data, &img->width,
&img->height, &data);
if (rc)
{
--- 6026,6032 ----
return 0;
}
! rc = xbm_read_bitmap_file_data (SDATA (file), &img->width,
&img->height, &data);
if (rc)
{
***************
*** 6139,6151 ****
{
Lisp_Object line = XVECTOR (data)->contents[i];
if (STRINGP (line))
! bcopy (XSTRING (line)->data, p, nbytes);
else
bcopy (XBOOL_VECTOR (line)->data, p, nbytes);
}
}
else if (STRINGP (data))
! bits = XSTRING (data)->data;
else
bits = XBOOL_VECTOR (data)->data;
--- 6139,6151 ----
{
Lisp_Object line = XVECTOR (data)->contents[i];
if (STRINGP (line))
! bcopy (SDATA (line), p, nbytes);
else
bcopy (XBOOL_VECTOR (line)->data, p, nbytes);
}
}
else if (STRINGP (data))
! bits = SDATA (data);
else
bits = XBOOL_VECTOR (data)->data;
***************
*** 6337,6346 ****
{
Lisp_Object name = XCAR (XCAR (tail));
Lisp_Object color = XCDR (XCAR (tail));
! xpm_syms[i].name = (char *) alloca (XSTRING (name)->size + 1);
! strcpy (xpm_syms[i].name, XSTRING (name)->data);
! xpm_syms[i].value = (char *) alloca (XSTRING (color)->size + 1);
! strcpy (xpm_syms[i].value, XSTRING (color)->data);
}
}
--- 6337,6346 ----
{
Lisp_Object name = XCAR (XCAR (tail));
Lisp_Object color = XCDR (XCAR (tail));
! xpm_syms[i].name = (char *) alloca (SCHARS (name) + 1);
! strcpy (xpm_syms[i].name, SDATA (name));
! xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1);
! strcpy (xpm_syms[i].value, SDATA (color));
}
}
***************
*** 6359,6372 ****
}
rc = XpmReadFileToPixmap (NULL, FRAME_W32_WINDOW (f),
! XSTRING (file)->data, &img->pixmap, &img->mask,
&attrs);
}
else
{
Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL);
rc = XpmCreatePixmapFromBuffer (NULL, FRAME_W32_WINDOW (f),
! XSTRING (buffer)->data,
&img->pixmap, &img->mask,
&attrs);
}
--- 6359,6372 ----
}
rc = XpmReadFileToPixmap (NULL, FRAME_W32_WINDOW (f),
! SDATA (file), &img->pixmap, &img->mask,
&attrs);
}
else
{
Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL);
rc = XpmCreatePixmapFromBuffer (NULL, FRAME_W32_WINDOW (f),
! SDATA (buffer),
&img->pixmap, &img->mask,
&attrs);
}
***************
*** 6998,7005 ****
char *buf = NULL;
struct stat st;
! if (stat (XSTRING (file)->data, &st) == 0
! && (fp = fopen (XSTRING (file)->data, "r")) != NULL
&& (buf = (char *) xmalloc (st.st_size),
fread (buf, 1, st.st_size, fp) == st.st_size))
{
--- 6998,7005 ----
char *buf = NULL;
struct stat st;
! if (stat (SDATA (file), &st) == 0
! && (fp = fopen (SDATA (file), "r")) != NULL
&& (buf = (char *) xmalloc (st.st_size),
fread (buf, 1, st.st_size, fp) == st.st_size))
{
***************
*** 7067,7074 ****
{
Lisp_Object data;
data = image_spec_value (img->spec, QCdata, NULL);
! p = XSTRING (data)->data;
! end = p + STRING_BYTES (XSTRING (data));
}
/* Check magic number. */
--- 7067,7074 ----
{
Lisp_Object data;
data = image_spec_value (img->spec, QCdata, NULL);
! p = SDATA (data);
! end = p + SBYTES (data);
}
/* Check magic number. */
***************
*** 7401,7407 ****
}
/* Open the image file. */
! fp = fopen (XSTRING (file)->data, "rb");
if (!fp)
{
image_error ("Cannot open image file `%s'", file, Qnil);
--- 7401,7407 ----
}
/* Open the image file. */
! fp = fopen (SDATA (file), "rb");
if (!fp)
{
image_error ("Cannot open image file `%s'", file, Qnil);
***************
*** 7423,7430 ****
else
{
/* Read from memory. */
! tbr.bytes = XSTRING (specified_data)->data;
! tbr.len = STRING_BYTES (XSTRING (specified_data));
tbr.index = 0;
/* Check PNG signature. */
--- 7423,7430 ----
else
{
/* Read from memory. */
! tbr.bytes = SDATA (specified_data);
! tbr.len = SBYTES (specified_data);
tbr.index = 0;
/* Check PNG signature. */
***************
*** 7936,7942 ****
return 0;
}
! fp = fopen (XSTRING (file)->data, "r");
if (fp == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
--- 7936,7942 ----
return 0;
}
! fp = fopen (SDATA (file), "r");
if (fp == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
***************
*** 7986,7993 ****
if (NILP (specified_data))
jpeg_stdio_src (&cinfo, fp);
else
! jpeg_memory_src (&cinfo, XSTRING (specified_data)->data,
! STRING_BYTES (XSTRING (specified_data)));
jpeg_read_header (&cinfo, TRUE);
--- 7986,7993 ----
if (NILP (specified_data))
jpeg_stdio_src (&cinfo, fp);
else
! jpeg_memory_src (&cinfo, SDATA (specified_data),
! SBYTES (specified_data));
jpeg_read_header (&cinfo, TRUE);
***************
*** 8295,8301 ****
}
/* Try to open the image file. */
! tiff = TIFFOpen (XSTRING (file)->data, "r");
if (tiff == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
--- 8295,8301 ----
}
/* Try to open the image file. */
! tiff = TIFFOpen (SDATA (file), "r");
if (tiff == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
***************
*** 8306,8313 ****
else
{
/* Memory source! */
! memsrc.bytes = XSTRING (specified_data)->data;
! memsrc.len = STRING_BYTES (XSTRING (specified_data));
memsrc.index = 0;
tiff = TIFFClientOpen ("memory_source", "r", &memsrc,
--- 8306,8313 ----
else
{
/* Memory source! */
! memsrc.bytes = SDATA (specified_data);
! memsrc.len = SBYTES (specified_data);
memsrc.index = 0;
tiff = TIFFClientOpen ("memory_source", "r", &memsrc,
***************
*** 8539,8545 ****
}
/* Open the GIF file. */
! gif = DGifOpenFileName (XSTRING (file)->data);
if (gif == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
--- 8539,8545 ----
}
/* Open the GIF file. */
! gif = DGifOpenFileName (SDATA (file));
if (gif == NULL)
{
image_error ("Cannot open `%s'", file, Qnil);
***************
*** 8551,8558 ****
{
/* Read from memory! */
current_gif_memory_src = &memsrc;
! memsrc.bytes = XSTRING (specified_data)->data;
! memsrc.len = STRING_BYTES (XSTRING (specified_data));
memsrc.index = 0;
gif = DGifOpen(&memsrc, gif_read_from_memory);
--- 8551,8558 ----
{
/* Read from memory! */
current_gif_memory_src = &memsrc;
! memsrc.bytes = SDATA (specified_data);
! memsrc.len = SBYTES (specified_data);
memsrc.index = 0;
gif = DGifOpen(&memsrc, gif_read_from_memory);
***************
*** 8999,9008 ****
CHECK_STRING (value);
BLOCK_INPUT;
! prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data,
False);
XChangeProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
prop_atom, XA_STRING, 8, PropModeReplace,
! XSTRING (value)->data, XSTRING (value)->size);
/* Make sure the property is set when we return. */
XFlush (FRAME_W32_DISPLAY (f));
--- 8999,9008 ----
CHECK_STRING (value);
BLOCK_INPUT;
! prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), SDATA (prop), False);
XChangeProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
prop_atom, XA_STRING, 8, PropModeReplace,
! SDATA (value), SCHARS (value));
/* Make sure the property is set when we return. */
XFlush (FRAME_W32_DISPLAY (f));
***************
*** 9028,9034 ****
CHECK_STRING (prop);
BLOCK_INPUT;
! prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data,
False);
XDeleteProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), prop_atom);
/* Make sure the property is removed when we return. */
--- 9028,9034 ----
CHECK_STRING (prop);
BLOCK_INPUT;
! prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), SDATA (prop), False);
XDeleteProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), prop_atom);
/* Make sure the property is removed when we return. */
***************
*** 9062,9068 ****
CHECK_STRING (prop);
BLOCK_INPUT;
! prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data,
False);
rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
prop_atom, 0, 0, False, XA_STRING,
&actual_type, &actual_format, &actual_size,
--- 9062,9068 ----
CHECK_STRING (prop);
BLOCK_INPUT;
! prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), SDATA (prop), False);
rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
prop_atom, 0, 0, False, XA_STRING,
&actual_type, &actual_format, &actual_size,
***************
*** 9378,9386 ****
{
tem = Fquery_fontset (font, Qnil);
if (STRINGP (tem))
! font = x_new_fontset (f, XSTRING (tem)->data);
else
! font = x_new_font (f, XSTRING (font)->data);
}
/* Try out a font which we hope has bold and italic variations. */
--- 9378,9386 ----
{
tem = Fquery_fontset (font, Qnil);
if (STRINGP (tem))
! font = x_new_fontset (f, SDATA (tem));
else
! font = x_new_font (f, SDATA (font));
}
/* Try out a font which we hope has bold and italic variations. */
***************
*** 9800,9813 ****
/* Create the dialog with PROMPT as title, using DIR as initial
directory and using "*" as pattern. */
dir = Fexpand_file_name (dir, Qnil);
! strncpy (init_dir, XSTRING (dir)->data, MAX_PATH);
init_dir[MAX_PATH] = '\0';
unixtodos_filename (init_dir);
if (STRINGP (default_filename))
{
char *file_name_only;
! char *full_path_name = XSTRING (default_filename)->data;
unixtodos_filename (full_path_name);
--- 9800,9813 ----
/* Create the dialog with PROMPT as title, using DIR as initial
directory and using "*" as pattern. */
dir = Fexpand_file_name (dir, Qnil);
! strncpy (init_dir, SDATA (dir), MAX_PATH);
init_dir[MAX_PATH] = '\0';
unixtodos_filename (init_dir);
if (STRINGP (default_filename))
{
char *file_name_only;
! char *full_path_name = SDATA (default_filename);
unixtodos_filename (full_path_name);
***************
*** 9846,9852 ****
file_details.lpstrFile = filename;
file_details.nMaxFile = sizeof (filename);
file_details.lpstrInitialDir = init_dir;
! file_details.lpstrTitle = XSTRING (prompt)->data;
file_details.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
if (!NILP (mustmatch))
--- 9846,9852 ----
file_details.lpstrFile = filename;
file_details.nMaxFile = sizeof (filename);
file_details.lpstrInitialDir = init_dir;
! file_details.lpstrTitle = SDATA (prompt);
file_details.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
if (!NILP (mustmatch))