GNOME.org
 

[adwaita-icon-theme] windows: Add Windows cursors and install them instead of X cursors on Windows

commit fa1a4b9181111c3e4d0111ee87f8b4288a1f1ecb
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Thu Nov 17 17:36:02 2016 +0100

    windows: Add Windows cursors and install them instead of X cursors on Windows
    
    The new cursors where created using
        ./renderpngs.py -r -s -t -o -m 32 -a -c -i -n 4 adwaita.svg
        ./pngs/make-w32.sh
    
    Remove the --enable-w32-cursors switch and instead only install
    Windows cursors on Windows and X cursors everywhere else.
    
    This makes cursors work in the gtk3-demo "Cursors" demo and
    when dragging things.

 Adwaita/cursors/X_cursor.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/all-scroll.cur          |  Bin 0 -> 136606 bytes
 Adwaita/cursors/bd_double_arrow.cur     |  Bin 0 -> 136606 bytes
 Adwaita/cursors/bottom_left_corner.cur  |  Bin 0 -> 136606 bytes
 Adwaita/cursors/bottom_right_corner.cur |  Bin 0 -> 136606 bytes
 Adwaita/cursors/bottom_side.cur         |  Bin 0 -> 136606 bytes
 Adwaita/cursors/bottom_tee.cur          |  Bin 0 -> 136606 bytes
 Adwaita/cursors/cell.cur                |  Bin 0 -> 136606 bytes
 Adwaita/cursors/circle.cur              |  Bin 0 -> 136606 bytes
 Adwaita/cursors/context-menu.cur        |  Bin 0 -> 136606 bytes
 Adwaita/cursors/copy.cur                |  Bin 0 -> 136606 bytes
 Adwaita/cursors/cross.cur               |  Bin 0 -> 136606 bytes
 Adwaita/cursors/crossed_circle.cur      |  Bin 0 -> 136606 bytes
 Adwaita/cursors/dnd-ask.cur             |  Bin 0 -> 136606 bytes
 Adwaita/cursors/dnd-copy.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/dnd-link.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/dnd-move.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/dnd-no-drop.cur         |  Bin 0 -> 136606 bytes
 Adwaita/cursors/dnd-none.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/dotbox.cur              |  Bin 0 -> 136606 bytes
 Adwaita/cursors/fd_double_arrow.cur     |  Bin 0 -> 136606 bytes
 Adwaita/cursors/grabbing.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/hand1.cur               |  Bin 0 -> 136606 bytes
 Adwaita/cursors/hand2.cur               |  Bin 0 -> 136606 bytes
 Adwaita/cursors/left_ptr.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/left_ptr_watch.ani      |  Bin 0 -> 667886 bytes
 Adwaita/cursors/left_side.cur           |  Bin 0 -> 136606 bytes
 Adwaita/cursors/left_tee.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/link.cur                |  Bin 0 -> 136606 bytes
 Adwaita/cursors/ll_angle.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/lr_angle.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/move.cur                |  Bin 0 -> 136606 bytes
 Adwaita/cursors/pencil.cur              |  Bin 0 -> 136606 bytes
 Adwaita/cursors/plus.cur                |  Bin 0 -> 136606 bytes
 Adwaita/cursors/pointer-move.cur        |  Bin 0 -> 136606 bytes
 Adwaita/cursors/question_arrow.cur      |  Bin 0 -> 136606 bytes
 Adwaita/cursors/right_ptr.cur           |  Bin 0 -> 136606 bytes
 Adwaita/cursors/right_side.cur          |  Bin 0 -> 136606 bytes
 Adwaita/cursors/right_tee.cur           |  Bin 0 -> 136606 bytes
 Adwaita/cursors/sb_down_arrow.cur       |  Bin 0 -> 136606 bytes
 Adwaita/cursors/sb_h_double_arrow.cur   |  Bin 0 -> 136606 bytes
 Adwaita/cursors/sb_left_arrow.cur       |  Bin 0 -> 136606 bytes
 Adwaita/cursors/sb_right_arrow.cur      |  Bin 0 -> 136606 bytes
 Adwaita/cursors/sb_up_arrow.cur         |  Bin 0 -> 136606 bytes
 Adwaita/cursors/sb_v_double_arrow.cur   |  Bin 0 -> 136606 bytes
 Adwaita/cursors/tcross.cur              |  Bin 0 -> 136606 bytes
 Adwaita/cursors/top_left_corner.cur     |  Bin 0 -> 136606 bytes
 Adwaita/cursors/top_right_corner.cur    |  Bin 0 -> 136606 bytes
 Adwaita/cursors/top_side.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/top_tee.cur             |  Bin 0 -> 136606 bytes
 Adwaita/cursors/ul_angle.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/ur_angle.cur            |  Bin 0 -> 136606 bytes
 Adwaita/cursors/vertical-text.cur       |  Bin 0 -> 136606 bytes
 Adwaita/cursors/watch.ani               |  Bin 0 -> 786744 bytes
 Adwaita/cursors/xterm.cur               |  Bin 0 -> 136606 bytes
 Adwaita/cursors/zoom-in.cur             |  Bin 0 -> 136606 bytes
 Adwaita/cursors/zoom-out.cur            |  Bin 0 -> 136606 bytes
 Makefile.am                             |   12 ++++++++++--
 configure.ac                            |   21 +++++++++++----------
 59 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/Adwaita/cursors/X_cursor.cur b/Adwaita/cursors/X_cursor.cur
