I'm tired of cleaning up these messes. Enough already.

SVN revision: 1366
This commit is contained in:
Michael Jennings 1999-11-22 17:14:54 +00:00
parent c1f5c19cc4
commit 87ab8f2613
1 changed files with 3 additions and 25 deletions

View File

@ -22,10 +22,10 @@
#define NEXT_PIC() ((void) 0)
#define INC_PIC() do {idx++; if (idx == image_cnt) idx = 0;} while (0)
Epplet_gadget close_button, play_button, pause_button, prev_button, next_button, zoom_button, bg_button, picture;
Epplet_gadget close_button, play_button, pause_button, prev_button, next_button, zoom_button, picture;
unsigned long idx = 0, image_cnt = 0;
double delay = 5.0;
char **filenames = NULL, *path, *zoom_cmd, *bg_cmd, change_root_bg = 0;
char **filenames = NULL, *path, *zoom_cmd;
unsigned char paused = 0;
Window zoom_win = None;
@ -33,7 +33,6 @@ static char **dirscan(char *dir, unsigned long *num);
static void change_image(void *data);
static void close_cb(void *data);
static void zoom_cb(void *data);
static void bg_cb(void *data);
static void play_cb(void *data);
static void in_cb(void *data, Window w);
static void out_cb(void *data, Window w);
@ -140,10 +139,7 @@ change_image(void *data) {
Epplet_change_image(picture, 42, 42, filenames[idx]);
INC_PIC();
if(change_root_bg)
bg_cb(NULL);
Epplet_remove_timer("CHANGE_IMAGE");
if (!paused) {
Epplet_timer(change_image, NULL, delay, "CHANGE_IMAGE");
@ -172,17 +168,6 @@ zoom_cb(void *data) {
data = NULL;
}
static void
bg_cb(void *data) {
char buff[1024];
Esnprintf(buff, sizeof(buff), bg_cmd, filenames[CUR_PIC()]);
Epplet_spawn_command(buff);
return;
data = NULL;
}
static void
play_cb(void *data) {
@ -223,7 +208,6 @@ static void
in_cb(void *data, Window w) {
Epplet_gadget_show(close_button);
Epplet_gadget_show(bg_button);
Epplet_gadget_show(zoom_button);
Epplet_gadget_show(prev_button);
Epplet_gadget_show(next_button);
@ -242,7 +226,6 @@ out_cb(void *data, Window w) {
Epplet_gadget_hide(close_button);
Epplet_gadget_hide(zoom_button);
Epplet_gadget_hide(bg_button);
Epplet_gadget_hide(prev_button);
Epplet_gadget_hide(next_button);
Epplet_gadget_hide(play_button);
@ -269,11 +252,7 @@ parse_config(void) {
} else {
Epplet_add_config("delay", "5.0");
}
zoom_cmd = Epplet_query_config_def("zoom_prog", "ee %s");
bg_cmd = Epplet_query_config_def("bg_prog", "Esetroot %s");
if(Epplet_query_config("change_root"))
change_root_bg = 1;
}
int
@ -299,7 +278,6 @@ main(int argc, char **argv) {
chdir(path);
close_button = Epplet_create_button(NULL, NULL, 3, 3, 0, 0, "CLOSE", 0, NULL, close_cb, NULL);
bg_button = Epplet_create_button(NULL, NULL, 18, 3, 0, 0, "ARROW_UP", 0, NULL, bg_cb, NULL);
zoom_button = Epplet_create_button(NULL, NULL, 33, 3, 0, 0, "EJECT", 0, NULL, zoom_cb, NULL);
prev_button = Epplet_create_button(NULL, NULL, 3, 33, 0, 0, "PREVIOUS", 0, NULL, play_cb, (void *) (-1));
play_button = Epplet_create_button(NULL, NULL, 18, 33, 0, 0, "PLAY", 0, NULL, play_cb, (void *) (1));