Fixed fullscreen res detection. Changed defaults back to small cat while the last few scaling niggles are fixed

2 files changed, 7 insertions, 4 deletions

diff --git a/TODO b/TODO
index a99eb03..fa29473 100644
--- a/TODO
+++ b/TODO
@@ -6,3 +6,6 @@
 -- Add man page(?)
 
 -- Fullscreen resolution autodetect broken by most recent update
+-> Fixed this temporarily but CPU usage is still proving very high/cat scaling is a bit off for wide monitors
+-> Defaulting to the small cat until I can re-implement Xinerama support and fix scaling issues on wide setups
+                                                                        -- Johnson
diff --git a/nyan.c b/nyan.c
index ff92d0d..b0f93d2 100644
--- a/nyan.c
+++ b/nyan.c
@@ -73,8 +73,8 @@ static SDL_Event            event;
 static int                  running = 1;

 static int                  SURF_TYPE = SDL_HWSURFACE;

 static int                  sound = 1;

-static int                  fullscreen = 0;

-static int                  catsize = 1;

+static int                  fullscreen = 1;

+static int                  catsize = 0;

 static int                  cursor = 0;

 #ifdef XINERAMA

 static Display* dpy;

@@ -248,7 +248,7 @@ handle_args(int argc, char **argv) {
             fullscreen = 1;

         else if(!(strcmp(argv[i], "-nf") || !strcmp(argv[i], "--nofullscreen")))

             fullscreen = 0;

-        else if(!strcmp(argv[i], "-c") || !strcmp(argv[i], "--catsize")) { // I don't know boolean order of operations, please cut down on unneeded parenthases

+        else if(!strcmp(argv[i], "-c") || !strcmp(argv[i], "--catsize")) {

             if (++i < argc) {

                 if(!strcmp(argv[i], "full"))

                     catsize = 1;

@@ -299,7 +299,7 @@ init(void) {
 

     SDL_Init( SDL_INIT_EVERYTHING );

     if (fullscreen)

-        screen = SDL_SetVideoMode( SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_BPP, SURF_TYPE | SDL_FULLSCREEN );

+        screen = SDL_SetVideoMode( 0, 0, SCREEN_BPP, SURF_TYPE | SDL_FULLSCREEN );

     else

         screen = SDL_SetVideoMode( SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_BPP, SURF_TYPE );

     if(!cursor)