view oldXMenu/AddSel.c @ 26058:c11f0832a7c5

(Fconstrain_to_field): Make sure we don't violate the argument preconditions of find_before_next_newline in the case where both ONLY_IN_LINE and ESCAPE_FROM_EDGE are set and OLD_POS was indeed at the edge. (text_property_eq, text_property_stickiness): Don't use initializers for auto variables of type Lisp_Object. (find_field): Likewise. Use braces around nested ifs. (Fline_end_position): Store the raw eol in a variable, so that the final expression doesn't look so ugly. (Fconstrain_to_field): Doc fix. (preceding_pos): Renamed from `preceeding_pos'. (text_property_stickiness, find_field): Call preceding_pos, not preceeding_pos. (Ffield_string_no_properties): New function. (text_property_stickiness, preceeding_pos): New functions. (Ffield_string): Remove PROPS parameter. (find_field): Add MERGE_AT_BOUNDARY parameter. Rewrite to use stickiness of `field' property to resolve ambiguous cases. (Ffield_beginning, Ffield_end): Add ESCAPE_FROM_EDGE parameter. (Fconstrain_to_field): Likewise. (syms_of_editfns): Init Sfield_string_no_properties. (Ffield_string, Ferase_field, Ffield_end): Supply new MERGE_AT_BOUNDARY argument to find_field. (Fline_beginning_position, Fline_end_position): Supply new ESCAPE_FROM_EDGE parameter to Fconstrain_to_field. Pass a value of Qt for the ONLY_IN_LINE argument to Fconstrain_to_field (only matters if N != 1). (Fconstrain_to_field): Add get/set-current-point behavior when NEW_POS is nil. (find_field): Use XSETFASTINT instead of make_number. (Qfield): New variable. (find_field, Ferase_field, Ffield_string, Ffield_beginning, Ffield_end, Fconstrain_to_field): New functions. (Fline_beginning_position, Fline_end_position): Constrain to any field. (make_buffer_string_both): Remove minibuffer-prompt hack. (syms_of_editfns): Initialize Qfield, and subr entries for field functions above.

#include "copyright.h"

/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/AddSel.c,v 1.1 1992/04/11 22:10:17 jimb Exp $ */
/* Copyright    Massachusetts Institute of Technology    1985	*/

/*
 * 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)
    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? */
{
    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;
    
    /*
     * 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));
}