Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
borders.c ewin-ops.c ewins.c iclass.c
Log Message:
Fix pseudotrans updates.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -3 -r1.258 -r1.259
--- borders.c 8 May 2005 16:01:25 -0000 1.258
+++ borders.c 8 May 2005 20:26:49 -0000 1.259
@@ -82,7 +82,7 @@
return;
#if 0 /* Debug */
- Eprintf("BorderWinpartITclassApply: %#lx %#lx %2d %d %s\n",
+ Eprintf("BorderWpITApply: %#lx %#lx %2d %d %s\n",
EwinGetClientWin(ewin), EoGetWin(ewin), i, force, EwinGetName(ewin));
#endif
@@ -163,6 +163,12 @@
if (!ewin)
return;
+#if 0 /* Debug */
+ Eprintf("EwinBorderDraw %#lx %s d=%d s=%d p=%d q=%d\n",
+ EwinGetClientWin(ewin), EoGetName(ewin), EoGetDesk(ewin), do_shape,
+ do_paint, queue_off);
+#endif
+
pq = Mode.queue_up;
if (queue_off)
Mode.queue_up = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewin-ops.c 8 May 2005 16:01:46 -0000 1.31
+++ ewin-ops.c 8 May 2005 20:26:49 -0000 1.32
@@ -461,7 +461,8 @@
EwinDetermineArea(ewin);
- if ((Mode.mode == MODE_NONE) /* && (move || resize) */ )
+ if ((Mode.mode == MODE_NONE ||
+ Mode.mode == MODE_DESKSWITCH) /* && (move || resize) */ )
{
if (TransparencyEnabled())
EwinBorderDraw(ewin, resize, 1, 0); /* Update the border */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- ewins.c 8 May 2005 16:01:46 -0000 1.59
+++ ewins.c 8 May 2005 20:26:49 -0000 1.60
@@ -1614,11 +1614,13 @@
EwinEventsConfigure(lst[i], mode);
+#if 0 /* FIXME - Remove? (obsoletes EwinRefresh) */
/* This is a hack. Maybe we should do something with expose events. */
if (mode)
if (Mode.mode == MODE_DESKSWITCH && EoIsSticky(ewin) &&
EoIsShown(ewin))
EwinRefresh(ewin);
+#endif
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- iclass.c 7 May 2005 11:19:58 -0000 1.62
+++ iclass.c 8 May 2005 20:26:49 -0000 1.63
@@ -759,18 +759,27 @@
if (trans)
{
- Window cr;
- Pixmap bg;
+ Window cr, dummy;
+ Drawable bg;
int xx, yy;
- XTranslateCoordinates(disp, win, VRoot.win, 0, 0, &xx, &yy, &cr);
-/* Eprintf("ImagestateMakePmapMask %#lx %d %d %d %d\n", win, xx, yy, w,
h); */
+ bg = BackgroundGetPixmap(DeskGetBackground(DesksGetCurrent()));
+ if ((flags & ICLASS_ATTR_GLASS) || (bg == None))
+ {
+ cr = VRoot.win;
+ bg = VRoot.win;
+ }
+ else
+ {
+ cr = DeskGetCurrentRoot();
+ }
+ XTranslateCoordinates(disp, win, cr, 0, 0, &xx, &yy, &dummy);
+#if 0
+ Eprintf("ImagestateMakePmapMask %#lx %d %d %d %d\n", win, xx, yy, w, h);
+#endif
if (xx < VRoot.w && yy < VRoot.h && xx + w >= 0 && yy + h >= 0)
{
/* Create the background base image */
- bg = BackgroundGetPixmap(DeskGetBackground(DesksGetCurrent()));
- if ((flags & ICLASS_ATTR_GLASS) || (bg == None))
- bg = VRoot.win;
imlib_context_set_drawable(bg);
ii = imlib_create_image_from_drawable(0, xx, yy, w, h,
!EServerIsGrabbed());
@@ -780,7 +789,9 @@
}
else
{
-/* Eprintf("ImagestateMakePmapMask %#lx %d %d\n", win, w, h); */
+#if 0
+ Eprintf("ImagestateMakePmapMask %#lx %d %d\n", win, w, h);
+#endif
}
#else
trans = 0;
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
