fix colors on BGR displays

[micropolis] / src / sim / w_x.c

diff --git a/src/sim/w_x.c b/src/sim/w_x.c
index 69363b57febcc17ca3b6a3c4d69c203c6cf29cb7..3d8dd481979966f6514b3f0414345ecdec9a0af3 100644 (file)
--- a/src/sim/w_x.c
+++ b/src/sim/w_x.c
@@ -327,28 +327,43 @@ FindXDisplay(Tk_Window tkwin)
              color->pixel; \
            break; \
          case 15: \
+           if (xd->visual->red_mask == 0x7c00) { \
            xd->pixels[i] = \
              (((color->red >> (8 + 3)) & 0x1f) << (5 + 5)) | \
              (((color->green >> (8 + 2)) & 0x1f) << (5)) | \
              (((color->blue >> (8 + 3)) & 0x1f) << (0)); \
+           } else { \
+             (((color->blue >> (8 + 3)) & 0x1f) << (5 + 5)) | \
+             (((color->green >> (8 + 2)) & 0x1f) << (5)) | \
+             (((color->red >> (8 + 3)) & 0x1f) << (0)); \
+           } \
            break; \
          case 16: \
+           if (xd->visual->red_mask == 0xf800) { \
            xd->pixels[i] = \
              (((color->red >> (8 + 3)) & 0x1f) << (6 + 5)) | \
              (((color->green >> (8 + 2)) & 0x3f) << (5)) | \
              (((color->blue >> (8 + 3)) & 0x1f) << (0)); \
+           } else { \
+           xd->pixels[i] = \
+             (((color->blue >> (8 + 3)) & 0x1f) << (6 + 5)) | \
+             (((color->green >> (8 + 2)) & 0x3f) << (5)) | \
+             (((color->red >> (8 + 3)) & 0x1f) << (0)); \
+           } \
            break; \
          case 24: \
+         case 32: \
+           if (xd->visual->red_mask == 0xff0000) { \
            xd->pixels[i] = \
              ((color->red & 0xff) << 16) | \
              ((color->green & 0xff) << 8) | \
              ((color->blue & 0xff) << 0); \
-           break; \
-         case 32: \
+           } else { \
            xd->pixels[i] = \
-             ((color->red & 0xff) << 16) | \
+             ((color->blue & 0xff) << 16) | \
              ((color->green & 0xff) << 8) | \
-             ((color->blue & 0xff) << 0); \
+             ((color->red & 0xff) << 0); \
+           } \
            break; \
          } \
        } \
@@ -441,7 +456,9 @@ FindXDisplay(Tk_Window tkwin)
        } else {
          fprintf(stderr,
                  "Cool, I found the shared memory extension!\n");
-         xd->shared = 1;
+         fprintf(stderr,
+                 "Disabled SHM, because it is currently broken!\n");
+         xd->shared = 0;
        }
       }
     }
@@ -488,6 +505,7 @@ SimView *
 InitNewView(SimView *view, char *title, int class, int w, int h)
 {
   int type, i;
+  int test = 1;
   int d = 8;
   unsigned long valuemask = 0;
   char *t;
@@ -582,6 +600,9 @@ InitNewView(SimView *view, char *title, int class, int w, int h)
     view->type = X_Mem_View;
   }
 
+  view->x->needs_swap = !(*(unsigned char*) (&test));
+
+
   GetPixmaps(view->x);
   view->pixels = view->x->pixels;
 
@@ -1138,7 +1159,7 @@ DoResizeView(SimView *view, int w, int h)
          view->pixel_bytes = 2;
          view->depth = 15;
          bitmap_pad = 16;
-         bitmap_depth = 16;
+         bitmap_depth = 15;
          view->line_bytes8 =
            ((view->m_width * view->pixel_bytes) + 3) & (~3);
          break;