Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets/epplets
Modified Files:
E-Mountbox.c E-SD.c E-ScreenSave.c E-ScreenShoot.c Makefile.am
Removed Files:
E-Mountbox.h E-SD.h E-ScreenSave.h E-ScreenShoot.h
Log Message:
Static declarations and global/initialised data in header files is bad.
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Mountbox.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- E-Mountbox.c 31 Mar 2006 22:56:17 -0000 1.25
+++ E-Mountbox.c 12 Apr 2006 23:02:29 -0000 1.26
@@ -17,8 +17,162 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*/
+#include "epplet.h"
+#include "config.h"
+#include <math.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <ctype.h>
-#include "E-Mountbox.h"
+#define FSTAB "/etc/fstab"
+#define PROCMOUNTS "/proc/mounts"
+#define ETCMTAB "/etc/mtab"
+
+#define __BG_IMAGE EROOT"/epplet_data/E-Mountbox/E-Mountbox-bg.png"
+#define __DEFAULT EROOT"/epplet_data/E-Mountbox/E-Mountbox-blockdev.png"
+
+ConfigItem defaults[] = {
+ {"BG_IMAGE", EROOT"/epplet_data/E-Mountbox/E-Mountbox-bg.png"},
+ {"DEFAULT", EROOT"/epplet_data/E-Mountbox/E-Mountbox-blockdev.png"},
+ {"EJECT_MODE", "2"},
+ {"DO_POLL", "1"},
+ {"POLLINTVAL", "5"}
+};
+
+char *default_types[] = {
+ "cd "EROOT"/epplet_data/E-Mountbox/E-Mountbox-cd.png",
+ "fd "EROOT"/epplet_data/E-Mountbox/E-Mountbox-floppy.png",
+ "zip "EROOT"/epplet_data/E-Mountbox/E-Mountbox-zip.png",
+ "jazz "EROOT"/epplet_data/E-Mountbox/E-Mountbox-jazz.png"
+};
+
+typedef enum eject_mode
+{
+ NO_EJECT,
+ MANUAL_EJECT,
+ AUTO_EJECT
+}
+EjectMode;
+
+typedef struct _tile Tile;
+typedef struct _mountpointtype MountPointType;
+typedef struct _mode Mode;
+
+struct _mode
+{
+ EjectMode eject_mode;
+ int do_polling;
+ int polling_interval;
+ int anim_mount;
+ int show_buttons;
+};
+
+struct _mountpointtype
+{
+ char *key;
+ char *imagefile;
+ Imlib_Image *image;
+ MountPointType *next;
+ MountPointType *prev;
+};
+
+typedef struct _mountpoint
+{
+ char *device;
+ char *path;
+ char mounted;
+}
+MountPoint;
+
+struct _tile
+{
+ Imlib_Image *image;
+ MountPoint *mountpoint;
+ Tile *prev;
+ Tile *next;
+};
+
+Mode mode;
+Tile *tiles = NULL;
+Tile *current_tile = NULL;
+int current_tile_index = 0;
+int num_tiles = 0;
+MountPointType *types = NULL;
+int num_types = 0;
+Imlib_Image *bg_image = NULL;
+Imlib_Image *default_image = NULL;
+Epplet_gadget action_area, button_close, button_config, button_help;
+
+/* stuff for the config win */
+Epplet_gadget tbox_key, tbox_file, tbox_default, tbox_bg;
+Epplet_gadget arrow_left, arrow_right, button_add, button_del,
button_add_long;
+Epplet_gadget label_key, label_file, label_interval, label_slider,
hslider_interval;
+Epplet_gadget togglebutton_no_eject, togglebutton_manual_eject,
togglebutton_auto_eject;
+int ejectbuttons[3];
+Window config_win = 0;
+MountPointType *current_type = NULL;
+RGB_buf window_buf = NULL; /* the currently displayed
mountpoint */
+RGB_buf widescreen_buf = NULL; /* the wide image of all
mountpoints */
+RGB_buf widescreen_canvas_buf = NULL; /* only the background */
+
+/* graphx handling */
+int IsTransparent(Imlib_Image * im, int x, int y);
+void UpdateView(int dir, int fast);
+void FreeImages(void);
+void UpdateGraphics(void);
+static void ConfigUpdateDialog(void *data);
+
+/* mount handling */
+void SetupMounts(void);
+void FreeMounts(void);
+void AddMountPoint(char *device, char *path);
+void FreeMountPointTypes(void);
+void AddMountPointType(char *key, char *image);
+void ModifyMountPointType(MountPointType *mpt, char *key, char
*imagefile);
+void DeleteMountPointType(MountPointType *mpt);
+void Mount(MountPoint * mp);
+void Umount(MountPoint * mp);
+void UpdatePolling(void);
+
+/* miscellaneous nitty gritty */
+int ParseFstab(void);
+int ParseProcMounts(void);
+int ParseEtcMtab(void);
+void VisitMountPoints(void);
+MountPoint *FindMountPointByClick(int x, int y);
+void SyncConfigs(void);
+
+/* callbacks/ handlers */
+/*
+static void CallbackEnter(void *data, Window w);
+static void CallbackLeave(void *data, Window w);
+*/
+static void CallbackExpose(void *data, Window win, int x, int y, int w,
int h);
+static void CallbackButtonUp(void *data, Window win, int x, int y, int b);
+static void CallbackExit(void *data);
+static void CallbackSlideLeft(void *data);
+static void CallbackSlideRight(void *data);
+static void CallbackAnimate(void *data);
+static void CallbackHelp(void *data);
+static void CallbackShowMore(void *data);
+static void Callback_ConfigOK(void *data);
+static void Callback_ConfigApply(void *data);
+static void Callback_ConfigCancel(void *data);
+static void Callback_DefaultChange(void *data);
+static void Callback_BGChange(void *data);
+static void Callback_TypeChange(void *data);
+static void Callback_ConfigLeft(void *data);
+static void Callback_ConfigRight(void *data);
+static void Callback_ConfigAdd(void *data);
+static void Callback_ConfigDel(void *data);
+static void Callback_ConfigInterval(void *data);
+#ifdef HAVE_EJECT
+static void Callback_EjectType(void *data);
+#endif
+
+/* config stuff */
+void SetupDefaults(void);
+void SetupGraphx(void);
static void
error_exit(void)
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-SD.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- E-SD.c 31 Mar 2006 22:56:17 -0000 1.19
+++ E-SD.c 12 Apr 2006 23:02:29 -0000 1.20
@@ -31,7 +31,47 @@
#include <esd.h>
#include "utils.h"
#include "esdcloak.h"
-#include "E-SD.h"
+
+Epplet_gadget btn_conf, btn_close, btn_help, btn_ctimer;
+Epplet_gadget p, ctimer_p;
+Window win;
+RGB_buf buf;
+Epplet_gadget da;
+int cloaked = 0;
+extern int load_val;
+extern int load_r;
+extern int load_l;
+extern int colors[];
+static void cb_in (void *data, Window w);
+
+int cloak_anims[] = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
+};
+int cloak_delays[] = {
+ 1, 2, 3, 4, 5, 10, 15, 20, 30, 60, 120
+};
+
+struct {
+ int fd;
+ int vol_l;
+ int vol_r;
+ int vol_ave;
+ int standby;
+} esd;
+
+
+Epplet_gadget lbar, rbar, standby;
+
+
+struct
+{
+ int cloak_anim;
+ int do_cloak;
+ double cloak_delay;
+ double draw_interval;
+ char *dir;
+}
+opt;
/* RATE is sample rate (samples/sec) */
#define BUFS 8 /* number of audio buffers (lag compensation) */
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-ScreenSave.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- E-ScreenSave.c 27 Jun 2002 18:35:52 -0000 1.25
+++ E-ScreenSave.c 12 Apr 2006 23:02:29 -0000 1.26
@@ -27,7 +27,53 @@
#include "epplet.h"
#include "utils.h"
#include "cloak.h"
-#include "E-ScreenSave.h"
+
+Epplet_gadget btn_conf, btn_close, btn_help, btn_ctimer, btn_save;
+Epplet_gadget btn_col, btn_stimer;
+Epplet_gadget p, col_p, ctimer_p, stimer_p;
+Window win;
+RGB_buf buf;
+Epplet_gadget da;
+int cloaked = 0;
+extern int load_val;
+extern int colors[];
+static void cb_in (void *data, Window w);
+
+int cloak_anims[] = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
+};
+int cloak_delays[] = {
+ 1, 2, 3, 4, 5, 10, 15, 20, 30, 60, 120
+};
+int save_delays[] = {
+ 0, 1, 2, 3, 4, 5, 10, 15, 20, 30, 60, 120, 300, 600
+};
+int rand_delays[] = {
+ 0, 30, 60, 90, 120, 180, 240, 300, 600, 900, 1200
+};
+
+struct
+{
+ int quality;
+ int win;
+ int beep;
+ int cloak_anim;
+ int frame;
+ int do_cloak;
+ int rand_cloak;
+ int run_script;
+ double delay;
+ double cloak_delay;
+ double rand_delay;
+ double draw_interval;
+ char *dir;
+ char *file_prefix;
+ char *file_stamp;
+ char *file_type;
+ char *script;
+ char *lock_cmd;
+}
+opt;
Window confwin = 0;
Epplet_gadget txt;
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-ScreenShoot.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- E-ScreenShoot.c 9 Nov 2000 11:42:56 -0000 1.28
+++ E-ScreenShoot.c 12 Apr 2006 23:02:29 -0000 1.29
@@ -26,8 +26,67 @@
#include "epplet.h"
#include "utils.h"
#include "cloak.h"
-#include "E-ScreenShoot.h"
+
#include "E-ScreenShoot_ftp.h"
+
+Epplet_gadget btn_shoot, btn_conf, btn_close, btn_help, btn_ctimer;
+Epplet_gadget tog_win, btn_col, btn_stimer;
+Epplet_gadget sldr_qual;
+Epplet_gadget p, col_p, ctimer_p, stimer_p, grabber_p;
+Window win;
+RGB_buf buf;
+Epplet_gadget da;
+int cloaked = 0;
+extern int load_val;
+extern int colors[];
+static void cb_in (void *data, Window w);
+int invquality = 0;
+
+int cloak_anims[] = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24,25
+};
+int cloak_delays[] = {
+ 1, 2, 3, 4, 5, 10, 15, 20, 30, 60, 120
+};
+int shot_delays[] = {
+ 0, 1, 2, 3, 4, 5, 10, 15, 20, 30, 60, 120
+};
+int rand_delays[] = {
+ 0, 30, 60, 90, 120, 180, 240, 300, 600, 900, 1200
+};
+
+struct
+{
+ int quality;
+ int win;
+ int beep;
+ int cloak_anim;
+ int frame;
+ int do_cloak;
+ int rand_cloak;
+ int run_script;
+ int view_shot;
+ int do_ftp;
+ int ftp_passive;
+ double delay;
+ double cloak_delay;
+ double rand_delay;
+ double draw_interval;
+ char *dir;
+ char *file_prefix;
+ char *file_stamp;
+ char *file_type;
+ char *script;
+ char *viewer;
+ char *ftp_host;
+ char *ftp_user;
+ char *ftp_pass;
+ char *ftp_file;
+ char *ftp_temp;
+ char *ftp_dir;
+ char *grabber;
+}
+opt;
Window confwin = 0;
Epplet_gadget txt_file_prefix;
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/Makefile.am,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- Makefile.am 12 Apr 2006 18:20:45 -0000 1.95
+++ Makefile.am 12 Apr 2006 23:02:29 -0000 1.96
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.95 2006/04/12 18:20:45 kwo Exp $
+# $Id: Makefile.am,v 1.96 2006/04/12 23:02:29 kwo Exp $
edatadir = $(EROOT)
@@ -47,7 +47,7 @@
E_Exec_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_Exec_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
-E_SD_epplet_SOURCES = E-SD.c E-SD.h esdcloak.c utils.c utils.h esdcloak.h
+E_SD_epplet_SOURCES = E-SD.c esdcloak.c utils.c utils.h esdcloak.h
E_SD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
@@ -137,7 +137,7 @@
E_Xss_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_ScreenShoot_epplet_SOURCES = \
-E-ScreenShoot.c E-ScreenShoot.h cloak.c utils.c utils.h cloak.h \
+E-ScreenShoot.c cloak.c utils.c utils.h cloak.h \
E-ScreenShoot_ftp.c E-ScreenShoot_ftp.h
E_ScreenShoot_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
@@ -147,7 +147,7 @@
E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_ScreenSave_epplet_SOURCES = \
-E-ScreenSave.c E-ScreenSave.h cloak.c utils.c utils.h cloak.h
+E-ScreenSave.c cloak.c utils.c utils.h cloak.h
E_ScreenSave_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
@@ -156,7 +156,7 @@
E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) $(X_LIBS)
E_UrlWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir)
-L$(prefix)/lib $(LIBS) $(X_LIBS)
-E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
+E_Mountbox_epplet_SOURCES = E-Mountbox.c
E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
