Mercurial > emacs
view lwlib/lwlib-Xlw.c @ 68953:0ddd5b380ffb
Use allout invisible-text overlays instead of
selective display for concealed text. Also, lots of general
cleanup, and improved compatibility code.
(allout-version) Incremented, corrected, revised, and refined
module commentary.
(provide 'allout): Moved to the bottom, added a require of overlay.
(allout-encrypt-unencrypted-on-saves): Defaults to t instead of
`except-current'.
(allout-write-file-hook-handler): Minimize delay.
(count-trailing-whitespace-region): New function so
auto-encryption of current topic can resituate cursor exactly.
PGP/GPG encryption trims trailing whitespace from lines, which
must be accounted for across encryption then decryption.
(allout-command-prefix): Now defaults to "\C-c<space>" rather than
just plain "\C-c", to avoid intruding on user's keybinding space.
(allout-toggle-current-subtree-encryption): Pass along fetch-pass
parameter, so user request to provide a new password is done.
(allout-outside-normal-auto-fill-function, allout-auto-fill):
Refined mechanism for auto-filling behavior while in allout mode.
(allout-mode): Explicitly specify the mode map in the docstring.
Clarify provision for various write-file hook var names.
Adjusted for invisible-text overlays instead of selective-display.
(allout-depth): Really return 0 if not within any topic. This
rectifies `allout-beginning-of-level' and sequence numbering
errors that occur when cutting and pasting numbered topics.
Changed from a in-line subst to a regular function, as well.
(allout-pre-next-prefix): Renamed from allout-pre-next-preface.
(allout-end-of-subtree, allout-end-of-subtree)
(allout-end-of-entry, allout-end-of-current-heading)
(allout-next-visible-heading, allout-open-topic, allout-show-entry)
(allout-show-children, allout-show-to-offshoot)
(allout-hide-current-entry, allout-show-current-entry): Rectified
handling of trailing blank lines between items.
(allout-line-boundary-regexp, set-allout-regexp, allout-depth)
(allout-current-depth, allout-unprotected, allout-hidden-p)
(allout-on-current-heading-p, allout-listify-exposed)
(allout-chart-subtree, allout-goto-prefix)
(allout-back-to-current-heading, allout-get-body-text)
(allout-snug-back, allout-flag-current-subtree, allout-show-all)
(allout-hide-region-body, allout-toggle-subtree-encryption)
(allout-encrypt-string, allout-encrypted-key-info)
(allout-next-topic-pending-encryption, allout-encrypt-decrypted)
(allout-file-vars-section-data): Adjusted for use with
invisible-text overlays instead of selective-display.
(allout-kill-line, allout-kill-topic, allout-yank-processing):
Reworked for use with invisible text overlays.
(allout-current-topic-collapsed-p): New function.
(allout-hide-current-subtree): Use allout-current-topic-collapsed-p
to know when to close the containing topic.
(allout-pre-command-business, allout-post-command-business):
Simplify undo-batching and dynamic isearch exposure.
(allout-set-overlay-category): New for invisible-text overlays.
Sets properties of allout-overlay-category, used by
allout-flag-region to set invisible-text overlay properties.
(allout-get-invisibility-overlay): Get the first qualifying
invisibility overlay, so we can find the extent of it.
(allout-back-to-visible-text): Get to just before the beginnining
of the current invisibility overlay, if any.
(allout-overlay-insert-in-front-handler)
(allout-overlay-interior-modification-handler)
(allout-before-change-handler, allout-isearch-end-handler): New
functions to handle extraordinary actions affecting concealed
text.
(allout-flag-region): Use overlays instead of selective-display
for invisible text - by inheritence from the properties of
allout-overlay-category in mainline emacs, and applied
property-by-property in xemacs, some recent versions of which
don't inherit the properties from the category. Provisions to
respond to concealed-text edits simplified drastically.
(allout-isearch-rectification, allout-isearch-was-font-lock)
(allout-isearch-expose, allout-enwrap-isearch)
(allout-isearch-abort, allout-pre-was-isearching)
(allout-isearch-prior-pos, allout-isearch-did-quit)
(allout-isearch-dynamic-expose)
(allout-hide-current-entry-completely): Functions deleted.
(allout-undo-aggregation): Explicit undo aggregation no longer
necessary due to transition away from selective-display.
(set-allout-regexp, allout-up-current-level)
(allout-next-visible-heading, allout-forward-current-level)
(allout-open-topic, allout-reindent-body, allout-rebullet-topic)
(allout-kill-line, allout-yank-processing, allout-show-children)
(allout-expose-topic, allout-old-expose-topic)
(allout-listify-exposed, allout-insert-latex-header)
(allout-toggle-subtree-encryption, allout-encrypt-string)
(remove-from-invisibility-spec, allout-hide-current-subtree):
Ditched unused variables.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 17 Feb 2006 10:52:30 +0000 |
parents | e8a3fb527b77 |
children | 6be52bf115d4 c5406394f567 |
line wrap: on
line source
/* The lwlib interface to "xlwmenu" menus. Copyright (C) 1992 Lucid, Inc. Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. The Lucid Widget Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. The Lucid Widget Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "lisp.h" #include "lwlib-Xlw.h" #include <X11/StringDefs.h> #include <X11/IntrinsicP.h> #include <X11/ObjectP.h> #include <X11/CompositeP.h> #include <X11/Shell.h> #include "xlwmenu.h" #if 0 #include <stdio.h> /* Print the complete X resource name of widget WIDGET to stderr. This is sometimes handy to have available. */ void x_print_complete_resource_name (widget) Widget widget; { int i; String names[100]; for (i = 0; i < 100 && widget != NULL; ++i) { names[i] = XtName (widget); widget = XtParent (widget); } for (--i; i >= 1; --i) fprintf (stderr, "%s.", names[i]); fprintf (stderr, "%s\n", names[0]); } #endif /* 0 */ /* Menu callbacks */ /* Callback XtNhighlightCallback for Lucid menus. W is the menu widget, CLIENT_DATA contains a pointer to the widget_instance for the menu, CALL_DATA contains a pointer to the widget_value structure for the highlighted menu item. The latter may be null if there isn't any highlighted menu item. */ static void highlight_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { widget_instance *instance = (widget_instance *) client_data; if (instance->info->highlight_cb && !w->core.being_destroyed) instance->info->highlight_cb (w, instance->info->id, call_data); } static void pre_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { widget_instance* instance = (widget_instance*)client_data; widget_value* val; if (w->core.being_destroyed) return; val = lw_get_widget_value_for_widget (instance, w); if (instance->info->pre_activate_cb) instance->info->pre_activate_cb (w, instance->info->id, val ? val->call_data : NULL); } static void pick_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { widget_instance* instance = (widget_instance*)client_data; widget_value* contents_val = (widget_value*)call_data; widget_value* widget_val; XtPointer widget_arg; if (w->core.being_destroyed) return; if (instance->info->selection_cb && contents_val && contents_val->enabled && !contents_val->contents) instance->info->selection_cb (w, instance->info->id, contents_val->call_data); widget_val = lw_get_widget_value_for_widget (instance, w); widget_arg = widget_val ? widget_val->call_data : NULL; if (instance->info->post_activate_cb) instance->info->post_activate_cb (w, instance->info->id, widget_arg); } /* creation functions */ static Widget xlw_create_menubar (instance) widget_instance* instance; { Widget widget; Arg al[5]; int ac = 0; XtSetArg (al[ac], XtNmenu, instance->info->val); ac++; #ifdef emacs XtSetArg (al[ac], XtNshowGrip, 0); ac++; XtSetArg (al[ac], XtNresizeToPreferred, 1); ac++; XtSetArg (al[ac], XtNallowResize, 1); ac++; #endif /* This used to use XtVaCreateWidget, but an old Xt version has a bug in XtVaCreateWidget that frees instance->info->name. */ widget = XtCreateWidget (instance->info->name, xlwMenuWidgetClass, instance->parent, al, ac); XtAddCallback (widget, XtNopen, pre_hook, (XtPointer)instance); XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance); XtAddCallback (widget, XtNhighlightCallback, highlight_hook, (XtPointer)instance); return widget; } static Widget xlw_create_popup_menu (instance) widget_instance* instance; { Widget popup_shell = XtCreatePopupShell (instance->info->name, overrideShellWidgetClass, instance->parent, NULL, 0); Widget widget; Arg al[2]; int ac = 0; XtSetArg (al[ac], XtNmenu, instance->info->val); ac++; XtSetArg (al[ac], XtNhorizontal, False); ac++; /* This used to use XtVaManagedCreateWidget, but an old Xt version has a bug in XtVaManagedCreateWidget that frees instance->info->name. */ widget = XtCreateManagedWidget ("popup", xlwMenuWidgetClass, popup_shell, al, ac); XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance); XtAddCallback (widget, XtNhighlightCallback, highlight_hook, (XtPointer)instance); return popup_shell; } widget_creation_entry xlw_creation_table [] = { {"menubar", xlw_create_menubar}, {"popup", xlw_create_popup_menu}, {NULL, NULL} }; Boolean lw_lucid_widget_p (widget) Widget widget; { WidgetClass the_class = XtClass (widget); if (the_class == xlwMenuWidgetClass) return True; if (the_class == overrideShellWidgetClass) return (XtClass (((CompositeWidget)widget)->composite.children [0]) == xlwMenuWidgetClass); return False; } void #ifdef PROTOTYPES xlw_update_one_widget (widget_instance* instance, Widget widget, widget_value* val, Boolean deep_p) #else xlw_update_one_widget (instance, widget, val, deep_p) widget_instance* instance; Widget widget; widget_value* val; Boolean deep_p; #endif { Arg al[1]; /* This used to use XtVaSetValues, but some old Xt versions that have a bug in XtVaCreateWidget might have it here too. */ XtSetArg (al[0], XtNmenu, instance->info->val); XtSetValues (widget, al, 1); } void xlw_update_one_value (instance, widget, val) widget_instance* instance; Widget widget; widget_value* val; { return; } void #ifdef PROTOTYPES xlw_pop_instance (widget_instance* instance, Boolean up) #else xlw_pop_instance (instance, up) widget_instance* instance; Boolean up; #endif { } void xlw_popup_menu (widget, event) Widget widget; XEvent *event; { XlwMenuWidget mw; if (!XtIsShell (widget)) return; mw = (XlwMenuWidget)((CompositeWidget)widget)->composite.children [0]; if (event) XtCallActionProc ((Widget) mw, "start", event, NULL, 0); else { XEvent dummy; XButtonPressedEvent *bd = &dummy.xbutton; bd->type = ButtonPress; bd->serial = 0; bd->send_event = 0; bd->display = XtDisplay (widget); bd->window = XtWindow (XtParent (widget)); bd->time = CurrentTime; bd->button = 0; XQueryPointer (bd->display, bd->window, &bd->root, &bd->subwindow, &bd->x_root, &bd->y_root, &bd->x, &bd->y, &bd->state); XtCallActionProc ((Widget) mw, "start", &dummy, NULL, 0); } } /* Destruction of instances */ void xlw_destroy_instance (instance) widget_instance* instance; { if (instance->widget) XtDestroyWidget (instance->widget); } /* arch-tag: 541e3912-477d-406e-9bf2-dbf2b7ff8c3b (do not change this comment) */