more big endian fixes (overlays on minimaps)

diff --git a/src/sim/g_map.c b/src/sim/g_map.c
index 87c7e273b1c508c041e40b11de5ed4422e98d282..667cfae5000a2344eecad485c896c51a55265f7c 100644 (file)
--- a/src/sim/g_map.c
+++ b/src/sim/g_map.c
@@ -406,25 +406,15 @@ drawRect(SimView *view, int pixel, int solid,
        unsigned char *image = 
          &data[(line * y) + (x * pixelBytes)];
 
        unsigned char *image = 
          &data[(line * y) + (x * pixelBytes)];
 

-       if (solid) {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
+       for (i = h; i > 0; i--) {
+         for (j = w; j > 0; j--) {
+           if (solid || stipple++ & 1)

              *image = pixel;
              *image = pixel;

-             image++;
-           }
-           image += line - w;
-         }
-       } else {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             if (stipple++ & 1)
-               *image = pixel;
-             image++;
-           }
-           if (!(w & 1))
-             stipple++;
-           image += line - w;
+           image++;

          }
          }

+         if (!(w & 1))
+           stipple++;
+         image += line - w;

        }
       }
       break;
        }
       }
       break;


@@ -438,26 +428,22 @@ drawRect(SimView *view, int pixel, int solid,
        image = 
          &data[(line * y) + x];
 
        image = 
          &data[(line * y) + x];
 

-       if (solid) {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             *image = pixel;
-             image++;
-           }
-           image += line - w;
-         }
-       } else {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             if (stipple++ & 1)
-               *image = pixel;
-             image++;
+       for (i = h; i > 0; i--) {
+         for (j = w; j > 0; j--) {
+           if (solid || stipple++ & 1) {
+             if (view->x->x_big_endian) {
+               *image = ((pixel & 0xff) << 8) | ((pixel & 0xff00) >> 8);
+             } else {
+               *image = pixel;
+             }

            }
            }

-           if (!(w & 1))
-             stipple++;
-           image += line - w;
+           image++;

          }
          }

+         if (!(w & 1))
+           stipple++;
+         image += line - w;

        }
        }

+

       }
       break;
 
       }
       break;
 


@@ -470,37 +456,36 @@ drawRect(SimView *view, int pixel, int solid,
        image = 
          &data[(line * y) + x * pixelBytes];
 
        image = 
          &data[(line * y) + x * pixelBytes];
 

-       if (solid) {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
-             *(image++) = (pixel >> 0) & 0xff;
-             *(image++) = (pixel >> 8) & 0xff;
-             *(image++) = (pixel >> 16) & 0xff;
+       for (i = h; i > 0; i--) {
+         for (j = w; j > 0; j--) {
+           if (view->x->x_big_endian) {

              if (pixelBytes == 4) {
                image++;
              }
              if (pixelBytes == 4) {
                image++;
              }

-           }
-           image += line - w * pixelBytes;
-         }
-       } else {
-         for (i = h; i > 0; i--) {
-           for (j = w; j > 0; j--) {
+             if (solid || stipple++ & 1) {
+               *(image++) = (pixel >> 16) & 0xff;
+               *(image++) = (pixel >> 8) & 0xff;
+               *(image++) = (pixel >> 0) & 0xff;
+             } else {
+               image += 3;
+             }
+           } else {

              if (stipple++ & 1) {
              if (stipple++ & 1) {

-               *(image++) = (pixel >> 0) & 0xff;
-               *(image++) = (pixel >> 8) & 0xff;
-               *(image++) = (pixel >> 16) & 0xff;
+               *(image++) = (pixel >> 0) & 0xff;
+               *(image++) = (pixel >> 8) & 0xff;
+               *(image++) = (pixel >> 16) & 0xff;

              } else {
                image += 3;
              }
              if (pixelBytes == 4) {
              } else {
                image += 3;
              }
              if (pixelBytes == 4) {

-               image++;
+               image++;

              }
            }
              }
            }

-           if (!(w & 1)) {
-             stipple++;
-           }
-           image += line - w * pixelBytes;

          }
          }

+         if (!(w & 1)) {
+           stipple++;
+         }
+         image += line - w * pixelBytes;

        }
       }
       break;
        }
       }
       break;

diff --git a/src/sim/headers/view.h b/src/sim/headers/view.h
index 8f87fe0f7dd5e9e4f44a1a0dcea571436ca5e907..744e0b3e1e0cfee55b7425c0e53df8c52b73bf4a 100644 (file)
--- a/src/sim/headers/view.h
+++ b/src/sim/headers/view.h
@@ -114,6 +114,7 @@ typedef struct XDisplay {
   Pixmap horiz_stipple;
   Pixmap diag_stipple;
   int needs_swap;
   Pixmap horiz_stipple;
   Pixmap diag_stipple;
   int needs_swap;

+  int x_big_endian;

 } XDisplay;
 
 
 } XDisplay;
 
 

diff --git a/src/sim/w_x.c b/src/sim/w_x.c
index 3d8dd481979966f6514b3f0414345ecdec9a0af3..e32aeedc46136796dae246ac0433c66eb89966dc 100644 (file)
--- a/src/sim/w_x.c
+++ b/src/sim/w_x.c
@@ -601,6 +601,7 @@ InitNewView(SimView *view, char *title, int class, int w, int h)
   }
 
   view->x->needs_swap = !(*(unsigned char*) (&test));
   }
 
   view->x->needs_swap = !(*(unsigned char*) (&test));

+  view->x->x_big_endian = (ImageByteOrder(view->x->dpy) == MSBFirst);

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