mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-23 10:34:07 +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.
118 lines
3.2 KiB
C
118 lines
3.2 KiB
C
/* Copyright Massachusetts Institute of Technology 1985 */
|
|
|
|
#include "copyright.h"
|
|
|
|
|
|
/*
|
|
* XMenu: MIT Project Athena, X Window system menu package
|
|
*
|
|
* XMenuDestroy - Free all resources associated with and XMenu.
|
|
*
|
|
* Author: Tony Della Fera, DEC
|
|
* August, 1985
|
|
*
|
|
*/
|
|
|
|
#include "XMenuInt.h"
|
|
|
|
void
|
|
XMenuDestroy(Display *display, register XMenu *menu)
|
|
|
|
/* Menu object to destroy. */
|
|
{
|
|
register XMPane *p_ptr; /* Pointer to the current pane. */
|
|
register XMPane *p_next; /* Pointer to the next pane. */
|
|
register XMSelect *s_ptr; /* Pointer to the current selection. */
|
|
register XMSelect *s_next; /* Pointer to the next selection. */
|
|
|
|
/*
|
|
* Destroy the selection and pane X windows and free
|
|
* their corresponding XMWindows.
|
|
*/
|
|
for (
|
|
p_ptr = menu->p_list->next;
|
|
p_ptr != menu->p_list;
|
|
p_ptr = p_next
|
|
) {
|
|
for (
|
|
s_ptr = p_ptr->s_list->next;
|
|
s_ptr != p_ptr->s_list;
|
|
s_ptr = s_next
|
|
) {
|
|
s_next = s_ptr->next;
|
|
free(s_ptr);
|
|
}
|
|
if (p_ptr->window) {
|
|
XDestroySubwindows(display, p_ptr->window);
|
|
XDestroyWindow(display, p_ptr->window);
|
|
}
|
|
p_next = p_ptr->next;
|
|
free(p_ptr);
|
|
}
|
|
|
|
/*
|
|
* Destroy the association table.
|
|
*/
|
|
XDestroyAssocTable(menu->assoc_tab);
|
|
|
|
/*
|
|
* Free the mouse cursor.
|
|
*/
|
|
XFreeCursor(display, menu->mouse_cursor);
|
|
|
|
/*
|
|
* Free the fonts.
|
|
*/
|
|
XFreeFont(display, menu->p_fnt_info);
|
|
XFreeFont(display, menu->s_fnt_info);
|
|
|
|
/*
|
|
* Free the pixmaps.
|
|
*/
|
|
/* XFreePixmap(display, menu->p_bdr_pixmap);
|
|
XFreePixmap(display, menu->s_bdr_pixmap);
|
|
XFreePixmap(display, menu->p_frg_pixmap);
|
|
XFreePixmap(display, menu->s_frg_pixmap);
|
|
XFreePixmap(display, menu->bkgnd_pixmap); */
|
|
XFreePixmap(display, menu->inact_pixmap);
|
|
|
|
/*
|
|
* Free the color cells.
|
|
*/
|
|
if ((menu->p_bdr_color != BlackPixel(display, DefaultScreen(display))) && (menu->p_bdr_color != WhitePixel(display, DefaultScreen(display))))
|
|
XFreeColors(
|
|
display,
|
|
DefaultColormap(display, DefaultScreen(display)),
|
|
&menu->p_bdr_color,
|
|
1, 0);
|
|
if ((menu->s_bdr_color != BlackPixel(display, DefaultScreen(display))) && (menu->s_bdr_color != WhitePixel(display, DefaultScreen(display))))
|
|
XFreeColors(
|
|
display,
|
|
DefaultColormap(display, DefaultScreen(display)),
|
|
&menu->s_bdr_color,
|
|
1, 0);
|
|
if ((menu->p_frg_color != BlackPixel(display, DefaultScreen(display))) && (menu->p_frg_color != WhitePixel(display, DefaultScreen(display))))
|
|
XFreeColors(
|
|
display,
|
|
DefaultColormap(display, DefaultScreen(display)),
|
|
&menu->p_frg_color,
|
|
1, 0);
|
|
if ((menu->s_frg_color != BlackPixel(display, DefaultScreen(display))) && (menu->s_frg_color != WhitePixel(display, DefaultScreen(display))))
|
|
XFreeColors(
|
|
display,
|
|
DefaultColormap(display, DefaultScreen(display)),
|
|
&menu->s_frg_color,
|
|
1, 0);
|
|
if ((menu->bkgnd_color != BlackPixel(display, DefaultScreen(display))) && (menu->bkgnd_color != WhitePixel(display, DefaultScreen(display))))
|
|
XFreeColors(
|
|
display,
|
|
DefaultColormap(display, DefaultScreen(display)),
|
|
&menu->bkgnd_color,
|
|
1, 0);
|
|
|
|
/*
|
|
* Free the XMenu.
|
|
*/
|
|
free(menu);
|
|
}
|