mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-25 07:28:20 +00:00
55660072db
* Activate.c (XMenuActivate): Callback's first arg is readonly. * AddPane.c (XMenuAddPane): Label is readonly. Rename local to avoid shadowing. * AddSel.c (XMenuAddSelection): Help arg is readonly. Rename local. * Create.c (atoi, atof): Remove decls; include <stdlib.h>. (MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused. (x_get_resource_string): Args are readonly. (XAllocDisplayColor): colorName is readonly. (XMenuCreate): def_env is readonly. Remove unused locals. Avoid "else;". * Destroy.c (XMenuDestroy): Return void. * Error.c (XMenuError): Remove const pointer. * EvHand.c (XMenuEventHandler): Return void. * FindPane.c, FindSel.c: Include <string.h>. * InsPane.c (XMenuInsertPane): Rename local to avoid shadowing. * InsSel.c (XMenuInsertSelection): Likewise. * Internal.c (toggle_color, BUFFER_SIZE): Remove; unused. (_XMErrorList): Now const. (_XMWinQueInit, _XMRecomputeGlobals, _XMTransToOrigin, _XMRefreshPane): (_XMRefreshSelection): Return void. (_XMWinQueFlush, _XMRefreshSelection): Rename locals to avoid shadowing. (_XMWinQueFlush): Use stack, not heap. Don't use uninitialized var. * SetAEQ.c (XMenuSetAEQ): Now returns void. * SetFrz.c (XMenuSetFreeze): Likewise. * X10.h (XAssoc): Use void * for generic pointer. * XDelAssoc.c: Include XMenuInt.h rather than duplicating part of it. * XDestAssoc.c, XMakeAssoc.c: Likewise. * XDestAssoc.c (XDestroyAssocTable): Return void. * XMakeAssoc.c (XMakeAssoc): Use void * for generic pointer. * XMenu.h, XMenuInt.h: Adjust to signature changes. Use const for pointers to readonly storage. * insque.c: Include XMenuInt.h, to check our own signature. (emacs_insque, emacs_remque): Use void * for generic pointers.
117 lines
2.7 KiB
C
117 lines
2.7 KiB
C
/* Copyright Massachusetts Institute of Technology 1985 */
|
|
|
|
#include "copyright.h"
|
|
|
|
|
|
/*
|
|
* XMenu: MIT Project Athena, X Window system menu package
|
|
*
|
|
* XMenuInsertSelection - Inserts a selection into an XMenu object
|
|
*
|
|
* Author: Tony Della Fera, DEC
|
|
* 20-Nov-85
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "XMenuInt.h"
|
|
|
|
int
|
|
XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_num, char *data, char *label, int active)
|
|
/* Menu object to be modified. */
|
|
/* Pane number to be modified. */
|
|
/* Selection number of new selection. */
|
|
/* Data value. */
|
|
/* Selection label. */
|
|
/* Make selection active? */
|
|
{
|
|
register XMPane *p_ptr; /* XMPane pointer. */
|
|
register XMSelect *s_ptr; /* XMSelect pointer. */
|
|
|
|
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.
|
|
*/
|
|
p_ptr = _XMGetPanePtr(menu, p_num);
|
|
if (p_ptr == NULL) return(XM_FAILURE);
|
|
|
|
/*
|
|
* Find the selection number one less than the one specified since that
|
|
* is the selection after which the insertion will occur.
|
|
*/
|
|
s_ptr = _XMGetSelectionPtr(p_ptr, (s_num - 1));
|
|
if (s_ptr == 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->active = active;
|
|
sel->serial = -1;
|
|
sel->label = label;
|
|
sel->label_width = label_width;
|
|
sel->label_length = label_length;
|
|
sel->data = data;
|
|
sel->parent_p = p_ptr;
|
|
|
|
/*
|
|
* Insert the selection after the selection with the selection
|
|
* number one less than the desired number for the new selection.
|
|
*/
|
|
emacs_insque(sel, s_ptr);
|
|
|
|
/*
|
|
* Update the selection count.
|
|
*/
|
|
p_ptr->s_count++;
|
|
|
|
/*
|
|
* Schedule a recompute.
|
|
*/
|
|
menu->recompute = 1;
|
|
|
|
/*
|
|
* Return the selection number just inserted.
|
|
*/
|
|
_XMErrorCode = XME_NO_ERROR;
|
|
return(s_num);
|
|
}
|