Tue Dec 7 17:13:06 PST 1999
(KainX) New dialog for E-NetGraph. This is the only network epplet I use, so I don't have any plans to add similar interfaces to the other net epplets, but I recommend that *someone* does so. Also, I modified E-Slides and E-NetGraph so that if the config file or the default settings don't provide a valid image directory (for E-Slides) or a valid network interface (E-NetGraph), rather than immediately exiting, you will be presented with the config dialog. Very handy. SVN revision: 1544
This commit is contained in:
Michael Jennings
parent
35dcbdf93e
commit
276863160e
14
ChangeLog
14
ChangeLog
|
|
@ -1447,3 +1447,17 @@ Mon Dec 6 23:07:32 PST 1999
|
|||
(KainX)
|
||||
|
||||
And one for E-Xss.
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Tue Dec 7 17:13:06 PST 1999
|
||||
(KainX)
|
||||
|
||||
New dialog for E-NetGraph. This is the only network epplet I use, so I don't
|
||||
have any plans to add similar interfaces to the other net epplets, but I
|
||||
recommend that *someone* does so.
|
||||
|
||||
Also, I modified E-Slides and E-NetGraph so that if the config file or the
|
||||
default settings don't provide a valid image directory (for E-Slides) or a
|
||||
valid network interface (E-NetGraph), rather than immediately exiting, you
|
||||
will be presented with the config dialog. Very handy.
|
||||
|
|
|
|||
|
|
@ -17,27 +17,34 @@
|
|||
|
||||
/* global variables */
|
||||
RGB_buf buf;
|
||||
Window win;
|
||||
Window win, config_win = None;
|
||||
unsigned char *rgb_pointer_start = NULL;
|
||||
|
||||
Epplet_gadget close_button;
|
||||
Epplet_gadget close_button, cfg_button, dev_popup, dev_button, cfg_tb_in, cfg_tb_out, cfg_tb_bg, cfg_tb_dev;
|
||||
|
||||
long total_bytes_in = 0;
|
||||
long total_bytes_out = 0;
|
||||
int old_in_y = 0, old_out_y = 39;
|
||||
struct timeval last_time;
|
||||
|
||||
char *device_string = NULL;
|
||||
char *device_string = NULL, *cfg_device_string = NULL;
|
||||
long max_bytes_in_per_sec = 8192;
|
||||
long max_bytes_out_per_sec = 8192;
|
||||
int in_color[3];
|
||||
int out_color[3];
|
||||
int bg_color[3];
|
||||
int log_scale = 0;
|
||||
int log_scale = 0, cfg_log_scale = 0;
|
||||
unsigned int in_color_hex = 0x0040c0;
|
||||
unsigned int out_color_hex = 0xc000c0;
|
||||
unsigned int bg_color_hex = 0x000000;
|
||||
|
||||
static int delete_cb(void *data, Window win);
|
||||
static void apply_config(void);
|
||||
static void ok_cb(void *data);
|
||||
static void apply_cb(void *data);
|
||||
static void cancel_cb(void *data);
|
||||
static void config_cb(void *data);
|
||||
|
||||
/* functions */
|
||||
static void
|
||||
timer_draw(void *data)
|
||||
|
|
@ -51,17 +58,15 @@ timer_draw(void *data)
|
|||
float intensity;
|
||||
long elapsed_microseconds;
|
||||
struct timeval current_time;
|
||||
char err[255];
|
||||
|
||||
invalid = net_get_bytes_inout(device_string, &new_total_bytes_in, &new_total_bytes_out);
|
||||
if (invalid)
|
||||
{
|
||||
char err[255];
|
||||
|
||||
Esnprintf(err, sizeof(err), "Unable to get network device statistics for %s: %s", device_string, net_strerror(invalid));
|
||||
Epplet_dialog_ok(err);
|
||||
Esync();
|
||||
exit(-1);
|
||||
}
|
||||
for (; (invalid = net_get_bytes_inout(device_string, &new_total_bytes_in, &new_total_bytes_out)) != 0; ) {
|
||||
Esnprintf(err, sizeof(err), "Unable to get network device statistics for %s: %s", device_string, net_strerror(invalid));
|
||||
Epplet_dialog_ok(err);
|
||||
Esync();
|
||||
config_cb(NULL);
|
||||
return;
|
||||
}
|
||||
if (new_total_bytes_in != -1.0)
|
||||
{
|
||||
if (total_bytes_in == 0)
|
||||
|
|
@ -190,6 +195,7 @@ cb_in(void *data, Window w)
|
|||
{
|
||||
if (w == Epplet_get_main_window())
|
||||
{
|
||||
Epplet_gadget_show(cfg_button);
|
||||
Epplet_gadget_show(close_button);
|
||||
}
|
||||
return;
|
||||
|
|
@ -201,12 +207,148 @@ cb_out(void *data, Window w)
|
|||
{
|
||||
if (w == Epplet_get_main_window())
|
||||
{
|
||||
Epplet_gadget_hide(cfg_button);
|
||||
Epplet_gadget_hide(close_button);
|
||||
}
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
delete_cb(void *data, Window win)
|
||||
{
|
||||
config_win = None;
|
||||
return 1;
|
||||
win = (Window) 0;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
apply_config(void)
|
||||
{
|
||||
char *s;
|
||||
|
||||
device_string = cfg_device_string;
|
||||
Epplet_modify_config("device", device_string);
|
||||
|
||||
s = Epplet_textbox_contents(cfg_tb_in);
|
||||
if (strlen(s)) {
|
||||
Epplet_modify_config("in_color", s);
|
||||
in_color_hex = strtoul(s, (char **) NULL, 0);
|
||||
in_color[0] = in_color_hex >> 16;
|
||||
in_color[1] = (in_color_hex >> 8) & 0xff;
|
||||
in_color[2] = in_color_hex & 0xff;
|
||||
}
|
||||
s = Epplet_textbox_contents(cfg_tb_out);
|
||||
if (strlen(s)) {
|
||||
Epplet_modify_config("out_color", s);
|
||||
out_color_hex = strtoul(s, (char **) NULL, 0);
|
||||
out_color[0] = out_color_hex >> 16;
|
||||
out_color[1] = (out_color_hex >> 8) & 0xff;
|
||||
out_color[2] = out_color_hex & 0xff;
|
||||
}
|
||||
s = Epplet_textbox_contents(cfg_tb_bg);
|
||||
if (strlen(s)) {
|
||||
Epplet_modify_config("bg_color", s);
|
||||
bg_color_hex = strtoul(s, (char **) NULL, 0);
|
||||
bg_color[0] = bg_color_hex >> 16;
|
||||
bg_color[1] = (bg_color_hex >> 8) & 0xff;
|
||||
bg_color[2] = bg_color_hex & 0xff;
|
||||
}
|
||||
|
||||
log_scale = cfg_log_scale;
|
||||
Epplet_modify_config("log_scale", (log_scale ? "1" : "0"));
|
||||
|
||||
timer_draw(NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
ok_cb(void *data)
|
||||
{
|
||||
apply_config();
|
||||
Epplet_save_config();
|
||||
Epplet_window_destroy(config_win);
|
||||
config_win = None;
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
apply_cb(void *data)
|
||||
{
|
||||
apply_config();
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
cancel_cb(void *data)
|
||||
{
|
||||
Epplet_window_destroy(config_win);
|
||||
config_win = None;
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
dev_popup_cb(void *data)
|
||||
{
|
||||
cfg_device_string = (char *) data;
|
||||
Epplet_change_textbox(cfg_tb_dev, cfg_device_string);
|
||||
}
|
||||
|
||||
static void
|
||||
config_cb(void *data)
|
||||
{
|
||||
char buff[128];
|
||||
static char **devices = NULL;
|
||||
Epplet_gadget dev_popup;
|
||||
unsigned long i;
|
||||
|
||||
if (config_win) {
|
||||
return;
|
||||
}
|
||||
|
||||
config_win = Epplet_create_window_config(200, 230, "E-NetGraph Configuration", ok_cb, NULL, apply_cb, NULL, cancel_cb, NULL);
|
||||
|
||||
dev_popup = Epplet_create_popup();
|
||||
if (!devices) {
|
||||
devices = net_get_devices(NULL);
|
||||
}
|
||||
if (devices) {
|
||||
for (i = 0; devices[i]; i++) {
|
||||
Epplet_add_popup_entry(dev_popup, devices[i], NULL, dev_popup_cb, (void *) devices[i]);
|
||||
}
|
||||
}
|
||||
cfg_device_string = device_string;
|
||||
|
||||
Epplet_gadget_show(Epplet_create_label(4, 4, "Interface to monitor...", 2));
|
||||
Epplet_gadget_show(cfg_tb_dev = Epplet_create_textbox(NULL, device_string, 4, 18, 178, 20, 2, NULL, NULL));
|
||||
Epplet_gadget_show(Epplet_create_popupbutton(NULL, NULL, 185, 22, 12, 12, "ARROW_UP", dev_popup));
|
||||
|
||||
sprintf(buff, "0x%02x%02x%02x", in_color[0], in_color[1], in_color[2]);
|
||||
Epplet_gadget_show(Epplet_create_label(4, 50, "Color for incoming packets:", 2));
|
||||
Epplet_gadget_show(cfg_tb_in = Epplet_create_textbox(NULL, buff, 4, 64, 192, 20, 2, NULL, NULL));
|
||||
|
||||
sprintf(buff, "0x%02x%02x%02x", out_color[0], out_color[1], out_color[2]);
|
||||
Epplet_gadget_show(Epplet_create_label(4, 96, "Color for outgoing packets:", 2));
|
||||
Epplet_gadget_show(cfg_tb_out = Epplet_create_textbox(NULL, buff, 4, 110, 192, 20, 2, NULL, NULL));
|
||||
|
||||
sprintf(buff, "0x%02x%02x%02x", bg_color[0], bg_color[1], bg_color[2]);
|
||||
Epplet_gadget_show(Epplet_create_label(4, 142, "Color for window background:", 2));
|
||||
Epplet_gadget_show(cfg_tb_bg = Epplet_create_textbox(NULL, buff, 4, 156, 192, 20, 2, NULL, NULL));
|
||||
|
||||
cfg_log_scale = log_scale;
|
||||
Epplet_gadget_show(Epplet_create_togglebutton(NULL, NULL, 4, 188, 12, 12, &cfg_log_scale, NULL, NULL));
|
||||
Epplet_gadget_show(Epplet_create_label(20, 188, "Use logarithmic scale?", 2));
|
||||
|
||||
Epplet_window_show(config_win);
|
||||
Epplet_window_pop_context();
|
||||
|
||||
return;
|
||||
data = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
load_config(void)
|
||||
{
|
||||
|
|
@ -221,8 +363,7 @@ load_config(void)
|
|||
out_color_hex = strtol(s, (char **)NULL, 0);
|
||||
s = Epplet_query_config_def("bg_color", "0");
|
||||
bg_color_hex = strtol(s, (char **)NULL, 0);
|
||||
if (strlen(Epplet_query_config_def("log_scale", "")))
|
||||
log_scale = 1;
|
||||
log_scale = atoi(Epplet_query_config_def("log_scale", "0"));
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -362,8 +503,8 @@ main(int argc, char **argv)
|
|||
win = Epplet_get_drawingarea_window(drawingarea);
|
||||
rgb_pointer_start = Epplet_get_rgb_pointer(buf);
|
||||
|
||||
close_button = Epplet_create_button(NULL, NULL, 0, 0, 0, 0, "CLOSE",
|
||||
win, NULL, cb_close, NULL);
|
||||
close_button = Epplet_create_std_button("CLOSE", 2, 2, cb_close, NULL);
|
||||
cfg_button = Epplet_create_std_button("CONFIGURE", 33, 2, config_cb, NULL);
|
||||
Epplet_register_focus_in_handler(cb_in, NULL);
|
||||
Epplet_register_focus_out_handler(cb_out, NULL);
|
||||
|
||||
|
|
|
|||
|
|
@ -212,8 +212,6 @@ change_image(void *data)
|
|||
filenames[idx] = NULL;
|
||||
INC_PIC();
|
||||
}
|
||||
Imlib_destroy_image(Epplet_get_imlib_data(), im); /* Destroy the image, but keep it in cache. */
|
||||
|
||||
new_w = (w * 16 - 6);
|
||||
new_h = (h * 16 - 6);
|
||||
if (maintain_aspect) {
|
||||
|
|
@ -224,6 +222,8 @@ change_image(void *data)
|
|||
new_w *= ratio;
|
||||
}
|
||||
}
|
||||
Imlib_destroy_image(Epplet_get_imlib_data(), im); /* Destroy the image, but keep it in cache. */
|
||||
|
||||
new_x = ((w * 16) / 2) - (new_w / 2);
|
||||
new_y = ((h * 16) / 2) - (new_h / 2);
|
||||
Epplet_move_change_image(picture, new_x, new_y, new_w, new_h, filenames[idx]);
|
||||
|
|
@ -403,7 +403,6 @@ apply_config(void)
|
|||
path = strdup(buff);
|
||||
Epplet_modify_config("image_dir", path);
|
||||
idx = 0;
|
||||
change_image(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -420,6 +419,7 @@ apply_config(void)
|
|||
maintain_aspect = cfg_maintain_aspect;
|
||||
sprintf(buff, "%d", maintain_aspect);
|
||||
Epplet_modify_config("maintain_aspect", buff);
|
||||
change_image(NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -545,9 +545,6 @@ get_images(char *image_path)
|
|||
Esnprintf(err, sizeof(err), "Unable to find any files in %s!", image_path);
|
||||
Epplet_dialog_ok(err);
|
||||
Esync();
|
||||
if (!filenames) {
|
||||
exit(-1);
|
||||
}
|
||||
return 0;
|
||||
} else if (idx >= cnt) {
|
||||
idx = 0;
|
||||
|
|
@ -596,7 +593,6 @@ main(int argc, char **argv)
|
|||
Epplet_Init("E-Slides", "0.3", "Enlightenment Slideshow Epplet", w, h, argc, argv, 0);
|
||||
Epplet_load_config();
|
||||
parse_config();
|
||||
get_images(path);
|
||||
|
||||
cfg_popup = Epplet_create_popup();
|
||||
Epplet_add_popup_entry(cfg_popup, "Set Background", NULL, cfg_popup_cb, (void *) 0);
|
||||
|
|
@ -616,7 +612,11 @@ main(int argc, char **argv)
|
|||
Epplet_register_focus_in_handler(in_cb, NULL);
|
||||
Epplet_register_focus_out_handler(out_cb, NULL);
|
||||
|
||||
change_image(NULL); /* Set everything up */
|
||||
if (get_images(path)) {
|
||||
change_image(NULL);
|
||||
} else {
|
||||
config_cb(NULL);
|
||||
}
|
||||
Epplet_Loop();
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -351,8 +351,6 @@ main(int argc, char **argv) {
|
|||
prev_button = Epplet_create_button(NULL, NULL, 3, 33, 0, 0, "PREVIOUS", 0, NULL, play_cb, (void *) (-1));
|
||||
next_button = Epplet_create_button(NULL, NULL, 33, 33, 0, 0, "NEXT", 0, NULL, play_cb, (void *) (1));
|
||||
cfg_button = Epplet_create_std_button("CONFIGURE", 18, 3, config_cb, NULL);
|
||||
Epplet_gadget_show(prev_button);
|
||||
Epplet_gadget_show(next_button);
|
||||
Epplet_show();
|
||||
|
||||
Epplet_register_focus_in_handler(in_cb, NULL);
|
||||
|
|
|
|||
|
|
@ -48,10 +48,39 @@
|
|||
#endif
|
||||
|
||||
char **
|
||||
net_get_devices(void) {
|
||||
net_get_devices(unsigned long *count) {
|
||||
|
||||
FILE *fp;
|
||||
char buff[256], **names = NULL, *s;
|
||||
unsigned long i;
|
||||
|
||||
names = (char **) malloc(sizeof(char *));
|
||||
memset(names, 0, sizeof(char *));
|
||||
|
||||
#ifdef linux
|
||||
return ((char **) NULL);
|
||||
fp = fopen("/proc/net/dev", "r");
|
||||
if (fp == NULL) {
|
||||
return ((char **) NULL);
|
||||
}
|
||||
fgets(buff, sizeof(buff), fp);
|
||||
fgets(buff, sizeof(buff), fp);
|
||||
|
||||
for (i = 0; fgets(buff, sizeof(buff), fp); ) {
|
||||
s = strchr(buff, ':');
|
||||
if (!s) {
|
||||
continue;
|
||||
}
|
||||
*s = 0;
|
||||
for (s = buff; isspace(*s); s++);
|
||||
names[i] = strdup(s);
|
||||
names = (char **) realloc(names, sizeof(char *) * ((++i) + 1));
|
||||
names[i] = (char *) NULL;
|
||||
}
|
||||
if (count) {
|
||||
*count = i;
|
||||
}
|
||||
fclose(fp);
|
||||
return (names);
|
||||
#elif defined(__sun__)
|
||||
return ((char **) NULL);
|
||||
#else
|
||||
|
|
@ -69,7 +98,7 @@ net_get_bytes_inout(const char *device, double *in_bytes, double *out_bytes) {
|
|||
kstat_named_t kned[100];
|
||||
#elif defined(linux)
|
||||
unsigned char match = 0;
|
||||
static FILE *fp;
|
||||
FILE *fp;
|
||||
char buff[256], *colon = NULL, dev[64], in_str[64], out_str[64];
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#define NONULL(x) ((x) ? (x) : (""))
|
||||
|
||||
/* Returns an array containing the names of all valid network devices on the system */
|
||||
extern char **net_get_devices(void);
|
||||
extern char **net_get_devices(unsigned long *count);
|
||||
|
||||
/* Stores the number of bytes received and transmitted by device into
|
||||
the supplied pointers. Returns 0 on success, a valid errno value on
|
||||
|
|
|
|||
Loading…
Reference in New Issue