annotate oldXMenu/AddSel.c @ 106395:f2b36fb84bf7

Enhance `c-parse-state' to run efficiently in "brace desserts". * progmodes/cc-mode.el (c-basic-common-init): Call c-state-cache-init. (c-neutralize-syntax-in-and-mark-CPP): Renamed from c-extend-and-neutralize-syntax-in-CPP. Mark each CPP construct by placing `category' properties value 'c-cpp-delimiter at its boundaries. * progmodes/cc-langs.el (c-before-font-lock-function): c-extend-and-neutralize-syntax-in-CPP has been renamed c-neutralize-syntax-in-and-mark-CPP. * progmodes/cc-fonts.el (c-cpp-matchers): Mark template brackets with `category' properties now, not `syntax-table' ones. * progmodes/cc-engine.el (c-syntactic-end-of-macro): A new enhanced (but slower) version of c-end-of-macro that won't land inside a literal or on another awkward character. (c-state-cache-too-far, c-state-cache-start) (c-state-nonlit-pos-interval, c-state-nonlit-pos-cache) (c-state-nonlit-pos-cache-limit, c-state-point-min) (c-state-point-min-lit-type, c-state-point-min-lit-start) (c-state-min-scan-pos, c-state-brace-pair-desert) (c-state-old-cpp-beg, c-state-old-cpp-end): New constants and buffer local variables. (c-state-literal-at, c-state-lit-beg) (c-state-cache-non-literal-place, c-state-get-min-scan-pos) (c-state-mark-point-min-literal, c-state-cache-top-lparen) (c-state-cache-top-paren, c-state-cache-after-top-paren) (c-get-cache-scan-pos, c-get-fallback-scan-pos) (c-state-balance-parens-backwards, c-parse-state-get-strategy) (c-renarrow-state-cache) (c-append-lower-brace-pair-to-state-cache) (c-state-push-any-brace-pair, c-append-to-state-cache) (c-remove-stale-state-cache) (c-remove-stale-state-cache-backwards, c-state-cache-init) (c-invalidate-state-cache-1, c-parse-state-1) (c-invalidate-state-cache): New defuns/defmacros/defsubsts. (c-parse-state): Enhanced and refactored. (c-debug-parse-state): Amended to deal with all the new variables. * progmodes/cc-defs.el (c-<-as-paren-syntax, c-mark-<-as-paren) (c->-as-paren-syntax, c-mark->-as-paren, c-unmark-<->-as-paren): modify to use category text properties rather than syntax-table ones. (c-suppress-<->-as-parens, c-restore-<->-as-parens): new defsubsts to switch off/on the syntactic paren property of C++ template delimiters using the category property. (c-with-<->-as-parens-suppressed): Macro to invoke code with template delims suppressed. (c-cpp-delimiter, c-set-cpp-delimiters, c-clear-cpp-delimiters): New constant/macros which apply category properties to the start and end of preprocessor constructs. (c-comment-out-cpps, c-uncomment-out-cpps): defsubsts which "comment out" the syntactic value of characters in preprocessor constructs. (c-with-cpps-commented-out) (c-with-all-but-one-cpps-commented-out): Macros to invoke code with characters in all or all but one preprocessor constructs "commented out".
author Alan Mackenzie <acm@muc.de>
date Thu, 03 Dec 2009 16:02:10 +0000
parents fec5e03aaf59
children edf631bdbb7a ec58e5c426ef 5cc91198ffb2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
76174
fec5e03aaf59 Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
1 /* Copyright Massachusetts Institute of Technology 1985 */
fec5e03aaf59 Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents: 75348
diff changeset
2
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
3 #include "copyright.h"
Dave Love <fx@gnu.org>
parents:
diff changeset
4
Dave Love <fx@gnu.org>
parents:
diff changeset
5
Dave Love <fx@gnu.org>
parents:
diff changeset
6 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
7 * XMenu: MIT Project Athena, X Window system menu package
Dave Love <fx@gnu.org>
parents:
diff changeset
8 *
Dave Love <fx@gnu.org>
parents:
diff changeset
9 * XMenuAddSelection - Adds a selection to an XMenu object.
Dave Love <fx@gnu.org>
parents:
diff changeset
10 *
Dave Love <fx@gnu.org>
parents:
diff changeset
11 * Author: Tony Della Fera, DEC
Dave Love <fx@gnu.org>
parents:
diff changeset
12 * August, 1985
Dave Love <fx@gnu.org>
parents:
diff changeset
13 *
Dave Love <fx@gnu.org>
parents:
diff changeset
14 */
Dave Love <fx@gnu.org>
parents:
diff changeset
15
Dave Love <fx@gnu.org>
parents:
diff changeset
16 #include <config.h>
Dave Love <fx@gnu.org>
parents:
diff changeset
17 #include "XMenuInt.h"
Dave Love <fx@gnu.org>
parents:
diff changeset
18
Dave Love <fx@gnu.org>
parents:
diff changeset
19 int
27455
d93b1a9c3c96 (XMenuAddSelection): Add parameter HELP.
Gerd Moellmann <gerd@gnu.org>
parents: 25858
diff changeset
20 XMenuAddSelection(display, menu, p_num, data, label, active, help)
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
21 Display *display;
Dave Love <fx@gnu.org>
parents:
diff changeset
22 register XMenu *menu; /* Menu object to be modified. */
Dave Love <fx@gnu.org>
parents:
diff changeset
23 register int p_num; /* Pane number to be modified. */
Dave Love <fx@gnu.org>
parents:
diff changeset
24 char *data; /* Data value. */
Dave Love <fx@gnu.org>
parents:
diff changeset
25 char *label; /* Selection label. */
Dave Love <fx@gnu.org>
parents:
diff changeset
26 int active; /* Make selection active? */
27455
d93b1a9c3c96 (XMenuAddSelection): Add parameter HELP.
Gerd Moellmann <gerd@gnu.org>
parents: 25858
diff changeset
27 char *help; /* Help string */
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
28 {
Dave Love <fx@gnu.org>
parents:
diff changeset
29 register XMPane *pane; /* Pane containing the new selection. */
Dave Love <fx@gnu.org>
parents:
diff changeset
30 register XMSelect *select; /* Newly created selection. */
Dave Love <fx@gnu.org>
parents:
diff changeset
31
Dave Love <fx@gnu.org>
parents:
diff changeset
32
Dave Love <fx@gnu.org>
parents:
diff changeset
33 int label_length; /* Label lenght in characters. */
Dave Love <fx@gnu.org>
parents:
diff changeset
34 int label_width; /* Label width in pixels. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 27455
diff changeset
35
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
36 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
37 * Check for NULL pointers!
Dave Love <fx@gnu.org>
parents:
diff changeset
38 */
Dave Love <fx@gnu.org>
parents:
diff changeset
39 if (label == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
40 _XMErrorCode = XME_ARG_BOUNDS;
Dave Love <fx@gnu.org>
parents:
diff changeset
41 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
42 }
Dave Love <fx@gnu.org>
parents:
diff changeset
43 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
44 * Find the right pane.
Dave Love <fx@gnu.org>
parents:
diff changeset
45 */
Dave Love <fx@gnu.org>
parents:
diff changeset
46 pane = _XMGetPanePtr(menu, p_num);
Dave Love <fx@gnu.org>
parents:
diff changeset
47 if (pane == NULL) return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
48
Dave Love <fx@gnu.org>
parents:
diff changeset
49 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
50 * Calloc the XMSelect structure.
Dave Love <fx@gnu.org>
parents:
diff changeset
51 */
Dave Love <fx@gnu.org>
parents:
diff changeset
52 select = (XMSelect *)calloc(1, sizeof(XMSelect));
Dave Love <fx@gnu.org>
parents:
diff changeset
53 if (select == NULL) {
Dave Love <fx@gnu.org>
parents:
diff changeset
54 _XMErrorCode = XME_CALLOC;
Dave Love <fx@gnu.org>
parents:
diff changeset
55 return(XM_FAILURE);
Dave Love <fx@gnu.org>
parents:
diff changeset
56 }
Dave Love <fx@gnu.org>
parents:
diff changeset
57 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
58 * Determine label size.
Dave Love <fx@gnu.org>
parents:
diff changeset
59 */
Dave Love <fx@gnu.org>
parents:
diff changeset
60 label_length = strlen(label);
Dave Love <fx@gnu.org>
parents:
diff changeset
61 label_width = XTextWidth(menu->s_fnt_info, label, label_length);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 27455
diff changeset
62
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
63 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
64 * Fill the XMSelect structure.
Dave Love <fx@gnu.org>
parents:
diff changeset
65 */
Dave Love <fx@gnu.org>
parents:
diff changeset
66 if (!strcmp (label, "--") || !strcmp (label, "---"))
Dave Love <fx@gnu.org>
parents:
diff changeset
67 {
Dave Love <fx@gnu.org>
parents:
diff changeset
68 select->type = SEPARATOR;
Dave Love <fx@gnu.org>
parents:
diff changeset
69 select->active = 0;
Dave Love <fx@gnu.org>
parents:
diff changeset
70 }
Dave Love <fx@gnu.org>
parents:
diff changeset
71 else
Dave Love <fx@gnu.org>
parents:
diff changeset
72 {
Dave Love <fx@gnu.org>
parents:
diff changeset
73 select->type = SELECTION;
Dave Love <fx@gnu.org>
parents:
diff changeset
74 select->active = active;
Dave Love <fx@gnu.org>
parents:
diff changeset
75 }
Dave Love <fx@gnu.org>
parents:
diff changeset
76
Dave Love <fx@gnu.org>
parents:
diff changeset
77 select->serial = -1;
Dave Love <fx@gnu.org>
parents:
diff changeset
78 select->label = label;
Dave Love <fx@gnu.org>
parents:
diff changeset
79 select->label_width = label_width;
Dave Love <fx@gnu.org>
parents:
diff changeset
80 select->label_length = label_length;
Dave Love <fx@gnu.org>
parents:
diff changeset
81 select->data = data;
Dave Love <fx@gnu.org>
parents:
diff changeset
82 select->parent_p = pane;
27455
d93b1a9c3c96 (XMenuAddSelection): Add parameter HELP.
Gerd Moellmann <gerd@gnu.org>
parents: 25858
diff changeset
83 select->help_string = help;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 27455
diff changeset
84
25858
Dave Love <fx@gnu.org>
parents:
diff changeset
85 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
86 * Insert the selection at the end of the selection list.
Dave Love <fx@gnu.org>
parents:
diff changeset
87 */
Dave Love <fx@gnu.org>
parents:
diff changeset
88 emacs_insque(select, pane->s_list->prev);
Dave Love <fx@gnu.org>
parents:
diff changeset
89
Dave Love <fx@gnu.org>
parents:
diff changeset
90 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
91 * Update the selection count.
Dave Love <fx@gnu.org>
parents:
diff changeset
92 */
Dave Love <fx@gnu.org>
parents:
diff changeset
93 pane->s_count++;
Dave Love <fx@gnu.org>
parents:
diff changeset
94
Dave Love <fx@gnu.org>
parents:
diff changeset
95 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
96 * Schedule a recompute.
Dave Love <fx@gnu.org>
parents:
diff changeset
97 */
Dave Love <fx@gnu.org>
parents:
diff changeset
98 menu->recompute = 1;
Dave Love <fx@gnu.org>
parents:
diff changeset
99
Dave Love <fx@gnu.org>
parents:
diff changeset
100 /*
Dave Love <fx@gnu.org>
parents:
diff changeset
101 * Return the selection number just added.
Dave Love <fx@gnu.org>
parents:
diff changeset
102 */
Dave Love <fx@gnu.org>
parents:
diff changeset
103 _XMErrorCode = XME_NO_ERROR;
Dave Love <fx@gnu.org>
parents:
diff changeset
104 return((pane->s_count - 1));
Dave Love <fx@gnu.org>
parents:
diff changeset
105 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
106
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
107 /* arch-tag: 0161f024-c739-440d-9498-050280c6c355
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
108 (do not change this comment) */