Mercurial > emacs
view oldXMenu/Recomp.c @ 26879:b4de7fa9866e
(x_append_glyph): Setup members of struct glyph properly
for composition.
(x_append_composite_glyph): New function.
(VCENTER_BASELINE_OFFSET): New macro.
(x_produce_glyphs): If it->what == IT_COMPOSITION, setup members
of struct it for the composition. Cache pixel offsets in the
struct composition. Delete codes for a composite character.
Handle Vignore_relative_composition in composition code.
(struct glyph_string): Delete member cmpcharp, add new member cmp.
(x_set_cursor_gc): Check s->cmp, not s->cmpcharp.
(x_compute_glyph_string_overhangs): Likewise.
(x_get_glyph_overhangs): Delete codes for a composite character.
(x_right_overwritten): Check s->cmp, not s->cmpcharp.
(x_draw_glyph_string_background): Likewise. Delete codes for
checking s->gidx for a composition.
(x_draw_glyph_string_foreground): Delete code for a composite
character.
(x_draw_composite_glyph_string_foreground): New function.
(x_draw_glyph_string_box): Check s->cmp, not s->cmpcharp.
(x_draw_glyph_string): Handle the case of COMPOSITE_GLYPH.
(struct work): Deleted.
(x_fill_composite_glyph_string): Argument changed. Mostly
rewritten for that.
(x_fill_glyph_string): Don't check CHARSET_COMPOSITION.
(BUILD_CHAR_GLYPH_STRINGS): Don't handle composition here.
(BUILD_COMPOSITE_GLYPH_STRING): New macro.
(BUILD_GLYPH_STRINGS): For composition, call
BUILD_COMPOSITE_GLYPH_STRING.
(x_new_font): Initialize f->output_data.x->baseline_offset, not
f->output_data.x->font_baseline.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 15 Dec 1999 00:27:21 +0000 |
parents | bbce331da1be |
children | 23a1cea22d13 |
line wrap: on
line source
#include "copyright.h" /* $Header: /u/src/emacs/19.0/oldXMenu/RCS/Recomp.c,v 1.1 1992/04/11 22:10:20 jimb Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* * XMenu: MIT Project Athena, X Window system menu package * * XMenuRecompute - Recompute XMenu object dependencies. * * Author: Tony Della Fera, DEC * September, 1985 * */ #include "XMenuInt.h" int XMenuRecompute(display, menu) Display *display; register XMenu *menu; /* Menu object to be recomputed. */ { register XMPane *p_ptr; /* Pane pointer. */ register XMSelect *s_ptr; /* Selection pointer. */ register int p_num; /* Pane serial number. */ register int s_num; /* Selection serial number. */ /* * If there are no panes in the menu then return failure * because the menu is not initialized. */ if (menu->p_count == 0) { _XMErrorCode = XME_NOT_INIT; return(XM_FAILURE); } /* * Recompute menu wide global values: pane window size, * selection size and maximum selection count. */ _XMRecomputeGlobals(display, menu); /* * For each pane in the menu... */ p_num = 0; for ( p_ptr = menu->p_list->next; p_ptr != menu->p_list; p_ptr = p_ptr->next ){ /* * Recompute pane dependencies. */ if (_XMRecomputePane(display, menu, p_ptr, p_num) == _FAILURE) { return(XM_FAILURE); } p_num++; /* * For each selection in the pane... */ s_num = 0; for ( s_ptr = p_ptr->s_list->next; s_ptr != p_ptr->s_list; s_ptr = s_ptr->next ) { /* * Recompute selection dependencies. */ if (_XMRecomputeSelection(display, menu, s_ptr, s_num) == _FAILURE) { return(XM_FAILURE); } s_num++; } } /* * Recompute menu size. */ if (menu->menu_style == CENTER) { menu->width = menu->p_width + (menu->p_bdr_width << 1); } else { menu->width = menu->p_width + (menu->p_bdr_width << 1) + ((menu->p_count - 1) * menu->p_x_off); } menu->height = menu->p_height + (menu->p_bdr_width << 1) + ((menu->p_count - 1) * menu->p_y_off); /* * Reset the recompute flag. */ menu->recompute = 0; /* * Return successfully. */ _XMErrorCode = XME_NO_ERROR; return(XM_SUCCESS); }