Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h alert.c areas.c desktops.c emodule.c emodule.h ewin-ops.c
ewins.c fx.c iclass.c iconify.c main.c mod-bg.c mod-btn.c
mod-desks.c mod-menus.c mod-sound.c mod-tt.c moveresize.c
pager.c slideout.c snaps.c tclass.c text.c theme.c warp.c
Log Message:
Iconboxes are now cleanly modular.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.30
retrieving revision 1.314.2.31
diff -u -3 -r1.314.2.30 -r1.314.2.31
--- E.h 27 Aug 2004 00:03:27 -0000 1.314.2.30
+++ E.h 27 Aug 2004 21:31:51 -0000 1.314.2.31
@@ -484,7 +484,6 @@
typedef struct _ditem DItem;
typedef struct _pager Pager;
typedef struct _snapshot Snapshot;
-typedef struct _iconbox Iconbox;
typedef struct _group Group;
typedef struct _button Button;
typedef struct _slideout Slideout;
@@ -840,11 +839,11 @@
char focusclick;
char neverfocus;
char no_actions;
+ void *data;
Menu *menu;
Window shownmenu;
Dialog *dialog;
Pager *pager;
- Iconbox *ibox;
int area_x;
int area_y;
char *session_id;
@@ -862,6 +861,8 @@
struct
{
unsigned vroot:1; /* Virtual root window */
+ unsigned inhibit_iconify:1;
+ unsigned autosave:1;
unsigned int opacity;
} props;
struct
@@ -2041,12 +2042,6 @@
int make_mask, int image_type);
void FreePmapMask(PmapMask * pmm);
-/* iconify.c */
-void RemoveMiniIcon(EWin * ewin);
-void IconboxesEwinIconify(EWin * ewin);
-void IconboxesEwinDeIconify(EWin * ewin);
-void IconboxesUpdateEwinIcon(EWin * ewin, int icon_mode);
-
/* init.c */
void SetupFallbackClasses(void);
@@ -2336,11 +2331,6 @@
const char *text);
/* text.c */
-#define ExTextExtents XmbTextExtents
-#define ExDrawString XmbDrawString
-TextState *TextGetState(TextClass * tclass, int active, int sticky,
- int state);
-void TextStateLoadFont(TextState * ts);
void TextSize(TextClass * tclass, int active, int sticky,
int state, const char *text, int *width,
int *height, int fsize);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/alert.c,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -3 -r1.34.2.1 -r1.34.2.2
--- alert.c 22 Aug 2004 20:03:48 -0000 1.34.2.1
+++ alert.c 27 Aug 2004 21:31:52 -0000 1.34.2.2
@@ -22,6 +22,9 @@
*/
#include "E.h"
+#define ExTextExtents XmbTextExtents
+#define ExDrawString XmbDrawString
+
static void ShowAlert(char *text);
static int (*IgnoreFunction) (const void *) = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/areas.c,v
retrieving revision 1.71.2.5
retrieving revision 1.71.2.6
diff -u -3 -r1.71.2.5 -r1.71.2.6
--- areas.c 24 Aug 2004 23:37:52 -0000 1.71.2.5
+++ areas.c 27 Aug 2004 21:31:52 -0000 1.71.2.6
@@ -259,7 +259,7 @@
if (EventDebug(EDBUG_TYPE_DESKS))
Eprintf("SetCurrentArea %d,%d\n", ax, ay);
- ModulesSignal(ESIGNAL_AREA_SWITCH_START);
+ ModulesSignal(ESIGNAL_AREA_SWITCH_START, NULL);
dx = VRoot.w * (ax - desks.desk[desks.current].current_area_x);
dy = VRoot.h * (ay - desks.desk[desks.current].current_area_y);
@@ -339,7 +339,7 @@
/* re-focus on a new ewin on that new desktop area */
FocusNewDesk();
- ModulesSignal(ESIGNAL_AREA_SWITCH_DONE);
+ ModulesSignal(ESIGNAL_AREA_SWITCH_DONE, NULL);
/* update which "edge flip resistance" detector windows are visible */
EdgeWindowsShow();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.95.2.11
retrieving revision 1.95.2.12
diff -u -3 -r1.95.2.11 -r1.95.2.12
--- desktops.c 24 Aug 2004 23:37:52 -0000 1.95.2.11
+++ desktops.c 27 Aug 2004 21:31:52 -0000 1.95.2.12
@@ -706,7 +706,7 @@
if (EventDebug(EDBUG_TYPE_DESKS))
Eprintf("GotoDesktop %d\n", desk);
- ModulesSignal(ESIGNAL_DESK_SWITCH_START);
+ ModulesSignal(ESIGNAL_DESK_SWITCH_START, NULL);
ActionsSuspend();
@@ -776,7 +776,7 @@
ActionsResume();
FocusNewDesk();
- ModulesSignal(ESIGNAL_DESK_SWITCH_DONE);
+ ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
if (Mode.mode == MODE_DESKSWITCH)
Mode.mode = MODE_NONE;
@@ -919,7 +919,7 @@
StackDesktop(desks.current);
FocusNewDesk();
#if 0 /* FIXME - TBD */
- ModulesSignal(ESIGNAL_DESK_SWITCH_DONE);
+ ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
#endif
RedrawPagersForDesktop(desk, 3);
ForceUpdatePagersForDesktop(desk);
@@ -949,7 +949,7 @@
MoveStickyWindowsToCurrentDesk();
StackDesktop(desks.current);
#if 0 /* FIXME - TBD */
- ModulesSignal(ESIGNAL_DESK_SWITCH_DONE);
+ ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL);
#endif
RedrawPagersForDesktop(desks.order[0], 3);
ForceUpdatePagersForDesktop(desks.order[0]);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/emodule.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- emodule.c 7 Aug 2004 15:34:26 -0000 1.1.2.2
+++ emodule.c 27 Aug 2004 21:31:52 -0000 1.1.2.3
@@ -225,13 +225,13 @@
}
void
-ModulesSignal(int sig)
+ModulesSignal(int sig, void *prm)
{
int i;
for (i = 0; i < n_modules; i++)
if (p_modules[i]->Signal)
- p_modules[i]->Signal(sig);
+ p_modules[i]->Signal(sig, prm);
}
#if 0
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/emodule.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- emodule.h 24 Aug 2004 23:37:53 -0000 1.1.2.2
+++ emodule.h 27 Aug 2004 21:31:52 -0000 1.1.2.3
@@ -29,7 +29,7 @@
{
const char *name;
const char *nick;
- void (*Signal) (int sig);
+ void (*Signal) (int sig, void *prm);
int (*ConfigLoad) (FILE * fs);
int (*ConfigSave) (FILE * fs);
void (*Configure) (const char *params);
@@ -59,6 +59,11 @@
ESIGNAL_MOVE_DONE,
ESIGNAL_RESIZE_START,
ESIGNAL_RESIZE_DONE,
+ ESIGNAL_EWIN_CREATE,
+ ESIGNAL_EWIN_DESTROY,
+ ESIGNAL_EWIN_ICONIFY,
+ ESIGNAL_EWIN_DEICONIFY,
+ ESIGNAL_EWIN_CHANGE_ICON,
} e_signal_t;
#if 0 /* Maybe later */
@@ -80,7 +85,7 @@
int ModuleCommand(const char *name, const char *cmd,
const char *params);
-void ModulesSignal(int signal);
+void ModulesSignal(int signal, void *prm);
void ModulesConfigShow(void);
#if 0
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ewin-ops.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- ewin-ops.c 15 Aug 2004 16:25:32 -0000 1.1.2.1
+++ ewin-ops.c 27 Aug 2004 21:31:53 -0000 1.1.2.2
@@ -348,7 +348,7 @@
if (GetZoomEWin() == ewin)
Zoom(NULL);
- if (ewin->ibox)
+ if (ewin->props.inhibit_iconify)
EDBUG_RETURN_;
if (ewin->state == EWIN_STATE_ICONIC)
@@ -360,7 +360,7 @@
was_shaded = ewin->shaded;
- IconboxesEwinIconify(ewin);
+ ModulesSignal(ESIGNAL_EWIN_ICONIFY, ewin);
HideEwin(ewin);
@@ -416,8 +416,6 @@
if (ewin->state != EWIN_STATE_ICONIC)
EDBUG_RETURN_;
- RemoveMiniIcon(ewin);
-
x = ewin->req_x;
y = ewin->req_y;
@@ -447,7 +445,7 @@
ewin->iconified = 0;
- IconboxesEwinDeIconify(ewin);
+ ModulesSignal(ESIGNAL_EWIN_DEICONIFY, ewin);
RaiseEwin(ewin);
ShowEwin(ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ewins.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- ewins.c 24 Aug 2004 18:15:11 -0000 1.1.2.6
+++ ewins.c 27 Aug 2004 21:31:53 -0000 1.1.2.7
@@ -163,8 +163,7 @@
UnmatchEwinToSnapInfo(ewin);
- if (ewin->iconified > 0)
- RemoveMiniIcon(ewin);
+ ModulesSignal(ESIGNAL_EWIN_DESTROY, ewin);
lst = EwinListTransientFor(ewin, &num);
for (i = 0; i < num; i++)
@@ -602,7 +601,9 @@
/* if its iconified - de-iconify */
if (ewin->iconified)
{
+#if 0 /* FIXME - When do we need this? */
RemoveMiniIcon(ewin);
+#endif
ewin->desktop = desks.current;
MoveEwinToArea(ewin, desks.desk[desks.current].current_area_x,
desks.desk[desks.current].current_area_y);
@@ -1634,8 +1635,7 @@
if (EWinChanges.flags & EWIN_CHANGE_ICON_PMAP)
{
- if (ewin->iconified)
- IconboxesUpdateEwinIcon(ewin, 1);
+ ModulesSignal(ESIGNAL_EWIN_CHANGE_ICON, ewin);
}
EWinChanges.flags = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.41.2.6
retrieving revision 1.41.2.7
diff -u -3 -r1.41.2.6 -r1.41.2.7
--- fx.c 26 Aug 2004 23:21:00 -0000 1.41.2.6
+++ fx.c 27 Aug 2004 21:31:53 -0000 1.41.2.7
@@ -984,7 +984,7 @@
*/
static void
-FxSighan(int sig)
+FxSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.46.2.3
retrieving revision 1.46.2.4
diff -u -3 -r1.46.2.3 -r1.46.2.4
--- iclass.c 25 Aug 2004 21:56:57 -0000 1.46.2.3
+++ iclass.c 27 Aug 2004 21:31:53 -0000 1.46.2.4
@@ -1224,7 +1224,7 @@
*/
static void
-ImageclassSighan(int sig)
+ImageclassSighan(int sig, void *prm __UNUSED__)
{
ImageClass *ic;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.116.2.12
retrieving revision 1.116.2.13
diff -u -3 -r1.116.2.12 -r1.116.2.13
--- iconify.c 27 Aug 2004 00:03:28 -0000 1.116.2.12
+++ iconify.c 27 Aug 2004 21:31:53 -0000 1.116.2.13
@@ -23,6 +23,8 @@
#include "E.h"
#include <math.h>
+typedef struct _iconbox Iconbox;
+
void UpdateAppIcon(EWin * ewin, int imode);
Iconbox *SelectIconboxForEwin(EWin * ewin);
@@ -450,7 +452,7 @@
IconboxEwinMoveResize(EWin * ewin, int resize __UNUSED__)
{
static int call_depth = 0; /* Ugly! */
- Iconbox *ib = ewin->ibox;
+ Iconbox *ib = ewin->data;
if (!ib || call_depth > 0)
return;
@@ -474,7 +476,7 @@
static void
IconboxEwinRefresh(EWin * ewin)
{
- Iconbox *ib = ewin->ibox;
+ Iconbox *ib = ewin->data;
if (!ib)
return;
@@ -489,17 +491,20 @@
static void
IconboxEwinClose(EWin * ewin)
{
- IconboxDestroy(ewin->ibox);
- ewin->ibox = NULL;
+ IconboxDestroy(ewin->data);
+ ewin->data = NULL;
}
static void
IconboxEwinInit(EWin * ewin, void *ptr)
{
- ewin->ibox = (Iconbox *) ptr;
+ ewin->data = (Iconbox *) ptr;
ewin->MoveResize = IconboxEwinMoveResize;
ewin->Refresh = IconboxEwinRefresh;
ewin->Close = IconboxEwinClose;
+
+ ewin->props.inhibit_iconify = 1;
+ ewin->props.autosave = 1;
}
static void
@@ -596,7 +601,7 @@
}
}
-void
+static void
IconboxesEwinIconify(EWin * ewin)
{
Iconbox *ib;
@@ -613,7 +618,7 @@
}
}
-void
+static void
IconboxesEwinDeIconify(EWin * ewin)
{
Iconbox *ib;
@@ -625,7 +630,7 @@
IB_Animate(0, ewin, ib->ewin);
}
-void
+static void
RemoveMiniIcon(EWin * ewin)
{
Iconbox *ib;
@@ -1175,7 +1180,7 @@
}
}
-void
+static void
IconboxesUpdateEwinIcon(EWin * ewin, int icon_mode)
{
Iconbox **ib;
@@ -3022,13 +3027,34 @@
*/
static void
-IconboxesSighan(int sig)
+IconboxesSighan(int sig, void *prm)
{
+ EWin *ewin;
+
switch (sig)
{
case ESIGNAL_START:
IconboxesShow();
break;
+ case ESIGNAL_EWIN_ICONIFY:
+ ewin = (EWin *) prm;
+ IconboxesEwinIconify(ewin);
+ break;
+ case ESIGNAL_EWIN_DEICONIFY:
+ ewin = (EWin *) prm;
+ RemoveMiniIcon(ewin);
+ IconboxesEwinDeIconify(ewin);
+ break;
+ case ESIGNAL_EWIN_DESTROY:
+ ewin = (EWin *) prm;
+ if (ewin->iconified > 0)
+ RemoveMiniIcon(ewin);
+ break;
+ case ESIGNAL_EWIN_CHANGE_ICON:
+ ewin = (EWin *) prm;
+ if (ewin->iconified)
+ IconboxesUpdateEwinIcon(ewin, 1);
+ break;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.99.2.13
retrieving revision 1.99.2.14
diff -u -3 -r1.99.2.13 -r1.99.2.14
--- main.c 27 Aug 2004 00:03:28 -0000 1.99.2.13
+++ main.c 27 Aug 2004 21:31:53 -0000 1.99.2.14
@@ -203,7 +203,7 @@
UngrabX();
EwinsInit();
- ModulesSignal(ESIGNAL_INIT);
+ ModulesSignal(ESIGNAL_INIT, NULL);
/* make all of our fallback classes */
SetupFallbackClasses();
@@ -330,7 +330,7 @@
Mode.wm.startup = 0;
- ModulesSignal(ESIGNAL_START);
+ ModulesSignal(ESIGNAL_START, NULL);
/* Update pagers */
for (i = 0; i < Conf.desks.num; i++)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-bg.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -3 -r1.1.2.7 -r1.1.2.8
--- mod-bg.c 25 Aug 2004 21:56:58 -0000 1.1.2.7
+++ mod-bg.c 27 Aug 2004 21:31:54 -0000 1.1.2.8
@@ -94,7 +94,7 @@
}
static void
-BackgroundsSighan(int sig)
+BackgroundsSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-btn.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- mod-btn.c 24 Aug 2004 23:37:54 -0000 1.1.2.2
+++ mod-btn.c 27 Aug 2004 21:31:54 -0000 1.1.2.3
@@ -29,7 +29,7 @@
*/
static void
-ButtonsSighan(int sig)
+ButtonsSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-desks.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- mod-desks.c 25 Aug 2004 21:56:58 -0000 1.1.2.4
+++ mod-desks.c 27 Aug 2004 21:31:54 -0000 1.1.2.5
@@ -28,7 +28,7 @@
*/
static void
-DesktopsSighan(int sig)
+DesktopsSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-menus.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- mod-menus.c 24 Aug 2004 23:37:54 -0000 1.1.2.4
+++ mod-menus.c 27 Aug 2004 21:31:54 -0000 1.1.2.5
@@ -28,7 +28,7 @@
*/
static void
-MenusSighan(int sig)
+MenusSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-sound.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- mod-sound.c 8 Aug 2004 00:02:19 -0000 1.1.2.4
+++ mod-sound.c 27 Aug 2004 21:31:54 -0000 1.1.2.5
@@ -28,7 +28,7 @@
*/
static void
-SoundSighan(int sig)
+SoundSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-tt.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -3 -r1.1.2.7 -r1.1.2.8
--- mod-tt.c 24 Aug 2004 23:37:54 -0000 1.1.2.7
+++ mod-tt.c 27 Aug 2004 21:31:54 -0000 1.1.2.8
@@ -102,7 +102,7 @@
*/
static void
-TooltipsSighan(int sig)
+TooltipsSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -3 -r1.22.2.3 -r1.22.2.4
--- moveresize.c 24 Aug 2004 23:37:55 -0000 1.22.2.3
+++ moveresize.c 27 Aug 2004 21:31:54 -0000 1.22.2.4
@@ -46,7 +46,7 @@
#endif
SoundPlay("SOUND_MOVE_START");
- ModulesSignal(ESIGNAL_MOVE_START);
+ ModulesSignal(ESIGNAL_MOVE_START, NULL);
if (Conf.movemode > 0)
GrabX();
@@ -161,7 +161,7 @@
if (Conf.movemode > 0)
UngrabX();
- ModulesSignal(ESIGNAL_MOVE_DONE);
+ ModulesSignal(ESIGNAL_MOVE_DONE, NULL);
if (wasresize)
ForceUpdatePagersForDesktop(desks.current);
@@ -269,7 +269,7 @@
mode_moveresize_ewin = ewin;
SoundPlay("SOUND_RESIZE_START");
- ModulesSignal(ESIGNAL_RESIZE_START);
+ ModulesSignal(ESIGNAL_RESIZE_START, NULL);
if (Conf.resizemode > 0)
GrabX();
@@ -388,7 +388,7 @@
if (Conf.resizemode > 0)
UngrabX();
- ModulesSignal(ESIGNAL_RESIZE_DONE);
+ ModulesSignal(ESIGNAL_RESIZE_DONE, NULL);
ForceUpdatePagersForDesktop(desks.current);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.103.2.9
retrieving revision 1.103.2.10
diff -u -3 -r1.103.2.9 -r1.103.2.10
--- pager.c 25 Aug 2004 21:56:58 -0000 1.103.2.9
+++ pager.c 27 Aug 2004 21:31:54 -0000 1.103.2.10
@@ -1767,12 +1767,12 @@
{
PagerEwinMove(p, ewin->pager);
}
- else if ((ewin) && (ewin->ibox))
+ else if ((ewin) && (ewin->type == EWIN_TYPE_ICONBOX))
{
/* Pointer is in iconbox */
/* Don't iconify an iconbox by dragging */
- if (p->hi_ewin->ibox)
+ if (p->hi_ewin->props.inhibit_iconify)
break;
/* Iconify after moving back to pre-drag position */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -3 -r1.22.2.3 -r1.22.2.4
--- slideout.c 24 Aug 2004 23:37:55 -0000 1.22.2.3
+++ slideout.c 27 Aug 2004 21:31:54 -0000 1.22.2.4
@@ -500,7 +500,7 @@
*/
static void
-SlideoutsSighan(int sig)
+SlideoutsSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/snaps.c,v
retrieving revision 1.72.2.1
retrieving revision 1.72.2.2
diff -u -3 -r1.72.2.1 -r1.72.2.2
--- snaps.c 21 Aug 2004 09:09:21 -0000 1.72.2.1
+++ snaps.c 27 Aug 2004 21:31:54 -0000 1.72.2.2
@@ -1258,22 +1258,22 @@
void
RememberImportantInfoForEwin(EWin * ewin)
{
- if ((ewin->pager) || (ewin->ibox))
- {
- if (EventDebug(EDBUG_TYPE_SNAPS))
- Eprintf("RememberImportantInfoForEwin %#lx %s\n",
- ewin->client.win, EwinGetTitle(ewin));
+ if (!ewin->props.autosave && !ewin->pager)
+ return;
- SnapshotEwinBorder(ewin);
- SnapshotEwinDesktop(ewin);
- SnapshotEwinSize(ewin);
- SnapshotEwinLocation(ewin);
- SnapshotEwinLayer(ewin);
- SnapshotEwinSticky(ewin);
- SnapshotEwinShade(ewin);
- SnapshotEwinGroups(ewin, ewin->num_groups);
- SnapshotEwinSkipLists(ewin);
- SnapshotEwinNeverFocus(ewin);
- SaveSnapInfo();
- }
+ if (EventDebug(EDBUG_TYPE_SNAPS))
+ Eprintf("RememberImportantInfoForEwin %#lx %s\n",
+ ewin->client.win, EwinGetTitle(ewin));
+
+ SnapshotEwinBorder(ewin);
+ SnapshotEwinDesktop(ewin);
+ SnapshotEwinSize(ewin);
+ SnapshotEwinLocation(ewin);
+ SnapshotEwinLayer(ewin);
+ SnapshotEwinSticky(ewin);
+ SnapshotEwinShade(ewin);
+ SnapshotEwinGroups(ewin, ewin->num_groups);
+ SnapshotEwinSkipLists(ewin);
+ SnapshotEwinNeverFocus(ewin);
+ SaveSnapInfo();
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tclass.c,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -3 -r1.27.2.1 -r1.27.2.2
--- tclass.c 22 Aug 2004 20:04:07 -0000 1.27.2.1
+++ tclass.c 27 Aug 2004 21:31:54 -0000 1.27.2.2
@@ -486,7 +486,7 @@
*/
static void
-TextclassSighan(int sig)
+TextclassSighan(int sig, void *prm __UNUSED__)
{
TextClass *tc;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/text.c,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -u -3 -r1.43.2.1 -r1.43.2.2
--- text.c 25 Aug 2004 21:56:59 -0000 1.43.2.1
+++ text.c 27 Aug 2004 21:31:54 -0000 1.43.2.2
@@ -22,13 +22,16 @@
*/
#include "E.h"
+#define ExTextExtents XmbTextExtents
+#define ExDrawString XmbDrawString
+
static void TextDrawRotTo(Window win, Drawable * drawable, int x, int y,
int w, int h, TextState * ts);
static void TextDrawRotBack(Window win, Drawable drawable, int x, int y,
int w, int h, TextState * ts);
-TextState *
+static TextState *
TextGetState(TextClass * tclass, int active, int sticky, int state)
{
EDBUG(5, "TextGetState");
@@ -135,7 +138,7 @@
EDBUG_RETURN(list);
}
-void
+static void
TextStateLoadFont(TextState * ts)
{
EDBUG(5, "TextStateLoadFont");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/theme.c,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -3 -r1.37.2.2 -r1.37.2.3
--- theme.c 26 Aug 2004 23:21:02 -0000 1.37.2.2
+++ theme.c 27 Aug 2004 21:31:54 -0000 1.37.2.3
@@ -438,7 +438,7 @@
}
static void
-ThemesSighan(int sig)
+ThemesSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.49.2.3
retrieving revision 1.49.2.4
diff -u -3 -r1.49.2.3 -r1.49.2.4
--- warp.c 22 Aug 2004 20:04:07 -0000 1.49.2.3
+++ warp.c 27 Aug 2004 21:31:54 -0000 1.49.2.4
@@ -330,7 +330,7 @@
*/
static void
-WarplistSighan(int sig)
+WarplistSighan(int sig, void *prm __UNUSED__)
{
switch (sig)
{
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
