Updated the cursor theme to contain a few needed cursors

(pencil, based_right_arrow) and a few default painting
tool cursors as well.

28 files changed, 178 insertions, 161 deletions

diff --git a/.gitignore b/.gitignore
index 7bc1cab..1b53eb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ test/valgrind-logs
 test/torturetest
 test/torture_*
 test/exported_*
+.DS_Store
diff --git a/cursor/sugar/ChangeLog b/cursor/sugar/ChangeLog
deleted file mode 100644
index ac10780..0000000
--- a/cursor/sugar/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2003-01-17  Havoc Pennington  <hp@redhat.com>
-
-	* Makefile.am (EXTRA_DIST): fix distcheck
-
-Thu Jan 16 14:56:26 2003  Owen Taylor  <otaylor@redhat.com>
-
-	* Bluecurve.cursortheme: Conform to new syntax,
-	add aliases.
-
diff --git a/cursor/sugar/Makefile.am b/cursor/sugar/Makefile.am
index 58ce3bf..cb9beec 100644
--- a/cursor/sugar/Makefile.am
+++ b/cursor/sugar/Makefile.am
@@ -4,16 +4,16 @@ THEME_DIR = $(top_builddir)/cursor/sugar/theme
 all-local: sugar.stamp
 
 sugar_images =			\
-	sugar-0.png		\
-	sugar-1.png		\
-	sugar-2.png		\
-	sugar-3.png		\
-	sugar-4.png		\
-	sugar-5.png		\
-	sugar-6.png		\
-	sugar-7.png		\
-	sugar-8.png              \
-	sugar-9.png              \
+	sugar-00.png		\
+	sugar-01.png		\
+	sugar-02.png		\
+	sugar-03.png		\
+	sugar-04.png		\
+	sugar-05.png		\
+	sugar-06.png		\
+	sugar-07.png		\
+	sugar-08.png              \
+	sugar-09.png              \
 	sugar-10.png             \
 	sugar-11.png             \
 	sugar-hotspots.png
