#define ARG_COMICS 52
#define ARG_COMICS_DIR 53
#define ARG_COMICS_DELAY 54
+#define ARG_VIEW 55
#define DEPTH 24
static SDL_Surface *screen=NULL, *screen_image, *background, **thisfish;
static SDL_Rect *fish_dest, *fish_src, *clean_dest;
static int curr_dest, clean_count, no_sdl_quit = 0, comics_delay = 50;
-int window_id = -1, fullscreen = 0;
+int window_id = -1, fullscreen = 1;
+int view = 1;
static unsigned char *original_bg;
static AquariumData ad;
int sdl_flags = SDL_DOUBLEBUF|SDL_HWSURFACE|SDL_ANYFORMAT;
screen_height = 480;
- screen_width = 640;
+ screen_width = 800;
if(window_id != -1){
display = XOpenDisplay(NULL);
Sound_settings *s, sound_settings = {0,TYPE_MP3, NULL};
Bubble_settings *bub, bubble_settings = {20};
- Bottom_settings *b, bottom_settings = {0,5,1,75,2};
- Background_settings *bg, background_settings = {NULL,NULL, 0,1,
+ Bottom_settings *b, bottom_settings = {1,5,1,75,3};
+ Background_settings *bg, background_settings = {NULL,NULL, 2,0,
(GaiColor){0, 100, 150, 0},
(GaiColor){10,120, 250, 0},
(GaiColor){0,0,0,0}};
- Fish_settings *f, fish_settings = {0, 0, 75, 0, 100, 0, 15, 0, 75, 75,
+ Fish_settings *f, fish_settings = {1, 1, 75, 0, 100, 1, 15, 0, 75, 75,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
struct option cmdline_options[] = {
{"sound", no_argument, NULL, ARG_SOUND},
{"root", no_argument, NULL, ARG_FULLSCREEN},
{"bubble", required_argument, NULL, ARG_BUBBLE},
{"desktop", no_argument, NULL, ARG_DESKTOP},
+ {"view", required_argument, NULL, ARG_VIEW},
{0,0,0,0}};
memcpy(b,&bottom_settings, sizeof(Bottom_settings));
memcpy(bub, &bubble_settings, sizeof(Bubble_settings));
memcpy(s, &sound_settings, sizeof(Sound_settings));
+fprintf(stderr, "1BG %i\n",bg->desktop);
while ((c =
getopt_long_only(argc, argv, "", cmdline_options, NULL)) != -1){
s->prg = g_strdup_printf(optarg);
break;
case ARG_WINDOW_ID:
- window_id = htoi(optarg);
+ window_id = atoi(optarg);
break;
case ARG_FULLSCREEN:
fullscreen = 1;
case ARG_BUBBLE:
bub->max_bubbles = atoi(optarg);
break;
+ case ARG_VIEW:
+ view = atoi(optarg);
+ break;
case ARG_DESKTOP:
bg->type = 0;
bg->desktop = 1;
screensaver_init_param(argc, argv);
screensaver_init(0);
- if(window_id==-1)
+ if(window_id==-1){
+ fprintf(stderr, "screensaver_main_sdl\n");
screensaver_main_sdl();
- else
+ }
+ else{
+ fprintf(stderr, "screensaver_main_GDK\n");
screensaver_main_gdk();
+ }
return 0;
}