Changeset 524Tweet

Timestamp:

Apr 22, 2011, 4:12:53 AM (12 years ago)

Author:

Sam Hocevar

Message:

core: Get rid of mostly useless headers, move endianness handling to
common.h (and rewrite functions so that they do not need the SDL headers)
and move a few functions out of sdlport's video.cpp. These functions
were in the original video.cpp (which reappears) and shouldn't be part
of the SDL port.

Location:

abuse/trunk/src

Files:

• chars.h (modified) (1 diff)
• clisp.cpp (modified) (1 diff)
• common.h (modified) (2 diffs)
• compiled.cpp (modified) (1 diff)
• compiled.h (modified) (1 diff)
• crc.h (modified) (1 diff)
• demo.cpp (modified) (1 diff)
• extend.h (modified) (1 diff)
• game.h (modified) (1 diff)
• imlib/Makefile.am (modified) (1 diff)
• imlib/dprint.cpp (modified) (1 diff)
• imlib/filesel.cpp (modified) (1 diff)
• imlib/filter.cpp (modified) (1 diff)
• imlib/glview.cpp (modified) (1 diff)
• imlib/image.cpp (modified) (2 diffs)
• imlib/image.h (modified) (1 diff)
• imlib/input.cpp (modified) (1 diff)
• imlib/macs.h (deleted)
• imlib/palette.cpp (modified) (1 diff)
• imlib/readwav.cpp (modified) (1 diff)
• imlib/specs.cpp (modified) (2 diffs)
• imlib/specs.h (modified) (1 diff)
• imlib/sprite.cpp (modified) (1 diff)
• imlib/sprite.h (modified) (1 diff)
• imlib/status.cpp (modified) (1 diff)
• imlib/system.h (deleted)
• imlib/timage.h (modified) (1 diff)
• imlib/video.cpp (added)
• imlib/video.h (modified) (2 diffs)
• innet.cpp (modified) (1 diff)
• intsect.cpp (modified) (1 diff)
• level.cpp (modified) (2 diffs)
• level.h (modified) (1 diff)
• light.cpp (modified) (1 diff)
• lisp/lisp.cpp (modified) (1 diff)
• lisp/lisp_gc.cpp (modified) (1 diff)
• lisp/lisp_opt.cpp (modified) (1 diff)
• lisp/trig.cpp (modified) (1 diff)
• net/Makefile.am (modified) (1 diff)
• net/engine.cpp (modified) (1 diff)
• net/fileman.cpp (modified) (1 diff)
• net/gserver.cpp (modified) (1 diff)
• net/indian.h (deleted)
• net/netfile.cpp (modified) (1 diff)
• net/undrv.cpp (modified) (1 diff)
• netface.h (modified) (1 diff)
• newlight.cpp (modified) (1 diff)
• nfclient.cpp (modified) (1 diff)
• nfserver.h (modified) (1 diff)
• particle.cpp (modified) (1 diff)
• sdlport/event.cpp (modified) (1 diff)
• sdlport/jnet.cpp (modified) (1 diff)
• sdlport/jnet.h (modified) (1 diff)
• sdlport/video.cpp (modified) (4 diffs)
• seq.cpp (modified) (1 diff)
• status.cpp (modified) (1 diff)
• transp.h (modified) (1 diff)
• unixnfc.cpp (modified) (1 diff)
• view.cpp (modified) (1 diff)

abuse/trunk/src/chars.h

@@ -18 +18 @@
 #include "ability.h"
 #include "event.h"
-#include "macs.h"
 #include <stdarg.h>
 #include <time.h>

abuse/trunk/src/clisp.cpp

@@ -12 +12 @@
 
 #include <string.h>
+#include <unistd.h>
 
 #include "common.h"

abuse/trunk/src/common.h

@@ -11 +11 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
+
+//
+// Globally required headers
+//
+#include <stdint.h>
 
 //
@@ -26 +31 @@
 static inline float Max(float a, float b) { return a > b ? a : b; }
 
