Mercurial > emacs
comparison src/xterm.c @ 31694:97c48afc4c5a
(x_draw_image_glyph_string): Remove a comment describing
a feature to implement that is already implemented.
(note_mouse_highlight, x_find_ccl_program): Avoid some compiler
warnings.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 18 Sep 2000 13:18:16 +0000 |
parents | 410df09028db |
children | 9ff91d2b19f8 |
comparison
equal
deleted
inserted
replaced
31693:8e9fb2a048ac | 31694:97c48afc4c5a |
---|---|
3964 | 3964 |
3965 y = s->y + box_line_width; | 3965 y = s->y + box_line_width; |
3966 | 3966 |
3967 if (s->img->mask) | 3967 if (s->img->mask) |
3968 { | 3968 { |
3969 /* Create a pixmap as large as the glyph string Fill it with | 3969 /* Create a pixmap as large as the glyph string. Fill it |
3970 the background color. Copy the image to it, using its | 3970 with the background color. Copy the image to it, using |
3971 mask. Copy the temporary pixmap to the display. */ | 3971 its mask. Copy the temporary pixmap to the display. */ |
3972 Screen *screen = FRAME_X_SCREEN (s->f); | 3972 Screen *screen = FRAME_X_SCREEN (s->f); |
3973 int depth = DefaultDepthOfScreen (screen); | 3973 int depth = DefaultDepthOfScreen (screen); |
3974 | 3974 |
3975 /* Create a pixmap as large as the glyph string. */ | 3975 /* Create a pixmap as large as the glyph string. */ |
3976 pixmap = XCreatePixmap (s->display, s->window, | 3976 pixmap = XCreatePixmap (s->display, s->window, |
4000 0, 0, s->background_width, s->height); | 4000 0, 0, s->background_width, s->height); |
4001 XSetForeground (s->display, s->gc, xgcv.foreground); | 4001 XSetForeground (s->display, s->gc, xgcv.foreground); |
4002 } | 4002 } |
4003 } | 4003 } |
4004 else | 4004 else |
4005 /* Implementation idea: Is it possible to construct a mask? | |
4006 We could look at the color at the margins of the image, and | |
4007 say that this color is probably the background color of the | |
4008 image. */ | |
4009 x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height); | 4005 x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height); |
4010 | 4006 |
4011 s->background_filled_p = 1; | 4007 s->background_filled_p = 1; |
4012 } | 4008 } |
4013 | 4009 |
6668 /* Look for a `help-echo' property. */ | 6664 /* Look for a `help-echo' property. */ |
6669 { | 6665 { |
6670 Lisp_Object help, overlay; | 6666 Lisp_Object help, overlay; |
6671 | 6667 |
6672 /* Check overlays first. */ | 6668 /* Check overlays first. */ |
6673 help = Qnil; | 6669 help = overlay = Qnil; |
6674 for (i = noverlays - 1; i >= 0 && NILP (help); --i) | 6670 for (i = noverlays - 1; i >= 0 && NILP (help); --i) |
6675 { | 6671 { |
6676 overlay = overlay_vec[i]; | 6672 overlay = overlay_vec[i]; |
6677 help = Foverlay_get (overlay, Qhelp_echo); | 6673 help = Foverlay_get (overlay, Qhelp_echo); |
6678 } | 6674 } |
13087 x_find_ccl_program (fontp) | 13083 x_find_ccl_program (fontp) |
13088 struct font_info *fontp; | 13084 struct font_info *fontp; |
13089 { | 13085 { |
13090 Lisp_Object list, elt; | 13086 Lisp_Object list, elt; |
13091 | 13087 |
13088 elt = Qnil; | |
13092 for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XCDR (list)) | 13089 for (list = Vfont_ccl_encoder_alist; CONSP (list); list = XCDR (list)) |
13093 { | 13090 { |
13094 elt = XCAR (list); | 13091 elt = XCAR (list); |
13095 if (CONSP (elt) | 13092 if (CONSP (elt) |
13096 && STRINGP (XCAR (elt)) | 13093 && STRINGP (XCAR (elt)) |
13097 && (fast_c_string_match_ignore_case (XCAR (elt), fontp->name) | 13094 && (fast_c_string_match_ignore_case (XCAR (elt), fontp->name) |
13098 >= 0)) | 13095 >= 0)) |
13099 break; | 13096 break; |
13100 } | 13097 } |
13098 | |
13101 if (! NILP (list)) | 13099 if (! NILP (list)) |
13102 { | 13100 { |
13103 struct ccl_program *ccl | 13101 struct ccl_program *ccl |
13104 = (struct ccl_program *) xmalloc (sizeof (struct ccl_program)); | 13102 = (struct ccl_program *) xmalloc (sizeof (struct ccl_program)); |
13105 | 13103 |