[Emacs-diffs] Changes to emacs/src/xdisp.c

[Jan Dj�rv]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.992 emacs/src/xdisp.c:1.993
*** emacs/src/xdisp.c:1.992     Thu Mar 10 14:55:22 2005
--- emacs/src/xdisp.c   Sun Mar 20 22:28:55 2005
***************
*** 17366,17374 ****
  
  #ifdef HAVE_WINDOW_SYSTEM
        if (EQ (prop, Qheight))
!       return OK_PIXELS (font ? FONT_HEIGHT ((XFontStruct *)font) : 
FRAME_LINE_HEIGHT (it->f));
        if (EQ (prop, Qwidth))
!       return OK_PIXELS (font ? FONT_WIDTH ((XFontStruct *)font) : 
FRAME_COLUMN_WIDTH (it->f));
  #else
        if (EQ (prop, Qheight) || EQ (prop, Qwidth))
        return OK_PIXELS (1);
--- 17366,17374 ----
  
  #ifdef HAVE_WINDOW_SYSTEM
        if (EQ (prop, Qheight))
!       return OK_PIXELS (font ? FONT_HEIGHT ((x_font_type *)font) : 
FRAME_LINE_HEIGHT (it->f));
        if (EQ (prop, Qwidth))
!       return OK_PIXELS (font ? FONT_WIDTH ((x_font_type *)font) : 
FRAME_COLUMN_WIDTH (it->f));
  #else
        if (EQ (prop, Qheight) || EQ (prop, Qwidth))
        return OK_PIXELS (1);
***************
*** 17794,17801 ****
        int two_byte_p;
  
        s->face = get_glyph_face_and_encoding (s->f, glyph,
!                                              s->char2b + s->nchars,
!                                              &two_byte_p);
        s->two_byte_p = two_byte_p;
        ++s->nchars;
        xassert (s->nchars <= end - start);
--- 17794,17801 ----
        int two_byte_p;
  
        s->face = get_glyph_face_and_encoding (s->f, glyph,
!                                              s->char2b + s->nchars,
!                                              &two_byte_p);
        s->two_byte_p = two_byte_p;
        ++s->nchars;
        xassert (s->nchars <= end - start);
