Mercurial > emacs
view oldXMenu/DelPane.c @ 85614:9f3a25157e4f
Make `window-system' into a keyboard-local variable (rather than
frame-local as done originally by multi-tty).
* startup.el (window-system): Remove. Don't make it frame-local.
* keyboard.h (struct kboard): Add Vwindow_system.
* keyboard.c (init_kboard): Set a default for Vwindow_system.
(mark_kboards): Mark Vwindow_system.
* dispnew.c (syms_of_display) <window-system>: Declare terminal-local.
(init_display): Don't set the obsolete `window-system' frame-param.
* xterm.c (x_term_init):
* w32term.c (w32_create_terminal):
* term.c (init_tty): Set Vwindow_system.
* macterm.c (mac_create_terminal): Set a keyboard (missing piece of the
multi-tty merge maybe?), copied from w32term.c. Set Vwindow_system.
* xfns.c (Fx_create_frame, x_create_tip_frame):
* w32fns.c (Fx_create_frame, x_create_tip_frame):
* macfns.c (Fx_create_frame):
Don't set the obsolete `window-system' frame-param.
* frame.h (Qwindow_system): Remove.
* frame.c (Qwindow_system): Remove. In `syms_of_frame' as well.
(Fmake_terminal_frame): Don't set obsolete `window-system' frame-param.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 25 Oct 2007 02:38:41 +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 * * XMenuDeletePane - Deletes a pane from an XMenu object. * * Author: Tony Della Fera, DEC * 20-Nov-85 * */ #include "XMenuInt.h" int XMenuDeletePane(display, menu, p_num) register Display *display; /* Previously opened display */ register XMenu *menu; /* Menu object to be modified. */ register int p_num; /* Pane number to be deleted. */ { register XMPane *p_ptr; /* Pointer to pane being deleted. */ register XMSelect *s_ptr; /* Pointer to selections being deleted. */ register XMSelect *s_next; /* Pointer to next selection to be deleted. */ /* * Find the right pane. */ p_ptr = _XMGetPanePtr(menu, p_num); if (p_ptr == NULL) return(XM_FAILURE); /* * Remove the pane from the association table. */ XDeleteAssoc(display, menu->assoc_tab, p_ptr->window); /* * Remove the pane from the pane list and update * the pane count. */ emacs_remque(p_ptr); menu->p_count--; /* * Remove all the selections in the pane from the * association table and free their XMSelect structures. */ for ( s_ptr = p_ptr->s_list->next; s_ptr != p_ptr->s_list; s_ptr = s_next ) { XDeleteAssoc(display, menu->assoc_tab, s_ptr->window); s_next = s_ptr->next; free(s_ptr); } free(p_ptr->s_list); if (p_ptr->window) { /* * Destroy the selection transparencies. */ XDestroySubwindows(display, p_ptr->window); /* * Destroy the pane window. */ XDestroyWindow(display, p_ptr->window); } /* * Free the pane's XMPane structure. */ free(p_ptr); /* * Schedule a recompute. */ menu->recompute = 1; /* * Return the pane number just deleted. */ _XMErrorCode = XME_NO_ERROR; return(p_num); } /* arch-tag: 32a5bfd4-4bac-4090-bb53-844110f4908e (do not change this comment) */