/[emacs]/emacs/src/macterm.c
ViewVC logotype

Diff of /emacs/src/macterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11 by akochoi, Thu Jul 4 02:43:48 2002 UTC revision 1.12 by raeburn, Mon Jul 15 00:00:36 2002 UTC
# Line 7005  note_mode_line_highlight (w, x, mode_lin Line 7005  note_mode_line_highlight (w, x, mode_lin
7005    
7006        if (glyph < end        if (glyph < end
7007            && STRINGP (glyph->object)            && STRINGP (glyph->object)
7008            && XSTRING (glyph->object)->intervals            && STRING_INTERVALS (glyph->object)
7009            && glyph->charpos >= 0            && glyph->charpos >= 0
7010            && glyph->charpos < XSTRING (glyph->object)->size)            && glyph->charpos < SCHARS (glyph->object))
7011          {          {
7012            /* If we're on a string with `help-echo' text property,            /* If we're on a string with `help-echo' text property,
7013               arrange for the help to be displayed.  This is done by               arrange for the help to be displayed.  This is done by
# Line 7328  note_mouse_highlight (f, x, y) Line 7328  note_mouse_highlight (f, x, y)
7328                if (NILP (b))                if (NILP (b))
7329                  b = make_number (0);                  b = make_number (0);
7330                if (NILP (e))                if (NILP (e))
7331                  e = make_number (XSTRING (object)->size - 1);                  e = make_number (SCHARS (object) - 1);
7332                fast_find_string_pos (w, XINT (b), object,                fast_find_string_pos (w, XINT (b), object,
7333                                      &dpyinfo->mouse_face_beg_col,                                      &dpyinfo->mouse_face_beg_col,
7334                                      &dpyinfo->mouse_face_beg_row,                                      &dpyinfo->mouse_face_beg_row,
# Line 7426  note_mouse_highlight (f, x, y) Line 7426  note_mouse_highlight (f, x, y)
7426              /* Try text properties.  */              /* Try text properties.  */
7427              if (STRINGP (object)              if (STRINGP (object)
7428                  && charpos >= 0                  && charpos >= 0
7429                  && charpos < XSTRING (object)->size)                  && charpos < SCHARS (object))
7430                {                {
7431                  help = Fget_text_property (make_number (charpos),                  help = Fget_text_property (make_number (charpos),
7432                                             Qhelp_echo, object);                                             Qhelp_echo, object);
# Line 9469  x_bitmap_icon (f, icon) Line 9469  x_bitmap_icon (f, icon)
9469    if (NILP (icon))    if (NILP (icon))
9470      hicon = LoadIcon (hinst, EMACS_CLASS);      hicon = LoadIcon (hinst, EMACS_CLASS);
9471    else if (STRINGP (icon))    else if (STRINGP (icon))
9472      hicon = LoadImage (NULL, (LPCTSTR) XSTRING (icon)->data, IMAGE_ICON, 0, 0,      hicon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0,
9473                         LR_DEFAULTSIZE | LR_LOADFROMFILE);                         LR_DEFAULTSIZE | LR_LOADFROMFILE);
9474    else if (SYMBOLP (icon))    else if (SYMBOLP (icon))
9475      {      {
# Line 9606  x_new_fontset (f, fontsetname) Line 9606  x_new_fontset (f, fontsetname)
9606         to do.  */         to do.  */
9607      return fontset_name (fontset);      return fontset_name (fontset);
9608    
9609    result = x_new_font (f, (XSTRING (fontset_ascii (fontset))->data));    result = x_new_font (f, (SDATA (fontset_ascii (fontset))));
9610    
9611    if (!STRINGP (result))    if (!STRINGP (result))
9612      /* Can't load ASCII font.  */      /* Can't load ASCII font.  */
# Line 10893  x_list_fonts (struct frame *f, Line 10893  x_list_fonts (struct frame *f,
10893          }          }
10894      }      }
10895    
10896    ptnstr = XSTRING (pattern)->data;    ptnstr = SDATA (pattern);
10897    
10898    GCPRO2 (pattern, newlist);    GCPRO2 (pattern, newlist);
10899    
# Line 11243  x_load_font (f, fontname, size) Line 11243  x_load_font (f, fontname, size)
11243          for (tail = font_names; CONSP (tail); tail = XCDR (tail))          for (tail = font_names; CONSP (tail); tail = XCDR (tail))
11244            if (dpyinfo->font_table[i].name            if (dpyinfo->font_table[i].name
11245                && (!strcmp (dpyinfo->font_table[i].name,                && (!strcmp (dpyinfo->font_table[i].name,
11246                             XSTRING (XCAR (tail))->data)                             SDATA (XCAR (tail)))
11247                    || !strcmp (dpyinfo->font_table[i].full_name,                    || !strcmp (dpyinfo->font_table[i].full_name,
11248                                XSTRING (XCAR (tail))->data)))                                SDATA (XCAR (tail)))))
11249              return (dpyinfo->font_table + i);              return (dpyinfo->font_table + i);
11250      }      }
11251    
# Line 11263  x_load_font (f, fontname, size) Line 11263  x_load_font (f, fontname, size)
11263         a bug of not finding a font even if the font surely exists and         a bug of not finding a font even if the font surely exists and
11264         is loadable by XLoadQueryFont.  */         is loadable by XLoadQueryFont.  */
11265      if (size > 0 && !NILP (font_names))      if (size > 0 && !NILP (font_names))
11266        fontname = (char *) XSTRING (XCAR (font_names))->data;        fontname = (char *) SDATA (XCAR (font_names));
11267    
11268      font = (MacFontStruct *) XLoadQueryFont (FRAME_MAC_DISPLAY (f), fontname);      font = (MacFontStruct *) XLoadQueryFont (FRAME_MAC_DISPLAY (f), fontname);
11269      if (!font)      if (!font)
# Line 11457  same_x_server (name1, name2) Line 11457  same_x_server (name1, name2)
11457       char *name1, *name2;       char *name1, *name2;
11458  {  {
11459    int seen_colon = 0;    int seen_colon = 0;
11460    unsigned char *system_name = XSTRING (Vsystem_name)->data;    unsigned char *system_name = SDATA (Vsystem_name);
11461    int system_name_length = strlen (system_name);    int system_name_length = strlen (system_name);
11462    int length_until_period = 0;    int length_until_period = 0;
11463    
# Line 12968  same_x_server (name1, name2) Line 12968  same_x_server (name1, name2)
12968       char *name1, *name2;       char *name1, *name2;
12969  {  {
12970    int seen_colon = 0;    int seen_colon = 0;
12971    unsigned char *system_name = XSTRING (Vsystem_name)->data;    unsigned char *system_name = SDATA (Vsystem_name);
12972    int system_name_length = strlen (system_name);    int system_name_length = strlen (system_name);
12973    int length_until_period = 0;    int length_until_period = 0;
12974    
# Line 13026  mac_initialize_display_info () Line 13026  mac_initialize_display_info ()
13026        
13027  #if 0  #if 0
13028    dpyinfo->mac_id_name    dpyinfo->mac_id_name
13029      = (char *) xmalloc (XSTRING (Vinvocation_name)->size      = (char *) xmalloc (SCHARS (Vinvocation_name)
13030                          + XSTRING (Vsystem_name)->size                          + SCHARS (Vsystem_name)
13031                          + 2);                          + 2);
13032    sprintf (dpyinfo->mac_id_name, "%s@%s",    sprintf (dpyinfo->mac_id_name, "%s@%s",
13033             XSTRING (Vinvocation_name)->data, XSTRING (Vsystem_name)->data);             SDATA (Vinvocation_name), SDATA (Vsystem_name));
13034  #else  #else
13035    dpyinfo->mac_id_name = (char *) xmalloc (strlen ("Mac Display") + 1);    dpyinfo->mac_id_name = (char *) xmalloc (strlen ("Mac Display") + 1);
13036    strcpy (dpyinfo->mac_id_name, "Mac Display");    strcpy (dpyinfo->mac_id_name, "Mac Display");

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26