Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h areas.c desktops.c ipc.c
Log Message:
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.8
retrieving revision 1.314.2.9
diff -u -3 -r1.314.2.8 -r1.314.2.9
--- E.h 8 Aug 2004 22:31:40 -0000 1.314.2.8
+++ E.h 8 Aug 2004 22:49:04 -0000 1.314.2.9
@@ -1824,10 +1824,11 @@
#define EDBUG_TYPE_MOVERESIZE 133
#define EDBUG_TYPE_SESSION 134
#define EDBUG_TYPE_SNAPS 135
-#define EDBUG_TYPE_DISPATCH 136
-#define EDBUG_TYPE_MODULES 137
-#define EDBUG_TYPE_CONFIG 138
-#define EDBUG_TYPE_IPC 139
+#define EDBUG_TYPE_DESKS 136
+#define EDBUG_TYPE_DISPATCH 137
+#define EDBUG_TYPE_MODULES 138
+#define EDBUG_TYPE_CONFIG 139
+#define EDBUG_TYPE_IPC 140
int EventDebug(unsigned int type);
#else
#define EventDebug(type) 0
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/areas.c,v
retrieving revision 1.71.2.1
retrieving revision 1.71.2.2
diff -u -3 -r1.71.2.1 -r1.71.2.2
--- areas.c 31 Jul 2004 20:25:52 -0000 1.71.2.1
+++ areas.c 8 Aug 2004 22:49:04 -0000 1.71.2.2
@@ -256,6 +256,9 @@
&& (ay == desks.desk[desks.current].current_area_y))
EDBUG_RETURN_;
+ if (EventDebug(EDBUG_TYPE_DESKS))
+ Eprintf("SetCurrentArea %d,%d\n", ax, ay);
+
ModulesSignal(ESIGNAL_AREA_SWITCH);
dx = VRoot.w * (ax - desks.desk[desks.current].current_area_x);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.95.2.4
retrieving revision 1.95.2.5
diff -u -3 -r1.95.2.4 -r1.95.2.5
--- desktops.c 8 Aug 2004 22:31:41 -0000 1.95.2.4
+++ desktops.c 8 Aug 2004 22:49:04 -0000 1.95.2.5
@@ -717,6 +717,9 @@
if (desk < 0 || desk >= Conf.desks.num || desk == pdesk)
EDBUG_RETURN_;
+ if (EventDebug(EDBUG_TYPE_DESKS))
+ Eprintf("GotoDesktop %d\n", desk);
+
SlideoutsHide();
ModulesSignal(ESIGNAL_DESK_SWITCH);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.5
retrieving revision 1.174.2.6
diff -u -3 -r1.174.2.5 -r1.174.2.6
--- ipc.c 8 Aug 2004 22:31:41 -0000 1.174.2.5
+++ ipc.c 8 Aug 2004 22:49:04 -0000 1.174.2.6
@@ -4114,25 +4114,40 @@
}
static void
-IPC_Debug(const char *params, Client * c)
+IPC_Debug(const char *params, Client * c __UNUSED__)
{
- char buf[FILEPATH_LEN_MAX];
- char param1[FILEPATH_LEN_MAX];
- char param2[FILEPATH_LEN_MAX];
+ char param[1024];
+ int l;
+ const char *p;
- buf[0] = 0;
- param1[0] = 0;
- param2[0] = 0;
+ p = params;
+ l = 0;
+ sscanf(p, "%1000s %n", param, &l);
+ p += l;
- word(params, 1, param1);
- word(params, 2, param2);
-
- if (!strncmp(param1, "event", 2))
+ if (!strncmp(param, "event", 2))
{
- EventDebugInit(param2);
+ EventDebugInit(p);
}
+ else if (!strncmp(param, "grab", 2))
+ {
+ Window win;
- CommsSend(c, buf);
+ l = 0;
+ sscanf(p, "%1000s %n", param, &l);
+ p += l;
+ if (!strncmp(param, "unset", 2))
+ {
+ UnGrabTheButtons();
+ IpcPrintf("Ungrab\n");
+ }
+ else
+ {
+ sscanf(param, "%li", &win);
+ GrabConfineThePointer(win, ECSR_ACT_RESIZE);
+ IpcPrintf("Grab %#lx\n", win);
+ }
+ }
}
static void
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
