fix colors on BGR displays

diff --git a/src/sim/w_x.c b/src/sim/w_x.c
index 06d3b9eaf49b207009339e192885435c33eaa23f..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: \
              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)); \
            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: \
            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)); \
            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: \
            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); \
            xd->pixels[i] = \
              ((color->red & 0xff) << 16) | \
              ((color->green & 0xff) << 8) | \
              ((color->blue & 0xff) << 0); \

-           break; \
-         case 32: \
+           } else { \

            xd->pixels[i] = \
            xd->pixels[i] = \

-             ((color->red & 0xff) << 16) | \
+             ((color->blue & 0xff) << 16) | \

              ((color->green & 0xff) << 8) | \
              ((color->green & 0xff) << 8) | \

-             ((color->blue & 0xff) << 0); \
+             ((color->red & 0xff) << 0); \
+           } \

            break; \
          } \
        } \
            break; \
          } \
        } \