still more NumLock fixes, this time for scrollbars and sliders

[micropolis] / src / sim / g_smmaps.c

diff --git a/src/sim/g_smmaps.c b/src/sim/g_smmaps.c
index ed8c075c0cad25eb530bbe3e9b00cec1a71ce76c..8b5f345fa073d262a76316be8b1ad59563c31c30 100644 (file)
--- a/src/sim/g_smmaps.c
+++ b/src/sim/g_smmaps.c
@@ -84,63 +84,67 @@ int DynamicData[32];
       if (tile >= TILE_COUNT) tile -= TILE_COUNT;
 
 
-#if defined(MSDOS) || defined(OSF1) || defined(IS_INTEL)
-
-#define ROW1_8(n) \
+#define LE_ROW1_8(n) \
       l = mem[n]; \
       image[0] = l; \
       image[1] = l >>8; \
       image[2] = l >>16; \
       image += lineBytes;
 
-#define ROW1_16(n) \
+#define LE_ROW1_16(n) \
       memcpy((char *)image, ((char *)mem) + (n * 4 * 2), (3 * 2)); \
       image += lineBytes;
 
-#define ROW1_24(n) \
+#define LE_ROW1_24(n) \
       memcpy((char *)image, ((char *)mem) + (n * 4 * 3), (3 * 3)); \
       image += lineBytes;
 
-#define ROW1_32(n) \
+#define LE_ROW1_32(n) \
       memcpy((char *)image, ((char *)mem) + (n * 4 * 4), (3 * 4)); \
       image += lineBytes;
 
-#else
-
-#define ROW1_8(n) \
+#define BE_ROW1_8(n) \
       l = mem[n]; \
       image[0] = l >>24; \
       image[1] = l >>16; \
       image[2] = l >>8; \
       image += lineBytes;
 
-#define ROW1_16(n) \
+#define BE_ROW1_16(n) \
       l = mem[n]; /* XXX: WRONG. handle depth */ \
       image[0] = l >>24; \
       image[1] = l >>16; \
       image[2] = l >>8; \
       image += lineBytes;
 
-#define ROW1_24(n) \
+#define BE_ROW1_24(n) \
       l = mem[n]; /* XXX: WRONG. handle depth */ \
       image[0] = l >>24; \
       image[1] = l >>16; \
       image[2] = l >>8; \
       image += lineBytes;
 
-#define ROW1_32(n) \
+#define BE_ROW1_32(n) \
       l = mem[n]; /* XXX: WRONG. handle depth */ \
       image[0] = l >>24; \
       image[1] = l >>16; \
       image[2] = l >>8; \
       image += lineBytes;
 
-#endif
+#define LE_ROW3_8 LE_ROW1_8(0) LE_ROW1_8(1) LE_ROW1_8(2)
+#define LE_ROW3_16 LE_ROW1_16(0) LE_ROW1_16(1) LE_ROW1_16(2)
+#define LE_ROW3_24 LE_ROW1_24(0) LE_ROW1_24(1) LE_ROW1_24(2)
+#define LE_ROW3_32 LE_ROW1_32(0) LE_ROW1_32(1) LE_ROW1_32(2)
 
-#define ROW3_8 ROW1_8(0) ROW1_8(1) ROW1_8(2)
-#define ROW3_16 ROW1_16(0) ROW1_16(1) ROW1_16(2)
-#define ROW3_24 ROW1_24(0) ROW1_24(1) ROW1_24(2)
-#define ROW3_32 ROW1_32(0) ROW1_32(1) ROW1_32(2)
+#define BE_ROW3_8 BE_ROW1_8(0) BE_ROW1_8(1) BE_ROW1_8(2)
+#define BE_ROW3_16 BE_ROW1_16(0) BE_ROW1_16(1) BE_ROW1_16(2)
+#define BE_ROW3_24 BE_ROW1_24(0) BE_ROW1_24(1) BE_ROW1_24(2)
+#define BE_ROW3_32 BE_ROW1_32(0) BE_ROW1_32(1) BE_ROW1_32(2)
+
+#define ROW3_8 if (view->x->needs_swap) { BE_ROW3_8 } else { LE_ROW3_8 }
+#define ROW3_16 LE_ROW3_16
+#define ROW3_24 LE_ROW3_24
+#define ROW3_32 LE_ROW3_32
 
 #define ROW3 \
          switch (view->x->depth) { \
@@ -153,8 +157,6 @@ int DynamicData[32];
                  ROW3_16 \
                  break; \
                case 24: \
-                 ROW3_24 \
-                 break; \
                case 32: \
                  ROW3_32 \
                  break; \
@@ -293,14 +295,26 @@ void drawPower(SimView *view)
                case 16:
                  { 
                        unsigned short *p;
-                       p = (short *)image;
-                       p[0] = p[1] = p[2] = pix;
+                       p = (unsigned short *)image;
+                       if (view->x->x_big_endian) {
+                         p[0] = p[1] = p[2] = ((pix & 0xff) << 8) | ((pix & 0xff00) >> 8);
+                       } else {
+                         p[0] = p[1] = p[2] = pix;
+                       }
                        image += lineBytes;
-                       p = (short *)image;
-                       p[0] = p[1] = p[2] = pix;
+                       p = (unsigned short *)image;
+                       if (view->x->x_big_endian) {
+                         p[0] = p[1] = p[2] = ((pix & 0xff) << 8) | ((pix & 0xff00) >> 8);
+                       } else {
+                         p[0] = p[1] = p[2] = pix;
+                       }
                        image += lineBytes;
-                       p = (short *)image;
-                       p[0] = p[1] = p[2] = pix;
+                       p = (unsigned short *)image;
+                       if (view->x->x_big_endian) {
+                         p[0] = p[1] = p[2] = ((pix & 0xff) << 8) | ((pix & 0xff00) >> 8);
+                       } else {
+                         p[0] = p[1] = p[2] = pix;
+                       }
                        image += lineBytes;
                  }
                  break;
@@ -313,12 +327,21 @@ void drawPower(SimView *view)
                          unsigned char *img =
                                image;
                          for (x = 0; x < 4; x++) {
-                               *(img++) = (pix >> 0) & 0xff;
-                               *(img++) = (pix >> 8) & 0xff;
-                               *(img++) = (pix >> 16) & 0xff;
-                               if (pixelBytes == 4) {
-                                 img++;
-                               } // if
+                               if (view->x->x_big_endian) {
+                                 if (pixelBytes == 4) {
+                                   img++;
+                                 } // if
+                                 *(img++) = (pix >> 16) & 0xff;
+                                 *(img++) = (pix >> 8) & 0xff;
+                                 *(img++) = (pix >> 0) & 0xff;
+                               } else {
+                                 *(img++) = (pix >> 0) & 0xff;
+                                 *(img++) = (pix >> 8) & 0xff;
+                                 *(img++) = (pix >> 16) & 0xff;
+                                 if (pixelBytes == 4) {
+                                   img++;
+                                 } // if
+                               }
                          } // for x
                          image += lineBytes;
                        } // for y