Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100707. ------------------------------------------------------------ revno: 100707 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-07-03 23:05:43 -0700 message: * lib-src/fakemail.c (action): Convert function definitions to standard C. (add_a_stream): * lib-src/test-distrib.c (cool_read): (main): Likewise. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-07-03 12:11:03 +0000 +++ lib-src/ChangeLog 2010-07-04 06:05:43 +0000 @@ -1,3 +1,10 @@ +2010-07-04 Dan Nicolaescu + + * fakemail.c (action): Convert function definitions to standard C. + (add_a_stream): + * test-distrib.c (cool_read): + (main): Likewise. + 2010-07-03 Andreas Schwab * sorted-doc.c (cmpdoc): Fix signature. === modified file 'lib-src/fakemail.c' --- lib-src/fakemail.c 2010-07-03 00:50:23 +0000 +++ lib-src/fakemail.c 2010-07-04 06:05:43 +0000 @@ -100,7 +100,7 @@ struct stream_record { FILE *handle; - int (*action)(); + int (*action)(FILE *); struct stream_record *rest_streams; }; typedef struct stream_record *stream_list; @@ -417,7 +417,7 @@ } void -add_a_stream (FILE *the_stream, int (*closing_action) (/* ??? */)) +add_a_stream (FILE *the_stream, int (*closing_action) (FILE *)) { stream_list old = the_streams; the_streams = new_stream (); === modified file 'lib-src/test-distrib.c' --- lib-src/test-distrib.c 2010-01-13 08:35:10 +0000 +++ lib-src/test-distrib.c 2010-07-04 06:05:43 +0000 @@ -52,10 +52,7 @@ /* Like `read' but keeps trying until it gets SIZE bytes or reaches eof. */ int -cool_read (fd, buf, size) - int fd; - char *buf; - int size; +cool_read (int fd, char *buf, int size) { int num, sofar = 0; @@ -70,9 +67,7 @@ } int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { int fd; ------------------------------------------------------------ revno: 100706 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-07-03 22:57:11 -0700 message: 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. diff: === modified file 'oldXMenu/Activate.c' --- oldXMenu/Activate.c 2010-01-13 08:35:10 +0000 +++ oldXMenu/Activate.c 2010-07-04 05:57:11 +0000 @@ -103,32 +103,27 @@ /* For debug, set this to 0 to not grab the keyboard on menu popup */ int x_menu_grab_keyboard = 1; -typedef void (*Wait_func)(); - static Wait_func wait_func; static void* wait_data; void -XMenuActivateSetWaitFunction (func, data) - Wait_func func; - void *data; +XMenuActivateSetWaitFunction (Wait_func func, void *data) { wait_func = func; wait_data = data; } int -XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data, - help_callback) - register Display *display; /* Display to put menu on. */ - register XMenu *menu; /* Menu to activate. */ - int *p_num; /* Pane number selected. */ - int *s_num; /* Selection number selected. */ - int x_pos; /* X coordinate of menu position. */ - int y_pos; /* Y coordinate of menu position. */ - unsigned int event_mask; /* Mouse button event mask. */ - char **data; /* Pointer to return data value. */ - void (* help_callback) (); /* Help callback. */ +XMenuActivate( + register Display *display, /* Display to put menu on. */ + register XMenu *menu, /* Menu to activate. */ + int *p_num, /* Pane number selected. */ + int *s_num, /* Selection number selected. */ + int x_pos, /* X coordinate of menu position. */ + int y_pos, /* Y coordinate of menu position. */ + unsigned int event_mask, /* Mouse button event mask. */ + char **data, /* Pointer to return data value. */ + void (* help_callback) (char *, int, int)) /* Help callback. */ { int status; /* X routine call status. */ int orig_x; /* Upper left menu origin X coord. */ === modified file 'oldXMenu/AddPane.c' --- oldXMenu/AddPane.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/AddPane.c 2010-07-04 05:57:11 +0000 @@ -16,11 +16,11 @@ #include "XMenuInt.h" int -XMenuAddPane(display, menu, label, active) - Display *display; - register XMenu *menu; /* Menu object to be modified. */ - register char *label; /* Selection label. */ - int active; /* Make selection active? */ +XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active) + + /* Menu object to be modified. */ + /* Selection label. */ + /* Make selection active? */ { register XMPane *pane; /* Newly created pane. */ register XMSelect *select; /* Initial selection for the new pane. */ === modified file 'oldXMenu/AddSel.c' --- oldXMenu/AddSel.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/AddSel.c 2010-07-04 05:57:11 +0000 @@ -17,14 +17,14 @@ #include "XMenuInt.h" int -XMenuAddSelection(display, menu, p_num, data, label, active, help) - Display *display; - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be modified. */ - char *data; /* Data value. */ - char *label; /* Selection label. */ - int active; /* Make selection active? */ - char *help; /* Help string */ +XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char *help) + + /* Menu object to be modified. */ + /* Pane number to be modified. */ + /* Data value. */ + /* Selection label. */ + /* Make selection active? */ + /* Help string */ { register XMPane *pane; /* Pane containing the new selection. */ register XMSelect *select; /* Newly created selection. */ === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2010-05-08 18:47:07 +0000 +++ oldXMenu/ChangeLog 2010-07-04 05:57:11 +0000 @@ -1,3 +1,38 @@ +2010-07-04 Dan Nicolaescu + + * 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 * Version 23.2 released. === modified file 'oldXMenu/ChgPane.c' --- oldXMenu/ChgPane.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/ChgPane.c 2010-07-04 05:57:11 +0000 @@ -17,10 +17,10 @@ #include "XMenuInt.h" int -XMenuChangePane(menu, p_num, label) - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be modified. */ - char *label; /* Selection label. */ +XMenuChangePane(register XMenu *menu, register int p_num, char *label) + /* Menu object to be modified. */ + /* Pane number to be modified. */ + /* Selection label. */ { register XMPane *p_ptr; /* XMPane pointer. */ === modified file 'oldXMenu/ChgSel.c' --- oldXMenu/ChgSel.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/ChgSel.c 2010-07-04 05:57:11 +0000 @@ -17,15 +17,15 @@ #include "XMenuInt.h" int -XMenuChangeSelection(display, menu, p_num, s_num, data, data_sw, label, label_sw) - Display *display; /* previously opened display. */ - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be modified. */ - register int s_num; /* Selection number to modified. */ - char *data; /* Data value. */ - int data_sw; /* Change to new data value? */ - char *label; /* Selection label. */ - int label_sw; /* Change to new label? */ +XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num, register int s_num, char *data, int data_sw, char *label, int label_sw) + /* previously opened display. */ + /* Menu object to be modified. */ + /* Pane number to be modified. */ + /* Selection number to modified. */ + /* Data value. */ + /* Change to new data value? */ + /* Selection label. */ + /* Change to new label? */ { register XMPane *p_ptr; /* XMPane pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */ === modified file 'oldXMenu/Create.c' --- oldXMenu/Create.c 2010-01-13 08:35:10 +0000 +++ oldXMenu/Create.c 2010-07-04 05:57:11 +0000 @@ -91,19 +91,14 @@ #define TILE_BUF_SIZE 5 -int atoi(); -double atof(); -char *x_get_resource_string (); +int atoi(const char *); +double atof(const char *); +char *x_get_resource_string (char *attribute, char *class); static Status -XAllocDisplayColor(display, map, colorName, color, junk) - Display *display; - Colormap map; - char *colorName; - XColor *color; - XColor *junk; +XAllocDisplayColor(Display *display, Colormap map, char *colorName, XColor *color, XColor *junk) { return (colorName!=0 && XParseColor(display, map, colorName, color) && @@ -112,10 +107,10 @@ XMenu * -XMenuCreate(display, parent, def_env) - Display *display; /* ID of previously opened display */ - Window parent; /* Window ID of the menu's parent window. */ - register char *def_env; /* X Defaults program environment name. */ +XMenuCreate(Display *display, Window parent, register char *def_env) + /* ID of previously opened display */ + /* Window ID of the menu's parent window. */ + /* X Defaults program environment name. */ { register int i; /* Loop counter. */ register int j; /* Loop counter. */ === modified file 'oldXMenu/DelPane.c' --- oldXMenu/DelPane.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/DelPane.c 2010-07-04 05:57:11 +0000 @@ -16,10 +16,10 @@ #include "XMenuInt.h" int -XMenuDeletePane(display, menu, p_num) - register Display *display; /* Previously opened display */ - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be deleted. */ +XMenuDeletePane(register Display *display, register XMenu *menu, register int p_num) + /* Previously opened display */ + /* Menu object to be modified. */ + /* Pane number to be deleted. */ { register XMPane *p_ptr; /* Pointer to pane being deleted. */ register XMSelect *s_ptr; /* Pointer to selections being deleted. */ === modified file 'oldXMenu/DelSel.c' --- oldXMenu/DelSel.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/DelSel.c 2010-07-04 05:57:11 +0000 @@ -16,11 +16,11 @@ #include "XMenuInt.h" int -XMenuDeleteSelection(display, menu, p_num, s_num) - register Display *display; /* Previously opened display. */ - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be deleted. */ - register int s_num; /* Selection number to be deleted. */ +XMenuDeleteSelection(register Display *display, register XMenu *menu, register int p_num, register int s_num) + /* Previously opened display. */ + /* Menu object to be modified. */ + /* Pane number to be deleted. */ + /* Selection number to be deleted. */ { register XMPane *p_ptr; /* Pointer to pane being deleted. */ register XMSelect *s_ptr; /* Pointer to selections being deleted. */ === modified file 'oldXMenu/Destroy.c' --- oldXMenu/Destroy.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/Destroy.c 2010-07-04 05:57:11 +0000 @@ -15,9 +15,9 @@ #include "XMenuInt.h" -XMenuDestroy(display, menu) - Display *display; - register XMenu *menu; /* Menu object to destroy. */ +XMenuDestroy(Display *display, register XMenu *menu) + + /* Menu object to destroy. */ { register XMPane *p_ptr; /* Pointer to the current pane. */ register XMPane *p_next; /* Pointer to the next pane. */ === modified file 'oldXMenu/Error.c' --- oldXMenu/Error.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/Error.c 2010-07-04 05:57:11 +0000 @@ -17,7 +17,7 @@ #include "XMenuInt.h" char * -XMenuError() +XMenuError(void) { static char message[128]; /* Error message buffer. */ === modified file 'oldXMenu/EvHand.c' --- oldXMenu/EvHand.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/EvHand.c 2010-07-04 05:57:11 +0000 @@ -15,8 +15,7 @@ #include "XMenuInt.h" -XMenuEventHandler(handler) - int (*handler)(); +XMenuEventHandler(int (*handler) (XEvent*)) { /* * Set the global event handler variable. === modified file 'oldXMenu/FindPane.c' --- oldXMenu/FindPane.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/FindPane.c 2010-07-04 05:57:11 +0000 @@ -17,9 +17,7 @@ #include "XMenuInt.h" int -XMenuFindPane(menu, label) - register XMenu *menu; - register char *label; +XMenuFindPane(register XMenu *menu, register char *label) { register XMPane *p_ptr; register int i = 0; === modified file 'oldXMenu/FindSel.c' --- oldXMenu/FindSel.c 2010-01-13 08:35:10 +0000 +++ oldXMenu/FindSel.c 2010-07-04 05:57:11 +0000 @@ -34,10 +34,7 @@ #include "XMenuInt.h" int -XMenuFindSelection(menu, p_num, label) - register XMenu *menu; - int p_num; - register char *label; +XMenuFindSelection(register XMenu *menu, int p_num, register char *label) { register XMPane *p_ptr; register XMSelect *s_ptr; === modified file 'oldXMenu/InsPane.c' --- oldXMenu/InsPane.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/InsPane.c 2010-07-04 05:57:11 +0000 @@ -18,11 +18,11 @@ #include "XMenuInt.h" int -XMenuInsertPane(menu, p_num, label, active) - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number of new pane. */ - char *label; /* Selection label. */ - int active; /* Make selection active? */ +XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int active) + /* Menu object to be modified. */ + /* Pane number of new pane. */ + /* Selection label. */ + /* Make selection active? */ { register XMPane *p_ptr; /* XMPane pointer. */ register XMPane *pane; /* Newly created pane. */ === modified file 'oldXMenu/InsSel.c' --- oldXMenu/InsSel.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/InsSel.c 2010-07-04 05:57:11 +0000 @@ -17,13 +17,13 @@ #include "XMenuInt.h" int -XMenuInsertSelection(menu, p_num, s_num, data, label, active) - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be modified. */ - register int s_num; /* Selection number of new selection. */ - char *data; /* Data value. */ - char *label; /* Selection label. */ - int active; /* Make selection active? */ +XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_num, char *data, char *label, int active) + /* Menu object to be modified. */ + /* Pane number to be modified. */ + /* Selection number of new selection. */ + /* Data value. */ + /* Selection label. */ + /* Make selection active? */ { register XMPane *p_ptr; /* XMPane pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */ === modified file 'oldXMenu/Internal.c' --- oldXMenu/Internal.c 2010-01-13 08:35:10 +0000 +++ oldXMenu/Internal.c 2010-07-04 05:57:11 +0000 @@ -96,7 +96,7 @@ /* * _XMEventHandler - Internal event handler variable. */ -int (*_XMEventHandler)() = NULL; +int (*_XMEventHandler)(XEvent*) = NULL; @@ -104,7 +104,7 @@ * _XMWinQueInit - Internal routine to initialize the window * queue. */ -_XMWinQueInit() +_XMWinQueInit(void) { /* * If the queue is not initialized initialize it. @@ -138,10 +138,10 @@ * window queue. */ int -_XMWinQueAddPane(display, menu, p_ptr) - register Display *display; - register XMenu *menu; /* Menu being manipulated. */ - register XMPane *p_ptr; /* XMPane being queued. */ +_XMWinQueAddPane(register Display *display, register XMenu *menu, register XMPane *p_ptr) + + /* Menu being manipulated. */ + /* XMPane being queued. */ { /* * If the queue is currently full then flush it. @@ -172,10 +172,10 @@ * the selection window queue. */ int -_XMWinQueAddSelection(display, menu, s_ptr) - register Display *display; - register XMenu *menu; /* Menu being manipulated. */ - register XMSelect *s_ptr; /* XMSelection being queued. */ +_XMWinQueAddSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr) + + /* Menu being manipulated. */ + /* XMSelection being queued. */ { /* * If this entry will overflow the queue then flush it. @@ -206,10 +206,10 @@ * selection window queues. */ int -_XMWinQueFlush(display, menu, pane, select) - register Display *display; - register XMenu *menu; /* Menu being manipulated. */ - register XMPane *pane; /* Current pane. */ +_XMWinQueFlush(register Display *display, register XMenu *menu, register XMPane *pane, XMSelect *select) + + /* Menu being manipulated. */ + /* Current pane. */ { register int pq_index; /* Pane queue index. */ register int sq_index; /* Selection queue index. */ @@ -346,9 +346,9 @@ * a pane pointer that points to the indexed pane. */ XMPane * -_XMGetPanePtr(menu, p_num) - register XMenu *menu; /* Menu to find the pane in. */ - register int p_num; /* Index number of pane to find. */ +_XMGetPanePtr(register XMenu *menu, register int p_num) + /* Menu to find the pane in. */ + /* Index number of pane to find. */ { register XMPane *p_ptr; /* Pane pointer to be returned. */ register int i; /* Loop counter. */ @@ -382,9 +382,9 @@ * indexed selection. */ XMSelect * -_XMGetSelectionPtr(p_ptr, s_num) - register XMPane *p_ptr; /* Pane to find the selection in. */ - register int s_num; /* Index number of the selection to find. */ +_XMGetSelectionPtr(register XMPane *p_ptr, register int s_num) + /* Pane to find the selection in. */ + /* Index number of the selection to find. */ { register XMSelect *s_ptr; /* Selection pointer to be returned. */ register int i; /* Loop counter. */ @@ -416,9 +416,9 @@ * _XMRecomputeGlobals - Internal subroutine to recompute menu wide * global values. */ -_XMRecomputeGlobals(display, menu) - register Display *display; /*X11 display variable. */ - register XMenu *menu; /* Menu object to compute from. */ +_XMRecomputeGlobals(register Display *display, register XMenu *menu) + /*X11 display variable. */ + /* Menu object to compute from. */ { register XMPane *p_ptr; /* Pane pointer. */ register XMSelect *s_ptr; /* Selection pointer. */ @@ -531,11 +531,11 @@ * window dependencies. */ int -_XMRecomputePane(display, menu, p_ptr, p_num) - register Display *display; /* Standard X display variable. */ - register XMenu *menu; /* Menu object being recomputed. */ - register XMPane *p_ptr; /* Pane pointer. */ - register int p_num; /* Pane sequence number. */ +_XMRecomputePane(register Display *display, register XMenu *menu, register XMPane *p_ptr, register int p_num) + /* Standard X display variable. */ + /* Menu object being recomputed. */ + /* Pane pointer. */ + /* Pane sequence number. */ { register int window_x; /* Recomputed window X coordinate. */ register int window_y; /* Recomputed window Y coordinate. */ @@ -681,11 +681,11 @@ * selection window dependencies. */ int -_XMRecomputeSelection(display, menu, s_ptr, s_num) - register Display *display; - register XMenu *menu; /* Menu object being recomputed. */ - register XMSelect *s_ptr; /* Selection pointer. */ - register int s_num; /* Selection sequence number. */ +_XMRecomputeSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr, register int s_num) + + /* Menu object being recomputed. */ + /* Selection pointer. */ + /* Selection sequence number. */ { register Bool config_s = False; /* Reconfigure selection window? */ XWindowChanges *changes; /* Values to change in configure. */ @@ -811,15 +811,15 @@ * recomputed before calling this routine or * unpredictable results will follow. */ -_XMTransToOrigin(display, menu, p_ptr, s_ptr, x_pos, y_pos, orig_x, orig_y) - Display *display; /* Not used. Included for consistency. */ - register XMenu *menu; /* Menu being computed against. */ - register XMPane *p_ptr; /* Current pane pointer. */ - register XMSelect *s_ptr; /* Current selection pointer. */ - int x_pos; /* X coordinate of point to translate. */ - int y_pos; /* Y coordinate of point to translate. */ - int *orig_x; /* Return value X coord. of the menu origin. */ - int *orig_y; /* Return value Y coord. of the menu origin. */ +_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) + /* Not used. Included for consistency. */ + /* Menu being computed against. */ + /* Current pane pointer. */ + /* Current selection pointer. */ + /* X coordinate of point to translate. */ + /* Y coordinate of point to translate. */ + /* Return value X 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_y; /* Local Y coordinate of the menu origin. */ @@ -871,10 +871,7 @@ * _XMRefreshPane - Internal subroutine to completely refresh * the contents of a pane. */ -_XMRefreshPane(display, menu, pane) - register Display *display; - register XMenu *menu; - register XMPane *pane; +_XMRefreshPane(register Display *display, register XMenu *menu, register XMPane *pane) { register XMSelect *s_list = pane->s_list; register XMSelect *s_ptr; @@ -941,10 +938,7 @@ * _XMRefreshSelection - Internal subroutine that refreshes * a single selection window. */ -_XMRefreshSelection(display, menu, select) - register Display *display; - register XMenu *menu; - register XMSelect *select; +_XMRefreshSelection(register Display *display, register XMenu *menu, register XMSelect *select) { register int width = select->window_w; register int height = select->window_h; === modified file 'oldXMenu/Locate.c' --- oldXMenu/Locate.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/Locate.c 2010-07-04 05:57:11 +0000 @@ -17,17 +17,17 @@ #include "XMenuInt.h" int -XMenuLocate(display, menu, p_num, s_num, x_pos, y_pos, ul_x, ul_y, width, height) - register Display *display; /* Previously opened display. */ - register XMenu *menu; /* Menu object being located. */ - int p_num; /* Active pane number. */ - int s_num; /* Active selection number. */ - int x_pos; /* X coordinate of mouse active position. */ - int y_pos; /* Y coordinate of mouse active position. */ - int *ul_x; /* Returned upper left menu X coordinate. */ - int *ul_y; /* Returned upper left menu Y coordinate. */ - int *width; /* Returned menu width. */ - int *height; /* Returned menu 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) + /* Previously opened display. */ + /* Menu object being located. */ + /* Active pane number. */ + /* Active selection number. */ + /* X coordinate of mouse active position. */ + /* Y coordinate of mouse active position. */ + /* Returned upper left menu X coordinate. */ + /* Returned upper left menu Y coordinate. */ + /* Returned menu width. */ + /* Returned menu height. */ { register XMPane *p_ptr; /* XMPane pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */ === modified file 'oldXMenu/Post.c' --- oldXMenu/Post.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/Post.c 2010-07-04 05:57:11 +0000 @@ -39,14 +39,14 @@ #include "XMenuInt.h" char * -XMenuPost(display, menu, p_num, s_num, x_pos, y_pos, event_mask) - register Display *display; /* Previously opened display. */ - register XMenu *menu; /* Menu to post. */ - register int *p_num; /* Pane number selected. */ - register int *s_num; /* Selection number selected. */ - register int x_pos; /* X coordinate of menu position. */ - register int y_pos; /* Y coordinate of menu position. */ - int event_mask; /* Mouse button 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) + /* Previously opened display. */ + /* Menu to post. */ + /* Pane number selected. */ + /* Selection number selected. */ + /* X coordinate of menu position. */ + /* Y coordinate of menu position. */ + /* Mouse button event mask. */ { register int stat; /* Routine call return status. */ char *data; /* Return data. */ === modified file 'oldXMenu/Recomp.c' --- oldXMenu/Recomp.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/Recomp.c 2010-07-04 05:57:11 +0000 @@ -16,9 +16,9 @@ #include "XMenuInt.h" int -XMenuRecompute(display, menu) - Display *display; - register XMenu *menu; /* Menu object to be recomputed. */ +XMenuRecompute(Display *display, register XMenu *menu) + + /* Menu object to be recomputed. */ { register XMPane *p_ptr; /* Pane pointer. */ register XMSelect *s_ptr; /* Selection pointer. */ === modified file 'oldXMenu/SetAEQ.c' --- oldXMenu/SetAEQ.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/SetAEQ.c 2010-07-04 05:57:11 +0000 @@ -18,9 +18,9 @@ #include "XMenuInt.h" -XMenuSetAEQ(menu, aeq) - register XMenu *menu; /* Menu object to be modified. */ - register int aeq; /* AEQ mode? */ +XMenuSetAEQ(register XMenu *menu, register int aeq) + /* Menu object to be modified. */ + /* AEQ mode? */ { /* * Set the AEQ mode switch. === modified file 'oldXMenu/SetFrz.c' --- oldXMenu/SetFrz.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/SetFrz.c 2010-07-04 05:57:11 +0000 @@ -17,9 +17,9 @@ #include "XMenuInt.h" -XMenuSetFreeze(menu, freeze) - register XMenu *menu; /* Menu object to be modified. */ - register int freeze; /* Freeze mode? */ +XMenuSetFreeze(register XMenu *menu, register int freeze) + /* Menu object to be modified. */ + /* Freeze mode? */ { /* * Set the freeze mode switch. === modified file 'oldXMenu/SetPane.c' --- oldXMenu/SetPane.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/SetPane.c 2010-07-04 05:57:11 +0000 @@ -16,10 +16,10 @@ #include "XMenuInt.h" int -XMenuSetPane(menu, p_num, active) - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be modified. */ - register int active; /* Make selection active? */ +XMenuSetPane(register XMenu *menu, register int p_num, register int active) + /* Menu object to be modified. */ + /* Pane number to be modified. */ + /* Make selection active? */ { register XMPane *p_ptr; /* XMPane pointer. */ === modified file 'oldXMenu/SetSel.c' --- oldXMenu/SetSel.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/SetSel.c 2010-07-04 05:57:11 +0000 @@ -16,11 +16,11 @@ #include "XMenuInt.h" int -XMenuSetSelection(menu, p_num, s_num, active) - register XMenu *menu; /* Menu object to be modified. */ - register int p_num; /* Pane number to be modified. */ - register int s_num; /* Selection number to modified. */ - int active; /* Make selection active? */ +XMenuSetSelection(register XMenu *menu, register int p_num, register int s_num, int active) + /* Menu object to be modified. */ + /* Pane number to be modified. */ + /* Selection number to modified. */ + /* Make selection active? */ { register XMPane *p_ptr; /* XMPane pointer. */ register XMSelect *s_ptr; /* XMSelect pointer. */ === modified file 'oldXMenu/X10.h' --- oldXMenu/X10.h 2010-01-04 05:35:18 +0000 +++ oldXMenu/X10.h 2010-07-04 05:57:11 +0000 @@ -71,8 +71,8 @@ int size; /* Table size (number of buckets). */ } XAssocTable; -XAssocTable *XCreateAssocTable(); -char *XLookUpAssoc(); +XAssocTable *XCreateAssocTable(int size); +char *XLookUpAssoc(Display *dpy, XAssocTable *table, XID x_id); #endif /* _X10_H_ */ === modified file 'oldXMenu/XCrAssoc.c' --- oldXMenu/XCrAssoc.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/XCrAssoc.c 2010-07-04 05:57:11 +0000 @@ -11,8 +11,6 @@ #define NULL 0 #endif -extern int errno; - /* * XCreateAssocTable - Create an XAssocTable. The size argument should be * a power of two for efficiency reasons. Some size suggestions: use 32 @@ -20,8 +18,8 @@ * buckets is 8. If there is an error creating the XAssocTable, a NULL * pointer is returned. */ -XAssocTable *XCreateAssocTable(size) - register int size; /* Desired size of the table. */ +XAssocTable *XCreateAssocTable(register int size) + /* Desired size of the table. */ { register XAssocTable *table; /* XAssocTable to be initialized. */ register XAssoc *buckets; /* Pointer to the first bucket in */ === modified file 'oldXMenu/XDelAssoc.c' --- oldXMenu/XDelAssoc.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/XDelAssoc.c 2010-07-04 05:57:11 +0000 @@ -5,22 +5,19 @@ #include #include "X10.h" -void emacs_remque(); struct qelem { struct qelem *q_forw; struct qelem *q_back; char q_data[1]; }; +void emacs_remque(struct qelem*); /* * XDeleteAssoc - Delete an association in an XAssocTable keyed on * an XId. An association may be removed only once. Redundant * deletes are meaningless (but cause no problems). */ -XDeleteAssoc(dpy, table, x_id) - register Display *dpy; - register XAssocTable *table; - register XID x_id; +XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id) { int hash; register XAssoc *bucket; === modified file 'oldXMenu/XDestAssoc.c' --- oldXMenu/XDestAssoc.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/XDestAssoc.c 2010-07-04 05:57:11 +0000 @@ -10,8 +10,7 @@ * XDestroyAssocTable - Destroy (free the memory associated with) * an XAssocTable. */ -XDestroyAssocTable(table) - register XAssocTable *table; +XDestroyAssocTable(register XAssocTable *table) { register int i; register XAssoc *bucket; === modified file 'oldXMenu/XLookAssoc.c' --- oldXMenu/XLookAssoc.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/XLookAssoc.c 2010-07-04 05:57:11 +0000 @@ -18,10 +18,10 @@ * in the table the routine will return a NULL pointer. All XId's are relative * to the currently active Display. */ -caddr_t XLookUpAssoc(dpy, table, x_id) - register Display *dpy; - register XAssocTable *table; /* XAssocTable to search in. */ - register XID x_id; /* XId to search for. */ +caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, register XID x_id) + + /* XAssocTable to search in. */ + /* XId to search for. */ { int hash; register XAssoc *bucket; === modified file 'oldXMenu/XMakeAssoc.c' --- oldXMenu/XMakeAssoc.c 2010-01-04 05:35:18 +0000 +++ oldXMenu/XMakeAssoc.c 2010-07-04 05:57:11 +0000 @@ -13,25 +13,20 @@ #define NULL 0 #endif -extern int errno; - -void emacs_insque(); struct qelem { struct qelem *q_forw; struct qelem *q_back; char q_data[1]; }; +void emacs_insque (struct qelem *elem, struct qelem *prev); + /* * XMakeAssoc - Insert data into an XAssocTable keyed on an XId. * Data is inserted into the table only once. Redundant inserts are * meaningless (but cause no problems). The queue in each association * bucket is sorted (lowest XId to highest XId). */ -XMakeAssoc(dpy, table, x_id, data) - register Display *dpy; - register XAssocTable *table; - register XID x_id; - register caddr_t data; +XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data) { int hash; register XAssoc *bucket; === modified file 'oldXMenu/XMenu.h' --- oldXMenu/XMenu.h 2010-01-04 05:35:18 +0000 +++ oldXMenu/XMenu.h 2010-07-04 05:57:11 +0000 @@ -234,31 +234,33 @@ Pixmap inact_pixmap; /* Menu inactive pixmap. */ } XMenu; +typedef void (*Wait_func)(void*); + /* * XMenu library routine declarations. */ -XMenu *XMenuCreate(); -int XMenuAddPane(); -int XMenuAddSelection(); -int XMenuInsertPane(); -int XMenuInsertSelection(); -int XMenuFindPane(); -int XMenuFindSelection(); -int XMenuChangePane(); -int XMenuChangeSelection(); -int XMenuSetPane(); -int XMenuSetSelection(); -int XMenuRecompute(); -int XMenuEventHandler(); /* No value actually returned. */ -int XMenuLocate(); -int XMenuSetFreeze(); /* No value actually returned. */ -void XMenuActivateSetWaitFunction(); -int XMenuActivate(); -char *XMenuPost(); -int XMenuDeletePane(); -int XMenuDeleteSelection(); -int XMenuDestroy(); /* No value actually returned. */ -char *XMenuError(); +XMenu *XMenuCreate(Display *display, Window parent, register char *def_env); +int XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active); +int XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char *help); +int XMenuInsertPane(register XMenu *menu, register int p_num, char *label, int active); +int XMenuInsertSelection(register XMenu *menu, register int p_num, register int s_num, char *data, char *label, int active); +int XMenuFindPane(register XMenu *menu, register char *label); +int XMenuFindSelection(register XMenu *menu, int p_num, register char *label); +int XMenuChangePane(register XMenu *menu, register int p_num, char *label); +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(register XMenu *menu, register int p_num, register int active); +int XMenuSetSelection(register XMenu *menu, register int p_num, register int s_num, int active); +int XMenuRecompute(Display *display, register XMenu *menu); +int XMenuEventHandler(int (*handler) (XEvent *)); /* No value actually returned. */ +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(register XMenu *menu, register int freeze); /* No value actually returned. */ +void XMenuActivateSetWaitFunction(Wait_func func, void *data); +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(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(register Display *display, register XMenu *menu, register int p_num); +int XMenuDeleteSelection(register Display *display, register XMenu *menu, register int p_num, register int s_num); +int XMenuDestroy(Display *display, register XMenu *menu); /* No value actually returned. */ +char *XMenuError(void); #endif /* Don't add after this point. */ === modified file 'oldXMenu/XMenuInt.h' --- oldXMenu/XMenuInt.h 2010-01-04 05:35:18 +0000 +++ oldXMenu/XMenuInt.h 2010-07-04 05:57:11 +0000 @@ -37,7 +37,7 @@ /* * XMenu internal event handler variable. */ -extern int (*_XMEventHandler)(); +extern int (*_XMEventHandler)(XEvent*); #ifndef Pixel #define Pixel unsigned long @@ -46,19 +46,17 @@ /* * Internal routine declarations. */ -int _XMWinQueInit(); /* No value actually returned. */ -int _XMWinQueAddPane(); -int _XMWinQueAddSelection(); -int _XMWinQueFlush(); -XMPane *_XMGetPanePtr(); -XMSelect *_XMGetSelectionPtr(); -int _XMRecomputeGlobals(); /* No value actually returned. */ -int _XMRecomputePane(); -int _XMRecomputeSelection(); -int _XMTransToOrigin(); /* No value actually returned. */ -int _XMRefreshPane(); /* No value actually returned. */ -int _XMRefreshSelections(); /* No value actually returned. */ -int _XMHighlightSelection(); /* No value actually returned. */ +int _XMWinQueInit(void); /* No value actually returned. */ +int _XMWinQueAddPane(register Display *display, register XMenu *menu, register XMPane *p_ptr); +int _XMWinQueAddSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr); +int _XMWinQueFlush(register Display *display, register XMenu *menu, register XMPane *pane, XMSelect *select); +XMPane *_XMGetPanePtr(register XMenu *menu, register int p_num); +XMSelect *_XMGetSelectionPtr(register XMPane *p_ptr, register int s_num); +int _XMRecomputeGlobals(register Display *display, register XMenu *menu); /* No value actually returned. */ +int _XMRecomputePane(register Display *display, register XMenu *menu, register XMPane *p_ptr, register int p_num); +int _XMRecomputeSelection(register Display *display, register XMenu *menu, register XMSelect *s_ptr, register int s_num); +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(register Display *display, register XMenu *menu, register XMPane *pane); /* No value actually returned. */ #endif /* Don't add stuff after this #endif */ === modified file 'oldXMenu/insque.c' --- oldXMenu/insque.c 2010-01-13 08:35:10 +0000 +++ oldXMenu/insque.c 2010-07-04 05:57:11 +0000 @@ -30,8 +30,7 @@ /* Insert ELEM into a doubly-linked list, after PREV. */ void -emacs_insque (elem, prev) - struct qelem *elem, *prev; +emacs_insque (struct qelem *elem, struct qelem *prev) { struct qelem *next = prev->q_forw; prev->q_forw = elem; @@ -43,8 +42,7 @@ /* Unlink ELEM from the doubly-linked list that it is in. */ -emacs_remque (elem) - struct qelem *elem; +emacs_remque (struct qelem *elem) { struct qelem *next = elem->q_forw; struct qelem *prev = elem->q_back; ------------------------------------------------------------ revno: 100705 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-07-03 22:47:55 -0700 message: Convert function definitions in lwlib files to standard C. * lwlib/lwlib-Xaw.c: Convert function definitions to standard C. * lwlib/lwlib-Xlw.c: * lwlib/lwlib-utils.c: * lwlib/lwlib.c: * lwlib/lwlib.h: * lwlib/xlwmenu.c: Likewise. diff: === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2010-07-02 12:19:53 +0000 +++ lwlib/ChangeLog 2010-07-04 05:47:55 +0000 @@ -1,3 +1,12 @@ +2010-07-04 Dan Nicolaescu + + * lwlib-Xaw.c: Convert function definitions to standard C. + * lwlib-Xlw.c: + * lwlib-utils.c: + * lwlib.c: + * lwlib.h: + * xlwmenu.c: Likewise. + 2010-07-02 Jan Djärv * lwlib-Xm.c: Remove __P and P_ from .c and .m files. === modified file 'lwlib/lwlib-Xaw.c' --- lwlib/lwlib-Xaw.c 2010-05-13 17:48:56 +0000 +++ lwlib/lwlib-Xaw.c 2010-07-04 05:47:55 +0000 @@ -70,12 +70,11 @@ #endif -static void xaw_generic_callback (/*Widget, XtPointer, XtPointer*/); +static void xaw_generic_callback (Widget widget, XtPointer closure, XtPointer call_data); Boolean -lw_xaw_widget_p (widget) - Widget widget; +lw_xaw_widget_p (Widget widget) { return (XtIsSubclass (widget, scrollbarWidgetClass) || XtIsSubclass (widget, dialogWidgetClass)); @@ -427,10 +426,7 @@ } void -xaw_update_one_value (instance, widget, val) - widget_instance *instance; - Widget widget; - widget_value *val; +xaw_update_one_value (widget_instance *instance, Widget widget, widget_value *val) { /* This function is not used by the scrollbars and those are the only Athena widget implemented at the moment so do nothing. */ @@ -438,8 +434,7 @@ } void -xaw_destroy_instance (instance) - widget_instance *instance; +xaw_destroy_instance (widget_instance *instance) { #ifdef HAVE_XFT if (instance->xft_data) @@ -471,9 +466,7 @@ } void -xaw_popup_menu (widget, event) - Widget widget; - XEvent *event; +xaw_popup_menu (Widget widget, XEvent *event) { /* An Athena menubar has not been implemented. */ return; @@ -557,7 +550,7 @@ /* Dialogs pop down on any key press */ static char dialogOverride[] = "Escape: lwlib_delete_dialog()"; -static void wm_delete_window(); +static void wm_delete_window(Widget w, XtPointer closure, XtPointer call_data); static XtActionsRec xaw_actions [] = { {"lwlib_delete_dialog", wm_delete_window} }; @@ -748,8 +741,7 @@ } Widget -xaw_create_dialog (instance) - widget_instance* instance; +xaw_create_dialog (widget_instance *instance) { char *name = instance->info->type; Widget parent = instance->parent; @@ -813,10 +805,7 @@ static void -xaw_generic_callback (widget, closure, call_data) - Widget widget; - XtPointer closure; - XtPointer call_data; +xaw_generic_callback (Widget widget, XtPointer closure, XtPointer call_data) { widget_instance *instance = (widget_instance *) closure; Widget instance_widget; @@ -862,10 +851,7 @@ } static void -wm_delete_window (w, closure, call_data) - Widget w; - XtPointer closure; - XtPointer call_data; +wm_delete_window (Widget w, XtPointer closure, XtPointer call_data) { LWLIB_ID id; Cardinal nkids; @@ -966,8 +952,7 @@ #endif static Widget -xaw_create_scrollbar (instance) - widget_instance *instance; +xaw_create_scrollbar (widget_instance *instance) { #if 0 Arg av[20]; @@ -1007,8 +992,7 @@ } static Widget -xaw_create_main (instance) - widget_instance *instance; +xaw_create_main (widget_instance *instance) { Arg al[1]; int ac; === modified file 'lwlib/lwlib-Xlw.c' --- lwlib/lwlib-Xlw.c 2010-01-13 08:35:10 +0000 +++ lwlib/lwlib-Xlw.c 2010-07-04 05:47:55 +0000 @@ -72,10 +72,7 @@ if there isn't any highlighted menu item. */ static void -highlight_hook (w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +highlight_hook (Widget w, XtPointer client_data, XtPointer call_data) { widget_instance *instance = (widget_instance *) client_data; @@ -85,29 +82,20 @@ } static void -enter_hook (w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +enter_hook (Widget w, XtPointer client_data, XtPointer call_data) { highlight_hook (w, client_data, call_data); } static void -leave_hook (w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +leave_hook (Widget w, XtPointer client_data, XtPointer call_data) { highlight_hook (w, client_data, NULL); } static void -pre_hook (w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +pre_hook (Widget w, XtPointer client_data, XtPointer call_data) { widget_instance* instance = (widget_instance*)client_data; widget_value* val; @@ -122,10 +110,7 @@ } static void -pick_hook (w, client_data, call_data) - Widget w; - XtPointer client_data; - XtPointer call_data; +pick_hook (Widget w, XtPointer client_data, XtPointer call_data) { widget_instance* instance = (widget_instance*)client_data; widget_value* contents_val = (widget_value*)call_data; @@ -150,8 +135,7 @@ /* creation functions */ static Widget -xlw_create_menubar (instance) - widget_instance* instance; +xlw_create_menubar (widget_instance *instance) { Widget widget; Arg al[5]; @@ -178,8 +162,7 @@ } static Widget -xlw_create_popup_menu (instance) - widget_instance* instance; +xlw_create_popup_menu (widget_instance *instance) { Widget popup_shell = XtCreatePopupShell (instance->info->name, overrideShellWidgetClass, @@ -214,8 +197,7 @@ }; Boolean -lw_lucid_widget_p (widget) - Widget widget; +lw_lucid_widget_p (Widget widget) { WidgetClass the_class = XtClass (widget); @@ -249,10 +231,7 @@ } void -xlw_update_one_value (instance, widget, val) - widget_instance* instance; - Widget widget; - widget_value* val; +xlw_update_one_value (widget_instance *instance, Widget widget, widget_value *val) { return; } @@ -269,9 +248,7 @@ } void -xlw_popup_menu (widget, event) - Widget widget; - XEvent *event; +xlw_popup_menu (Widget widget, XEvent *event) { XlwMenuWidget mw; @@ -304,8 +281,7 @@ /* Destruction of instances */ void -xlw_destroy_instance (instance) - widget_instance* instance; +xlw_destroy_instance (widget_instance *instance) { if (instance->widget) XtDestroyWidget (instance->widget); === modified file 'lwlib/lwlib-utils.c' --- lwlib/lwlib-utils.c 2010-01-13 08:35:10 +0000 +++ lwlib/lwlib-utils.c 2010-07-04 05:47:55 +0000 @@ -42,8 +42,7 @@ /* Redisplay the contents of the widget, without first clearing it. */ void -XtNoClearRefreshWidget (widget) - Widget widget; +XtNoClearRefreshWidget (Widget widget) { XEvent event; @@ -67,10 +66,7 @@ * Apply a function to all the subwidgets of a given widget recursively. */ void -XtApplyToWidgets (w, proc, arg) - Widget w; - XtApplyToWidgetsProc proc; - XtPointer arg; +XtApplyToWidgets (Widget w, XtApplyToWidgetsProc proc, XtPointer arg) { if (XtIsComposite (w)) { @@ -101,10 +97,7 @@ * Stop as soon as the function returns non NULL and returns this as a value. */ void * -XtApplyUntilToWidgets (w, proc, arg) - Widget w; - XtApplyUntilToWidgetsProc proc; - XtPointer arg; +XtApplyUntilToWidgets (Widget w, XtApplyUntilToWidgetsProc proc, XtPointer arg) { void* result; if (XtIsComposite (w)) @@ -130,9 +123,7 @@ * Returns a copy of the list of all children of a composite widget */ Widget * -XtCompositeChildren (widget, number) - Widget widget; - unsigned int* number; +XtCompositeChildren (Widget widget, unsigned int *number) { CompositeWidget cw = (CompositeWidget)widget; Widget* result; @@ -153,15 +144,13 @@ } Boolean -XtWidgetBeingDestroyedP (widget) - Widget widget; +XtWidgetBeingDestroyedP (Widget widget) { return widget->core.being_destroyed; } void -XtSafelyDestroyWidget (widget) - Widget widget; +XtSafelyDestroyWidget (Widget widget) { #if 0 === modified file 'lwlib/lwlib.c' --- lwlib/lwlib.c 2010-07-02 12:19:53 +0000 +++ lwlib/lwlib.c 2010-07-04 05:47:55 +0000 @@ -106,10 +106,7 @@ static void show_one_widget_busy (Widget, Boolean); void -lwlib_memset (address, value, length) - char *address; - int value; - size_t length; +lwlib_memset (char *address, int value, size_t length) { int i; @@ -118,10 +115,7 @@ } void -lwlib_bcopy (from, to, length) - char *from; - char *to; - int length; +lwlib_bcopy (char *from, char *to, int length) { int i; @@ -130,8 +124,7 @@ } /* utility functions for widget_instance and widget_info */ char * -safe_strdup (s) - const char *s; +safe_strdup (const char *s) { char *result; if (! s) return 0; @@ -145,8 +138,7 @@ /* Like strcmp but ignore differences in case. */ static int -my_strcasecmp (s1, s2) - char *s1, *s2; +my_strcasecmp (char *s1, char *s2) { while (1) { @@ -164,8 +156,7 @@ } static void -safe_free_str (s) - char *s; +safe_free_str (char *s) { free (s); } @@ -174,7 +165,7 @@ static int malloc_cpt = 0; widget_value * -malloc_widget_value () +malloc_widget_value (void) { widget_value *wv; if (widget_value_free_list) @@ -196,8 +187,7 @@ by malloc_widget_value(), and no substructures. */ void -free_widget_value (wv) - widget_value *wv; +free_widget_value (widget_value *wv) { if (wv->free_list) abort (); @@ -217,8 +207,7 @@ } static void -free_widget_value_tree (wv) - widget_value *wv; +free_widget_value_tree (widget_value *wv) { if (!wv) return; @@ -249,9 +238,7 @@ } static widget_value * -copy_widget_value_tree (val, change) - widget_value* val; - change_type change; +copy_widget_value_tree (widget_value *val, change_type change) { widget_value* copy; @@ -310,8 +297,7 @@ } static void -free_widget_info (info) - widget_info* info; +free_widget_info (widget_info *info) { safe_free_str (info->type); safe_free_str (info->name); @@ -321,10 +307,7 @@ } static void -mark_widget_destroyed (widget, closure, call_data) - Widget widget; - XtPointer closure; - XtPointer call_data; +mark_widget_destroyed (Widget widget, XtPointer closure, XtPointer call_data) { widget_instance* instance = (widget_instance*)closure; @@ -363,8 +346,7 @@ } static void -free_widget_instance (instance) - widget_instance* instance; +free_widget_instance (widget_instance *instance) { lwlib_memset ((void*)instance, 0xDEADBEEF, sizeof (widget_instance)); free (instance); @@ -401,8 +383,7 @@ /* Internal function used by the library dependent implementation to get the widget_value for a given widget in an instance */ widget_info * -lw_get_widget_info (id) - LWLIB_ID id; +lw_get_widget_info (LWLIB_ID id) { return get_widget_info (id, 0); } @@ -441,8 +422,7 @@ WIDGET, or null if WIDGET is not a lwlib widget. */ widget_instance * -lw_get_widget_instance (widget) - Widget widget; +lw_get_widget_instance (Widget widget) { return get_widget_instance (widget, False); } @@ -471,9 +451,7 @@ /* utility function for widget_value */ static Boolean -safe_strcmp (s1, s2) - char* s1; - char* s2; +safe_strcmp (char *s1, char *s2) { if (!!s1 ^ !!s2) return True; return (s1 && s2) ? strcmp (s1, s2) : s1 ? False : !!s2; @@ -500,11 +478,7 @@ static widget_value * -merge_widget_value (val1, val2, level, change_p) - widget_value* val1; - widget_value* val2; - int level; - int *change_p; +merge_widget_value (widget_value *val1, widget_value *val2, int level, int *change_p) { change_type change, this_one_change; widget_value* merged_next; @@ -658,9 +632,7 @@ /* modifying the widgets */ static Widget -name_to_widget (instance, name) - widget_instance* instance; - char* name; +name_to_widget (widget_instance *instance, char *name) { Widget widget = NULL; @@ -814,8 +786,7 @@ /* creating the widgets */ static void -initialize_widget_instance (instance) - widget_instance* instance; +initialize_widget_instance (widget_instance *instance) { widget_value* val; @@ -830,9 +801,7 @@ static widget_creation_function -find_in_table (type, table) - char* type; - widget_creation_entry* table; +find_in_table (char *type, widget_creation_entry *table) { widget_creation_entry* cur; for (cur = table; cur->type; cur++) @@ -842,8 +811,7 @@ } static Boolean -dialog_spec_p (name) - char* name; +dialog_spec_p (char *name) { /* return True if name matches [EILPQeilpq][1-9][Bb] or [EILPQeilpq][1-9][Bb][Rr][1-9] */ @@ -876,8 +844,7 @@ } static void -instantiate_widget_instance (instance) - widget_instance* instance; +instantiate_widget_instance (widget_instance *instance) { widget_creation_function function = NULL; @@ -1016,8 +983,7 @@ /* destroying the widgets */ static void -destroy_one_instance (instance) - widget_instance* instance; +destroy_one_instance (widget_instance *instance) { /* Remove the destroy callback on the widget; that callback will try to dereference the instance object (to set its widget slot to 0, since the @@ -1059,8 +1025,7 @@ } void -lw_destroy_widget (w) - Widget w; +lw_destroy_widget (Widget w) { widget_instance* instance = get_widget_instance (w, True); @@ -1076,8 +1041,7 @@ } void -lw_destroy_all_widgets (id) - LWLIB_ID id; +lw_destroy_all_widgets (LWLIB_ID id) { widget_info* info = get_widget_info (id, True); widget_instance* instance; @@ -1096,14 +1060,14 @@ } void -lw_destroy_everything () +lw_destroy_everything (void) { while (all_widget_info) lw_destroy_all_widgets (all_widget_info->id); } void -lw_destroy_all_pop_ups () +lw_destroy_all_pop_ups (void) { widget_info* info; widget_info* next; @@ -1123,7 +1087,7 @@ #endif Widget -lw_raise_all_pop_up_widgets () +lw_raise_all_pop_up_widgets (void) { widget_info* info; widget_instance* instance; @@ -1197,23 +1161,19 @@ } void -lw_pop_up_all_widgets (id) - LWLIB_ID id; +lw_pop_up_all_widgets (LWLIB_ID id) { lw_pop_all_widgets (id, True); } void -lw_pop_down_all_widgets (id) - LWLIB_ID id; +lw_pop_down_all_widgets (LWLIB_ID id) { lw_pop_all_widgets (id, False); } void -lw_popup_menu (widget, event) - Widget widget; - XEvent *event; +lw_popup_menu (Widget widget, XEvent *event) { #if defined (USE_LUCID) if (lw_lucid_widget_p (widget)) @@ -1231,9 +1191,7 @@ /* get the values back */ static Boolean -get_one_value (instance, val) - widget_instance* instance; - widget_value* val; +get_one_value (widget_instance *instance, widget_value *val) { Widget widget = name_to_widget (instance, val->name); @@ -1258,9 +1216,7 @@ } Boolean -lw_get_some_values (id, val_out) - LWLIB_ID id; - widget_value* val_out; +lw_get_some_values (LWLIB_ID id, widget_value *val_out) { widget_info* info = get_widget_info (id, False); widget_instance* instance; @@ -1282,8 +1238,7 @@ } widget_value* -lw_get_all_values (id) - LWLIB_ID id; +lw_get_all_values (LWLIB_ID id) { widget_info* info = get_widget_info (id, False); widget_value* val = info->val; @@ -1296,9 +1251,7 @@ /* internal function used by the library dependent implementation to get the widget_value for a given widget in an instance */ widget_value* -lw_get_widget_value_for_widget (instance, w) - widget_instance* instance; - Widget w; +lw_get_widget_value_for_widget (widget_instance *instance, Widget w) { char* name = XtName (w); widget_value* cur; @@ -1317,10 +1270,7 @@ modified to update other instances of the widgets. Closure should be the widget_instance. */ void -lw_internal_update_other_instances (widget, closure, call_data) - Widget widget; - XtPointer closure; - XtPointer call_data; +lw_internal_update_other_instances (Widget widget, XtPointer closure, XtPointer call_data) { widget_instance* instance = (widget_instance*)closure; char* name = XtName (widget); @@ -1357,8 +1307,7 @@ /* get the id */ LWLIB_ID -lw_get_widget_id (w) - Widget w; +lw_get_widget_id (Widget w) { widget_instance* instance = get_widget_instance (w, False); @@ -1367,9 +1316,7 @@ /* set the keyboard focus */ void -lw_set_keyboard_focus (parent, w) - Widget parent; - Widget w; +lw_set_keyboard_focus (Widget parent, Widget w) { #if defined (USE_MOTIF) xm_set_keyboard_focus (parent, w); @@ -1455,9 +1402,7 @@ /* Toolkit independent way of determining if an event window is in the menubar. */ Boolean -lw_window_is_in_menubar (win, menubar_widget) - Window win; - Widget menubar_widget; +lw_window_is_in_menubar (Window win, Widget menubar_widget) { return menubar_widget #if defined (USE_LUCID) @@ -1473,10 +1418,7 @@ /* Motif hack to set the main window areas. */ void -lw_set_main_areas (parent, menubar, work_area) - Widget parent; - Widget menubar; - Widget work_area; +lw_set_main_areas (Widget parent, Widget menubar, Widget work_area) { #if defined (USE_MOTIF) xm_set_main_areas (parent, menubar, work_area); @@ -1506,10 +1448,7 @@ to similar ones that are supported. */ int -lw_separator_p (label, type, motif_p) - char *label; - enum menu_separator *type; - int motif_p; +lw_separator_p (char *label, enum menu_separator *type, int motif_p) { int separator_p = 0; === modified file 'lwlib/lwlib.h' --- lwlib/lwlib.h 2010-07-02 09:26:33 +0000 +++ lwlib/lwlib.h 2010-07-04 05:47:55 +0000 @@ -156,7 +156,7 @@ Boolean lw_get_some_values (LWLIB_ID id, widget_value* val); void lw_pop_up_all_widgets (LWLIB_ID id); void lw_pop_down_all_widgets (LWLIB_ID id); -widget_value *malloc_widget_value (); +widget_value *malloc_widget_value (void); void free_widget_value (widget_value *); void lw_popup_menu (Widget, XEvent *); === modified file 'lwlib/xlwmenu.c' --- lwlib/xlwmenu.c 2010-07-02 12:19:53 +0000 +++ lwlib/xlwmenu.c 2010-07-04 05:47:55 +0000 @@ -185,22 +185,22 @@ }; #undef offset -static Boolean XlwMenuSetValues(); -static void XlwMenuRealize(); -static void XlwMenuResize(); -static void XlwMenuInitialize(); -static void XlwMenuRedisplay(); -static void XlwMenuDestroy(); -static void XlwMenuClassInitialize(); -static void Start(); -static void Drag(); -static void Down(); -static void Up(); -static void Left(); -static void Right(); -static void Select(); -static void Key(); -static void Nothing(); +static Boolean XlwMenuSetValues(Widget current, Widget request, Widget new); +static void XlwMenuRealize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes); +static void XlwMenuResize(Widget w); +static void XlwMenuInitialize(Widget request, XlwMenuWidget mw, ArgList args, Cardinal *num_args); +static void XlwMenuRedisplay(Widget w, XEvent *ev, Region region); +static void XlwMenuDestroy(Widget w); +static void XlwMenuClassInitialize(void); +static void Start(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Drag(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Down(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Up(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Left(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Right(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Select(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Key(Widget w, XEvent *ev, String *params, Cardinal *num_params); +static void Nothing(Widget w, XEvent *ev, String *params, Cardinal *num_params); static int separator_height (enum menu_separator); static void pop_up_menu (XlwMenuWidget, XButtonPressedEvent *); @@ -278,9 +278,7 @@ /* Ungrab pointer and keyboard */ static void -ungrab_all (w, ungrabtime) - Widget w; - Time ungrabtime; +ungrab_all (Widget w, Time ungrabtime) { XtUngrabPointer (w, ungrabtime); if (GRAB_KEYBOARD) XtUngrabKeyboard (w, ungrabtime); @@ -289,8 +287,7 @@ /* Like abort, but remove grabs from widget W before. */ static void -abort_gracefully (w) - Widget w; +abort_gracefully (Widget w) { if (XtIsShell (XtParent (w))) XtRemoveGrab (w); @@ -299,9 +296,7 @@ } static void -push_new_stack (mw, val) - XlwMenuWidget mw; - widget_value* val; +push_new_stack (XlwMenuWidget mw, widget_value *val) { if (!mw->menu.new_stack) { @@ -321,8 +316,7 @@ } static void -pop_new_stack_if_no_contents (mw) - XlwMenuWidget mw; +pop_new_stack_if_no_contents (XlwMenuWidget mw) { if (mw->menu.new_depth > 1) { @@ -332,9 +326,7 @@ } static void -make_old_stack_space (mw, n) - XlwMenuWidget mw; - int n; +make_old_stack_space (XlwMenuWidget mw, int n) { if (!mw->menu.old_stack) { @@ -354,9 +346,7 @@ /* Size code */ static int -string_width (mw, s) - XlwMenuWidget mw; - char *s; +string_width (XlwMenuWidget mw, char *s) { XCharStruct xcs; int drop; @@ -415,8 +405,7 @@ #endif static int -arrow_width (mw) - XlwMenuWidget mw; +arrow_width (XlwMenuWidget mw) { return (MENU_FONT_ASCENT (mw) * 3/4) | 1; } @@ -424,8 +413,7 @@ /* Return the width of toggle buttons of widget MW. */ static int -toggle_button_width (mw) - XlwMenuWidget mw; +toggle_button_width (XlwMenuWidget mw) { return (MENU_FONT_HEIGHT (mw) * 2 / 3) | 1; } @@ -434,8 +422,7 @@ /* Return the width of radio buttons of widget MW. */ static int -radio_button_width (mw) - XlwMenuWidget mw; +radio_button_width (XlwMenuWidget mw) { return toggle_button_width (mw) * 1.41; } @@ -449,9 +436,7 @@ }; static char* -resource_widget_value (mw, val) - XlwMenuWidget mw; - widget_value *val; +resource_widget_value (XlwMenuWidget mw, widget_value *val) { if (!val->toolkit_data) { @@ -537,9 +522,7 @@ } static void -size_menu (mw, level) - XlwMenuWidget mw; - int level; +size_menu (XlwMenuWidget mw, int level) { unsigned int label_width = 0; int rest_width = 0; @@ -605,14 +588,7 @@ /* Display code */ static void -draw_arrow (mw, window, gc, x, y, width, down_p) - XlwMenuWidget mw; - Window window; - GC gc; - int x; - int y; - int width; - int down_p; +draw_arrow (XlwMenuWidget mw, Window window, GC gc, int x, int y, int width, int down_p) { Display *dpy = XtDisplay (mw); GC top_gc = mw->menu.shadow_top_gc; @@ -669,15 +645,7 @@ static void -draw_shadow_rectangle (mw, window, x, y, width, height, erase_p, down_p) - XlwMenuWidget mw; - Window window; - int x; - int y; - int width; - int height; - int erase_p; - int down_p; +draw_shadow_rectangle (XlwMenuWidget mw, Window window, int x, int y, int width, int height, int erase_p, int down_p) { Display *dpy = XtDisplay (mw); GC top_gc = !erase_p ? mw->menu.shadow_top_gc : mw->menu.background_gc; @@ -733,15 +701,7 @@ static void -draw_shadow_rhombus (mw, window, x, y, width, height, erase_p, down_p) - XlwMenuWidget mw; - Window window; - int x; - int y; - int width; - int height; - int erase_p; - int down_p; +draw_shadow_rhombus (XlwMenuWidget mw, Window window, int x, int y, int width, int height, int erase_p, int down_p) { Display *dpy = XtDisplay (mw); GC top_gc = !erase_p ? mw->menu.shadow_top_gc : mw->menu.background_gc; @@ -801,10 +761,7 @@ toggle button is selected. */ static void -draw_toggle (mw, window, x, y, selected_p) - XlwMenuWidget mw; - Window window; - int x, y, selected_p; +draw_toggle (XlwMenuWidget mw, Window window, int x, int y, int selected_p) { int width, height; @@ -821,10 +778,7 @@ toggle button is selected. */ static void -draw_radio (mw, window, x, y, selected_p) - XlwMenuWidget mw; - Window window; - int x, y, selected_p; +draw_radio (XlwMenuWidget mw, Window window, int x, int y, int selected_p) { int width, height; @@ -841,11 +795,7 @@ separator to draw. TYPE is the separator type. */ static void -draw_separator (mw, window, x, y, width, type) - XlwMenuWidget mw; - Window window; - int x, y, width; - enum menu_separator type; +draw_separator (XlwMenuWidget mw, Window window, int x, int y, int width, enum menu_separator type) { Display *dpy = XtDisplay (mw); XGCValues xgcv; @@ -958,8 +908,7 @@ /* Return the pixel height of menu separator SEPARATOR. */ static int -separator_height (separator) - enum menu_separator separator; +separator_height (enum menu_separator separator) { switch (separator) { @@ -1188,13 +1137,7 @@ } static void -display_menu (mw, level, just_compute_p, highlighted_pos, hit, hit_return) - XlwMenuWidget mw; - int level; - Boolean just_compute_p; - XPoint* highlighted_pos; - XPoint* hit; - widget_value** hit_return; +display_menu (XlwMenuWidget mw, int level, Boolean just_compute_p, XPoint *highlighted_pos, XPoint *hit, widget_value **hit_return) { widget_value* val; widget_value* following_item; @@ -1285,10 +1228,7 @@ /* Motion code */ static void -set_new_state (mw, val, level) - XlwMenuWidget mw; - widget_value* val; - int level; +set_new_state (XlwMenuWidget mw, widget_value *val, int level) { int i; @@ -1311,7 +1251,7 @@ for (i = 0; i < mw->menu.windows_length; ++i) if (mw->menu.windows [i].w == widget) break; if (i < mw->menu.windows_length && i < mw->menu.old_depth) - display_menu (mw, i, False, NULL, NULL, NULL, NULL, NULL); + display_menu (mw, i, False, NULL, NULL, NULL); } static void @@ -1332,9 +1272,7 @@ static void -make_windows_if_needed (mw, n) - XlwMenuWidget mw; - int n; +make_windows_if_needed (XlwMenuWidget mw, int n) { int i; int start_at; @@ -1396,9 +1334,7 @@ /* Value is non-zero if WINDOW is part of menu bar widget W. */ int -xlwmenu_window_p (w, window) - Widget w; - Window window; +xlwmenu_window_p (Widget w, Window window) { XlwMenuWidget mw = (XlwMenuWidget) w; int i; @@ -1412,11 +1348,7 @@ /* Make the window fit in the screen */ static void -fit_to_screen (mw, ws, previous_ws, horizontal_p) - XlwMenuWidget mw; - window_state* ws; - window_state* previous_ws; - Boolean horizontal_p; +fit_to_screen (XlwMenuWidget mw, window_state *ws, window_state *previous_ws, Boolean horizontal_p) { unsigned int screen_width = WidthOfScreen (XtScreen (mw)); unsigned int screen_height = HeightOfScreen (XtScreen (mw)); @@ -1497,8 +1429,7 @@ /* Updates old_stack from new_stack and redisplays. */ static void -remap_menubar (mw) - XlwMenuWidget mw; +remap_menubar (XlwMenuWidget mw) { int i; int last_same; @@ -1591,11 +1522,7 @@ } static Boolean -motion_event_is_in_menu (mw, ev, level, relative_pos) - XlwMenuWidget mw; - XMotionEvent* ev; - int level; - XPoint* relative_pos; +motion_event_is_in_menu (XlwMenuWidget mw, XMotionEvent *ev, int level, XPoint *relative_pos) { window_state* ws = &mw->menu.windows [level]; int shadow = level == 0 ? 0 : mw->menu.shadow_thickness; @@ -1608,11 +1535,7 @@ } static Boolean -map_event_to_widget_value (mw, ev, val, level) - XlwMenuWidget mw; - XMotionEvent* ev; - widget_value** val; - int* level; +map_event_to_widget_value (XlwMenuWidget mw, XMotionEvent *ev, widget_value **val, int *level) { int i; XPoint relative_pos; @@ -1651,8 +1574,7 @@ /* Procedures */ static void -make_drawing_gcs (mw) - XlwMenuWidget mw; +make_drawing_gcs (XlwMenuWidget mw) { XGCValues xgcv; float scale; @@ -1722,8 +1644,7 @@ } static void -release_drawing_gcs (mw) - XlwMenuWidget mw; +release_drawing_gcs (XlwMenuWidget mw) { XtReleaseGC ((Widget) mw, mw->menu.foreground_gc); XtReleaseGC ((Widget) mw, mw->menu.button_gc); @@ -1742,8 +1663,7 @@ ? ((unsigned long) (x)) : ((unsigned long) (y))) static void -make_shadow_gcs (mw) - XlwMenuWidget mw; +make_shadow_gcs (XlwMenuWidget mw) { XGCValues xgcv; unsigned long pm = 0; @@ -1875,8 +1795,7 @@ static void -release_shadow_gcs (mw) - XlwMenuWidget mw; +release_shadow_gcs (XlwMenuWidget mw) { Display *dpy = XtDisplay ((Widget) mw); Screen *screen = XtScreen ((Widget) mw); @@ -1897,8 +1816,7 @@ #ifdef HAVE_XFT static int -openXftFont (mw) - XlwMenuWidget mw; +openXftFont (XlwMenuWidget mw) { char *fname = mw->menu.faceName; @@ -1934,11 +1852,7 @@ #endif static void -XlwMenuInitialize (request, mw, args, num_args) - Widget request; - XlwMenuWidget mw; - ArgList args; - Cardinal *num_args; +XlwMenuInitialize (Widget request, XlwMenuWidget mw, ArgList args, Cardinal *num_args) { /* Get the GCs and the widget size */ @@ -2018,16 +1932,13 @@ } static void -XlwMenuClassInitialize () +XlwMenuClassInitialize (void) { xlwmenu_default_font = 0; } static void -XlwMenuRealize (w, valueMask, attributes) - Widget w; - Mask *valueMask; - XSetWindowAttributes *attributes; +XlwMenuRealize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes) { XlwMenuWidget mw = (XlwMenuWidget)w; XSetWindowAttributes xswa; @@ -2089,10 +2000,7 @@ receives expose events through Xt. So we repaint all the other panes when receiving an Expose event. */ static void -XlwMenuRedisplay (w, ev, region) - Widget w; - XEvent* ev; - Region region; +XlwMenuRedisplay (Widget w, XEvent *ev, Region region) { XlwMenuWidget mw = (XlwMenuWidget)w; int i; @@ -2113,15 +2021,13 @@ over a menu item is unmapped. */ void -xlwmenu_redisplay (w) - Widget w; +xlwmenu_redisplay (Widget w) { XlwMenuRedisplay (w, NULL, None); } static void -XlwMenuDestroy (w) - Widget w; +XlwMenuDestroy (Widget w) { int i; XlwMenuWidget mw = (XlwMenuWidget) w; @@ -2200,10 +2106,7 @@ #endif static Boolean -XlwMenuSetValues (current, request, new) - Widget current; - Widget request; - Widget new; +XlwMenuSetValues (Widget current, Widget request, Widget new) { XlwMenuWidget oldmw = (XlwMenuWidget)current; XlwMenuWidget newmw = (XlwMenuWidget)new; @@ -2292,8 +2195,7 @@ } static void -XlwMenuResize (w) - Widget w; +XlwMenuResize (Widget w) { XlwMenuWidget mw = (XlwMenuWidget)w; @@ -2315,9 +2217,7 @@ /* Action procedures */ static void -handle_single_motion_event (mw, ev) - XlwMenuWidget mw; - XMotionEvent* ev; +handle_single_motion_event (XlwMenuWidget mw, XMotionEvent *ev) { widget_value* val; int level; @@ -2333,9 +2233,7 @@ } static void -handle_motion_event (mw, ev) - XlwMenuWidget mw; - XMotionEvent* ev; +handle_motion_event (XlwMenuWidget mw, XMotionEvent *ev) { int x = ev->x_root; int y = ev->y_root; @@ -2357,11 +2255,7 @@ } static void -Start (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Start (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget)w; @@ -2394,11 +2288,7 @@ } static void -Drag (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Drag (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget)w; if (mw->menu.popped_up) @@ -2408,19 +2298,12 @@ /* Do nothing. This is how we handle presses and releases of modifier keys. */ static void -Nothing (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Nothing (Widget w, XEvent *ev, String *params, Cardinal *num_params) { } static widget_value * -find_first_selectable (mw, item, skip_titles) - XlwMenuWidget mw; - widget_value *item; - int skip_titles; +find_first_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) { widget_value *current = item; enum menu_separator separator; @@ -2436,10 +2319,7 @@ } static widget_value * -find_next_selectable (mw, item, skip_titles) - XlwMenuWidget mw; - widget_value *item; - int skip_titles; +find_next_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) { widget_value *current = item; enum menu_separator separator; @@ -2473,10 +2353,7 @@ } static widget_value * -find_prev_selectable (mw, item, skip_titles) - XlwMenuWidget mw; - widget_value *item; - int skip_titles; +find_prev_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) { widget_value *current = item; widget_value *prev = item; @@ -2493,11 +2370,7 @@ } static void -Down (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Down (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget) w; widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; @@ -2522,11 +2395,7 @@ } static void -Up (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Up (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget) w; widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; @@ -2562,11 +2431,7 @@ } void -Left (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Left (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget) w; widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; @@ -2602,11 +2467,7 @@ } void -Right (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Right (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget) w; widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; @@ -2642,11 +2503,7 @@ /* Handle key press and release events while menu is popped up. Our action is to get rid of the menu. */ static void -Key (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Key (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget)w; @@ -2672,11 +2529,7 @@ } static void -Select (w, ev, params, num_params) - Widget w; - XEvent *ev; - String *params; - Cardinal *num_params; +Select (Widget w, XEvent *ev, String *params, Cardinal *num_params) { XlwMenuWidget mw = (XlwMenuWidget)w; widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; @@ -2715,9 +2568,7 @@ /* Special code to pop-up a menu */ static void -pop_up_menu (mw, event) - XlwMenuWidget mw; - XButtonPressedEvent* event; +pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event) { int x = event->x_root; int y = event->y_root; ------------------------------------------------------------ revno: 100704 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-07-03 18:15:30 +0300 message: ebrowse.c (check_namespace): Fix indentation. diff: === modified file 'lib-src/ebrowse.c' --- lib-src/ebrowse.c 2010-07-03 10:46:27 +0000 +++ lib-src/ebrowse.c 2010-07-03 15:15:30 +0000 @@ -1062,10 +1062,10 @@ { if (streq (p->name, name) && (p->namesp == context)) break; - } + } return p; - } +} /* Find the symbol for namespace NAME. If not found, add a new symbol for NAME to all_namespaces. */ ------------------------------------------------------------ revno: 100703 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-07-03 17:42:02 +0300 message: Fix menu bar and colors on MS-DOS. msdos.c (IT_set_frame_parameters): Set menu-bar-lines according to menu-bar-mode, if not set in the frame parameters or in default-frame-alist. Fix setting of colors in frames other than the initial one. Fix reversal of colors when `reverse' is specified in the frame parameters. Call update_face_from_frame_parameter instead of internal-set-lisp-face-attribute. Initialize screen colors from initial_screen_colors[] when f->default_face_done_p is zero, instead of depending on being called with default-frame-alist as the alist argument. xfaces.c (update_face_from_frame_parameter): Move out of HAVE_WINDOW_SYSTEM portion. Condition window-system only parts with HAVE_WINDOW_SYSTEM. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-03 07:49:55 +0000 +++ src/ChangeLog 2010-07-03 14:36:18 +0000 @@ -1,5 +1,22 @@ 2010-07-03 Eli Zaretskii + * msdos.c (IT_set_frame_parameters): Fix setting of colors in + frames other than the initial one. Fix reversal of colors when + `reverse' is specified in the frame parameters. Call + update_face_from_frame_parameter instead of + internal-set-lisp-face-attribute. Initialize screen colors from + initial_screen_colors[] when f->default_face_done_p is zero, + instead of depending on being called with default-frame-alist as + the alist argument. + + * xfaces.c (update_face_from_frame_parameter): Move out of + HAVE_WINDOW_SYSTEM portion. Condition window-system only parts + with HAVE_WINDOW_SYSTEM. + + * msdos.c (IT_set_frame_parameters): Set menu-bar-lines according + to menu-bar-mode, if not set in the frame parameters or in + default-frame-alist. + * w32console.c (sys_tputs): Adjust argument list to prototype in term.c. === modified file 'src/msdos.c' --- src/msdos.c 2010-05-07 13:51:16 +0000 +++ src/msdos.c 2010-07-03 14:36:18 +0000 @@ -2092,33 +2092,27 @@ = (Lisp_Object *) alloca (length * sizeof (Lisp_Object)); /* Do we have to reverse the foreground and background colors? */ int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt); - int need_to_reverse, was_reverse = reverse; int redraw = 0, fg_set = 0, bg_set = 0; unsigned long orig_fg, orig_bg; Lisp_Object frame_bg, frame_fg; - extern Lisp_Object Qdefault, QCforeground, QCbackground; struct tty_display_info *tty = FRAME_TTY (f); + extern Lisp_Object Qmenu_bar_lines; + extern Lisp_Object Vmenu_bar_mode; + int menu_bar_lines_defined = + !NILP (Fassq (Qmenu_bar_lines, Vdefault_frame_alist)); /* If we are creating a new frame, begin with the original screen colors used for the initial frame. */ - if (EQ (alist, Vdefault_frame_alist) + if (!f->default_face_done_p && initial_screen_colors[0] != -1 && initial_screen_colors[1] != -1) { FRAME_FOREGROUND_PIXEL (f) = initial_screen_colors[0]; FRAME_BACKGROUND_PIXEL (f) = initial_screen_colors[1]; init_frame_faces (f); + f->default_face_done_p = 1; } - orig_fg = FRAME_FOREGROUND_PIXEL (f); - orig_bg = FRAME_BACKGROUND_PIXEL (f); - frame_fg = Fcdr (Fassq (Qforeground_color, f->param_alist)); - frame_bg = Fcdr (Fassq (Qbackground_color, f->param_alist)); - /* frame_fg and frame_bg could be nil if, for example, - f->param_alist is nil, e.g. if we are called from - Fmake_terminal_frame. */ - if (NILP (frame_fg)) - frame_fg = build_string (unspecified_fg); - if (NILP (frame_bg)) - frame_bg = build_string (unspecified_bg); + orig_fg = reverse ? FRAME_BACKGROUND_PIXEL (f) : FRAME_FOREGROUND_PIXEL (f); + orig_bg = reverse ? FRAME_FOREGROUND_PIXEL (f) : FRAME_BACKGROUND_PIXEL (f); /* Extract parm names and values into those vectors. */ i = 0; @@ -2144,60 +2138,79 @@ if (EQ (prop, Qreverse)) reverse = EQ (val, Qt); + else if (!menu_bar_lines_defined && EQ (prop, Qmenu_bar_lines)) + menu_bar_lines_defined = 1; } - need_to_reverse = reverse && !was_reverse; - if (tty->termscript && need_to_reverse) + if (tty->termscript && reverse) fprintf (tty->termscript, "\n"); /* Now process the alist elements in reverse of specified order. */ for (i--; i >= 0; i--) { - Lisp_Object prop, val, frame; + Lisp_Object prop, val; prop = parms[i]; val = values[i]; if (EQ (prop, Qforeground_color)) { - unsigned long new_color = load_color (f, NULL, val, need_to_reverse + unsigned long new_color = load_color (f, NULL, val, reverse ? LFACE_BACKGROUND_INDEX : LFACE_FOREGROUND_INDEX); if (new_color != FACE_TTY_DEFAULT_COLOR && new_color != FACE_TTY_DEFAULT_FG_COLOR && new_color != FACE_TTY_DEFAULT_BG_COLOR) { - FRAME_FOREGROUND_PIXEL (f) = new_color; - /* Make sure the foreground of the default face for this - frame is changed as well. */ - XSETFRAME (frame, f); - Finternal_set_lisp_face_attribute (Qdefault, QCforeground, - val, frame); - fg_set = 1; + if (!reverse) + { + FRAME_FOREGROUND_PIXEL (f) = new_color; + /* Make sure the foreground of the default face for + this frame is changed as well. */ + update_face_from_frame_parameter (f, Qforeground_color, val); + fg_set = 1; + if (tty->termscript) + fprintf (tty->termscript, "\n", new_color); + } + else + { + FRAME_BACKGROUND_PIXEL (f) = new_color; + update_face_from_frame_parameter (f, Qbackground_color, val); + bg_set = 1; + if (tty->termscript) + fprintf (tty->termscript, "\n", new_color); + } redraw = 1; - if (tty->termscript) - fprintf (tty->termscript, "\n", new_color); } } else if (EQ (prop, Qbackground_color)) { - unsigned long new_color = load_color (f, NULL, val, need_to_reverse + unsigned long new_color = load_color (f, NULL, val, reverse ? LFACE_FOREGROUND_INDEX : LFACE_BACKGROUND_INDEX); if (new_color != FACE_TTY_DEFAULT_COLOR && new_color != FACE_TTY_DEFAULT_FG_COLOR && new_color != FACE_TTY_DEFAULT_BG_COLOR) { - FRAME_BACKGROUND_PIXEL (f) = new_color; - /* Make sure the background of the default face for this - frame is changed as well. */ - XSETFRAME (frame, f); - Finternal_set_lisp_face_attribute (Qdefault, QCbackground, - val, frame); - bg_set = 1; + if (!reverse) + { + FRAME_BACKGROUND_PIXEL (f) = new_color; + /* Make sure the background of the default face for + this frame is changed as well. */ + bg_set = 1; + update_face_from_frame_parameter (f, Qbackground_color, val); + if (tty->termscript) + fprintf (tty->termscript, "\n", new_color); + } + else + { + FRAME_FOREGROUND_PIXEL (f) = new_color; + fg_set = 1; + update_face_from_frame_parameter (f, Qforeground_color, val); + if (tty->termscript) + fprintf (tty->termscript, "\n", new_color); + } redraw = 1; - if (tty->termscript) - fprintf (tty->termscript, "\n", new_color); } } else if (EQ (prop, Qtitle)) @@ -2226,26 +2239,36 @@ store_frame_param (f, prop, val); } + /* If menu-bar-lines is neither in the frame parameters nor in + default-frame-alist, set it according to menu-bar-mode. */ + if (!menu_bar_lines_defined) + { + store_frame_param (f, Qmenu_bar_lines, + NILP (Vmenu_bar_mode) + ? make_number (0) : make_number (1)); + if (tty->termscript) + fprintf (tty->termscript, "contents, font); - if (NILP (font)) - return; - LFACE_FONT (lface) = font; - } - f->default_face_done_p = 0; - Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font), Qnil)); - } -} - - /* Update the corresponding face when frame parameter PARAM on frame F has been assigned the value NEW_VALUE. */ @@ -3562,6 +3531,7 @@ ? new_value : Qunspecified); realize_basic_faces (f); } +#ifdef HAVE_WINDOW_SYSTEM else if (EQ (param, Qborder_color)) { face = Qborder; @@ -3583,6 +3553,7 @@ LFACE_BACKGROUND (lface) = (STRINGP (new_value) ? new_value : Qunspecified); } +#endif /* Changing a named face means that all realized faces depending on that face are invalid. Since we cannot tell which realized faces @@ -3598,6 +3569,37 @@ } +#ifdef HAVE_WINDOW_SYSTEM + +/* Set the `font' frame parameter of FRAME determined from the + font-object set in `default' face attributes LFACE. */ + +static void +set_font_frame_param (frame, lface) + Lisp_Object frame, lface; +{ + struct frame *f = XFRAME (frame); + Lisp_Object font; + + if (FRAME_WINDOW_P (f) + /* Don't do anything if the font is `unspecified'. This can + happen during frame creation. */ + && (font = LFACE_FONT (lface), + ! UNSPECIFIEDP (font))) + { + if (FONT_SPEC_P (font)) + { + font = font_load_for_lface (f, XVECTOR (lface)->contents, font); + if (NILP (font)) + return; + LFACE_FONT (lface) = font; + } + f->default_face_done_p = 0; + Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, font), Qnil)); + } +} + + /* Get the value of X resource RESOURCE, class CLASS for the display of frame FRAME. This is here because ordinary `x-get-resource' doesn't take a frame argument. */ ------------------------------------------------------------ revno: 100702 committer: Andreas Schwab branch nick: emacs timestamp: Sat 2010-07-03 14:11:03 +0200 message: Fix invalid cast * sorted-doc.c (cmpdoc): Fix signature. (qsort_compare): Delete. (main): Remove cast. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-07-03 10:46:27 +0000 +++ lib-src/ChangeLog 2010-07-03 12:11:03 +0000 @@ -1,3 +1,9 @@ +2010-07-03 Andreas Schwab + + * sorted-doc.c (cmpdoc): Fix signature. + (qsort_compare): Delete. + (main): Remove cast. + 2010-07-03 Juanma Barranquero * ebrowse.c (match_qualified_namespace_alias): Check for null pointer. === modified file 'lib-src/sorted-doc.c' --- lib-src/sorted-doc.c 2010-07-03 07:44:17 +0000 +++ lib-src/sorted-doc.c 2010-07-03 12:11:03 +0000 @@ -103,15 +103,15 @@ /* Comparison function for qsort to call. */ int -cmpdoc (DOCSTR **a, DOCSTR **b) +cmpdoc (const void *va, const void *vb) { + DOCSTR *const *a = va; + DOCSTR *const *b = vb; register int val = strcmp ((*a)->name, (*b)->name); if (val) return val; return (*a)->type - (*b)->type; } -typedef int (*qsort_compare) (const void *, const void *); - enum state { WAITING, BEG_NAME, NAME_GET, BEG_DESC, DESC_GET @@ -228,7 +228,7 @@ /* sort the array by name; within each name, by type */ - qsort ((char*)array, cnt, sizeof (DOCSTR*), (qsort_compare)cmpdoc); + qsort ((char*)array, cnt, sizeof (DOCSTR*), cmpdoc); /* write the output header */ ------------------------------------------------------------ revno: 100701 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-07-03 12:46:27 +0200 message: lib-src/ebrowse.c (match_qualified_namespace_alias): Check for null pointer. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-07-03 07:44:17 +0000 +++ lib-src/ChangeLog 2010-07-03 10:46:27 +0000 @@ -1,5 +1,9 @@ 2010-07-03 Juanma Barranquero + * ebrowse.c (match_qualified_namespace_alias): Check for null pointer. + +2010-07-03 Juanma Barranquero + Fix prototype warnings. * ebrowse.c (match_qualified_namespace_alias): === modified file 'lib-src/ebrowse.c' --- lib-src/ebrowse.c 2010-07-03 07:44:17 +0000 +++ lib-src/ebrowse.c 2010-07-03 10:46:27 +0000 @@ -2385,7 +2385,7 @@ { case IDENT: tmp = (struct link *) xmalloc (sizeof *cur); - tmp->sym = find_namespace (yytext, cur->sym); + tmp->sym = find_namespace (yytext, cur ? cur->sym : NULL); tmp->next = NULL; if (head) { ------------------------------------------------------------ revno: 100700 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-07-03 10:49:55 +0300 message: w32console.c (sys_tputs): Adjust argument list to prototype in term.c. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-03 07:44:17 +0000 +++ src/ChangeLog 2010-07-03 07:49:55 +0000 @@ -1,3 +1,8 @@ +2010-07-03 Eli Zaretskii + + * w32console.c (sys_tputs): Adjust argument list to prototype in + term.c. + 2010-07-03 Juanma Barranquero * lisp.h (memory_warnings): Fix prototype. === modified file 'src/w32console.c' --- src/w32console.c 2010-07-02 12:19:53 +0000 +++ src/w32console.c 2010-07-03 07:49:55 +0000 @@ -492,7 +492,7 @@ ***********************************************************************/ void -sys_tputs (char *str, int nlines, int (*outfun)()) +sys_tputs (char *str, int nlines, int (*outfun)(int)) { } ------------------------------------------------------------ revno: 100699 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-07-03 09:44:17 +0200 message: Fix prototypes. * src/cm.c (evalcost): Fix arg type. * src/cm.h (evalcost): Fix prototype. * src/lisp.h (memory_warnings): Fix prototype. * lib-src/ebrowse.c (match_qualified_namespace_alias): Pass sym* to find_namespace, not link*. * lib-src/emacsclient.c (send_to_emacs, quote_argument): Arg s is HSOCKET. * lib-src/sorted-doc.c (qsort_compare): New typedef. (main): Use it to cast cmpdoc. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-07-03 00:50:23 +0000 +++ lib-src/ChangeLog 2010-07-03 07:44:17 +0000 @@ -1,3 +1,15 @@ +2010-07-03 Juanma Barranquero + + Fix prototype warnings. + + * ebrowse.c (match_qualified_namespace_alias): + Pass sym* to find_namespace, not link*. + + * emacsclient.c (send_to_emacs, quote_argument): Arg s is HSOCKET. + + * sorted-doc.c (qsort_compare): New typedef. + (main): Use it to cast cmpdoc. + 2010-07-03 Dan Nicolaescu * update-game-score.c: Convert function definitions to standard C. === modified file 'lib-src/ebrowse.c' --- lib-src/ebrowse.c 2010-07-03 00:50:23 +0000 +++ lib-src/ebrowse.c 2010-07-03 07:44:17 +0000 @@ -2385,7 +2385,7 @@ { case IDENT: tmp = (struct link *) xmalloc (sizeof *cur); - tmp->sym = find_namespace (yytext, cur); + tmp->sym = find_namespace (yytext, cur->sym); tmp->next = NULL; if (head) { === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2010-07-03 00:50:23 +0000 +++ lib-src/emacsclient.c 2010-07-03 07:44:17 +0000 @@ -764,7 +764,7 @@ - the buffer is full (but this shouldn't happen) Otherwise, we just accumulate it. */ void -send_to_emacs (int s, char *data) +send_to_emacs (HSOCKET s, char *data) { while (data) { @@ -801,9 +801,9 @@ any initial -. Change spaces to underscores, too, so that the return value never contains a space. - Does not change the string. Outputs the result to STREAM. */ + Does not change the string. Outputs the result to S. */ void -quote_argument (int s, char *str) +quote_argument (HSOCKET s, char *str) { char *copy = (char *) xmalloc (strlen (str) * 2 + 1); char *p, *q; === modified file 'lib-src/sorted-doc.c' --- lib-src/sorted-doc.c 2010-07-03 00:50:23 +0000 +++ lib-src/sorted-doc.c 2010-07-03 07:44:17 +0000 @@ -110,6 +110,7 @@ return (*a)->type - (*b)->type; } +typedef int (*qsort_compare) (const void *, const void *); enum state { @@ -227,7 +228,7 @@ /* sort the array by name; within each name, by type */ - qsort ((char*)array, cnt, sizeof (DOCSTR*), cmpdoc); + qsort ((char*)array, cnt, sizeof (DOCSTR*), (qsort_compare)cmpdoc); /* write the output header */ === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-02 22:18:28 +0000 +++ src/ChangeLog 2010-07-03 07:44:17 +0000 @@ -1,3 +1,11 @@ +2010-07-03 Juanma Barranquero + + * lisp.h (memory_warnings): Fix prototype. + + * cm.h (evalcost): Fix prototype. + + * cm.c (evalcost): Fix arg type. + 2010-07-02 Dan Nicolaescu * term.c (term_clear_mouse_face, Fidentity): === modified file 'src/cm.c' --- src/cm.c 2010-07-02 12:19:53 +0000 +++ src/cm.c 2010-07-03 07:44:17 +0000 @@ -46,7 +46,7 @@ /* ARGSUSED */ int evalcost (c) - char c; + int c; { cost++; return c; === modified file 'src/cm.h' --- src/cm.h 2010-07-02 22:18:28 +0000 +++ src/cm.h 2010-07-03 07:44:17 +0000 @@ -158,7 +158,7 @@ #define losecursor(tty) (curX(tty) = -1, curY(tty) = -1) extern int cost; -extern int evalcost (char c); +extern int evalcost (int c); #define emacs_tputs(tty, str, affcnt, putc) (current_tty = (tty), tputs (str, affcnt, putc)) === modified file 'src/lisp.h' --- src/lisp.h 2010-07-02 22:18:28 +0000 +++ src/lisp.h 2010-07-03 07:44:17 +0000 @@ -2668,7 +2668,7 @@ extern void syms_of_xsettings (void); /* Defined in vm-limit.c. */ -extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (const char*)); +extern void memory_warnings (POINTER_TYPE *, void (*warnfun) (char*)); /* Defined in alloc.c */ extern void check_pure_size (void); ------------------------------------------------------------ revno: 100698 committer: Chong Yidong branch nick: trunk timestamp: Fri 2010-07-02 23:16:11 -0400 message: Fix typo in last change. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-07-03 03:13:26 +0000 +++ etc/NEWS 2010-07-03 03:16:11 +0000 @@ -313,9 +313,10 @@ If the alist entries are added, they override the value of `menu-bar-mode'/`tool-bar-mode'. -** Mouse dragging is not any differently from active regions. -The internal variables `mouse-drag-overlay', and the internal function -`mouse-move-drag-overlay' and `mouse-show-mark', have been deleted. +** Regions created by mouse dragging are now normal active regions, +similar to the ones created by shift-selection. In previous Emacs +versions, these regions were delineated by `mouse-drag-overlay', which +has now been removed. * Lisp changes in Emacs 24.1 ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.