+//
+// Byte swapping
+//
+static inline int BigEndian()
+{
+    union { uint32_t const x; uint8_t t[4]; } const u = { 0x01ffff00 };
+    return u.t[0];
+}
+
+static inline uint16_t Swap16(uint16_t x)
+{
+    return ((uint16_t)x << 8 ) | ((uint16_t)x >> 8);
+}
+
+static inline uint32_t Swap32(uint32_t x)
+{
+    return ((uint32_t)x >> 24) | (((uint32_t)x & 0x00ff0000) >> 8)
+         | (((uint32_t)x & 0x0000ff00) << 8) | ((uint32_t)x << 24);
+}
+
+#define uint16_to_intel(x) (BigEndian() ? Swap16((x)) : (x))
+#define uint32_to_intel(x) (BigEndian() ? Swap32((x)) : (x))
+#define big_uint16_to_local(x) (BigEndian() ? (x) : Swap16((x)))
+#define big_uint32_to_local(x) (BigEndian() ? (x) : Swap32((x)))
+#define uint16_to_local(x) (BigEndian() ? Swap16((x)) : (x))
+#define uint32_to_local(x) (BigEndian() ? Swap32((x)) : (x))
+
+#define bltl(x) big_uint32_to_local(x)
+#define bstl(x) big_uint16_to_local(x)
+#define lltl(x) uint32_to_intel(x)
+#define lstl(x) uint16_to_intel(x)
+
+#include <stdio.h>
+#define ERROR(x,st) { if (!(x)) \
+   { printf("Error on line %d of %s : %s\n", \
+     __LINE__,__FILE__,st); exit(1); } }
+
+// These macros should be removed for the non-debugging version
+#ifdef NO_CHECK
+#   define CONDITION(x,st)
+#   define CHECK(x)
+#else
+#   define CONDITION(x,st) ERROR(x,st)
+#   define CHECK(x) CONDITION(x,"Check stop");
+#endif
+
 #endif // __COMMON_H__
 

abuse/trunk/src/compiled.cpp

@@ -15 +15 @@
 
 #include "lisp.h"
-#include "macs.h"
 
 extern int total_objects;

abuse/trunk/src/compiled.h

@@ -11 +11 @@
 #ifndef __COMPILED_HPP_
 #define __COMPILED_HPP_
-#include "macs.h"
+
 extern int32_t S_fall_start,S_falling,S_landing,S_pounce_wait,
             S_turn_around,S_fire_wait,S_ceil_fire,S_top_walk,

abuse/trunk/src/crc.h

@@ -12 +12 @@
 #define _CRC_HPP_
 #include "specs.h"
-#include "macs.h"
 
 uint16_t calc_crc(uint8_t *buf, int len);

abuse/trunk/src/demo.cpp

@@ -17 +17 @@
 #include "demo.h"
 #include "specs.h"
-#include "macs.h"
 #include "jwindow.h"
 #include "dprint.h"

abuse/trunk/src/extend.h

@@ -21 +21 @@
 #include "lisp/lisp.h"
 
-#include "macs.h"
 #include "morpher.h"
 #include "chars.h"

abuse/trunk/src/game.h

@@ -14 +14 @@
 #include "loader2.h"
 
-#include "macs.h"
 #include "image.h"
 #include "video.h"

abuse/trunk/src/imlib/Makefile.am

@@ -26 +26 @@
     sprite.cpp sprite.h \
     jwindow.cpp jwindow.h \
-    macs.h video.h event.h mouse.h timing.h jdir.h \
-    system.h \
+    video.cpp video.h \
+    event.h mouse.h timing.h jdir.h \
     $(NULL)
 

abuse/trunk/src/imlib/dprint.cpp

@@ -15 +15 @@
 #include <stdio.h>
 
-#include "macs.h"
+#include "common.h"
 
 void  (*dprint_fun)(char *) = NULL;

abuse/trunk/src/imlib/filesel.cpp

@@ -10 +10 @@
 
 #include "config.h"
