Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2658 - in trunk/src/target/OM-2007.2/daemons/neod: . src
([EMAIL PROTECTED])
2. r2659 - trunk/oe/packages/uboot ([EMAIL PROTECTED])
3. r2660 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r2661 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
5. r2662 - trunk/oe/packages/uboot ([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-08-07 13:28:01 +0200 (Tue, 07 Aug 2007)
New Revision: 2658
Modified:
trunk/src/target/OM-2007.2/daemons/neod/README
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h
Log:
neod: short press on AUX now gets back to today, long press on AUX opens dialer
Modified: trunk/src/target/OM-2007.2/daemons/neod/README
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/README 2007-08-06 21:21:46 UTC
(rev 2657)
+++ trunk/src/target/OM-2007.2/daemons/neod/README 2007-08-07 11:28:01 UTC
(rev 2658)
@@ -1,7 +1,8 @@
Minimal Button and powermanagement handling daemon
NOTE: Merely throwaway code, since it may be a better idea to base on
- * HAL / OHM, or
- * devmand, or
- * zaurusd ?
+ * freedesktop's HAL / OHM, or
+ * G[PE]2's machined, or
+ * Florian Boor's devmand, or
+ * Richard Purdie's zaurusd ?
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-06
21:21:46 UTC (rev 2657)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-08-07
11:28:01 UTC (rev 2658)
@@ -121,6 +121,44 @@
return retval;
}
+/* Retrieves the text property @atom from @window */
+static char* get_text_property( Window window, Atom atom )
+{
+ XTextProperty text;
+ char *ret, **list;
+ int result, count;
+
+ gdk_error_trap_push ();
+ result = XGetTextProperty (gdk_display,
+ window,
+ &text,
+ atom);
+ if (gdk_error_trap_pop () || result == 0)
+ return NULL;
+
+ count = gdk_text_property_to_utf8_list
+ (gdk_x11_xatom_to_atom (text.encoding),
+ text.format,
+ text.value,
+ text.nitems,
+ &list);
+ if (count > 0) {
+ int i;
+
+ ret = list[0];
+
+ for (i = 1; i < count; i++)
+ g_free (list[i]);
+ g_free (list);
+ } else
+ ret = NULL;
+
+ if (text.value)
+ XFree (text.value);
+
+ return ret;
+}
+
gboolean neod_buttonactions_install_watcher()
{
int auxfd = open( AUX_BUTTON_EVENT_PATH, O_RDONLY );
@@ -252,15 +290,33 @@
aux_timer = -1;
if ( timeout < 1 )
{
- // make dialer interface show up
- // NOTE: temporary hack, will use dbus interface once dialer has it :)
- system( "openmoko-dialer &" );
+ // show desktop
+ Screen *screen = GDK_SCREEN_XSCREEN(gdk_screen_get_default());
+ XEvent xev;
+
+ xev.xclient.type = ClientMessage;
+ xev.xclient.serial = 0;
+ xev.xclient.send_event = True;
+ xev.xclient.display = DisplayOfScreen(screen);
+ xev.xclient.window = RootWindowOfScreen(screen);
+ xev.xclient.message_type =
+ gdk_x11_get_xatom_by_name("_NET_SHOWING_DESKTOP");
+ xev.xclient.format = 32;
+ //TODO add support for toggle!?
+ xev.xclient.data.l[0] = TRUE;
+ xev.xclient.data.l[1] = 0;
+ xev.xclient.data.l[2] = 0;
+ xev.xclient.data.l[3] = 0;
+ xev.xclient.data.l[4] = 0;
+
+ XSendEvent(DisplayOfScreen(screen), RootWindowOfScreen(screen), False,
+ SubstructureRedirectMask | SubstructureNotifyMask, &xev);
}
else
{
- // make main menu show up
+ // make dialer interface show up
// NOTE: temporary hack, will use dbus interface once main menu has it
:)
- system( "openmoko-mainmenu &" );
+ system( "openmoko-dialer &" );
}
return FALSE;
}
@@ -331,12 +387,17 @@
if ( timeout < 1 )
{
Window xwindow = get_window_property(
gdk_x11_get_default_root_xwindow(),
gdk_x11_get_xatom_by_name("_NET_ACTIVE_WINDOW") );
- g_debug( "active Window = %d", (int) xwindow );
+ const char* title = get_text_property( xwindow,
gdk_x11_get_xatom_by_name("_NET_WM_NAME") );
+ g_debug( "active Window = %d ('%s')", (int) xwindow, title );
+ if ( strcmp( "Today", title ) == 0 )
+ {
+ g_debug( "sorry, i'm not going to close the today window" );
+ return;
+ }
+
Display* display = XOpenDisplay( NULL );
- //xwindow = gdk_x11_drawable_get_xid (window);
-
XEvent xev;
xev.xclient.type = ClientMessage;
xev.xclient.serial = 0;
@@ -352,11 +413,11 @@
xev.xclient.data.l[4] = 0;
//TODO: add timeout checking for response
-
+#if 1
XSendEvent (display, gdk_x11_get_default_root_xwindow (), False,
SubstructureRedirectMask | SubstructureNotifyMask, &xev);
XCloseDisplay( display );
-
+#endif
}
else
{
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h 2007-08-06
21:21:46 UTC (rev 2657)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h 2007-08-07
11:28:01 UTC (rev 2658)
@@ -5,7 +5,7 @@
*
* 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.
+ * 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
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-07 13:45:17 +0200 (Tue, 07 Aug 2007)
New Revision: 2659
Modified:
trunk/oe/packages/uboot/uboot-gta01_svn.bb
Log:
oe/uboot: pinpoint last known good revision until someone catches up with our
patches
Modified: trunk/oe/packages/uboot/uboot-gta01_svn.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-08-07 11:28:01 UTC (rev
2658)
+++ trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-08-07 11:45:17 UTC (rev
2659)
@@ -9,8 +9,7 @@
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
-SRC_URI = "\
- git://www.denx.de/git/u-boot.git/;protocol=git \
+SRC_URI =
"http://downloads.openmoko.org/sources/git_www.denx.de.git.u-boot.git._8993e54b6f397973794f3d6f47d3b3c0c98dd4f6.tar.gz
\
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
"
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-07 14:22:30 +0200 (Tue, 07 Aug 2007)
New Revision: 2660
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
Log:
2007-08-07 Neil J. Patel <[EMAIL PROTECTED]>
* src/dialer-main.c: (main):
* src/moko-dialer.c: (on_call_progress_changed),
(moko_dialer_init):
Make sure the dialer window hides on delete, instead of calling
gtk_main_quit ().
* src/moko-talking.c: (moko_talking_init):
Fix the loading of the incmong and outgoing call images, so there is
not a
gap between them during animation.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-07 12:22:30 UTC (rev 2660)
@@ -1,3 +1,15 @@
+2007-08-07 Neil J. Patel <[EMAIL PROTECTED]>
+
+ * src/dialer-main.c: (main):
+ * src/moko-dialer.c: (on_call_progress_changed),
+ (moko_dialer_init):
+ Make sure the dialer window hides on delete, instead of calling
+ gtk_main_quit ().
+
+ * src/moko-talking.c: (moko_talking_init):
+ Fix the loading of the incmong and outgoing call images, so there is
not a
+ gap between them during animation.
+
2007-08-06 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-notify.c: (on_bus_eos), (moko_notify_start_ringtone):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
2007-08-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
2007-08-07 12:22:30 UTC (rev 2660)
@@ -117,7 +117,7 @@
g_warning ("Failed to make a connection to the session bus: %s",
error->message);
g_error_free (error);
- return EXIT_FAILURE;
+ return 1;
}
proxy = dbus_g_proxy_new_for_name (connection,
DBUS_SERVICE_DBUS,
@@ -134,7 +134,7 @@
gdk_init(&argc, &argv);
gdk_notify_startup_complete ();
- return EXIT_FAILURE;
+ return 1;
}
if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
{
@@ -151,7 +151,7 @@
gdk_init(&argc, &argv);
gdk_notify_startup_complete ();
- return EXIT_SUCCESS;
+ return 0;
}
/* So we are creating a new dialer, one of the first things we sould do is
@@ -185,5 +185,5 @@
gtk_main ();
- return EXIT_SUCCESS;
+ return 0;
}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-07 12:22:30 UTC (rev 2660)
@@ -505,12 +505,12 @@
moko_journal_voice_info_set_was_missed (priv->entry, TRUE);
moko_journal_add_entry (priv->journal, priv->entry);
+ moko_journal_write_to_storage (priv->journal);
if (priv->time)
moko_time_free (priv->time);
priv->entry = NULL;
priv->time = NULL;
}
- moko_journal_write_to_storage (priv->journal);
moko_notify_stop (priv->notify);
g_print ("mokogsmd disconnect\n");
break;
@@ -721,7 +721,7 @@
/* Create the window */
priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (G_OBJECT (priv->window), "delete-event",
- (GCallback) gtk_main_quit, NULL);
+ (GCallback) gtk_widget_hide_on_delete, NULL);
gtk_window_set_title (GTK_WINDOW (priv->window), "Dialer");
/* Notebook */
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-08-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-08-07 12:22:30 UTC (rev 2660)
@@ -444,7 +444,7 @@
if (G_IS_OBJECT (priv->talking[i]))
g_object_ref (priv->talking[i]);
}
- for (i = 0; i < N_PICS; i++)
+ for (i = 0; i < N_PICS-1; i++)
{
gchar *name = g_strdup_printf ("%s/outgoing_%d.png", PKGDATADIR, i);
priv->outgoing[i] = gdk_pixbuf_new_from_file (name, NULL);
@@ -452,7 +452,7 @@
if (G_IS_OBJECT (priv->outgoing[i]))
g_object_ref (priv->outgoing[i]);
}
- for (i = 0; i < N_PICS; i++)
+ for (i = 0; i < N_PICS-1; i++)
{
gchar *name = g_strdup_printf ("%s/incoming_%d.png", PKGDATADIR, i);
priv->incoming[i] = gdk_pixbuf_new_from_file (name, NULL);
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-08-07 16:29:40 +0200 (Tue, 07 Aug 2007)
New Revision: 2661
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-notify.c
Log:
2007-08-07 Neil J. Patel <[EMAIL PROTECTED]>
* src/moko-dialer.c: (on_keypad_dial_clicked):
Make sure new entry's are written to the journal.
* src/moko-notify.c: (moko_notify_check_brightness),
(moko_notify_start):
Check the LCD brightness, if it is under 5000, set it to 5000.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-07 12:22:30 UTC (rev 2660)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-08-07 14:29:40 UTC (rev 2661)
@@ -1,5 +1,14 @@
2007-08-07 Neil J. Patel <[EMAIL PROTECTED]>
+ * src/moko-dialer.c: (on_keypad_dial_clicked):
+ Make sure new entry's are written to the journal.
+
+ * src/moko-notify.c: (moko_notify_check_brightness),
+ (moko_notify_start):
+ Check the LCD brightness, if it is under 5000, set it to 5000.
+
+2007-08-07 Neil J. Patel <[EMAIL PROTECTED]>
+
* src/dialer-main.c: (main):
* src/moko-dialer.c: (on_call_progress_changed),
(moko_dialer_init):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-07 12:22:30 UTC (rev 2660)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-08-07 14:29:40 UTC (rev 2661)
@@ -250,6 +250,7 @@
if (entry)
moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
moko_journal_add_entry (priv->journal, priv->entry);
+ moko_journal_write_to_storage (priv->journal);
moko_time_free (priv->time);
priv->entry = NULL;
priv->time = NULL;
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-notify.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-notify.c
2007-08-07 12:22:30 UTC (rev 2660)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-notify.c
2007-08-07 14:29:40 UTC (rev 2661)
@@ -57,7 +57,37 @@
static guint notify_signals[LAST_SIGNAL] = {0, };
*/
+static void
+moko_notify_check_brightness (void)
+{
+ gint fd;
+ gchar buf[50];
+ gint brightness, len;
+ fd = g_open (SYS_BRIGHTNESS"/brightness", O_WRONLY, 0);
+ if (fd == -1)
+ {
+ g_warning ("Unable to open brightness device");
+ return;
+ }
+ if (read (fd, buf, sizeof (buf)) == -1)
+ {
+ close (fd);
+ return;
+ }
+ brightness = atoi (buf);
+
+ if (brightness >= 5000)
+ {
+ close (fd);
+ return;
+ }
+
+ len = g_sprintf (buf, "%d", 5000);
+ write (fd, buf, len);
+ close (fd);
+}
+
static void
on_bus_eos (GstBus *bus, GstMessage *message, MokoNotify *notify)
{
@@ -213,6 +243,7 @@
return;
priv->started = TRUE;
+ moko_notify_check_brightness ();
moko_notify_start_vibrate ();
moko_notify_start_ringtone (notify);
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-08-07 22:14:48 +0200 (Tue, 07 Aug 2007)
New Revision: 2662
Modified:
trunk/oe/packages/uboot/uboot-gta01_svn.bb
Log:
uboot: try downloading file from buildhost instead of downloads.openmoko.org
(which seems to be unsynchronized)
Modified: trunk/oe/packages/uboot/uboot-gta01_svn.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-08-07 14:29:40 UTC (rev
2661)
+++ trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-08-07 20:14:48 UTC (rev
2662)
@@ -4,12 +4,12 @@
SECTION = "bootloader"
PRIORITY = "optional"
PV = "1.2.0+svn${SRCDATE}"
-PR = "r12"
+PR = "r13"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
-SRC_URI =
"http://downloads.openmoko.org/sources/git_www.denx.de.git.u-boot.git._8993e54b6f397973794f3d6f47d3b3c0c98dd4f6.tar.gz
\
+SRC_URI =
"http://buildhost.openmoko.org/sources/git_www.denx.de.git.u-boot.git._8993e54b6f397973794f3d6f47d3b3c0c98dd4f6.tar.gz
\
svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
