[Tux4kids-commits] r1334 - in tuxtype/branches/gsoc-sarah: data/images doc src
David Bruce
dbruce-guest at alioth.debian.org
Mon Aug 3 04:41:58 UTC 2009
Author: dbruce-guest
Date: 2009-08-03 04:41:58 +0000 (Mon, 03 Aug 2009)
New Revision: 1334
Added:
tuxtype/branches/gsoc-sarah/data/images/Done.png
tuxtype/branches/gsoc-sarah/data/images/RemWordList.png
Modified:
tuxtype/branches/gsoc-sarah/data/images/Makefile.am
tuxtype/branches/gsoc-sarah/doc/ChangeLog
tuxtype/branches/gsoc-sarah/src/editor.c
tuxtype/branches/gsoc-sarah/src/titlescreen.c
Log:
cleaned-up functions in editor.c now active code.
Added: tuxtype/branches/gsoc-sarah/data/images/Done.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/gsoc-sarah/data/images/Done.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: tuxtype/branches/gsoc-sarah/data/images/Makefile.am
===================================================================
--- tuxtype/branches/gsoc-sarah/data/images/Makefile.am 2009-08-03 00:35:40 UTC (rev 1333)
+++ tuxtype/branches/gsoc-sarah/data/images/Makefile.am 2009-08-03 04:41:58 UTC (rev 1334)
@@ -14,6 +14,7 @@
imagesdir = $(pkgdatadir)/images
dist_images_DATA = README_IMAGES.TXT \
+ Done.png \
down.png \
fishy-.png \
fishy0.png \
@@ -50,6 +51,7 @@
num_8.png \
num_9.png \
pract.png \
+ RemWordList.png \
right.png \
splat0.png \
sound.png \
Added: tuxtype/branches/gsoc-sarah/data/images/RemWordList.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/branches/gsoc-sarah/data/images/RemWordList.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: tuxtype/branches/gsoc-sarah/doc/ChangeLog
===================================================================
--- tuxtype/branches/gsoc-sarah/doc/ChangeLog 2009-08-03 00:35:40 UTC (rev 1333)
+++ tuxtype/branches/gsoc-sarah/doc/ChangeLog 2009-08-03 04:41:58 UTC (rev 1334)
@@ -1,9 +1,16 @@
-30 Jun 2009 (svn.debian.org/tux4kids - revision 1325)
+02 Aug 2009 (svn.debian.org/tux4kids - revision 1334)
[ David Bruce <davidstuartbruce at gmail.com> ]
+ - ChooseListToEdit() and EditWordList() in editor.h/c now used by program, old functions
+ commented out. Code cleanup ongoing. Added two more copies of NewWordList.png - to be
+ edited into buttons for "Remove" and "Done". Editor page rearranged.
+
+01 Aug 2009 (svn.debian.org/tux4kids - revision 1325)
+[ David Bruce <davidstuartbruce at gmail.com> ]
- Created files editor.h/c for word list editing code as titlescreen is really just
supposed to be the menu system. Copied ChooseFile() and ChooseWord() into these files
and renamed them ChooseListToEdit() and EditWordList(). They are not yet active code.
+30 Jun 2009
[Sarah Frisk <ssfrisk at gmail.com> ]
-Changed it so that wordlists are by the the name of the first word in file
-Discovered what is causing images not showing up. Apparently there is some memory issue that I've been working on for several days that causes any custom images not to appear when wordlists are added.
Modified: tuxtype/branches/gsoc-sarah/src/editor.c
===================================================================
--- tuxtype/branches/gsoc-sarah/src/editor.c 2009-08-03 00:35:40 UTC (rev 1333)
+++ tuxtype/branches/gsoc-sarah/src/editor.c 2009-08-03 04:41:58 UTC (rev 1334)
@@ -26,9 +26,11 @@
void ChooseListToEdit(void)
{
SDL_Surface* new_button = NULL;
+ SDL_Surface* remove_button = NULL;
+ SDL_Surface* done_button = NULL;
//this is text:
SDL_Surface *s1 = NULL, *s2 = NULL, *s3 = NULL, *s4 = NULL;
- SDL_Rect locText;
+ SDL_Rect text_rect;
SDL_Rect button_rect;
int stop = 0;
@@ -64,6 +66,7 @@
//Try to open directory for modifiable word lists:
sprintf(fn , "%s" , settings.var_data_path);
+
lists_dir = opendir(fn);
if (!lists_dir)
@@ -100,7 +103,8 @@
/* Make sure list title is capitalized: */
list_titles[num_lists][0] = toupper(list_titles[num_lists][0]);
fclose(fp);
- strncpy(file_names[num_lists++], list_dirent->d_name, FNLEN-1);
+ strncpy(file_names[num_lists], list_dirent->d_name, FNLEN-1);
+ num_lists++;
}
}
closedir(lists_dir);
@@ -116,30 +120,41 @@
}
/* Render text and instructions */
- s1 = BlackOutline(gettext_noop("Word List Editor"), 25, &yellow);
- s2 = BlackOutline(gettext_noop("To add a new wordlist, click the 'New Wordlist' button (it's not there)"), 18, &white);
+ s1 = BlackOutline(N_("Word List Editor"), 25, &yellow);
+ s2 = BlackOutline(N_("To add a new wordlist, click the 'New Wordlist' button (it's not there)"), 18, &white);
//FIXME this is going to be too long for one line.
- s3 = BlackOutline(gettext_noop("To edit current word lists, either click on the wordlist, or use the arrow keys to navigate and press return"), 18, &white);
- s4 = BlackOutline(gettext_noop("To exit Word List Editor, press ESC"), 18, &white);
+ s3 = BlackOutline(N_("To edit current word lists, either click on the wordlist, or use the arrow keys to navigate and press return"), 18, &white);
+ s4 = BlackOutline(N_("To exit Word List Editor, press ESC"), 18, &white);
/* Load image of new word list button: */
new_button = LoadImage("NewWordList.png", IMG_ALPHA);
- LOG( "ChooseFile() - drawing screen\n");
+ remove_button = LoadImage("RemWordList.png", IMG_ALPHA);
+ done_button = LoadImage("Done.png", IMG_ALPHA);
/* Draw the initial text and images that won't change as list is examined: */
SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
- locText.x = screen->w/2 - (s1->w/2); locText.y = 10;
- SDL_BlitSurface( s1, NULL, screen, &locText);
- locText.x = screen->w/2 - (s2->w/2); locText.y = 60;
- SDL_BlitSurface( s2, NULL, screen, &locText);
- locText.x = screen->w/2 - (s3->w/2); locText.y = 90;
- SDL_BlitSurface(s3, NULL, screen, &locText);
- locText.x = screen->w/2 - (s4->w/2); locText.y = 120;
- SDL_BlitSurface( s4, NULL, screen, &locText);
- button_rect.x = screen->w/3 * 2; button_rect.y = 200;
+ text_rect.x = screen->w/2 - (s1->w/2);
+ text_rect.y = 10;
+ SDL_BlitSurface( s1, NULL, screen, &text_rect);
+ text_rect.x = screen->w/2 - (s2->w/2);
+ text_rect.y = 60;
+ SDL_BlitSurface( s2, NULL, screen, &text_rect);
+ text_rect.x = screen->w/2 - (s3->w/2);
+ text_rect.y = 90;
+ SDL_BlitSurface(s3, NULL, screen, &text_rect);
+ text_rect.x = screen->w/2 - (s4->w/2);
+ text_rect.y = 120;
+ SDL_BlitSurface(s4, NULL, screen, &text_rect);
+
+ button_rect.x = screen->w - new_button->w - 20;
+ button_rect.y = screen->h/3;
SDL_BlitSurface(new_button, NULL, screen, &button_rect);
+ button_rect.y += new_button->h + 10;
+ SDL_BlitSurface(remove_button, NULL, screen, &button_rect);
+ button_rect.y += new_button->h + 10;
+ SDL_BlitSurface(done_button, NULL, screen, &button_rect);
SDL_UpdateRect(screen, 0, 0, 0, 0);
@@ -147,13 +162,13 @@
/* set initial rect sizes */
titleRects[0].y = screen->h / 3;
titleRects[0].w = titleRects[0].h = 0;
- titleRects[0].x = screen->w / 2;
+ titleRects[0].x = 30;
for (i = 1; i < 8; i++)
{
- titleRects[i].y = titleRects[i-1].y + 50;
+ titleRects[i].y = titleRects[i - 1].y + 40;
titleRects[i].w = titleRects[i].h = 0;
- titleRects[i].x = screen->w /2;
+ titleRects[i].x = 30;
}
@@ -238,20 +253,17 @@
{
int start;
- if(CurrentBkgd())
- SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
-
start = loc - (loc % 8);
for (i = start; i < MIN (start + 8, num_lists); i++)
{
- titleRects[i % 8].x = 320 - (white_titles_surf[i]->w/2);
+// titleRects[i % 8].x = 320 - (white_titles_surf[i]->w/2);
+// SDL_BlitSurface(CurrentBkgd(), &titleRects[i % 8], screen, &titleRects[i % 8]);
+
if (i == loc)
SDL_BlitSurface(yellow_titles_surf[loc], NULL, screen, &titleRects[i % 8]);
else
SDL_BlitSurface(white_titles_surf[i], NULL, screen, &titleRects[i % 8]);
- SDL_BlitSurface(CurrentBkgd(), &locText, screen, &locText);
- SDL_UpdateRect(screen, locText.x, locText.y, locText.w, locText.h);
}
SDL_UpdateRect(screen, 0, 0, 0 ,0);
@@ -279,6 +291,12 @@
SDL_FreeSurface(s3);
if(s4)
SDL_FreeSurface(s4);
+ if(new_button)
+ SDL_FreeSurface(new_button);
+ if(remove_button)
+ SDL_FreeSurface(remove_button);
+ if(done_button)
+ SDL_FreeSurface(done_button);
}
Modified: tuxtype/branches/gsoc-sarah/src/titlescreen.c
===================================================================
--- tuxtype/branches/gsoc-sarah/src/titlescreen.c 2009-08-03 00:35:40 UTC (rev 1333)
+++ tuxtype/branches/gsoc-sarah/src/titlescreen.c 2009-08-03 04:41:58 UTC (rev 1334)
@@ -22,6 +22,7 @@
#include "titlescreen.h"
#include "SDL_extras.h"
#include "convert_utf.h"
+#include "editor.h"
/* --- media for menus --- */
@@ -58,8 +59,8 @@
static void load_menu(void);
static void recalc_rects(void);
static int chooseWordlist(void);
-static void ChooseWord(char* words_file);
-static void ChooseFile(void);
+//static void ChooseWord(char* words_file);
+//static void ChooseFile(void);
static void unload_media(void);
static void unload_menu(void);
static void not_implemented(void);
@@ -484,7 +485,8 @@
if (menu_opt == EDIT_WORDLIST)
{
- ChooseFile();
+ ChooseListToEdit();
+ //ChooseFile();
redraw = 1;
}
@@ -1549,567 +1551,570 @@
}
-/* NOTE ChooseFile() is the function to pick custom word lists to edit. */
-/* We should change the name to something more descriptive. */
+// NOTE these functions have been moved to editor.c/h, renamed with more
+// descriptive names, and undergone code cleanup there - DSB
-static void ChooseFile(void)
-{
- SDL_Surface* titles[MAX_WORD_LISTS] = {NULL};
- SDL_Surface* select[MAX_WORD_LISTS] = {NULL};
- SDL_Surface *picture = NULL;
- SDL_Surface* bkg = NULL;
- SDL_Surface *s1 = NULL, *s2 = NULL, *s3 = NULL, *s4 = NULL; //this is text
- SDL_Rect locText;
- SDL_Rect button_rect;
+// /* NOTE ChooseFile() is the function to pick custom word lists to edit. */
+// /* We should change the name to something more descriptive. */
+//
+// static void ChooseFile(void)
+// {
+// SDL_Surface* titles[MAX_WORD_LISTS] = {NULL};
+// SDL_Surface* select[MAX_WORD_LISTS] = {NULL};
+// SDL_Surface *picture = NULL;
+// SDL_Surface* bkg = NULL;
+// SDL_Surface *s1 = NULL, *s2 = NULL, *s3 = NULL, *s4 = NULL; //this is text
+// SDL_Rect locText;
+// SDL_Rect button_rect;
+//
+// static SDL_Rect titleRects[8];
+// int stop = 0;
+// int loc = 0;
+// int old_loc = 1;
+// int number_of_lists = 0;
+//
+// int themes = 0;
+// int i;
+// int result = 0;
+// char fn[FNLEN];
+// char fileNames[MAX_WORD_LISTS][FNLEN];
+// char wordTypes[MAX_WORD_LISTS][FNLEN];
+//
+// int old_use_english;
+// char old_theme_path[FNLEN];
+//
+// FILE* fp = NULL;
+// FILE* tempFile = NULL;
+//
+//
+// DIR* themesDir = NULL;
+// struct dirent* themesFile = NULL;
+//
+// sprintf(fn , "%s" , settings.var_data_path);
+// fprintf(stderr , "%s", settings.var_data_path);
+//
+//
+// themesDir = opendir(fn);
+//
+// if (!themesDir)
+// {
+// fprintf(stderr, "Choosefile() - cannot open themes directory!");
+// return;
+// }
+//
+// do
+// {
+// themesFile = readdir(themesDir);
+// if (!themesFile)
+// break;
+//
+// /* we ignore any hidden file and CVS */
+//
+// if (themesFile->d_name[0] == '.')
+// continue;
+//
+// if (strcmp("CVS", themesFile->d_name) == 0)
+// continue;
+//
+// snprintf(fn, FNLEN, "%s/%s" , settings.var_data_path, themesFile->d_name);
+//
+// /* CheckFile() returns 2 if dir, 1 if file, 0 if neither: */
+// if (CheckFile(fn) == 1)
+// {
+// /* We know it opens safely because CheckFile() returned 1 */
+// fp = fopen(fn,"r");
+// /* HACK: we should get the names from file :) */
+// if (EOF ==fscanf(fp, "%[^\n]\n", wordTypes[themes]))
+// continue;
+// /* Make sure theme name is capitalized: */
+// wordTypes[themes][0] = toupper(wordTypes[themes][0]);
+// fclose(fp);
+// strncpy( fileNames[themes++], themesFile->d_name, FNLEN-1 );
+// }
+// } while (1);
+//
+//
+// closedir(themesDir);
+//
+// for (i = 0; i < themes; i++)
+// {
+// titles[i] = BlackOutline(wordTypes[i], DEFAULT_MENU_FONT_SIZE, &white);
+// select[i] = BlackOutline(wordTypes[i], DEFAULT_MENU_FONT_SIZE, &yellow);
+// }
+//
+//
+//
+// /* Text and instructions */
+//
+// s1 = BlackOutline(gettext_noop("Word List Editor"), 25, &yellow);
+// s2 = BlackOutline(gettext_noop("To add a new wordlist, click the 'New Wordlist' button (it's not there)"), 18, &white);
+// s3 = BlackOutline(gettext_noop("To edit current word lists, either click on the wordlist, or use the arrow keys to navigate and press return"), 18, &white);
+// s4 = BlackOutline(gettext_noop("To exit Word List Editor, press ESC"), 18, &white);
+//
+// // picture = LoadImage("right.png", IMG_ALPHA);
+//
+// picture = LoadImage("NewWordList.png", IMG_ALPHA);
+// LOG( "ChooseFile() - drawing screen\n");
+// if(picture != NULL)
+// printf("picture loaded successfully\n");
+//
+// SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
+// locText.x = screen->w/2 - (s1->w/2); locText.y = 10;
+// SDL_BlitSurface( s1, NULL, screen, &locText);
+// locText.x = screen->w/2 - (s2->w/2); locText.y = 60;
+// SDL_BlitSurface( s2, NULL, screen, &locText);
+// locText.x = screen->w/2 - (s3->w/2); locText.y = 90;
+// SDL_BlitSurface(s3, NULL, screen, &locText);
+// locText.x = screen->w/2 - (s4->w/2); locText.y = 120;
+// SDL_BlitSurface(s4, NULL, screen, &locText);
+//
+// button_rect.x = screen->w/3 * 2; button_rect.y = 200;
+// SDL_BlitSurface(picture, NULL, screen, &button_rect);
+//
+//
+// SDL_UpdateRect(screen, 0, 0, 0, 0);
+//
+//
+//
+//
+// /* set initial rect sizes */
+//
+// titleRects[0].y = screen->h / 3;
+// titleRects[0].w = titleRects[0].h = 0;
+// titleRects[0].x = screen->w / 2;
+// for (i = 1; i<8; i++)
+// {
+// titleRects[i].y = titleRects[i-1].y + 50;
+// titleRects[i].w = titleRects[i].h = 0;
+// titleRects[i].x = screen->w /2;
+// }
+//
+// while (!stop)
+// {
+// while (SDL_PollEvent(&event))
+// switch (event.type)
+// {
+// case SDL_QUIT:
+// exit(0);
+// break;
+//
+// case SDL_MOUSEMOTION:
+// for (i = 0; (i < 8) && (loc - (loc % 8) + i < themes); i++)
+// if (inRect(titleRects[i], event.motion.x, event.motion.y))
+// {
+// loc = loc - (loc % 8) + i;
+// break; /* out of for loop */
+// }
+// break; /* out of switch-case */
+//
+// case SDL_MOUSEBUTTONDOWN:
+// for (i = 0; (i < 8) && (loc - (loc % 8) + i <themes); i++)
+// if (inRect(titleRects[i], event.button.x, event.button.y))
+// {
+// loc = loc - (loc % 8) + i;
+// ChooseWord(fileNames[loc]);
+// break;
+// }
+// break;
+//
+// case SDL_KEYDOWN:
+// if (event.key.keysym.sym == SDLK_ESCAPE)
+// {
+// // settings.use_english = old_use_english;
+// //strncpy(settings.theme_data_path, old_theme_path, FNLEN - 1);
+// stop = 1;
+// break;
+// }
+//
+// if (event.key.keysym.sym == SDLK_RETURN)
+// {
+// ChooseWord(fileNames[loc]);
+// loc = 0;
+// break;
+// }
+//
+// if ((event.key.keysym.sym == SDLK_LEFT)
+// || (event.key.keysym.sym == SDLK_PAGEUP))
+// {
+// if (loc - (loc % 8) - 8 >= 0)
+// loc = loc - (loc % 8) - 8;
+// }
+//
+// if ((event.key.keysym.sym == SDLK_RIGHT)
+// || (event.key.keysym.sym == SDLK_PAGEDOWN))
+// {
+// if (loc - (loc % 8) + 8 < themes)
+// loc = (loc - (loc % 8) + 8);
+// }
+//
+// if (event.key.keysym.sym == SDLK_UP)
+// {
+// if (loc > 0)
+// loc--;
+// }
+//
+// if (event.key.keysym.sym == SDLK_DOWN)
+// {
+// if (loc + 1 < themes)
+// loc++;
+// }
+// }
+//
+// if (old_loc != loc)
+// {
+// int start;
+//
+// SDL_BlitSurface( bkg, NULL, screen, NULL );
+//
+// //if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);
+//
+// start = loc - (loc % 8);
+//
+// for (i = start; i < MIN (start + 8,themes); i++)
+// {
+// titleRects[i % 8].x = 320 - (titles[i]->w/2);
+// if (i == loc)
+// SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i % 8]);
+// else
+// SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i % 8]);
+// SDL_BlitSurface(CurrentBkgd(), &locText, screen, &locText);
+// SDL_UpdateRect(screen, locText.x, locText.y, locText.w, locText.h);
+// }
+//
+// SDL_UpdateRect(screen, 0, 0, 0 ,0);
+// }
+// SDL_Delay(40);
+// old_loc = loc;
+// }
+//
+// /* --- clear graphics before quitting --- */
+//
+// for (i = 0; i<themes; i++)
+//
+// {
+// SDL_FreeSurface(titles[i]);
+// SDL_FreeSurface(select[i]);
+// }
+//
+// SDL_FreeSurface(s1);
+// SDL_FreeSurface(s2);
+// SDL_FreeSurface(s3);
+// SDL_FreeSurface(s4);
+// s1 = s2 = s3 = s4 = NULL;
+//
+//
+//
+// bkg = NULL; /* the other pointers are going out of scope so we don't */
+// /* have to worry about setting them to NULL */
+// }
+//
+//
+// static void ChooseWord(char *words_file)
+// {
+// /* Need to figure out how to handle empty lists */
+// static SDL_Surface* titles[MAX_WORD_LISTS] = {NULL};
+// static SDL_Surface* select[MAX_WORD_LISTS] = {NULL};
+// static SDL_Surface *left = NULL, *right = NULL;
+// static SDL_Rect leftRect, rightRect;
+// SDL_Surface* bkg = NULL;
+// SDL_Rect titleRects[8];
+// int stop = 0;
+// int loc = 0;
+// int old_loc = 1;
+//
+// FILE* fp = NULL;
+//
+// int start, number_of_words = 0;
+// int i,len;
+// int listening_for_new_word = 0;
+// char fn[FNLEN];
+// char str[FNLEN];
+// char words_in_list[MAX_WORD_LISTS][FNLEN];
+//
+// wchar_t temp[FNLEN], temp2[FNLEN];
+//
+// /* save previous settings in case we back out: */
+// // old_use_english = settings.use_english;
+// // strncpy(old_theme_path, settings.theme_data_path, FNLEN - 1);
+//
+// //internationalization required
+// sprintf(fn , "%s/%s", settings.var_data_path, words_file);
+//
+// fp = fopen(fn,"r");
+//
+// number_of_words = 0;
+//
+// while(!feof(fp))
+// if (EOF ==fscanf(fp, "%[^\n]\n", words_in_list[number_of_words++]))
+// continue;
+//
+// fclose(fp);
+//
+// for (i = 0; i<number_of_words; i++)
+// {
+// titles[i] = BlackOutline(words_in_list[i], DEFAULT_MENU_FONT_SIZE, &white);
+// select[i] = BlackOutline(words_in_list[i], DEFAULT_MENU_FONT_SIZE, &yellow);
+// }
+//
+// bkg = LoadImage("main_bkg.png", IMG_REGULAR);
+// SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
+//
+// left = LoadImage("left.png", IMG_ALPHA);
+// leftRect.w = left->w; leftRect.h = left->h;
+// leftRect.x = 320 - 100 - (leftRect.w/2); leftRect.y = 430;
+//
+// right = LoadImage("right.png", IMG_ALPHA);
+// rightRect.w = right->w; rightRect.h = right->h;
+// rightRect.x = 320 + 100 - (rightRect.w/2); rightRect.y = 430;
+//
+// /* set initial rect sizes */
+// titleRects[0].y = 30;
+// titleRects[0].w = titleRects[0].h = titleRects[0].x = 0;
+// for (i = 1; i<8; i++)
+// {
+// titleRects[i].y = titleRects[i-1].y + 50;
+// titleRects[i].w = titleRects[i].h = titleRects[i].x = 0;
+// }
+//
+// while (!stop)
+// {
+// while (SDL_PollEvent(&event))
+// switch (event.type)
+// {
+// case SDL_QUIT:
+// exit(0);
+// break;
+//
+// case SDL_MOUSEBUTTONDOWN:
+// if (inRect(leftRect, event.button.x, event.button.y))
+// if (loc - (loc % 8) - 8 >= 0)
+// {
+// loc = loc - (loc % 8) - 8;
+// break;
+// }
+//
+// if (inRect(rightRect, event.button.x, event.button.y))
+// if (loc - (loc % 8) + 8 < number_of_words)
+// {
+// loc = loc - (loc % 8) + 8;
+// break;
+// }
+//
+// for (i = 0; (i < 8) && (loc - (loc % 8) + i < number_of_words); i++)
+// if (inRect(titleRects[i], event.motion.x, event.motion.y))
+// {
+// loc = loc - (loc % 8) + i;
+// break;
+// }
+// break;
+//
+// case SDL_KEYDOWN:
+// i = 1;
+//
+// if (event.key.keysym.sym == SDLK_BACKSPACE)
+//
+// {
+//
+// len = ConvertFromUTF8(temp, words_in_list[loc], FNLEN);
+// if (len > 1 && number_of_words > 1 && loc != 0) {
+// // remove the last character from the string
+// temp[len - 1] = temp[len];
+// len = ConvertToUTF8(temp, words_in_list[loc], FNLEN);
+// titles[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &white );
+// select[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &yellow);
+// }
+//
+// else {
+// // we have to remove the word from the list //
+// fprintf(stderr, "The number of words is %i\n", number_of_words);
+// fprintf(stderr, "The length is %i \n", len);
+// if (number_of_words > 1 && loc != 0)
+// {
+// int x = 0;
+// number_of_words--;
+// fprintf(stderr, "There are current: %i words\n", number_of_words);
+// for (x = loc; x <= number_of_words; x++)
+// {
+// if (x < number_of_words)
+// {
+// len = ConvertFromUTF8(temp, words_in_list[x + 1], FNLEN);
+// len = ConvertToUTF8(temp, words_in_list[x], FNLEN);
+// titles[x] = BlackOutline(words_in_list[x], DEFAULT_MENU_FONT_SIZE, &white );
+// select[x] = BlackOutline(words_in_list[x], DEFAULT_MENU_FONT_SIZE, &yellow);
+// }
+// else
+// {
+// titles[x] = NULL;
+// select[x] = NULL;
+// }
+// }
+// if (loc == number_of_words)
+// loc --;
+// }
+//
+// titles[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &white );
+// select[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &yellow);
+//
+// //handle deleation of words better, right now don't really do that
+// }
+// break;
+// }
+//
+// if (event.key.keysym.sym == SDLK_ESCAPE)
+// {
+// stop = 1;
+// break;
+// }
+//
+// if ((event.key.keysym.sym == SDLK_LEFT)
+// || (event.key.keysym.sym == SDLK_PAGEUP))
+// {
+// if (loc - (loc % 8) - 8 >= 0)
+// loc = loc - (loc % 8) - 8;
+// break;
+// }
+//
+// if ((event.key.keysym.sym == SDLK_RIGHT)
+// || (event.key.keysym.sym == SDLK_PAGEDOWN))
+// {
+// if (loc - (loc % 8) + 8 < number_of_words)
+// loc = (loc - (loc % 8) + 8);
+// break;
+// }
+//
+// if (event.key.keysym.sym == SDLK_UP)
+// {
+// if (loc > 0)
+// loc--;
+// break;
+// }
+//
+// if (event.key.keysym.sym == SDLK_DOWN)
+// {
+// if (loc + 1 < number_of_words)
+// loc++;
+// break;
+// }
+//
+//
+// switch (event.key.keysym.sym)
+// {
+// case SDLK_RETURN:
+// if (number_of_words < MAX_WORD_LISTS)
+// listening_for_new_word = 1;
+// else
+// fprintf(stderr, "Couldn't add new word, this wordlist is full.\n");
+// case SDLK_CAPSLOCK:
+// case SDLK_RALT:
+// case SDLK_LALT:
+// case SDLK_RSHIFT:
+// case SDLK_LSHIFT:
+// case SDLK_RCTRL:
+// case SDLK_LCTRL:
+// i=0;
+// break;
+// default: // ignore any other keys
+// {}
+// }
+//
+// if(i)
+// {
+// // If it's listening for a new word, from having last pressed enter, create a whole new word
+// // with a length of 0, else get the current length of the highlighted word
+// if (listening_for_new_word) {
+// loc = number_of_words;
+// number_of_words++;
+// listening_for_new_word = 0;
+// len = 0;
+//
+// } else {
+// len = ConvertFromUTF8(temp, words_in_list[loc], FNLEN);
+// }
+//
+// // Add the character to the end of the existing string
+// temp[len] = toupper(event.key.keysym.unicode);
+// temp[len + 1] = 0;
+// ConvertToUTF8(temp,words_in_list[loc], FNLEN);
+//
+// // Copy back to the on-screen list
+// titles[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &white );
+// select[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &yellow);
+//
+// i = 0;
+// break;
+// }
+// }
+//
+// if(!stop)
+// {
+// SDL_BlitSurface( bkg, NULL, screen, NULL );
+//
+// // if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);
+//
+// start = loc - (loc % 8);
+// for (i = start; i < MIN(start + 8,number_of_words); i++)
+// {
+// titleRects[i % 8].x = 320 - (titles[i]->w/2);
+// if (i == loc)
+// SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i%8]);
+// else
+// SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i%8]);
+// }
+//
+// /* --- draw buttons --- */
+//
+// if (start > 0)
+// SDL_BlitSurface( left, NULL, screen, &leftRect );
+//
+// if (start + 8 < number_of_words)
+// SDL_BlitSurface(right, NULL, screen, &rightRect);
+//
+// SDL_UpdateRect(screen, 0, 0, 0 ,0);
+// }
+// //SDL_Delay(40);
+// old_loc = loc;
+// }
+//
+// /*FIXME: somehow when this is first saved, there is a space between
+// each of the new words in the saved file. This is fixed upon reloading the
+// word list*/
+//
+// /* Write changes to file, if possible: */
+// fprintf(stderr, "In ChooseWord(), about to write changes\n");
+// fp = fopen(fn,"w");
+//
+// if (fp)
+// {
+// fseek(fp, 0, SEEK_SET);
+// fprintf(fp, "%s", str);
+// i = 0;
+//
+// while(i < number_of_words)
+// fprintf(fp, "%s\n", words_in_list[i++]);
+//
+// fclose(fp);
+// fp = NULL;
+// fprintf(stderr, "In ChooseWord(), changes written successfully\n");
+// }
+// else
+// {
+// fprintf(stderr, "In ChooseWord(), unable to open %s for writing\n", fn);
+// }
+//
+// /* --- clear graphics before quitting --- */
+// /* FIXME none of this is safe if any of the images is NULL */
+// for (i = 0; i < MAX_WORD_LISTS; i++)
+// {
+// SDL_FreeSurface(titles[i]);
+// SDL_FreeSurface(select[i]);
+// }
+//
+// SDL_FreeSurface(bkg);
+// SDL_FreeSurface(left);
+// SDL_FreeSurface(right);
+// bkg = NULL; /* the other pointers are going out of scope so we don't */
+// /* have to worry about setting them to NULL */
+// }
+//
- static SDL_Rect titleRects[8];
- int stop = 0;
- int loc = 0;
- int old_loc = 1;
- int number_of_lists = 0;
-
- int themes = 0;
- int i;
- int result = 0;
- char fn[FNLEN];
- char fileNames[MAX_WORD_LISTS][FNLEN];
- char wordTypes[MAX_WORD_LISTS][FNLEN];
-
- int old_use_english;
- char old_theme_path[FNLEN];
-
- FILE* fp = NULL;
- FILE* tempFile = NULL;
-
-
- DIR* themesDir = NULL;
- struct dirent* themesFile = NULL;
-
- sprintf(fn , "%s" , settings.var_data_path);
- fprintf(stderr , "%s", settings.var_data_path);
-
-
- themesDir = opendir(fn);
-
- if (!themesDir)
- {
- fprintf(stderr, "Choosefile() - cannot open themes directory!");
- return;
- }
-
- do
- {
- themesFile = readdir(themesDir);
- if (!themesFile)
- break;
-
- /* we ignore any hidden file and CVS */
-
- if (themesFile->d_name[0] == '.')
- continue;
-
- if (strcmp("CVS", themesFile->d_name) == 0)
- continue;
-
- snprintf(fn, FNLEN, "%s/%s" , settings.var_data_path, themesFile->d_name);
-
- /* CheckFile() returns 2 if dir, 1 if file, 0 if neither: */
- if (CheckFile(fn) == 1)
- {
- /* We know it opens safely because CheckFile() returned 1 */
- fp = fopen(fn,"r");
- /* HACK: we should get the names from file :) */
- if (EOF ==fscanf(fp, "%[^\n]\n", wordTypes[themes]))
- continue;
- /* Make sure theme name is capitalized: */
- wordTypes[themes][0] = toupper(wordTypes[themes][0]);
- fclose(fp);
- strncpy( fileNames[themes++], themesFile->d_name, FNLEN-1 );
- }
- } while (1);
-
-
- closedir(themesDir);
-
- for (i = 0; i < themes; i++)
- {
- titles[i] = BlackOutline(wordTypes[i], DEFAULT_MENU_FONT_SIZE, &white);
- select[i] = BlackOutline(wordTypes[i], DEFAULT_MENU_FONT_SIZE, &yellow);
- }
-
-
-
- /* Text and instructions */
-
- s1 = BlackOutline(gettext_noop("Word List Editor"), 25, &yellow);
- s2 = BlackOutline(gettext_noop("To add a new wordlist, click the 'New Wordlist' button (it's not there)"), 18, &white);
- s3 = BlackOutline(gettext_noop("To edit current word lists, either click on the wordlist, or use the arrow keys to navigate and press return"), 18, &white);
- s4 = BlackOutline(gettext_noop("To exit Word List Editor, press ESC"), 18, &white);
-
-// picture = LoadImage("right.png", IMG_ALPHA);
-
- picture = LoadImage("NewWordList.png", IMG_ALPHA);
- LOG( "ChooseFile() - drawing screen\n");
- if(picture != NULL)
- printf("picture loaded successfully\n");
-
- SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
- locText.x = screen->w/2 - (s1->w/2); locText.y = 10;
- SDL_BlitSurface( s1, NULL, screen, &locText);
- locText.x = screen->w/2 - (s2->w/2); locText.y = 60;
- SDL_BlitSurface( s2, NULL, screen, &locText);
- locText.x = screen->w/2 - (s3->w/2); locText.y = 90;
- SDL_BlitSurface(s3, NULL, screen, &locText);
- locText.x = screen->w/2 - (s4->w/2); locText.y = 120;
- SDL_BlitSurface(s4, NULL, screen, &locText);
-
- button_rect.x = screen->w/3 * 2; button_rect.y = 200;
- SDL_BlitSurface(picture, NULL, screen, &button_rect);
-
-
- SDL_UpdateRect(screen, 0, 0, 0, 0);
-
-
-
-
- /* set initial rect sizes */
-
- titleRects[0].y = screen->h / 3;
- titleRects[0].w = titleRects[0].h = 0;
- titleRects[0].x = screen->w / 2;
- for (i = 1; i<8; i++)
- {
- titleRects[i].y = titleRects[i-1].y + 50;
- titleRects[i].w = titleRects[i].h = 0;
- titleRects[i].x = screen->w /2;
- }
-
- while (!stop)
- {
- while (SDL_PollEvent(&event))
- switch (event.type)
- {
- case SDL_QUIT:
- exit(0);
- break;
-
- case SDL_MOUSEMOTION:
- for (i = 0; (i < 8) && (loc - (loc % 8) + i < themes); i++)
- if (inRect(titleRects[i], event.motion.x, event.motion.y))
- {
- loc = loc - (loc % 8) + i;
- break; /* out of for loop */
- }
- break; /* out of switch-case */
-
- case SDL_MOUSEBUTTONDOWN:
- for (i = 0; (i < 8) && (loc - (loc % 8) + i <themes); i++)
- if (inRect(titleRects[i], event.button.x, event.button.y))
- {
- loc = loc - (loc % 8) + i;
- ChooseWord(fileNames[loc]);
- break;
- }
- break;
-
- case SDL_KEYDOWN:
- if (event.key.keysym.sym == SDLK_ESCAPE)
- {
- // settings.use_english = old_use_english;
- //strncpy(settings.theme_data_path, old_theme_path, FNLEN - 1);
- stop = 1;
- break;
- }
-
- if (event.key.keysym.sym == SDLK_RETURN)
- {
- ChooseWord(fileNames[loc]);
- loc = 0;
- break;
- }
-
- if ((event.key.keysym.sym == SDLK_LEFT)
- || (event.key.keysym.sym == SDLK_PAGEUP))
- {
- if (loc - (loc % 8) - 8 >= 0)
- loc = loc - (loc % 8) - 8;
- }
-
- if ((event.key.keysym.sym == SDLK_RIGHT)
- || (event.key.keysym.sym == SDLK_PAGEDOWN))
- {
- if (loc - (loc % 8) + 8 < themes)
- loc = (loc - (loc % 8) + 8);
- }
-
- if (event.key.keysym.sym == SDLK_UP)
- {
- if (loc > 0)
- loc--;
- }
-
- if (event.key.keysym.sym == SDLK_DOWN)
- {
- if (loc + 1 < themes)
- loc++;
- }
- }
-
- if (old_loc != loc)
- {
- int start;
-
- SDL_BlitSurface( bkg, NULL, screen, NULL );
-
- //if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);
-
- start = loc - (loc % 8);
-
- for (i = start; i < MIN (start + 8,themes); i++)
- {
- titleRects[i % 8].x = 320 - (titles[i]->w/2);
- if (i == loc)
- SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i % 8]);
- else
- SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i % 8]);
- SDL_BlitSurface(CurrentBkgd(), &locText, screen, &locText);
- SDL_UpdateRect(screen, locText.x, locText.y, locText.w, locText.h);
- }
-
- SDL_UpdateRect(screen, 0, 0, 0 ,0);
- }
- SDL_Delay(40);
- old_loc = loc;
- }
-
- /* --- clear graphics before quitting --- */
-
- for (i = 0; i<themes; i++)
-
- {
- SDL_FreeSurface(titles[i]);
- SDL_FreeSurface(select[i]);
- }
-
- SDL_FreeSurface(s1);
- SDL_FreeSurface(s2);
- SDL_FreeSurface(s3);
- SDL_FreeSurface(s4);
- s1 = s2 = s3 = s4 = NULL;
-
-
-
- bkg = NULL; /* the other pointers are going out of scope so we don't */
- /* have to worry about setting them to NULL */
-}
-
-
-static void ChooseWord(char *words_file)
-{
- /* Need to figure out how to handle empty lists */
- static SDL_Surface* titles[MAX_WORD_LISTS] = {NULL};
- static SDL_Surface* select[MAX_WORD_LISTS] = {NULL};
- static SDL_Surface *left = NULL, *right = NULL;
- static SDL_Rect leftRect, rightRect;
- SDL_Surface* bkg = NULL;
- SDL_Rect titleRects[8];
- int stop = 0;
- int loc = 0;
- int old_loc = 1;
-
- FILE* fp = NULL;
-
- int start, number_of_words = 0;
- int i,len;
- int listening_for_new_word = 0;
- char fn[FNLEN];
- char str[FNLEN];
- char words_in_list[MAX_WORD_LISTS][FNLEN];
-
- wchar_t temp[FNLEN], temp2[FNLEN];
-
- /* save previous settings in case we back out: */
- // old_use_english = settings.use_english;
- // strncpy(old_theme_path, settings.theme_data_path, FNLEN - 1);
-
- //internationalization required
- sprintf(fn , "%s/%s", settings.var_data_path, words_file);
-
- fp = fopen(fn,"r");
-
- number_of_words = 0;
-
- while(!feof(fp))
- if (EOF ==fscanf(fp, "%[^\n]\n", words_in_list[number_of_words++]))
- continue;
-
- fclose(fp);
-
- for (i = 0; i<number_of_words; i++)
- {
- titles[i] = BlackOutline(words_in_list[i], DEFAULT_MENU_FONT_SIZE, &white);
- select[i] = BlackOutline(words_in_list[i], DEFAULT_MENU_FONT_SIZE, &yellow);
- }
-
- bkg = LoadImage("main_bkg.png", IMG_REGULAR);
- SDL_BlitSurface(CurrentBkgd(), NULL, screen, NULL);
-
- left = LoadImage("left.png", IMG_ALPHA);
- leftRect.w = left->w; leftRect.h = left->h;
- leftRect.x = 320 - 100 - (leftRect.w/2); leftRect.y = 430;
-
- right = LoadImage("right.png", IMG_ALPHA);
- rightRect.w = right->w; rightRect.h = right->h;
- rightRect.x = 320 + 100 - (rightRect.w/2); rightRect.y = 430;
-
- /* set initial rect sizes */
- titleRects[0].y = 30;
- titleRects[0].w = titleRects[0].h = titleRects[0].x = 0;
- for (i = 1; i<8; i++)
- {
- titleRects[i].y = titleRects[i-1].y + 50;
- titleRects[i].w = titleRects[i].h = titleRects[i].x = 0;
- }
-
- while (!stop)
- {
- while (SDL_PollEvent(&event))
- switch (event.type)
- {
- case SDL_QUIT:
- exit(0);
- break;
-
- case SDL_MOUSEBUTTONDOWN:
- if (inRect(leftRect, event.button.x, event.button.y))
- if (loc - (loc % 8) - 8 >= 0)
- {
- loc = loc - (loc % 8) - 8;
- break;
- }
-
- if (inRect(rightRect, event.button.x, event.button.y))
- if (loc - (loc % 8) + 8 < number_of_words)
- {
- loc = loc - (loc % 8) + 8;
- break;
- }
-
- for (i = 0; (i < 8) && (loc - (loc % 8) + i < number_of_words); i++)
- if (inRect(titleRects[i], event.motion.x, event.motion.y))
- {
- loc = loc - (loc % 8) + i;
- break;
- }
- break;
-
- case SDL_KEYDOWN:
- i = 1;
-
- if (event.key.keysym.sym == SDLK_BACKSPACE)
-
- {
-
- len = ConvertFromUTF8(temp, words_in_list[loc], FNLEN);
- if (len > 1 && number_of_words > 1 && loc != 0) {
- // remove the last character from the string
- temp[len - 1] = temp[len];
- len = ConvertToUTF8(temp, words_in_list[loc], FNLEN);
- titles[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &white );
- select[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &yellow);
- }
-
- else {
- // we have to remove the word from the list //
- fprintf(stderr, "The number of words is %i\n", number_of_words);
- fprintf(stderr, "The length is %i \n", len);
- if (number_of_words > 1 && loc != 0)
- {
- int x = 0;
- number_of_words--;
- fprintf(stderr, "There are current: %i words\n", number_of_words);
- for (x = loc; x <= number_of_words; x++)
- {
- if (x < number_of_words)
- {
- len = ConvertFromUTF8(temp, words_in_list[x + 1], FNLEN);
- len = ConvertToUTF8(temp, words_in_list[x], FNLEN);
- titles[x] = BlackOutline(words_in_list[x], DEFAULT_MENU_FONT_SIZE, &white );
- select[x] = BlackOutline(words_in_list[x], DEFAULT_MENU_FONT_SIZE, &yellow);
- }
- else
- {
- titles[x] = NULL;
- select[x] = NULL;
- }
- }
- if (loc == number_of_words)
- loc --;
- }
-
- titles[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &white );
- select[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &yellow);
-
- //handle deleation of words better, right now don't really do that
- }
- break;
- }
-
- if (event.key.keysym.sym == SDLK_ESCAPE)
- {
- stop = 1;
- break;
- }
-
- if ((event.key.keysym.sym == SDLK_LEFT)
- || (event.key.keysym.sym == SDLK_PAGEUP))
- {
- if (loc - (loc % 8) - 8 >= 0)
- loc = loc - (loc % 8) - 8;
- break;
- }
-
- if ((event.key.keysym.sym == SDLK_RIGHT)
- || (event.key.keysym.sym == SDLK_PAGEDOWN))
- {
- if (loc - (loc % 8) + 8 < number_of_words)
- loc = (loc - (loc % 8) + 8);
- break;
- }
-
- if (event.key.keysym.sym == SDLK_UP)
- {
- if (loc > 0)
- loc--;
- break;
- }
-
- if (event.key.keysym.sym == SDLK_DOWN)
- {
- if (loc + 1 < number_of_words)
- loc++;
- break;
- }
-
-
- switch (event.key.keysym.sym)
- {
- case SDLK_RETURN:
- if (number_of_words < MAX_WORD_LISTS)
- listening_for_new_word = 1;
- else
- fprintf(stderr, "Couldn't add new word, this wordlist is full.\n");
- case SDLK_CAPSLOCK:
- case SDLK_RALT:
- case SDLK_LALT:
- case SDLK_RSHIFT:
- case SDLK_LSHIFT:
- case SDLK_RCTRL:
- case SDLK_LCTRL:
- i=0;
- break;
- default: // ignore any other keys
- {}
- }
-
- if(i)
- {
- // If it's listening for a new word, from having last pressed enter, create a whole new word
- // with a length of 0, else get the current length of the highlighted word
- if (listening_for_new_word) {
- loc = number_of_words;
- number_of_words++;
- listening_for_new_word = 0;
- len = 0;
-
- } else {
- len = ConvertFromUTF8(temp, words_in_list[loc], FNLEN);
- }
-
- // Add the character to the end of the existing string
- temp[len] = toupper(event.key.keysym.unicode);
- temp[len + 1] = 0;
- ConvertToUTF8(temp,words_in_list[loc], FNLEN);
-
- // Copy back to the on-screen list
- titles[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &white );
- select[loc] = BlackOutline(words_in_list[loc], DEFAULT_MENU_FONT_SIZE, &yellow);
-
- i = 0;
- break;
- }
- }
-
- if(!stop)
- {
- SDL_BlitSurface( bkg, NULL, screen, NULL );
-
-// if (loc) SetupPaths(fileNames[loc]); else SetupPaths(NULL);
-
- start = loc - (loc % 8);
- for (i = start; i < MIN(start + 8,number_of_words); i++)
- {
- titleRects[i % 8].x = 320 - (titles[i]->w/2);
- if (i == loc)
- SDL_BlitSurface(select[loc], NULL, screen, &titleRects[i%8]);
- else
- SDL_BlitSurface(titles[i], NULL, screen, &titleRects[i%8]);
- }
-
- /* --- draw buttons --- */
-
- if (start > 0)
- SDL_BlitSurface( left, NULL, screen, &leftRect );
-
- if (start + 8 < number_of_words)
- SDL_BlitSurface(right, NULL, screen, &rightRect);
-
- SDL_UpdateRect(screen, 0, 0, 0 ,0);
- }
- //SDL_Delay(40);
- old_loc = loc;
- }
-
- /*FIXME: somehow when this is first saved, there is a space between
- each of the new words in the saved file. This is fixed upon reloading the
- word list*/
-
- /* Write changes to file, if possible: */
- fprintf(stderr, "In ChooseWord(), about to write changes\n");
- fp = fopen(fn,"w");
-
- if (fp)
- {
- fseek(fp, 0, SEEK_SET);
- fprintf(fp, "%s", str);
- i = 0;
-
- while(i < number_of_words)
- fprintf(fp, "%s\n", words_in_list[i++]);
-
- fclose(fp);
- fp = NULL;
- fprintf(stderr, "In ChooseWord(), changes written successfully\n");
- }
- else
- {
- fprintf(stderr, "In ChooseWord(), unable to open %s for writing\n", fn);
- }
-
- /* --- clear graphics before quitting --- */
- /* FIXME none of this is safe if any of the images is NULL */
- for (i = 0; i < MAX_WORD_LISTS; i++)
- {
- SDL_FreeSurface(titles[i]);
- SDL_FreeSurface(select[i]);
- }
-
- SDL_FreeSurface(bkg);
- SDL_FreeSurface(left);
- SDL_FreeSurface(right);
- bkg = NULL; /* the other pointers are going out of scope so we don't */
- /* have to worry about setting them to NULL */
-}
-
-
\ No newline at end of file
More information about the Tux4kids-commits
mailing list