e16
/
e16-epplets
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Thu Feb 10 23:27:41 2005 Michael Jennings (mej) 

Rename package back to just "epplets."

Allow for ~/.e16 in addition to ~/.enlightenment.

Fix E-Disk for 2.6 kernels.
----------------------------------------------------------------------


SVN revision: 13307
This commit is contained in:
Michael Jennings 2005-02-11 04:29:17 +00:00
parent 4a0bc0867d
commit 7910f9603f
5 changed files with 213 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -12,3 +12,11 @@ Wed Jan 5 15:12:34 2005 Michael Jennings (mej)
Oops, wrong imlib. :)
----------------------------------------------------------------------
Thu Feb 10 23:27:41 2005 Michael Jennings (mej)
Rename package back to just "epplets."
Allow for ~/.e16 in addition to ~/.enlightenment.
Fix E-Disk for 2.6 kernels.
----------------------------------------------------------------------

25
api/epplet.c
View File

@ -5495,12 +5495,25 @@ static void
Epplet_find_instance(char *name)
{
struct stat st;
char s[1024];
char s[1024], *tmpdir;
int i = 0, fd;
pid_t pid;
/* Find E dir */
Esnprintf(s, sizeof(s), "%s/.e16", getenv("HOME"));
if (stat(s, &st) < 0)
{
Esnprintf(s, sizeof(s), "%s/.enlightenment", getenv("HOME"));
if (stat(s, &st) < 0)
{
Esnprintf(s, sizeof(s), "%s/.enlightenment", getenv("HOME"));
mkdir(s, S_IRWXU);
}
}
tmpdir = strdup(s);
/* make sure basic dir exists */
Esnprintf(s, sizeof(s), "%s/.enlightenment/epplet_config", getenv("HOME"));
Esnprintf(s, sizeof(s), "%s/epplet_config", tmpdir);
if (stat(s, &st) < 0)
{
if (mkdir(s, S_IRWXU) < 0)
@ -5512,14 +5525,16 @@ Epplet_find_instance(char *name)
s, strerror(errno));
Epplet_dialog_ok(err);
epplet_instance = 1;
free(tmpdir);
return;
}
}
/* make sure this epplets config dir exists */
Esnprintf(s, sizeof(s), "%s/.enlightenment/epplet_config/%s",
getenv("HOME"), name);
/* make sure this epplet's config dir exists */
Esnprintf(s, sizeof(s), "%s/epplet_config/%s", tmpdir, name);
conf_dir = strdup(s);
free(tmpdir);
if (stat(s, &st) < 0)
{
if (mkdir(s, S_IRWXU) < 0)

2
configure.in
View File

@ -1,7 +1,7 @@
dnl# $Id$
AC_INIT(api/epplet.c)
AM_INIT_AUTOMAKE(enlightenment-epplets, 0.8)
AM_INIT_AUTOMAKE(epplets, 0.8)
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then

18
epplets.spec
View File

@ -1,21 +1,22 @@
%define use_gnome %{?_with_gnome}0
%define use_gnome %{?_with_gnome:1}0
Summary: Enlightenment Epplets
Name: enlightenment-epplets
Name: epplets
Version: 0.8
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: User Interface/X
URL: http://www.enlightenment.org/
Source0: http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
Packager: %{?_packager:%{_packager}}%{!?_packager:%{_vendor}}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Source: http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: freeglut-devel xorg-x11-devel
BuildRequires: imlib-devel XFree86-devel
Requires: enlightenment >= 0.16.0
Provides: epplets = %{version}
Obsoletes: epplets
Provides: enlightenment-epplets = %{version}
Provides: e16-epplets = %{version}
Obsoletes: enlightenment-epplets
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
@ -40,6 +41,7 @@ export CFLAGS
%{__make} %{?_smp_mflags} %{?mflags}
%install
test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
%ifos linux
@ -51,7 +53,7 @@ export CFLAGS
%endif
%clean
rm -rf $RPM_BUILD_ROOT
test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)

