Ticket #39: osso-xterm-enter-passwd.en3.diff

osso-xterm-0.13.mh24bora1/debian/changelog

@@ +1 @@
+osso-xterm (0.13.mh24bora1en3) unstable; urgency=low
+
+  * Add "Terminal->Enter Password..." which opens a dialog box 
+    for non-visible entry of a password that won't be remembered.
+ 
+ -- Erik Nygren <nygren@mit.edu>  Sat, 30 Jun 2007 13:54:00 -0500
+
-osso-xterm (0.13.mh24bora1) unstable; urgency=low
-
-  * Build for bora.

osso-xterm-0.13.mh24bora1/src/terminal-app.c

@@ -46 +46 @@
-#include <hildon-widgets/hildon-program.h>
-#include <hildon-widgets/hildon-defines.h>
-#include <hildon-widgets/hildon-banner.h>
+#include <hildon-widgets/hildon-get-password-dialog.h>
+#include <hildon-widgets/hildon-input-mode-hint.h>
-#elif HILDON == 1
-#include <hildon/hildon-window.h>
-#include <hildon/hildon-program.h>
-#include <hildon/hildon-defines.h>
-#include <hildon/hildon-banner.h>
+#include <hildon/hildon-get-password-dialog.h>
+#include <hildon/hildon-input-mode-hint.h>
-#endif
-#include <gconf/gconf-client.h>
-#include <gdk/gdkkeysyms.h>
@@ -59 +63 @@
-#include "terminal-settings.h"
-#include "terminal-tab-header.h"
-#include "terminal-app.h"
+#include "terminal-widget.h"
-#include "shortcuts.h"
-
-
@@ -118 +123 @@
-                                                             TerminalApp     *app);
-static void            terminal_app_action_ctrl             (GtkAction       *action,
-                                                             TerminalApp     *app);
+static void            terminal_app_action_enter_passwd     (GtkAction       *action,
+                                                             TerminalApp     *app);
-static void            terminal_app_action_settings         (GtkAction       *action,
-                                                             TerminalApp     *app);
-static void            terminal_app_action_quit             (GtkAction       *action,
@@ -155 +162 @@
-  { "reset", NULL, N_ ("Reset"), NULL, NULL, G_CALLBACK (terminal_app_action_reset), },
-  { "reset-and-clear", NULL, N_ ("Reset and Clear"), NULL, NULL, G_CALLBACK (terminal_app_action_reset_and_clear), },
-  { "ctrl", NULL, N_ ("Send Ctrl-<some key>"), NULL, NULL, G_CALLBACK (terminal_app_action_ctrl), },
+  { "enter-passwd", NULL, N_ ("Enter Password..."), NULL, NULL, G_CALLBACK (terminal_app_action_enter_passwd), },
-  { "settings", NULL, N_ ("Settings..."), NULL, NULL, G_CALLBACK (terminal_app_action_settings), },
-  { "quit", NULL, N_ ("Quit"), NULL, NULL, G_CALLBACK (terminal_app_action_quit), },
-};
@@ -198 +206 @@
- "    <menuitem action='fullscreen'/>"
- "    <separator/>"
- "    <menuitem action='ctrl'/>"
+ "    <menuitem action='enter-passwd'/>"
- "    <separator/>"
- "    <menu action='font-menu'>"
- "      <menuitem action='-8pt'/>"
@@ -307 +316 @@
-  attach_item(parent, actiongroup, accelgroup, "reset");
-  attach_item(parent, actiongroup, accelgroup, "reset-and-clear");
-  attach_item(parent, actiongroup, accelgroup, "ctrl");
+  attach_item(parent, actiongroup, accelgroup, "enter-passwd");
-
-  attach_item(menubar, actiongroup, accelgroup, "settings");
-
@@ -1114 +1124 @@
-
-
-static void
+terminal_app_action_enter_passwd (GtkAction    *action,
+                          TerminalApp  *app)
+{
+  GtkWidget *dialog, *label;
+  GtkEntry *pwd_entry;
+
+  dialog = gtk_dialog_new_with_buttons("Enter Password",
+                                       GTK_WINDOW(app),
+                                       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                       GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                                       GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                       NULL);
+
+  gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+
+  label = gtk_label_new("Enter password/text to send...");
+  gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), label);
+
+  pwd_entry = GTK_ENTRY (gtk_entry_new ());
+  gtk_entry_set_visibility (pwd_entry, FALSE);
+  gtk_entry_set_activates_default (pwd_entry, TRUE);
+  g_object_set(G_OBJECT(pwd_entry), HILDON_AUTOCAP, FALSE, NULL);
+  
+  gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(pwd_entry));
+
+  gtk_widget_show_all(dialog);
+
+  /* It would be nice to activate the text box to keep the input area up,
+     but I'm not quite sure how to do that? Neither of these quite work:
+
+    gtk_widget_grab_focus(GTK_WIDGET(pwd_entry));
+    gtk_widget_activate(GTK_WIDGET(pwd_entry));
+  */
+
+  if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+    gchar *pwd = (gchar*)gtk_entry_get_text (pwd_entry);    
+    TerminalWidget *tw = terminal_app_get_active(app);
+    int i;
+
+    if (tw) {
+      for (i=0; pwd[i]; i++) {
+        terminal_widget_send_key(tw, pwd[i], 0);
+        pwd[i] = 0;
+      }
+      terminal_widget_send_key(tw, GDK_KP_Enter, 0);
+    }
+  } 
+
+  gtk_widget_hide(dialog);
+  gtk_widget_destroy(dialog);
+
+}
+
+
+static void
-terminal_app_action_settings (GtkAction    *action,
-                              TerminalApp  *app)
-{

osso-xterm-0.13.mh24bora1/src/terminal-widget.c

@@ -1739 +1739 @@
-  }
-}
-
-static 
+
-terminal_widget_send_key(TerminalWidget *widget,
-                         guint keyval,
-                         guint state)

osso-xterm-0.13.mh24bora1/src/terminal-widget.h

@@ -124 +124 @@
-                                                       gint            y,
-                                                       gint           *tag);
-
+void
+terminal_widget_send_key(TerminalWidget *widget,
+                         guint keyval,
+                         guint state);
+
+
-G_END_DECLS;
-
-#endif /* !__TERMINAL_WIDGET_H__ */