new file mode 100644
index 0000000..30a4fa1
Binary files /dev/null and b/Adwaita/cursors/X_cursor.cur differ
diff --git a/Adwaita/cursors/all-scroll.cur b/Adwaita/cursors/all-scroll.cur
new file mode 100644
index 0000000..187970f
Binary files /dev/null and b/Adwaita/cursors/all-scroll.cur differ
diff --git a/Adwaita/cursors/bd_double_arrow.cur b/Adwaita/cursors/bd_double_arrow.cur
new file mode 100644
index 0000000..d0ca074
Binary files /dev/null and b/Adwaita/cursors/bd_double_arrow.cur differ
diff --git a/Adwaita/cursors/bottom_left_corner.cur b/Adwaita/cursors/bottom_left_corner.cur
new file mode 100644
index 0000000..4e8d94f
Binary files /dev/null and b/Adwaita/cursors/bottom_left_corner.cur differ
diff --git a/Adwaita/cursors/bottom_right_corner.cur b/Adwaita/cursors/bottom_right_corner.cur
new file mode 100644
index 0000000..1a8d2c9
Binary files /dev/null and b/Adwaita/cursors/bottom_right_corner.cur differ
diff --git a/Adwaita/cursors/bottom_side.cur b/Adwaita/cursors/bottom_side.cur
new file mode 100644
index 0000000..e98dd63
Binary files /dev/null and b/Adwaita/cursors/bottom_side.cur differ
diff --git a/Adwaita/cursors/bottom_tee.cur b/Adwaita/cursors/bottom_tee.cur
new file mode 100644
index 0000000..8ae58dd
Binary files /dev/null and b/Adwaita/cursors/bottom_tee.cur differ
diff --git a/Adwaita/cursors/cell.cur b/Adwaita/cursors/cell.cur
new file mode 100644
index 0000000..279d2d9
Binary files /dev/null and b/Adwaita/cursors/cell.cur differ
diff --git a/Adwaita/cursors/circle.cur b/Adwaita/cursors/circle.cur
new file mode 100644
index 0000000..24dbdf9
Binary files /dev/null and b/Adwaita/cursors/circle.cur differ
diff --git a/Adwaita/cursors/context-menu.cur b/Adwaita/cursors/context-menu.cur
new file mode 100644
index 0000000..9c39a1e
Binary files /dev/null and b/Adwaita/cursors/context-menu.cur differ
diff --git a/Adwaita/cursors/copy.cur b/Adwaita/cursors/copy.cur
new file mode 100644
index 0000000..a986334
Binary files /dev/null and b/Adwaita/cursors/copy.cur differ
diff --git a/Adwaita/cursors/cross.cur b/Adwaita/cursors/cross.cur
new file mode 100644
index 0000000..74559af
Binary files /dev/null and b/Adwaita/cursors/cross.cur differ
diff --git a/Adwaita/cursors/crossed_circle.cur b/Adwaita/cursors/crossed_circle.cur
new file mode 100644
index 0000000..fe556ca
Binary files /dev/null and b/Adwaita/cursors/crossed_circle.cur differ
diff --git a/Adwaita/cursors/dnd-ask.cur b/Adwaita/cursors/dnd-ask.cur
new file mode 100644
index 0000000..95085c6
Binary files /dev/null and b/Adwaita/cursors/dnd-ask.cur differ
diff --git a/Adwaita/cursors/dnd-copy.cur b/Adwaita/cursors/dnd-copy.cur
new file mode 100644
index 0000000..76dd49a
Binary files /dev/null and b/Adwaita/cursors/dnd-copy.cur differ
diff --git a/Adwaita/cursors/dnd-link.cur b/Adwaita/cursors/dnd-link.cur
new file mode 100644
index 0000000..eb28be9
Binary files /dev/null and b/Adwaita/cursors/dnd-link.cur differ
diff --git a/Adwaita/cursors/dnd-move.cur b/Adwaita/cursors/dnd-move.cur
new file mode 100644
index 0000000..1ef2429
Binary files /dev/null and b/Adwaita/cursors/dnd-move.cur differ
diff --git a/Adwaita/cursors/dnd-no-drop.cur b/Adwaita/cursors/dnd-no-drop.cur
new file mode 100644
index 0000000..482e175
Binary files /dev/null and b/Adwaita/cursors/dnd-no-drop.cur differ
diff --git a/Adwaita/cursors/dnd-none.cur b/Adwaita/cursors/dnd-none.cur
new file mode 100644
index 0000000..0e3f291
Binary files /dev/null and b/Adwaita/cursors/dnd-none.cur differ
diff --git a/Adwaita/cursors/dotbox.cur b/Adwaita/cursors/dotbox.cur
new file mode 100644
index 0000000..f43c73a
Binary files /dev/null and b/Adwaita/cursors/dotbox.cur differ
diff --git a/Adwaita/cursors/fd_double_arrow.cur b/Adwaita/cursors/fd_double_arrow.cur
new file mode 100644
index 0000000..401760a
Binary files /dev/null and b/Adwaita/cursors/fd_double_arrow.cur differ
diff --git a/Adwaita/cursors/grabbing.cur b/Adwaita/cursors/grabbing.cur
new file mode 100644
index 0000000..c25f52d
Binary files /dev/null and b/Adwaita/cursors/grabbing.cur differ
diff --git a/Adwaita/cursors/hand1.cur b/Adwaita/cursors/hand1.cur
new file mode 100644
index 0000000..75d8e89
Binary files /dev/null and b/Adwaita/cursors/hand1.cur differ
diff --git a/Adwaita/cursors/hand2.cur b/Adwaita/cursors/hand2.cur
new file mode 100644
index 0000000..8bb8df8
Binary files /dev/null and b/Adwaita/cursors/hand2.cur differ
diff --git a/Adwaita/cursors/left_ptr.cur b/Adwaita/cursors/left_ptr.cur
new file mode 100644
index 0000000..88155ce
Binary files /dev/null and b/Adwaita/cursors/left_ptr.cur differ
diff --git a/Adwaita/cursors/left_ptr_watch.ani b/Adwaita/cursors/left_ptr_watch.ani
new file mode 100644
index 0000000..181b8f6
Binary files /dev/null and b/Adwaita/cursors/left_ptr_watch.ani differ
diff --git a/Adwaita/cursors/left_side.cur b/Adwaita/cursors/left_side.cur
new file mode 100644
index 0000000..66ac3a5
Binary files /dev/null and b/Adwaita/cursors/left_side.cur differ
diff --git a/Adwaita/cursors/left_tee.cur b/Adwaita/cursors/left_tee.cur
new file mode 100644
index 0000000..6cb9fae
Binary files /dev/null and b/Adwaita/cursors/left_tee.cur differ
diff --git a/Adwaita/cursors/link.cur b/Adwaita/cursors/link.cur
new file mode 100644
index 0000000..ce0a291
Binary files /dev/null and b/Adwaita/cursors/link.cur differ
diff --git a/Adwaita/cursors/ll_angle.cur b/Adwaita/cursors/ll_angle.cur
new file mode 100644
index 0000000..b6c5e6c
Binary files /dev/null and b/Adwaita/cursors/ll_angle.cur differ
diff --git a/Adwaita/cursors/lr_angle.cur b/Adwaita/cursors/lr_angle.cur
new file mode 100644
index 0000000..0192bfa
Binary files /dev/null and b/Adwaita/cursors/lr_angle.cur differ
diff --git a/Adwaita/cursors/move.cur b/Adwaita/cursors/move.cur
new file mode 100644
index 0000000..d734dbc
Binary files /dev/null and b/Adwaita/cursors/move.cur differ
diff --git a/Adwaita/cursors/pencil.cur b/Adwaita/cursors/pencil.cur
new file mode 100644
index 0000000..4cc68f9
Binary files /dev/null and b/Adwaita/cursors/pencil.cur differ
diff --git a/Adwaita/cursors/plus.cur b/Adwaita/cursors/plus.cur
new file mode 100644
index 0000000..3f943b0
Binary files /dev/null and b/Adwaita/cursors/plus.cur differ
diff --git a/Adwaita/cursors/pointer-move.cur b/Adwaita/cursors/pointer-move.cur
new file mode 100644
index 0000000..0e61864
Binary files /dev/null and b/Adwaita/cursors/pointer-move.cur differ
diff --git a/Adwaita/cursors/question_arrow.cur b/Adwaita/cursors/question_arrow.cur
new file mode 100644
index 0000000..b2ba91a
Binary files /dev/null and b/Adwaita/cursors/question_arrow.cur differ
diff --git a/Adwaita/cursors/right_ptr.cur b/Adwaita/cursors/right_ptr.cur
new file mode 100644
index 0000000..64ade26
Binary files /dev/null and b/Adwaita/cursors/right_ptr.cur differ
diff --git a/Adwaita/cursors/right_side.cur b/Adwaita/cursors/right_side.cur
new file mode 100644
index 0000000..3578cee
Binary files /dev/null and b/Adwaita/cursors/right_side.cur differ
diff --git a/Adwaita/cursors/right_tee.cur b/Adwaita/cursors/right_tee.cur
new file mode 100644
index 0000000..a8ad34e
Binary files /dev/null and b/Adwaita/cursors/right_tee.cur differ
diff --git a/Adwaita/cursors/sb_down_arrow.cur b/Adwaita/cursors/sb_down_arrow.cur
new file mode 100644
index 0000000..f923763
Binary files /dev/null and b/Adwaita/cursors/sb_down_arrow.cur differ
diff --git a/Adwaita/cursors/sb_h_double_arrow.cur b/Adwaita/cursors/sb_h_double_arrow.cur
new file mode 100644
index 0000000..e4de220
Binary files /dev/null and b/Adwaita/cursors/sb_h_double_arrow.cur differ
diff --git a/Adwaita/cursors/sb_left_arrow.cur b/Adwaita/cursors/sb_left_arrow.cur
new file mode 100644
index 0000000..19ef830
Binary files /dev/null and b/Adwaita/cursors/sb_left_arrow.cur differ
diff --git a/Adwaita/cursors/sb_right_arrow.cur b/Adwaita/cursors/sb_right_arrow.cur
new file mode 100644
index 0000000..68f1135
Binary files /dev/null and b/Adwaita/cursors/sb_right_arrow.cur differ
diff --git a/Adwaita/cursors/sb_up_arrow.cur b/Adwaita/cursors/sb_up_arrow.cur
new file mode 100644
index 0000000..7de01d0
Binary files /dev/null and b/Adwaita/cursors/sb_up_arrow.cur differ
diff --git a/Adwaita/cursors/sb_v_double_arrow.cur b/Adwaita/cursors/sb_v_double_arrow.cur
new file mode 100644
index 0000000..0966756
Binary files /dev/null and b/Adwaita/cursors/sb_v_double_arrow.cur differ
diff --git a/Adwaita/cursors/tcross.cur b/Adwaita/cursors/tcross.cur
new file mode 100644
index 0000000..e3adc65
Binary files /dev/null and b/Adwaita/cursors/tcross.cur differ
diff --git a/Adwaita/cursors/top_left_corner.cur b/Adwaita/cursors/top_left_corner.cur
new file mode 100644
index 0000000..2c6ede7
Binary files /dev/null and b/Adwaita/cursors/top_left_corner.cur differ
diff --git a/Adwaita/cursors/top_right_corner.cur b/Adwaita/cursors/top_right_corner.cur
new file mode 100644
index 0000000..759f2a2
Binary files /dev/null and b/Adwaita/cursors/top_right_corner.cur differ
diff --git a/Adwaita/cursors/top_side.cur b/Adwaita/cursors/top_side.cur
new file mode 100644
index 0000000..f6388fe
Binary files /dev/null and b/Adwaita/cursors/top_side.cur differ
diff --git a/Adwaita/cursors/top_tee.cur b/Adwaita/cursors/top_tee.cur
new file mode 100644
index 0000000..fa50dad
Binary files /dev/null and b/Adwaita/cursors/top_tee.cur differ
diff --git a/Adwaita/cursors/ul_angle.cur b/Adwaita/cursors/ul_angle.cur
new file mode 100644
index 0000000..afafe01
Binary files /dev/null and b/Adwaita/cursors/ul_angle.cur differ
diff --git a/Adwaita/cursors/ur_angle.cur b/Adwaita/cursors/ur_angle.cur
new file mode 100644
index 0000000..c6f70dc
Binary files /dev/null and b/Adwaita/cursors/ur_angle.cur differ
diff --git a/Adwaita/cursors/vertical-text.cur b/Adwaita/cursors/vertical-text.cur
new file mode 100644
index 0000000..10e123b
Binary files /dev/null and b/Adwaita/cursors/vertical-text.cur differ
diff --git a/Adwaita/cursors/watch.ani b/Adwaita/cursors/watch.ani
new file mode 100644
index 0000000..00b22eb
Binary files /dev/null and b/Adwaita/cursors/watch.ani differ
diff --git a/Adwaita/cursors/xterm.cur b/Adwaita/cursors/xterm.cur
new file mode 100644
index 0000000..631e6ae
Binary files /dev/null and b/Adwaita/cursors/xterm.cur differ
diff --git a/Adwaita/cursors/zoom-in.cur b/Adwaita/cursors/zoom-in.cur
new file mode 100644
index 0000000..82b7254
Binary files /dev/null and b/Adwaita/cursors/zoom-in.cur differ
diff --git a/Adwaita/cursors/zoom-out.cur b/Adwaita/cursors/zoom-out.cur
new file mode 100644
index 0000000..389e2c5
Binary files /dev/null and b/Adwaita/cursors/zoom-out.cur differ
diff --git a/Makefile.am b/Makefile.am
index 857853e..9f39d7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,15 @@ SUBDIRS = src build
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 cursordir = $(datadir)/icons/Adwaita/cursors
-cursor_DATA = $(wildcard $(srcdir)/Adwaita/cursors/*)
+
+# Install .cur/.ani on Windows and X cursors everywhere else
+win_cursors = $(wildcard $(srcdir)/Adwaita/cursors/*.cur) $(wildcard $(srcdir)/Adwaita/cursors/*.ani)
+if PLATFORM_WIN32
+cursor_DATA = $(win_cursors)
+else
+cursor_DATA = $(filter-out $(win_cursors), $(wildcard $(srcdir)/Adwaita/cursors/*))
+endif
+
 if ENABLE_L_XL_VARIANTS
 cursorldir = $(datadir)/icons/Adwaita-Large/cursors
 cursorl_DATA = $(wildcard $(srcdir)/Adwaita-Large/cursors/*)
@@ -108,7 +116,7 @@ install-data-local:
 
 install-data-hook:
        cd $(DESTDIR)$(cursordir) && \
-       if test "x$(enable_w32_cursors)" = "xyes"; \
+       if test "x$(platform_win32)" = "xyes"; \
        then \
                cur=.cur && \
                ani=.ani; \
diff --git a/configure.ac b/configure.ac
index 78a7f33..d5fcfa6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ AC_PREREQ(2.53)
 
 AC_INIT([adwaita-icon-theme], [3.21.91],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
+AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([index.theme.in])
 
@@ -54,16 +55,16 @@ if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then
 fi
 AC_SUBST(symbolic_encode_sizes)
 
-AC_ARG_ENABLE([w32-cursors],
-  [AS_HELP_STRING([--enable-w32-cursors],
-    [Make and install Windows cursors (.cur and .ani) instead of X cursors])],
-  [case "${enableval}" in
-    yes) enable_w32_cursors=yes ;;
-    no)  enable_w32_cursors=no ;;
-    *) AC_MSG_ERROR([bad value ${enableval} for --enable-w32-cursors]) ;;
-   esac],
-  [enable_w32_cursors=no])
-AC_SUBST(enable_w32_cursors)
+case "$host" in
+  *-*-mingw*|*-*-cygwin*)
+    platform_win32=yes
+    ;;
+  *)
+    platform_win32=no
+    ;;
+esac
+AC_SUBST(platform_win32)
+AM_CONDITIONAL([PLATFORM_WIN32], [test x$platform_win32 = xyes])
 
 AC_ARG_ENABLE([l-xl-variants],
   [AS_HELP_STRING([--enable-l-xl-variants],
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]