Changeset 134 for abuse/trunk/src/sdlport/video.cppTweet

Timestamp:

Apr 10, 2008, 11:08:14 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Removed 4300 lines of unused code.

File:

• abuse/trunk/src/sdlport/video.cpp (modified) (28 diffs)

abuse/trunk/src/sdlport/video.cpp

@@ -21 +21 @@
 
 #include <SDL.h>
-#ifdef HAVE_OPENGL
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif    /* __APPLE__ */
+
+#ifdef HAVE_OPENGL
+#   ifdef __APPLE__
+#       include <OpenGL/gl.h>
+#       include <OpenGL/glu.h>
+#   else
+#       include <GL/gl.h>
+#       include <GL/glu.h>
+#   endif    /* __APPLE__ */
 #endif    /* HAVE_OPENGL */
+
 #include "filter.hpp"
 #include "system.h"
@@ -61 +63 @@
 {
     int value;
-    for( value = 1 ; value < input ; value <<= 1);
+    for(value = 1 ; value < input ; value <<= 1);
     return value;
 }
@@ -69 +71 @@
 // Set the video mode
 //
-void set_mode( int mode, int argc, char **argv )
+void set_mode(int mode, int argc, char **argv)
 {
     const SDL_VideoInfo *vidInfo;
@@ -76 +78 @@
     // Check for video capabilities
     vidInfo = SDL_GetVideoInfo();
-    if( vidInfo->hw_available )
-    {
+    if(vidInfo->hw_available)
         vidFlags |= SDL_HWSURFACE;
-    }
-    else
-    {
+    else
         vidFlags |= SDL_SWSURFACE;
-    }
-    if( flags.fullscreen )
-    {
+
+    if(flags.fullscreen)
         vidFlags |= SDL_FULLSCREEN;
-    }
-    if( flags.doublebuf )
-    {
+
+    if(flags.doublebuf)
         vidFlags |= SDL_DOUBLEBUF;
-    }
 
     // Calculate the window scale
@@ -98 +94 @@
 
     // Try using opengl hw accell
-    if( flags.gl ) {
-#ifdef HAVE_OPENGL
-        printf( "Video : OpenGL enabled\n" );
+    if(flags.gl) {
+#ifdef HAVE_OPENGL
+        printf("Video : OpenGL enabled\n");
         // allow doublebuffering in with gl too
-        SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, flags.doublebuf );
+        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, flags.doublebuf);
         // set video gl capability
         vidFlags |= SDL_OPENGL;
@@ -109 +105 @@
 #else
         // ignore the option if not available
-        printf( "Video : OpenGL disabled (Support missing in executable)\n");
+        printf("Video : OpenGL disabled (Support missing in executable)\n");
         flags.gl = 0;
 #endif
@@ -115 +111 @@
 
     // Set the icon for this window.  Looks nice on taskbars etc.
-    SDL_WM_SetIcon( SDL_LoadBMP("abuse.bmp"), NULL );
+    SDL_WM_SetIcon(SDL_LoadBMP("abuse.bmp"), NULL);
 
     // Create the window with a preference for 8-bit (palette animations!), but accept any depth */
-    window = SDL_SetVideoMode(flags.xres, flags.yres, 8, vidFlags | SDL_ANYFORMAT );
-    if( window == NULL )
-    {
-        printf( "Video : Unable to set video mode : %s\n", SDL_GetError() );
-        exit( 1 );
+    window = SDL_SetVideoMode(flags.xres, flags.yres, 8, vidFlags | SDL_ANYFORMAT);
+    if(window == NULL)
+    {
+        printf("Video : Unable to set video mode : %s\n", SDL_GetError());
+        exit(1);
     }
 
     // Create the screen image
-    screen = new image( xres, yres, NULL, 2 );
-    if( screen == NULL )
+    screen = new image(xres, yres, NULL, 2);
+    if(screen == NULL)
     {
         // Our screen image is no good, we have to bail.
-        printf( "Video : Unable to create screen image.\n" );
-        exit( 1 );
+        printf("Video : Unable to create screen image.\n");
+        exit(1);
     }
     screen->clear();
@@ -138 +134 @@
     {
 #ifdef HAVE_OPENGL
-        int w,h;
+        int w, h;
 
         // texture width/height should be power of 2
+        // FIXME: we can use GL_ARB_texture_non_power_of_two or
+        // GL_ARB_texture_rectangle to avoid the extra memory allocation
         w = power_of_two(xres);
         h = power_of_two(yres);
 
         // create texture surface
-        texture = SDL_CreateRGBSurface( SDL_SWSURFACE, w ,h ,32,
+        texture = SDL_CreateRGBSurface(SDL_SWSURFACE, w , h , 32,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
-                0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 );
+                0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
 #else
-                0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF );
+                0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
 #endif
 
@@ -164 +162 @@
         glLoadIdentity();
 
-        glOrtho(0.0, (GLdouble)window->w, (GLdouble)window->h, 0.0, 0.0,1.0);
+        glOrtho(0.0, (GLdouble)window->w, (GLdouble)window->h, 0.0, 0.0, 1.0);
 
         glMatrixMode(GL_MODELVIEW);
@@ -181 +179 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, flags.antialias);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, flags.antialias);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels );
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture->w, texture->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels);
 #endif
     }
 
     // Create our 8-bit surface
