darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* gdbtk.c (gdbtk_cleanup): New static function.

Browse source 
(gdbtk_init): Add gdbtk_cleanup as a final cleanup.  Uncomment
	call to ide_initialize_paths.  If we can't initialize the event
	system, set GDBTK_IDE to 0 in the Tcl interpreter.  Create the
	ide_window_register and the ide_window commands.  Initialize tk,
	itcl, and tix after initializing the IDE.
This commit is contained in:
Ian Lance Taylor 1997-08-08 20:07:14 +00:00
parent f1f6dd9c39
commit 9a2f9219c8
2 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/ChangeLog
View file

@ -1,5 +1,12 @@
start-sanitize-gdbtk start-sanitize-gdbtk
Fri Aug 8 15:19:14 1997 Ian Lance Taylor <ian@cygnus.com> Fri Aug 8 15:59:24 1997 Ian Lance Taylor <ian@cygnus.com>
* gdbtk.c (gdbtk_cleanup): New static function.
(gdbtk_init): Add gdbtk_cleanup as a final cleanup. Uncomment
call to ide_initialize_paths. If we can't initialize the event
system, set GDBTK_IDE to 0 in the Tcl interpreter. Create the
ide_window_register and the ide_window commands. Initialize tk,
itcl, and tix after initializing the IDE.
* configure.in (tixdir): Update for cygwin32 case for Tcl 8.0. * configure.in (tixdir): Update for cygwin32 case for Tcl 8.0.
* configure: Rebuild. * configure: Rebuild.

51
gdb/gdbtk.c
View file

@ -1303,6 +1303,17 @@ tk_command_loop ()
Tk_MainLoop (); Tk_MainLoop ();
} }
/* gdbtk_init installs this function as a final cleanup. */
static void
gdbtk_cleanup (dummy)
PTR dummy;
{
Tcl_Finalize ();
}
/* Initialize gdbtk. */
static void static void
gdbtk_init ( argv0 ) gdbtk_init ( argv0 )
char *argv0; char *argv0;
@ -1339,20 +1350,13 @@ gdbtk_init ( argv0 )
if (Tcl_Init(interp) != TCL_OK) if (Tcl_Init(interp) != TCL_OK)
error ("Tcl_Init failed: %s", interp->result); error ("Tcl_Init failed: %s", interp->result);
if (Tk_Init(interp) != TCL_OK) make_final_cleanup (gdbtk_cleanup, NULL);
error ("Tk_Init failed: %s", interp->result);
if (Itcl_Init(interp) == TCL_ERROR)
error ("Itcl_Init failed: %s", interp->result);
if (Tix_Init(interp) != TCL_OK)
error ("Tix_Init failed: %s", interp->result);
#ifdef IDE #ifdef IDE
/* Initialize the Paths variable. /* Initialize the Paths variable. */
if (ide_initialize_paths (interp, "gdb") != TCL_OK) if (ide_initialize_paths (interp, "gdb") != TCL_OK)
return (TCL_ERROR); error ("ide_initialize_paths failed: %s", interp->result);
*/
/* Find the directory where we expect to find idemanager. We ignore /* Find the directory where we expect to find idemanager. We ignore
errors since it doesn't really matter if this fails. */ errors since it doesn't really matter if this fails. */
libexecdir = Tcl_GetVar2 (interp, "Paths", "libexecdir", TCL_GLOBAL_ONLY); libexecdir = Tcl_GetVar2 (interp, "Paths", "libexecdir", TCL_GLOBAL_ONLY);
@ -1365,6 +1369,8 @@ gdbtk_init ( argv0 )
Tcl_AppendResult (interp, "can't initialize event system: ", errmsg, Tcl_AppendResult (interp, "can't initialize event system: ", errmsg,
(char *) NULL); (char *) NULL);
fprintf(stderr, "WARNING: ide_event_init_client failed: %s\n", interp->result); fprintf(stderr, "WARNING: ide_event_init_client failed: %s\n", interp->result);
Tcl_SetVar (interp, "GDBTK_IDE", "0", 0);
} }
else else
{ {
@ -1376,16 +1382,37 @@ gdbtk_init ( argv0 )
if (ide_create_property_command (interp, h) != TCL_OK) if (ide_create_property_command (interp, h) != TCL_OK)
error ("ide_create_property_command failed: %s", interp->result); error ("ide_create_property_command failed: %s", interp->result);
if (ide_create_window_register_command (interp, h) != TCL_OK)
error ("ide_create_window_register_command failed: %s",
interp->result);
if (ide_create_window_command (interp, h) != TCL_OK)
error ("ide_create_window_command failed: %s", interp->result);
/* /*
if (ide_initialize (interp, "gdb") != TCL_OK) if (ide_initialize (interp, "gdb") != TCL_OK)
error ("ide_initialize failed: %s", interp->result); error ("ide_initialize failed: %s", interp->result);
*/ */
Tcl_SetVar (interp, "GDBTK_IDE", "1", 0);
} }
Tcl_SetVar (interp, "GDBTK_IDE", "1", 0);
#else #else
Tcl_SetVar (interp, "GDBTK_IDE", "0", 0); Tcl_SetVar (interp, "GDBTK_IDE", "0", 0);
#endif /* IDE */ #endif /* IDE */
/* We don't want to open the X connection until we've done all the
IDE initialization. Otherwise, goofy looking unfinished windows
pop up when ILU drops into the TCL event loop. */
if (Tk_Init(interp) != TCL_OK)
error ("Tk_Init failed: %s", interp->result);
if (Itcl_Init(interp) == TCL_ERROR)
error ("Itcl_Init failed: %s", interp->result);
if (Tix_Init(interp) != TCL_OK)
error ("Tix_Init failed: %s", interp->result);
Tcl_CreateCommand (interp, "gdb_cmd", call_wrapper, gdb_cmd, NULL); Tcl_CreateCommand (interp, "gdb_cmd", call_wrapper, gdb_cmd, NULL);
Tcl_CreateCommand (interp, "gdb_loc", call_wrapper, gdb_loc, NULL); Tcl_CreateCommand (interp, "gdb_loc", call_wrapper, gdb_loc, NULL);
Tcl_CreateCommand (interp, "gdb_path_conv", call_wrapper, gdb_path_conv, NULL); Tcl_CreateCommand (interp, "gdb_path_conv", call_wrapper, gdb_path_conv, NULL);