From: erg Date: Wed, 19 Mar 2008 21:43:59 +0000 (+0000) Subject: Clean up smyrna files: X-Git-Tag: LAST_LIBGRAPH~32^2~4464 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5703fedb299e3fba61c8ef47c65fd5d0b169c31;p=graphviz Clean up smyrna files: remove unnecessary globals modify libraries not to rely on code in cmd/smyrna remove static declarations from .h files remove unnecessary libraries mark unused code and clean up warnings --- diff --git a/cmd/smyrna/gui/callbacks.c b/cmd/smyrna/gui/callbacks.c index a1d64bedc..be1e88f07 100755 --- a/cmd/smyrna/gui/callbacks.c +++ b/cmd/smyrna/gui/callbacks.c @@ -14,7 +14,7 @@ * AT&T Research, Florham Park NJ * **********************************************************/ -#define _CRT_SECURE_NO_DEPRECATE 1 +#define _CRT_SECURE_NO_DEPRECATE 1 #ifdef HAVE_CONFIG_H # include #endif @@ -31,165 +31,141 @@ -void -new_graph_clicked (GtkWidget *widget, - gpointer user_data) +void new_graph_clicked(GtkWidget * widget, gpointer user_data) { - g_print ("new graph button fired\n"); + g_print("new graph button fired\n"); } -void -open_graph_clicked (GtkWidget *widget, - gpointer user_data) - +void open_graph_clicked(GtkWidget * widget, gpointer user_data) { } -void -save_graph_clicked (GtkWidget *widget, - gpointer user_data) +void save_graph_clicked(GtkWidget * widget, gpointer user_data) { - if(view->activeGraph > -1) - save_graph(view->g[view->activeGraph],NULL); + if (view->activeGraph > -1) + save_graph(view->g[view->activeGraph], NULL); } -void -save_as_graph_clicked (GtkWidget *widget, - gpointer user_data) - +void save_as_graph_clicked(GtkWidget * widget, gpointer user_data) { - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new ("Save File", - NULL, - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - char *filename; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - save_graph(view->g[view->activeGraph],filename); - g_free (filename); - } - gtk_widget_destroy (dialog); + GtkWidget *dialog; + dialog = gtk_file_chooser_dialog_new("Save File", + NULL, + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, + GTK_RESPONSE_ACCEPT, NULL); + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER + (dialog), TRUE); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + char *filename; + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + save_graph(view->g[view->activeGraph], filename); + g_free(filename); + } + gtk_widget_destroy(dialog); } -void -remove_graph_clicked (GtkWidget *widget, - gpointer user_data) - { - g_print ("remove graph button fired\n"); +void remove_graph_clicked(GtkWidget * widget, gpointer user_data) +{ + g_print("remove graph button fired\n"); } -void -btn_dot_clicked (GtkWidget *widget, - gpointer user_data) - +void btn_dot_clicked(GtkWidget * widget, gpointer user_data) { - GdkCursor* cursor; - GdkWindow* w; - Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); + GdkCursor *cursor; + GdkWindow *w; + Dlg = (GtkMessageDialog *) gtk_message_dialog_new(NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); - respond=gtk_dialog_run ((GtkDialog*)Dlg); - if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph],0,0); - gtk_object_destroy ((GtkObject*)Dlg); + respond = gtk_dialog_run((GtkDialog *) Dlg); + if (respond == GTK_RESPONSE_YES) + do_graph_layout(view->g[view->activeGraph], 0, 0); + gtk_object_destroy((GtkObject *) Dlg); - cursor = gdk_cursor_new(GDK_HAND2); - w=(GdkWindow*)glade_xml_get_widget(xml, "frmMain"); -// gdk_window_set_cursor(w, cursor); - gdk_window_set_cursor ((GTK_WIDGET(view->drawing_area)->window), cursor); -// gdk_window_set_title((GTK_WIDGET(widget)->window),"adasdasdasdassada"); - gdk_cursor_destroy(cursor); + cursor = gdk_cursor_new(GDK_HAND2); + w = (GdkWindow *) glade_xml_get_widget(xml, "frmMain"); +// gdk_window_set_cursor(w, cursor); + gdk_window_set_cursor((GTK_WIDGET(view->drawing_area)->window), + cursor); +// gdk_window_set_title((GTK_WIDGET(widget)->window),"adasdasdasdassada"); + gdk_cursor_destroy(cursor); } -void -btn_neato_clicked (GtkWidget *widget, - gpointer user_data) - +void btn_neato_clicked(GtkWidget * widget, gpointer user_data) { - Dlg = (GtkMessageDialog*) gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); - - respond=gtk_dialog_run ((GtkDialog*)Dlg); - if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph],1,0); - gtk_object_destroy ((GtkObject*)Dlg); - gtk_button_set_image(GTK_BUTTON(glade_xml_get_widget(xml, "btn_neato")), gtk_image_new_from_file("c:\fonts.png")); + Dlg = (GtkMessageDialog *) gtk_message_dialog_new(NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); + + respond = gtk_dialog_run((GtkDialog *) Dlg); + if (respond == GTK_RESPONSE_YES) + do_graph_layout(view->g[view->activeGraph], 1, 0); + gtk_object_destroy((GtkObject *) Dlg); + gtk_button_set_image(GTK_BUTTON + (glade_xml_get_widget(xml, "btn_neato")), + gtk_image_new_from_file("c:\fonts.png")); } -void -btn_twopi_clicked (GtkWidget *widget, - gpointer user_data) - +void btn_twopi_clicked(GtkWidget * widget, gpointer user_data) { - Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); + Dlg = (GtkMessageDialog *) gtk_message_dialog_new(NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); - respond=gtk_dialog_run ((GtkDialog*)Dlg); - if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph],2,0); - gtk_object_destroy ((GtkObject*)Dlg); + respond = gtk_dialog_run((GtkDialog *) Dlg); + if (respond == GTK_RESPONSE_YES) + do_graph_layout(view->g[view->activeGraph], 2, 0); + gtk_object_destroy((GtkObject *) Dlg); } -void -btn_circo_clicked (GtkWidget *widget, - gpointer user_data) - +void btn_circo_clicked(GtkWidget * widget, gpointer user_data) { - Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); - - respond=gtk_dialog_run ((GtkDialog*)Dlg); - if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph],3,0); - gtk_object_destroy ((GtkObject*)Dlg); + Dlg = (GtkMessageDialog *) gtk_message_dialog_new(NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); + + respond = gtk_dialog_run((GtkDialog *) Dlg); + if (respond == GTK_RESPONSE_YES) + do_graph_layout(view->g[view->activeGraph], 3, 0); + gtk_object_destroy((GtkObject *) Dlg); } -void -btn_fdp_clicked (GtkWidget *widget, - gpointer user_data) - +void btn_fdp_clicked(GtkWidget * widget, gpointer user_data) { - int ind=0; - - Dlg = (GtkMessageDialog*)gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); - respond=gtk_dialog_run ((GtkDialog*)Dlg); - if (respond == GTK_RESPONSE_YES) - do_graph_layout(view->g[view->activeGraph],4,0); - gtk_object_destroy ((GtkObject*)Dlg); + Dlg = (GtkMessageDialog *) gtk_message_dialog_new(NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "This will change the graph layout\n all your position changes will be lost\n Are you sure?"); + + respond = gtk_dialog_run((GtkDialog *) Dlg); + if (respond == GTK_RESPONSE_YES) + do_graph_layout(view->g[view->activeGraph], 4, 0); + gtk_object_destroy((GtkObject *) Dlg); } @@ -201,56 +177,48 @@ btn_fdp_clicked (GtkWidget *widget, //test call back function delete later -static void callback( GtkWidget *widget, - gpointer data ) +#ifdef UNUSED +static void callback(GtkWidget * widget, gpointer data) { - g_print ("Hello again - %s was pressed\n", (char *) data); + g_print("Hello again - %s was pressed\n", (char *) data); } +#endif -void -on_newNode (GtkWidget *button, - gpointer user_data) +void on_newNode(GtkWidget * button, gpointer user_data) { - int* a; - int* b; - a=(int*) malloc (sizeof(int)); - b=(int*) malloc (sizeof(int)); + int *a; + int *b; + a = (int *) malloc(sizeof(int)); + b = (int *) malloc(sizeof(int)); } -void dlgOpenGraph_OK_Clicked( GtkWidget *button, - gpointer data ) +void dlgOpenGraph_OK_Clicked(GtkWidget * button, gpointer data) { - g_print ("ok is pressed - %i was pressed\n",*(int*)data); - + g_print("ok is pressed - %i was pressed\n", *(int *) data); + } -void graph_select_change (GtkWidget *widget, - gpointer user_data) +void graph_select_change(GtkWidget * widget, gpointer user_data) { - gint active_graph; + gint active_graph; - if(!view->SignalBlock) - { - active_graph=gtk_combo_box_get_active((GtkComboBox*)widget); + if (!view->SignalBlock) { + active_graph = gtk_combo_box_get_active((GtkComboBox *) widget); - if (active_graph > -1) - { - view->activeGraph=active_graph; - refreshControls(view); - } + if (active_graph > -1) { + view->activeGraph = active_graph; + refreshControls(view); } + } } //dlgOpenGraph btnOK clicked -void on_dlgOpenGraph_btnOK_clicked (GtkWidget *widget, - - gpointer user_data) - +void on_dlgOpenGraph_btnOK_clicked(GtkWidget * widget, gpointer user_data) { /* GTK_RESPONSE_OK = -5, @@ -260,15 +228,20 @@ void on_dlgOpenGraph_btnOK_clicked (GtkWidget *widget GTK_RESPONSE_NO = -9, GTK_RESPONSE_APPLY = -10, GTK_RESPONSE_HELP = -11 */ - - if(update_graph_properties(view->g[view->activeGraph])) - gtk_dialog_response((GtkDialog*)glade_xml_get_widget(xml, "dlgOpenGraph"),GTK_RESPONSE_OK); + + if (update_graph_properties(view->g[view->activeGraph])) + gtk_dialog_response((GtkDialog *) + glade_xml_get_widget(xml, "dlgOpenGraph"), + GTK_RESPONSE_OK); } + //dlgOpenGraph btncancelclicked -void on_dlgOpenGraph_btncancel_clicked (GtkWidget *widget, - gpointer user_data) +void on_dlgOpenGraph_btncancel_clicked(GtkWidget * widget, + gpointer user_data) { - gtk_dialog_response((GtkDialog*)glade_xml_get_widget(xml, "dlgOpenGraph"),GTK_RESPONSE_CANCEL); + gtk_dialog_response((GtkDialog *) + glade_xml_get_widget(xml, "dlgOpenGraph"), + GTK_RESPONSE_CANCEL); } @@ -278,42 +251,38 @@ void on_dlgOpenGraph_btncancel_clicked (GtkWidget *wi -void attr_widgets_modifiedSlot(GtkWidget *widget,gpointer user_data) +void attr_widgets_modifiedSlot(GtkWidget * widget, gpointer user_data) { - attr_widgets_modified[(int)user_data]=1; - g_print("attr changed signal..incoming data : %i\n",(int)user_data); + attr_widgets_modified[(int) user_data] = 1; + g_print("attr changed signal..incoming data : %i\n", (int) user_data); } -void frmObject_set_scroll (GtkWidget *widget,gpointer user_data) +void frmObject_set_scroll(GtkWidget * widget, gpointer user_data) { - g_print("scroll resize required\n"); + g_print("scroll resize required\n"); } -void frmObjectBtnOK_clicked (GtkWidget *widget,gpointer user_data) +void frmObjectBtnOK_clicked(GtkWidget * widget, gpointer user_data) { - //call function to update object values - update_object_properties(frmObjectTypeIndex,frmObjectg); - if(((custom_graph_data*)AGDATA(view->g[view->activeGraph]))->TopView == 0) - do_graph_layout(view->g[view->activeGraph],0,1); - else - { - set_update_required(view->Topview); - deselect_all(view->g[view->activeGraph]); - } - - gtk_widget_hide(glade_xml_get_widget(xml, "frmObject")); + //call function to update object values + update_object_properties(frmObjectTypeIndex, frmObjectg); + if (((custom_graph_data *) AGDATA(view->g[view->activeGraph]))-> + TopView == 0) + do_graph_layout(view->g[view->activeGraph], 0, 1); + else { + set_update_required(view->Topview); + deselect_all(view->g[view->activeGraph]); + } + + gtk_widget_hide(glade_xml_get_widget(xml, "frmObject")); } -void frmObjectBtnCancel_clicked (GtkWidget *widget,gpointer user_data) + +void frmObjectBtnCancel_clicked(GtkWidget * widget, gpointer user_data) { - gtk_widget_hide(glade_xml_get_widget(xml, "frmObject")); + gtk_widget_hide(glade_xml_get_widget(xml, "frmObject")); } - - - - -