r959 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
tony_guan at sita.openmoko.org
tony_guan at sita.openmoko.org
Mon Feb 12 02:30:09 CET 2007
Author: tony_guan
Date: 2007-02-12 02:29:50 +0100 (Mon, 12 Feb 2007)
New Revision: 959
Added:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h
Removed:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.h
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
Log:
missing file window-pin.* added, pin.* removed.
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2007-02-12 01:29:50 UTC (rev 959)
@@ -20,6 +20,7 @@
openmoko-dialer-window-outgoing.c\
openmoko-dialer-window-incoming.c\
openmoko-dialer-window-talking.c\
+openmoko-dialer-window-pin.c\
moko-dialer-status.c\
alsa.c
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -642,9 +642,9 @@
if(photo)
if (photo)
- gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
- photo->data.inlined.length, NULL);
- //gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL); //just temporaly modified.
+ // gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
+ // photo->data.inlined.length, NULL);
+ gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL); //just temporaly modified.
gdk_pixbuf_loader_close (loader, NULL);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -299,7 +299,7 @@
/* FIXME: read pin from STDIN and send it back via lgsm_pin */
- gsm_pin_require();
+ gsm_pin_require(lh);
return 0;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -49,12 +49,13 @@
{
return p_dialer_data;
}
-void gsm_pin_require()
+void gsm_pin_require(struct lgsm_handle *lh)
{
MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
if(appdata)
{
+appdata->lh=lh;
gtk_widget_show(appdata->window_pin);
}
else
@@ -283,13 +284,11 @@
//init the dialer window
window_dialer_init(p_dialer_data);
window_incoming_init(p_dialer_data);
-#warning FIXME for tony: window_pin_init unknown reference
-#if 0
window_pin_init(p_dialer_data);
-#endif
+ window_outgoing_init(p_dialer_data);
+ window_history_init(p_dialer_data);
+
DBG_WARN("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
-// window_outgoing_init(p_dialer_data);
-// window_history_init(p_dialer_data);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-02-12 01:29:50 UTC (rev 959)
@@ -33,6 +33,7 @@
typedef struct _dialer_data
{
//the global data area begins here
+ struct lgsm_handle *lh;
GMainLoop *mainloop;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -56,8 +56,8 @@
moko_dialer_textview_delete (appdata->moko_dialer_text_view);
//refresh the autolist,but do not automaticall fill the textview
gchar *codesinput;
- codesinput = moko_dialer_textview_get_input (appdata->moko_dialer_text_view, FALSE);
-
+ codesinput =g_strdup(moko_dialer_textview_get_input (appdata->moko_dialer_text_view, FALSE));
+ DBG_MESSAGE("input %s",codesinput);
if (g_utf8_strlen (codesinput, -1) >= MOKO_DIALER_MIN_SENSATIVE_LEN)
{
moko_dialer_autolist_refresh_by_string (appdata->moko_dialer_autolist,
@@ -88,8 +88,8 @@
{
gchar *codesinput;
//get the input digits
- codesinput = moko_dialer_textview_get_input (appdata->moko_dialer_text_view,
- FALSE);
+ codesinput =g_strdup(moko_dialer_textview_get_input (appdata->moko_dialer_text_view,
+ FALSE));
if (g_utf8_strlen (codesinput, -1) < 1)
{
if (g_utf8_strlen (appdata->g_state.lastnumber, -1) > 0)
@@ -111,8 +111,8 @@
moko_dialer_autolist_set_select (appdata->moko_dialer_autolist, -1);
moko_dialer_autolist_hide_all_tips (appdata->moko_dialer_autolist);
-//got the number;
- codesinput = g_strdup (appdata->g_peer_info.number);
+//got the number;//FIXME:which function should I use if not g_strdup. & strcpy.
+ strcpy(appdata->g_peer_info.number, codesinput );
//retrieve the contact information if any.
contact_get_peer_info_from_number (appdata->g_contactlist.contacts,
@@ -233,7 +233,7 @@
char input[2];
input[0] = parac;
input[1] = 0;
- gchar *codesinput;
+ gchar *codesinput=NULL;
//DBG_TRACE();
MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
@@ -244,7 +244,7 @@
//DBG_TRACE();
- codesinput = moko_dialer_textview_get_input (moko_dialer_text_view, FALSE);
+ codesinput = g_strdup(moko_dialer_textview_get_input (moko_dialer_text_view, FALSE));
//DBG_TRACE();
//DBG_MESSAGE("LEN=%d,MAX=%d",strlen(codesinput),MOKO_DIALER_MAX_NUMBER_LEN);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -950,7 +950,7 @@
if (appdata->treeview_history == 0)
{
- DBG_WARN ("not ready");
+ DBG_WARN ("treeview_history not ready");
return 0;
}
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -0,0 +1,204 @@
+/* openmoko-dialer-window-dialer.c
+ *
+ * Authored by Tony Guan<tonyguan at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 FIC Shanghai Lab
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
+ */
+
+#include <libmokoui/moko-finger-window.h>
+#include <libmokoui/moko-pixmap-button.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuitem.h>
+#include <gtk/gtkvbox.h>
+#include "openmoko-dialer-main.h"
+
+void
+pin_delete_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+{
+moko_dialer_textview_delete (appdata->moko_pin_text_view);
+}
+
+
+void
+pin_ok_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+{
+ gchar *codesinput;
+ codesinput =g_strdup(moko_dialer_textview_get_input (appdata->moko_pin_text_view, TRUE));
+
+ if (g_utf8_strlen (codesinput, -1) <1)
+ {
+ //user didn't input anything, maybe it's a redial
+ DBG_MESSAGE("no input for pin");
+ }
+ else
+ {//here send the pin codes and hide our window.
+
+ DBG_MESSAGE("here we send the pin:%s",codesinput);
+ lgsm_pin (appdata->lh, codesinput);
+ gtk_widget_hide(appdata->window_pin);
+ }
+
+}
+
+
+
+
+void
+on_pin_panel_user_input (GtkWidget * widget, gchar parac,
+ gpointer user_data)
+{
+ char input[2];
+ input[0] = parac;
+ input[1] = 0;
+
+//DBG_TRACE();
+ MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+ MokoDialerTextview *moko_pin_text_view = appdata->moko_pin_text_view;
+
+
+ moko_dialer_textview_insert (moko_pin_text_view, input);
+//DBG_TRACE();
+
+}
+
+void
+on_window_pin_hide (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+appdata->window_present=0;
+
+}
+
+void
+on_window_pin_show (GtkWidget *widget,
+ MOKO_DIALER_APP_DATA * appdata)
+{
+DBG_ENTER();
+appdata->window_present=widget;
+DBG_LEAVE();
+}
+
+
+
+
+gint
+window_pin_init (MOKO_DIALER_APP_DATA * p_dialer_data)
+{
+
+ if (!p_dialer_data->window_pin)
+ {
+
+ GdkColor color;
+ gdk_color_parse ("black", &color);
+
+ GtkVBox *vbox = NULL;
+
+
+ MokoFingerWindow *window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+ g_signal_connect ((gpointer) window, "show",
+ G_CALLBACK (on_window_pin_show),
+ p_dialer_data);
+ g_signal_connect ((gpointer) window, "hide",
+ G_CALLBACK (on_window_pin_hide),
+ p_dialer_data);
+
+
+ /* contents */
+ vbox = gtk_vbox_new (FALSE, 0);
+ GtkHBox *hbox = gtk_hbox_new (FALSE, 10);
+
+
+ GtkEventBox *eventbox1 = gtk_event_box_new ();
+ gtk_widget_show (eventbox1);
+
gtk_widget_set_name (GTK_WIDGET (eventbox1), "gtkeventbox-black");
+ gtk_widget_modify_bg (eventbox1, GTK_STATE_NORMAL, &color);
+// gtk_widget_set_size_request (eventbox1, 480, 132);
+
+ MokoDialerTextview *mokotextview = moko_dialer_textview_new ();
+ p_dialer_data->moko_pin_text_view = mokotextview;
+
+ gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE, FALSE,
+ 0);
+
+ MokoDialerPanel *mokodialerpanel = moko_dialer_panel_new ();
+
+ gtk_widget_set_size_request (mokodialerpanel, 380, 384);
+
+
+ g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
+ G_CALLBACK (on_pin_panel_user_input), p_dialer_data);
+
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (mokodialerpanel), TRUE,
+ TRUE, 5);
+
+
+
+//the buttons
+
+ GtkVBox *vbox2 = gtk_vbox_new (FALSE, 0);
+ GtkButton *button1 = moko_pixmap_button_new ();
+ g_signal_connect (G_OBJECT (button1), "clicked",
+ G_CALLBACK (pin_delete_button_clicked), p_dialer_data);
+ gtk_widget_set_name (GTK_WIDGET(button1), "mokofingerbutton-orange");
+ moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (button1), "gtk-delete");
+ moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button1), "Delete");
+// gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
+ // WINDOW_DIALER_BUTTON_SIZE_Y);
+
+ gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button1), FALSE, FALSE,
+ 5);
+
+ GtkButton *button2 = moko_pixmap_button_new ();
+
+ g_signal_connect (G_OBJECT (button2), "clicked",
+ G_CALLBACK (pin_ok_button_clicked), p_dialer_data);
+ gtk_widget_set_name (GTK_WIDGET (button1), "mokofingerbutton-orange");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON (button2),
+ file_new_image_from_relative_path
+ ("phone.png"));
+ moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button2), "OK");
+ //gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X,
+ // WINDOW_DIALER_BUTTON_SIZE_Y);
+
+ gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button2), FALSE, FALSE,
+ 20);
+
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (vbox2), TRUE, TRUE, 5);
+
+
+
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 5);
+
+
+
+
+ moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
+
+
+ p_dialer_data->window_pin= window;
+
+ gtk_widget_show_all (GTK_WIDGET (window));
+ gtk_widget_hide(GTK_WIDGET (window));
+
+
+ }
+
+ return 1;
+}
Added: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h 2007-02-12 01:29:50 UTC (rev 959)
@@ -0,0 +1,38 @@
+/* openmoko-dialer-window-dialer.h
+ *
+ * Authored By Tony Guan<tonyguan at fic-sh.com.cn>
+ *
+ * Copyright (C) 2006 FIC Shanghai Lab
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2.1 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
+ */
+#include "moko-dialer-includes.h"
+
+#ifndef _OPENMOKO_DIALER_WINDOW_DIALER_H
+#define _OPENMOKO_DIALER_WINDOW_DIALER_H
+
+#ifdef __cplusplus
+
+
+
+extern "C"
+{
+#endif
+
+
+ gint window_dialer_init (MOKO_DIALER_APP_DATA * p_dialer_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -387,14 +387,14 @@
button = MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label (tools));
image = file_new_image_from_relative_path ("speaker.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON(button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_speaker_clicked),
p_dialer_data);
button = MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label (tools));
image = file_new_image_from_relative_path ("dtmf.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON(button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_dtmf_talk_clicked),
p_dialer_data);
@@ -405,7 +405,7 @@
button = MOKO_PIXMAP_BUTTON (moko_finger_tool_box_add_button_without_label (tools));
image = file_new_image_from_relative_path ("tony.png");
- moko_pixmap_button_set_finger_toolbox_btn_center_image (button, image);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image (MOKO_PIXMAP_BUTTON(button), image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_tool_button_hangup_clicked),
p_dialer_data);
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c 2007-02-12 01:29:50 UTC (rev 959)
@@ -1,42 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include <libgsmd/libgsmd.h>
-#include <libgsmd/event.h>
-
-#define PIN_SIZE 32
-
-static char *pin;
-static char pinbuf[PIN_SIZE + 1];
-
-static int
-pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
-{
- int rc;
-
- printf ("EVENT: PIN request (type=%u) ", aux->u.pin.type);
-
- /* FIXME: read pin from STDIN and send it back via lgsm_pin */
- if (aux->u.pin.type == 1 && pin)
- {
- printf ("Auto-responding with pin `%s'\n", pin);
- lgsm_pin (lh, pin);
- }
- else
- {
-#warning FIXME for tony: gsm_pin_require is not found
-#if 0
- gsm_pin_require (pinbuf);
-#endif
- return lgsm_pin (lh, pinbuf);
- }
-
- return 0;
-}
-
-int
-pin_init (struct lgsm_handle *lh, char *pin_preset)
-{
- pin = pin_preset;
- return lgsm_evt_handler_register (lh, GSMD_EVT_PIN, &pin_handler);
-}
Deleted: trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.h 2007-02-12 00:19:50 UTC (rev 958)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.h 2007-02-12 01:29:50 UTC (rev 959)
@@ -1,2 +0,0 @@
-
-extern int pin_init (struct lgsm_handle *lh, const char *pin_preset);
More information about the commitlog
mailing list