334
epplets/E-Disk.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1999-2000, Michael Jennings
* Copyright (C) 1999-2005, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -51,205 +51,219 @@ static void parse_conf(void);
static void
show_size(unsigned long n, char *buff)
{
if (n < 1024) {
sprintf(buff, "%lu b", n);
} else if (n < 1024 * 1024) {
sprintf(buff, "%lu k", n / 1024);
} else if (n < 1024 * 1024 * 1024) {
sprintf(buff, "%lu M", n / (1024 * 1024));
} else {
sprintf(buff, "%lu G", n / (1024 * 1024 * 1024));
}
if (n < 1024) {
sprintf(buff, "%lu b", n);
} else if (n < 1024 * 1024) {
sprintf(buff, "%lu k", n / 1024);
} else if (n < 1024 * 1024 * 1024) {
sprintf(buff, "%lu M", n / (1024 * 1024));
} else {
sprintf(buff, "%lu G", n / (1024 * 1024 * 1024));
}
}
static void
timer_cb(void *data) {
FILE *fp;
char buff[1024];
unsigned long a, b, c, d, e;
unsigned long in_blks, out_blks;
static unsigned long last_in = 0, last_out = 0, in_delta = 0, out_delta = 0;
FILE *fp;
char buff[1024];
unsigned long a, b, c, d, e;
unsigned long in_blks = 0, out_blks = 0;
static unsigned long last_in = 0, last_out = 0, in_delta = 0, out_delta = 0;
if ((fp = fopen("/proc/stat", "r")) == NULL) {
D(("Failed to open /proc/stat -- %s\n", strerror(errno)));
if ((fp = fopen("/proc/diskstats", "r")) == NULL) {
if ((fp = fopen("/proc/stat", "r")) == NULL) {
D(("Failed to open /proc/stat -- %s\n", strerror(errno)));
return;
}
}
for (; fgets(buff, sizeof(buff), fp);) {
if (BEGMATCH(buff, "disk_rblk")) {
sscanf(buff, "%*s %lu %lu %lu %lu", &a, &b, &c, &d);
in_blks = a + b + c + d;
fgets(buff, sizeof(buff), fp);
sscanf(buff, "%*s %lu %lu %lu %lu", &a, &b, &c, &d);
out_blks = a + b + c + d;
} else if (BEGMATCH(buff, "disk_io")) {
char *pbuff = buff + 9;
for (in_blks = out_blks = 0; *pbuff == '('; pbuff = strchr(pbuff, ' ') + 1) {
pbuff = strchr(++pbuff, '(');
sscanf(++pbuff, "%lu,%lu,%lu,%lu,%lu", &a, &b, &c, &d, &e);
in_blks += c;
out_blks += e;
}
} else {
char tmp[64];
/* Hopefully no one can exploit /proc/diskstats without root. :-) */
sscanf(buff, "%lu %lu %s %*u %*u %lu %*u %*u %*u %lu", &a, &b, tmp, &c, &d);
/* Check for hdX or sdX, or md#, or...??? */
if ((((*tmp == 'h') || (*tmp == 's')) && (tmp[1] == 'd') && (isalpha(tmp[2])) && (tmp[3] == 0))
|| ((*tmp == 'm') && (tmp[1] == 'd') && (isdigit(tmp[2])))) {
in_blks += c;
out_blks += d;
}
}
}
in_blks -= last_in;
out_blks -= last_out;
fclose(fp);
if (last_in) {
/* We must have some history data to do anything. */
if (in_blks > max_in) {
max_in = in_blks;
Esnprintf(buff, sizeof(buff), "%lu", max_in);
Epplet_modify_config("max_in", buff);
}
if (in_blks != in_delta) {
in_val = (int) ((((float) in_blks) / max_in) * 100.0);
Epplet_gadget_data_changed(in_bar);
sprintf(buff, "I: ");
show_size(in_blks * 512, buff + 3);
strcat(buff, "/s");
Epplet_change_label(in_label, buff);
}
in_delta = in_blks;
}
last_in += in_blks;
if (last_out) {
/* We must have some history data to do anything. */
if (out_blks > max_out) {
max_out = out_blks;
Esnprintf(buff, sizeof(buff), "%lu", max_out);
Epplet_modify_config("max_out", buff);
}
if (out_blks != out_delta) {
out_val = (int) ((((float) out_blks) / max_out) * 100.0);
Epplet_gadget_data_changed(out_bar);
sprintf(buff, "O: ");
show_size(out_blks * 512, buff + 3);
strcat(buff, "/s");
Epplet_change_label(out_label, buff);
}
out_delta = out_blks;
}
last_out += out_blks;
Esync();
Epplet_timer(timer_cb, NULL, 1.0, "TIMER");
return;
}
for (; fgets(buff, sizeof(buff), fp);) {
if (BEGMATCH(buff, "disk_rblk")) {
sscanf(buff, "%*s %lu %lu %lu %lu", &a, &b, &c, &d);
in_blks = a + b + c + d - last_in;
fgets(buff, sizeof(buff), fp);
sscanf(buff, "%*s %lu %lu %lu %lu", &a, &b, &c, &d);
out_blks = a + b + c + d - last_out;
} else if (BEGMATCH(buff, "disk_io")) {
char *pbuff = buff + 9;
for (in_blks = out_blks = 0; *pbuff == '('; pbuff = strchr(pbuff, ' ') + 1) {
pbuff = strchr(++pbuff, '(');
sscanf(++pbuff, "%lu,%lu,%lu,%lu,%lu", &a, &b, &c, &d, &e);
in_blks += c;
out_blks += e;
}
in_blks -= last_in;
out_blks -= last_out;
}
}
fclose(fp);
if (last_in) {
/* We must have some history data to do anything. */
if (in_blks > max_in) {
max_in = in_blks;
Esnprintf(buff, sizeof(buff), "%lu", max_in);
Epplet_modify_config("max_in", buff);
}
if (in_blks != in_delta) {
in_val = (int) ((((float) in_blks) / max_in) * 100.0);
Epplet_gadget_data_changed(in_bar);
sprintf(buff, "I: ");
show_size(in_blks * 512, buff + 3);
strcat(buff, "/s");
Epplet_change_label(in_label, buff);
}
in_delta = in_blks;
}
last_in += in_blks;
if (last_out) {
/* We must have some history data to do anything. */
if (out_blks > max_out) {
max_out = out_blks;
Esnprintf(buff, sizeof(buff), "%lu", max_out);
Epplet_modify_config("max_out", buff);
}
if (out_blks != out_delta) {
out_val = (int) ((((float) out_blks) / max_out) * 100.0);
Epplet_gadget_data_changed(out_bar);
sprintf(buff, "O: ");
show_size(out_blks * 512, buff + 3);
strcat(buff, "/s");
Epplet_change_label(out_label, buff);
}
out_delta = out_blks;
}
last_out += out_blks;
Esync();
Epplet_timer(timer_cb, NULL, 1.0, "TIMER");
return;
data = NULL;
data = NULL;
}
static void
close_cb(void *data) {
Epplet_unremember();
Esync();
exit(0);
data = NULL;
Epplet_unremember();
Esync();
exit(0);
data = NULL;
}
static void
title_cb(void *data) {
show_title = !show_title;
if (show_title) {
Epplet_gadget_move(in_label, 3, 13);
Epplet_gadget_move(out_label, 3, 30);
Epplet_gadget_move(in_bar, 3, 22);
Epplet_gadget_move(out_bar, 3, 39);
Epplet_gadget_show(title);
} else {
Epplet_gadget_move(in_label, 4, 4);
Epplet_gadget_move(out_label, 4, 24);
Epplet_gadget_move(in_bar, 4, 14);
Epplet_gadget_move(out_bar, 4, 36);
Epplet_gadget_hide(title);
}
Epplet_modify_config("title", (show_title ? "1" : "0"));
Epplet_redraw();
return;
data = NULL;
show_title = !show_title;
if (show_title) {
Epplet_gadget_move(in_label, 3, 13);
Epplet_gadget_move(out_label, 3, 30);
Epplet_gadget_move(in_bar, 3, 22);
Epplet_gadget_move(out_bar, 3, 39);
Epplet_gadget_show(title);
} else {
Epplet_gadget_move(in_label, 4, 4);
Epplet_gadget_move(out_label, 4, 24);
Epplet_gadget_move(in_bar, 4, 14);
Epplet_gadget_move(out_bar, 4, 36);
Epplet_gadget_hide(title);
}
Epplet_modify_config("title", (show_title ? "1" : "0"));
Epplet_redraw();
return;
data = NULL;
}
static void
in_cb(void *data, Window w) {
if (w == Epplet_get_main_window()) {
Epplet_gadget_show(close_button);
Epplet_gadget_show(cfg_button);
}
return;
data = NULL;
if (w == Epplet_get_main_window()) {
Epplet_gadget_show(close_button);
Epplet_gadget_show(cfg_button);
}
return;
data = NULL;
}
static void
out_cb(void *data, Window w) {
if (w == Epplet_get_main_window()) {
Epplet_gadget_hide(close_button);
Epplet_gadget_hide(cfg_button);
}
return;
data = NULL;
if (w == Epplet_get_main_window()) {
Epplet_gadget_hide(close_button);
Epplet_gadget_hide(cfg_button);
}
return;
data = NULL;
}
static void
parse_conf(void) {
char *s;
char *s;
s = Epplet_query_config("max_in");
if (s) {
max_in = strtoul(s, (char **) NULL, 10);
}
s = Epplet_query_config("max_out");
if (s) {
max_out = strtoul(s, (char **) NULL, 10);
}
show_title = atoi(Epplet_query_config_def("title", "1"));
s = Epplet_query_config("max_in");
if (s) {
max_in = strtoul(s, (char **) NULL, 10);
}
s = Epplet_query_config("max_out");
if (s) {
max_out = strtoul(s, (char **) NULL, 10);
}
show_title = atoi(Epplet_query_config_def("title", "1"));
}
int
main(int argc, char **argv) {
int prio;
int prio;
prio = getpriority(PRIO_PROCESS, getpid());
setpriority(PRIO_PROCESS, getpid(), prio + 10);
atexit(Epplet_cleanup);
Epplet_Init("E-Disk", "0.2", "Enlightenment Disk I/O Monitor Epplet", 3, 3, argc, argv, 0);
Epplet_load_config();
parse_conf();
prio = getpriority(PRIO_PROCESS, getpid());
setpriority(PRIO_PROCESS, getpid(), prio + 10);
atexit(Epplet_cleanup);
Epplet_Init("E-Disk", "0.2", "Enlightenment Disk I/O Monitor Epplet", 3, 3, argc, argv, 0);
Epplet_load_config();
parse_conf();
title = Epplet_create_label(3, 3, "Disk I/O", 1);
if (show_title) {
/* New arrangement */
in_label = Epplet_create_label(3, 13, "I: 0 b/s", 1);
out_label = Epplet_create_label(3, 30, "O: 0 b/s", 1);
in_bar = Epplet_create_hbar(3, 22, 42, 7, 0, &in_val);
out_bar = Epplet_create_hbar(3, 39, 42, 7, 0, &out_val);
Epplet_gadget_show(title);
} else {
/* Old arrangement */
in_label = Epplet_create_label(4, 4, "I: 0 b/s", 1);
out_label = Epplet_create_label(4, 24, "O: 0 b/s", 1);
in_bar = Epplet_create_hbar(4, 14, 40, 8, 0, &in_val);
out_bar = Epplet_create_hbar(4, 36, 40, 8, 0, &out_val);
}
close_button = Epplet_create_button(NULL, NULL, 2, 2, 0, 0, "CLOSE", 0, NULL, close_cb, NULL);
cfg_button = Epplet_create_button(NULL, NULL, 33, 2, 0, 0, "CONFIGURE", 0, NULL, title_cb, NULL);
Epplet_gadget_show(in_label);
Epplet_gadget_show(in_bar);
Epplet_gadget_show(out_label);
Epplet_gadget_show(out_bar);
Epplet_show();
title = Epplet_create_label(3, 3, "Disk I/O", 1);
if (show_title) {
/* New arrangement */
in_label = Epplet_create_label(3, 13, "I: 0 b/s", 1);
out_label = Epplet_create_label(3, 30, "O: 0 b/s", 1);
in_bar = Epplet_create_hbar(3, 22, 42, 7, 0, &in_val);
out_bar = Epplet_create_hbar(3, 39, 42, 7, 0, &out_val);
Epplet_gadget_show(title);
} else {
/* Old arrangement */
in_label = Epplet_create_label(4, 4, "I: 0 b/s", 1);
out_label = Epplet_create_label(4, 24, "O: 0 b/s", 1);
in_bar = Epplet_create_hbar(4, 14, 40, 8, 0, &in_val);
out_bar = Epplet_create_hbar(4, 36, 40, 8, 0, &out_val);
}
close_button = Epplet_create_button(NULL, NULL, 2, 2, 0, 0, "CLOSE", 0, NULL, close_cb, NULL);
cfg_button = Epplet_create_button(NULL, NULL, 33, 2, 0, 0, "CONFIGURE", 0, NULL, title_cb, NULL);
Epplet_gadget_show(in_label);
Epplet_gadget_show(in_bar);
Epplet_gadget_show(out_label);
Epplet_gadget_show(out_bar);
Epplet_show();
Epplet_register_focus_in_handler(in_cb, NULL);
Epplet_register_focus_out_handler(out_cb, NULL);
timer_cb(NULL); /* Set everything up */
Epplet_Loop();
Epplet_register_focus_in_handler(in_cb, NULL);
Epplet_register_focus_out_handler(out_cb, NULL);
timer_cb(NULL); /* Set everything up */
Epplet_Loop();
return 0;
return 0;
}