Mercurial > emacs
diff mac/src/macterm.c @ 35660:b9366f467430
* alloc.c (allocate_string) [macintosh]: Call check_string_bytes
only if current_sblock has been initialized.
* frame.c (Fdelete_frame) [macintosh]: Allow deletion of initial
terminal frame even if it is the only visible frame.
* src/macfns.c (QCconversion): Replaces QCalgorithm.
* src/macfns.c (image_ascent, lookup_image): Adapt to change of
image margins.
* src/macterm.c (x_produce_image_glyph, x_draw_image_foreground)
(x_draw_image_relief, x_draw_image_foreground_1)
(x_draw_image_glyph_string): Adapt to change of image margins.
* src/macterm.c (mac_to_x_fontname): Change charset name of
Simplify Chinese fonts from gb2312 to gb2312.1980 and Korean fonts
from ksc5601 to ksc5601.1989.
author | Andrew Choi <akochoi@shaw.ca> |
---|---|
date | Sun, 28 Jan 2001 11:23:07 +0000 |
parents | 6ff26bad927b |
children | 16e83e3dab3d |
line wrap: on
line diff
--- a/mac/src/macterm.c Sun Jan 28 03:43:35 2001 +0000 +++ b/mac/src/macterm.c Sun Jan 28 11:23:07 2001 +0000 @@ -2051,8 +2051,8 @@ prepare_image_for_display (it->f, img); it->ascent = it->phys_ascent = image_ascent (img, face); - it->descent = it->phys_descent = img->height + 2 * img->margin - it->ascent; - it->pixel_width = img->width + 2 * img->margin; + it->descent = it->phys_descent = img->height + 2 * img->vmargin - it->ascent; + it->pixel_width = img->width + 2 * img->hmargin; it->nglyphs = 1; @@ -4190,11 +4190,8 @@ /* If there is a margin around the image, adjust x- and y-position by that margin. */ - if (s->img->margin) - { - x += s->img->margin; - y += s->img->margin; - } + x += s->img->hmargin; + y += s->img->vmargin; if (s->img->pixmap) { @@ -4271,11 +4268,8 @@ /* If there is a margin around the image, adjust x- and y-position by that margin. */ - if (s->img->margin) - { - x += s->img->margin; - y += s->img->margin; - } + x += s->img->hmargin; + y += s->img->vmargin; if (s->hl == DRAW_IMAGE_SUNKEN || s->hl == DRAW_IMAGE_RAISED) @@ -4320,11 +4314,8 @@ /* If there is a margin around the image, adjust x- and y-position by that margin. */ - if (s->img->margin) - { - x += s->img->margin; - y += s->img->margin; - } + x += s->img->hmargin; + y += s->img->vmargin; if (s->img->pixmap) { @@ -4403,7 +4394,7 @@ | s->face->box | | +------------------------- - | | s->img->margin + | | s->img->vmargin | | | | +------------------- | | | the image @@ -4416,7 +4407,6 @@ { int x, y; int box_line_width = s->face->box_line_width; - int margin = s->img->margin; int height; Pixmap pixmap = 0; @@ -4427,7 +4417,8 @@ flickering. */ s->stippled_p = s->face->stipple != 0; if (height > s->img->height - || margin + || s->img->vmargin + || s->img->hmargin #if 0 /* MAC_TODO: image mask */ || s->img->mask #endif @@ -10278,13 +10269,13 @@ strcpy(cs, "big5-0"); break; case smSimpChinese: - strcpy(cs, "gb2312-0"); + strcpy(cs, "gb2312.1980-0"); break; case smJapanese: strcpy(cs, "jisx0208.1983-sjis"); break; case smKorean: - strcpy(cs, "ksc5601-0"); + strcpy(cs, "ksc5601.1989-0"); break; default: strcpy(cs, "mac-roman"); @@ -10324,9 +10315,9 @@ foundry, family, weight, slant, cs) != 5) return; - if (strcmp (cs, "big5-0") == 0 || strcmp (cs, "gb2312-0") == 0 + if (strcmp (cs, "big5-0") == 0 || strcmp (cs, "gb2312.1980-0") == 0 || strcmp (cs, "jisx0208.1983-sjis") == 0 - || strcmp (cs, "ksc5601-0") == 0 || strcmp (cs, "mac-roman") == 0) + || strcmp (cs, "ksc5601.1989-0") == 0 || strcmp (cs, "mac-roman") == 0) strcpy(mf, family); else sprintf(mf, "%s-%s-%s", foundry, family, cs);