Mercurial > emacs
view oldXMenu/DelPane.c @ 111566:b4dbe6c4111e
Cleanup of window coordinate positioning code.
Now, text area click input events measure Y from the top of the text
area, excluding the header line if any.
* src/dispnew.c (buffer_posn_from_coords): Assume that X counts from
the start of the text area.
* src/keyboard.c (make_lispy_position): For text area clicks, record Y
pixel position relative to the text area, excluding header line.
Also change X and Y to Lisp_Objects, not pointers; don't return
coordinate values via pointers. Pass ON_TEXT_AREA coordinate to
buffer_posn_from_coords counting from the start of the text area.
(Fposn_at_x_y, make_lispy_event): Callers changed.
* src/w32term.c (w32_read_socket):
* src/msdos.c (dos_rawgetc):
* src/xterm.c (handle_one_xevent): Likewise.
* src/window.c (coordinates_in_window): Change X and Y to ints rather
than pointers; don't return coordinates via pointers.
(struct check_window_data): Change X and Y from pointers to ints.
(window_from_coordinates): Remove args WX and WY; don't return
coordinates via pointers.
(Fcoordinates_in_window_p, window_from_coordinates):
(check_window_containing, Fwindow_at): Callers changed.
(window_relative_x_coord): New function.
* src/window.h (window_from_coordinates, window_relative_x_coord):
Update prototypes.
* src/xdisp.c (remember_mouse_glyph): Change window_from_coordinates
call. Use window_relative_x_coord.
(note_mouse_highlight): Change window_from_coordinates call.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Tue, 16 Nov 2010 21:37:45 -0500 |
parents | 5cc91198ffb2 |
children | ef719132ddfa |
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(register Display *display, register XMenu *menu, register int p_num) /* Previously opened display */ /* Menu object to be modified. */ /* 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) */