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

Diff of /emacs/src/w32term.c

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

revision 1.162 by pj, Thu Jun 13 14:58:38 2002 UTC revision 1.163 by raeburn, Mon Jul 15 00:00:37 2002 UTC
# Line 6508  note_mode_line_highlight (w, x, mode_lin Line 6508  note_mode_line_highlight (w, x, mode_lin
6508    
6509        if (glyph < end        if (glyph < end
6510            && STRINGP (glyph->object)            && STRINGP (glyph->object)
6511            && XSTRING (glyph->object)->intervals            && STRING_INTERVALS (glyph->object)
6512            && glyph->charpos >= 0            && glyph->charpos >= 0
6513            && glyph->charpos < XSTRING (glyph->object)->size)            && glyph->charpos < SCHARS (glyph->object))
6514          {          {
6515            /* If we're on a string with `help-echo' text property,            /* If we're on a string with `help-echo' text property,
6516               arrange for the help to be displayed.  This is done by               arrange for the help to be displayed.  This is done by
# Line 6829  note_mouse_highlight (f, x, y) Line 6829  note_mouse_highlight (f, x, y)
6829                if (NILP (b))                if (NILP (b))
6830                  b = make_number (0);                  b = make_number (0);
6831                if (NILP (e))                if (NILP (e))
6832                  e = make_number (XSTRING (object)->size - 1);                  e = make_number (SCHARS (object) - 1);
6833                fast_find_string_pos (w, XINT (b), object,                fast_find_string_pos (w, XINT (b), object,
6834                                      &dpyinfo->mouse_face_beg_col,                                      &dpyinfo->mouse_face_beg_col,
6835                                      &dpyinfo->mouse_face_beg_row,                                      &dpyinfo->mouse_face_beg_row,
# Line 6927  note_mouse_highlight (f, x, y) Line 6927  note_mouse_highlight (f, x, y)
6927              /* Try text properties.  */              /* Try text properties.  */
6928              if (STRINGP (object)              if (STRINGP (object)
6929                  && charpos >= 0                  && charpos >= 0
6930                  && charpos < XSTRING (object)->size)                  && charpos < SCHARS (object))
6931                {                {
6932                  help = Fget_text_property (make_number (charpos),                  help = Fget_text_property (make_number (charpos),
6933                                             Qhelp_echo, object);                                             Qhelp_echo, object);
# Line 8619  w32_read_socket (sd, bufp, numchars, exp Line 8619  w32_read_socket (sd, bufp, numchars, exp
8619                    /* We may get paint messages even though the client                    /* We may get paint messages even though the client
8620                       area is clipped - these are not expose events. */                       area is clipped - these are not expose events. */
8621                    DebPrint (("clipped frame %p (%s) got WM_PAINT - ignored\n", f,                    DebPrint (("clipped frame %p (%s) got WM_PAINT - ignored\n", f,
8622                               XSTRING (f->name)->data));                               SDATA (f->name)));
8623                  }                  }
8624                else if (f->async_visible != 1)                else if (f->async_visible != 1)
8625                  {                  {
# Line 8628  w32_read_socket (sd, bufp, numchars, exp Line 8628  w32_read_socket (sd, bufp, numchars, exp
8628                    f->async_iconified = 0;                    f->async_iconified = 0;
8629                    SET_FRAME_GARBAGED (f);                    SET_FRAME_GARBAGED (f);
8630                    DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f,                    DebPrint (("frame %p (%s) reexposed by WM_PAINT\n", f,
8631                               XSTRING (f->name)->data));                               SDATA (f->name)));
8632    
8633                    /* WM_PAINT serves as MapNotify as well, so report                    /* WM_PAINT serves as MapNotify as well, so report
8634                       visibility changes properly.  */                       visibility changes properly.  */
# Line 9308  w32_read_socket (sd, bufp, numchars, exp Line 9308  w32_read_socket (sd, bufp, numchars, exp
9308                    if (!FRAME_OBSCURED_P (f))                    if (!FRAME_OBSCURED_P (f))
9309                      {                      {
9310                        DebPrint (("frame %p (%s) obscured\n", f,                        DebPrint (("frame %p (%s) obscured\n", f,
9311                                   XSTRING (f->name)->data));                                   SDATA (f->name)));
9312                      }                      }
9313                  }                  }
9314                else                else
# Line 9320  w32_read_socket (sd, bufp, numchars, exp Line 9320  w32_read_socket (sd, bufp, numchars, exp
9320                      {                      {
9321                        SET_FRAME_GARBAGED (f);                        SET_FRAME_GARBAGED (f);
9322                        DebPrint (("obscured frame %p (%s) found to be visible\n", f,                        DebPrint (("obscured frame %p (%s) found to be visible\n", f,
9323                                   XSTRING (f->name)->data));                                   SDATA (f->name)));
9324    
9325                        /* Force a redisplay sooner or later.  */                        /* Force a redisplay sooner or later.  */
9326                        record_asynch_buffer_change ();                        record_asynch_buffer_change ();
# Line 9991  x_bitmap_icon (f, icon) Line 9991  x_bitmap_icon (f, icon)
9991    if (NILP (icon))    if (NILP (icon))
9992      hicon = LoadIcon (hinst, EMACS_CLASS);      hicon = LoadIcon (hinst, EMACS_CLASS);
9993    else if (STRINGP (icon))    else if (STRINGP (icon))
9994      hicon = LoadImage (NULL, (LPCTSTR) XSTRING (icon)->data, IMAGE_ICON, 0, 0,      hicon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0,
9995                         LR_DEFAULTSIZE | LR_LOADFROMFILE);                         LR_DEFAULTSIZE | LR_LOADFROMFILE);
9996    else if (SYMBOLP (icon))    else if (SYMBOLP (icon))
9997      {      {
# Line 10121  x_new_fontset (f, fontsetname) Line 10121  x_new_fontset (f, fontsetname)
10121         to do.  */         to do.  */
10122      return fontset_name (fontset);      return fontset_name (fontset);
10123    
10124    result = x_new_font (f, (XSTRING (fontset_ascii (fontset))->data));    result = x_new_font (f, (SDATA (fontset_ascii (fontset))));
10125    
10126    if (!STRINGP (result))    if (!STRINGP (result))
10127      /* Can't load ASCII font.  */      /* Can't load ASCII font.  */
# Line 11047  w32_initialize_display_info (display_nam Line 11047  w32_initialize_display_info (display_nam
11047    dpyinfo->name_list_element = XCAR (w32_display_name_list);    dpyinfo->name_list_element = XCAR (w32_display_name_list);
11048        
11049    dpyinfo->w32_id_name    dpyinfo->w32_id_name
11050      = (char *) xmalloc (XSTRING (Vinvocation_name)->size      = (char *) xmalloc (SCHARS (Vinvocation_name)
11051                          + XSTRING (Vsystem_name)->size                          + SCHARS (Vsystem_name)
11052                          + 2);                          + 2);
11053    sprintf (dpyinfo->w32_id_name, "%s@%s",    sprintf (dpyinfo->w32_id_name, "%s@%s",
11054             XSTRING (Vinvocation_name)->data, XSTRING (Vsystem_name)->data);             SDATA (Vinvocation_name), SDATA (Vsystem_name));
11055    
11056    /* Default Console mode values - overridden when running in GUI mode    /* Default Console mode values - overridden when running in GUI mode
11057       with values obtained from system metrics.  */       with values obtained from system metrics.  */

Legend:
Removed from v.1.162  
changed lines
  Added in v.1.163

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