Mercurial > emacs
annotate oldXMenu/InsPane.c @ 109748:e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
* callproc.c (synch_process_death): Make const.
(Fcall_process): Make signame const.
* emacs.c (main): Pass char[] to putenv instead of literal.
* floatfns.c (matherr): Use a const char* variable for x->name.
* font.c (font_open_by_name): Make name const.
* font.h (font_open_by_name): Make name const.
* gtkutil.c (get_utf8_string): Always return an allocated string.
Parameter is const.
(create_dialog, xg_create_one_menuitem, create_menus)
(xg_item_label_same_p, xg_update_menu_item): Free result from
get_utf8_string.
(xg_separator_p, xg_item_label_same_p): label is const.
* gtkutil.h: Replace widget_value with struct _widget_value.
(enum button_type, struct _widget_value): Remove and use the one from
keyboard.h.
* keyboard.h (_widget_value): Add defined USE_GTK. Replace Boolean
with unsigned char and XtPointer with void *.
* menu.c (Fx_popup_menu): error_name is const.
* menu.h (w32_menu_show, ns_menu_show, xmenu_show): error parameter
is const char **.
* w32menu.c (w32_menu_show):
* nsmenu.m (ns_menu_show): error parameter is const char **.
* process.h (synch_process_death): Is const char*.
* xmenu.c (Fx_popup_dialog): error_name is const char*.
(xmenu_show): error parameter is const char **. pane_string is const
char *.
(button_names): Is const char *.
(xdialog_show): error_name and pane_string is const.
* xrdb.c (get_system_app): Make path const and use char *p for non-const
char.
* xselect.c (Fx_get_atom_name): Use char empty[] instead of literal "".
* xsmfns.c (NOSPLASH_OPT): Change to char[].
(smc_save_yourself_CB): Do xstrdup on all ->type and ->name for
props. Free them at the end.
* xterm.c (emacs_class): New char[] for EMACS_CLASS.
(xim_open_dpy, xim_initialize, xim_close_dpy): Use emacs_class.
(x_term_init): Use char[] display_opt and name_opt instead of
string literal. file is const char*.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Wed, 11 Aug 2010 14:34:46 +0200 |
parents | 5cc91198ffb2 |
children | ef719132ddfa |
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 | 3 #include "copyright.h" |
4 | |
5 | |
6 /* | |
7 * XMenu: MIT Project Athena, X Window system menu package | |
8 * | |
9 * XMenuInsertPane - Inserts a pane into an XMenu object in | |
10 * a particular position. | |
11 * | |
12 * Author: Tony Della Fera, DEC | |
13 * 20-Nov-85 | |
14 * | |
15 */ | |
16 | |
17 #include <config.h> | |
18 #include "XMenuInt.h" | |
19 | |
20 int | |
109124
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
21 XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int active) |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
22 /* Menu object to be modified. */ |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
23 /* Pane number of new pane. */ |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
24 /* Selection label. */ |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
25 /* Make selection active? */ |
25858 | 26 { |
27 register XMPane *p_ptr; /* XMPane pointer. */ | |
28 register XMPane *pane; /* Newly created pane. */ | |
29 register XMSelect *select; /* Initial selection for the new pane. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
30 |
25858 | 31 int label_length; /* Label length in characters. */ |
32 int label_width; /* Label width in pixels. */ | |
33 | |
34 /* | |
35 * Check for NULL pointers! | |
36 */ | |
37 if (label == NULL) { | |
38 _XMErrorCode = XME_ARG_BOUNDS; | |
39 return(XM_FAILURE); | |
40 } | |
41 | |
42 /* | |
43 * Find the pane number one less than the one specified since that | |
44 * is the pane after which the insertion will occur. | |
45 */ | |
46 p_ptr = _XMGetPanePtr(menu, (p_num - 1)); | |
47 if (p_ptr == NULL) return(XM_FAILURE); | |
48 | |
49 /* | |
50 * Calloc the XMPane structure and the initial XMSelect. | |
51 */ | |
52 pane = (XMPane *)calloc(1, sizeof(XMPane)); | |
53 if (pane == NULL) { | |
54 _XMErrorCode = XME_CALLOC; | |
55 return(XM_FAILURE); | |
56 } | |
57 select = (XMSelect *)calloc(1, sizeof(XMSelect)); | |
58 if (select == NULL) { | |
59 _XMErrorCode = XME_CALLOC; | |
60 return(XM_FAILURE); | |
61 } | |
62 | |
63 /* | |
64 * Determine label size. | |
65 */ | |
66 label_length = strlen(label); | |
67 label_width = XTextWidth(menu->p_fnt_info, label, label_length); | |
68 | |
69 /* | |
70 * Set up the initial selection. | |
71 * Values not explicitly set are zeroed by calloc. | |
72 */ | |
73 select->next = select; | |
74 select->prev = select; | |
75 select->type = SL_HEADER; | |
76 select->serial = -1; | |
77 select->parent_p = pane; | |
78 | |
79 /* | |
80 * Fill the XMPane structure. | |
81 */ | |
82 pane->type = PANE; | |
83 pane->active = active; | |
84 pane->serial = -1; | |
85 pane->label = label; | |
86 pane->label_width = label_width; | |
87 pane->label_length = label_length; | |
88 pane->s_list = select; | |
89 | |
90 /* | |
91 * Insert the pane after the pane with the pane | |
92 * number one less than the desired number for the | |
93 * new pane. | |
94 */ | |
95 emacs_insque(pane, p_ptr); | |
96 | |
97 /* | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
98 * Update the pane count. |
25858 | 99 */ |
100 menu->p_count++; | |
101 | |
102 /* | |
103 * Schedule a recompute. | |
104 */ | |
105 menu->recompute = 1; | |
106 | |
107 /* | |
108 * Return the number of the pane just added. | |
109 */ | |
110 _XMErrorCode = XME_NO_ERROR; | |
111 return(p_num); | |
112 } | |
52401 | 113 |
114 /* arch-tag: ab94d53d-f05b-4273-82d3-f1b01eb9dc9e | |
115 (do not change this comment) */ |