-    surface = SDL_CreateRGBSurface( SDL_SWSURFACE, window->w, window->h, 8, 0xff, 0xff, 0xff, 0xff );
-    if( surface == NULL )
+    surface = SDL_CreateRGBSurface(SDL_SWSURFACE, window->w, window->h, 8, 0xff, 0xff, 0xff, 0xff);
+    if(surface == NULL)
     {
         // Our surface is no good, we have to bail.
-        printf( "Video : Unable to create 8-bit surface.\n" );
-        exit( 1 );
-    }
-
-    printf( "Video : %dx%d %dbpp\n", window->w, window->h, window->format->BitsPerPixel );
+        printf("Video : Unable to create 8-bit surface.\n");
+        exit(1);
+    }
+
+    printf("Video : %dx%d %dbpp\n", window->w, window->h, window->format->BitsPerPixel);
 
     // Set the window caption
-    SDL_WM_SetCaption( "Abuse-SDL", "Abuse-SDL" );
+    SDL_WM_SetCaption("Abuse", "Abuse");
 
     // Grab and hide the mouse cursor
-    SDL_ShowCursor( 0 );
-    if( flags.grabmouse )
-    {
-        SDL_WM_GrabInput( SDL_GRAB_ON );
-    }
-
-    update_dirty( screen );
+    SDL_ShowCursor(0);
+    if(flags.grabmouse)
+        SDL_WM_GrabInput(SDL_GRAB_ON);
+
+    update_dirty(screen);
 }
 
