mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-22 07:09:54 +00:00
68a256c892
Make the following changes by hand, and run 'admin/merge-gnulib'. * .gitignore: Add lib/malloc/*.gl.h. * admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h directly from Gnulib, without worrying about Gnulib modules, as these files are special cases. (AVOIDED_MODULES): Remove malloc-posix. * lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4: * m4/year2038.m4: New files, copied from Gnulib. * lib/malloca.c, lib/malloca.h: * m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4: Remove. These are either no longer present in Gnulib, or are no longer needed by modules that Emacs uses. * oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first; needed for new Gnulib. * src/xmenu.c: Call emacs_abort, not abort.
124 lines
3.0 KiB
C
124 lines
3.0 KiB
C
/* Copyright Massachusetts Institute of Technology 1985 */
|
|
|
|
/*
|
|
|
|
Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
|
|
|
|
Permission to use, copy, modify, and distribute this
|
|
software and its documentation for any purpose and without
|
|
fee is hereby granted, provided that the above copyright
|
|
notice appear in all copies and that both that copyright
|
|
notice and this permission notice appear in supporting
|
|
documentation, and that the name of M.I.T. not be used in
|
|
advertising or publicity pertaining to distribution of the
|
|
software without specific, written prior permission.
|
|
M.I.T. makes no representations about the suitability of
|
|
this software for any purpose. It is provided "as is"
|
|
without express or implied warranty.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
* 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 "XMenuInt.h"
|
|
#include <string.h>
|
|
|
|
int
|
|
XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char const *help)
|
|
|
|
/* Menu object to be modified. */
|
|
/* Pane number to be modified. */
|
|
/* Data value. */
|
|
/* Selection label. */
|
|
/* Make selection active? */
|
|
/* Help string */
|
|
{
|
|
register XMPane *pane; /* Pane containing the new selection. */
|
|
register XMSelect *sel; /* Newly created selection. */
|
|
|
|
|
|
int label_length; /* Label length 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.
|
|
*/
|
|
sel = (XMSelect *)calloc(1, sizeof(XMSelect));
|
|
if (sel == 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, "---"))
|
|
{
|
|
sel->type = SEPARATOR;
|
|
sel->active = 0;
|
|
}
|
|
else
|
|
{
|
|
sel->type = SELECTION;
|
|
sel->active = active;
|
|
}
|
|
|
|
sel->serial = -1;
|
|
sel->label = label;
|
|
sel->label_width = label_width;
|
|
sel->label_length = label_length;
|
|
sel->data = data;
|
|
sel->parent_p = pane;
|
|
sel->help_string = help;
|
|
|
|
/*
|
|
* Insert the selection at the end of the selection list.
|
|
*/
|
|
emacs_insque(sel, 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));
|
|
}
|