Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c ewins.c misc.c pager.c
Log Message:
Various trivial fixes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- dialog.c 3 Apr 2005 15:46:42 -0000 1.105
+++ dialog.c 25 Apr 2005 16:02:52 -0000 1.106
@@ -178,6 +178,7 @@
struct _dialog
{
+ EWin *ewin;
char *name;
char *title;
char *text;
@@ -538,6 +539,7 @@
Dialog *d = ptr;
ewin->data = ptr;
+ d->ewin = ewin;
ewin->MoveResize = DialogEwinMoveResize;
ewin->Refresh = DialogEwinRefresh;
@@ -660,7 +662,7 @@
if (d->exit_func)
d->exit_func(d, d->exit_val, NULL);
- EUnmapWindow(d->win);
+ HideEwin(d->ewin);
}
DItem *
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewins.c 23 Apr 2005 08:07:27 -0000 1.46
+++ ewins.c 25 Apr 2005 16:02:52 -0000 1.47
@@ -182,8 +182,6 @@
if (!EwinIsInternal(ewin))
EUnregisterWindow(ewin->client.win);
- HintsSetClientList();
-
SnapshotEwinUnmatch(ewin);
ModulesSignal(ESIGNAL_EWIN_DESTROY, ewin);
@@ -202,6 +200,8 @@
EobjListFocusDel(&ewin->o);
EobjFini(&ewin->o);
+ HintsSetClientList();
+
if (ewin->icccm.wm_name)
Efree(ewin->icccm.wm_name);
if (ewin->icccm.wm_res_class)
@@ -1087,7 +1087,7 @@
/* FIXME - This is to sync the client.win EXID mapped state */
EUnmapWindow(ewin->client.win);
- EUnmapWindow(EoGetWin(ewin));
+ EoUnmap(ewin);
ModulesSignal(ESIGNAL_EWIN_UNMAP, ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/misc.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- misc.c 19 Mar 2005 16:40:07 -0000 1.63
+++ misc.c 25 Apr 2005 16:02:54 -0000 1.64
@@ -23,6 +23,7 @@
*/
#include "E.h"
#include <sys/time.h>
+#include <time.h>
/* This is a general quicksort algorithm, using median-of-three strategy.
*
@@ -184,11 +185,15 @@
void
Eprintf(const char *fmt, ...)
{
+ static time_t t0 = 0;
va_list args;
struct timeval tv;
+ if (t0 == 0)
+ t0 = time(NULL);
+
gettimeofday(&tv, NULL);
- fprintf(stdout, "[%d] %4ld.%06ld: ", getpid(), tv.tv_sec, tv.tv_usec);
+ fprintf(stdout, "[%d] %4ld.%06ld: ", getpid(), tv.tv_sec - t0, tv.tv_usec);
va_start(args, fmt);
vfprintf(stdout, fmt, args);
va_end(args);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- pager.c 23 Apr 2005 08:28:03 -0000 1.132
+++ pager.c 25 Apr 2005 16:02:54 -0000 1.133
@@ -38,7 +38,6 @@
int desktop;
int w, h;
int dw, dh;
- char visible;
int update_phase;
EWin *ewin;
Window sel_win;
@@ -95,7 +94,6 @@
p->pmap = ECreatePixmap(p->win, p->w, p->h, VRoot.depth);
ESetWindowBackgroundPixmap(p->win, p->pmap);
p->desktop = 0;
- p->visible = 0;
p->update_phase = 0;
p->ewin = NULL;
p->sel_win = ECreateWindow(p->win, 0, 0, p->w / ax, p->h / ay, 0);
@@ -161,6 +159,7 @@
PagerUpdateTimeout(int val __UNUSED__, void *data)
{
Pager *p;
+ EWin *ewin;
char s[4096];
static double last_time = 0.0;
double cur_time, in;
@@ -186,11 +185,12 @@
DoIn(s, in, PagerUpdateTimeout, 0, p);
if (!Conf.pagers.snap)
return;
- if (!p->visible)
+ ewin = p->ewin;
+ if (!ewin || !EoIsShown(ewin))
return;
if (p->desktop != DesksGetCurrent())
return;
- if (p->ewin && p->ewin->visibility == VisibilityFullyObscured)
+ if (ewin->visibility == VisibilityFullyObscured)
return;
if (Mode.mode != MODE_NONE)
return;
@@ -560,7 +560,7 @@
p->dw = w / ax;
p->dh = h / ay;
p->pmap = ECreatePixmap(p->win, p->w, p->h, VRoot.depth);
- if (p->visible)
+ if (EoIsShown(ewin))
PagerRedraw(p, 1);
ESetWindowBackgroundPixmap(p->win, p->pmap);
EClearWindow(p->win);
@@ -667,7 +667,6 @@
ewin->client.height.max = 240 * ay;
p->ewin = ewin;
- p->visible = 1;
/* get the size right damnit! */
w = ewin->client.w;
@@ -974,7 +973,7 @@
static void
PagerClose(Pager * p)
{
- EUnmapWindow(p->win);
+ HideEwin(p->ewin);
}
static void
@@ -1946,9 +1945,9 @@
}
else if (!enable && Conf.pagers.enable)
{
- Conf.pagers.enable = 0;
for (i = 0; i < Conf.desks.num; i++)
PagersDisableForDesktop(i);
+ Conf.pagers.enable = 0;
}
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
