mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Convert function definitions in oldXMenu to standard C.

Browse source 
* 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.
This commit is contained in:
Dan Nicolaescu 2010-07-03 22:57:11 -07:00
parent c3174d16e2
commit b782e2d7f3
33 changed files with 241 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

27
oldXMenu/Activate.c
View file

@ -103,32 +103,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* For debug, set this to 0 to not grab the keyboard on menu popup */ /* For debug, set this to 0 to not grab the keyboard on menu popup */
int x_menu_grab_keyboard = 1; int x_menu_grab_keyboard = 1;
typedef void (*Wait_func)();
static Wait_func wait_func; static Wait_func wait_func;
static void* wait_data; static void* wait_data;
void void
XMenuActivateSetWaitFunction (func, data) XMenuActivateSetWaitFunction (Wait_func func, void *data)
Wait_func func;
void *data;
{ {
wait_func = func; wait_func = func;
wait_data = data; wait_data = data;
} }
int int
XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data, XMenuActivate(
help_callback) register Display *display, /* Display to put menu on. */
register Display *display; /* Display to put menu on. */ register XMenu *menu, /* Menu to activate. */
register XMenu *menu; /* Menu to activate. */ int *p_num, /* Pane number selected. */
int *p_num; /* Pane number selected. */ int *s_num, /* Selection number selected. */
int *s_num; /* Selection number selected. */ int x_pos, /* X coordinate of menu position. */
int x_pos; /* X coordinate of menu position. */ int y_pos, /* Y coordinate of menu position. */
int y_pos; /* Y coordinate of menu position. */ unsigned int event_mask, /* Mouse button event mask. */
unsigned int event_mask; /* Mouse button event mask. */ char **data, /* Pointer to return data value. */
char **data; /* Pointer to return data value. */ void (* help_callback) (char *, int, int)) /* Help callback. */
void (* help_callback) (); /* Help callback. */
{ {
int status; /* X routine call status. */ int status; /* X routine call status. */
int orig_x; /* Upper left menu origin X coord. */ int orig_x; /* Upper left menu origin X coord. */

10
oldXMenu/AddPane.c
View file

@ -16,11 +16,11 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuAddPane(display, menu, label, active) XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active)
Display *display;
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register char *label; /* Selection label. */ /* Selection label. */
int active; /* Make selection active? */ /* Make selection active? */
{ {
register XMPane *pane; /* Newly created pane. */ register XMPane *pane; /* Newly created pane. */
register XMSelect *select; /* Initial selection for the new pane. */ register XMSelect *select; /* Initial selection for the new pane. */

16
oldXMenu/AddSel.c
View file

@ -17,14 +17,14 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuAddSelection(display, menu, p_num, data, label, active, help) XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char *help)
Display *display;
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be modified. */ /* Pane number to be modified. */
char *data; /* Data value. */ /* Data value. */
char *label; /* Selection label. */ /* Selection label. */
int active; /* Make selection active? */ /* Make selection active? */
char *help; /* Help string */ /* Help string */
{ {
register XMPane *pane; /* Pane containing the new selection. */ register XMPane *pane; /* Pane containing the new selection. */
register XMSelect *select; /* Newly created selection. */ register XMSelect *select; /* Newly created selection. */

35
oldXMenu/ChangeLog
View file

@ -1,3 +1,38 @@
2010-07-04 Dan Nicolaescu <dann@ics.uci.edu>
* Activate.c: Convert function definitions to standard C.
* AddPane.c:
* AddSel.c:
* ChgPane.c:
* ChgSel.c:
* Create.c:
* DelPane.c:
* DelSel.c:
* Destroy.c:
* Error.c:
* EvHand.c:
* FindPane.c:
* FindSel.c:
* InsPane.c:
* InsSel.c:
* Internal.c:
* Locate.c:
* Post.c:
* Recomp.c:
* SetAEQ.c:
* SetFrz.c:
* SetPane.c:
* SetSel.c:
* X10.h:
* XCrAssoc.c:
* XDelAssoc.c:
* XDestAssoc.c:
* XLookAssoc.c:
* XMakeAssoc.c:
* XMenu.h:
* XMenuInt.h:
* insque.c: Likewise.
2010-05-07 Chong Yidong <cyd@stupidchicken.com> 2010-05-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.2 released. * Version 23.2 released.

8
oldXMenu/ChgPane.c
View file

@ -17,10 +17,10 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuChangePane(menu, p_num, label) XMenuChangePane(register XMenu *menu, register int p_num, char *label)
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be modified. */ /* Pane number to be modified. */
char *label; /* Selection label. */ /* Selection label. */
{ {
register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *p_ptr; /* XMPane pointer. */

18
oldXMenu/ChgSel.c
View file

@ -17,15 +17,15 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuChangeSelection(display, menu, p_num, s_num, data, data_sw, label, label_sw) XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num, register int s_num, char *data, int data_sw, char *label, int label_sw)
Display *display; /* previously opened display. */ /* previously opened display. */
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be modified. */ /* Pane number to be modified. */
register int s_num; /* Selection number to modified. */ /* Selection number to modified. */
char *data; /* Data value. */ /* Data value. */
int data_sw; /* Change to new data value? */ /* Change to new data value? */
char *label; /* Selection label. */ /* Selection label. */
int label_sw; /* Change to new label? */ /* Change to new label? */
{ {
register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *p_ptr; /* XMPane pointer. */
register XMSelect *s_ptr; /* XMSelect pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */

21
oldXMenu/Create.c
View file

@ -91,19 +91,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define TILE_BUF_SIZE 5 #define TILE_BUF_SIZE 5
int atoi(); int atoi(const char *);
double atof(); double atof(const char *);
char *x_get_resource_string (); char *x_get_resource_string (char *attribute, char *class);
static Status static Status
XAllocDisplayColor(display, map, colorName, color, junk) XAllocDisplayColor(Display *display, Colormap map, char *colorName, XColor *color, XColor *junk)
Display *display;
Colormap map;
char *colorName;
XColor *color;
XColor *junk;
{ {
return (colorName!=0 && return (colorName!=0 &&
XParseColor(display, map, colorName, color) && XParseColor(display, map, colorName, color) &&
@ -112,10 +107,10 @@ XAllocDisplayColor(display, map, colorName, color, junk)
XMenu * XMenu *
XMenuCreate(display, parent, def_env) XMenuCreate(Display *display, Window parent, register char *def_env)
Display *display; /* ID of previously opened display */ /* ID of previously opened display */
Window parent; /* Window ID of the menu's parent window. */ /* Window ID of the menu's parent window. */
register char *def_env; /* X Defaults program environment name. */ /* X Defaults program environment name. */
{ {
register int i; /* Loop counter. */ register int i; /* Loop counter. */
register int j; /* Loop counter. */ register int j; /* Loop counter. */

8
oldXMenu/DelPane.c
View file

@ -16,10 +16,10 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuDeletePane(display, menu, p_num) XMenuDeletePane(register Display *display, register XMenu *menu, register int p_num)
register Display *display; /* Previously opened display */ /* Previously opened display */
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be deleted. */ /* Pane number to be deleted. */
{ {
register XMPane *p_ptr; /* Pointer to pane being deleted. */ register XMPane *p_ptr; /* Pointer to pane being deleted. */
register XMSelect *s_ptr; /* Pointer to selections being deleted. */ register XMSelect *s_ptr; /* Pointer to selections being deleted. */

10
oldXMenu/DelSel.c
View file

@ -16,11 +16,11 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuDeleteSelection(display, menu, p_num, s_num) XMenuDeleteSelection(register Display *display, register XMenu *menu, register int p_num, register int s_num)
register Display *display; /* Previously opened display. */ /* Previously opened display. */
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be deleted. */ /* Pane number to be deleted. */
register int s_num; /* Selection number to be deleted. */ /* Selection number to be deleted. */
{ {
register XMPane *p_ptr; /* Pointer to pane being deleted. */ register XMPane *p_ptr; /* Pointer to pane being deleted. */
register XMSelect *s_ptr; /* Pointer to selections being deleted. */ register XMSelect *s_ptr; /* Pointer to selections being deleted. */

6
oldXMenu/Destroy.c
View file

@ -15,9 +15,9 @@
#include "XMenuInt.h" #include "XMenuInt.h"
XMenuDestroy(display, menu) XMenuDestroy(Display *display, register XMenu *menu)
Display *display;
register XMenu *menu; /* Menu object to destroy. */ /* Menu object to destroy. */
{ {
register XMPane *p_ptr; /* Pointer to the current pane. */ register XMPane *p_ptr; /* Pointer to the current pane. */
register XMPane *p_next; /* Pointer to the next pane. */ register XMPane *p_next; /* Pointer to the next pane. */

2
oldXMenu/Error.c
View file

@ -17,7 +17,7 @@
#include "XMenuInt.h" #include "XMenuInt.h"
char * char *
XMenuError() XMenuError(void)
{ {
static char message[128]; /* Error message buffer. */ static char message[128]; /* Error message buffer. */

3
oldXMenu/EvHand.c
View file

@ -15,8 +15,7 @@
#include "XMenuInt.h" #include "XMenuInt.h"
XMenuEventHandler(handler) XMenuEventHandler(int (*handler) (XEvent*))
int (*handler)();
{ {
/* /*
* Set the global event handler variable. * Set the global event handler variable.

4
oldXMenu/FindPane.c
View file

@ -17,9 +17,7 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuFindPane(menu, label) XMenuFindPane(register XMenu *menu, register char *label)
register XMenu *menu;
register char *label;
{ {
register XMPane *p_ptr; register XMPane *p_ptr;
register int i = 0; register int i = 0;

5
oldXMenu/FindSel.c
View file

@ -34,10 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuFindSelection(menu, p_num, label) XMenuFindSelection(register XMenu *menu, int p_num, register char *label)
register XMenu *menu;
int p_num;
register char *label;
{ {
register XMPane *p_ptr; register XMPane *p_ptr;
register XMSelect *s_ptr; register XMSelect *s_ptr;

10
oldXMenu/InsPane.c
View file

@ -18,11 +18,11 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuInsertPane(menu, p_num, label, active) XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int active)
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number of new pane. */ /* Pane number of new pane. */
char *label; /* Selection label. */ /* Selection label. */
int active; /* Make selection active? */ /* Make selection active? */
{ {
register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *p_ptr; /* XMPane pointer. */
register XMPane *pane; /* Newly created pane. */ register XMPane *pane; /* Newly created pane. */

14
oldXMenu/InsSel.c
View file

@ -17,13 +17,13 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuInsertSelection(menu, p_num, s_num, data, label, active) XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_num, char *data, char *label, int active)
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be modified. */ /* Pane number to be modified. */
register int s_num; /* Selection number of new selection. */ /* Selection number of new selection. */
char *data; /* Data value. */ /* Data value. */
char *label; /* Selection label. */ /* Selection label. */
int active; /* Make selection active? */ /* Make selection active? */
{ {
register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *p_ptr; /* XMPane pointer. */
register XMSelect *s_ptr; /* XMSelect pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */

94
oldXMenu/Internal.c
View file

@ -96,7 +96,7 @@ _XMErrorList[XME_CODE_COUNT] = {
/* /*
* _XMEventHandler - Internal event handler variable. * _XMEventHandler - Internal event handler variable.
*/ */
int (*_XMEventHandler)() = NULL; int (*_XMEventHandler)(XEvent*) = NULL;
@ -104,7 +104,7 @@ int (*_XMEventHandler)() = NULL;
* _XMWinQueInit - Internal routine to initialize the window * _XMWinQueInit - Internal routine to initialize the window
* queue. * queue.
*/ */
_XMWinQueInit() _XMWinQueInit(void)
{ {
/* /*
* If the queue is not initialized initialize it. * If the queue is not initialized initialize it.
@ -138,10 +138,10 @@ _XMWinQueInit()
* window queue. * window queue.
*/ */
int int
_XMWinQueAddPane(display, menu, p_ptr) _XMWinQueAddPane(register Display *display, register XMenu *menu, register XMPane *p_ptr)
register Display *display;
register XMenu *menu; /* Menu being manipulated. */ /* Menu being manipulated. */
register XMPane *p_ptr; /* XMPane being queued. */ /* XMPane being queued. */
{ {
/* /*
* If the queue is currently full then flush it. * If the queue is currently full then flush it.
@ -172,10 +172,10 @@ _XMWinQueAddPane(display, menu, p_ptr)
* the selection window queue. * the selection window queue.
*/ */
int int
_XMWinQueAddSelection(display, menu, s_ptr) _XMWinQueAddSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr)
register Display *display;
register XMenu *menu; /* Menu being manipulated. */ /* Menu being manipulated. */
register XMSelect *s_ptr; /* XMSelection being queued. */ /* XMSelection being queued. */
{ {
/* /*
* If this entry will overflow the queue then flush it. * If this entry will overflow the queue then flush it.
@ -206,10 +206,10 @@ _XMWinQueAddSelection(display, menu, s_ptr)
* selection window queues. * selection window queues.
*/ */
int int
_XMWinQueFlush(display, menu, pane, select) _XMWinQueFlush(register Display *display, register XMenu *menu, register XMPane *pane, XMSelect *select)
register Display *display;
register XMenu *menu; /* Menu being manipulated. */ /* Menu being manipulated. */
register XMPane *pane; /* Current pane. */ /* Current pane. */
{ {
register int pq_index; /* Pane queue index. */ register int pq_index; /* Pane queue index. */
register int sq_index; /* Selection queue index. */ register int sq_index; /* Selection queue index. */
@ -346,9 +346,9 @@ _XMWinQueFlush(display, menu, pane, select)
* a pane pointer that points to the indexed pane. * a pane pointer that points to the indexed pane.
*/ */
XMPane * XMPane *
_XMGetPanePtr(menu, p_num) _XMGetPanePtr(register XMenu *menu, register int p_num)
register XMenu *menu; /* Menu to find the pane in. */ /* Menu to find the pane in. */
register int p_num; /* Index number of pane to find. */ /* Index number of pane to find. */
{ {
register XMPane *p_ptr; /* Pane pointer to be returned. */ register XMPane *p_ptr; /* Pane pointer to be returned. */
register int i; /* Loop counter. */ register int i; /* Loop counter. */
@ -382,9 +382,9 @@ _XMGetPanePtr(menu, p_num)
* indexed selection. * indexed selection.
*/ */
XMSelect * XMSelect *
_XMGetSelectionPtr(p_ptr, s_num) _XMGetSelectionPtr(register XMPane *p_ptr, register int s_num)
register XMPane *p_ptr; /* Pane to find the selection in. */ /* Pane to find the selection in. */
register int s_num; /* Index number of the selection to find. */ /* Index number of the selection to find. */
{ {
register XMSelect *s_ptr; /* Selection pointer to be returned. */ register XMSelect *s_ptr; /* Selection pointer to be returned. */
register int i; /* Loop counter. */ register int i; /* Loop counter. */
@ -416,9 +416,9 @@ _XMGetSelectionPtr(p_ptr, s_num)
* _XMRecomputeGlobals - Internal subroutine to recompute menu wide * _XMRecomputeGlobals - Internal subroutine to recompute menu wide
* global values. * global values.
*/ */
_XMRecomputeGlobals(display, menu) _XMRecomputeGlobals(register Display *display, register XMenu *menu)
register Display *display; /*X11 display variable. */ /*X11 display variable. */
register XMenu *menu; /* Menu object to compute from. */ /* Menu object to compute from. */
{ {
register XMPane *p_ptr; /* Pane pointer. */ register XMPane *p_ptr; /* Pane pointer. */
register XMSelect *s_ptr; /* Selection pointer. */ register XMSelect *s_ptr; /* Selection pointer. */
@ -531,11 +531,11 @@ _XMRecomputeGlobals(display, menu)
* window dependencies. * window dependencies.
*/ */
int int
_XMRecomputePane(display, menu, p_ptr, p_num) _XMRecomputePane(register Display *display, register XMenu *menu, register XMPane *p_ptr, register int p_num)
register Display *display; /* Standard X display variable. */ /* Standard X display variable. */
register XMenu *menu; /* Menu object being recomputed. */ /* Menu object being recomputed. */
register XMPane *p_ptr; /* Pane pointer. */ /* Pane pointer. */
register int p_num; /* Pane sequence number. */ /* Pane sequence number. */
{ {
register int window_x; /* Recomputed window X coordinate. */ register int window_x; /* Recomputed window X coordinate. */
register int window_y; /* Recomputed window Y coordinate. */ register int window_y; /* Recomputed window Y coordinate. */
@ -681,11 +681,11 @@ _XMRecomputePane(display, menu, p_ptr, p_num)
* selection window dependencies. * selection window dependencies.
*/ */
int int
_XMRecomputeSelection(display, menu, s_ptr, s_num) _XMRecomputeSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr, register int s_num)
register Display *display;
register XMenu *menu; /* Menu object being recomputed. */ /* Menu object being recomputed. */
register XMSelect *s_ptr; /* Selection pointer. */ /* Selection pointer. */
register int s_num; /* Selection sequence number. */ /* Selection sequence number. */
{ {
register Bool config_s = False; /* Reconfigure selection window? */ register Bool config_s = False; /* Reconfigure selection window? */
XWindowChanges *changes; /* Values to change in configure. */ XWindowChanges *changes; /* Values to change in configure. */
@ -811,15 +811,15 @@ _XMRecomputeSelection(display, menu, s_ptr, s_num)
* recomputed before calling this routine or * recomputed before calling this routine or
* unpredictable results will follow. * unpredictable results will follow.
*/ */
_XMTransToOrigin(display, menu, p_ptr, s_ptr, x_pos, y_pos, orig_x, orig_y) _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)
Display *display; /* Not used. Included for consistency. */ /* Not used. Included for consistency. */
register XMenu *menu; /* Menu being computed against. */ /* Menu being computed against. */
register XMPane *p_ptr; /* Current pane pointer. */ /* Current pane pointer. */
register XMSelect *s_ptr; /* Current selection pointer. */ /* Current selection pointer. */
int x_pos; /* X coordinate of point to translate. */ /* X coordinate of point to translate. */
int y_pos; /* Y coordinate of point to translate. */ /* Y coordinate of point to translate. */
int *orig_x; /* Return value X coord. of the menu origin. */ /* Return value X coord. of the menu origin. */
int *orig_y; /* Return value Y coord. of the menu origin. */ /* Return value Y coord. of the menu origin. */
{ {
register int l_orig_x; /* Local X coordinate of the menu origin. */ register int l_orig_x; /* Local X coordinate of the menu origin. */
register int l_orig_y; /* Local Y coordinate of the menu origin. */ 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)
* _XMRefreshPane - Internal subroutine to completely refresh * _XMRefreshPane - Internal subroutine to completely refresh
* the contents of a pane. * the contents of a pane.
*/ */
_XMRefreshPane(display, menu, pane) _XMRefreshPane(register Display *display, register XMenu *menu, register XMPane *pane)
register Display *display;
register XMenu *menu;
register XMPane *pane;
{ {
register XMSelect *s_list = pane->s_list; register XMSelect *s_list = pane->s_list;
register XMSelect *s_ptr; register XMSelect *s_ptr;
@ -941,10 +938,7 @@ _XMRefreshPane(display, menu, pane)
* _XMRefreshSelection - Internal subroutine that refreshes * _XMRefreshSelection - Internal subroutine that refreshes
* a single selection window. * a single selection window.
*/ */
_XMRefreshSelection(display, menu, select) _XMRefreshSelection(register Display *display, register XMenu *menu, register XMSelect *select)
register Display *display;
register XMenu *menu;
register XMSelect *select;
{ {
register int width = select->window_w; register int width = select->window_w;
register int height = select->window_h; register int height = select->window_h;

22
oldXMenu/Locate.c
View file

@ -17,17 +17,17 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuLocate(display, menu, p_num, s_num, x_pos, y_pos, ul_x, ul_y, width, height) 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)
register Display *display; /* Previously opened display. */ /* Previously opened display. */
register XMenu *menu; /* Menu object being located. */ /* Menu object being located. */
int p_num; /* Active pane number. */ /* Active pane number. */
int s_num; /* Active selection number. */ /* Active selection number. */
int x_pos; /* X coordinate of mouse active position. */ /* X coordinate of mouse active position. */
int y_pos; /* Y coordinate of mouse active position. */ /* Y coordinate of mouse active position. */
int *ul_x; /* Returned upper left menu X coordinate. */ /* Returned upper left menu X coordinate. */
int *ul_y; /* Returned upper left menu Y coordinate. */ /* Returned upper left menu Y coordinate. */
int *width; /* Returned menu width. */ /* Returned menu width. */
int *height; /* Returned menu height. */ /* Returned menu height. */
{ {
register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *p_ptr; /* XMPane pointer. */
register XMSelect *s_ptr; /* XMSelect pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */

16
oldXMenu/Post.c
View file

@ -39,14 +39,14 @@
#include "XMenuInt.h" #include "XMenuInt.h"
char * char *
XMenuPost(display, menu, p_num, s_num, x_pos, y_pos, event_mask) 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)
register Display *display; /* Previously opened display. */ /* Previously opened display. */
register XMenu *menu; /* Menu to post. */ /* Menu to post. */
register int *p_num; /* Pane number selected. */ /* Pane number selected. */
register int *s_num; /* Selection number selected. */ /* Selection number selected. */
register int x_pos; /* X coordinate of menu position. */ /* X coordinate of menu position. */
register int y_pos; /* Y coordinate of menu position. */ /* Y coordinate of menu position. */
int event_mask; /* Mouse button event mask. */ /* Mouse button event mask. */
{ {
register int stat; /* Routine call return status. */ register int stat; /* Routine call return status. */
char *data; /* Return data. */ char *data; /* Return data. */

6
oldXMenu/Recomp.c
View file

@ -16,9 +16,9 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuRecompute(display, menu) XMenuRecompute(Display *display, register XMenu *menu)
Display *display;
register XMenu *menu; /* Menu object to be recomputed. */ /* Menu object to be recomputed. */
{ {
register XMPane *p_ptr; /* Pane pointer. */ register XMPane *p_ptr; /* Pane pointer. */
register XMSelect *s_ptr; /* Selection pointer. */ register XMSelect *s_ptr; /* Selection pointer. */

6
oldXMenu/SetAEQ.c
View file

@ -18,9 +18,9 @@
#include "XMenuInt.h" #include "XMenuInt.h"
XMenuSetAEQ(menu, aeq) XMenuSetAEQ(register XMenu *menu, register int aeq)
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int aeq; /* AEQ mode? */ /* AEQ mode? */
{ {
/* /*
* Set the AEQ mode switch. * Set the AEQ mode switch.

6
oldXMenu/SetFrz.c
View file

@ -17,9 +17,9 @@
#include "XMenuInt.h" #include "XMenuInt.h"
XMenuSetFreeze(menu, freeze) XMenuSetFreeze(register XMenu *menu, register int freeze)
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int freeze; /* Freeze mode? */ /* Freeze mode? */
{ {
/* /*
* Set the freeze mode switch. * Set the freeze mode switch.

8
oldXMenu/SetPane.c
View file

@ -16,10 +16,10 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuSetPane(menu, p_num, active) XMenuSetPane(register XMenu *menu, register int p_num, register int active)
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be modified. */ /* Pane number to be modified. */
register int active; /* Make selection active? */ /* Make selection active? */
{ {
register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *p_ptr; /* XMPane pointer. */

10
oldXMenu/SetSel.c
View file

@ -16,11 +16,11 @@
#include "XMenuInt.h" #include "XMenuInt.h"
int int
XMenuSetSelection(menu, p_num, s_num, active) XMenuSetSelection(register XMenu *menu, register int p_num, register int s_num, int active)
register XMenu *menu; /* Menu object to be modified. */ /* Menu object to be modified. */
register int p_num; /* Pane number to be modified. */ /* Pane number to be modified. */
register int s_num; /* Selection number to modified. */ /* Selection number to modified. */
int active; /* Make selection active? */ /* Make selection active? */
{ {
register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *p_ptr; /* XMPane pointer. */
register XMSelect *s_ptr; /* XMSelect pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */

4
oldXMenu/X10.h
View file

@ -71,8 +71,8 @@ typedef struct {
int size; /* Table size (number of buckets). */ int size; /* Table size (number of buckets). */
} XAssocTable; } XAssocTable;
XAssocTable *XCreateAssocTable(); XAssocTable *XCreateAssocTable(int size);
char *XLookUpAssoc(); char *XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id);
#endif /* _X10_H_ */ #endif /* _X10_H_ */

6
oldXMenu/XCrAssoc.c
View file

@ -11,8 +11,6 @@
#define NULL 0 #define NULL 0
#endif #endif
extern int errno;
/* /*
* XCreateAssocTable - Create an XAssocTable. The size argument should be * XCreateAssocTable - Create an XAssocTable. The size argument should be
* a power of two for efficiency reasons. Some size suggestions: use 32 * a power of two for efficiency reasons. Some size suggestions: use 32
@ -20,8 +18,8 @@ extern int errno;
* buckets is 8. If there is an error creating the XAssocTable, a NULL * buckets is 8. If there is an error creating the XAssocTable, a NULL
* pointer is returned. * pointer is returned.
*/ */
XAssocTable *XCreateAssocTable(size) XAssocTable *XCreateAssocTable(register int size)
register int size; /* Desired size of the table. */ /* Desired size of the table. */
{ {
register XAssocTable *table; /* XAssocTable to be initialized. */ register XAssocTable *table; /* XAssocTable to be initialized. */
register XAssoc *buckets; /* Pointer to the first bucket in */ register XAssoc *buckets; /* Pointer to the first bucket in */

7
oldXMenu/XDelAssoc.c
View file

@ -5,22 +5,19 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "X10.h" #include "X10.h"
void emacs_remque();
struct qelem { struct qelem {
struct qelem *q_forw; struct qelem *q_forw;
struct qelem *q_back; struct qelem *q_back;
char q_data[1]; char q_data[1];
}; };
void emacs_remque(struct qelem*);
/* /*
* XDeleteAssoc - Delete an association in an XAssocTable keyed on * XDeleteAssoc - Delete an association in an XAssocTable keyed on
* an XId. An association may be removed only once. Redundant * an XId. An association may be removed only once. Redundant
* deletes are meaningless (but cause no problems). * deletes are meaningless (but cause no problems).
*/ */
XDeleteAssoc(dpy, table, x_id) XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
register Display *dpy;
register XAssocTable *table;
register XID x_id;
{ {
int hash; int hash;
register XAssoc *bucket; register XAssoc *bucket;

3
oldXMenu/XDestAssoc.c
View file

@ -10,8 +10,7 @@
* XDestroyAssocTable - Destroy (free the memory associated with) * XDestroyAssocTable - Destroy (free the memory associated with)
* an XAssocTable. * an XAssocTable.
*/ */
XDestroyAssocTable(table) XDestroyAssocTable(register XAssocTable *table)
register XAssocTable *table;
{ {
register int i; register int i;
register XAssoc *bucket; register XAssoc *bucket;

8
oldXMenu/XLookAssoc.c
View file

@ -18,10 +18,10 @@
* in the table the routine will return a NULL pointer. All XId's are relative * in the table the routine will return a NULL pointer. All XId's are relative
* to the currently active Display. * to the currently active Display.
*/ */
caddr_t XLookUpAssoc(dpy, table, x_id) caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
register Display *dpy;
register XAssocTable *table; /* XAssocTable to search in. */ /* XAssocTable to search in. */
register XID x_id; /* XId to search for. */ /* XId to search for. */
{ {
int hash; int hash;
register XAssoc *bucket; register XAssoc *bucket;

11
oldXMenu/XMakeAssoc.c
View file

@ -13,25 +13,20 @@
#define NULL 0 #define NULL 0
#endif #endif
extern int errno;
void emacs_insque();
struct qelem { struct qelem {
struct qelem *q_forw; struct qelem *q_forw;
struct qelem *q_back; struct qelem *q_back;
char q_data[1]; char q_data[1];
}; };
void emacs_insque (struct qelem *elem, struct qelem *prev);
/* /*
* XMakeAssoc - Insert data into an XAssocTable keyed on an XId. * XMakeAssoc - Insert data into an XAssocTable keyed on an XId.
* Data is inserted into the table only once. Redundant inserts are * Data is inserted into the table only once. Redundant inserts are
* meaningless (but cause no problems). The queue in each association * meaningless (but cause no problems). The queue in each association
* bucket is sorted (lowest XId to highest XId). * bucket is sorted (lowest XId to highest XId).
*/ */
XMakeAssoc(dpy, table, x_id, data) XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data)
register Display *dpy;
register XAssocTable *table;
register XID x_id;
register caddr_t data;
{ {
int hash; int hash;
register XAssoc *bucket; register XAssoc *bucket;

46
oldXMenu/XMenu.h
View file

@ -234,31 +234,33 @@ typedef struct _xmenu {
Pixmap inact_pixmap; /* Menu inactive pixmap. */ Pixmap inact_pixmap; /* Menu inactive pixmap. */
} XMenu; } XMenu;
typedef void (*Wait_func)(void*);
/* /*
* XMenu library routine declarations. * XMenu library routine declarations.
*/ */
XMenu *XMenuCreate(); XMenu *XMenuCreate(Display *display, Window parent, register char *def_env);
int XMenuAddPane(); int XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active);
int XMenuAddSelection(); int XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char *help);
int XMenuInsertPane(); int XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int active);
int XMenuInsertSelection(); int XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_num, char *data, char *label, int active);
int XMenuFindPane(); int XMenuFindPane(register XMenu *menu, register char *label);
int XMenuFindSelection(); int XMenuFindSelection(register XMenu *menu, int p_num, register char *label);
int XMenuChangePane(); int XMenuChangePane(register XMenu *menu, register int p_num, char *label);
int XMenuChangeSelection(); int XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num, register int s_num, char *data, int data_sw, char *label, int label_sw);
int XMenuSetPane(); int XMenuSetPane(register XMenu *menu, register int p_num, register int active);
int XMenuSetSelection(); int XMenuSetSelection(register XMenu *menu, register int p_num, register int s_num, int active);
int XMenuRecompute(); int XMenuRecompute(Display *display, register XMenu *menu);
int XMenuEventHandler(); /* No value actually returned. */ int XMenuEventHandler(int (*handler) (XEvent *)); /* No value actually returned. */
int XMenuLocate(); int 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);
int XMenuSetFreeze(); /* No value actually returned. */ int XMenuSetFreeze(register XMenu *menu, register int freeze); /* No value actually returned. */
void XMenuActivateSetWaitFunction(); void XMenuActivateSetWaitFunction(Wait_func func, void *data);
int XMenuActivate(); int 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));
char *XMenuPost(); char *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);
int XMenuDeletePane(); int XMenuDeletePane(register Display *display, register XMenu *menu, register int p_num);
int XMenuDeleteSelection(); int XMenuDeleteSelection(register Display *display, register XMenu *menu, register int p_num, register int s_num);
int XMenuDestroy(); /* No value actually returned. */ int XMenuDestroy(Display *display, register XMenu *menu); /* No value actually returned. */
char *XMenuError(); char *XMenuError(void);
#endif #endif
/* Don't add after this point. */ /* Don't add after this point. */

26
oldXMenu/XMenuInt.h
View file

@ -37,7 +37,7 @@
/* /*
* XMenu internal event handler variable. * XMenu internal event handler variable.
*/ */
extern int (*_XMEventHandler)(); extern int (*_XMEventHandler)(XEvent*);
#ifndef Pixel #ifndef Pixel
#define Pixel unsigned long #define Pixel unsigned long
@ -46,19 +46,17 @@ extern int (*_XMEventHandler)();
/* /*
* Internal routine declarations. * Internal routine declarations.
*/ */
int _XMWinQueInit(); /* No value actually returned. */ int _XMWinQueInit(void); /* No value actually returned. */
int _XMWinQueAddPane(); int _XMWinQueAddPane(register Display *display, register XMenu *menu, register XMPane *p_ptr);
int _XMWinQueAddSelection(); int _XMWinQueAddSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr);
int _XMWinQueFlush(); int _XMWinQueFlush(register Display *display, register XMenu *menu, register XMPane *pane, XMSelect *select);
XMPane *_XMGetPanePtr(); XMPane *_XMGetPanePtr(register XMenu *menu, register int p_num);
XMSelect *_XMGetSelectionPtr(); XMSelect *_XMGetSelectionPtr(register XMPane *p_ptr, register int s_num);
int _XMRecomputeGlobals(); /* No value actually returned. */ int _XMRecomputeGlobals(register Display *display, register XMenu *menu); /* No value actually returned. */
int _XMRecomputePane(); int _XMRecomputePane(register Display *display, register XMenu *menu, register XMPane *p_ptr, register int p_num);
int _XMRecomputeSelection(); int _XMRecomputeSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr, register int s_num);
int _XMTransToOrigin(); /* No value actually returned. */ int _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. */
int _XMRefreshPane(); /* No value actually returned. */ int _XMRefreshPane(register Display *display, register XMenu *menu, register XMPane *pane); /* No value actually returned. */
int _XMRefreshSelections(); /* No value actually returned. */
int _XMHighlightSelection(); /* No value actually returned. */
#endif #endif
/* Don't add stuff after this #endif */ /* Don't add stuff after this #endif */

6
oldXMenu/insque.c
View file

@ -30,8 +30,7 @@ struct qelem {
/* Insert ELEM into a doubly-linked list, after PREV. */ /* Insert ELEM into a doubly-linked list, after PREV. */
void void
emacs_insque (elem, prev) emacs_insque (struct qelem *elem, struct qelem *prev)
struct qelem *elem, *prev;
{ {
struct qelem *next = prev->q_forw; struct qelem *next = prev->q_forw;
prev->q_forw = elem; prev->q_forw = elem;
@ -43,8 +42,7 @@ emacs_insque (elem, prev)
/* Unlink ELEM from the doubly-linked list that it is in. */ /* Unlink ELEM from the doubly-linked list that it is in. */
emacs_remque (elem) emacs_remque (struct qelem *elem)
struct qelem *elem;
{ {
struct qelem *next = elem->q_forw; struct qelem *next = elem->q_forw;
struct qelem *prev = elem->q_back; struct qelem *prev = elem->q_back;