Changeset 442

Timestamp:

11/26/06 04:59:31 (2 years ago)

Author:

radekk

Message:

Hand tool - implementing cursor hand.

Files:

• sweep/trunk/pixmaps/cursor-closedhand.xbm (added)
• sweep/trunk/pixmaps/cursor-closedhand_mask.xbm (added)
• sweep/trunk/pixmaps/cursor-openhand.xbm (added)
• sweep/trunk/pixmaps/cursor-openhand_mask.xbm (added)
• sweep/trunk/src/cursors.c (modified) (5 diffs)
• sweep/trunk/src/cursors.h (modified) (1 diff)
• sweep/trunk/src/sample-display.c (modified) (2 diffs)

sweep/trunk/src/cursors.c

@@ -41 +41 @@
-#include "../pixmaps/zoom_out.xbm"
-#include "../pixmaps/zoom_out_mask.xbm"
+#include "../pixmaps/cursor-openhand.xbm"
+#include "../pixmaps/cursor-openhand_mask.xbm"
+#include "../pixmaps/cursor-closedhand.xbm"
+#include "../pixmaps/cursor-closedhand_mask.xbm"
-
-GdkCursor * sweep_cursors[SWEEP_CURSOR_MAX];
@@ -100 +104 @@
-  sweep_cursors[SWEEP_CURSOR_PENCIL] = gdk_cursor_new (GDK_PENCIL);
-  sweep_cursors[SWEEP_CURSOR_NOISE] = gdk_cursor_new (GDK_SPRAYCAN);
-
+
-
-  create_bitmap_and_mask_from_xpm (&bitmap, &mask, horiz_xpm);
@@ -107 +111 @@
-    gdk_cursor_new_from_pixmap (bitmap, mask, &white, &black, 8, 8);
-
+
-  create_bitmap_and_mask_from_xpm (&bitmap, &mask, horiz_plus_xpm);
-  
@@ -112 +117 @@
-    gdk_cursor_new_from_pixmap (bitmap, mask, &white, &black, 8, 8);
-
+
-  create_bitmap_and_mask_from_xpm (&bitmap, &mask, horiz_minus_xpm);
-  
-  sweep_cursors[SWEEP_CURSOR_HORIZ_MINUS] =
-    gdk_cursor_new_from_pixmap (bitmap, mask, &white, &black, 8, 8);
+
-
-  bitmap =
@@ -163 +170 @@
-
-
+  bitmap =
+    gdk_bitmap_create_from_data (NULL, (const gchar *) cursor_openhand_bits,
+                                 cursor_openhand_width, cursor_openhand_height);
+  mask =
+    gdk_bitmap_create_from_data (NULL, (const gchar *) cursor_openhand_mask_bits,
+                                 cursor_openhand_mask_width, cursor_openhand_mask_height);
+
+  sweep_cursors[SWEEP_CURSOR_HAND_OPEN] =
+    gdk_cursor_new_from_pixmap (bitmap, mask, &black, &white,
+                                cursor_openhand_x_hot, cursor_openhand_y_hot);
+
+
+  bitmap =
+    gdk_bitmap_create_from_data (NULL, cursor_closedhand_bits,
+                                 cursor_closedhand_width, cursor_closedhand_height);
+  mask =
+    gdk_bitmap_create_from_data (NULL, cursor_closedhand_mask_bits,
+                                 cursor_closedhand_mask_width, cursor_closedhand_mask_height);
+
+  sweep_cursors[SWEEP_CURSOR_HAND_CLOSE] =
+    gdk_cursor_new_from_pixmap (bitmap, mask, &black, &white,
+                                cursor_closedhand_x_hot, cursor_closedhand_y_hot);
+
+
-}

sweep/trunk/src/cursors.h

@@ -33 +33 @@
-  SWEEP_CURSOR_PENCIL,
-  SWEEP_CURSOR_NOISE,
-
+
+
-  SWEEP_CURSOR_MAX
-};

sweep/trunk/src/sample-display.c

@@ -487 +487 @@
-  case TOOL_NOISE:
-    cursor = sweep_cursors[SWEEP_CURSOR_NOISE];
+    break;
+  case TOOL_HAND:
+    cursor = sweep_cursors[SWEEP_CURSOR_HAND_OPEN];
-    break;
-  default:
@@ -2209 +2212 @@
-        s->selecting = SELECTING_HAND;
-        s->view->hand_offset = x;
-
+_CLOSE
-        sample_display_handle_hand_motion (s, x, y);
-        break;