Integrate Eben cursors. Not all of them seem to work correctly yet.

17 files changed, 86 insertions, 120 deletions

diff --git a/art/cursor/olpc/Makefile.am b/art/cursor/olpc/Makefile.am
index 36b8375..a8b3acb 100644
--- a/art/cursor/olpc/Makefile.am
+++ b/art/cursor/olpc/Makefile.am
@@ -4,8 +4,17 @@ THEME_DIR = $(top_builddir)/art/cursor/olpc/theme
 all-local: olpc.stamp
 
 olpc_images =			\
-	olpc-48-hotspot.png	\
-	olpc-48-1.png
+	olpc-0.png		\
+	olpc-1.png		\
+	olpc-2.png		\
+	olpc-3.png		\
+	olpc-4.png		\
+	olpc-5.png		\
+	olpc-6.png		\
+	olpc-7.png		\
+	olpc-8.png              \
+	olpc-9.png              \
+	olpc-hotspots.png
 
 olpc.stamp: $(olpc_images) $(THEMEGEN) olpc.cursortheme
 	rm -rf olpc &&     	                                \
diff --git a/art/cursor/olpc/olpc-0.png b/art/cursor/olpc/olpc-0.png
new file mode 100644
index 0000000..dc9ff42
--- /dev/null
+++ b/art/cursor/olpc/olpc-0.png
diff --git a/art/cursor/olpc/olpc-1.png b/art/cursor/olpc/olpc-1.png
new file mode 100644
index 0000000..cbeb1f0
--- /dev/null
+++ b/art/cursor/olpc/olpc-1.png
diff --git a/art/cursor/olpc/olpc-10.png b/art/cursor/olpc/olpc-10.png
new file mode 100644
index 0000000..fa70558
--- /dev/null
+++ b/art/cursor/olpc/olpc-10.png
diff --git a/art/cursor/olpc/olpc-11.png b/art/cursor/olpc/olpc-11.png
new file mode 100644
index 0000000..fb095db
--- /dev/null
+++ b/art/cursor/olpc/olpc-11.png
diff --git a/art/cursor/olpc/olpc-2.png b/art/cursor/olpc/olpc-2.png
new file mode 100644
index 0000000..7f5d40f
--- /dev/null
+++ b/art/cursor/olpc/olpc-2.png
diff --git a/art/cursor/olpc/olpc-3.png b/art/cursor/olpc/olpc-3.png
new file mode 100644
index 0000000..3d44171
--- /dev/null
+++ b/art/cursor/olpc/olpc-3.png
diff --git a/art/cursor/olpc/olpc-4.png b/art/cursor/olpc/olpc-4.png
new file mode 100644
index 0000000..837ca13
--- /dev/null
+++ b/art/cursor/olpc/olpc-4.png
diff --git a/art/cursor/olpc/olpc-48-1.png b/art/cursor/olpc/olpc-48-1.png
deleted file mode 100644
index abf8ac6..0000000
--- a/art/cursor/olpc/olpc-48-1.png
+++ /dev/null
diff --git a/art/cursor/olpc/olpc-48-hotspot.png b/art/cursor/olpc/olpc-48-hotspot.png
deleted file mode 100644
index 7355d38..0000000
--- a/art/cursor/olpc/olpc-48-hotspot.png
+++ /dev/null
diff --git a/art/cursor/olpc/olpc-5.png b/art/cursor/olpc/olpc-5.png
new file mode 100644
index 0000000..d26904b
--- /dev/null
+++ b/art/cursor/olpc/olpc-5.png
diff --git a/art/cursor/olpc/olpc-6.png b/art/cursor/olpc/olpc-6.png
new file mode 100644
index 0000000..70b254c
--- /dev/null
+++ b/art/cursor/olpc/olpc-6.png
diff --git a/art/cursor/olpc/olpc-7.png b/art/cursor/olpc/olpc-7.png
new file mode 100644
index 0000000..2e3e849
--- /dev/null
+++ b/art/cursor/olpc/olpc-7.png
diff --git a/art/cursor/olpc/olpc-8.png b/art/cursor/olpc/olpc-8.png
new file mode 100644
index 0000000..29c00c2
--- /dev/null
+++ b/art/cursor/olpc/olpc-8.png
diff --git a/art/cursor/olpc/olpc-9.png b/art/cursor/olpc/olpc-9.png
new file mode 100644
index 0000000..0badf2b
--- /dev/null
+++ b/art/cursor/olpc/olpc-9.png
diff --git a/art/cursor/olpc/olpc-hotspots.png b/art/cursor/olpc/olpc-hotspots.png
new file mode 100644
index 0000000..5edfc49
--- /dev/null
+++ b/art/cursor/olpc/olpc-hotspots.png
diff --git a/art/cursor/olpc/olpc.cursortheme b/art/cursor/olpc/olpc.cursortheme
index 78dd59e..89fda8a 100644
--- a/art/cursor/olpc/olpc.cursortheme
+++ b/art/cursor/olpc/olpc.cursortheme
@@ -1,119 +1,76 @@
-<theme name="Bluecurve">
-  <source size="48" gridsize="96">
-    <image file="olpc-48-1.png" use="0"/>
-    <image file="olpc-48-hotspot.png" use="hotspot"/>
-  </source>
-  <layout>
-    <row>
-      <cursor name="X_cursor"/>
-      <cursor name="arrow"/>
-      <cursor name="based_arrow_down"/>
-      <cursor name="based_arrow_up"/>
-      <cursor name="boat"/>
-      <cursor name="bogosity"/>
-      <cursor name="bottom_left_corner"/>
-      <cursor name="bottom_right_corner"/>
-    </row><row>
-      <cursor name="bottom_side"/>
-      <cursor name="bottom_tee"/>
-      <cursor name="box_spiral"/>
-      <cursor name="center_ptr"/>
-      <cursor name="circle"/>
-      <cursor name="clock"/>
-      <cursor name="coffee_mug"/>
-      <cursor name="cross"/>
-    </row><row>
-      <cursor name="cross_reverse"/>
-      <cursor name="crosshair"/>
-      <cursor name="diamond_cross"/>
-      <cursor name="dot"/>
-      <cursor name="dotbox"/>
-      <cursor name="double_arrow"/>
-      <cursor name="draft_large"/>
-      <cursor name="draft_small"/>
-    </row><row>
-      <cursor name="draped_box"/>
-      <cursor name="exchange"/>
-      <cursor name="fleur"/>
-      <cursor name="gobbler"/>
-      <cursor name="gumby"/>
-      <cursor name="hand1"/>
-      <cursor name="hand2"/>
-      <cursor name="heart"/>
-    </row><row>
-      <cursor name="icon"/>
-      <cursor name="iron_cross"/>
-      <cursor name="left_ptr"/>
-      <cursor name="left_side"/>
-      <cursor name="left_tee"/>
-      <cursor name="leftbutton"/>
-      <cursor name="ll_angle"/>
-      <cursor name="lr_angle"/>
-    </row><row>
-      <cursor name="man"/>
-      <cursor name="middlebutton"/>
-      <cursor name="mouse"/>
-      <cursor name="pencil"/>
-      <cursor name="pirate"/>
-      <cursor name="plus"/>
-      <cursor name="question_arrow"/>
-      <cursor name="right_ptr"/>
-    </row><row>
-      <cursor name="right_side"/>
-      <cursor name="right_tee"/>
-      <cursor name="rightbutton"/>
-      <cursor name="rtl_logo"/>
-      <cursor name="sailboat"/>
-      <cursor name="sb_down_arrow"/>
-      <cursor name="sb_h_double_arrow"/>
-      <cursor name="sb_left_arrow"/>
-    </row><row>
-      <cursor name="sb_right_arrow"/>
-      <cursor name="sb_up_arrow"/>
-      <cursor name="sb_v_double_arrow"/>
-      <cursor name="shuttle"/>
-      <cursor name="sizing"/>
-      <cursor name="spider"/>
-      <cursor name="spraycan"/>
-      <cursor name="star"/>
-    </row><row>
-      <cursor name="target"/>
-      <cursor name="tcross"/>
-      <cursor name="top_left_arrow"/>
-      <cursor name="top_left_corner"/>
-      <cursor name="top_right_corner"/>
-      <cursor name="top_side"/>
-      <cursor name="top_tee"/>
-      <cursor name="trek"/>
-    </row><row>
-      <cursor name="ul_angle"/>
-      <cursor name="umbrella"/>
-      <cursor name="ur_angle"/>
-      <cursor name="_watch-old_">
-      </cursor>
-      <cursor name="xterm"/>
-      <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>
-    </row>
-    <row>
-      <cursor name="color-picker"/>
-      <cursor name="dnd-move"/>
-      <cursor name="dnd-copy"/>
-      <cursor name="dnd-ask"/>
-      <cursor name="dnd-link"/>
-      <cursor name="dnd-none"/>
-    </row>
-  </layout>
+<theme name="OLPC">	
+	<source size="48" gridsize="48">
+		<image file="olpc-0.png" use="0"/>
+		<image file="olpc-1.png" use="1"/>
+		<image file="olpc-2.png" use="2"/>
+		<image file="olpc-3.png" use="3"/>
+		<image file="olpc-4.png" use="4"/>
+		<image file="olpc-5.png" use="5"/>
+		<image file="olpc-6.png" use="6"/>
+		<image file="olpc-7.png" use="7"/>
+		<image file="olpc-8.png" use="8"/>
+		<image file="olpc-9.png" use="9"/>
+		<image file="olpc-10.png" use="10"/>
+		<image file="olpc-11.png" use="11"/>
+		
+		<image file="olpc-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"/>
+			<cursor name="left_ptr_modify"/>
+		</row><row>
+			<cursor name="busy"/>
+			<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>
 </theme>