Revision: 41163
http://brlcad.svn.sourceforge.net/brlcad/?rev=41163&view=rev
Author: brlcad
Date: 2010-10-29 06:13:25 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
minor formatting consistency
Modified Paths:
--------------
brlcad/trunk/src/bwish/cadAppInit.c
brlcad/trunk/src/bwish/cmd.c
brlcad/trunk/src/bwish/consoleMain.c
brlcad/trunk/src/bwish/input.c
brlcad/trunk/src/bwish/main.c
brlcad/trunk/src/bwish/tcl.c
brlcad/trunk/src/bwish/unixMain.c
brlcad/trunk/src/bwish/winMain.c
Modified: brlcad/trunk/src/bwish/cadAppInit.c
===================================================================
--- brlcad/trunk/src/bwish/cadAppInit.c 2010-10-29 06:09:12 UTC (rev 41162)
+++ brlcad/trunk/src/bwish/cadAppInit.c 2010-10-29 06:13:25 UTC (rev 41163)
@@ -20,7 +20,7 @@
*/
/** @file cadAppInit.c
*
- * This file initializes Itcl/Itk and various BRL-CAD libraries.
+ * This file initializes Itcl/Itk and various BRL-CAD libraries.
*
*/
@@ -170,6 +170,7 @@
return TCL_OK;
}
+
/*
* Local Variables:
* tab-width: 8
Modified: brlcad/trunk/src/bwish/cmd.c
===================================================================
--- brlcad/trunk/src/bwish/cmd.c 2010-10-29 06:09:12 UTC (rev 41162)
+++ brlcad/trunk/src/bwish/cmd.c 2010-10-29 06:13:25 UTC (rev 41163)
@@ -69,6 +69,7 @@
return TCL_OK;
}
+
/***************************** BWISH/BTCLSH COMMAND HISTORY
*****************************/
HIDDEN int historyInitialized=0;
@@ -84,6 +85,7 @@
historyInitialized=1;
}
+
/*
* H I S T O R Y _ R E C O R D
*
@@ -353,6 +355,7 @@
{(char *)NULL, CMD_NULL}
};
+
#ifdef BWISH
/* structure provided in libtclcad. provides -format pix-n-w support.
* doesn't really seem to be used anywhere except here.
Modified: brlcad/trunk/src/bwish/consoleMain.c
===================================================================
--- brlcad/trunk/src/bwish/consoleMain.c 2010-10-29 06:09:12 UTC (rev
41162)
+++ brlcad/trunk/src/bwish/consoleMain.c 2010-10-29 06:13:25 UTC (rev
41163)
@@ -40,14 +40,14 @@
*
* main --
*
- * This is the main program for the application.
+ * This is the main program for the application.
*
* Results:
- * None: Tcl_Main never returns here, so this function never returns
- * either.
+ * None: Tcl_Main never returns here, so this function never returns
+ * either.
*
* Side effects:
- * Whatever the application does.
+ * Whatever the application does.
*
*----------------------------------------------------------------------
*/
@@ -85,21 +85,22 @@
return 0; /* Needed only to prevent compiler warning. */
}
+
/*
*----------------------------------------------------------------------
*
* Tcl_AppInit --
*
- * This function performs application-specific initialization. Most
- * applications, especially those that incorporate additional packages,
- * will have their own version of this function.
+ * This function performs application-specific initialization. Most
+ * applications, especially those that incorporate additional packages,
+ * will have their own version of this function.
*
* Results:
- * Returns a standard Tcl completion code, and leaves an error message in
- * the interp's result if an error occurs.
+ * Returns a standard Tcl completion code, and leaves an error message in
+ * the interp's result if an error occurs.
*
* Side effects:
- * Depends on the startup script.
+ * Depends on the startup script.
*
*----------------------------------------------------------------------
*/
@@ -118,6 +119,7 @@
return TCL_OK;
}
+
/*
* Local Variables:
* mode: c
Modified: brlcad/trunk/src/bwish/input.c
===================================================================
--- brlcad/trunk/src/bwish/input.c 2010-10-29 06:09:12 UTC (rev 41162)
+++ brlcad/trunk/src/bwish/input.c 2010-10-29 06:13:25 UTC (rev 41163)
@@ -111,6 +111,7 @@
insert_prompt();
}
+
HIDDEN void
inputHandler(ClientData clientData, int UNUSED(mask))
{
@@ -136,6 +137,7 @@
processChar(ch);
}
+
/* Process character */
HIDDEN void
processChar(char ch)
@@ -357,42 +359,42 @@
#endif
break;
case CTRL_W: /* backward-delete-word */
- {
- char *start;
- char *curr;
- int len;
+ {
+ char *start;
+ char *curr;
+ int len;
- start = bu_vls_addr(&input_str);
- curr = start + input_str_index - 1;
+ start = bu_vls_addr(&input_str);
+ curr = start + input_str_index - 1;
- /* skip spaces */
- while (curr > start && *curr == ' ')
- --curr;
+ /* skip spaces */
+ while (curr > start && *curr == ' ')
+ --curr;
- /* find next space */
- while (curr > start && *curr != ' ')
- --curr;
+ /* find next space */
+ while (curr > start && *curr != ' ')
+ --curr;
- bu_vls_init(&temp);
- bu_vls_strcat(&temp, start+input_str_index);
+ bu_vls_init(&temp);
+ bu_vls_strcat(&temp, start+input_str_index);
- if (curr == start)
- input_str_index = 0;
- else
- input_str_index = curr - start + 1;
+ if (curr == start)
+ input_str_index = 0;
+ else
+ input_str_index = curr - start + 1;
- len = bu_vls_strlen(&input_str);
- bu_vls_trunc(&input_str, input_str_index);
- insert_prompt();
- bu_log("%V%V%*s", &input_str, &temp, len - input_str_index, SPACES);
- insert_prompt();
- bu_log("%V", &input_str);
- bu_vls_vlscat(&input_str, &temp);
- bu_vls_free(&temp);
- }
+ len = bu_vls_strlen(&input_str);
+ bu_vls_trunc(&input_str, input_str_index);
+ insert_prompt();
+ bu_log("%V%V%*s", &input_str, &temp, len - input_str_index,
SPACES);
+ insert_prompt();
+ bu_log("%V", &input_str);
+ bu_vls_vlscat(&input_str, &temp);
+ bu_vls_free(&temp);
+ }
- escaped = bracketed = 0;
- break;
+ escaped = bracketed = 0;
+ break;
case 'd':
if (escaped) {
/* delete-word */
@@ -506,12 +508,14 @@
}
}
+
HIDDEN void
insert_prompt(void)
{
bu_log("%V", &prompt);
}
+
HIDDEN void
insert_char(char ch)
{
@@ -535,12 +539,14 @@
}
}
+
HIDDEN void
insert_beep(void)
{
bu_log("%c", 7);
}
+
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/bwish/main.c
===================================================================
--- brlcad/trunk/src/bwish/main.c 2010-10-29 06:09:12 UTC (rev 41162)
+++ brlcad/trunk/src/bwish/main.c 2010-10-29 06:13:25 UTC (rev 41163)
@@ -20,9 +20,9 @@
*/
/** @file main.c
*
- * This file provides the main() function for both BWISH and BTCLSH.
- * While initializing Tcl, Itcl and various BRL-CAD libraries it sets
- * things up to provide command history and command line editing.
+ * This file provides the main() function for both BWISH and BTCLSH.
+ * While initializing Tcl, Itcl and various BRL-CAD libraries it sets
+ * things up to provide command history and command line editing.
*
*/
@@ -274,6 +274,7 @@
return TCL_OK;
}
+
int
main(int argc, char **argv)
{
Modified: brlcad/trunk/src/bwish/tcl.c
===================================================================
--- brlcad/trunk/src/bwish/tcl.c 2010-10-29 06:09:12 UTC (rev 41162)
+++ brlcad/trunk/src/bwish/tcl.c 2010-10-29 06:13:25 UTC (rev 41163)
@@ -20,12 +20,12 @@
*/
/** @file tcl.c
*
- * The supporting Tcl routines for BWISH and BTCLSH.
+ * The supporting Tcl routines for BWISH and BTCLSH.
*
- * Cad_Main --
- * Main program for wish-like applications that desire command
- * line editing when in interactive mode. Much of this code was
- * borrowed from libtk/generic/tkMain.c.
+ * Cad_Main --
+ * Main program for wish-like applications that desire command
+ * line editing when in interactive mode. Much of this code was
+ * borrowed from libtk/generic/tkMain.c.
*
*/
@@ -54,9 +54,9 @@
void Cad_Exit(int status);
#ifdef BWISH
-# define CAD_RCFILENAME "~/.bwishrc"
+# define CAD_RCFILENAME "~/.bwishrc"
#else
-# define CAD_RCFILENAME "~/.btclshrc"
+# define CAD_RCFILENAME "~/.btclshrc"
#endif
/*
@@ -65,13 +65,13 @@
* borrowed from libtk/generic/tkMain.c.
*
* Results:
- * None. This procedure never returns (it exits the process when
- * it's done.
+ * None. This procedure never returns (it exits the process when
+ * it's done.
*
* Side effects:
- * This procedure initializes the Tk world and then starts
- * interpreting commands; almost anything could happen,
- * depending on the script being interpreted.
+ * This procedure initializes the Tk world and then starts
+ * interpreting commands; almost anything could happen,
+ * depending on the script being interpreted.
*/
void
Cad_Main(int argc, char **argv, Tcl_AppInitProc (*appInitProc), Tcl_Interp
*interp)
@@ -159,6 +159,7 @@
Cad_Exit(TCL_OK);
}
+
void
Cad_MainLoop(void)
{
@@ -172,6 +173,7 @@
}
}
+
void
Cad_Exit(int status)
{
@@ -179,6 +181,7 @@
Tcl_Exit(status);
}
+
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/bwish/unixMain.c
===================================================================
--- brlcad/trunk/src/bwish/unixMain.c 2010-10-29 06:09:12 UTC (rev 41162)
+++ brlcad/trunk/src/bwish/unixMain.c 2010-10-29 06:13:25 UTC (rev 41163)
@@ -20,8 +20,8 @@
*/
/** @file unixMain.c
*
- * This file provides the main() function for
- * BWISH and BTCLSH on Unix platforms.
+ * This file provides the main() function for
+ * BWISH and BTCLSH on Unix platforms.
*
*/
/*
@@ -44,20 +44,20 @@
*
* main --
*
- * This is the main program for BWISH.
+ * This is the main program for BWISH.
*
* Results:
- * None: Tk_Main never returns here, so this procedure never returns
- * either.
+ * None: Tk_Main never returns here, so this procedure never returns
+ * either.
*
* Side effects:
- * Whatever the application does.
+ * Whatever the application does.
*
*----------------------------------------------------------------------
*/
int
-main(int argc,
+main(int argc,
char **argv)
{
/*
@@ -92,21 +92,22 @@
return 0; /* Needed only to prevent compiler warning. */
}
+
/*
*----------------------------------------------------------------------
*
* Tcl_AppInit --
*
- * This procedure performs application-specific initialization. Most
- * applications, especially those that incorporate additional packages,
- * will have their own version of this procedure.
+ * This procedure performs application-specific initialization. Most
+ * applications, especially those that incorporate additional packages,
+ * will have their own version of this procedure.
*
* Results:
- * Returns a standard Tcl completion code, and leaves an error message in
- * the interp's result if an error occurs.
+ * Returns a standard Tcl completion code, and leaves an error message in
+ * the interp's result if an error occurs.
*
* Side effects:
- * Depends on the startup script.
+ * Depends on the startup script.
*
*----------------------------------------------------------------------
*/
@@ -142,6 +143,7 @@
return TCL_OK;
}
+
/*
* Local Variables:
* mode: c
Modified: brlcad/trunk/src/bwish/winMain.c
===================================================================
--- brlcad/trunk/src/bwish/winMain.c 2010-10-29 06:09:12 UTC (rev 41162)
+++ brlcad/trunk/src/bwish/winMain.c 2010-10-29 06:13:25 UTC (rev 41163)
@@ -20,7 +20,7 @@
*/
/** @file winMain.c
*
- * This file provides the WinMain() function for BWISH.
+ * This file provides the WinMain() function for BWISH.
*
*/
/*
@@ -77,13 +77,13 @@
*
* WinMain --
*
- * Main entry point from Windows.
+ * Main entry point from Windows.
*
* Results:
- * Returns false if initialization fails, otherwise it never returns.
+ * Returns false if initialization fails, otherwise it never returns.
*
* Side effects:
- * Just about anything, since from here we call arbitrary Tcl code.
+ * Just about anything, since from here we call arbitrary Tcl code.
*
*----------------------------------------------------------------------
*/
@@ -91,8 +91,8 @@
int APIENTRY
WinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
- LPSTR lpszCmdLine,
- int nCmdShow)
+ LPSTR lpszCmdLine,
+ int nCmdShow)
{
char **argv;
int argc;
@@ -140,21 +140,22 @@
return 1;
}
+
/*
*----------------------------------------------------------------------
*
* Tcl_AppInit --
*
- * This procedure performs application-specific initialization. Most
- * applications, especially those that incorporate additional packages,
- * will have their own version of this procedure.
+ * This procedure performs application-specific initialization. Most
+ * applications, especially those that incorporate additional packages,
+ * will have their own version of this procedure.
*
* Results:
- * Returns a standard Tcl completion code, and leaves an error message in
- * the interp's result if an error occurs.
+ * Returns a standard Tcl completion code, and leaves an error message in
+ * the interp's result if an error occurs.
*
* Side effects:
- * Depends on the startup script.
+ * Depends on the startup script.
*
*----------------------------------------------------------------------
*/
@@ -185,7 +186,7 @@
Tcl_SetVar(interp, "tcl_rcFileName", "~/bwishrc.tcl", TCL_GLOBAL_ONLY);
return TCL_OK;
- error:
+error:
MessageBeep(MB_ICONEXCLAMATION);
MessageBox(NULL, (LPCWSTR)Tcl_GetStringResult(interp), (LPCWSTR)"Error in
bwish",
MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND);
@@ -198,18 +199,19 @@
return TCL_ERROR;
}
+
/*
*----------------------------------------------------------------------
*
* BwishPanic --
*
- * Display a message and exit.
+ * Display a message and exit.
*
* Results:
- * None.
+ * None.
*
* Side effects:
- * Exits the program.
+ * Exits the program.
*
*----------------------------------------------------------------------
*/
@@ -232,6 +234,7 @@
ExitProcess(1);
}
+
/*
* Local Variables:
* mode: c
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
