Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2005-05-15 14:27:41 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2005-05-15 14:27:41 (GMT)
commitca801b4ad1de3e576ca05c3480a15d41d9f9cd56 (patch)
treec67b3c8ee7b933d78acfe56e9d4f1b165e14ac45
parent16302d020164e57d50870328f1ac9cf9139db42d (diff)
updated Added --disable-xrandr option to force xrandr not to be compiledWIN-6_5_3
* TODO: updated * configure.in: Added --disable-xrandr option to force xrandr not to be compiled * src/gcompris/gcompris.c: (board_widget_key_press_callback): new windows code
-rw-r--r--ChangeLog6
-rw-r--r--TODO4
-rw-r--r--configure.in23
-rw-r--r--src/gcompris/gcompris.c14
4 files changed, 38 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 816c433..b8f58ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-05-15 Bruno coudoin <bruno.coudoin@free.fr>
+ * TODO: updated
+ * configure.in: Added --disable-xrandr option to force xrandr not to be compiled
+ * src/gcompris/gcompris.c: (board_widget_key_press_callback): new windows code
+
+2005-05-15 Bruno coudoin <bruno.coudoin@free.fr>
+
* Makefile.mingw: needed to compile on windows
* gcompris-installer.nsi: windows installer data file for null soft installer
* global_win32.mak: to compile on windows
diff --git a/TODO b/TODO
index 0e22b7e..dd06d21 100644
--- a/TODO
+++ b/TODO
@@ -91,6 +91,10 @@ faut vider le tampon du clavier au début du tableau)
- quand on est en mode plein écran, et qu'on clique sur "aide" dans
l'écran "à propos", il lance un navigateur qui n'est pas visible.
+- chess: Replace color change by dotted cases in the chess board.
+
+- Pause the background music when playing music with sounds
+
----------- PROFILE DESIGN -------------
We need to create a profile and edition mecanism in gcompris. Here is a
diff --git a/configure.in b/configure.in
index 2bbb2fe..0495d9f 100644
--- a/configure.in
+++ b/configure.in
@@ -115,19 +115,26 @@ AC_MSG_ERROR([You must have popt 1.5 or newer to compile gcompris.]))
AM_ICONV
dnl XRANDR Allow us to set the screen resolution dynamically
-RANDR_LIBS=
-found_randr=no
-AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate,
+AC_ARG_ENABLE(xrandr,
+ AC_HELP_STRING(
+ [--disable-xrandr],
+ [Turn off xrandr]),
+ USE_XRANDR="$enableval", USE_XRANDR="yes")
+if test "x$USE_XRANDR" == "xyes" ; then
+ RANDR_LIBS=
+ found_randr=no
+ AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate,
[AC_CHECK_HEADER(X11/extensions/Xrandr.h,
RANDR_LIBS="-L/usr/X11R6/lib/ -lXrandr" found_randr=yes,,
[#include <X11/Xlib.h>])],
, -L/usr/X11R6/lib/ -lXrandr $ALL_X_LIBS )
-if test "x$found_randr" = "xno"; then
- AC_MSG_NOTICE(["Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen."])
- AC_DEFINE_UNQUOTED(XRANDR, 0, [XRANDR NOT Available])
-else
- AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available])
+ if test "x$found_randr" = "xno"; then
+ AC_MSG_NOTICE(["Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen."])
+ AC_DEFINE_UNQUOTED(XRANDR, 0, [XRANDR NOT Available])
+ else
+ AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available])
+ fi
fi
LDFLAGS="${LDFLAGS} ${RANDR_LIBS}"
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index c7035f2..3b735dc 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -1,6 +1,6 @@
/* gcompris - gcompris.c
*
- * Time-stamp: <2005/05/13 00:14:48 bruno>
+ * Time-stamp: <2005/05/15 16:14:59 bruno>
*
* Copyright (C) 2000-2003 Bruno Coudoin
*
@@ -178,6 +178,18 @@ board_widget_key_press_callback (GtkWidget *widget,
return TRUE;
}
+ if(event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && ((event->keyval == GDK_l)
+ || (event->keyval == GDK_L))) {
+ properties->key="thanks_for_your_help";
+ gcompris_properties_save(properties);
+ gcompris_load_menus();
+
+ gcompris_close_all_dialog();
+
+ board_stop();
+ return TRUE;
+ }
+
if(event->state & GDK_CONTROL_MASK && ((event->keyval == GDK_p)
|| (event->keyval == GDK_P))) {
properties->key="thanks_for_your_help";