r1396 - in trunk/src/target/OM-2007/applications/openmoko-taskmanager: . src
zhiyong_sun at sita.openmoko.org
zhiyong_sun at sita.openmoko.org
Mon Mar 19 03:48:25 CET 2007
Author: zhiyong_sun
Date: 2007-03-19 03:48:16 +0100 (Mon, 19 Mar 2007)
New Revision: 1396
Removed:
trunk/src/target/OM-2007/applications/openmoko-taskmanager/patch/
Modified:
trunk/src/target/OM-2007/applications/openmoko-taskmanager/README
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.c
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.h
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/popupmenu.c
Log:
use root window message handle function to realise close and active window functions instead of using matchbox WM command, delete patch for matchbox WM
Modified: trunk/src/target/OM-2007/applications/openmoko-taskmanager/README
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/README 2007-03-18 13:57:39 UTC (rev 1395)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/README 2007-03-19 02:48:16 UTC (rev 1396)
@@ -1,17 +1,2 @@
This is openmoko-taskmanager application.
-usage:
-1. install patch for matchbox-window-manager-1.* (more see README in patch), and then reninstall your matchbox-window-manager-1.*.
-
-2. install openmoko-taskmanager
-
-make sure the openmoko-taskmanager works under matchbox-window-manager-1.*, which has been patched.
-
-NOTE: an unpatched matchbox-window-manager-1.* will make the application inefficent.
-
-HOWTO run the application:
-openmoko-taskmanager will be launched when openmoko-footer's left button clicked. so before you use this application, you must make sure you have intalled the openmoko-footer correctly (more see README of openmoko-footer), or a more straight way is that you can test it in a terminal, but make sure you have run matchbox window manager first.
-
-TODO:
-UI spec
-warring message and error handle
Modified: trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/Makefile.am 2007-03-18 13:57:39 UTC (rev 1395)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/Makefile.am 2007-03-19 02:48:16 UTC (rev 1396)
@@ -3,7 +3,7 @@
bin_PROGRAMS = openmoko-taskmanager
openmoko_taskmanager_SOURCES = taskmanager.c list_view.c callbacks.c \
- popupmenu.c misc.c xatoms.c
+ misc.c xatoms.c
openmoko_taskmanager_LDADD = @OPENMOKO_LIBS@
Modified: trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c 2007-03-18 13:57:39 UTC (rev 1395)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c 2007-03-19 02:48:16 UTC (rev 1396)
@@ -82,7 +82,7 @@
if (!tm)
return;
moko_wm_cmd (tm,
- GTK_WIDGET (tm->l->list_view), MB_CMD_ACTIVATE_CLIENT);
+ GTK_WIDGET (tm->l->list_view), CMD_ACTIVATE_WINDOW);
}
void
@@ -91,7 +91,7 @@
if (!tm)
return;
moko_wm_cmd (tm,
- GTK_WIDGET (tm->l->list_view), MB_CMD_REMOVE_CLIENT);
+ GTK_WIDGET (tm->l->list_view), CMD_CLOSE_WINDOW);
}
void
@@ -118,7 +118,7 @@
while (1);
do{
- mbcommand (GDK_DISPLAY(), MB_CMD_REMOVE_CLIENT, list->data, NULL);
+ mbcommand (GDK_DISPLAY(), CMD_CLOSE_WINDOW, list->data, NULL);
g_debug ("%d", list->data);
}
@@ -161,7 +161,7 @@
gtk_tree_model_get (model, &iter, OBJECT_COL, &w, -1);
//moko_print_win_list(GDK_DISPLAY(), &w, 1);
//moko_send_Xclimsgwm(GDK_DISPLAY (), w);
- mbcommand(GDK_DISPLAY(), MB_CMD_ACTIVATE_CLIENT, w, NULL);
+ mbcommand(GDK_DISPLAY(), CMD_ACTIVATE_WINDOW, w, NULL);
}
if (path)
free (path);
@@ -170,8 +170,8 @@
void
moko_hold_event_cb (GtkButton *btn, MokoTaskList *l)
{
- moko_init_popup_menu(NULL, NULL, l);
- }
+
+}
void
moko_wheel_left_up_press_cb (GtkWidget *self, MokoTaskManager *tm)
Modified: trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.c 2007-03-18 13:57:39 UTC (rev 1395)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.c 2007-03-19 02:48:16 UTC (rev 1396)
@@ -277,37 +277,29 @@
{
XEvent ev;
Window root;
- Atom theme_prop, cmd_prop, desktop_manager_atom;
+ Atom cmd_prop;
- desktop_manager_atom = XInternAtom(dpy, "_NET_DESKTOP_MANGER",False);
-
root = DefaultRootWindow(dpy);
- /*use to grab desktop later*/
- if (cmd_id == MB_CMD_DESKTOP) {
- /* Check if desktop is running */
- if (!XGetSelectionOwner(dpy, desktop_manager_atom)) {
- fprintf(stderr, "Desktop not running, exiting...\n");
- switch (fork()) {
- case 0:
- execvp ("mbdesktop", NULL);
- break;
- case -1:
- fprintf(stderr, "failed to exec mbdesktop");
- break;
- }
- exit(0);
- }
- }
-
- if (cmd_id == MB_CMD_REMOVE_CLIENT)
+ switch (cmd_id)
{
- if (moko_kill_window (dpy, win))
- return;
+ /*use to grab desktop later*/
+ case CMD_SHOW_DESKTOP :
+ cmd_prop = atoms[_NET_SHOW_DESKTOP];
+ break;
+ case CMD_CLOSE_WINDOW :
+ //cmd_prop = atoms[_NET_CLOSE_WINDOW]; FIXME:children windows, (wheel and toolbox) could not be close in this way
+ cmd_prop == NULL;
+ moko_kill_window (dpy, win);
+ break;
+ case CMD_ACTIVATE_WINDOW :
+ cmd_prop = atoms[_NET_ACTIVE_WINDOW];
+ break;
+ default :
+ cmd_prop = XInternAtom(dpy, "_MB_COMMAND", False);
}
-
- cmd_prop = XInternAtom(dpy, "_MB_COMMAND", False);
- memset(&ev, '\0', sizeof ev);
+
+ memset(&ev, '\0', sizeof(ev));
ev.xclient.type = ClientMessage;
if (win == NULL)
ev.xclient.window = root; /* we send it _from_ root as we have no win */
Modified: trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.h 2007-03-18 13:57:39 UTC (rev 1395)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/misc.h 2007-03-19 02:48:16 UTC (rev 1396)
@@ -35,21 +35,13 @@
#include "xatoms.h"
-/*Matchbox windows manager structs*/
-#define MB_CMD_SET_THEME 1
-#define MB_CMD_EXIT 2
-#define MB_CMD_DESKTOP 3
-#define MB_CMD_NEXT 4
-#define MB_CMD_PREV 5
-#define MB_CMD_SHOW_EXT_MENU 6
-#define MB_CMD_MISC 7
-#define MB_CMD_COMPOSITE 8
-#define MB_CMB_KEYS_RELOAD 9
+enum {
+ CMD_ACTIVATE_WINDOW,
+ CMD_CLOSE_WINDOW,
+ CMD_SHOW_DESKTOP,
+ CMD_END
+};
-#define MB_CMD_ACTIVATE_CLIENT 100
-#define MB_CMD_REMOVE_CLIENT 101
-#define MB_CMD_REMOVE_AND_ACTIVE 102
-
Window my_win;
Modified: trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/popupmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/popupmenu.c 2007-03-18 13:57:39 UTC (rev 1395)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/popupmenu.c 2007-03-19 02:48:16 UTC (rev 1396)
@@ -23,14 +23,14 @@
moko_kill_task_cb(GtkMenuItem *item, MokoTaskList *l) {
g_debug ("kill task cb");
//moko_wm_cmd(item, l->mokolist_view, MB_CMD_REMOVE_CLIENT);
- moko_wm_cmd(item, l->list_view, MB_CMD_REMOVE_CLIENT);
+ moko_wm_cmd(item, l->list_view, CMD_CLOSE_WINDOW);
}
void
moko_kill_and_swith_cb(GtkMenuItem *item, MokoTaskList *l) {
g_debug ("call kill and switch task function");
//moko_wm_cmd(item, l->mokolist_view, MB_CMD_REMOVE_AND_ACTIVE);
- moko_wm_cmd(item, l->list_view, MB_CMD_REMOVE_AND_ACTIVE);
+ //moko_wm_cmd(item, l->list_view, MB_CMD_REMOVE_AND_ACTIVE);
}
void
More information about the commitlog
mailing list
