~ubuntu-branches/ubuntu/lucid/libx11/lucid

« back to all changes in this revision

Viewing changes to src/TextExt.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-01-17 16:34:54 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090117163454-gaey3cd32xyavueo
Tags: 2:1.1.99.2-1build1
Fakesync with Debian, all previous Ubuntu changes are included
in the new upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
#define max_byte2 max_char_or_byte2
44
44
 
45
45
 
46
 
/* 
 
46
/*
47
47
 * CI_GET_ROWZERO_CHAR_INFO_2D - do the same thing as CI_GET_CHAR_INFO_1D,
48
48
 * except that the font has more than one row.  This is special case of more
49
49
 * general version used in XTextExt16.c since row == 0.  This is used when
121
121
            } else {
122
122
                overall->ascent = max (overall->ascent, cs->ascent);
123
123
                overall->descent = max (overall->descent, cs->descent);
124
 
                overall->lbearing = min (overall->lbearing, 
 
124
                overall->lbearing = min (overall->lbearing,
125
125
                                         overall->width + cs->lbearing);
126
126
                overall->rbearing = max (overall->rbearing,
127
127
                                         overall->width + cs->rbearing);
134
134
     * if there were no characters, then set everything to 0
135
135
     */
136
136
    if (nfound == 0) {
137
 
        overall->width = overall->ascent = overall->descent = 
 
137
        overall->width = overall->ascent = overall->descent =
138
138
          overall->lbearing = overall->rbearing = 0;
139
139
    }
140
140
 
143
143
 
144
144
 
145
145
/*
146
 
 * XTextWidth - compute the width of a string of eightbit bytes.  This is a 
 
146
 * XTextWidth - compute the width of a string of eightbit bytes.  This is a
147
147
 * subset of XTextExtents.
148
148
 */
149
149
int