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. r2136 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
2. r2137 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
3. r2138 - in trunk/oe/packages/alsa: . files
([EMAIL PROTECTED])
4. r2139 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
5. r2140 - in trunk/oe/packages/openmoko-base: . files
([EMAIL PROTECTED])
6. r2141 - in trunk/oe/packages/gsm: . files
([EMAIL PROTECTED])
7. r2142 - trunk/oe/packages/openmoko-base/files
([EMAIL PROTECTED])
8. r2143 - trunk/src/target/OM-2007/artwork/sounds
([EMAIL PROTECTED])
9. r2144 - trunk/src/target/OM-2007/artwork/sounds
([EMAIL PROTECTED])
10. r2145 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-06-03 14:55:50 +0200 (Sun, 03 Jun 2007)
New Revision: 2136
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
Log:
openmoko-panel-mainmenu: kill topmost window on short press of power button
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-03 06:21:35 UTC (rev 2135)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-03 12:55:50 UTC (rev 2136)
@@ -22,6 +22,10 @@
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
#include <fcntl.h>
#include <string.h>
#include <errno.h>
@@ -41,9 +45,9 @@
#define POWER_BUTTON_EVENT_PATH "/dev/input/event2"
#define POWER_BUTTON_KEYCODE 116
#else
- #define AUX_BUTTON_EVENT_PATH "/dev/input/event4"
+ #define AUX_BUTTON_EVENT_PATH "/dev/input/event1"
#define AUX_BUTTON_KEYCODE 0x25
- #define POWER_BUTTON_EVENT_PATH "/dev/input/event3"
+ #define POWER_BUTTON_EVENT_PATH "/dev/input/event0"
#define POWER_BUTTON_KEYCODE 0x25
#endif
@@ -56,6 +60,46 @@
GtkWidget* aux_menu = 0;
GtkWidget* power_menu = 0;
+/* Borrowed from libwnck */
+static Window
+ get_window_property (Window xwindow,
+ Atom atom)
+{
+ Atom type;
+ int format;
+ gulong nitems;
+ gulong bytes_after;
+ Window *w;
+ int err, result;
+ Window retval;
+
+ gdk_error_trap_push ();
+
+ type = None;
+ result = XGetWindowProperty (gdk_display,
+ xwindow,
+ atom,
+ 0, G_MAXLONG,
+ False, XA_WINDOW, &type, &format, &nitems,
+ &bytes_after, (unsigned char **) &w);
+ err = gdk_error_trap_pop ();
+
+ if (err != Success ||
+ result != Success)
+ return None;
+
+ if (type != XA_WINDOW)
+ {
+ XFree (w);
+ return None;
+ }
+
+ retval = *w;
+ XFree (w);
+
+ return retval;
+}
+
gboolean panel_mainmenu_install_watcher()
{
int auxfd = open( AUX_BUTTON_EVENT_PATH, O_RDONLY );
@@ -214,7 +258,7 @@
{
//FIXME talk to neod
//FIXME notify user
- system( "/bin/sh poweroff");
+ system( "/sbin/poweroff");
}
gboolean panel_mainmenu_power_timeout( guint timeout )
@@ -223,7 +267,33 @@
power_timer = -1;
if ( timeout < 1 )
{
- // close current application
+ 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 );
+
+ Display* display = XOpenDisplay( NULL );
+
+ //xwindow = gdk_x11_drawable_get_xid (window);
+
+ XEvent xev;
+ xev.xclient.type = ClientMessage;
+ xev.xclient.serial = 0;
+ xev.xclient.send_event = True;
+ xev.xclient.display = display;
+ xev.xclient.window = xwindow;
+ xev.xclient.message_type = gdk_x11_get_xatom_by_name(
"_NET_CLOSE_WINDOW" );
+ xev.xclient.format = 32;
+ xev.xclient.data.l[0] = 0;
+ xev.xclient.data.l[1] = 0;
+ xev.xclient.data.l[2] = 0;
+ xev.xclient.data.l[3] = 0;
+ xev.xclient.data.l[4] = 0;
+
+ //TODO: add timeout checking for response
+
+ XSendEvent (display, gdk_x11_get_default_root_xwindow (), False,
+ SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+ XCloseDisplay( display );
+
}
else
{
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-03 16:48:39 +0200 (Sun, 03 Jun 2007)
New Revision: 2137
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
Log:
openmoko-panel-mainmenu: temp. hack to play a startup sound
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-06-03 12:55:50 UTC (rev 2136)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-06-03 14:48:39 UTC (rev 2137)
@@ -77,6 +77,9 @@
{
g_debug("openmoko-panel-mainmenu new");
+ //FIXME for testing only
+ system( "madplay /usr/share/openmoko/sounds/startup_openmoko.mp3 &" );
+
MokoPanelApplet *applet = moko_panel_applet_new();
g_debug("applet is %p", applet);
moko_panel_applet_set_icon(applet, PKGDATADIR "/btn_menu.png", TRUE);
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-03 16:50:35 +0200 (Sun, 03 Jun 2007)
New Revision: 2138
Modified:
trunk/oe/packages/alsa/alsa-state_svn.bb
trunk/oe/packages/alsa/files/stereoout.state
Log:
oe/alsa: bump default stereoout volume
Modified: trunk/oe/packages/alsa/alsa-state_svn.bb
===================================================================
--- trunk/oe/packages/alsa/alsa-state_svn.bb 2007-06-03 14:48:39 UTC (rev
2137)
+++ trunk/oe/packages/alsa/alsa-state_svn.bb 2007-06-03 14:50:35 UTC (rev
2138)
@@ -1,7 +1,7 @@
DESCRIPTION = "ALSA state files"
LICENSE = "MIT"
SECTION = "base"
-PR = "r1"
+PR = "r2"
SRC_URI = "file://capturehandset.state \
file://captureheadset.state \
Modified: trunk/oe/packages/alsa/files/stereoout.state
===================================================================
--- trunk/oe/packages/alsa/files/stereoout.state 2007-06-03 14:48:39 UTC
(rev 2137)
+++ trunk/oe/packages/alsa/files/stereoout.state 2007-06-03 14:50:35 UTC
(rev 2138)
@@ -815,7 +815,7 @@
comment.range '0 - 31'
iface MIXER
name 'Amp Left Playback Volume'
- value 15
+ value 25
}
control.87 {
comment.access 'read write'
@@ -824,7 +824,7 @@
comment.range '0 - 31'
iface MIXER
name 'Amp Right Playback Volume'
- value 15
+ value 25
}
control.88 {
comment.access 'read write'
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-03 16:58:11 +0200 (Sun, 03 Jun 2007)
New Revision: 2139
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
Log:
openmoko-panel-mainmenu: remove startup sound. will be included in session
startup script
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-06-03 14:50:35 UTC (rev 2138)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
2007-06-03 14:58:11 UTC (rev 2139)
@@ -77,9 +77,6 @@
{
g_debug("openmoko-panel-mainmenu new");
- //FIXME for testing only
- system( "madplay /usr/share/openmoko/sounds/startup_openmoko.mp3 &" );
-
MokoPanelApplet *applet = moko_panel_applet_new();
g_debug("applet is %p", applet);
moko_panel_applet_set_icon(applet, PKGDATADIR "/btn_menu.png", TRUE);
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-03 17:01:36 +0200 (Sun, 03 Jun 2007)
New Revision: 2140
Modified:
trunk/oe/packages/openmoko-base/files/session
trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
Log:
oe/openmoko-base: configure soundcard and play startup sound from
/etc/matchbox/session
Modified: trunk/oe/packages/openmoko-base/files/session
===================================================================
--- trunk/oe/packages/openmoko-base/files/session 2007-06-03 14:58:11 UTC
(rev 2139)
+++ trunk/oe/packages/openmoko-base/files/session 2007-06-03 15:01:36 UTC
(rev 2140)
@@ -9,6 +9,10 @@
# start old-style panel plugin to get a keyboard
mbinputmgr &
+# set default alsa configuration and play welcome sound
+alsactl restore 0 -f /etc/alsa/stereoout.state
+madplay /usr/share/openmoko/sounds/startup_openmoko.mp3 &
+
openmoko-footer &
openmoko-today --desktop &
openmoko-dialer &
Modified: trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-03
14:58:11 UTC (rev 2139)
+++ trunk/oe/packages/openmoko-base/openmoko-session_svn.bb 2007-06-03
15:01:36 UTC (rev 2140)
@@ -2,7 +2,7 @@
SECTION = "openmoko/base"
RDEPENDS = "matchbox-panel-2 matchbox-wm gconf"
PV = "0.1+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit openmoko-base
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-03 17:03:05 +0200 (Sun, 03 Jun 2007)
New Revision: 2141
Modified:
trunk/oe/packages/gsm/files/gsmd
trunk/oe/packages/gsm/libgsmd_svn.bb
Log:
oe/gsm: remove configuring soundcard from gsm script
Modified: trunk/oe/packages/gsm/files/gsmd
===================================================================
--- trunk/oe/packages/gsm/files/gsmd 2007-06-03 15:01:36 UTC (rev 2140)
+++ trunk/oe/packages/gsm/files/gsmd 2007-06-03 15:03:05 UTC (rev 2141)
@@ -23,14 +23,12 @@
# FIXME remove Neo1973 specifics here and catch up with OE upstream,
once we're stable
echo -n "Setting Neo1973 temporary demo specifics..."
dmesg -n1
- alsactl -f /etc/alsa/gsmhandset.state restore 0
echo "done"
# Power on GSM device
if [ -e "${GSM_POW}" ]
then
echo -n "Powering up GSM device..."
echo "1" > ${GSM_POW}
- sleep 1
echo "done"
else
echo "GSM device not found. Aborting startup"
Modified: trunk/oe/packages/gsm/libgsmd_svn.bb
===================================================================
--- trunk/oe/packages/gsm/libgsmd_svn.bb 2007-06-03 15:01:36 UTC (rev
2140)
+++ trunk/oe/packages/gsm/libgsmd_svn.bb 2007-06-03 15:03:05 UTC (rev
2141)
@@ -3,8 +3,8 @@
LICENSE = "GPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
-PV = "0.0+svn${SRCDATE}"
-PR = "r9"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd"
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-03 17:22:03 +0200 (Sun, 03 Jun 2007)
New Revision: 2142
Modified:
trunk/oe/packages/openmoko-base/files/session
Log:
* Move startup sound to a later position. Makes no sense to hear the sound while
still on X start.
Modified: trunk/oe/packages/openmoko-base/files/session
===================================================================
--- trunk/oe/packages/openmoko-base/files/session 2007-06-03 15:03:05 UTC
(rev 2141)
+++ trunk/oe/packages/openmoko-base/files/session 2007-06-03 15:22:03 UTC
(rev 2142)
@@ -9,13 +9,13 @@
# start old-style panel plugin to get a keyboard
mbinputmgr &
+openmoko-footer &
+openmoko-today --desktop &
+openmoko-dialer &
+
# set default alsa configuration and play welcome sound
alsactl restore 0 -f /etc/alsa/stereoout.state
madplay /usr/share/openmoko/sounds/startup_openmoko.mp3 &
-openmoko-footer &
-openmoko-today --desktop &
-openmoko-dialer &
-
exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
--- End Message ---
--- Begin Message ---
Author: wansti
Date: 2007-06-03 17:28:04 +0200 (Sun, 03 Jun 2007)
New Revision: 2143
Added:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.mp3
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.ogg
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.wav
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.mp3
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.ogg
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.wav
Modified:
trunk/src/target/OM-2007/artwork/sounds/openmoko_sounds.rg
Log:
Added two very simple, standard ringtones
Modified: trunk/src/target/OM-2007/artwork/sounds/openmoko_sounds.rg
===================================================================
(Binary files differ)
Added: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.mp3
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.ogg
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.wav
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.mp3
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.ogg
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.wav
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple02.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
--- End Message ---
--- Begin Message ---
Author: wansti
Date: 2007-06-03 17:35:31 +0200 (Sun, 03 Jun 2007)
New Revision: 2144
Removed:
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.mp3
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.ogg
trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.wav
Modified:
trunk/src/target/OM-2007/artwork/sounds/openmoko_sounds.rg
Log:
Removed simple ringtone #1 (might be copyrighted)
Modified: trunk/src/target/OM-2007/artwork/sounds/openmoko_sounds.rg
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.mp3
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.ogg
===================================================================
(Binary files differ)
Deleted: trunk/src/target/OM-2007/artwork/sounds/ringtone_simple01.wav
===================================================================
(Binary files differ)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-04 00:15:19 +0200 (Mon, 04 Jun 2007)
New Revision: 2145
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
Log:
openmoko-panel-mainmenu: prepare for simple power saving logic
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-03 15:35:31 UTC (rev 2144)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.c
2007-06-03 22:15:19 UTC (rev 2145)
@@ -23,6 +23,9 @@
#include <gtk/gtkmenuitem.h>
#include <gdk/gdkx.h>
+
+#include <glib.h>
+
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -40,30 +43,43 @@
//FIXME find out through sysfs
#ifndef DEBUG_THIS_FILE
- #define AUX_BUTTON_EVENT_PATH "/dev/input/event0"
+ #define AUX_BUTTON_EVENT_PATH "/dev/input/event1"
#define AUX_BUTTON_KEYCODE 169
#define POWER_BUTTON_EVENT_PATH "/dev/input/event2"
#define POWER_BUTTON_KEYCODE 116
+ #define TOUCHSCREEN_EVENT_PATH "/dev/input/touchscreen0"
#else
#define AUX_BUTTON_EVENT_PATH "/dev/input/event1"
#define AUX_BUTTON_KEYCODE 0x25
#define POWER_BUTTON_EVENT_PATH "/dev/input/event0"
#define POWER_BUTTON_KEYCODE 0x25
+ #define TOUCHSCREEN_EVENT_PATH "/dev/input/event2"
#endif
GPollFD aux_fd;
GPollFD power_fd;
+GIOChannel* touchscreen_io;
int aux_timer = -1;
int power_timer = -1;
+int powersave_timer1 = -1;
+int powersave_timer2 = -1;
+int powersave_timer3 = -1;
GtkWidget* aux_menu = 0;
GtkWidget* power_menu = 0;
+typedef enum _PowerState
+{
+ NORMAL,
+ DISPLAY_DIM,
+ DISPLAY_OFF,
+ SUSPEND,
+} PowerState;
+PowerState power_state = NORMAL;
+
/* Borrowed from libwnck */
-static Window
- get_window_property (Window xwindow,
- Atom atom)
+static Window get_window_property( Window xwindow, Atom atom )
{
Atom type;
int format;
@@ -130,6 +146,19 @@
power_fd.revents = 0;
g_source_add_poll( button_watcher, &power_fd );
g_source_attach( button_watcher, NULL );
+
+ int tsfd = open( TOUCHSCREEN_EVENT_PATH, O_RDONLY );
+ if ( tsfd < 0 )
+ {
+ g_debug( "can't open " TOUCHSCREEN_EVENT_PATH " (%s)", strerror( errno
) );
+ return FALSE;
+ }
+ touchscreen_io = g_io_channel_unix_new( tsfd );
+ g_io_add_watch( touchscreen_io, G_IO_IN, panel_mainmenu_touchscreen_cb,
NULL );
+
+ panel_mainmenu_powersave_reset();
+ panel_mainmenu_set_display( 100 );
+
return TRUE;
}
@@ -318,3 +347,73 @@
return FALSE;
}
+gboolean panel_mainmenu_touchscreen_cb( GIOChannel *source, GIOCondition
condition, gpointer data )
+{
+ g_debug( "mainmenu touchscreen event" );
+
+ struct input_event event;
+ int size = read( g_io_channel_unix_get_fd( source ), &event, sizeof(
struct input_event ) );
+ g_debug( "read %d bytes from power_fd %d", size, power_fd.fd );
+ g_debug( "input event = ( %0x, %0x, %0x )", event.type, event.code,
event.value );
+
+ panel_mainmenu_powersave_reset();
+ if ( power_state != NORMAL )
+ {
+ panel_mainmenu_set_display( 100 );
+ power_state = NORMAL;
+ }
+ return TRUE;
+}
+
+void panel_mainmenu_powersave_reset()
+{
+ g_debug( "mainmenu powersave reset" );
+ if ( powersave_timer1 != -1 )
+ g_source_remove( powersave_timer1 );
+ if ( powersave_timer2 != -1 )
+ g_source_remove( powersave_timer2 );
+ if ( powersave_timer3 != -1 )
+ g_source_remove( powersave_timer3 );
+
+ //TODO load this from preferences
+ powersave_timer1 = g_timeout_add( 10 * 1000, (GSourceFunc)
panel_mainmenu_powersave_timeout1, (gpointer)1 );
+ powersave_timer2 = g_timeout_add( 20 * 1000, (GSourceFunc)
panel_mainmenu_powersave_timeout2, (gpointer)1 );
+ powersave_timer3 = g_timeout_add( 40 * 1000, (GSourceFunc)
panel_mainmenu_powersave_timeout3, (gpointer)1 );
+}
+
+void panel_mainmenu_set_display( int brightness )
+{
+ g_debug( "mainmenu set display %d", brightness );
+}
+
+gboolean panel_mainmenu_powersave_timeout1( guint timeout )
+{
+ g_debug( "mainmenu powersave timeout 1" );
+ //FIXME talk to neod
+ //FIXME dim display
+ power_state = DISPLAY_DIM;
+ panel_mainmenu_set_display( 50 );
+ return FALSE;
+}
+
+gboolean panel_mainmenu_powersave_timeout2( guint timeout )
+{
+ g_debug( "mainmenu powersave timeout 2" );
+ //FIXME talk to neod
+ //FIXME turn off display
+ panel_mainmenu_set_display( 0 );
+ power_state = DISPLAY_OFF;
+ return FALSE;
+}
+
+gboolean panel_mainmenu_powersave_timeout3( guint timeout )
+{
+ g_debug( "mainmenu powersave timeout 3" );
+ //FIXME talk to neod
+ power_state = SUSPEND;
+ system( "/usr/bin/apm -s");
+ panel_mainmenu_powersave_reset();
+ panel_mainmenu_set_display( 100 );
+ power_state = NORMAL;
+ return FALSE;
+}
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
2007-06-03 15:35:31 UTC (rev 2144)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/buttonactions.h
2007-06-03 22:15:19 UTC (rev 2145)
@@ -7,7 +7,17 @@
gboolean panel_mainmenu_input_check( GSource* source );
gboolean panel_mainmenu_input_dispatch( GSource* source, GSourceFunc callback,
gpointer data );
+gboolean panel_mainmenu_touchscreen_cb( GIOChannel *source, GIOCondition
condition, gpointer data );
+
gboolean panel_mainmenu_aux_timeout( guint timeout );
gboolean panel_mainmenu_power_timeout( guint timeout );
+void panel_mainmenu_powersave_reset();
+
+gboolean panel_mainmenu_powersave_timeout1( guint timeout );
+gboolean panel_mainmenu_powersave_timeout2( guint timeout );
+gboolean panel_mainmenu_powersave_timeout3( guint timeout );
+
+void panel_mainmenu_set_display( int brightness );
+
#endif
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
