Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
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. r4342 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
2. r4343 -
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit
([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2008-04-10 16:45:39 +0200 (Thu, 10 Apr 2008)
New Revision: 4342
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
* libmokoui/moko-finger-scroll.c
(moko_finger_scroll_button_press_cb),
(moko_finger_scroll_motion_notify_cb),
(moko_finger_scroll_button_release_cb), (moko_finger_scroll_init):
Do check event type, but don't distinguish between single click and
double-click
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-04-10
14:08:23 UTC (rev 4341)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-04-10
14:45:39 UTC (rev 4342)
@@ -1,3 +1,12 @@
+2008-04-10 Chris Lord <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-finger-scroll.c
+ (moko_finger_scroll_button_press_cb),
+ (moko_finger_scroll_motion_notify_cb),
+ (moko_finger_scroll_button_release_cb), (moko_finger_scroll_init):
+ Do check event type, but don't distinguish between single click and
+ double-click
+
2008-04-07 Chris Lord <[EMAIL PROTECTED]>
* libmokoui/moko-finger-scroll.c
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2008-04-10 14:08:23 UTC (rev 4341)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2008-04-10 14:45:39 UTC (rev 4342)
@@ -53,6 +53,7 @@
gboolean enabled;
gboolean clicked;
guint32 last_time; /* Last event time, to stop infinite loops */
+ gint last_type;
gboolean moved;
GTimeVal click_start;
GTimeVal last_click;
@@ -231,9 +232,11 @@
MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (scroll);
if ((!priv->enabled) || (event->button != 1) ||
- ((event->time == priv->last_time))) return TRUE;
+ ((event->time == priv->last_time) &&
+ (priv->last_type == 1))) return TRUE;
priv->last_time = event->time;
+ priv->last_type = 1;
priv->click_x = event->x;
priv->click_y = event->y;
@@ -468,7 +471,8 @@
gdouble x, y;
if ((!priv->enabled) || (!priv->clicked) ||
- ((event->time == priv->last_time))) {
+ ((event->time == priv->last_time) &&
+ (priv->last_type == 2))) {
gdk_window_get_pointer (
GTK_WIDGET (scroll)->window, NULL, NULL, 0);
return TRUE;
@@ -533,6 +537,7 @@
if (priv->child) {
/* Send motion notify to child */
priv->last_time = event->time;
+ priv->last_type = 2;
event = (GdkEventMotion *)gdk_event_copy ((GdkEvent *)event);
event->x = priv->cx + (event->x - priv->ix);
event->y = priv->cy + (event->y - priv->iy);
@@ -558,10 +563,12 @@
gdouble delta, speed_x, speed_y;
if ((!priv->clicked) || (!priv->enabled) || (event->button != 1) ||
- ((event->time == priv->last_time)))
+ ((event->time == priv->last_time) &&
+ (priv->last_type == 3)))
return TRUE;
priv->last_time = event->time;
+ priv->last_type = 3;
g_get_current_time (¤t);
@@ -994,6 +1001,7 @@
priv->moved = FALSE;
priv->clicked = FALSE;
priv->last_time = 0;
+ priv->last_type = 0;
priv->vscroll = TRUE;
priv->hscroll = TRUE;
priv->scroll_width = 6;
--- End Message ---
--- Begin Message ---
Author: sean_chiang
Date: 2008-04-10 17:55:40 +0200 (Thu, 10 Apr 2008)
New Revision: 4343
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.h
Log:
forgot to svn add. add the missing files.
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.c
2008-04-10 14:45:39 UTC (rev 4342)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.c
2008-04-10 15:55:40 UTC (rev 4343)
@@ -0,0 +1,30 @@
+/*
+ * moko-headset; set and get the headset status
+ *
+ * by Sean Chiang <[EMAIL PROTECTED]>
+ *
+ * Copyright (C) 2006-2007 OpenMoko Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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$]
+ */
+
+#include "moko-headset.h"
+
+static int headset_status = HEADSET_STATUS_OUT;
+
+void moko_headset_status_set(int status) {
+ headset_status = status;
+}
+
+int moko_headset_status_get(void) {
+ return headset_status;
+}
Added:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.h
2008-04-10 14:45:39 UTC (rev 4342)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-headset.h
2008-04-10 15:55:40 UTC (rev 4343)
@@ -0,0 +1,31 @@
+/*
+ * moko-headset; set and get the headset status
+ *
+ * by Sean Chiang <[EMAIL PROTECTED]>
+ *
+ * Copyright (C) 2006-2007 OpenMoko Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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$]
+ */
+
+#ifndef _HAVE_MOKO_HEADSET_H
+#define _HAVE_MOKO_HEADSET_H
+
+enum {
+ HEADSET_STATUS_IN = 0,
+ HEADSET_STATUS_OUT,
+};
+
+void moko_headset_status_set(int status);
+int moko_headset_status_get(void);
+
+#endif /* _HAVE_MOKO_HEADSET_H */
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
