re-add (disabled) air crash disaster

[micropolis] / src / sim / w_x.c

diff --git a/src/sim/w_x.c b/src/sim/w_x.c
index 76e9ff6eb6392a87b4f551f7feed35d2d178094e..ef42536588ef0d8d535c104d17f5fd017fbb8f9d 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; \
          } \
        } \


@@ -441,9 +456,7 @@ FindXDisplay(Tk_Window tkwin)
        } else {
          fprintf(stderr,
                  "Cool, I found the shared memory extension!\n");
        } else {
          fprintf(stderr,
                  "Cool, I found the shared memory extension!\n");

-         fprintf(stderr,
-                 "Disabled SHM, because it is currently broken!\n");
-         xd->shared = 0;
+         xd->shared = 1;

        }
       }
     }
        }
       }
     }


@@ -490,6 +503,7 @@ SimView *
 InitNewView(SimView *view, char *title, int class, int w, int h)
 {
   int type, i;
 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;
   int d = 8;
   unsigned long valuemask = 0;
   char *t;


@@ -584,7 +598,9 @@ InitNewView(SimView *view, char *title, int class, int w, int h)
     view->type = X_Mem_View;
   }
 
     view->type = X_Mem_View;
   }
 

-  view->x->big_endian = (ImageByteOrder(view->x->dpy) == MSBFirst);
+  view->x->needs_swap = !(*(unsigned char*) (&test));
+  view->x->x_big_endian = (ImageByteOrder(view->x->dpy) == MSBFirst);
+

 
   GetPixmaps(view->x);
   view->pixels = view->x->pixels;
 
   GetPixmaps(view->x);
   view->pixels = view->x->pixels;


@@ -595,8 +611,6 @@ InitNewView(SimView *view, char *title, int class, int w, int h)
   view->pan_x = w / 2; view->pan_y = h / 2;
   DoResizeView(view, w, h);
 
   view->pan_x = w / 2; view->pan_y = h / 2;
   DoResizeView(view, w, h);
 

-  GetViewTiles(view);
-

   return (view);
 }
 
   return (view);
 }
 


@@ -1142,7 +1156,7 @@ DoResizeView(SimView *view, int w, int h)
          view->pixel_bytes = 2;
          view->depth = 15;
          bitmap_pad = 16;
          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;
          view->line_bytes8 =
            ((view->m_width * view->pixel_bytes) + 3) & (~3);
          break;


@@ -1228,6 +1242,9 @@ DoResizeView(SimView *view, int w, int h)
       }
     }
   }
       }
     }
   }

+
+  GetViewTiles(view);
+

 }
 
 
 }