Changeset 16228 for trunk/Ohana/src/kapa2/src/Reorient.c

Timestamp:

Jan 24, 2008, 5:45:18 PM (18 years ago)

Author:

eugene

Message:

cleaning up the image/screen relationships and remap functions

File:

• trunk/Ohana/src/kapa2/src/Reorient.c (modified) (3 diffs)

trunk/Ohana/src/kapa2/src/Reorient.c

@@ -3 +3 @@
 void Reorient (Graphic *graphic, KapaImageWidget *image, double X, double Y, int mode) {
 
-  if (image[0].expand == 0) image[0].expand = 1;
+  Picture *picture;
 
-  if ((image[0].X == X) && (image[0].Y == Y) && (mode == 0)) {
+  picture = &image[0].picture;
+
+  if (picture[0].expand == 0) picture[0].expand = 1;
+
+  if ((picture[0].X == X) && (picture[0].Y == Y) && (mode == 0)) {
     Refresh ();
     XFlush (graphic[0].display);
@@ -13 +17 @@
   switch (mode) {
   case 0:
-    if ((image[0].X != X) || (image[0].Y != Y)) {
-      image[0].X = X;
-      image[0].Y = Y;
+    if ((picture[0].X != X) || (picture[0].Y != Y)) {
+      picture[0].X = X;
+      picture[0].Y = Y;
     }
     break;
   case -1: 
-    image[0].expand--;
-    if ((image[0].expand == 0) || (image[0].expand == -1))
-      image[0].expand = -2;
-    if (image[0].expand < -30) {
-      fprintf (stderr, "can't get smaller!\n");
-      image[0].expand = -30;
-      return;
-    }
-    image[0].X = X;
-    image[0].Y = Y;
+    picture[0].expand--;
+    if ((picture[0].expand == 0) || (picture[0].expand == -1)) picture[0].expand = -2;
+    picture[0].X = X;
+    picture[0].Y = Y;
     break;
   case +1:
-    image[0].expand++;
-    if ((image[0].expand == 0) || (image[0].expand == -1))
-      image[0].expand = 1;
-    if (image[0].expand > 30) {
-      fprintf (stderr, "can't get bigger!\n");
-      image[0].expand = 30;
-      return;
-    }
-    image[0].X = X;
-    image[0].Y = Y;
+    picture[0].expand++;
+    if ((picture[0].expand == 0) || (picture[0].expand == -1)) picture[0].expand = 1;
+    picture[0].X = X;
+    picture[0].Y = Y;
     break;
   }
@@ -49 +41 @@
   XFlush (graphic[0].display);
 }
-
-# if (0) /* the "warp" function seems to be a problem on SUNs for some reason */
-  XQueryPointer (graphic[0].display, graphic[0].window, &dummy1, &dummy1, &dummy2, &dummy2, &x, &y, &dummy3); 
-  if ((x > image[0].picture.x) && (x < image[0].picture.x + image[0].picture.dx) &&
-      (y > image[0].picture.y) && (y < image[0].picture.y + image[0].picture.dy) &&
-      ((mouse_event[0].button == 2) || (mouse_event[0].button == 3))) {
-    XWarpPointer (graphic[0].display, None, graphic[0].window, 0, 0, 0, 0, 
-                  image[0].picture.x + 0.5*image[0].picture.dx,
-                  image[0].picture.y + 0.5*image[0].picture.dy);
-  }
-# endif
-