Mercurial > emacs
view oldXMenu/AddSel.c @ 103344:d04aeff22966
2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsterm.m (ns_use_system_highlight_color): Drop, unused.
2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com>
Changes to support :script/:lang/:otf in NS font driver.
* nsfont.m (nsfont_escape_name, nsfont_unescape_name)
(nsfont_get_family, nsfont_char_width): Rename to ns_ prefix to
indicate not part of font driver interface, and change callers.
(ns_get_family): Remove pointless null check.
(nsfont_spec_to_traits, nsfont_fmember_to_entity): Replace with
ns_spec_to_descriptor, ns_descriptor_to_entity.
(nsfont_trait_distance, nsfont_make_fontset_for_font): Remove.
(ns_attribute_value, ns_attribute_fvalue, ns_has_attribute)
(ns_spec_to_descriptor, ns_descriptor_to_entity)
(ns_charset_covers, ns_lang_to_script, ns_otf_to_script)
(ns_get_req_script, ns_accumulate_script_ranges)
(ns_script_to_charset, ns_get_covering_families, ns_findfonts):
New functions.
(nsfont_list, nsfont_match): Use ns_findfonts.
(nsfont_open): Use font descriptor instead of traits.
(nsfont_draw): Handle "automatic" (lookup-table) compositions.
(dump_glyphstring): Rename to ns_dump_glyphstring.
* nsfns.m (Fns_popup_font_panel): Use shared font manager.
* fontset.c (fontset_from_font): Remove NS-specific code.
2009-06-08 Peter Jones <pjones@pmade.com> (tiny change)
* nsterm.m (ns_draw_window_cursor): Respect cursor_type for
nonactive windows.
2009-06-08 Felix Mueller <felix@enqueue.eu> (tiny change)
* nsterm.m (ns_init_paths): Append path separator to INFOPATH
variable.
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Mon, 08 Jun 2009 04:34:54 +0000 |
parents | fec5e03aaf59 |
children | edf631bdbb7a ec58e5c426ef 5cc91198ffb2 |
line wrap: on
line source
/* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" /* * XMenu: MIT Project Athena, X Window system menu package * * XMenuAddSelection - Adds a selection to an XMenu object. * * Author: Tony Della Fera, DEC * August, 1985 * */ #include <config.h> #include "XMenuInt.h" int XMenuAddSelection(display, menu, p_num, data, label, active, help) Display *display; register XMenu *menu; /* Menu object to be modified. */ register int p_num; /* Pane number to be modified. */ char *data; /* Data value. */ char *label; /* Selection label. */ int active; /* Make selection active? */ char *help; /* Help string */ { register XMPane *pane; /* Pane containing the new selection. */ register XMSelect *select; /* Newly created selection. */ int label_length; /* Label lenght in characters. */ int label_width; /* Label width in pixels. */ /* * Check for NULL pointers! */ if (label == NULL) { _XMErrorCode = XME_ARG_BOUNDS; return(XM_FAILURE); } /* * Find the right pane. */ pane = _XMGetPanePtr(menu, p_num); if (pane == NULL) return(XM_FAILURE); /* * Calloc the XMSelect structure. */ select = (XMSelect *)calloc(1, sizeof(XMSelect)); if (select == NULL) { _XMErrorCode = XME_CALLOC; return(XM_FAILURE); } /* * Determine label size. */ label_length = strlen(label); label_width = XTextWidth(menu->s_fnt_info, label, label_length); /* * Fill the XMSelect structure. */ if (!strcmp (label, "--") || !strcmp (label, "---")) { select->type = SEPARATOR; select->active = 0; } else { select->type = SELECTION; select->active = active; } select->serial = -1; select->label = label; select->label_width = label_width; select->label_length = label_length; select->data = data; select->parent_p = pane; select->help_string = help; /* * Insert the selection at the end of the selection list. */ emacs_insque(select, pane->s_list->prev); /* * Update the selection count. */ pane->s_count++; /* * Schedule a recompute. */ menu->recompute = 1; /* * Return the selection number just added. */ _XMErrorCode = XME_NO_ERROR; return((pane->s_count - 1)); } /* arch-tag: 0161f024-c739-440d-9498-050280c6c355 (do not change this comment) */