[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
From: |
Dave Love |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
Date: |
Tue, 16 Jul 2002 10:35:33 -0400 |
Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.743 emacs/src/xterm.c:1.744
*** emacs/src/xterm.c:1.743 Thu Jul 11 10:18:02 2002
--- emacs/src/xterm.c Sun Jul 14 20:00:41 2002
***************
*** 7269,7275 ****
if (NILP (b))
b = make_number (0);
if (NILP (e))
! e = make_number (XSTRING (object)->size - 1);
fast_find_string_pos (w, XINT (b), object,
&dpyinfo->mouse_face_beg_col,
&dpyinfo->mouse_face_beg_row,
--- 7269,7275 ----
if (NILP (b))
b = make_number (0);
if (NILP (e))
! e = make_number (SCHARS (object) - 1);
fast_find_string_pos (w, XINT (b), object,
&dpyinfo->mouse_face_beg_col,
&dpyinfo->mouse_face_beg_row,
***************
*** 7367,7373 ****
/* Try text properties. */
if (STRINGP (object)
&& charpos >= 0
! && charpos < XSTRING (object)->size)
{
help = Fget_text_property (make_number (charpos),
Qhelp_echo, object);
--- 7367,7373 ----
/* Try text properties. */
if (STRINGP (object)
&& charpos >= 0
! && charpos < SCHARS (object))
{
help = Fget_text_property (make_number (charpos),
Qhelp_echo, object);
***************
*** 12099,12105 ****
XErrorEvent *error;
{
XGetErrorText (display, error->error_code,
! XSTRING (x_error_message_string)->data,
X_ERROR_MESSAGE_SIZE);
}
--- 12099,12105 ----
XErrorEvent *error;
{
XGetErrorText (display, error->error_code,
! SDATA (x_error_message_string),
X_ERROR_MESSAGE_SIZE);
}
***************
*** 12131,12137 ****
record_unwind_protect (x_catch_errors_unwind, x_error_message_string);
x_error_message_string = make_uninit_string (X_ERROR_MESSAGE_SIZE);
! XSTRING (x_error_message_string)->data[0] = 0;
return count;
}
--- 12131,12137 ----
record_unwind_protect (x_catch_errors_unwind, x_error_message_string);
x_error_message_string = make_uninit_string (X_ERROR_MESSAGE_SIZE);
! SREF (x_error_message_string, 0) = 0;
return count;
}
***************
*** 12158,12165 ****
/* Make sure to catch any errors incurred so far. */
XSync (dpy, False);
! if (XSTRING (x_error_message_string)->data[0])
! error (format, XSTRING (x_error_message_string)->data);
}
/* Nonzero if we had any X protocol errors
--- 12158,12165 ----
/* Make sure to catch any errors incurred so far. */
XSync (dpy, False);
! if (SREF (x_error_message_string, 0))
! error (format, SDATA (x_error_message_string));
}
/* Nonzero if we had any X protocol errors
***************
*** 12172,12178 ****
/* Make sure to catch any errors incurred so far. */
XSync (dpy, False);
! return XSTRING (x_error_message_string)->data[0] != 0;
}
/* Forget about any errors we have had, since we did x_catch_errors on DPY.
*/
--- 12172,12178 ----
/* Make sure to catch any errors incurred so far. */
XSync (dpy, False);
! return SREF (x_error_message_string, 0) != 0;
}
/* Forget about any errors we have had, since we did x_catch_errors on DPY.
*/
***************
*** 12181,12187 ****
x_clear_errors (dpy)
Display *dpy;
{
! XSTRING (x_error_message_string)->data[0] = 0;
}
/* Stop catching X protocol errors and let them make Emacs die.
--- 12181,12187 ----
x_clear_errors (dpy)
Display *dpy;
{
! SREF (x_error_message_string, 0) = 0;
}
/* Stop catching X protocol errors and let them make Emacs die.
***************
*** 12481,12487 ****
to do. */
return fontset_name (fontset);
! result = x_new_font (f, (XSTRING (fontset_ascii (fontset))->data));
if (!STRINGP (result))
/* Can't load ASCII font. */
--- 12481,12487 ----
to do. */
return fontset_name (fontset);
! result = x_new_font (f, (SDATA (fontset_ascii (fontset))));
if (!STRINGP (result))
/* Can't load ASCII font. */
***************
*** 12493,12499 ****
#ifdef HAVE_X_I18N
if (FRAME_XIC (f)
&& (FRAME_XIC_STYLE (f) & (XIMPreeditPosition | XIMStatusArea)))
! xic_set_xfontset (f, XSTRING (fontset_ascii (fontset))->data);
#endif
return build_string (fontsetname);
--- 12493,12499 ----
#ifdef HAVE_X_I18N
if (FRAME_XIC (f)
&& (FRAME_XIC_STYLE (f) & (XIMPreeditPosition | XIMStatusArea)))
! xic_set_xfontset (f, SDATA (fontset_ascii (fontset)));
#endif
return build_string (fontsetname);
***************
*** 14093,14099 ****
XFontStruct *font;
unsigned long value;
! font = XLoadQueryFont (dpy, XSTRING (pattern)->data);
if (x_had_errors_p (dpy))
{
/* This error is perhaps due to insufficient memory on X
--- 14093,14099 ----
XFontStruct *font;
unsigned long value;
! font = XLoadQueryFont (dpy, SDATA (pattern));
if (x_had_errors_p (dpy))
{
/* This error is perhaps due to insufficient memory on X
***************
*** 14136,14142 ****
{
/* We try at least 10 fonts because XListFonts will return
auto-scaled fonts at the head. */
! names = XListFonts (dpy, XSTRING (pattern)->data, max (maxnames, 10),
&num_fonts);
if (x_had_errors_p (dpy))
{
--- 14136,14142 ----
{
/* We try at least 10 fonts because XListFonts will return
auto-scaled fonts at the head. */
! names = XListFonts (dpy, SDATA (pattern), max (maxnames, 10),
&num_fonts);
if (x_had_errors_p (dpy))
{
***************
*** 14237,14243 ****
BLOCK_INPUT;
count = x_catch_errors (dpy);
thisinfo = XLoadQueryFont (dpy,
! XSTRING (XCAR (tem))->data);
if (x_had_errors_p (dpy))
{
/* This error is perhaps due to insufficient memory on X
--- 14237,14243 ----
BLOCK_INPUT;
count = x_catch_errors (dpy);
thisinfo = XLoadQueryFont (dpy,
! SDATA (XCAR (tem)));
if (x_had_errors_p (dpy))
{
/* This error is perhaps due to insufficient memory on X
***************
*** 14417,14425 ****
for (tail = font_names; CONSP (tail); tail = XCDR (tail))
if (dpyinfo->font_table[i].name
&& (!strcmp (dpyinfo->font_table[i].name,
! XSTRING (XCAR (tail))->data)
|| !strcmp (dpyinfo->font_table[i].full_name,
! XSTRING (XCAR (tail))->data)))
return (dpyinfo->font_table + i);
}
--- 14417,14425 ----
for (tail = font_names; CONSP (tail); tail = XCDR (tail))
if (dpyinfo->font_table[i].name
&& (!strcmp (dpyinfo->font_table[i].name,
! SDATA (XCAR (tail)))
|| !strcmp (dpyinfo->font_table[i].full_name,
! SDATA (XCAR (tail)))))
return (dpyinfo->font_table + i);
}
***************
*** 14437,14443 ****
a bug of not finding a font even if the font surely exists and
is loadable by XLoadQueryFont. */
if (size > 0 && !NILP (font_names))
! fontname = (char *) XSTRING (XCAR (font_names))->data;
BLOCK_INPUT;
count = x_catch_errors (FRAME_X_DISPLAY (f));
--- 14437,14443 ----
a bug of not finding a font even if the font surely exists and
is loadable by XLoadQueryFont. */
if (size > 0 && !NILP (font_names))
! fontname = (char *) SDATA (XCAR (font_names));
BLOCK_INPUT;
count = x_catch_errors (FRAME_X_DISPLAY (f));
***************
*** 14689,14695 ****
char *name1, *name2;
{
int seen_colon = 0;
! unsigned char *system_name = XSTRING (Vsystem_name)->data;
int system_name_length = strlen (system_name);
int length_until_period = 0;
--- 14689,14695 ----
char *name1, *name2;
{
int seen_colon = 0;
! unsigned char *system_name = SDATA (Vsystem_name);
int system_name_length = strlen (system_name);
int length_until_period = 0;
***************
*** 14771,14777 ****
argv[argc++] = xrm_option;
}
stop_polling ();
! dpy = XtOpenDisplay (Xt_app_con, XSTRING (display_name)->data,
resource_name, EMACS_CLASS,
emacs_options, XtNumber (emacs_options),
&argc, argv);
--- 14771,14777 ----
argv[argc++] = xrm_option;
}
stop_polling ();
! dpy = XtOpenDisplay (Xt_app_con, SDATA (display_name),
resource_name, EMACS_CLASS,
emacs_options, XtNumber (emacs_options),
&argc, argv);
***************
*** 14787,14793 ****
#ifdef HAVE_X11R5
XSetLocaleModifiers ("");
#endif
! dpy = XOpenDisplay (XSTRING (display_name)->data);
#endif /* not USE_X_TOOLKIT */
/* Detect failure. */
--- 14787,14793 ----
#ifdef HAVE_X11R5
XSetLocaleModifiers ("");
#endif
! dpy = XOpenDisplay (SDATA (display_name));
#endif /* not USE_X_TOOLKIT */
/* Detect failure. */
***************
*** 14809,14816 ****
for (share = x_display_list, tail = x_display_name_list; share;
share = share->next, tail = XCDR (tail))
! if (same_x_server (XSTRING (XCAR (XCAR (tail)))->data,
! XSTRING (display_name)->data))
break;
if (share)
dpyinfo->kboard = share->kboard;
--- 14809,14816 ----
for (share = x_display_list, tail = x_display_name_list; share;
share = share->next, tail = XCDR (tail))
! if (same_x_server (SDATA (XCAR (XCAR (tail))),
! SDATA (display_name)))
break;
if (share)
dpyinfo->kboard = share->kboard;
***************
*** 14856,14866 ****
#endif /* ! 0 */
dpyinfo->x_id_name
! = (char *) xmalloc (STRING_BYTES (XSTRING (Vinvocation_name))
! + STRING_BYTES (XSTRING (Vsystem_name))
+ 2);
sprintf (dpyinfo->x_id_name, "address@hidden",
! XSTRING (Vinvocation_name)->data, XSTRING (Vsystem_name)->data);
/* Figure out which modifier bits mean what. */
x_find_modifier_meanings (dpyinfo);
--- 14856,14866 ----
#endif /* ! 0 */
dpyinfo->x_id_name
! = (char *) xmalloc (SBYTES (Vinvocation_name)
! + SBYTES (Vsystem_name)
+ 2);
sprintf (dpyinfo->x_id_name, "address@hidden",
! SDATA (Vinvocation_name), SDATA (Vsystem_name));
/* Figure out which modifier bits mean what. */
x_find_modifier_meanings (dpyinfo);
***************
*** 14923,14930 ****
build_string ("PrivateColormap"),
Qnil, Qnil);
if (STRINGP (value)
! && (!strcmp (XSTRING (value)->data, "true")
! || !strcmp (XSTRING (value)->data, "on")))
dpyinfo->cmap = XCopyColormapAndFree (dpyinfo->display,
dpyinfo->cmap);
}
}
--- 14923,14930 ----
build_string ("PrivateColormap"),
Qnil, Qnil);
if (STRINGP (value)
! && (!strcmp (SDATA (value), "true")
! || !strcmp (SDATA (value), "on")))
dpyinfo->cmap = XCopyColormapAndFree (dpyinfo->display,
dpyinfo->cmap);
}
}
***************
*** 15084,15091 ****
build_string ("Synchronous"),
Qnil, Qnil);
if (STRINGP (value)
! && (!strcmp (XSTRING (value)->data, "true")
! || !strcmp (XSTRING (value)->data, "on")))
XSynchronize (dpyinfo->display, True);
}
--- 15084,15091 ----
build_string ("Synchronous"),
Qnil, Qnil);
if (STRINGP (value)
! && (!strcmp (SDATA (value), "true")
! || !strcmp (SDATA (value), "on")))
XSynchronize (dpyinfo->display, True);
}
- [Emacs-diffs] Changes to emacs/src/xterm.c, Dave Love, 2002/07/01
- [Emacs-diffs] Changes to emacs/src/xterm.c, Richard M. Stallman, 2002/07/02
- [Emacs-diffs] Changes to emacs/src/xterm.c, Juanma Barranquero, 2002/07/03
- [Emacs-diffs] Changes to emacs/src/xterm.c, Juanma Barranquero, 2002/07/03
- [Emacs-diffs] Changes to emacs/src/xterm.c, Dave Love, 2002/07/03
- [Emacs-diffs] Changes to emacs/src/xterm.c, Eli Zaretskii, 2002/07/08
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kenichi Handa, 2002/07/08
- [Emacs-diffs] Changes to emacs/src/xterm.c, Juanma Barranquero, 2002/07/11
- [Emacs-diffs] Changes to emacs/src/xterm.c, Stefan Monnier, 2002/07/12
- [Emacs-diffs] Changes to emacs/src/xterm.c, Ken Raeburn, 2002/07/14
- [Emacs-diffs] Changes to emacs/src/xterm.c,
Dave Love <=
- [Emacs-diffs] Changes to emacs/src/xterm.c, Ken Raeburn, 2002/07/16
- [Emacs-diffs] Changes to emacs/src/xterm.c, Ken Raeburn, 2002/07/16
- [Emacs-diffs] Changes to emacs/src/xterm.c, Richard M. Stallman, 2002/07/24
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kenichi Handa, 2002/07/26
- [Emacs-diffs] Changes to emacs/src/xterm.c, Richard M. Stallman, 2002/07/27