Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h borders.c ewins.c ewmh.c focus.c ipc.c menus-misc.c
moveresize.c pager.c
Log Message:
Merge+fixes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.58
retrieving revision 1.314.2.59
diff -u -3 -r1.314.2.58 -r1.314.2.59
--- E.h 27 Oct 2004 23:32:47 -0000 1.314.2.58
+++ E.h 13 Nov 2004 10:41:56 -0000 1.314.2.59
@@ -743,6 +743,7 @@
int flags;
Group **groups;
int num_groups;
+ char visibility;
char docked;
char shown;
char iconified;
@@ -2038,12 +2039,13 @@
void __PRINTF__ Eprintf(const char *fmt, ...);
/* moveresize.c */
-int ActionMoveStart(EWin * ewin, char constrained, int
nogroup);
+int ActionMoveStart(EWin * ewin, int grab, char constrained,
+ int nogroup);
int ActionMoveEnd(EWin * ewin);
int ActionMoveSuspend(void);
int ActionMoveResume(void);
void ActionMoveHandleMotion(void);
-int ActionResizeStart(EWin * ewin, int hv);
+int ActionResizeStart(EWin * ewin, int grab, int hv);
int ActionResizeEnd(EWin * ewin);
void ActionResizeHandleMotion(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.221.2.16
retrieving revision 1.221.2.17
diff -u -3 -r1.221.2.16 -r1.221.2.17
--- borders.c 27 Oct 2004 23:32:50 -0000 1.221.2.16
+++ borders.c 13 Nov 2004 10:41:56 -0000 1.221.2.17
@@ -1031,7 +1031,6 @@
#endif
if (wbit->state == STATE_CLICKED)
wbit->left = 1;
-#if 0
else
{
wbit->state = STATE_NORMAL;
@@ -1039,15 +1038,6 @@
if (ewin->border->part[part].aclass)
EventAclass(ev, ewin, ewin->border->part[part].aclass);
}
-#else
- else
- {
- if (ewin->border->part[part].aclass)
- EventAclass(ev, ewin, ewin->border->part[part].aclass);
- }
- wbit->state = STATE_NORMAL;
- BorderWinpartChange(ewin, part, 0);
-#endif
}
#if 0 /* FIXME */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ewins.c,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -3 -r1.1.2.26 -r1.1.2.27
--- ewins.c 20 Oct 2004 21:04:07 -0000 1.1.2.26
+++ ewins.c 13 Nov 2004 10:41:56 -0000 1.1.2.27
@@ -37,7 +37,7 @@
#define EWIN_CLIENT_EVENT_MASK \
(EnterWindowMask | LeaveWindowMask | FocusChangeMask | \
StructureNotifyMask | ResizeRedirectMask | \
- PropertyChangeMask | ColormapChangeMask)
+ PropertyChangeMask | ColormapChangeMask | VisibilityChangeMask)
static void EwinHandleEventsToplevel(XEvent * ev, void *prm);
static void EwinHandleEventsContainer(XEvent * ev, void *prm);
@@ -870,7 +870,7 @@
ICCCM_Configure(ewin);
ecore_x_ungrab();
EoSetFloating(ewin, 1); /* Causes reparenting to root */
- ActionMoveStart(ewin, 0, 0);
+ ActionMoveStart(ewin, 1, 0, 0);
EDBUG_RETURN_;
}
else if ((doslide) && (!Mode.doingslide))
@@ -1250,12 +1250,11 @@
EwinPropagateShapes(ewin);
}
-#if 0
static void
-EwinEventVisibility(EWin * ewin __UNUSED__, int state __UNUSED__)
+EwinEventVisibility(EWin * ewin, int state)
{
+ ewin->visibility = state;
}
-#endif
void
EwinRefresh(EWin * ewin)
@@ -1851,6 +1850,9 @@
case ConfigureNotify:
case GravityNotify:
break;
+ case VisibilityNotify:
+ EwinEventVisibility(ewin, ev->xvisibility.state);
+ break;
case DestroyNotify:
if (ev->xdestroywindow.window == ewin->client.win)
EwinEventDestroy(ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.55.2.14
retrieving revision 1.55.2.15
diff -u -3 -r1.55.2.14 -r1.55.2.15
--- ewmh.c 27 Oct 2004 23:32:52 -0000 1.55.2.14
+++ ewmh.c 13 Nov 2004 10:41:56 -0000 1.55.2.15
@@ -1018,6 +1018,20 @@
{
switch (event->data.l[2])
{
+ case _NET_WM_MOVERESIZE_SIZE_TOPLEFT:
+ case _NET_WM_MOVERESIZE_SIZE_TOP:
+ case _NET_WM_MOVERESIZE_SIZE_TOPRIGHT:
+ case _NET_WM_MOVERESIZE_SIZE_RIGHT:
+ case _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT:
+ case _NET_WM_MOVERESIZE_SIZE_BOTTOM:
+ case _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT:
+ case _NET_WM_MOVERESIZE_SIZE_LEFT:
+ ActionResizeStart(ewin, 1, MODE_RESIZE);
+ break;
+ case _NET_WM_MOVERESIZE_MOVE:
+ ActionMoveStart(ewin, 1, 0, 0);
+ break;
+
case _NET_WM_MOVERESIZE_SIZE_KEYBOARD:
/* doResize(NULL); */
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.81.2.8
retrieving revision 1.81.2.9
diff -u -3 -r1.81.2.8 -r1.81.2.9
--- focus.c 27 Oct 2004 23:32:52 -0000 1.81.2.8
+++ focus.c 13 Nov 2004 10:41:56 -0000 1.81.2.9
@@ -528,7 +528,7 @@
else
IpcPrintf("Focused: none\n");
}
- else if (!strcmp(prm, "cfg"))
+ else if (!strcmp(cmd, "cfg"))
{
SettingsFocus();
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.32
retrieving revision 1.174.2.33
diff -u -3 -r1.174.2.32 -r1.174.2.33
--- ipc.c 31 Oct 2004 19:47:11 -0000 1.174.2.32
+++ ipc.c 13 Nov 2004 10:41:56 -0000 1.174.2.33
@@ -95,7 +95,7 @@
{
int old, new;
- new = old = *item; /* Remember old value */
+ new = old = *item != 0; /* Remember old value */
if (value == NULL || value[0] == '\0')
new = !old;
@@ -849,7 +849,7 @@
{
if (!strcmp(param1, "ptr"))
{
- ActionMoveStart(ewin, 0, 0);
+ ActionMoveStart(ewin, 0, 0, 0);
}
else if (!strcmp(param1, "?"))
{
@@ -881,15 +881,15 @@
{
if (!strcmp(param1, "ptr"))
{
- ActionResizeStart(ewin, MODE_RESIZE);
+ ActionResizeStart(ewin, 0, MODE_RESIZE);
}
else if (!strcmp(param1, "ptr-h"))
{
- ActionResizeStart(ewin, MODE_RESIZE_H);
+ ActionResizeStart(ewin, 0, MODE_RESIZE_H);
}
else if (!strcmp(param1, "ptr-v"))
{
- ActionResizeStart(ewin, MODE_RESIZE_V);
+ ActionResizeStart(ewin, 0, MODE_RESIZE_V);
}
else if (!strcmp(param1, "?"))
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/menus-misc.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -3 -r1.1.2.12 -r1.1.2.13
--- menus-misc.c 17 Oct 2004 08:47:26 -0000 1.1.2.12
+++ menus-misc.c 13 Nov 2004 10:41:56 -0000 1.1.2.13
@@ -371,12 +371,13 @@
const char *file)
{
Menu *m = NULL;
- char s[4096], *ff = NULL;
+ char s[4096], *ff;
static int calls = 0;
EDBUG(5, "MenuCreateFromFlatFile");
- if (calls > 255)
+ if (calls > 32)
EDBUG_RETURN(NULL);
+ calls++;
ff = FindFile(file, NULL);
if (!ff)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.22.2.11
retrieving revision 1.22.2.12
diff -u -3 -r1.22.2.11 -r1.22.2.12
--- moveresize.c 20 Oct 2004 21:04:10 -0000 1.22.2.11
+++ moveresize.c 13 Nov 2004 10:41:56 -0000 1.22.2.12
@@ -28,7 +28,7 @@
static int move_mode_real = 0;
int
-ActionMoveStart(EWin * ewin, char constrained, int nogroup)
+ActionMoveStart(EWin * ewin, int grab, char constrained, int nogroup)
{
EWin **gwins;
int i, num;
@@ -51,10 +51,11 @@
if (Conf.movemode > 0)
ecore_x_grab();
-#if 0 /* FIXME - TBD */
- GrabPointerRelease();
- GrabPointerSet(VRoot.win, ECSR_ACT_MOVE, 1);
-#endif
+ if (grab)
+ {
+ GrabPointerRelease();
+ GrabPointerSet(VRoot.win, ECSR_ACT_MOVE, 1);
+ }
Mode.mode = MODE_MOVE_PENDING;
Mode.constrained = constrained;
@@ -97,9 +98,7 @@
EDBUG(6, "doMoveEnd");
-#if 0 /* FIXME - TBD */
GrabPointerRelease();
-#endif
if (ewin && ewin != mode_moveresize_ewin)
return 0;
@@ -260,7 +259,7 @@
}
int
-ActionResizeStart(EWin * ewin, int hv)
+ActionResizeStart(EWin * ewin, int grab, int hv)
{
int x, y, w, h;
@@ -279,10 +278,11 @@
Mode.queue_up = 0;
-#if 0 /* FIXME - TBD */
- GrabPointerRelease();
- GrabPointerSet(VRoot.win, ECSR_ACT_RESIZE, 1);
-#endif
+ if (grab)
+ {
+ GrabPointerRelease();
+ GrabPointerSet(VRoot.win, ECSR_ACT_RESIZE, 1);
+ }
switch (hv)
{
@@ -366,9 +366,7 @@
EDBUG(0, "doResizeEnd");
-#if 0 /* FIXME - TBD */
GrabPointerRelease();
-#endif
if (ewin && ewin != mode_moveresize_ewin)
return 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.103.2.21
retrieving revision 1.103.2.22
diff -u -3 -r1.103.2.21 -r1.103.2.22
--- pager.c 30 Oct 2004 15:04:29 -0000 1.103.2.21
+++ pager.c 13 Nov 2004 10:41:56 -0000 1.103.2.22
@@ -133,7 +133,7 @@
}
static void
-PagerUpdateTimeout(int val, void *data)
+PagerUpdateTimeout(int val __UNUSED__, void *data)
{
Pager *p;
char s[4096];
@@ -165,6 +165,8 @@
return;
if (p->desktop != DesksGetCurrent())
return;
+ if (p->ewin && p->ewin->visibility == VisibilityFullyObscured)
+ return;
if (Mode.mode != MODE_NONE)
return;
@@ -193,8 +195,6 @@
p->update_phase = 0;
}
- return;
- val = 0;
}
static void
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
