Package: gcompris
Version: 6.5.2-3
Severity: grave
Tags: sarge
In the gcompris activity anim, draw, melody, click_on_letter there is a
problem with key entries. For exemple in draw, entering a letter makes
it apears twice.
This is a problem in the way key event are handle in several activity.
The patch fixes all these issues.
--- src/boards/algebra.c 2005-05-20 00:19:16.789483121 +0200
+++ ../gcompris/src/boards/algebra.c 2005-05-20 00:11:29.116875202 +0200
@@ -1,6 +1,6 @@
/* gcompris - algebra.c
*
- * Time-stamp: <2004/03/10 23:15:42 bcoudoin>
+ * Time-stamp: <2005/03/30 22:01:14 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -223,7 +223,7 @@
gboolean stop = FALSE;
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
switch (keyval)
--- src/boards/enumerate.c 2005-05-20 00:19:16.855460495 +0200
+++ ../gcompris/src/boards/enumerate.c 2005-05-20 00:11:29.253828230 +0200
@@ -176,7 +176,7 @@
GnomeCanvasItem *item = NULL;
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
switch (keyval)
--- src/boards/gletters.c 2005-05-20 00:19:16.902444383 +0200
+++ ../gcompris/src/boards/gletters.c 2005-05-20 00:11:29.272821716 +0200
@@ -1,6 +1,6 @@
/* gcompris - gletters.c
*
- * Time-stamp: <2004/10/21 22:58:45 bruno>
+ * Time-stamp: <2005/03/30 21:41:45 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -428,7 +428,7 @@
g_message("in key_press: %d, %c, %lc",keyval,keyval,keyval);
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
switch (keyval)
@@ -558,8 +558,6 @@
gcompris_log_set_comment(gcomprisBoard, list_of_letters, str);
- g_message("leaving key_press\n");
-
return TRUE;
}
--- src/boards/maze.c 2005-05-20 00:19:16.914440269 +0200
+++ ../gcompris/src/boards/maze.c 2005-05-20 00:11:29.311808344 +0200
@@ -881,7 +881,7 @@
guint richting=0,level=gcomprisBoard->level;
if(board_paused)
- return TRUE;
+ return FALSE;
if (threeDactive) return key_press_3D(keyval);
--- src/boards/paratrooper.c 2005-05-20 00:19:16.946429299 +0200
+++ ../gcompris/src/boards/paratrooper.c 2005-05-20 00:11:29.392780572 +0200
@@ -1,6 +1,6 @@
/* gcompris - paratrooper.c
*
- * Time-stamp: <2005/01/09 02:56:01 bruno>
+ * Time-stamp: <2005/03/30 22:04:44 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -230,7 +230,7 @@
{
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
--- src/boards/planegame.c 2005-05-20 00:19:16.948428613 +0200
+++ ../gcompris/src/boards/planegame.c 2005-05-20 00:11:29.394779887 +0200
@@ -1,6 +1,6 @@
/* gcompris - planegame.c
*
- * Time-stamp: <2004/03/08 00:01:15 bcoudoin>
+ * Time-stamp: <2005/03/30 22:05:27 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -190,7 +190,7 @@
{
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
switch (keyval)
--- src/boards/shapegame.c 2005-05-20 00:19:17.033399473 +0200
+++ ../gcompris/src/boards/shapegame.c 2005-05-20 00:11:29.561722629 +0200
@@ -1,6 +1,6 @@
/* gcompris - shapegame.c
*
- * Time-stamp: <2004/11/09 00:29:43 bruno>
+ * Time-stamp: <2005/03/30 22:06:15 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -335,7 +335,7 @@
gboolean stop = FALSE;
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
switch (keyval)
--- src/boards/smallnumbers.c 2005-05-20 00:19:17.035398787 +0200
+++ ../gcompris/src/boards/smallnumbers.c 2005-05-20 00:11:29.563721943 +0200
@@ -1,6 +1,6 @@
/* gcompris - smallnumbers.c
*
- * Time-stamp: <2005/02/01 00:39:36 bruno>
+ * Time-stamp: <2005/03/30 22:07:06 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -194,7 +194,7 @@
char str[2];
if(!gcomprisBoard || !boardRootItem)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
switch (keyval)
--- src/boards/target.c 2005-05-20 00:19:17.064388846 +0200
+++ ../gcompris/src/boards/target.c 2005-05-20 00:11:29.571719200 +0200
@@ -231,7 +231,7 @@
guint c;
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
switch (keyval)
--- src/boards/wordsgame.c 2005-05-20 00:19:17.068387474 +0200
+++ ../gcompris/src/boards/wordsgame.c 2005-05-20 00:11:29.577717143 +0200
@@ -1,6 +1,6 @@
/* gcompris - wordsgame.c
*
- * Time-stamp: <2004/11/14 15:13:11 bruno>
+ * Time-stamp: <2005/03/30 21:40:02 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -227,10 +227,10 @@
LettersItem *item;
if(!gcomprisBoard)
- return TRUE;
+ return FALSE;
if(!g_unichar_isalnum (gdk_keyval_to_unicode (keyval)))
- return TRUE;
+ return FALSE;
/* Add some filter for control and shift key */
@@ -361,7 +361,7 @@
}
g_free(letter);
- return FALSE;
+ return TRUE;
}
static gboolean
--- src/gcompris/sdlplayer.c 2005-05-20 00:19:17.373282914 +0200
+++ ../gcompris/src/gcompris/sdlplayer.c 2005-05-20 00:11:30.627357139 +0200
@@ -68,7 +68,7 @@
int audio_rate,audio_channels,
// set this to any of 512,1024,2048,4096
// the higher it is, the more FPS shown and CPU needed
- audio_buffers=512;
+ audio_buffers=2048;
Uint16 audio_format;
// initialize SDL for audio
@@ -76,7 +76,7 @@
return(cleanExit("SDL_Init"));
// initialize sdl mixer, open up the audio device
- if(Mix_OpenAudio(22050,MIX_DEFAULT_FORMAT,1,audio_buffers)<0)
+ if(Mix_OpenAudio(44100,MIX_DEFAULT_FORMAT,2,audio_buffers)<0)
return(cleanExit("Mix_OpenAudio"));
// print out some info on the audio device and stream
