Mercurial > emacs
view oldXMenu/DelPane.c @ 108656:0b28d05fa415
Initial reimplementation of calculating line edge positions in bidi lines.
dispextern.h (struct glyph_row): New members minpos and maxpos.
(MATRIX_ROW_START_CHARPOS, MATRIX_ROW_START_BYTEPOS)
(MATRIX_ROW_END_CHARPOS, MATRIX_ROW_END_BYTEPOS): Reference minpos
and maxpos members instead of start.pos and end.pos, respectively.
xdisp.c (display_line): Compare IT_CHARPOS with the position in
row->start.pos, rather than with MATRIX_ROW_START_CHARPOS.
(cursor_row_p): Use row->end.pos rather than MATRIX_ROW_END_CHARPOS.
(try_window_reusing_current_matrix, try_window_id): Use
ROW->minpos rather than ROW->start.pos.
(init_from_display_pos, init_iterator): Use EMACS_INT for
character and byte positions.
(find_row_edges): Renamed from find_row_end. Accept additional
arguments for minimum and maximum buffer positions seen by
display_line for this row. Don't use iterator to find the
position following the maximum one; instead, increment the
position found by display_line directly.
(display_line): Record minimum and maximum buffer positions for
glyphs in this row. Record the position of the newline that
terminates the line.
dispnew.c (increment_row_positions, check_matrix_invariants):
Increment and check row->start.pos and row->end.pos, in addition
to MATRIX_ROW_START_CHARPOS and MATRIX_ROW_END_CHARPOS.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Tue, 18 May 2010 18:22:15 +0300 |
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) */