diff --git a/cursor/sugar/sugar-0.png b/cursor/sugar/sugar-0.png
deleted file mode 100644
index 5e56564..0000000
--- a/cursor/sugar/sugar-0.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-00.png b/cursor/sugar/sugar-00.png
new file mode 100644
index 0000000..d9b2633
--- /dev/null
+++ b/cursor/sugar/sugar-00.png
diff --git a/cursor/sugar/sugar-01.png b/cursor/sugar/sugar-01.png
new file mode 100644
index 0000000..0ba523a
--- /dev/null
+++ b/cursor/sugar/sugar-01.png
diff --git a/cursor/sugar/sugar-02.png b/cursor/sugar/sugar-02.png
new file mode 100644
index 0000000..a822ad9
--- /dev/null
+++ b/cursor/sugar/sugar-02.png
diff --git a/cursor/sugar/sugar-03.png b/cursor/sugar/sugar-03.png
new file mode 100644
index 0000000..22101be
--- /dev/null
+++ b/cursor/sugar/sugar-03.png
diff --git a/cursor/sugar/sugar-04.png b/cursor/sugar/sugar-04.png
new file mode 100644
index 0000000..49efde3
--- /dev/null
+++ b/cursor/sugar/sugar-04.png
diff --git a/cursor/sugar/sugar-05.png b/cursor/sugar/sugar-05.png
new file mode 100644
index 0000000..2fd9324
--- /dev/null
+++ b/cursor/sugar/sugar-05.png
diff --git a/cursor/sugar/sugar-06.png b/cursor/sugar/sugar-06.png
new file mode 100644
index 0000000..4e1b1d7
--- /dev/null
+++ b/cursor/sugar/sugar-06.png
diff --git a/cursor/sugar/sugar-07.png b/cursor/sugar/sugar-07.png
new file mode 100644
index 0000000..2d37d1d
--- /dev/null
+++ b/cursor/sugar/sugar-07.png
diff --git a/cursor/sugar/sugar-08.png b/cursor/sugar/sugar-08.png
new file mode 100644
index 0000000..661502a
--- /dev/null
+++ b/cursor/sugar/sugar-08.png
diff --git a/cursor/sugar/sugar-09.png b/cursor/sugar/sugar-09.png
new file mode 100644
index 0000000..1927ad2
--- /dev/null
+++ b/cursor/sugar/sugar-09.png
diff --git a/cursor/sugar/sugar-1.png b/cursor/sugar/sugar-1.png
deleted file mode 100644
index 340bbf7..0000000
--- a/cursor/sugar/sugar-1.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-10.png b/cursor/sugar/sugar-10.png
index 1d2991b..daa98b5 100644
--- a/cursor/sugar/sugar-10.png
+++ b/cursor/sugar/sugar-10.png
diff --git a/cursor/sugar/sugar-11.png b/cursor/sugar/sugar-11.png
index 02719c1..63216db 100644
--- a/cursor/sugar/sugar-11.png
+++ b/cursor/sugar/sugar-11.png
diff --git a/cursor/sugar/sugar-2.png b/cursor/sugar/sugar-2.png
deleted file mode 100644
index 9e69567..0000000
--- a/cursor/sugar/sugar-2.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-3.png b/cursor/sugar/sugar-3.png
deleted file mode 100644
index bedc3b1..0000000
--- a/cursor/sugar/sugar-3.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-4.png b/cursor/sugar/sugar-4.png
deleted file mode 100644
index 1f65d44..0000000
--- a/cursor/sugar/sugar-4.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-5.png b/cursor/sugar/sugar-5.png
deleted file mode 100644
index 22b6eba..0000000
--- a/cursor/sugar/sugar-5.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-6.png b/cursor/sugar/sugar-6.png
deleted file mode 100644
index 7f5d49e..0000000
--- a/cursor/sugar/sugar-6.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-7.png b/cursor/sugar/sugar-7.png
deleted file mode 100644
index 32ec0e0..0000000
--- a/cursor/sugar/sugar-7.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-8.png b/cursor/sugar/sugar-8.png
deleted file mode 100644
index 1dd0eea..0000000
--- a/cursor/sugar/sugar-8.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-9.png b/cursor/sugar/sugar-9.png
deleted file mode 100644
index 1e57153..0000000
--- a/cursor/sugar/sugar-9.png
+++ /dev/null
diff --git a/cursor/sugar/sugar-cursortheme b/cursor/sugar/sugar-cursortheme
new file mode 100644
index 0000000..2cec12b
--- /dev/null
+++ b/cursor/sugar/sugar-cursortheme
@@ -0,0 +1,167 @@
+<theme name="Sugar">
+	<source size="48" gridsize="48">
+		<image file="sugar-00.png" use="0"/>
+		<image file="sugar-01.png" use="1"/>
+		<image file="sugar-02.png" use="2"/>
+		<image file="sugar-03.png" use="3"/>
+		<image file="sugar-04.png" use="4"/>
+		<image file="sugar-05.png" use="5"/>
+		<image file="sugar-06.png" use="6"/>
+		<image file="sugar-07.png" use="7"/>
+		<image file="sugar-08.png" use="8"/>
+		<image file="sugar-09.png" use="9"/>
+		<image file="sugar-10.png" use="10"/>
+		<image file="sugar-11.png" use="11"/>
+		
+		<image file="sugar-hotspots.png" use="hotspot"/>
+	</source>
+	
+	<layout>
+		<row>
+			<cursor name="left_ptr"/>
+			<cursor name="center_ptr"/>
+			<cursor name="right_ptr"/>
+			<cursor name="exchange"/>
+			<cursor name="plus"/>
+			<cursor name="minus"/>
+		</row><row>
+			<cursor name="question_arrow"/>
+			<cursor name="link"/>
+			<cursor name="forbidden"/>
+			<cursor name="close"/>
+			<cursor name="left_ptr_watch">
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+			</cursor>
+			<cursor name="left_ptr_modify"/>
+		</row><row>
+			<cursor name="busy">
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+				<frame delay="60"/>
+			</cursor>
+			<cursor name="circle"/>
+			<cursor name="hand1"/>
+			<cursor name="hand2"/>
+			<cursor name="hand_open"/>
+			<cursor name="hand_closed"/>
+		</row><row>
+			<cursor name="sb_left_arrow"/>
+			<cursor name="sb_right_arrow"/>
+			<cursor name="sb_up_arrow"/>
+			<cursor name="sb_down_arrow"/>
+			<cursor name="hidden"/>
+			<cursor name="crosshair"/>
+		</row><row>
+			<cursor name="bottom_right_corner"/>
+			<cursor name="bottom_left_corner"/>
+			<cursor name="top_side"/>
+			<cursor name="right_side"/>
+			<cursor name="fleur"/>
+			<cursor name="xterm"/>		
+		</row><row>
+			<cursor name="based_arrow_left"/>
+			<cursor name="based_arrow_right"/>
+			<cursor name="based_arrow_up"/>
+			<cursor name="based_arrow_down"/>
+			<cursor name="sb_v_double_arrow"/>
+			<cursor name="sb_h_double_arrow"/>
+		</row><row>
+			<cursor name="pencil"/>
+			<cursor name="paintbrush"/>
+			<cursor name="eyedropper"/>
+			<cursor name="base(d)_arrow_down"/>
+			<cursor name="sb_v_double_arrow"/>
+			<cursor name="sb_h_double_arrow"/>
+		</row><row>
+			<cursor name="pencil"/>
+			<cursor name="brush"/>
+			<cursor name="eraser"/>
+			<cursor name="bucket"/>
+			<cursor name="color-picker"/>
+			<cursor name="hidden"/>
+		</row>
+	</layout>
+	
+	<alias name="default" target="left_ptr">
+	<alias name="top_left_arrow" target="left_ptr"/>
+	<alias name="top_right_arrow" target="right_ptr"/>
+	<alias name="arrow" target="right_ptr"/>
+	<alias name="draft_small" target="right_ptr"/>
+	<alias name="draft_large" target="right_ptr"/>
+	
+	<alias name="right_side" target="left_side"/>
+	<alias name="bottom_side" target="top_side"/>
+	<alias name="double_arrow" target="top_side"/>
+	<alias name="top_right_corner" target="bottom_left_corner"/>
+	<alias name="top_left_corner" target="bottom_right_corner"/>
+	
+	<alias name="dnd_none" target="forbidden"/>
+	<alias name="unavailable" target="forbidden"/>
+	
+	<alias name="dnd_none" target="forbidden"/>
+	<alias name="dnd_copy" target="plus"/>
+	<alias name="dnd_move" target="plus"/>
+	<alias name="dnd_ask" target="question_arrow"/>
+	<alias name="dnd_none" target="left_ptr_modify"/>
+	
+	<alias name="copy" target="plus"/>
+	<alias name="add" target="plus"/>
+	<alias name="remove" target="minus"/>
+	
+	<alias name="pirate" target="close"/>
+	<alias name="destroy" target="close"/>
+	
+	<alias name="cross" target="crosshair"/>
+	
+	<-- Mozilla cursors -->
+	
+	<!-- moz_spinning -->
+	<alias name="08e8e1c95fe2fc01f976f1e063a24ccd" target="left_ptr_watch"/>
+  	<!-- moz_question_arrow -->
+	<alias name="5c6cd98b3f3ebcb1f9c7f1c204630408" target="question_arrow"/>
+	<!-- moz_hand_grabbing -->
+	<alias name="208530c400c041818281048008011002" target="hand_closed"/>
+	<!-- moz_hand_grab -->
+	<alias name="5aca4d189052212118709018842178c0" target="hand_open"/>
+	<!-- moz_question_arrow -->
+	<alias name="5c6cd98b3f3ebcb1f9c7f1c204630408" target="question_arrow"/>
+	<!-- moz_copy -->
+	<alias name="08ffe1cb5fe6fc01f906f1c063814ccf" target="plus"/>
+	
+	<!--
+	moz_alias 0876e1c15ff2fc01f906f1c363074c0f (left_ptr with small arrow) 
+	moz_menu 08ffe1e65f80fcfdf9fff11263e74c48 (left_ptr with menu) */
+	-->
+	
+	<-- GTK+ toolkit cursors -->
+
+	<alias name="1081e37283d90000800003c07f3ef6bf" target="dnd_copy"/>
+	<alias name="9081237383d90e509aa00f00170e968f" target="dnd_move"/>
+	<alias name="3085a0e285430894940527032f8b26df" target="dnd_link"/>
+	<alias name="1001208387f90000800003000700f6ff" target="dnd_none"/>
+
+	<alias name="90b3018312820b127e5a0b7c8034a301" target="color-picker"/>
+
+	<alias name="watch" target="left_ptr_watch"/>
+	
+</theme>
diff --git a/cursor/sugar/sugar-hotspots.png b/cursor/sugar/sugar-hotspots.png
index 6fefa39..40918a3 100644
--- a/cursor/sugar/sugar-hotspots.png
+++ b/cursor/sugar/sugar-hotspots.png
diff --git a/cursor/sugar/sugar.cursortheme b/cursor/sugar/sugar.cursortheme
deleted file mode 100644
index 46a992c..0000000
--- a/cursor/sugar/sugar.cursortheme
+++ /dev/null
@@ -1,142 +0,0 @@
-<theme name="OLPC">	
-	<source size="48" gridsize="48">
-		<image file="sugar-0.png" use="0"/>
-		<image file="sugar-1.png" use="1"/>
-		<image file="sugar-2.png" use="2"/>
-		<image file="sugar-3.png" use="3"/>
-		<image file="sugar-4.png" use="4"/>
-		<image file="sugar-5.png" use="5"/>
-		<image file="sugar-6.png" use="6"/>
-		<image file="sugar-7.png" use="7"/>
-		<image file="sugar-8.png" use="8"/>
-		<image file="sugar-9.png" use="9"/>
-		<image file="sugar-10.png" use="10"/>
-		<image file="sugar-11.png" use="11"/>
-		
-		<image file="sugar-hotspots.png" use="hotspot"/>
-	</source>
-	
-	<alias name="top_left_arrow" target="left_ptr"/>
-	
-	<alias name="top_right_arrow" target="right_ptr"/>
-	<alias name="arrow" target="right_ptr"/>
-	<alias name="draft_small" target="right_ptr"/>
-	<alias name="draft_large" target="right_ptr"/>
-	
-	<alias name="close" target="pirate"/>
-	<alias name="destroy" target="pirate"/>
-	
-	<alias name="right_side" target="left_side"/>
-	<alias name="bottom_side" target="top_side"/>
-	<alias name="double_arrow" target="top_side"/>
-	<alias name="top_right_corner" target="bottom_left_corner"/>
-	<alias name="top_left_corner" target="bottom_right_corner"/>
-	
-	<layout>
-		<row>
-			<cursor name="left_ptr"/>
-			<cursor name="center_ptr"/>
-			<cursor name="right_ptr"/>
-			<cursor name="exchange"/>
-			<cursor name="plus"/>
-			<cursor name="minus"/>
-		</row><row>
-			<cursor name="question_arrow"/>
-			<cursor name="link"/>
-			<cursor name="unavailable"/>
-			<cursor name="pirate"/>
-			<cursor name="left_ptr_watch">
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-			        <frame delay="60"/>
-			</cursor>
-			<cursor name="left_ptr_modify"/>
-		</row><row>
-			<cursor name="busy">
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-				<frame delay="60"/>
-			        <frame delay="60"/>
-			</cursor>
-			<cursor name="circle"/>
-			<cursor name="hand1"/>
-			<cursor name="hand2"/>
-			<cursor name="hand_open"/>
-			<cursor name="hand_closed"/>
-		</row><row>
-			<cursor name="sb_left_arrow"/>
-			<cursor name="sb_right_arrow"/>
-			<cursor name="sb_up_arrow"/>
-			<cursor name="sb_down_arrow"/>
-			<cursor name="sb_v_double_arrow"/>
-			<cursor name="sb_h_double_arrow"/>
-		</row><row>
-			<cursor name="bottom_right_corner"/>
-			<cursor name="bottom_left_corner"/>
-			<cursor name="top_side"/>
-			<cursor name="right_side"/>
-			<cursor name="fleur"/>
-			<cursor name="xterm"/>		
-		</row><row>
-			<cursor name="crosshair"/>
-			<cursor name="pencil"/>
-		</row>
-	</layout>
-
-<!--
-  Aliases can also be used to provide cursors to be used in place
-  of particular legacy cursor shapes; whenever libXcursor is
-  asked to create a bitmap cursor, it creates a hash value
-  from the cursor shape, and tries using that as a cursor
-  name. Setting the environment variable XCURSOR_DISCOVER will
-  log this process, which is useful for finding out the hash values.
-
-  The following maps the mozilla pointer-while-waiting cursor to 
-  left_ptr_watch.
--->
-  
-  <!-- moz_spinning (left_ptr with watch) -->
-  <alias name="08e8e1c95fe2fc01f976f1e063a24ccd" target="left_ptr_watch"/>
-  
-  <!-- moz_question_arrow (left_ptr with question) -->
-  <alias name="5c6cd98b3f3ebcb1f9c7f1c204630408" target="question_arrow"/>
- 
-<!-- 
-   More mozilla hash values that could be aliased:
-
-     moz_alias 0876e1c15ff2fc01f906f1c363074c0f (left_ptr with small arrow) 
-     moz_copy 08ffe1cb5fe6fc01f906f1c063814ccf (left_ptr with plus)
-     moz_hand_grabbing 208530c400c041818281048008011002 (closed hand)
-     moz_hand_grab 5aca4d189052212118709018842178c0 (open hand)
-     moz_menu 08ffe1e65f80fcfdf9fff11263e74c48 (left_ptr with menu) */
-     moz_question_arrow 5c6cd98b3f3ebcb1f9c7f1c204630408 (left_ptr with ?)
-
-  GTK+ toolkit cursors:
--->
-
-     <alias name="1081e37283d90000800003c07f3ef6bf" target="dnd_copy"/>
-     <alias name="9081237383d90e509aa00f00170e968f" target="dnd_move"/>
-     <alias name="3085a0e285430894940527032f8b26df" target="dnd_link"/>
-     <alias name="1001208387f90000800003000700f6ff" target="dnd_none"/>
-
-     <alias name="90b3018312820b127e5a0b7c8034a301" target="color-picker"/>
-
-     <alias name="watch" target="left_ptr_watch"/>
-</theme>