@@ -215 +211 @@
 void close_graphics()
 {
-    if( lastl )
-    {
+    if(lastl)
         delete lastl;
-    }
     lastl = NULL;
     // Free our 8-bit surface
-    if( surface )
-    {
-        SDL_FreeSurface( surface );
-    }
-#ifdef HAVE_OPENGL
-    if ( texture )
-    {
-        SDL_FreeSurface( texture );
-    }
+    if(surface)
+        SDL_FreeSurface(surface);
+
+#ifdef HAVE_OPENGL
+    if (texture)
+        SDL_FreeSurface(texture);
 #endif
     delete screen;
@@ -237 +228 @@
 // Draw only dirty parts of the image
 //
-void put_part_image( image *im, int x, int y, int x1, int y1, int x2, int y2 )
+void put_part_image(image *im, int x, int y, int x1, int y1, int x2, int y2)
 {
     int xe, ye;
@@ -246 +237 @@
     Uint16 dinset;
 
-    if( (unsigned)y > yres || (unsigned)x > xres )
-    {
+    if((unsigned)y > yres || (unsigned)x > xres)
         return;
-    }
-    CHECK( x1 >= 0 && x2 >= x1 && y1 >= 0 && y2 >= y1 );
+
+    CHECK(x1 >= 0 && x2 >= x1 && y1 >= 0 && y2 >= y1);
 
     // Adjust if we are trying to draw off the screen
-    if( x < 0 )
+    if(x < 0)
     {
         x1 += -x;
@@ -259 +249 @@
     }
     srcrect.x = x1;
-    if( (unsigned)(x + ( x2 - x1 )) >= xres )
-    {
+    if((unsigned)(x + (x2 - x1)) >= xres)
         xe = xres - x + x1 - 1;
-    }
-    else
-    {
+    else
         xe = x2;
-    }
-    if( y < 0 )
+
+    if(y < 0)
     {
         y1 += -y;
@@ -273 +260 @@
     }
     srcrect.y = y1;
-    if( (unsigned)(y + ( y2 - y1 )) >= yres )
-    {
+    if((unsigned)(y + (y2 - y1)) >= yres)
         ye = yres - y + y1 - 1;
-    }
-    else
-    {
+    else
         ye = y2;
-    }
-    if( srcrect.x >= xe || srcrect.y >= ye )
+
+    if(srcrect.x >= xe || srcrect.y >= ye)
         return;
 
@@ -299 +283 @@
 
     // Lock the surface if necessary
-    if( SDL_MUSTLOCK( surface ) )
-    {
-        SDL_LockSurface( surface );
-    }
+    if(SDL_MUSTLOCK(surface))
+        SDL_LockSurface(surface);
+
     dpixel = (Uint8 *)surface->pixels;
     dpixel += (dstrect.x + ((dstrect.y) * surface->w)) * surface->format->BytesPerPixel;
@@ -311 +294 @@
         srcy = srcrect.y;
         dpixel = ((Uint8 *)surface->pixels) + y * surface->w + x ;
-        for( ii=0 ; ii < srcrect.h; ii++ )
+        for(ii=0 ; ii < srcrect.h; ii++)
         {
-            memcpy( dpixel, im->scan_line( srcy ) + srcrect.x , srcrect.w );
+            memcpy(dpixel, im->scan_line(srcy) + srcrect.x , srcrect.w);
             dpixel += surface->w;
             srcy ++;
@@ -328 +311 @@
         dpixel = (Uint8 *)surface->pixels + (dstrect.x + ((dstrect.y) * surface->w)) * surface->format->BytesPerPixel;
 
-        for( ii = 0; ii < dstrect.h; ii++ )
+        for(ii = 0; ii < dstrect.h; ii++)
         {
             srcx = (srcrect.x << 16);
-            for( jj = 0; jj < dstrect.w; jj++ )
+            for(jj = 0; jj < dstrect.w; jj++)
             {
-                memcpy( dpixel, im->scan_line( (srcy >> 16) ) + ((srcx >> 16) * surface->format->BytesPerPixel), surface->format->BytesPerPixel );
+                memcpy(dpixel, im->scan_line((srcy >> 16)) + ((srcx >> 16) * surface->format->BytesPerPixel), surface->format->BytesPerPixel);
                 dpixel += surface->format->BytesPerPixel;
                 srcx += xstep;
@@ -345 +328 @@
 
     // Unlock the surface if we locked it.
-    if( SDL_MUSTLOCK( surface ) )
-    {
-        SDL_UnlockSurface( surface );
-    }
+    if(SDL_MUSTLOCK(surface))
+        SDL_UnlockSurface(surface);
 
     // Now blit the surface
-    update_window_part( &dstrect);
+    update_window_part(&dstrect);
 }
 
@@ -358 +339 @@
 // Draw the entire image
 //
-void put_image( image * im, int x, int y )
-{
-    put_part_image( im, x, y, 0, 0, im->width() - 1, im->height() - 1 );
+void put_image(image * im, int x, int y)
+{
+    put_part_image(im, x, y, 0, 0, im->width() - 1, im->height() - 1);
 }
 
@@ -367 +348 @@
 // Update the dirty parts of the window
 //
-void update_dirty_window( image *im, int xoff, int yoff )
+void update_dirty_window(image *im, int xoff, int yoff)
 {
     int count;
     dirty_rect *dr, *q;
-    CHECK( im->special ); // make sure the image has the ability to contain dirty areas
-    if( im->special->keep_dirt == 0 )
-    {
-        put_image( im, xoff, yoff );
+    CHECK(im->special); // make sure the image has the ability to contain dirty areas
+    if(im->special->keep_dirt == 0)
+    {
+        put_image(im, xoff, yoff);
     }
     else
     {
         count = im->special->dirties.number_nodes();
-        if( !count )
+        if(!count)
             return;  // if nothing to update, return
-        dr = (dirty_rect *)( im->special->dirties.first() );
-        while( count > 0 )
+        dr = (dirty_rect *)(im->special->dirties.first());
+        while(count > 0)
         {
-            put_part_image( im, xoff + dr->dx1, yoff + dr->dy1, dr->dx1, dr->dy1, dr->dx2 + 1, dr->dy2 + 1 );
+            put_part_image(im, xoff + dr->dx1, yoff + dr->dy1, dr->dx1, dr->dy1, dr->dx2 + 1, dr->dy2 + 1);
             q = dr;
-            dr = (dirty_rect *)( dr->next() );
-            im->special->dirties.unlink( ( linked_node *)q );
+            dr = (dirty_rect *)(dr->next());
+            im->special->dirties.unlink((linked_node *)q);
             delete q;
             count--;
@@ -398 +379 @@
 // Update the dirty parts of the image
 //
-void update_dirty( image *im, int xoff, int yoff )
-{
-    update_dirty_window( im, xoff, yoff );
+void update_dirty(image *im, int xoff, int yoff)
+{
+    update_dirty_window(im, xoff, yoff);
     update_window_done();
 }
@@ -407 +388 @@
 // make_page()
 //
-void image::make_page( short width, short height, unsigned char *page_buffer )
-{
-    if( page_buffer )
+void image::make_page(short width, short height, unsigned char *page_buffer)
+{
+    if(page_buffer)
         data = page_buffer;
     else
-        data = (unsigned char *)malloc( width * height );
+        data = (unsigned char *)malloc(width * height);
 }
 
@@ -420 +401 @@
 void image::delete_page()
 {
-    if( !special || !special->static_mem )
-        free( data );
+    if(!special || !special->static_mem)
+        free(data);
 }
 
@@ -430 +411 @@
 void palette::load()
 {
-    if( lastl )
-    {
+    if(lastl)
         delete lastl;
-    }
     lastl = copy();
 
     // Force to only 256 colours.
     // Shouldn't be needed, but best to be safe.
-    if( ncolors > 256 )
-    {
+    if(ncolors > 256)
         ncolors = 256;
-    }
 
     SDL_Color colors[ncolors];
-    for( int ii = 0; ii < ncolors; ii++ )
+    for(int ii = 0; ii < ncolors; ii++)
     {
         colors[ii].r = red(ii);
@@ -450 +427 @@
         colors[ii].b = blue(ii);
     }
-    SDL_SetColors( surface, colors, 0, ncolors );
-    if( window->format->BitsPerPixel == 8 )
-    {
-        SDL_SetColors( window, colors, 0, ncolors );
-    }
+    SDL_SetColors(surface, colors, 0, ncolors);
+    if(window->format->BitsPerPixel == 8)
+        SDL_SetColors(window, colors, 0, ncolors);
 
     // Now redraw the surface
-    update_window_part( NULL );
+    update_window_part(NULL);
     update_window_done();
 }
@@ -473 +448 @@
 void update_window_done()
 {
+#ifdef HAVE_OPENGL
     // opengl blit complete surface to window
-    if (flags.gl)
-    {
-#ifdef HAVE_OPENGL
+    if(flags.gl)
+    {
         // convert color-indexed surface to RGB texture
-        SDL_BlitSurface( surface, NULL, texture, NULL );
+        SDL_BlitSurface(surface, NULL, texture, NULL);
 
         // Texturemap complete texture to surface so we have free scaling
         // and antialiasing
-        glTexSubImage2D( GL_TEXTURE_2D,0,
-             0,0,texture->w,texture->h,
-             GL_RGBA,GL_UNSIGNED_BYTE,texture->pixels);
+        glTexSubImage2D(GL_TEXTURE_2D, 0,
+                        0, 0, texture->w, texture->h,
+                        GL_RGBA, GL_UNSIGNED_BYTE, texture->pixels);
         glBegin(GL_TRIANGLE_STRIP);
         glTexCoord2f(texcoord[0], texcoord[1]); glVertex3i(0, 0, 0);
@@ -491 +466 @@
         glTexCoord2f(texcoord[2], texcoord[3]); glVertex3i(window->w, window->h, 0);
         glEnd();
-#endif
-    }
-
+
+        if(flags.doublebuf)
+            SDL_GL_SwapBuffers();
+    }
+#else
     // swap buffers in case of double buffering
-    if (flags.doublebuf)
-    {
-        if (flags.gl)
-        {
-#ifdef HAVE_OPENGL
-            SDL_GL_SwapBuffers();
-#endif
-        }
-        else
-        {
-            SDL_Flip(window);
-        }
-    }
-
     // do nothing in case of single buffering
-}
-
-void update_window_part( SDL_Rect *rect)
+    if(flags.doublebuf)
+        SDL_Flip(window);
+#endif
+}
+
+void update_window_part(SDL_Rect *rect)
 {
     // no partial blit's in case of opengl
     // complete blit + scaling just before flip
     if (flags.gl)
-    {
         return;
-    }
-
-    SDL_BlitSurface( surface, rect, window, rect );
+
+    SDL_BlitSurface(surface, rect, window, rect);
 
     // no window update needed until end of run
-    if( flags.doublebuf)
-    {
+    if(flags.doublebuf)
         return;
-    }
 
     // update window part for single buffer
-    if( rect == NULL )
-    {
-        SDL_UpdateRect( window, 0, 0, 0, 0 );
-    }
-    else
-    {
-        SDL_UpdateRect( window, rect->x, rect->y, rect->w, rect->h );
-    }
-}
+    if(rect == NULL)
+        SDL_UpdateRect(window, 0, 0, 0, 0);
+    else
+        SDL_UpdateRect(window, rect->x, rect->y, rect->w, rect->h);
+}