+
+#include <unistd.h>
 
 #include "common.h"

abuse/trunk/src/imlib/filter.cpp

@@ -14 +14 @@
 
 #include "image.h"
-#include "macs.h"
 #include "filter.h"
 

abuse/trunk/src/imlib/glview.cpp

@@ -13 +13 @@
 #include <math.h>
 
-#include "macs.h"
 #include "mdlread.h"
 #include "video.h"

abuse/trunk/src/imlib/image.cpp

@@ -12 +12 @@
 
 #include <math.h>
-#ifdef __DOS
-#   include <dir.h>
-#else
-#   include <unistd.h>
-#endif
 #include <stdlib.h>
 
@@ -22 +17 @@
 
 #include "image.h"
-#include "macs.h"
-#include "system.h"
-#include "system.h"
 
 linked_list image_list; // FIXME: only jwindow.cpp needs this

abuse/trunk/src/imlib/image.h

@@ -15 +15 @@
 #include "linked.h"
 #include "palette.h"
-#include "system.h"
 #include "specs.h"
 #define MAX_DIRTY 200

abuse/trunk/src/imlib/input.cpp

@@ -16 +16 @@
 
 #include "input.h"
-#include "macs.h"
-
 
 void button::remap(filter *f)

abuse/trunk/src/imlib/palette.cpp

@@ -17 +17 @@
 #include "palette.h"
 #include "image.h"
-#include "macs.h"
 #include "video.h"
 #include "filter.h"

abuse/trunk/src/imlib/readwav.cpp

@@ -11 +11 @@
 #include "config.h"
 
+#include "common.h"
+
 #include "readwav.h"
 #include "specs.h"
-#include "macs.h"
 #include "dprint.h"
 

abuse/trunk/src/imlib/specs.cpp

@@ -17 +17 @@
 #include <fcntl.h>
 #include <math.h>
+#include <unistd.h>
 #if (defined(__MACH__) || !defined(__APPLE__))
 #   include <sys/types.h>
@@ -27 +28 @@
 #include "palette.h"
 #include "specs.h"
-#include "system.h"
 #include "dprint.h"
 

abuse/trunk/src/imlib/specs.h

@@ -19 +19 @@
 
 #include "linked.h"
-#include "system.h"
 
 extern char const *spec_types[];

abuse/trunk/src/imlib/sprite.cpp

@@ -15 +15 @@
 #include "common.h"
 
-#include "macs.h"
 #include "video.h"
 #include "image.h"

abuse/trunk/src/imlib/sprite.h

@@ -11 +11 @@
 #ifndef __SPRITE_HPP
 #define __SPRITE_HPP
-#include "macs.h"
 #include "image.h"
 #include "linked.h"

abuse/trunk/src/imlib/status.cpp

@@ -15 +15 @@
 #include "common.h"
 
-#include "macs.h"
 #include "status.h"
 #include "dprint.h"

abuse/trunk/src/imlib/timage.h

@@ -13 +13 @@
 
 #include "image.h"
-#include "macs.h"
 #include "palette.h"
 #include "filter.h"

abuse/trunk/src/imlib/video.h

@@ -11 +11 @@
 #ifndef _VIDEO_HPP_
 #define _VIDEO_HPP_
-#include "system.h"
 
 #define TRI_1024x768x256 0x62
@@ -31 +30 @@
 void close_graphics();
 void fill_image(image *im, int x1, int y1, int x2, int y2);
+void update_window_done();
+
 void update_dirty(image *im, int xoff=0, int yoff=0);
-
+void put_part_image(image *im, int x, int y, int x1, int y1, int x2, int y2);
+void put_image(image * im, int x, int y);
 
 void clear_put_image(image *im, int x, int y);

abuse/trunk/src/innet.cpp

@@ -16 +16 @@
 
 #include "demo.h"
-#include "macs.h"
 #include "specs.h"
 #include "level.h"

abuse/trunk/src/intsect.cpp

