Mercurial > hg > xemacs-beta
view lwlib/xlwmenuP.h @ 5253:b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
src/ChangeLog addition:
2010-09-01 Aidan Kehoe <kehoea@parhasard.net>
* fns.c (list_merge, list_array_merge_into_list)
(list_array_merge_into_array):
Avoid algorithmic complexity surprises when checking for
circularity in these functions.
(Freduce): Fix some formatting, in passing.
(mapcarX): Drop the SOME_OR_EVERY argument to this function;
instead, take CALLER, a symbol reflecting the Lisp-visible
function that called mapcarX(). Use CALLER with
mapping_interaction_error() when sequences are modified
illegally. Don't cons with #'some, #'every, not even a little.
(Fmapconcat, FmapcarX, Fmapvector, Fmapcan, Fmapc, Fmap)
(Fmap_into, Fsome, Fevery): Call mapcarX() with its new
arguments.
(Fmapcan): Don't unnecessarily complicate the nconc call.
(maplist): Take CALLER, a symbol reflecting the Lisp-visible
function that called maplist(), rather than having separate
arguments to indicate mapl vs. mapcon.
Avoid algorithmic complexity surprises when checking for
circularity. In #'mapcon, check a given stretch of
result for well-formedness once, which was not previously the
case, despite what the comments said.
(Fmaplist, Fmapl, Fmapcon):
Call maplist() with its new arguments.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 01 Sep 2010 12:51:32 +0100 |
| parents | a6c778975d7d |
| children | ade4c7e2c6cb |
line wrap: on
line source
#ifndef INCLUDED_xlwmenuP_h_ #define INCLUDED_xlwmenuP_h_ #include "xlwmenu.h" #include <X11/CoreP.h> #ifdef HAVE_XFT_MENUBARS #include <X11/Xft/Xft.h> #endif /* Elements in the stack arrays. */ typedef struct _window_state { Window window; Position x; Position y; Dimension width; Dimension height; Dimension label_width; Dimension toggle_width; } window_state; /* New fields for the XlwMenu widget instance record */ typedef struct _XlwMenu_part { /* slots set by the resources */ #if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS) XmFontList font_list; XmFontList font_list_2; XmFontList fallback_font_list; #else XFontStruct * font; #ifdef HAVE_XFT_MENUBARS String fcFontName; String xftFontName; XftFont *renderFont; #endif # ifdef USE_XFONTSET XFontSet font_set; # endif #endif Dimension font_ascent, font_descent; /* extracted from font/fontlist */ Pixel foreground; Pixel button_foreground; Pixel highlight_foreground; Pixel title_foreground; Dimension margin; Dimension horizontal_margin; Dimension vertical_margin; Dimension column_spacing; Dimension shadow_thickness; Dimension indicator_size; Pixel top_shadow_color; Pixel bottom_shadow_color; Pixel select_color; #ifdef HAVE_XFT_MENUBARS #endif Pixmap top_shadow_pixmap; Pixmap bottom_shadow_pixmap; Cursor cursor_shape; XtCallbackList open; XtCallbackList select; widget_value* contents; int horizontal; Boolean use_backing_store; Boolean bounce_down; Boolean lookup_labels; /* State of the XlwMenu */ int old_depth; widget_value** old_stack; int old_stack_length; /* New state after the user moved */ int new_depth; widget_value** new_stack; int new_stack_length; /* Window resources */ window_state* windows; int windows_length; /* Internal part, set by the XlwMenu */ GC foreground_gc; GC button_gc; GC background_gc; GC inactive_gc; GC inactive_button_gc; GC shadow_top_gc; GC shadow_bottom_gc; GC select_gc; GC highlight_gc; GC title_gc; Cursor cursor; Boolean popped_up; Pixmap gray_pixmap; /* Stay-up stuff */ Boolean pointer_grabbed; Boolean next_release_must_exit; Time menu_post_time, menu_bounce_time; widget_value * last_selected_val; } XlwMenuPart; /* Full instance record declaration */ typedef struct _XlwMenuRec { CorePart core; XlwMenuPart menu; } XlwMenuRec; /* New fields for the XlwMenu widget class record */ typedef struct { int dummy; } XlwMenuClassPart; /* Full class record declaration. */ typedef struct _XlwMenuClassRec { CoreClassPart core_class; XlwMenuClassPart menu_class; } XlwMenuClassRec; /* Class pointer. */ extern XlwMenuClassRec xlwMenuClassRec; #endif /* INCLUDED_xlwmenuP_h_ */