Moved the cursors into a new directory.

--Sven

ChangeLog

@@ -1,3 +1,10 @@
+Wed May  5 12:40:54 MEST 1999 Sven Neumann <sven@gimp.org>
+
+	* Makefile.am
+	* app/cursorutil.c: Moved the cursors out of 'pixmaps' into a new
+	directory 'cursors'. Added the files to the Makefile.
+	Now its up to TigerT to provide a set of rocking cursors for us ;-)
+
 1999-05-05  Jay Cox  <jaycox@earthlink.net>
 
 	* pixmaps/mouse1*: new bitmap files containing the new mouse cursors.

Makefile.am

@@ -5,6 +5,14 @@ SUBDIRS = tools po intl libgimp app plug-ins modules data @GIMPDOCS@
 bin_SCRIPTS = gimptool
 
 EXTRA_DIST = \
+	cursors/bigcirc		\
+	cursors/bigcircmsk	\
+	cursors/mouse1		\
+	cursors/mouse1msk	\
+	cursors/mouse1_m	\
+	cursors/mouse1_mmsk	\
+	cursors/mouse1_p	\
+        cursors/mouse1_pmsk     \
 	pixmaps/anchor.xpm	 \
 	pixmaps/chain.xpm	 \
 	pixmaps/channel.xbm	 \

app/cursorutil.c

@@ -19,14 +19,14 @@
 #include "cursorutil.h"
 #include "dialog_handler.h"
 #include "gdisplay.h" /* for gdisplay_*_override_cursor() */
-#include "../pixmaps/mouse1"
-#include "../pixmaps/mouse1msk"
-#include "../pixmaps/mouse1_p"
-#include "../pixmaps/mouse1_pmsk"
-#include "../pixmaps/mouse1_m"
-#include "../pixmaps/mouse1_mmsk"
-#include "../pixmaps/bigcirc"
-#include "../pixmaps/bigcircmsk"
+#include "../cursors/mouse1"
+#include "../cursors/mouse1msk"
+#include "../cursors/mouse1_p"
+#include "../cursors/mouse1_pmsk"
+#include "../cursors/mouse1_m"
+#include "../cursors/mouse1_mmsk"
+#include "../cursors/bigcirc"
+#include "../cursors/bigcircmsk"
 
 typedef struct
 {
@@ -76,10 +76,10 @@ create_cursor(BM_Cursor *bmcursor)
 					   bmcursor->height);
   g_return_if_fail(pixmapmsk != NULL);
   
-  bmcursor->cursor = gdk_cursor_new_from_pixmap(pixmap, pixmapmsk, &fg, &bg,
-						bmcursor->x_hot,
-						bmcursor->y_hot);
-  g_return_if_fail(bmcursor->cursor != NULL);
+  bmcursor->cursor = gdk_cursor_new_from_pixmap (pixmap, pixmapmsk, &fg, &bg,
+						 bmcursor->x_hot,
+						 bmcursor->y_hot);
+  g_return_if_fail (bmcursor->cursor != NULL);
 }
 
 void
@@ -89,7 +89,7 @@ gimp_change_win_cursor(GdkWindow *win, GimpCursorType curtype)
 
   g_return_if_fail (curtype < GIMP_LAST_CURSOR_ENTRY);
   if (!gimp_cursors[(int)curtype].cursor)
-    create_cursor(&gimp_cursors[(int)curtype]);
+    create_cursor (&gimp_cursors[(int)curtype]);
   cursor = gimp_cursors[(int)curtype].cursor;
   gdk_window_set_cursor (win, cursor);
 }
@@ -136,7 +136,7 @@ gimp_add_busy_cursors (void)
   while (list)
     {
       gdisp = (GDisplay *) list->data;
-      gdisplay_install_override_cursor(gdisp, GDK_WATCH);
+      gdisplay_install_override_cursor (gdisp, GDK_WATCH);
 
       list = g_slist_next (list);
     }
@@ -157,7 +157,7 @@ gimp_remove_busy_cursors (gpointer data)
   while (list)
     {
       gdisp = (GDisplay *) list->data;
-      gdisplay_remove_override_cursor(gdisp);
+      gdisplay_remove_override_cursor (gdisp);
 
       list = g_slist_next (list);
     }
@@ -169,3 +169,7 @@ gimp_remove_busy_cursors (gpointer data)
 
   return 0;
 }
+
+
+
+

app/widgets/gimpcursor.c

@@ -19,14 +19,14 @@
 #include "cursorutil.h"
 #include "dialog_handler.h"
 #include "gdisplay.h" /* for gdisplay_*_override_cursor() */
-#include "../pixmaps/mouse1"
-#include "../pixmaps/mouse1msk"
-#include "../pixmaps/mouse1_p"
-#include "../pixmaps/mouse1_pmsk"
-#include "../pixmaps/mouse1_m"
-#include "../pixmaps/mouse1_mmsk"
-#include "../pixmaps/bigcirc"
-#include "../pixmaps/bigcircmsk"
+#include "../cursors/mouse1"
+#include "../cursors/mouse1msk"
+#include "../cursors/mouse1_p"
+#include "../cursors/mouse1_pmsk"
+#include "../cursors/mouse1_m"
+#include "../cursors/mouse1_mmsk"
+#include "../cursors/bigcirc"
+#include "../cursors/bigcircmsk"
 
 typedef struct
 {
@@ -76,10 +76,10 @@ create_cursor(BM_Cursor *bmcursor)
 					   bmcursor->height);
   g_return_if_fail(pixmapmsk != NULL);
   
-  bmcursor->cursor = gdk_cursor_new_from_pixmap(pixmap, pixmapmsk, &fg, &bg,
-						bmcursor->x_hot,
-						bmcursor->y_hot);
-  g_return_if_fail(bmcursor->cursor != NULL);
+  bmcursor->cursor = gdk_cursor_new_from_pixmap (pixmap, pixmapmsk, &fg, &bg,
+						 bmcursor->x_hot,
+						 bmcursor->y_hot);
+  g_return_if_fail (bmcursor->cursor != NULL);
 }
 
 void
@@ -89,7 +89,7 @@ gimp_change_win_cursor(GdkWindow *win, GimpCursorType curtype)
 
   g_return_if_fail (curtype < GIMP_LAST_CURSOR_ENTRY);
   if (!gimp_cursors[(int)curtype].cursor)
-    create_cursor(&gimp_cursors[(int)curtype]);
+    create_cursor (&gimp_cursors[(int)curtype]);
   cursor = gimp_cursors[(int)curtype].cursor;
   gdk_window_set_cursor (win, cursor);
 }
@@ -136,7 +136,7 @@ gimp_add_busy_cursors (void)
   while (list)
     {
       gdisp = (GDisplay *) list->data;
-      gdisplay_install_override_cursor(gdisp, GDK_WATCH);
+      gdisplay_install_override_cursor (gdisp, GDK_WATCH);
 
       list = g_slist_next (list);
     }
@@ -157,7 +157,7 @@ gimp_remove_busy_cursors (gpointer data)
   while (list)
     {
       gdisp = (GDisplay *) list->data;
-      gdisplay_remove_override_cursor(gdisp);
+      gdisplay_remove_override_cursor (gdisp);
 
       list = g_slist_next (list);
     }
@@ -169,3 +169,7 @@ gimp_remove_busy_cursors (gpointer data)
 
   return 0;
 }
+
+
+
+