minor changes

1 files changed, 123 insertions, 18 deletions

diff --git a/mixgtk/mixgtk_cmd_dispatcher.c b/mixgtk/mixgtk_cmd_dispatcher.c
index d14c5ee..71b5877 100644
--- a/mixgtk/mixgtk_cmd_dispatcher.c
+++ b/mixgtk/mixgtk_cmd_dispatcher.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk_cmd_dispatcher.c :
  * Implementation of the functions declared in mixgtk_cmd_dispatcher.h
  * ------------------------------------------------------------------
- *  Last change: Time-stamp: "01/03/10 00:49:04 jose"
+ *  Last change: Time-stamp: "01/03/12 02:05:43 jose"
  * ------------------------------------------------------------------
  * Copyright (C) 2001 Free Software Foundation, Inc.
  *  
@@ -23,6 +23,7 @@
 
 #define _GNU_SOURCE 1
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <mixlib/mix_vm_command.h>
 #include "mixgtk_cmd_dispatcher.h"
@@ -39,10 +40,24 @@ struct mixgtk_dispatch_
   size_t out_buffer_size;
   GtkWidget *prompt;
   GtkWidget *log;
+  GCompletion *completions;
 };
 
 static struct mixgtk_dispatch_ dis_data_ = {NULL};
 
+/* completions */
+static void
+init_completions_ (void)
+{
+  GList *cmds = NULL;
+  gint k;
+  
+  dis_data_.completions = g_completion_new (NULL);
+  for (k = 0; k < MIX_CMD_INVALID; ++k)
+    cmds = g_list_append (cmds, (gpointer) mix_vm_command_to_string (k));
+  g_completion_add_items (dis_data_.completions, cmds);
+}
+
 /* global hooks for the command dispatcher */
 static void
 global_pre_hook_ (mix_vm_cmd_dispatcher_t *dis,
@@ -104,6 +119,61 @@ next_post_hook_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg,
   mixgtk_mixal_update ();
 }
 
+static void
+linebp_post_hook_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg,
+		gpointer data)
+{
+  if (arg && strlen (arg)) mixgtk_mixal_update_bp_at_line (atoi (arg));
+}
+
+static void
+addrbp_post_hook_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg,
+		gpointer data)
+{
+  if (arg && strlen (arg)) mixgtk_mixal_update_bp_at_address (atoi (arg));
+}
+
+static void
+allbp_post_hook_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg,
+		  gpointer data)
+{
+  mixgtk_mixal_update_bp_all ();
+}
+
+
+static void
+install_hooks_ (void)
+{
+  mix_vm_cmd_dispatcher_global_pre_hook (dis_data_.dispatcher,
+					 global_pre_hook_, NULL);
+  mix_vm_cmd_dispatcher_global_post_hook (dis_data_.dispatcher,
+					  global_post_hook_, NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_LOAD, load_post_hook_,
+				   NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_RUN, run_post_hook_,
+				   NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_NEXT, next_post_hook_,
+				   NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_SBP, linebp_post_hook_,
+				   NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_CBP, linebp_post_hook_,
+				   NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_SBPA, addrbp_post_hook_,
+				   NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_CBPA, addrbp_post_hook_,
+				   NULL);
+  mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
+				   MIX_CMD_CABP, allbp_post_hook_,
+				   NULL);
+}
+
 
 /* initialise the command dispatcher */
 gboolean
@@ -125,20 +195,11 @@ mixgtk_cmd_dispatcher_init (void)
       dis_data_.out = out;
       dis_data_.dispatcher = mix_vm_cmd_dispatcher_new (out, out);
       mix_vm_cmd_dispatcher_print_time (dis_data_.dispatcher, FALSE);
-      mix_vm_cmd_dispatcher_global_pre_hook (dis_data_.dispatcher,
-					     global_pre_hook_, NULL);
-      mix_vm_cmd_dispatcher_global_post_hook (dis_data_.dispatcher,
-					      global_post_hook_, NULL);
-      mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
-				       MIX_CMD_LOAD, load_post_hook_,
-				       NULL);
-      mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
-				       MIX_CMD_RUN, run_post_hook_,
-				       NULL);
-      mix_vm_cmd_dispatcher_post_hook (dis_data_.dispatcher,
-				       MIX_CMD_NEXT, next_post_hook_,
-				       NULL);
+      install_hooks_ ();
     }
+  
+  if (!dis_data_.completions) init_completions_ ();
+  
   return TRUE;
 }
 
@@ -146,7 +207,7 @@ mixgtk_cmd_dispatcher_init (void)
 void
 mixgtk_cmd_dispatcher_dispatch (const gchar *command)
 {
-  GtkWidget *entry = mixgtk_widget_factory_get (MIXGTK_WIDGET_PROMPT);
+  GtkWidget *entry = dis_data_.prompt;
   g_return_if_fail (command != NULL);
   g_assert (entry != NULL);
   gtk_entry_set_text (GTK_ENTRY (entry), command);
@@ -177,9 +238,53 @@ void
 on_mixvm_cmd_entry_activate (GtkWidget *w, gpointer e)
 {
   gchar *text;
+  GList *cmds = NULL;
+  gchar *prefix = NULL;
+  
   text = gtk_entry_get_text (GTK_ENTRY (w));
-  mix_vm_cmd_dispatcher_dispatch_text (dis_data_.dispatcher, text);
-  gtk_entry_set_text (GTK_ENTRY (w), "");
-}
 
+  if (mix_vm_command_from_string (g_strchomp (text)) != MIX_CMD_INVALID)
+    {
+      mix_vm_cmd_dispatcher_dispatch_text (dis_data_.dispatcher, text);
+      gtk_entry_set_text (GTK_ENTRY (w), "");
+      return;
+    }
+  
+  cmds = g_completion_complete (dis_data_.completions, text, &prefix);
 
+  if (prefix != NULL)
+    {
+      gtk_entry_set_text (GTK_ENTRY (w), prefix);
+      g_free (prefix);
+      if (g_list_length (cmds) > 1)
+	{
+	  gint k = 0;
+	  gtk_text_insert (GTK_TEXT (dis_data_.log),
+			   NULL, NULL, NULL, "Completions:\n", -1);
+	  while (cmds)
+	    {
+	      ++k;
+	      gtk_text_insert (GTK_TEXT (dis_data_.log),
+			       NULL, NULL, NULL,
+			       (gchar *)(cmds->data), -1);
+	      gtk_text_insert (GTK_TEXT (dis_data_.log),
+			       NULL, NULL, NULL, "     ", -1);
+	      if (k%5 == 0)
+		gtk_text_insert (GTK_TEXT (dis_data_.log),
+				 NULL, NULL, NULL, "\n", -1);
+	      
+	      cmds = cmds->next;
+	    }
+	  if (k%5 != 0)
+	    gtk_text_insert (GTK_TEXT (dis_data_.log),
+			     NULL, NULL, NULL, "\n", -1);
+	}
+      else
+	gtk_entry_append_text (GTK_ENTRY (w), " ");
+    }
+  else
+    {
+      mix_vm_cmd_dispatcher_dispatch_text (dis_data_.dispatcher, text);
+      gtk_entry_set_text (GTK_ENTRY (w), "");
+    }
+}