@@ -12 +12 @@
 
 #include <stdlib.h>
-
-#include "macs.h"
 
 void pushback(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,

abuse/trunk/src/level.cpp

@@ -18 +18 @@
 #include <limits.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "common.h"
@@ -30 +31 @@
 #include "objects.h"
 #include "jrand.h"
-#include "macs.h"
 #include "clisp.h"
 #include "status.h"

abuse/trunk/src/level.h

@@ -14 +14 @@
 
 #include "specs.h"
-#include "macs.h"
 #include "objects.h"
 #include "view.h"

abuse/trunk/src/light.cpp

@@ -17 +17 @@
 #include "light.h"
 #include "image.h"
-#include "macs.h"
 #include "video.h"
 #include "palette.h"

abuse/trunk/src/lisp/lisp.cpp

@@ -29 +29 @@
 #else
 #   include "status.h"
-#   include "macs.h"
 #   include "specs.h"
 #   include "dprint.h"

abuse/trunk/src/lisp/lisp_gc.cpp

@@ -18 +18 @@
 #ifdef NO_LIBS
 #include "fakelib.h"
-#else
-#include "macs.h"
 #endif
 

abuse/trunk/src/lisp/lisp_opt.cpp

@@ -13 +13 @@
 #ifdef NO_LIBS
 #include "fakelib.h"
-#else
-#include "macs.h"
 #endif
 

abuse/trunk/src/lisp/trig.cpp

@@ -11 +11 @@
 #include "config.h"
 
-#include "system.h"
+#include "common.h"
 
 /* Python code to generate the tables:

abuse/trunk/src/net/Makefile.am

@@ -8 +8 @@
     sock.cpp sock.h \
     tcpip.cpp tcpip.h \
-    indian.h ghandler.h undrv.h \
+    ghandler.h undrv.h \
     $(NULL)
 

abuse/trunk/src/net/engine.cpp

@@ -11 +11 @@
 #include "config.h"
 
-#include "indian.h"
+#include "common.h"
+
 #include "../inc/netface.h"      // net interface structures to the engine will use
 #include "netfile.h"

abuse/trunk/src/net/fileman.cpp

@@ -19 +19 @@
 #include <sys/stat.h>
 
-#include "macs.h"
+#include "common.h"
 
 #include "fileman.h"

abuse/trunk/src/net/gserver.cpp

@@ -22 +22 @@
 #include "common.h"
 
-#include "system.h"
-#include "macs.h"
 #include "gserver.h"
 #include "netface.h"

abuse/trunk/src/net/netfile.cpp

@@ -11 +11 @@
 #include "config.h"
 
-#include "indian.h"
+#include "common.h"
+
 #include "netfile.h"
 #include "../inc/netface.h"

abuse/trunk/src/net/undrv.cpp

@@ -28 +28 @@
 #include <netdb.h>
 
-#include "indian.h"
+#include "common.h"
+
 #include "undrv.h"
-#include "../include/netface.h"      // net interface structures to the engine will use
-
-#include "../include/netface.h"
+#include "../include/netface.h" // net interface structures the engine will use
 
 //#include "netdrv.h"

abuse/trunk/src/netface.h

@@ -14 +14 @@
 #define __NETFACE_HPP_
 
+#include <stdint.h>
+
 #define PACKET_MAX_SIZE 1024    // this is a game data packet (udp/ipx)
 #define READ_PACKET_SIZE 1024   // this is a file service packet (tcp/spx)
 #define NET_CRC_FILENAME "#net_crc"
 #define NET_STARTFILE    "netstart.spe"
-#include "indian.h"
+
 #include <string.h>
 

abuse/trunk/src/newlight.cpp

@@ -15 +15 @@
 #include "light.h"
 #include "image.h"
-#include "macs.h"
 #include "video.h"
 #include "palette.h"

abuse/trunk/src/nfclient.cpp

@@ -20 +20 @@
 #include "common.h"
 
-#include "system.h"
 #include "netface.h"
 

abuse/trunk/src/nfserver.h

@@ -13 +13 @@
 
 #include "specs.h"
-#include "system.h"
 #include "netface.h"
 #include "sock.h"

abuse/trunk/src/particle.cpp

@@ -13 +13 @@
 #include "common.h"
 
-#include "macs.h"
 #include "particle.h"
 #include "view.h"

abuse/trunk/src/sdlport/event.cpp

@@ -25 +25 @@
 #include "common.h"
 
-#include "system.h"
 #include "image.h"
 #include "palette.h"
 #include "video.h"
-#include "macs.h"
 #include "mouse.h"
 #include "event.h"

abuse/trunk/src/sdlport/jnet.cpp

@@ -38 +38 @@
 
 #include "jnet.h"
-#include "macs.h"
 
 int current_sock_err;

abuse/trunk/src/sdlport/jnet.h

@@ -14 +14 @@
 #define __NET_HPP_
 
-#include "macs.h"
 #include "packet.h"
 

abuse/trunk/src/sdlport/video.cpp

@@ -36 +36 @@
 
 #include "filter.h"
-#include "system.h"
 #include "video.h"
-#include "macs.h"
 #include "image.h"
 #include "setup.h"
@@ -55 +53 @@
 #endif
 
-// Forward declarations
-void update_window_part(SDL_Rect *rect);
-void update_window_done();
+static void update_window_part(SDL_Rect *rect);
 
 //
@@ -339 +335 @@
 
 //
-// put_image()
-// Draw the entire image
-//
-void put_image(image * im, int x, int y)
-{
-    put_part_image(im, x, y, 0, 0, im->Size().x - 1, im->Size().y - 1);
-}
-
-//
-// update_dirty_window()
-// Update the dirty parts of the window
-//
-void update_dirty_window(image *im, int xoff, int yoff)
-{
-    int count;
-    dirty_rect *dr, *q;
-    CHECK(im->m_special); // make sure the image has the ability to contain dirty areas
-    if(im->m_special->keep_dirt == 0)
-    {
-        put_image(im, xoff, yoff);
-    }
-    else
-    {
-        count = im->m_special->dirties.number_nodes();
-        if(!count)
-            return;  // if nothing to update, return
-        dr = (dirty_rect *)(im->m_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);
-            q = dr;
-            dr = (dirty_rect *)(dr->next());
-            im->m_special->dirties.unlink(q);
-            delete q;
-            count--;
-        }
-    }
-}
-
-//
-// update_dirty()
-// Update the dirty parts of the image
-//
-void update_dirty(image *im, int xoff, int yoff)
-{
-    update_dirty_window(im, xoff, yoff);
-    update_window_done();
-}
-
-//
 // load()
 // Set the palette
@@ -461 +407 @@
 }
 
-void update_window_part(SDL_Rect *rect)
+static void update_window_part(SDL_Rect *rect)
 {
     // no partial blit's in case of opengl

abuse/trunk/src/seq.cpp

@@ -14 +14 @@
 
 #include "seq.h"
-#include "macs.h"
 #include "lisp.h"
 

abuse/trunk/src/status.cpp

@@ -13 +13 @@
 #include <string.h>
 
-#include "macs.h"
 #include "status.h"
 #include "dprint.h"

abuse/trunk/src/transp.h

@@ -12 +12 @@
 #define __TRANSP_HPP_
 #include "image.h"
-#include "macs.h"
 void transp_put(image *im, image *screen, uint8_t *table, int x, int y);
 

abuse/trunk/src/unixnfc.cpp

@@ -21 +21 @@
 #include <sys/fcntl.h>
 #include <fcntl.h>
-
-#include "system.h"
-#include "indian.h"
 
 #include "netface.h"

abuse/trunk/src/view.cpp

@@ -11 +11 @@
 #include "config.h"
 
+#include <unistd.h>
+
 #include "common.h"
 
 #include "game.h"
 
-#include "system.h"
 #include "view.h"
 #include "lisp.h"