aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2010-07-03 22:57:11 -0700
committerDan Nicolaescu2010-07-03 22:57:11 -0700
commitb782e2d7f36a742156e5b13d43efdcf620356bc0 (patch)
tree2c34b178184f880183bf64db7553be73c2c1c8e7
parentc3174d16e2a91d19313afd8109c31ad8695a87c6 (diff)
downloademacs-b782e2d7f36a742156e5b13d43efdcf620356bc0.tar.gz
emacs-b782e2d7f36a742156e5b13d43efdcf620356bc0.zip
Convert function definitions in oldXMenu to standard C.
* oldXMenu/Activate.c: Convert function definitions to standard C. * oldXMenu/AddPane.c: * oldXMenu/AddSel.c: * oldXMenu/ChgPane.c: * oldXMenu/ChgSel.c: * oldXMenu/Create.c: * oldXMenu/DelPane.c: * oldXMenu/DelSel.c: * oldXMenu/Destroy.c: * oldXMenu/Error.c: * oldXMenu/EvHand.c: * oldXMenu/FindPane.c: * oldXMenu/FindSel.c: * oldXMenu/InsPane.c: * oldXMenu/InsSel.c: * oldXMenu/Internal.c: * oldXMenu/Locate.c: * oldXMenu/Post.c: * oldXMenu/Recomp.c: * oldXMenu/SetAEQ.c: * oldXMenu/SetFrz.c: * oldXMenu/SetPane.c: * oldXMenu/SetSel.c: * oldXMenu/X10.h: * oldXMenu/XCrAssoc.c: * oldXMenu/XDelAssoc.c: * oldXMenu/XDestAssoc.c: * oldXMenu/XLookAssoc.c: * oldXMenu/XMakeAssoc.c: * oldXMenu/XMenu.h: * oldXMenu/XMenuInt.h: * oldXMenu/insque.c: Likewise.
Diffstat
-rw-r--r--oldXMenu/Activate.c27
-rw-r--r--oldXMenu/AddPane.c10
-rw-r--r--oldXMenu/AddSel.c16
-rw-r--r--oldXMenu/ChangeLog35
-rw-r--r--oldXMenu/ChgPane.c8
-rw-r--r--oldXMenu/ChgSel.c18
-rw-r--r--oldXMenu/Create.c21
-rw-r--r--oldXMenu/DelPane.c8
-rw-r--r--oldXMenu/DelSel.c10
-rw-r--r--oldXMenu/Destroy.c6
-rw-r--r--oldXMenu/Error.c2
-rw-r--r--oldXMenu/EvHand.c3
-rw-r--r--oldXMenu/FindPane.c4
-rw-r--r--oldXMenu/FindSel.c5
-rw-r--r--oldXMenu/InsPane.c10
-rw-r--r--oldXMenu/InsSel.c14
-rw-r--r--oldXMenu/Internal.c94
-rw-r--r--oldXMenu/Locate.c22
-rw-r--r--oldXMenu/Post.c16
-rw-r--r--oldXMenu/Recomp.c6
-rw-r--r--oldXMenu/SetAEQ.c6
-rw-r--r--oldXMenu/SetFrz.c6
-rw-r--r--oldXMenu/SetPane.c8
-rw-r--r--oldXMenu/SetSel.c10
-rw-r--r--oldXMenu/X10.h4
-rw-r--r--oldXMenu/XCrAssoc.c6
-rw-r--r--oldXMenu/XDelAssoc.c7
-rw-r--r--oldXMenu/XDestAssoc.c3
-rw-r--r--oldXMenu/XLookAssoc.c8
-rw-r--r--oldXMenu/XMakeAssoc.c11
-rw-r--r--oldXMenu/XMenu.h46
-rw-r--r--oldXMenu/XMenuInt.h26
-rw-r--r--oldXMenu/insque.c6
33 files changed, 241 insertions, 241 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 2e1996e7287..55bfca510b9 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -103,32 +103,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
103/* For debug, set this to 0 to not grab the keyboard on menu popup */ 103/* For debug, set this to 0 to not grab the keyboard on menu popup */
104int x_menu_grab_keyboard = 1; 104int x_menu_grab_keyboard = 1;
105 105
106typedef void (*Wait_func)();
107
108static Wait_func wait_func; 106static Wait_func wait_func;
109static void* wait_data; 107static void* wait_data;
110 108
111void 109void
112XMenuActivateSetWaitFunction (func, data) 110XMenuActivateSetWaitFunction (Wait_func func, void *data)
113 Wait_func func;
114 void *data;
115{ 111{
116 wait_func = func; 112 wait_func = func;
117 wait_data = data; 113 wait_data = data;
118} 114}
119 115
120int 116int
121XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data, 117XMenuActivate(
122 help_callback) 118 register Display *display, /* Display to put menu on. */
123 register Display *display; /* Display to put menu on. */ 119 register XMenu *menu, /* Menu to activate. */
124 register XMenu *menu; /* Menu to activate. */ 120 int *p_num, /* Pane number selected. */
125 int *p_num; /* Pane number selected. */ 121 int *s_num, /* Selection number selected. */
126 int *s_num; /* Selection number selected. */ 122 int x_pos, /* X coordinate of menu position. */
127 int x_pos; /* X coordinate of menu position. */ 123 int y_pos, /* Y coordinate of menu position. */
128 int y_pos; /* Y coordinate of menu position. */ 124 unsigned int event_mask, /* Mouse button event mask. */
129 unsigned int event_mask; /* Mouse button event mask. */ 125 char **data, /* Pointer to return data value. */
130 char **data; /* Pointer to return data value. */ 126 void (* help_callback) (char *, int, int)) /* Help callback. */
131 void (* help_callback) (); /* Help callback. */
132{ 127{
133 int status; /* X routine call status. */ 128 int status; /* X routine call status. */
134 int orig_x; /* Upper left menu origin X coord. */ 129 int orig_x; /* Upper left menu origin X coord. */
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index 54b55a150c9..6312aa2c70a 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -16,11 +16,11 @@
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18int 18int
19XMenuAddPane(display, menu, label, active) 19XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active)
20 Display *display; 20
21 register XMenu *menu; /* Menu object to be modified. */ 21 /* Menu object to be modified. */
22 register char *label; /* Selection label. */ 22 /* Selection label. */
23 int active; /* Make selection active? */ 23 /* Make selection active? */
24{ 24{
25 register XMPane *pane; /* Newly created pane. */ 25 register XMPane *pane; /* Newly created pane. */
26 register XMSelect *select; /* Initial selection for the new pane. */ 26 register XMSelect *select; /* Initial selection for the new pane. */
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index e38b3404b56..d2f2156b077 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -17,14 +17,14 @@
17#include "XMenuInt.h" 17#include "XMenuInt.h"
18 18
19int 19int
20XMenuAddSelection(display, menu, p_num, data, label, active, help) 20XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char *help)
21 Display *display; 21
22 register XMenu *menu; /* Menu object to be modified. */ 22 /* Menu object to be modified. */
23 register int p_num; /* Pane number to be modified. */ 23 /* Pane number to be modified. */
24 char *data; /* Data value. */ 24 /* Data value. */
25 char *label; /* Selection label. */ 25 /* Selection label. */
26 int active; /* Make selection active? */ 26 /* Make selection active? */
27 char *help; /* Help string */ 27 /* Help string */
28{ 28{
29 register XMPane *pane; /* Pane containing the new selection. */ 29 register XMPane *pane; /* Pane containing the new selection. */
30 register XMSelect *select; /* Newly created selection. */ 30 register XMSelect *select; /* Newly created selection. */
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 7c2b2826375..e2edb0afe09 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,38 @@
12010-07-04 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * Activate.c: Convert function definitions to standard C.
4 * AddPane.c:
5 * AddSel.c:
6 * ChgPane.c:
7 * ChgSel.c:
8 * Create.c:
9 * DelPane.c:
10 * DelSel.c:
11 * Destroy.c:
12 * Error.c:
13 * EvHand.c:
14 * FindPane.c:
15 * FindSel.c:
16 * InsPane.c:
17 * InsSel.c:
18 * Internal.c:
19 * Locate.c:
20 * Post.c:
21 * Recomp.c:
22 * SetAEQ.c:
23 * SetFrz.c:
24 * SetPane.c:
25 * SetSel.c:
26 * X10.h:
27 * XCrAssoc.c:
28 * XDelAssoc.c:
29 * XDestAssoc.c:
30 * XLookAssoc.c:
31 * XMakeAssoc.c:
32 * XMenu.h:
33 * XMenuInt.h:
34 * insque.c: Likewise.
35
12010-05-07 Chong Yidong <cyd@stupidchicken.com> 362010-05-07 Chong Yidong <cyd@stupidchicken.com>
2 37
3 * Version 23.2 released. 38 * Version 23.2 released.
diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index 06b2faa4451..9217c848641 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -17,10 +17,10 @@
17#include "XMenuInt.h" 17#include "XMenuInt.h"
18 18
19int 19int
20XMenuChangePane(menu, p_num, label) 20XMenuChangePane(register XMenu *menu, register int p_num, char *label)
21 register XMenu *menu; /* Menu object to be modified. */ 21 /* Menu object to be modified. */
22 register int p_num; /* Pane number to be modified. */ 22 /* Pane number to be modified. */
23 char *label; /* Selection label. */ 23 /* Selection label. */
24{ 24{
25 register XMPane *p_ptr; /* XMPane pointer. */ 25 register XMPane *p_ptr; /* XMPane pointer. */
26 26
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index 9a1230bd39b..b23bb6fd348 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -17,15 +17,15 @@
17#include "XMenuInt.h" 17#include "XMenuInt.h"
18 18
19int 19int
20XMenuChangeSelection(display, menu, p_num, s_num, data, data_sw, label, label_sw) 20XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num, register int s_num, char *data, int data_sw, char *label, int label_sw)
21 Display *display; /* previously opened display. */ 21 /* previously opened display. */
22 register XMenu *menu; /* Menu object to be modified. */ 22 /* Menu object to be modified. */
23 register int p_num; /* Pane number to be modified. */ 23 /* Pane number to be modified. */
24 register int s_num; /* Selection number to modified. */ 24 /* Selection number to modified. */
25 char *data; /* Data value. */ 25 /* Data value. */
26 int data_sw; /* Change to new data value? */ 26 /* Change to new data value? */
27 char *label; /* Selection label. */ 27 /* Selection label. */
28 int label_sw; /* Change to new label? */ 28 /* Change to new label? */
29{ 29{
30 register XMPane *p_ptr; /* XMPane pointer. */ 30 register XMPane *p_ptr; /* XMPane pointer. */
31 register XMSelect *s_ptr; /* XMSelect pointer. */ 31 register XMSelect *s_ptr; /* XMSelect pointer. */
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 628ab89a678..f96e077a466 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -91,19 +91,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
91 91
92#define TILE_BUF_SIZE 5 92#define TILE_BUF_SIZE 5
93 93
94int atoi(); 94int atoi(const char *);
95double atof(); 95double atof(const char *);
96char *x_get_resource_string (); 96char *x_get_resource_string (char *attribute, char *class);
97 97
98 98
99 99
100static Status 100static Status
101XAllocDisplayColor(display, map, colorName, color, junk) 101XAllocDisplayColor(Display *display, Colormap map, char *colorName, XColor *color, XColor *junk)
102 Display *display;
103 Colormap map;
104 char *colorName;
105 XColor *color;
106 XColor *junk;
107{ 102{
108 return (colorName!=0 && 103 return (colorName!=0 &&
109 XParseColor(display, map, colorName, color) && 104 XParseColor(display, map, colorName, color) &&
@@ -112,10 +107,10 @@ XAllocDisplayColor(display, map, colorName, color, junk)
112 107
113 108
114XMenu * 109XMenu *
115XMenuCreate(display, parent, def_env) 110XMenuCreate(Display *display, Window parent, register char *def_env)
116 Display *display; /* ID of previously opened display */ 111 /* ID of previously opened display */
117 Window parent; /* Window ID of the menu's parent window. */ 112 /* Window ID of the menu's parent window. */
118 register char *def_env; /* X Defaults program environment name. */ 113 /* X Defaults program environment name. */
119{ 114{
120 register int i; /* Loop counter. */ 115 register int i; /* Loop counter. */
121 register int j; /* Loop counter. */ 116 register int j; /* Loop counter. */
diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c
index e7568cff56e..baa1b8def41 100644
--- a/oldXMenu/DelPane.c
+++ b/oldXMenu/DelPane.c
@@ -16,10 +16,10 @@
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18int 18int
19XMenuDeletePane(display, menu, p_num) 19XMenuDeletePane(register Display *display, register XMenu *menu, register int p_num)
20 register Display *display; /* Previously opened display */ 20 /* Previously opened display */
21 register XMenu *menu; /* Menu object to be modified. */ 21 /* Menu object to be modified. */
22 register int p_num; /* Pane number to be deleted. */ 22 /* Pane number to be deleted. */
23{ 23{
24 register XMPane *p_ptr; /* Pointer to pane being deleted. */ 24 register XMPane *p_ptr; /* Pointer to pane being deleted. */
25 register XMSelect *s_ptr; /* Pointer to selections being deleted. */ 25 register XMSelect *s_ptr; /* Pointer to selections being deleted. */
diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c
index e7b6ace3845..9b0e3d7cd37 100644
--- a/oldXMenu/DelSel.c
+++ b/oldXMenu/DelSel.c
@@ -16,11 +16,11 @@
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18int 18int
19XMenuDeleteSelection(display, menu, p_num, s_num) 19XMenuDeleteSelection(register Display *display, register XMenu *menu, register int p_num, register int s_num)
20 register Display *display; /* Previously opened display. */ 20 /* Previously opened display. */
21 register XMenu *menu; /* Menu object to be modified. */ 21 /* Menu object to be modified. */
22 register int p_num; /* Pane number to be deleted. */ 22 /* Pane number to be deleted. */
23 register int s_num; /* Selection number to be deleted. */ 23 /* Selection number to be deleted. */
24{ 24{
25 register XMPane *p_ptr; /* Pointer to pane being deleted. */ 25 register XMPane *p_ptr; /* Pointer to pane being deleted. */
26 register XMSelect *s_ptr; /* Pointer to selections being deleted. */ 26 register XMSelect *s_ptr; /* Pointer to selections being deleted. */
diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index 117f04ed1c5..906d92fb8cf 100644
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -15,9 +15,9 @@
15 15
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18XMenuDestroy(display, menu) 18XMenuDestroy(Display *display, register XMenu *menu)
19 Display *display; 19
20 register XMenu *menu; /* Menu object to destroy. */ 20 /* Menu object to destroy. */
21{ 21{
22 register XMPane *p_ptr; /* Pointer to the current pane. */ 22 register XMPane *p_ptr; /* Pointer to the current pane. */
23 register XMPane *p_next; /* Pointer to the next pane. */ 23 register XMPane *p_next; /* Pointer to the next pane. */
diff --git a/oldXMenu/Error.c b/oldXMenu/Error.c
index 6f43cbdbf9b..6454974fd5e 100644
--- a/oldXMenu/Error.c
+++ b/oldXMenu/Error.c
@@ -17,7 +17,7 @@
17#include "XMenuInt.h" 17#include "XMenuInt.h"
18 18
19char * 19char *
20XMenuError() 20XMenuError(void)
21{ 21{
22 static char message[128]; /* Error message buffer. */ 22 static char message[128]; /* Error message buffer. */
23 23
diff --git a/oldXMenu/EvHand.c b/oldXMenu/EvHand.c
index 41ba49bcbca..fa99b8363af 100644
--- a/oldXMenu/EvHand.c
+++ b/oldXMenu/EvHand.c
@@ -15,8 +15,7 @@
15 15
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18XMenuEventHandler(handler) 18XMenuEventHandler(int (*handler) (XEvent*))
19 int (*handler)();
20{ 19{
21 /* 20 /*
22 * Set the global event handler variable. 21 * Set the global event handler variable.
diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c
index fa71c6b39a1..0d0f8188013 100644
--- a/oldXMenu/FindPane.c
+++ b/oldXMenu/FindPane.c
@@ -17,9 +17,7 @@
17#include "XMenuInt.h" 17#include "XMenuInt.h"
18 18
19int 19int
20XMenuFindPane(menu, label) 20XMenuFindPane(register XMenu *menu, register char *label)
21 register XMenu *menu;
22 register char *label;
23{ 21{
24 register XMPane *p_ptr; 22 register XMPane *p_ptr;
25 register int i = 0; 23 register int i = 0;
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index fcb66eb851c..202bbc1b28c 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -34,10 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34#include "XMenuInt.h" 34#include "XMenuInt.h"
35 35
36int 36int
37XMenuFindSelection(menu, p_num, label) 37XMenuFindSelection(register XMenu *menu, int p_num, register char *label)
38 register XMenu *menu;
39 int p_num;
40 register char *label;
41{ 38{
42 register XMPane *p_ptr; 39 register XMPane *p_ptr;
43 register XMSelect *s_ptr; 40 register XMSelect *s_ptr;
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index 0aa43935ea2..19ee33cb423 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -18,11 +18,11 @@
18#include "XMenuInt.h" 18#include "XMenuInt.h"
19 19
20int 20int
21XMenuInsertPane(menu, p_num, label, active) 21XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int active)
22 register XMenu *menu; /* Menu object to be modified. */ 22 /* Menu object to be modified. */
23 register int p_num; /* Pane number of new pane. */ 23 /* Pane number of new pane. */
24 char *label; /* Selection label. */ 24 /* Selection label. */
25 int active; /* Make selection active? */ 25 /* Make selection active? */
26{ 26{
27 register XMPane *p_ptr; /* XMPane pointer. */ 27 register XMPane *p_ptr; /* XMPane pointer. */
28 register XMPane *pane; /* Newly created pane. */ 28 register XMPane *pane; /* Newly created pane. */
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index 08a0370868c..0f28cdbef0c 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -17,13 +17,13 @@
17#include "XMenuInt.h" 17#include "XMenuInt.h"
18 18
19int 19int
20XMenuInsertSelection(menu, p_num, s_num, data, label, active) 20XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_num, char *data, char *label, int active)
21 register XMenu *menu; /* Menu object to be modified. */ 21 /* Menu object to be modified. */
22 register int p_num; /* Pane number to be modified. */ 22 /* Pane number to be modified. */
23 register int s_num; /* Selection number of new selection. */ 23 /* Selection number of new selection. */
24 char *data; /* Data value. */ 24 /* Data value. */
25 char *label; /* Selection label. */ 25 /* Selection label. */
26 int active; /* Make selection active? */ 26 /* Make selection active? */
27{ 27{
28 register XMPane *p_ptr; /* XMPane pointer. */ 28 register XMPane *p_ptr; /* XMPane pointer. */
29 register XMSelect *s_ptr; /* XMSelect pointer. */ 29 register XMSelect *s_ptr; /* XMSelect pointer. */
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index b00841b0cc3..cb87dd650c7 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -96,7 +96,7 @@ _XMErrorList[XME_CODE_COUNT] = {
96/* 96/*
97 * _XMEventHandler - Internal event handler variable. 97 * _XMEventHandler - Internal event handler variable.
98 */ 98 */
99int (*_XMEventHandler)() = NULL; 99int (*_XMEventHandler)(XEvent*) = NULL;
100 100
101 101
102 102
@@ -104,7 +104,7 @@ int (*_XMEventHandler)() = NULL;
104 * _XMWinQueInit - Internal routine to initialize the window 104 * _XMWinQueInit - Internal routine to initialize the window
105 * queue. 105 * queue.
106 */ 106 */
107_XMWinQueInit() 107_XMWinQueInit(void)
108{ 108{
109 /* 109 /*
110 * If the queue is not initialized initialize it. 110 * If the queue is not initialized initialize it.
@@ -138,10 +138,10 @@ _XMWinQueInit()
138 * window queue. 138 * window queue.
139 */ 139 */
140int 140int
141_XMWinQueAddPane(display, menu, p_ptr) 141_XMWinQueAddPane(register Display *display, register XMenu *menu, register XMPane *p_ptr)
142 register Display *display; 142
143 register XMenu *menu; /* Menu being manipulated. */ 143 /* Menu being manipulated. */
144 register XMPane *p_ptr; /* XMPane being queued. */ 144 /* XMPane being queued. */
145{ 145{
146 /* 146 /*
147 * If the queue is currently full then flush it. 147 * If the queue is currently full then flush it.
@@ -172,10 +172,10 @@ _XMWinQueAddPane(display, menu, p_ptr)
172 * the selection window queue. 172 * the selection window queue.
173 */ 173 */
174int 174int
175_XMWinQueAddSelection(display, menu, s_ptr) 175_XMWinQueAddSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr)
176 register Display *display; 176
177 register XMenu *menu; /* Menu being manipulated. */ 177 /* Menu being manipulated. */
178 register XMSelect *s_ptr; /* XMSelection being queued. */ 178 /* XMSelection being queued. */
179{ 179{
180 /* 180 /*
181 * If this entry will overflow the queue then flush it. 181 * If this entry will overflow the queue then flush it.
@@ -206,10 +206,10 @@ _XMWinQueAddSelection(display, menu, s_ptr)
206 * selection window queues. 206 * selection window queues.
207 */ 207 */
208int 208int
209_XMWinQueFlush(display, menu, pane, select) 209_XMWinQueFlush(register Display *display, register XMenu *menu, register XMPane *pane, XMSelect *select)
210 register Display *display; 210
211 register XMenu *menu; /* Menu being manipulated. */ 211 /* Menu being manipulated. */
212 register XMPane *pane; /* Current pane. */ 212 /* Current pane. */
213{ 213{
214 register int pq_index; /* Pane queue index. */ 214 register int pq_index; /* Pane queue index. */
215 register int sq_index; /* Selection queue index. */ 215 register int sq_index; /* Selection queue index. */
@@ -346,9 +346,9 @@ _XMWinQueFlush(display, menu, pane, select)
346 * a pane pointer that points to the indexed pane. 346 * a pane pointer that points to the indexed pane.
347 */ 347 */
348XMPane * 348XMPane *
349_XMGetPanePtr(menu, p_num) 349_XMGetPanePtr(register XMenu *menu, register int p_num)
350 register XMenu *menu; /* Menu to find the pane in. */ 350 /* Menu to find the pane in. */
351 register int p_num; /* Index number of pane to find. */ 351 /* Index number of pane to find. */
352{ 352{
353 register XMPane *p_ptr; /* Pane pointer to be returned. */ 353 register XMPane *p_ptr; /* Pane pointer to be returned. */
354 register int i; /* Loop counter. */ 354 register int i; /* Loop counter. */
@@ -382,9 +382,9 @@ _XMGetPanePtr(menu, p_num)
382 * indexed selection. 382 * indexed selection.
383 */ 383 */
384XMSelect * 384XMSelect *
385_XMGetSelectionPtr(p_ptr, s_num) 385_XMGetSelectionPtr(register XMPane *p_ptr, register int s_num)
386 register XMPane *p_ptr; /* Pane to find the selection in. */ 386 /* Pane to find the selection in. */
387 register int s_num; /* Index number of the selection to find. */ 387 /* Index number of the selection to find. */
388{ 388{
389 register XMSelect *s_ptr; /* Selection pointer to be returned. */ 389 register XMSelect *s_ptr; /* Selection pointer to be returned. */
390 register int i; /* Loop counter. */ 390 register int i; /* Loop counter. */
@@ -416,9 +416,9 @@ _XMGetSelectionPtr(p_ptr, s_num)
416 * _XMRecomputeGlobals - Internal subroutine to recompute menu wide 416 * _XMRecomputeGlobals - Internal subroutine to recompute menu wide
417 * global values. 417 * global values.
418 */ 418 */
419_XMRecomputeGlobals(display, menu) 419_XMRecomputeGlobals(register Display *display, register XMenu *menu)
420 register Display *display; /*X11 display variable. */ 420 /*X11 display variable. */
421 register XMenu *menu; /* Menu object to compute from. */ 421 /* Menu object to compute from. */
422{ 422{
423 register XMPane *p_ptr; /* Pane pointer. */ 423 register XMPane *p_ptr; /* Pane pointer. */
424 register XMSelect *s_ptr; /* Selection pointer. */ 424 register XMSelect *s_ptr; /* Selection pointer. */
@@ -531,11 +531,11 @@ _XMRecomputeGlobals(display, menu)
531 * window dependencies. 531 * window dependencies.
532 */ 532 */
533int 533int
534_XMRecomputePane(display, menu, p_ptr, p_num) 534_XMRecomputePane(register Display *display, register XMenu *menu, register XMPane *p_ptr, register int p_num)
535 register Display *display; /* Standard X display variable. */ 535 /* Standard X display variable. */
536 register XMenu *menu; /* Menu object being recomputed. */ 536 /* Menu object being recomputed. */
537 register XMPane *p_ptr; /* Pane pointer. */ 537 /* Pane pointer. */
538 register int p_num; /* Pane sequence number. */ 538 /* Pane sequence number. */
539{ 539{
540 register int window_x; /* Recomputed window X coordinate. */ 540 register int window_x; /* Recomputed window X coordinate. */
541 register int window_y; /* Recomputed window Y coordinate. */ 541 register int window_y; /* Recomputed window Y coordinate. */
@@ -681,11 +681,11 @@ _XMRecomputePane(display, menu, p_ptr, p_num)
681 * selection window dependencies. 681 * selection window dependencies.
682 */ 682 */
683int 683int
684_XMRecomputeSelection(display, menu, s_ptr, s_num) 684_XMRecomputeSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr, register int s_num)
685 register Display *display; 685
686 register XMenu *menu; /* Menu object being recomputed. */ 686 /* Menu object being recomputed. */
687 register XMSelect *s_ptr; /* Selection pointer. */ 687 /* Selection pointer. */
688 register int s_num; /* Selection sequence number. */ 688 /* Selection sequence number. */
689{ 689{
690 register Bool config_s = False; /* Reconfigure selection window? */ 690 register Bool config_s = False; /* Reconfigure selection window? */
691 XWindowChanges *changes; /* Values to change in configure. */ 691 XWindowChanges *changes; /* Values to change in configure. */
@@ -811,15 +811,15 @@ _XMRecomputeSelection(display, menu, s_ptr, s_num)
811 * recomputed before calling this routine or 811 * recomputed before calling this routine or
812 * unpredictable results will follow. 812 * unpredictable results will follow.
813 */ 813 */
814_XMTransToOrigin(display, menu, p_ptr, s_ptr, x_pos, y_pos, orig_x, orig_y) 814_XMTransToOrigin(Display *display, register XMenu *menu, register XMPane *p_ptr, register XMSelect *s_ptr, int x_pos, int y_pos, int *orig_x, int *orig_y)
815 Display *display; /* Not used. Included for consistency. */ 815 /* Not used. Included for consistency. */
816 register XMenu *menu; /* Menu being computed against. */ 816 /* Menu being computed against. */
817 register XMPane *p_ptr; /* Current pane pointer. */ 817 /* Current pane pointer. */
818 register XMSelect *s_ptr; /* Current selection pointer. */ 818 /* Current selection pointer. */
819 int x_pos; /* X coordinate of point to translate. */ 819 /* X coordinate of point to translate. */
820 int y_pos; /* Y coordinate of point to translate. */ 820 /* Y coordinate of point to translate. */
821 int *orig_x; /* Return value X coord. of the menu origin. */ 821 /* Return value X coord. of the menu origin. */
822 int *orig_y; /* Return value Y coord. of the menu origin. */ 822 /* Return value Y coord. of the menu origin. */
823{ 823{
824 register int l_orig_x; /* Local X coordinate of the menu origin. */ 824 register int l_orig_x; /* Local X coordinate of the menu origin. */
825 register int l_orig_y; /* Local Y coordinate of the menu origin. */ 825 register int l_orig_y; /* Local Y coordinate of the menu origin. */
@@ -871,10 +871,7 @@ _XMTransToOrigin(display, menu, p_ptr, s_ptr, x_pos, y_pos, orig_x, orig_y)
871 * _XMRefreshPane - Internal subroutine to completely refresh 871 * _XMRefreshPane - Internal subroutine to completely refresh
872 * the contents of a pane. 872 * the contents of a pane.
873 */ 873 */
874_XMRefreshPane(display, menu, pane) 874_XMRefreshPane(register Display *display, register XMenu *menu, register XMPane *pane)
875 register Display *display;
876 register XMenu *menu;
877 register XMPane *pane;
878{ 875{
879 register XMSelect *s_list = pane->s_list; 876 register XMSelect *s_list = pane->s_list;
880 register XMSelect *s_ptr; 877 register XMSelect *s_ptr;
@@ -941,10 +938,7 @@ _XMRefreshPane(display, menu, pane)
941 * _XMRefreshSelection - Internal subroutine that refreshes 938 * _XMRefreshSelection - Internal subroutine that refreshes
942 * a single selection window. 939 * a single selection window.
943 */ 940 */
944_XMRefreshSelection(display, menu, select) 941_XMRefreshSelection(register Display *display, register XMenu *menu, register XMSelect *select)
945 register Display *display;
946 register XMenu *menu;
947 register XMSelect *select;
948{ 942{
949 register int width = select->window_w; 943 register int width = select->window_w;
950 register int height = select->window_h; 944 register int height = select->window_h;
diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c
index edd94369e6e..c79f70bd836 100644
--- a/oldXMenu/Locate.c
+++ b/oldXMenu/Locate.c
@@ -17,17 +17,17 @@
17#include "XMenuInt.h" 17#include "XMenuInt.h"
18 18
19int 19int
20XMenuLocate(display, menu, p_num, s_num, x_pos, y_pos, ul_x, ul_y, width, height) 20XMenuLocate(register Display *display, register XMenu *menu, int p_num, int s_num, int x_pos, int y_pos, int *ul_x, int *ul_y, int *width, int *height)
21 register Display *display; /* Previously opened display. */ 21 /* Previously opened display. */
22 register XMenu *menu; /* Menu object being located. */ 22 /* Menu object being located. */
23 int p_num; /* Active pane number. */ 23 /* Active pane number. */
24 int s_num; /* Active selection number. */ 24 /* Active selection number. */
25 int x_pos; /* X coordinate of mouse active position. */ 25 /* X coordinate of mouse active position. */
26 int y_pos; /* Y coordinate of mouse active position. */ 26 /* Y coordinate of mouse active position. */
27 int *ul_x; /* Returned upper left menu X coordinate. */ 27 /* Returned upper left menu X coordinate. */
28 int *ul_y; /* Returned upper left menu Y coordinate. */ 28 /* Returned upper left menu Y coordinate. */
29 int *width; /* Returned menu width. */ 29 /* Returned menu width. */
30 int *height; /* Returned menu height. */ 30 /* Returned menu height. */
31{ 31{
32 register XMPane *p_ptr; /* XMPane pointer. */ 32 register XMPane *p_ptr; /* XMPane pointer. */
33 register XMSelect *s_ptr; /* XMSelect pointer. */ 33 register XMSelect *s_ptr; /* XMSelect pointer. */
diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c
index c51f23e7146..07e24a26272 100644
--- a/oldXMenu/Post.c
+++ b/oldXMenu/Post.c
@@ -39,14 +39,14 @@
39#include "XMenuInt.h" 39#include "XMenuInt.h"
40 40
41char * 41char *
42XMenuPost(display, menu, p_num, s_num, x_pos, y_pos, event_mask) 42XMenuPost(register Display *display, register XMenu *menu, register int *p_num, register int *s_num, register int x_pos, register int y_pos, int event_mask)
43 register Display *display; /* Previously opened display. */ 43 /* Previously opened display. */
44 register XMenu *menu; /* Menu to post. */ 44 /* Menu to post. */
45 register int *p_num; /* Pane number selected. */ 45 /* Pane number selected. */
46 register int *s_num; /* Selection number selected. */ 46 /* Selection number selected. */
47 register int x_pos; /* X coordinate of menu position. */ 47 /* X coordinate of menu position. */
48 register int y_pos; /* Y coordinate of menu position. */ 48 /* Y coordinate of menu position. */
49 int event_mask; /* Mouse button event mask. */ 49 /* Mouse button event mask. */
50{ 50{
51 register int stat; /* Routine call return status. */ 51 register int stat; /* Routine call return status. */
52 char *data; /* Return data. */ 52 char *data; /* Return data. */
diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c
index 230db9e3a13..038ac3b0b6b 100644
--- a/oldXMenu/Recomp.c
+++ b/oldXMenu/Recomp.c
@@ -16,9 +16,9 @@
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18int 18int
19XMenuRecompute(display, menu) 19XMenuRecompute(Display *display, register XMenu *menu)
20 Display *display; 20
21 register XMenu *menu; /* Menu object to be recomputed. */ 21 /* Menu object to be recomputed. */
22{ 22{
23 register XMPane *p_ptr; /* Pane pointer. */ 23 register XMPane *p_ptr; /* Pane pointer. */
24 register XMSelect *s_ptr; /* Selection pointer. */ 24 register XMSelect *s_ptr; /* Selection pointer. */
diff --git a/oldXMenu/SetAEQ.c b/oldXMenu/SetAEQ.c
index 0e81ed55a49..7cdb867ff09 100644
--- a/oldXMenu/SetAEQ.c
+++ b/oldXMenu/SetAEQ.c
@@ -18,9 +18,9 @@
18 18
19#include "XMenuInt.h" 19#include "XMenuInt.h"
20 20
21XMenuSetAEQ(menu, aeq) 21XMenuSetAEQ(register XMenu *menu, register int aeq)
22 register XMenu *menu; /* Menu object to be modified. */ 22 /* Menu object to be modified. */
23 register int aeq; /* AEQ mode? */ 23 /* AEQ mode? */
24{ 24{
25 /* 25 /*
26 * Set the AEQ mode switch. 26 * Set the AEQ mode switch.
diff --git a/oldXMenu/SetFrz.c b/oldXMenu/SetFrz.c
index be9f76f7d80..43684db9011 100644
--- a/oldXMenu/SetFrz.c
+++ b/oldXMenu/SetFrz.c
@@ -17,9 +17,9 @@
17 17
18#include "XMenuInt.h" 18#include "XMenuInt.h"
19 19
20XMenuSetFreeze(menu, freeze) 20XMenuSetFreeze(register XMenu *menu, register int freeze)
21 register XMenu *menu; /* Menu object to be modified. */ 21 /* Menu object to be modified. */
22 register int freeze; /* Freeze mode? */ 22 /* Freeze mode? */
23{ 23{
24 /* 24 /*
25 * Set the freeze mode switch. 25 * Set the freeze mode switch.
diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c
index b9ecb7e8706..9f5a99a564e 100644
--- a/oldXMenu/SetPane.c
+++ b/oldXMenu/SetPane.c
@@ -16,10 +16,10 @@
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18int 18int
19XMenuSetPane(menu, p_num, active) 19XMenuSetPane(register XMenu *menu, register int p_num, register int active)
20 register XMenu *menu; /* Menu object to be modified. */ 20 /* Menu object to be modified. */
21 register int p_num; /* Pane number to be modified. */ 21 /* Pane number to be modified. */
22 register int active; /* Make selection active? */ 22 /* Make selection active? */
23{ 23{
24 register XMPane *p_ptr; /* XMPane pointer. */ 24 register XMPane *p_ptr; /* XMPane pointer. */
25 25
diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c
index aae161322eb..162d3434bad 100644
--- a/oldXMenu/SetSel.c
+++ b/oldXMenu/SetSel.c
@@ -16,11 +16,11 @@
16#include "XMenuInt.h" 16#include "XMenuInt.h"
17 17
18int 18int
19XMenuSetSelection(menu, p_num, s_num, active) 19XMenuSetSelection(register XMenu *menu, register int p_num, register int s_num, int active)
20 register XMenu *menu; /* Menu object to be modified. */ 20 /* Menu object to be modified. */
21 register int p_num; /* Pane number to be modified. */ 21 /* Pane number to be modified. */
22 register int s_num; /* Selection number to modified. */ 22 /* Selection number to modified. */
23 int active; /* Make selection active? */ 23 /* Make selection active? */
24{ 24{
25 register XMPane *p_ptr; /* XMPane pointer. */ 25 register XMPane *p_ptr; /* XMPane pointer. */
26 register XMSelect *s_ptr; /* XMSelect pointer. */ 26 register XMSelect *s_ptr; /* XMSelect pointer. */
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index e1abcbbe6c5..9a7766bc09d 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -71,8 +71,8 @@ typedef struct {
71 int size; /* Table size (number of buckets). */ 71 int size; /* Table size (number of buckets). */
72} XAssocTable; 72} XAssocTable;
73 73
74XAssocTable *XCreateAssocTable(); 74XAssocTable *XCreateAssocTable(int size);
75char *XLookUpAssoc(); 75char *XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id);
76 76
77#endif /* _X10_H_ */ 77#endif /* _X10_H_ */
78 78
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index 874ed81d31f..aa98c27ff41 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -11,8 +11,6 @@
11#define NULL 0 11#define NULL 0
12#endif 12#endif
13 13
14extern int errno;
15
16/* 14/*
17 * XCreateAssocTable - Create an XAssocTable. The size argument should be 15 * XCreateAssocTable - Create an XAssocTable. The size argument should be
18 * a power of two for efficiency reasons. Some size suggestions: use 32 16 * a power of two for efficiency reasons. Some size suggestions: use 32
@@ -20,8 +18,8 @@ extern int errno;
20 * buckets is 8. If there is an error creating the XAssocTable, a NULL 18 * buckets is 8. If there is an error creating the XAssocTable, a NULL
21 * pointer is returned. 19 * pointer is returned.
22 */ 20 */
23XAssocTable *XCreateAssocTable(size) 21XAssocTable *XCreateAssocTable(register int size)
24 register int size; /* Desired size of the table. */ 22 /* Desired size of the table. */
25{ 23{
26 register XAssocTable *table; /* XAssocTable to be initialized. */ 24 register XAssocTable *table; /* XAssocTable to be initialized. */
27 register XAssoc *buckets; /* Pointer to the first bucket in */ 25 register XAssoc *buckets; /* Pointer to the first bucket in */
diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 11e8c35a774..7aca50aa56b 100644
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -5,22 +5,19 @@
5 5
6#include <X11/Xlib.h> 6#include <X11/Xlib.h>
7#include "X10.h" 7#include "X10.h"
8void emacs_remque();
9struct qelem { 8struct qelem {
10 struct qelem *q_forw; 9 struct qelem *q_forw;
11 struct qelem *q_back; 10 struct qelem *q_back;
12 char q_data[1]; 11 char q_data[1];
13}; 12};
13void emacs_remque(struct qelem*);
14 14
15/* 15/*
16 * XDeleteAssoc - Delete an association in an XAssocTable keyed on 16 * XDeleteAssoc - Delete an association in an XAssocTable keyed on
17 * an XId. An association may be removed only once. Redundant 17 * an XId. An association may be removed only once. Redundant
18 * deletes are meaningless (but cause no problems). 18 * deletes are meaningless (but cause no problems).
19 */ 19 */
20XDeleteAssoc(dpy, table, x_id) 20XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
21 register Display *dpy;
22 register XAssocTable *table;
23 register XID x_id;
24{ 21{
25 int hash; 22 int hash;
26 register XAssoc *bucket; 23 register XAssoc *bucket;
diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index fee53eb756f..c2dd8d4d89b 100644
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -10,8 +10,7 @@
10 * XDestroyAssocTable - Destroy (free the memory associated with) 10 * XDestroyAssocTable - Destroy (free the memory associated with)
11 * an XAssocTable. 11 * an XAssocTable.
12 */ 12 */
13XDestroyAssocTable(table) 13XDestroyAssocTable(register XAssocTable *table)
14 register XAssocTable *table;
15{ 14{
16 register int i; 15 register int i;
17 register XAssoc *bucket; 16 register XAssoc *bucket;
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index 0ab71c3e78b..a1a06e900c7 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -18,10 +18,10 @@
18 * in the table the routine will return a NULL pointer. All XId's are relative 18 * in the table the routine will return a NULL pointer. All XId's are relative
19 * to the currently active Display. 19 * to the currently active Display.
20 */ 20 */
21caddr_t XLookUpAssoc(dpy, table, x_id) 21caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
22 register Display *dpy; 22
23 register XAssocTable *table; /* XAssocTable to search in. */ 23 /* XAssocTable to search in. */
24 register XID x_id; /* XId to search for. */ 24 /* XId to search for. */
25{ 25{
26 int hash; 26 int hash;
27 register XAssoc *bucket; 27 register XAssoc *bucket;
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index cf039c8f3c1..84157399b43 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -13,25 +13,20 @@
13#define NULL 0 13#define NULL 0
14#endif 14#endif
15 15
16extern int errno;
17
18void emacs_insque();
19struct qelem { 16struct qelem {
20 struct qelem *q_forw; 17 struct qelem *q_forw;
21 struct qelem *q_back; 18 struct qelem *q_back;
22 char q_data[1]; 19 char q_data[1];
23}; 20};
21void emacs_insque (struct qelem *elem, struct qelem *prev);
22
24/* 23/*
25 * XMakeAssoc - Insert data into an XAssocTable keyed on an XId. 24 * XMakeAssoc - Insert data into an XAssocTable keyed on an XId.
26 * Data is inserted into the table only once. Redundant inserts are 25 * Data is inserted into the table only once. Redundant inserts are
27 * meaningless (but cause no problems). The queue in each association 26 * meaningless (but cause no problems). The queue in each association
28 * bucket is sorted (lowest XId to highest XId). 27 * bucket is sorted (lowest XId to highest XId).
29 */ 28 */
30XMakeAssoc(dpy, table, x_id, data) 29XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data)
31 register Display *dpy;
32 register XAssocTable *table;
33 register XID x_id;
34 register caddr_t data;
35{ 30{
36 int hash; 31 int hash;
37 register XAssoc *bucket; 32 register XAssoc *bucket;
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index 2589ae68cca..42f9c45a37c 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -234,31 +234,33 @@ typedef struct _xmenu {
234 Pixmap inact_pixmap; /* Menu inactive pixmap. */ 234 Pixmap inact_pixmap; /* Menu inactive pixmap. */
235} XMenu; 235} XMenu;
236 236
237typedef void (*Wait_func)(void*);
238
237/* 239/*
238 * XMenu library routine declarations. 240 * XMenu library routine declarations.
239 */ 241 */
240XMenu *XMenuCreate(); 242XMenu *XMenuCreate(Display *display, Window parent, register char *def_env);
241int XMenuAddPane(); 243int XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active);
242int XMenuAddSelection(); 244int XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char *help);
243int XMenuInsertPane(); 245int XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int active);
244int XMenuInsertSelection(); 246int XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_num, char *data, char *label, int active);
245int XMenuFindPane(); 247int XMenuFindPane(register XMenu *menu, register char *label);
246int XMenuFindSelection(); 248int XMenuFindSelection(register XMenu *menu, int p_num, register char *label);
247int XMenuChangePane(); 249int XMenuChangePane(register XMenu *menu, register int p_num, char *label);
248int XMenuChangeSelection(); 250int XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num, register int s_num, char *data, int data_sw, char *label, int label_sw);
249int XMenuSetPane(); 251int XMenuSetPane(register XMenu *menu, register int p_num, register int active);
250int XMenuSetSelection(); 252int XMenuSetSelection(register XMenu *menu, register int p_num, register int s_num, int active);
251int XMenuRecompute(); 253int XMenuRecompute(Display *display, register XMenu *menu);
252int XMenuEventHandler(); /* No value actually returned. */ 254int XMenuEventHandler(int (*handler) (XEvent *)); /* No value actually returned. */
253int XMenuLocate(); 255int XMenuLocate(register Display *display, register XMenu *menu, int p_num, int s_num, int x_pos, int y_pos, int *ul_x, int *ul_y, int *width, int *height);
254int XMenuSetFreeze(); /* No value actually returned. */ 256int XMenuSetFreeze(register XMenu *menu, register int freeze); /* No value actually returned. */
255void XMenuActivateSetWaitFunction(); 257void XMenuActivateSetWaitFunction(Wait_func func, void *data);
256int XMenuActivate(); 258int XMenuActivate(Display *display, XMenu *menu, int *p_num, int *s_num, int x_pos, int y_pos, unsigned int event_mask, char **data, void (*help_callback) (char *, int, int));
257char *XMenuPost(); 259char *XMenuPost(register Display *display, register XMenu *menu, register int *p_num, register int *s_num, register int x_pos, register int y_pos, int event_mask);
258int XMenuDeletePane(); 260int XMenuDeletePane(register Display *display, register XMenu *menu, register int p_num);
259int XMenuDeleteSelection(); 261int XMenuDeleteSelection(register Display *display, register XMenu *menu, register int p_num, register int s_num);
260int XMenuDestroy(); /* No value actually returned. */ 262int XMenuDestroy(Display *display, register XMenu *menu); /* No value actually returned. */
261char *XMenuError(); 263char *XMenuError(void);
262 264
263#endif 265#endif
264/* Don't add after this point. */ 266/* Don't add after this point. */
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index d2844d8ea2b..dc6a0e5192a 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -37,7 +37,7 @@
37/* 37/*
38 * XMenu internal event handler variable. 38 * XMenu internal event handler variable.
39 */ 39 */
40extern int (*_XMEventHandler)(); 40extern int (*_XMEventHandler)(XEvent*);
41 41
42#ifndef Pixel 42#ifndef Pixel
43#define Pixel unsigned long 43#define Pixel unsigned long
@@ -46,19 +46,17 @@ extern int (*_XMEventHandler)();
46/* 46/*
47 * Internal routine declarations. 47 * Internal routine declarations.
48 */ 48 */
49int _XMWinQueInit(); /* No value actually returned. */ 49int _XMWinQueInit(void); /* No value actually returned. */
50int _XMWinQueAddPane(); 50int _XMWinQueAddPane(register Display *display, register XMenu *menu, register XMPane *p_ptr);
51int _XMWinQueAddSelection(); 51int _XMWinQueAddSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr);
52int _XMWinQueFlush(); 52int _XMWinQueFlush(register Display *display, register XMenu *menu, register XMPane *pane, XMSelect *select);
53XMPane *_XMGetPanePtr(); 53XMPane *_XMGetPanePtr(register XMenu *menu, register int p_num);
54XMSelect *_XMGetSelectionPtr(); 54XMSelect *_XMGetSelectionPtr(register XMPane *p_ptr, register int s_num);
55int _XMRecomputeGlobals(); /* No value actually returned. */ 55int _XMRecomputeGlobals(register Display *display, register XMenu *menu); /* No value actually returned. */
56int _XMRecomputePane(); 56int _XMRecomputePane(register Display *display, register XMenu *menu, register XMPane *p_ptr, register int p_num);
57int _XMRecomputeSelection(); 57int _XMRecomputeSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr, register int s_num);
58int _XMTransToOrigin(); /* No value actually returned. */ 58int _XMTransToOrigin(Display *display, register XMenu *menu, register XMPane *p_ptr, register XMSelect *s_ptr, int x_pos, int y_pos, int *orig_x, int *orig_y); /* No value actually returned. */
59int _XMRefreshPane(); /* No value actually returned. */ 59int _XMRefreshPane(register Display *display, register XMenu *menu, register XMPane *pane); /* No value actually returned. */
60int _XMRefreshSelections(); /* No value actually returned. */
61int _XMHighlightSelection(); /* No value actually returned. */
62 60
63#endif 61#endif
64/* Don't add stuff after this #endif */ 62/* Don't add stuff after this #endif */
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 16b194d88d3..c6f8f6ef1fb 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -30,8 +30,7 @@ struct qelem {
30/* Insert ELEM into a doubly-linked list, after PREV. */ 30/* Insert ELEM into a doubly-linked list, after PREV. */
31 31
32void 32void
33emacs_insque (elem, prev) 33emacs_insque (struct qelem *elem, struct qelem *prev)
34 struct qelem *elem, *prev;
35{ 34{
36 struct qelem *next = prev->q_forw; 35 struct qelem *next = prev->q_forw;
37 prev->q_forw = elem; 36 prev->q_forw = elem;
@@ -43,8 +42,7 @@ emacs_insque (elem, prev)
43 42
44/* Unlink ELEM from the doubly-linked list that it is in. */ 43/* Unlink ELEM from the doubly-linked list that it is in. */
45 44
46emacs_remque (elem) 45emacs_remque (struct qelem *elem)
47 struct qelem *elem;
48{ 46{
49 struct qelem *next = elem->q_forw; 47 struct qelem *next = elem->q_forw;
50 struct qelem *prev = elem->q_back; 48 struct qelem *prev = elem->q_back;
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-15 08:03:01 +0000