***************
*** 17905,17911 ****
  
    if (glyph->type == CHAR_GLYPH)
      {
!       XFontStruct *font;
        struct face *face;
        struct font_info *font_info;
        XChar2b char2b;
--- 17905,17911 ----
  
    if (glyph->type == CHAR_GLYPH)
      {
!       x_font_type *font;
        struct face *face;
        struct font_info *font_info;
        XChar2b char2b;
***************
*** 17915,17921 ****
        font = face->font;
        font_info = FONT_INFO_FROM_ID (f, face->font_info_id);
        if (font  /* ++KFS: Should this be font_info ?  */
!         && (pcm = rif->per_char_metric (font, &char2b, glyph->font_type)))
        {
          if (pcm->rbearing > pcm->width)
            *right = pcm->rbearing - pcm->width;
--- 17915,17921 ----
        font = face->font;
        font_info = FONT_INFO_FROM_ID (f, face->font_info_id);
        if (font  /* ++KFS: Should this be font_info ?  */
!         && (pcm = rif->per_char_metric (f, font, &char2b, glyph->font_type)))
        {
          if (pcm->rbearing > pcm->width)
            *right = pcm->rbearing - pcm->width;
***************
*** 18909,18915 ****
    int ascent = 0;
    double tem;
    struct face *face = FACE_FROM_ID (it->f, it->face_id);
!   XFontStruct *font = face->font ? face->font : FRAME_FONT (it->f);
  
    PREPARE_FACE_FOR_DISPLAY (it->f, face);
  
--- 18909,18915 ----
    int ascent = 0;
    double tem;
    struct face *face = FACE_FROM_ID (it->f, it->face_id);
!   x_font_type *font = face->font ? face->font : FRAME_FONT (it->f);
  
    PREPARE_FACE_FOR_DISPLAY (it->f, face);
  
***************
*** 19060,19066 ****
  calc_line_height_property (it, val, font, boff, override)
       struct it *it;
       Lisp_Object val;
!      XFontStruct *font;
       int boff, override;
  {
    Lisp_Object face_name = Qnil;
--- 19060,19066 ----
  calc_line_height_property (it, val, font, boff, override)
       struct it *it;
       Lisp_Object val;
!      x_font_type *font;
       int boff, override;
  {
    Lisp_Object face_name = Qnil;
***************
*** 19150,19156 ****
    if (it->what == IT_CHARACTER)
      {
        XChar2b char2b;
!       XFontStruct *font;
        struct face *face = FACE_FROM_ID (it->f, it->face_id);
        XCharStruct *pcm;
        int font_not_found_p;
--- 19150,19156 ----
    if (it->what == IT_CHARACTER)
      {
        XChar2b char2b;
!       x_font_type *font;
        struct face *face = FACE_FROM_ID (it->f, it->face_id);
        XCharStruct *pcm;
        int font_not_found_p;
***************
*** 19220,19227 ****
  
          it->nglyphs = 1;
  
!         pcm = rif->per_char_metric (font, &char2b,
!                                     FONT_TYPE_FOR_UNIBYTE (font, 
it->char_to_display));
  
          if (it->override_ascent >= 0)
            {
--- 19220,19228 ----
  
          it->nglyphs = 1;
  
!         pcm = rif->per_char_metric (it->f, font, &char2b,
!                                     FONT_TYPE_FOR_UNIBYTE (font,
!                                                              
it->char_to_display));
  
          if (it->override_ascent >= 0)
            {
***************
*** 19452,19458 ****
             from the charset width; this is what old redisplay code
             did.  */
  
!         pcm = rif->per_char_metric (font, &char2b,
                                      FONT_TYPE_FOR_MULTIBYTE (font, it->c));
  
          if (font_not_found_p || !pcm)
--- 19453,19459 ----
             from the charset width; this is what old redisplay code
             did.  */
  
!         pcm = rif->per_char_metric (it->f, font, &char2b,
                                      FONT_TYPE_FOR_MULTIBYTE (font, it->c));
  
          if (font_not_found_p || !pcm)
***************
*** 19513,19519 ****
        /* Note: A composition is represented as one glyph in the
         glyph matrix.  There are no padding glyphs.  */
        XChar2b char2b;
!       XFontStruct *font;
        struct face *face = FACE_FROM_ID (it->f, it->face_id);
        XCharStruct *pcm;
        int font_not_found_p;
--- 19514,19520 ----
        /* Note: A composition is represented as one glyph in the
         glyph matrix.  There are no padding glyphs.  */
        XChar2b char2b;
!       x_font_type *font;
        struct face *face = FACE_FROM_ID (it->f, it->face_id);
        XCharStruct *pcm;
        int font_not_found_p;
***************
*** 19584,19591 ****
  
          /* Initialize the bounding box.  */
          if (font_info
!             && (pcm = rif->per_char_metric (font, &char2b,
!                                             FONT_TYPE_FOR_MULTIBYTE (font, 
it->c))))
            {
              width = pcm->width;
              ascent = pcm->ascent;
--- 19585,19593 ----
  
          /* Initialize the bounding box.  */
          if (font_info
!             && (pcm = rif->per_char_metric (it->f, font, &char2b,
!                                             FONT_TYPE_FOR_MULTIBYTE (font,
!                                                                        
it->c))))
            {
              width = pcm->width;
              ascent = pcm->ascent;
***************
*** 19643,19649 ****
                }
  
              if (font_info
!                 && (pcm = rif->per_char_metric (font, &char2b,
                                                  FONT_TYPE_FOR_MULTIBYTE 
(font, ch))))
                {
                  width = pcm->width;
--- 19645,19651 ----
                }
  
              if (font_info
!                 && (pcm = rif->per_char_metric (it->f, font, &char2b,
                                                  FONT_TYPE_FOR_MULTIBYTE 
(font, ch))))
                {
                  width = pcm->width;