Commit ca801b4a authored by Bruno Coudoin's avatar Bruno Coudoin

updated Added --disable-xrandr option to force xrandr not to be compiled

	* 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
parent 16302d02
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> 2005-05-15 Bruno coudoin <bruno.coudoin@free.fr>
* Makefile.mingw: needed to compile on windows * Makefile.mingw: needed to compile on windows
......
...@@ -91,6 +91,10 @@ faut vider le tampon du clavier au d ...@@ -91,6 +91,10 @@ faut vider le tampon du clavier au d
- quand on est en mode plein écran, et qu'on clique sur "aide" dans - 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. 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 ------------- ----------- PROFILE DESIGN -------------
We need to create a profile and edition mecanism in gcompris. Here is a We need to create a profile and edition mecanism in gcompris. Here is a
......
...@@ -115,19 +115,26 @@ AC_MSG_ERROR([You must have popt 1.5 or newer to compile gcompris.])) ...@@ -115,19 +115,26 @@ AC_MSG_ERROR([You must have popt 1.5 or newer to compile gcompris.]))
AM_ICONV AM_ICONV
dnl XRANDR Allow us to set the screen resolution dynamically dnl XRANDR Allow us to set the screen resolution dynamically
RANDR_LIBS= AC_ARG_ENABLE(xrandr,
found_randr=no AC_HELP_STRING(
AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate, [--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, [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
RANDR_LIBS="-L/usr/X11R6/lib/ -lXrandr" found_randr=yes,, RANDR_LIBS="-L/usr/X11R6/lib/ -lXrandr" found_randr=yes,,
[#include <X11/Xlib.h>])], [#include <X11/Xlib.h>])],
, -L/usr/X11R6/lib/ -lXrandr $ALL_X_LIBS ) , -L/usr/X11R6/lib/ -lXrandr $ALL_X_LIBS )
if test "x$found_randr" = "xno"; then 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_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]) AC_DEFINE_UNQUOTED(XRANDR, 0, [XRANDR NOT Available])
else else
AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available]) AC_DEFINE_UNQUOTED(XRANDR, 1, [XRANDR Available])
fi
fi fi
LDFLAGS="${LDFLAGS} ${RANDR_LIBS}" LDFLAGS="${LDFLAGS} ${RANDR_LIBS}"
......
/* gcompris - gcompris.c /* 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 * Copyright (C) 2000-2003 Bruno Coudoin
* *
...@@ -178,6 +178,18 @@ board_widget_key_press_callback (GtkWidget *widget, ...@@ -178,6 +178,18 @@ board_widget_key_press_callback (GtkWidget *widget,
return TRUE; 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) if(event->state & GDK_CONTROL_MASK && ((event->keyval == GDK_p)
|| (event->keyval == GDK_P))) { || (event->keyval == GDK_P))) {
properties->key="thanks_for_your_help"; properties->key="thanks_for_your_help";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment