Mercurial > emacs
annotate oldXMenu/X10.h @ 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 |
---|---|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
1 /* |
25858 | 2 * Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology |
3 * | |
4 * Permission to use, copy, modify, and distribute this software and its | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
5 * documentation for any purpose and without fee is hereby granted, provided |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
6 * that the above copyright notice appear in all copies and that both that |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
7 * copyright notice and this permission notice appear in supporting |
25858 | 8 * documentation, and that the name of M.I.T. not be used in advertising |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
9 * or publicity pertaining to distribution of the software without specific, |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
10 * written prior permission. M.I.T. makes no representations about the |
25858 | 11 * suitability of this software for any purpose. It is provided "as is" |
12 * without express or implied warranty. | |
13 * | |
14 * The X Window System is a Trademark of MIT. | |
15 * | |
16 */ | |
17 | |
18 | |
19 /* | |
20 * X10.h - Header definition and support file for the C subroutine | |
21 * interface library for V10 support routines. | |
22 */ | |
23 #ifndef _X10_H_ | |
24 #define _X10_H_ | |
25 | |
26 /* Used in XDraw and XDrawFilled */ | |
27 | |
28 typedef struct { | |
29 short x, y; | |
30 unsigned short flags; | |
31 } Vertex; | |
32 | |
33 /* The meanings of the flag bits. If the bit is 1 the predicate is true */ | |
34 | |
35 #define VertexRelative 0x0001 /* else absolute */ | |
36 #define VertexDontDraw 0x0002 /* else draw */ | |
37 #define VertexCurved 0x0004 /* else straight */ | |
38 #define VertexStartClosed 0x0008 /* else not */ | |
39 #define VertexEndClosed 0x0010 /* else not */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
40 /*#define VertexDrawLastPoint 0x0020 */ /* else don't */ |
25858 | 41 |
42 /* | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
43 The VertexDrawLastPoint option has not been implemented in XDraw and |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
44 XDrawFilled so it shouldn't be defined. |
25858 | 45 */ |
46 | |
47 /* | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
48 * XAssoc - Associations used in the XAssocTable data structure. The |
25858 | 49 * associations are used as circular queue entries in the association table |
50 * which is contains an array of circular queues (buckets). | |
51 */ | |
52 typedef struct _XAssoc { | |
53 struct _XAssoc *next; /* Next object in this bucket. */ | |
54 struct _XAssoc *prev; /* Previous obejct in this bucket. */ | |
55 Display *display; /* Display which owns the id. */ | |
56 XID x_id; /* X Window System id. */ | |
57 char *data; /* Pointer to untyped memory. */ | |
58 } XAssoc; | |
59 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
60 /* |
25858 | 61 * XAssocTable - X Window System id to data structure pointer association |
62 * table. An XAssocTable is a hash table whose buckets are circular | |
63 * queues of XAssoc's. The XAssocTable is constructed from an array of | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
64 * XAssoc's which are the circular queue headers (bucket headers). |
25858 | 65 * An XAssocTable consists an XAssoc pointer that points to the first |
66 * bucket in the bucket array and an integer that indicates the number | |
67 * of buckets in the array. | |
68 */ | |
69 typedef struct { | |
70 XAssoc *buckets; /* Pointer to first bucket in bucket array.*/ | |
71 int size; /* Table size (number of buckets). */ | |
72 } XAssocTable; | |
73 | |
109124
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
74 XAssocTable *XCreateAssocTable(int size); |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
75 char *XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id); |
25858 | 76 |
77 #endif /* _X10_H_ */ | |
52401 | 78 |
79 /* arch-tag: b0b749fb-757b-470b-b405-af7d033a5aad | |
80 (do not change this comment) */ |