Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h Makefile.am iconify.c main.c
Removed Files:
Tag: branch-exp
mod-ibox.c
Log Message:
Iconbox stuff into one file.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.29
retrieving revision 1.314.2.30
diff -u -3 -r1.314.2.29 -r1.314.2.30
--- E.h 26 Aug 2004 23:20:59 -0000 1.314.2.29
+++ E.h 27 Aug 2004 00:03:27 -0000 1.314.2.30
@@ -2043,25 +2043,9 @@
/* iconify.c */
void RemoveMiniIcon(EWin * ewin);
-Iconbox *IconboxCreate(const char *name);
-void IconboxDestroy(Iconbox * ib);
-Window IconboxGetWin(Iconbox * ib);
-void IconboxShow(Iconbox * ib);
-void IconboxHide(Iconbox * ib);
-void IconboxAddEwin(Iconbox * ib, EWin * ewin);
-void IconboxDelEwin(Iconbox * ib, EWin * ewin);
-void IconboxUpdateEwinIcon(Iconbox * ib, EWin * ewin,
- int icon_mode);
-void IconboxConfigure(Iconbox * ib);
-Iconbox **IconboxesList(int *num);
void IconboxesEwinIconify(EWin * ewin);
void IconboxesEwinDeIconify(EWin * ewin);
void IconboxesUpdateEwinIcon(EWin * ewin, int icon_mode);
-void IconboxesHandleEvent(XEvent * ev);
-void IB_CompleteRedraw(Iconbox * ib);
-void IconboxesShow(void);
-int IconboxesConfigLoad(FILE * fs);
-int IconboxesConfigSave(FILE * fs);
/* init.c */
void SetupFallbackClasses(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.43.2.11
retrieving revision 1.43.2.12
diff -u -3 -r1.43.2.11 -r1.43.2.12
--- Makefile.am 26 Aug 2004 22:06:38 -0000 1.43.2.11
+++ Makefile.am 27 Aug 2004 00:03:27 -0000 1.43.2.12
@@ -67,7 +67,6 @@
mod-bg.c \
mod-btn.c \
mod-desks.c \
- mod-ibox.c \
mod-menus.c \
mod-misc.c \
mod-sound.c \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.116.2.11
retrieving revision 1.116.2.12
diff -u -3 -r1.116.2.11 -r1.116.2.12
--- iconify.c 25 Aug 2004 21:56:58 -0000 1.116.2.11
+++ iconify.c 27 Aug 2004 00:03:28 -0000 1.116.2.12
@@ -271,35 +271,6 @@
UngrabX();
}
-void
-IconboxesEwinIconify(EWin * ewin)
-{
- Iconbox *ib;
-
- SoundPlay("SOUND_ICONIFY");
-
- ib = SelectIconboxForEwin(ewin);
- if (ib)
- {
- if (ib->animate)
- IB_Animate(1, ewin, ib->ewin);
- UpdateAppIcon(ewin, ib->icon_mode);
- IconboxAddEwin(ib, ewin);
- }
-}
-
-void
-IconboxesEwinDeIconify(EWin * ewin)
-{
- Iconbox *ib;
-
- SoundPlay("SOUND_DEICONIFY");
-
- ib = SelectIconboxForEwin(ewin);
- if (ib && ib->animate)
- IB_Animate(0, ewin, ib->ewin);
-}
-
#if 0 /* Unused */
void
MakeIcon(EWin * ewin)
@@ -312,17 +283,7 @@
}
#endif
-void
-RemoveMiniIcon(EWin * ewin)
-{
- Iconbox *ib;
-
- ib = SelectIconboxForEwin(ewin);
- if (ib)
- IconboxDelEwin(ib, ewin);
-}
-
-Iconbox *
+static Iconbox *
IconboxCreate(const char *name)
{
Iconbox *ib;
@@ -412,7 +373,7 @@
return ib;
}
-void
+static void
IconboxDestroy(Iconbox * ib)
{
int i;
@@ -437,11 +398,13 @@
autosave();
}
-Window
+#if 0 /* Not used */
+static Window
IconboxGetWin(Iconbox * ib)
{
return ib->win;
}
+#endif
static void
IB_Reconfigure(Iconbox * ib)
@@ -539,7 +502,7 @@
ewin->Close = IconboxEwinClose;
}
-void
+static void
IconboxShow(Iconbox * ib)
{
EWin *ewin = NULL;
@@ -582,14 +545,16 @@
Mode.queue_up = pq;
}
-void
+#if 0
+static void
IconboxHide(Iconbox * ib)
{
if (ib->ewin)
HideEwin(ib->ewin);
}
+#endif
-void
+static void
IconboxAddEwin(Iconbox * ib, EWin * ewin)
{
int i;
@@ -606,7 +571,7 @@
IconboxRedraw(ib);
}
-void
+static void
IconboxDelEwin(Iconbox * ib, EWin * ewin)
{
int i, j;
@@ -631,6 +596,45 @@
}
}
+void
+IconboxesEwinIconify(EWin * ewin)
+{
+ Iconbox *ib;
+
+ SoundPlay("SOUND_ICONIFY");
+
+ ib = SelectIconboxForEwin(ewin);
+ if (ib)
+ {
+ if (ib->animate)
+ IB_Animate(1, ewin, ib->ewin);
+ UpdateAppIcon(ewin, ib->icon_mode);
+ IconboxAddEwin(ib, ewin);
+ }
+}
+
+void
+IconboxesEwinDeIconify(EWin * ewin)
+{
+ Iconbox *ib;
+
+ SoundPlay("SOUND_DEICONIFY");
+
+ ib = SelectIconboxForEwin(ewin);
+ if (ib && ib->animate)
+ IB_Animate(0, ewin, ib->ewin);
+}
+
+void
+RemoveMiniIcon(EWin * ewin)
+{
+ Iconbox *ib;
+
+ ib = SelectIconboxForEwin(ewin);
+ if (ib)
+ IconboxDelEwin(ib, ewin);
+}
+
static void
IB_SnapEWin(EWin * ewin)
{
@@ -1065,7 +1069,7 @@
}
#endif
-Iconbox **
+static Iconbox **
IconboxesList(int *num)
{
/* list all currently available Iconboxes */
@@ -1153,7 +1157,7 @@
return ib_sel;
}
-void
+static void
IconboxUpdateEwinIcon(Iconbox * ib, EWin * ewin, int icon_mode)
{
int i;
@@ -2193,14 +2197,14 @@
y = 0;
}
-void
+static void
IB_CompleteRedraw(Iconbox * ib)
{
IB_Reconfigure(ib);
IconboxRedraw(ib);
}
-void
+static void
IconboxesShow(void)
{
int i, num;
@@ -2567,7 +2571,7 @@
data = NULL;
}
-void
+static void
IconboxConfigure(Iconbox * ib)
{
Dialog *d;
@@ -2866,7 +2870,7 @@
*/
#include "conf.h"
-int
+static int
IconboxesConfigLoad(FILE * fs)
{
int err = 0;
@@ -2979,7 +2983,7 @@
return err;
}
-int
+static int
IconboxesConfigSave(FILE * fs)
{
int i, num;
@@ -3012,3 +3016,85 @@
return 0;
}
+
+/*
+ * Iconboxes Module
+ */
+
+static void
+IconboxesSighan(int sig)
+{
+ switch (sig)
+ {
+ case ESIGNAL_START:
+ IconboxesShow();
+ break;
+ }
+}
+
+static void
+IconboxesConfigure(const char *params)
+{
+ Iconbox *ib;
+
+ if (!params || !params[0])
+ params = "DEFAULT";
+
+ ib = FindItem(params, 0, LIST_FINDBY_NAME, LIST_TYPE_ICONBOX);
+ if (ib)
+ IconboxConfigure(ib);
+}
+
+/*
+ * IPC functions
+ */
+static void
+IpcIboxCreate(const char *params, Client * c __UNUSED__)
+{
+ Iconbox *ib, **ibl;
+ int num = 0;
+ char s[64];
+
+ if (params == NULL)
+ {
+ ibl = IconboxesList(&num);
+ if (ibl)
+ Efree(ibl);
+ Esnprintf(s, sizeof(s), "_IB_%i", num);
+ params = s;
+ }
+ ib = IconboxCreate(params);
+ IconboxShow(ib);
+}
+
+IpcItem IconboxesIpcArray[] = {
+ {
+ IpcIboxCreate,
+ "iconbox", "ibox",
+ "Create a new iconbox",
+ "."}
+ ,
+};
+#define N_IPC_FUNCS (sizeof(IconboxesIpcArray)/sizeof(IpcItem))
+
+#if 0
+/*
+ * Configuration items
+ */
+static const CfgItem IconboxesCfgItems[] = {
+ CFG_ITEM_BOOL(Conf.iconboxes, enable, 1),
+};
+#define N_CFG_ITEMS (sizeof(IconboxesCfgItems)/sizeof(CfgItem))
+#endif
+
+/*
+ * Module descriptor
+ */
+EModule ModIconboxes = {
+ "iconboxes", "ibox",
+ IconboxesSighan,
+ IconboxesConfigLoad, IconboxesConfigSave,
+ IconboxesConfigure,
+ {0, NULL},
+ {N_IPC_FUNCS, IconboxesIpcArray}
+};
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.99.2.12
retrieving revision 1.99.2.13
diff -u -3 -r1.99.2.12 -r1.99.2.13
--- main.c 26 Aug 2004 23:21:00 -0000 1.99.2.12
+++ main.c 27 Aug 2004 00:03:28 -0000 1.99.2.13
@@ -244,7 +244,6 @@
CreateStartupDisplay(0);
/* Set up the iconboxes and pagers */
- IconboxesShow();
if (Conf.pagers.enable)
{
Conf.pagers.enable = 0;
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
