[Tux4kids-commits] r280 - in tuxmath/trunk: data/images/sprites src
tholy-guest at alioth.debian.org
tholy-guest at alioth.debian.org
Mon Oct 1 03:09:27 UTC 2007
Author: tholy-guest
Date: 2007-10-01 03:09:27 +0000 (Mon, 01 Oct 2007)
New Revision: 280
Modified:
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/src/titlescreen.c
Log:
Oops, a last-minute addition of mouse warping caused a problem; fixed in this version.
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2007-10-01 02:57:41 UTC (rev 279)
+++ tuxmath/trunk/data/images/sprites/Makefile 2007-10-01 03:09:27 UTC (rev 280)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# data/images/sprites/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,11 +13,15 @@
# PARTICULAR PURPOSE.
+srcdir = .
+top_srcdir = ../../..
pkgdatadir = $(datadir)/tuxmath
pkglibdir = $(libdir)/tuxmath
pkgincludedir = $(includedir)/tuxmath
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -29,9 +33,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
subdir = data/images/sprites
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,17 +49,21 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run automake-1.10
-AWK = mawk
-CC = i586-mingw32msvc-gcc
+ACLOCAL = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run aclocal-1.10
+AMDEP_FALSE = #
+AMDEP_TRUE =
+AMTAR = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run automake-1.10
+AWK = gawk
+BUILD_MINGW32_FALSE =
+BUILD_MINGW32_TRUE = #
+CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -63,31 +71,32 @@
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT =
GREP = /bin/grep
-INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
-LIBOBJS = ${LIBOBJDIR}strtod$U.o
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lgw32c -luuid -lole32 -lwsock32 -mwindows
-LTLIBOBJS = ${LIBOBJDIR}strtod$U.lo
-MAINT = #
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
+LDFLAGS =
+LIBOBJS =
+LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf
+LTLIBOBJS =
+MAKEINFO = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run makeinfo
NAME_VERSION = tuxmath-1.5.4
-NSIS = /usr/bin/makensis
-NSI_DLL_DIR = /home/dbruce/tuxmath_dll
+NSIS = no
+NSI_BUILD_FALSE = #
+NSI_BUILD_TRUE =
+NSI_DLL_DIR = /home/tim/tuxmath_dll
NSI_INSTALL_DIR = mingw32
NSI_TUXMATH_CONF_DIR = no
+NSI_USE_TUXMATH_CONF_FALSE =
+NSI_USE_TUXMATH_CONF_TRUE = #
OBJEXT = o
PACKAGE = tuxmath
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_DATA_DIR = data
-PACKAGE_NAME = tuxmath
-PACKAGE_STRING = tuxmath 1.5.4
+PACKAGE_NAME = Tux Of Math Command
+PACKAGE_STRING = Tux Of Math Command 1.5.4
PACKAGE_TARNAME = tuxmath
PACKAGE_VERSION = 1.5.4
PATH_SEPARATOR = :
@@ -96,41 +105,38 @@
SDL_CONFIG = /usr/bin/sdl-config
SDL_LIBS = -L/usr/lib -lSDL
SET_MAKE =
-SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
+SHELL = /bin/bash
+STRIP =
VERSION = 1.5.4
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
-abs_srcdir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
-abs_top_builddir = /home/dbruce/tux4kids/tuxmath/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxmath/trunk
-ac_ct_CC =
+WINDRES =
+ac_ct_CC = gcc
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE =
am__include = include
am__leading_dot = .
am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = i686-pc-linux-gnu
+build_alias =
+build_cpu = i686
build_os = linux-gnu
build_vendor = pc
-builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
+host = i686-pc-linux-gnu
+host_alias =
+host_cpu = i686
+host_os = linux-gnu
host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxmath/trunk/install-sh
+install_sh = $(SHELL) /home/tim/src/tux4kids/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -139,20 +145,17 @@
mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
-srcdir = .
sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
+target = i686-pc-linux-gnu
+target_alias =
+target_cpu = i686
+target_os = linux-gnu
target_vendor = pc
-top_builddir = ../../..
-top_srcdir = ../../..
EXTRA_DIST = cascade0.png \
cascade10.png \
cascade1.png \
@@ -259,7 +262,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -268,9 +271,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/images/sprites/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/images/sprites/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/images/sprites/Makefile
+ $(AUTOMAKE) --foreign data/images/sprites/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -284,10 +287,11 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: # $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
tags: TAGS
TAGS:
@@ -296,21 +300,22 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -369,20 +374,12 @@
install-data-am:
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -401,19 +398,16 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c 2007-10-01 02:57:41 UTC (rev 279)
+++ tuxmath/trunk/src/titlescreen.c 2007-10-01 03:09:27 UTC (rev 280)
@@ -920,6 +920,7 @@
int tux_frame = 0;
int click_flag = 1;
int use_sprite = 0;
+ int warp_mouse = 0;
#ifdef TUXMATH_DEBUG
fprintf(stderr, "Entering choose_menu_item():\n");
@@ -1250,12 +1251,15 @@
{tuxtype_playsound(sounds[SND_TOCK]);}
if (loc > 0)
{loc--;}
- else if (n_menu_entries <= n_entries_per_screen)
+ else if (n_menu_entries <= n_entries_per_screen) {
loc = n_menu_entries-1; // wrap around if only 1 screen
+ }
else if (loc == -1 && loc_screen_start > 0) {
loc = loc_screen_start-1;
loc_screen_start -= n_entries_per_screen;
}
+ if (loc != old_loc)
+ warp_mouse = 1;
break;
}
@@ -1271,6 +1275,8 @@
loc = 0; // wrap around if only 1 screen
else if (loc == -1)
loc = loc_screen_start;
+ if (loc != old_loc)
+ warp_mouse = 1;
break;
}
@@ -1437,6 +1443,15 @@
redraw = 0;
+ /* Move the mouse pointer if there is only a single screen */
+ if (warp_mouse && n_menu_entries <= n_entries_per_screen) {
+ imod = loc - loc_screen_start;
+ cursor.x = menu_button_rect[imod].x + (menu_button_rect[imod].w / 2);
+ cursor.y = menu_button_rect[imod].y + (3 * menu_button_rect[imod].h / 4);
+ SDL_WarpMouse(cursor.x, cursor.y);
+ warp_mouse = 0;
+ }
+
old_loc = loc;
old_loc_screen_start = loc_screen_start;
@@ -1460,13 +1475,6 @@
}
- /* Move the mouse pointer if there is only a single screen */
- if (n_menu_entries <= n_entries_per_screen && loc >= 0) {
- imod = loc - loc_screen_start;
- cursor.x = menu_button_rect[imod].x + (menu_button_rect[imod].w / 2);
- cursor.y = menu_button_rect[imod].y + (3 * menu_button_rect[imod].h / 4);
- SDL_WarpMouse(cursor.x, cursor.y);
- }
/* Wait so we keep frame rate constant: */
More information about the Tux4kids-commits
mailing list