Mercurial > emacs
comparison src/macterm.c @ 83490:0cdee8b991e1
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-144
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-145
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-146
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-147
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-148
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-149
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-150
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-151
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-152
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-56
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-57
Copy/update icons from Gnus trunk
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-530
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 12 Mar 2006 04:51:49 +0000 |
parents | 414faf8dce4e 7902af5c098e |
children | 203c9b24206b |
comparison
equal
deleted
inserted
replaced
83489:1e2c51896896 | 83490:0cdee8b991e1 |
---|---|
596 Rect r; | 596 Rect r; |
597 | 597 |
598 SetPortWindowPort (FRAME_MAC_WINDOW (f)); | 598 SetPortWindowPort (FRAME_MAC_WINDOW (f)); |
599 | 599 |
600 RGBForeColor (GC_FORE_COLOR (gc)); | 600 RGBForeColor (GC_FORE_COLOR (gc)); |
601 SetRect (&r, x, y, x + width + 1, y + height + 1); | 601 SetRect (&r, x, y, x + width, y + height); |
602 | 602 |
603 mac_begin_clip (gc); | 603 mac_begin_clip (gc); |
604 FrameRect (&r); /* using foreground color of gc */ | 604 FrameRect (&r); /* using foreground color of gc */ |
605 mac_end_clip (gc); | 605 mac_end_clip (gc); |
606 } | 606 } |
2434 { | 2434 { |
2435 for (i = 0; i < s->nchars; ++i) | 2435 for (i = 0; i < s->nchars; ++i) |
2436 { | 2436 { |
2437 struct glyph *g = s->first_glyph + i; | 2437 struct glyph *g = s->first_glyph + i; |
2438 mac_draw_rectangle (s->f, s->gc, x, s->y, | 2438 mac_draw_rectangle (s->f, s->gc, x, s->y, |
2439 g->pixel_width - 1, s->height - 1); | 2439 g->pixel_width, s->height); |
2440 x += g->pixel_width; | 2440 x += g->pixel_width; |
2441 } | 2441 } |
2442 } | 2442 } |
2443 else | 2443 else |
2444 { | 2444 { |
2513 first character of the composition could not be loaded. */ | 2513 first character of the composition could not be loaded. */ |
2514 if (s->font_not_found_p) | 2514 if (s->font_not_found_p) |
2515 { | 2515 { |
2516 if (s->gidx == 0) | 2516 if (s->gidx == 0) |
2517 mac_draw_rectangle (s->f, s->gc, x, s->y, | 2517 mac_draw_rectangle (s->f, s->gc, x, s->y, |
2518 s->width - 1, s->height - 1); | 2518 s->width, s->height); |
2519 } | 2519 } |
2520 else | 2520 else |
2521 { | 2521 { |
2522 for (i = 0; i < s->nchars; i++, ++s->gidx) | 2522 for (i = 0; i < s->nchars; i++, ++s->gidx) |
2523 mac_draw_string_16 (s->f, s->gc, | 2523 mac_draw_string_16 (s->f, s->gc, |
3066 if (s->hl == DRAW_CURSOR) | 3066 if (s->hl == DRAW_CURSOR) |
3067 { | 3067 { |
3068 int r = s->img->relief; | 3068 int r = s->img->relief; |
3069 if (r < 0) r = -r; | 3069 if (r < 0) r = -r; |
3070 mac_draw_rectangle (s->f, s->gc, x - r, y - r, | 3070 mac_draw_rectangle (s->f, s->gc, x - r, y - r, |
3071 s->slice.width + r*2 - 1, | 3071 s->slice.width + r*2, |
3072 s->slice.height + r*2 - 1); | 3072 s->slice.height + r*2); |
3073 } | 3073 } |
3074 } | 3074 } |
3075 } | 3075 } |
3076 else | 3076 else |
3077 /* Draw a rectangle if image could not be loaded. */ | 3077 /* Draw a rectangle if image could not be loaded. */ |
3078 mac_draw_rectangle (s->f, s->gc, x, y, | 3078 mac_draw_rectangle (s->f, s->gc, x, y, |
3079 s->slice.width - 1, s->slice.height - 1); | 3079 s->slice.width, s->slice.height); |
3080 } | 3080 } |
3081 | 3081 |
3082 | 3082 |
3083 /* Draw a relief around the image glyph string S. */ | 3083 /* Draw a relief around the image glyph string S. */ |
3084 | 3084 |
5243 return; | 5243 return; |
5244 | 5244 |
5245 /* Compute frame-relative coordinates for phys cursor. */ | 5245 /* Compute frame-relative coordinates for phys cursor. */ |
5246 x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); | 5246 x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); |
5247 y = get_phys_cursor_geometry (w, row, cursor_glyph, &h); | 5247 y = get_phys_cursor_geometry (w, row, cursor_glyph, &h); |
5248 wd = w->phys_cursor_width; | 5248 wd = w->phys_cursor_width + 1; |
5249 | 5249 |
5250 /* The foreground of cursor_gc is typically the same as the normal | 5250 /* The foreground of cursor_gc is typically the same as the normal |
5251 background color, which can cause the cursor box to be invisible. */ | 5251 background color, which can cause the cursor box to be invisible. */ |
5252 xgcv.foreground = f->output_data.mac->cursor_pixel; | 5252 xgcv.foreground = f->output_data.mac->cursor_pixel; |
5253 if (dpyinfo->scratch_cursor_gc) | 5253 if (dpyinfo->scratch_cursor_gc) |