From 26bc2ba7157c2a92248c1e8e8e24d6a2cb5d301e Mon Sep 17 00:00:00 2001 From: Bruno Coudoin Date: Mon, 28 Aug 2006 23:47:22 +0000 Subject: Continued the rework of the API. --- diff --git a/ChangeLog b/ChangeLog index c6424df..04a223f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,263 @@ +2006-08-29 Bruno coudoin + + Continued the rework of the API. + + * docs/C/python.xml: + * po/ChangeLog: + * po/POTFILES.in: + * po/tr.po: + * src/boards/advanced_colors.c: (start_board), (end_board), + (colors_next_level), (game_won), (ok_timeout): + * src/boards/algebra.c: (pause_board), (start_board), (end_board), + (timer_end), (algebra_next_level), (algebra_destroy_all_items), + (display_operand), (algebra_create_item), (item_event), (game_won): + * src/boards/algebra_guesscount.c: (start_board), (end_board), + (algebra_guesscount_next_level), (algebra_guesscount_create_item), + (game_won), (process_time): + * src/boards/animtest.c: (start_board): + * src/boards/awele.c: (start_board), (awele_next_level), + (awele_create_item), (game_won), (to_computer), + (updateCapturedBeans): + * src/boards/awele_alphaBeta.c: (think): + * src/boards/canal_lock.c: (canal_lock_next_level), (game_won), + (move_boat), (item_event): + * src/boards/chess.c: (chess_next_level), (game_won), + (display_white_turn), (display_info), (item_event): + * src/boards/click_on_letter.c: (start_board), (end_board), + (repeat), (sounds_are_fine), (click_on_letter_next_level), + (click_on_letter_create_item), (game_won), (process_ok_timeout), + (config_start): + * src/boards/clickgame.c: (clickgame_start), (clickgame_end), + (clickgame_next_level), (clickgame_move_item), (game_won), + (item_event): + * src/boards/clockgame.c: (start_board), (end_board), + (clockgame_next_level), (clockgame_create_item), (game_won), + (process_ok), (item_event): + * src/boards/colors.c: (colors_config_start), (start_board), + (end_board), (repeat), (game_won), (process_ok_timeout): + * src/boards/crane.c: (start_board), (bonus), (finished), + (select_item): + * src/boards/draw.c: (start_board), (create_item), + (item_event_resize), (item_event_move): + * src/boards/enumerate.c: (start_board), (enumerate_create_item), + (game_won), (item_event), (process_ok): + * src/boards/erase.c: (start_board), (end_board), + (erase_next_level), (bonus), (finished), (game_won): + * src/boards/fifteen.c: (fifteen_next_level), + (fifteen_create_item), (game_won), (test_win): + * src/boards/gletters.c: (level_set_score), (start_board), + (end_board), (key_press), (gletters_next_level), + (gletters_create_item), (player_win), (player_loose), + (gletter_config_start): + * src/boards/gtans.c: (start_board): + * src/boards/gtans_callbacks.c: + (on_wdrawareagrande_button_release_event): + * src/boards/gtans_interface.c: (create_mainwindow): + * src/boards/hanoi.c: (start_board), (hanoi_create_item), + (game_won), (item_event): + * src/boards/hanoi_real.c: (start_board), (hanoi_create_item), + (game_won), (item_event): + * src/boards/imageid.c: (start_board), (end_board), + (imageid_next_level), (imageid_create_item), (game_won), + (process_ok_timeout), (highlight_selected), (config_start): + * src/boards/leftright.c: (start_board), (end_board), + (leftright_next_level), (leftright_create_item), (game_won), + (process_ok_timeout): + * src/boards/machpuzzle.c: (minigolf_next_level), (game_won), + (minigolf_move): + * src/boards/magic_hat.c: (start_board), (process_ok), (finished), + (item_event): + * src/boards/maze.c: (start_board), (repeat), (maze_create_item), + (game_won), (draw_background), (twoDdisplay), (threeDdisplay): + * src/boards/memory.c: (start_board), (end_board), (create_item), + (player_win), (display_card), (check_win), (tux_play), + (sound_callback): + * src/boards/menu2.c: (menu_start), (menu_config), + (menu_create_item), (item_event), (set_content), + (create_info_area), (create_top), (display_welcome), + (menu_config_start): + * src/boards/missingletter.c: (start_board), (end_board), + (missing_letter_next_level), (missing_letter_create_item), + (game_won), (process_ok_timeout), (highlight_selected), + (config_start): + * src/boards/money.c: (money_next_level), (game_won), (process_ok): + * src/boards/money_widget.c: (money_widget_set_position): + * src/boards/paratrooper.c: (pause_board), (start_board), + (paratrooper_move_tux), (next_state): + * src/boards/planegame.c: (start_board), (end_board), + (planegame_next_level), (planegame_cloud_colision), + (planegame_create_item), (item_event): + * src/boards/py-mod-admin.c: (py_gc_board_config_start), + (py_gc_board_config_stop), (py_gc_db_profiles_list_get), + (py_gc_db_users_from_group_get), (py_gc_profile_set_current_user), + (py_gc_profile_get_current_user): + * src/boards/py-mod-bonus.c: (py_gc_bonus_display), + (py_gcompris_gc_bonus_end_display), + (python_gcompris_bonus_module_init): + * src/boards/py-mod-gcompris.c: (py_gc_set_background), + (py_gc_get_canvas), (py_gc_get_window), (py_gc_menu_section_get), + (py_gc_profile_get_current), (py_gc_profile_get_current_user), + (py_gc_board_config_window_display), (py_gcompris_textview), + (py_gc_profile_get_current_user_dirname), (py_gc_im_reset), + (python_gcompris_module_init): + * src/boards/py-mod-score.c: (py_gc_score_start), + (py_gc_score_end), (py_gc_score_set), + (python_gc_score_module_init): + * src/boards/py-mod-score.h: + * src/boards/py-mod-skin.c: (py_gc_skin_image_get), + (py_gc_skin_pixmap_load), (py_gc_skin_get_color_default), + (py_gc_skin_get_font_default), (py_gc_skin_get_color), + (py_gc_skin_get_font), (python_gc_skin_module_init): + * src/boards/py-mod-skin.h: + * src/boards/py-mod-sound.c: (py_gc_sound_play_ogg_list), + (py_gc_sound_play_ogg), (py_gc_sound_reopen), (py_gc_sound_close), + (py_gc_sound_pause), (py_gc_sound_resume), + (py_gc_sound_play_ogg_cb): + * src/boards/py-mod-timer.c: (py_gc_timer_display), + (py_gc_timer_add), (py_gc_timer_end), (py_gc_timer_get_remaining), + (py_gc_timer_pause), (python_gc_timer_module_init): + * src/boards/py-mod-timer.h: + * src/boards/python.c: (pythongc_board_config_start), + (pythongc_board_config_stop): + * src/boards/railroad.c: (start_board), (end_board), + (railroad_next_level), (game_won), (process_ok), (animate_model): + * src/boards/read_colors.c: (start_board), (end_board), + (read_colors_next_level), (game_won), (process_ok_timeout): + * src/boards/reading.c: (start_board), (display_what_to_do), + (reading_create_item), (ask_ready), (ask_yes_no), (player_win), + (player_loose), (reading_config_start): + * src/boards/reversecount.c: (pause_board), (process_error), + (reversecount_next_level), (reversecount_destroy_all_items), + (game_won), (animate_tux): + * src/boards/shapegame.c: (start_board), (increment_sublevel), + (process_ok), (shapegame_init_canvas), + (add_shape_to_list_of_shapes), (shape_goes_back_to_list), + (item_event), (item_event_edition), (create_title), + (add_xml_shape_to_data), (config_start): + * src/boards/smallnumbers.c: (start_board), (end_board), + (smallnumbers_next_level), (smallnumbers_create_item), + (player_win), (player_loose), (smallnumber_config_start): + * src/boards/submarine.c: (start_board), (submarine_create_item), + (update_timeout_slow), (game_won), (ok_timeout), + (submarine_explosion): + * src/boards/superbrain.c: (process_ok), (superbrain_next_level), + (game_won): + * src/boards/target.c: (start_board), (display_windspeed), + (target_create_item), (game_won), (process_ok), (request_score): + * src/boards/traffic.c: (start_board), (end_board), + (traffic_next_level), (game_won), (car_cb): + * src/boards/wordprocessor.c: (start_board), + (display_style_buttons): + * src/boards/wordsgame.c: (start_board), (end_board), (key_press), + (wordsgame_next_level), (wordsgame_create_item), (player_win), + (player_loose): + * src/gcompris/about.c: (gc_about_start), (move_plane): + * src/gcompris/anim.c: (gc_anim_load), (gc_anim_activate), + (gc_anim_swap), (gc_anim_deactivate), (gc_anim_free), + (gc_anim_set_state), (anim_tick): + * src/gcompris/bar.c: (gc_bar_start), (gc_bar_set_level), + (gc_bar_set), (update_exit_button), (bar_play_sound), + (item_event_bar): + * src/gcompris/board.c: (gc_board_get_current_board_plugin), + (gc_board_get_current), (gc_board_set_current), (board_play), + (board_pause), (board_stop), (board_run_next_end), + (board_run_next): + * src/gcompris/board.h: + * src/gcompris/board_config.c: (gc_board_config_start), + (gc_board_config_stop), (check_key), (gc_board_conf_close), + (_response_board_conf), (_conf_window_configured), + (gc_board_config_window_display), + (gc_board_conf_boolean_box_toggled), (gcompris_boolean_box), + (create_radio_buttons), (destroy_hash), (gcompris_radio_buttons), + (spin_changed), (gcompris_spin_int), (gcompris_separator), + (gcompris_textview_yes), (gcompris_textview): + * src/gcompris/board_config.h: + * src/gcompris/bonus.c: (end_gc_bonus_end_display), + (gc_bonus_end_display), (gc_bonus_display), (bonus_image), + (end_bonus): + * src/gcompris/bonus.h: + * src/gcompris/config.c: (gc_config_start), (gc_config_stop), + (gc_locale_get_name), (display_previous_next), (set_locale_flag), + (get_next_locale), (get_previous_locale), (item_event_ok): + * src/gcompris/dialog.c: (gc_dialog): + * src/gcompris/file_selector.c: (gc_selector_file_stop), + (display_file_selector), (display_files): + * src/gcompris/gameutil.c: (gc_difficulty_display), + (gc_file_find_absolute), (gc_util_create_rootdir): + * src/gcompris/gameutil.h: + * src/gcompris/gc_core.h: + * src/gcompris/gcompris.c: (gc_close_all_dialog), + (board_widget_key_press_callback), (gc_get_canvas), + (gc_get_window), (gc_set_background), (setup_window), + (gc_board_end), (gc_canvas_item_grab), (gc_canvas_item_ungrab), + (cleanup), (gc_terminate), (load_properties), (gc_locale_get), + (gc_locale_get_user_default), (gc_locale_set), (gc_log_handler), + (gc_init): + * src/gcompris/gcompris.h: + * src/gcompris/gcompris_alphabeta.c: (gc_alphabeta): + * src/gcompris/gcompris_alphabeta.h: + * src/gcompris/gcompris_config.h: + * src/gcompris/gcompris_confirm.c: (gc_confirm_box_stop), + (display_confirm), (set_content): + * src/gcompris/gcompris_db.c: (gc_db_init), (gc_db_exit), + (gc_db_set_date), (gc_db_set_version), (gc_db_check_boards), + (gc_db_board_update), (gc_db_read_board_from_section), + (gc_db_get_board_id), (gc_db_remove_board), + (gc_db_profile_from_name_get), (gc_db_get_profile), + (gc_db_users_from_group_get), (gc_db_conf_with_table_get), + (gcompris_get_conf), (gcompris_get_board_conf), + (gc_db_profiles_list_get), (gcompris_get_group_from_id), + (gcompris_get_groups_list), (gc_db_is_activity_in_profile): + * src/gcompris/gcompris_db.h: + * src/gcompris/gcompris_files.c: (gcompris_get_user_dirname), + (gc_profile_get_current_user_dirname), + (gcompris_get_board_dirname), (gcompris_get_current_board_dirname): + * src/gcompris/gcompris_files.h: + * src/gcompris/gcompris_im.c: (gc_im_init), (gc_im_reset), + (im_context_commit_callback), (im_context_preedit_callback), + (window_focus_callback): + * src/gcompris/gcompris_im.h: + * src/gcompris/help.c: (gc_help_start), (select_item): + * src/gcompris/images_selector.c: (gc_selector_images_start), + (gc_selector_images_stop): + * src/gcompris/log.c: (gc_log_end): + * src/gcompris/main.c: (main): + * src/gcompris/menu.c: (_add_xml_to_data), (gc_menu_section_get), + (boardlist_compare_func), (gc_menu_has_activity), + (gc_menu_getlist), (gc_menu_load_dir), (gc_menu_load): + * src/gcompris/profile.c: (gc_profile_get_current), + (gc_profile_set_current_user), (gc_profile_get_current_user): + * src/gcompris/profile.h: + * src/gcompris/properties.c: (scan_get_int), (scan_get_string), + (gc_prop_user_root_directory_get), (gc_prop_config_file_get), + (gc_prop_default_database_name_get), (gc_prop_new), + (gc_prop_destroy), (gc_prop_save), (gc_setenv): + * src/gcompris/properties.h: + * src/gcompris/score.c: (gc_score_start), (gc_score_end), + (gc_score_set), (display_number): + * src/gcompris/score.h: + * src/gcompris/skin.c: (gc_skin_image_get), (gc_skin_pixmap_load), + (gc_skin_free_string), (gc_skin_setup_vars), + (gc_skin_str_to_color), (skin_xml_load), (gc_skin_load), + (gc_skin_free), (gc_skin_get_color_default), + (gc_skin_get_gdkcolor_default), (gc_skin_get_font_default), + (gc_skin_get_number_default): + * src/gcompris/skin.h: + * src/gcompris/soundutil.c: (gc_sound_init), (gc_sound_close), + (gc_sound_reopen), (gc_sound_pause), (gc_sound_resume), + (gc_sound_policy_set), (gc_sound_policy_get), (scheduler_bgnd), + (scheduler), (thread_play_ogg), (get_next_sound_to_play), + (gc_sound_play_ogg_cb), (gc_sound_play_ogg), + (gc_sound_play_ogg_list), (gc_sound_alphabet), (gc_sound_callback), + (gc_sound_instance_init), (gc_sound_class_init), + (gc_sound_get_type): + * src/gcompris/soundutil.h: + * src/gcompris/timer.c: (gc_timer_display), (gc_timer_add), + (gc_timer_end), (gc_timer_pause), (gc_timer_get_remaining), + (start_animation), (display_time_ellapsed), (subtimer_increment), + (timer_increment): + * src/gcompris/timer.h: + 2006-08-23 Bruno coudoin - fixed bug#352350 Some typos in the PO file diff --git a/docs/C/python.xml b/docs/C/python.xml index c17584f..00c8d2a 100644 --- a/docs/C/python.xml +++ b/docs/C/python.xml @@ -43,7 +43,7 @@ xsltproc -o python.html http://docbook.sourceforge.net/release/xsl/current/html/ Notes about this wrapper -Generaly speaking, all C gcompris_xxx functions are wrapped to a +Generaly speaking, all C gc_xxx functions are wrapped to a corresponding gcompris.xxx function; parameters and return types remains the same. Some structures have also been wrapped. See below particular notes about this. @@ -196,7 +196,7 @@ attribute is readeable and/or writable. gcompris.set_background(gnomeCanvasGroup, file) - GnomeCanvasItem *gcompris_set_background(GnomeCanvasGroup *parent, gchar *file) + GnomeCanvasItem *gc_set_background(GnomeCanvasGroup *parent, gchar *file) return a gnome.canvas.CanvasItem object @@ -221,12 +221,12 @@ attribute is readeable and/or writable. gcompris.get_canvas() - GnomeCanvas* gcompris_get_canvas() + GnomeCanvas* gc_get_canvas() return a gnome.canvas.Canvas gcompris.get_window() - GtkWidget* gcompris_get_window(void) + GtkWidget* gc_get_window(void) return a gtk.Widget @@ -261,12 +261,12 @@ attribute is readeable and/or writable. gcompris.log_set_reason (gcomprisBoard, expected, got) - gcompris_log_set_reason (GcomprisBoard *gcomprisBoard, gchar *expected, gchar *got) + gc_log_set_reason (GcomprisBoard *gcomprisBoard, gchar *expected, gchar *got) gcompris.log_end (gcomprisBoard, status) - gcompris_log_end (GcomprisBoard *gcomprisBoard, gchar *status) + gc_log_end (GcomprisBoard *gcomprisBoard, gchar *status) @@ -473,17 +473,17 @@ attribute is readeable and/or writable. gcompris.utils.image_to_skin(imagename) - gchar *gcompris_image_to_skin(gchar *imagename) + gchar *gc_skin_image_get(gchar *imagename) return a string gcompris.utils.load_skin_pixmap(pixmapfile) - GdkPixbuf *gcompris_load_skin_pixmap(char *pixmapfile) + GdkPixbuf *gcompris_skin_pixmap_load(char *pixmapfile) return a gtk.gdk.Pixbuf gcompris.utils.load_pixmap(pixmapfile) - GdkPixbuf *gcompris_load_pixmap(char *pixmapfile) + GdkPixbuf *gc_pixmap_load(char *pixmapfile) return a gtk.gdk.Pixbuf @@ -561,12 +561,12 @@ attribute is readeable and/or writable. gcompris.bonus.display(BonusStatusList, BonusList) - void gcompris_display_bonus(BonusStatusList, BonusList) + void gc_bonus_display(BonusStatusList, BonusList) gcompris.bonus.board_finished(BoardFinishedList) - void board_finished(BoardFinishedList) + void gc_bonus_end_display(BoardFinishedList) @@ -620,8 +620,6 @@ attribute is readeable and/or writable. BONUS_TUX gcompris.bonus.GNU BONUS_TUX - gcompris.bonus.LAST - BONUS_LAST @@ -646,8 +644,6 @@ attribute is readeable and/or writable. BOARD_FINISHED_TUXLOCO gcompris.bonus.FINISHED_TOOMANYERRORS BOARD_FINISHED_TOOMANYERRORS - gcompris.bonus.FINISHED_LAST - BOARD_FINISHED_LAST @@ -670,17 +666,17 @@ attribute is readeable and/or writable. gcompris.score.start(style, x, y, max) - void gcompris_score_start(ScoreStyleList style, guint x, guint y, guint max) + void gc_score_start(ScoreStyleList style, guint x, guint y, guint max) gcompris.score.end() - void gcompris_score_end() + void gc_score_end() gcompris.score.set(value) - void gcompris_score_set(guint value) + void gc_score_set(guint value) @@ -704,8 +700,6 @@ attribute is readeable and/or writable. SCORESTYLE_NOTE gcompris.score.STYLE_LIFE SCORESTYLE_LIFE - gcompris.score.LAST - SCORE_LAST @@ -728,14 +722,19 @@ attribute is readeable and/or writable. gcompris.sound.play_ogg_list(list) - void gcompris_play_ogg_list( GList* files ) + void gc_sound_play_ogg_list( GList* files ) The list argument is a GList gcompris.sound.play_ogg(list) - void gcompris_play_ogg(char *, ...) + void gc_sound_play_ogg(char *, ...) The list argument is a python list containing strings + + gcompris.sound.play_ogg_cb(list) + void gc_sound_play_ogg_cb((const gchar *file, GcomprisSoundCallback cb) + The list argument is a python string and a function callback. It will be called once the sound has been played. + @@ -771,22 +770,22 @@ attribute is readeable and/or writable. gcompris.timer.add(second) - void gcompris_timer_add(int second) + void gc_timer_add(int second) gcompris.timer.end() - void gcompris_timer_end(void) + void gc_timer_end(void) gcompris.timer.get_remaining() - guint gcompris_timer_get_remaining() + guint gc_timer_get_remaining() Return an integer gcompris.timer.pause(pause) - void gcompris_timer_pause(gboolean pause) + void gc_timer_pause(gboolean pause) @@ -873,7 +872,7 @@ attribute is readeable and/or writable. gcompris.anim.CanvasItem.setState(int) - gcompris_set_anim_state(GcomprisAnimCanvasItem*, int) + gc_anim_set_state(GcomprisAnimCanvasItem*, int) diff --git a/src/boards/advanced_colors.c b/src/boards/advanced_colors.c index 5f53505..c41eb60 100644 --- a/src/boards/advanced_colors.c +++ b/src/boards/advanced_colors.c @@ -136,7 +136,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gcomprisBoard->number_of_sublevel = 8; gc_bar_set(GC_BAR_LEVEL); - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -159,7 +159,7 @@ static void end_board () { if(gcomprisBoard!=NULL){ pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); colors_destroy_all_items(); // free list while (g_list_length(listColors) > 0) @@ -205,7 +205,7 @@ static void colors_next_level() { colors_destroy_all_items(); gamewon = FALSE; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); gc_bar_set_level(gcomprisBoard); /* initialize board only once*/ @@ -227,7 +227,7 @@ static void colors_next_level() { /* set background */ str = g_strdup_printf("%s/%s", gcomprisBoard->boarddir, backgroundFile); g_warning("background = %s\n", str); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), str); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), str); g_free(str); } @@ -237,7 +237,7 @@ static void colors_next_level() { color_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", colors[GPOINTER_TO_INT(g_list_nth_data(listColors,0))], - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) (color_x1+color_x2)/2, "y", (double) (color_y1+color_y2)/2, "anchor", GTK_ANCHOR_CENTER, @@ -324,7 +324,7 @@ static void game_won() { gcomprisBoard->level++; gcomprisBoard->sublevel = 1; if (gcomprisBoard->level > gcomprisBoard->maxlevel) { - board_finished(BOARD_FINISHED_TUXLOCO); + gc_bonus_end_display(BOARD_FINISHED_TUXLOCO); return; } @@ -340,7 +340,7 @@ static void game_won() { * =====================================================================*/ static gboolean ok_timeout() { g_warning("+++ ok_timeout errors = %d\n", errors); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); if (!gamewon) errors--; if (errors <1) @@ -348,7 +348,7 @@ static gboolean ok_timeout() { update_clock(); if (errors <= 1) { - board_finished(BOARD_FINISHED_TOOMANYERRORS); + gc_bonus_end_display(BOARD_FINISHED_TOOMANYERRORS); } return FALSE; diff --git a/src/boards/algebra.c b/src/boards/algebra.c index 7f39f97..d7e6c28 100644 --- a/src/boards/algebra.c +++ b/src/boards/algebra.c @@ -133,13 +133,13 @@ static void pause_board (gboolean pause) return; /* Make the timer follow our pause status */ - gcompris_timer_pause(pause); + gc_timer_pause(pause); if(gamewon == TRUE && pause == FALSE) /* the game is won */ algebra_next_level(); if(leavenow == TRUE && pause == FALSE) - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); board_paused = pause; } @@ -156,14 +156,14 @@ static void start_board (GcomprisBoard *agcomprisBoard) /* disable im_context */ gcomprisBoard->disable_im_context = TRUE; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery2_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery2_background.png"); /* set initial values for this level */ gcomprisBoard->level=1; gcomprisBoard->maxlevel=9; gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel=10; /* Go to next level after this number of 'play' */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -200,7 +200,7 @@ end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); algebra_destroy_all_items(); } gcomprisBoard = NULL; @@ -338,7 +338,7 @@ static void timer_end() gamewon = FALSE; leavenow = TRUE; algebra_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } @@ -347,7 +347,7 @@ static void algebra_next_level() { gc_bar_set_level(gcomprisBoard); - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); algebra_destroy_all_items(); @@ -359,7 +359,7 @@ static void algebra_next_level() NULL)); maxtime = 20; - gcompris_timer_display(TIMER_X, TIMER_Y, + gc_timer_display(TIMER_X, TIMER_Y, GCOMPRIS_TIMER_BALLOON, maxtime, timer_end); /* Try the next level */ @@ -380,7 +380,7 @@ static void algebra_destroy_all_items() GnomeCanvasItem *item; gboolean stop = FALSE; - gcompris_timer_end(); + gc_timer_end(); while(g_list_length(item_list)>0) { @@ -439,7 +439,7 @@ static void display_operand(GnomeCanvasGroup *parent, item = gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", &operand, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "anchor", GTK_ANCHOR_CENTER, "x", x_align-((strlen(operand_str)-i)*NUMBERSWIDTH), "y", y, @@ -452,7 +452,7 @@ static void display_operand(GnomeCanvasGroup *parent, focus_item = gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", "_", - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "anchor", GTK_ANCHOR_CENTER, "x", x_align-((strlen(operand_str)-i)*NUMBERSWIDTH), "y", y, @@ -464,7 +464,7 @@ static void display_operand(GnomeCanvasGroup *parent, bad_item = gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", "/", - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "anchor", GTK_ANCHOR_CENTER, "x", x_align-((strlen(operand_str)-i)*NUMBERSWIDTH), "y", y, @@ -552,7 +552,7 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) item = gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", currentOperation, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", x, "y", y, "anchor", GTK_ANCHOR_CENTER, @@ -564,7 +564,7 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) item = gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", "=", - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", x_align + NUMBERSWIDTH*(strlen(second_operand_str)+1), "y", y, "anchor", GTK_ANCHOR_CENTER, @@ -605,12 +605,12 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) gchar *str2 = NULL; if(strlen(first_operand_str)==1) - str1 = gcompris_alphabet_sound(first_operand_str); + str1 = gc_sound_alphabet(first_operand_str); else str1 = g_strdup_printf("%s.ogg", first_operand_str); if(strlen(second_operand_str)==1) - str2 = gcompris_alphabet_sound(second_operand_str); + str2 = gc_sound_alphabet(second_operand_str); else str2 = g_strdup_printf("%s.ogg", second_operand_str); @@ -620,7 +620,7 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) first_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1); second_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str2); - gcompris_play_ogg(first_operand_str, audioOperand , second_operand_str, "sounds/$LOCALE/misc/equal.ogg", NULL); + gc_sound_play_ogg(first_operand_str, audioOperand , second_operand_str, "sounds/$LOCALE/misc/equal.ogg", NULL); g_free(str1); g_free(str2); @@ -708,7 +708,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) currentToBeFoundItem=toBeFoundItem; - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); break; default: @@ -814,13 +814,13 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } gamewon = TRUE; algebra_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); init_operation(); return; } diff --git a/src/boards/algebra_guesscount.c b/src/boards/algebra_guesscount.c index e0619a6..d5efedf 100644 --- a/src/boards/algebra_guesscount.c +++ b/src/boards/algebra_guesscount.c @@ -205,12 +205,12 @@ static void start_board (GcomprisBoard *agcomprisBoard) { button_pixmap = gc_pixmap_load(str); g_free(str); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),"gcompris/animals/tiger1_by_Ralf_Schmode.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas),"gcompris/animals/tiger1_by_Ralf_Schmode.jpg"); gcomprisBoard->level=1; gcomprisBoard->maxlevel=NUMBER_OF_LEVELS; gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS; /* Go to next level after this number of 'play' */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, 50, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -228,7 +228,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { static void end_board () { if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); destroy_board(); algebra_guesscount_destroy_all_items(); } @@ -265,7 +265,7 @@ static void algebra_guesscount_next_level() { gamewon = FALSE; token_count = 0; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); /* Try the next level */ algebra_guesscount_create_item(gnome_canvas_root(gcomprisBoard->canvas)); @@ -414,7 +414,7 @@ static GnomeCanvasItem *algebra_guesscount_create_item(GnomeCanvasGroup *parent) calcul_line_item_back[i*2] = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", BLANK, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) X_EQUAL+BUTTON_WIDTH*1.5 + 1, "y", (double) y_equal_offset[i]+BUTTON_HEIGHT/2 + 1, "anchor", GTK_ANCHOR_CENTER, @@ -423,7 +423,7 @@ static GnomeCanvasItem *algebra_guesscount_create_item(GnomeCanvasGroup *parent) calcul_line_item[i*2] = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", BLANK, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) X_EQUAL+BUTTON_WIDTH*1.5, "y", (double) y_equal_offset[i]+BUTTON_HEIGHT/2, "anchor", GTK_ANCHOR_CENTER, @@ -435,7 +435,7 @@ static GnomeCanvasItem *algebra_guesscount_create_item(GnomeCanvasGroup *parent) calcul_line_item_back[i*2+1] = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", BLANK, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) X_NUM1+BUTTON_WIDTH/2 + 1, "y", (double) y_equal_offset[i+1]+BUTTON_HEIGHT/2 + 1, "anchor", GTK_ANCHOR_CENTER, @@ -444,7 +444,7 @@ static GnomeCanvasItem *algebra_guesscount_create_item(GnomeCanvasGroup *parent) calcul_line_item[i*2+1] = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", BLANK, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) X_NUM1+BUTTON_WIDTH/2, "y", (double) y_equal_offset[i+1]+BUTTON_HEIGHT/2, "anchor", GTK_ANCHOR_CENTER, @@ -477,7 +477,7 @@ static GnomeCanvasItem *algebra_guesscount_create_item(GnomeCanvasGroup *parent) result_item_back = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", str, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) xOffset+BUTTON_WIDTH +1, "y", (double) Y_OPE+BUTTON_HEIGHT/2 +1, "anchor", GTK_ANCHOR_CENTER, @@ -486,7 +486,7 @@ static GnomeCanvasItem *algebra_guesscount_create_item(GnomeCanvasGroup *parent) result_item_front = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", str, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) xOffset+BUTTON_WIDTH, "y", (double) Y_OPE+BUTTON_HEIGHT/2, "anchor", GTK_ANCHOR_CENTER, @@ -542,10 +542,10 @@ static void game_won() { gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { - board_finished(BOARD_FINISHED_TUXPLANE); + gc_bonus_end_display(BOARD_FINISHED_TUXPLANE); return; } - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),background_images[gcomprisBoard->level-1]); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas),background_images[gcomprisBoard->level-1]); } algebra_guesscount_next_level(); } @@ -561,7 +561,7 @@ static void process_time(){ gtk_timeout_remove (process_time_id); process_time_id = 0; } - gcompris_display_bonus(gamewon, BONUS_RANDOM); + gc_bonus_display(gamewon, BONUS_RANDOM); } /* ==================================== */ static int oper_char_to_pixmap_index(char oper) { diff --git a/src/boards/animtest.c b/src/boards/animtest.c index 249e2b5..32376ae 100644 --- a/src/boards/animtest.c +++ b/src/boards/animtest.c @@ -66,15 +66,15 @@ static void start_board(GcomprisBoard *b) if(b != NULL) { board = b; - gcompris_set_background(gnome_canvas_root(board->canvas), "leftright/leftright-bg.jpg"); + gc_set_background(gnome_canvas_root(board->canvas), "leftright/leftright-bg.jpg"); board->level = 1; board->maxlevel=1; board->sublevel=1; board->number_of_sublevel=1; - gcompris_score_start(SCORESTYLE_NOTE, 10, 50, board->number_of_sublevel); + gc_score_start(SCORESTYLE_NOTE, 10, 50, board->number_of_sublevel); gc_bar_set(GC_BAR_LEVEL); gc_bar_set_level(board); - gcompris_score_set(board->sublevel); + gc_score_set(board->sublevel); animation = gc_anim_load( "animtest/test.txt" ); anim_item = (GnomeCanvasItem*) diff --git a/src/boards/awele.c b/src/boards/awele.c index 9d40dfe..66a3c07 100644 --- a/src/boards/awele.c +++ b/src/boards/awele.c @@ -139,7 +139,7 @@ start_board (GcomprisBoard * agcomprisBoard) gcomprisBoard->number_of_sublevel = 1; /* Go to next level after * this number of 'play' */ - str = gcompris_image_to_skin("button_reload.png"); + str = gc_skin_image_get("button_reload.png"); pixmap = gc_pixmap_load(str); g_free(str); if(pixmap) { @@ -240,8 +240,8 @@ awele_next_level () { gchar *img; - img = gcompris_image_to_skin ("gcompris-bg.jpg"); - gcompris_set_background (gnome_canvas_root (gcomprisBoard->canvas), + img = gc_skin_image_get ("gcompris-bg.jpg"); + gc_set_background (gnome_canvas_root (gcomprisBoard->canvas), img); g_free(img); @@ -350,21 +350,21 @@ awele_create_item (GnomeCanvasGroup * parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("NORTH"), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) x + 1, "y", (double) y + 1, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("NORTH"), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) x, "y", (double) y, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); x = 765; @@ -372,21 +372,21 @@ awele_create_item (GnomeCanvasGroup * parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("SOUTH"), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) x + 1, "y", (double) y + 1, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("SOUTH"), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) x, "y", (double) y, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); } @@ -587,7 +587,7 @@ game_won () // finished // : bail // out - board_finished (BOARD_FINISHED_RANDOM); + gc_bonus_end_display (BOARD_FINISHED_RANDOM); return; } @@ -684,7 +684,7 @@ static gboolean to_computer(gpointer data) /* Human player win by catching all the beans left. */ gamewon = TRUE; sublevel_finished = TRUE; - gcompris_display_bonus(TRUE, BONUS_FLOWER); + gc_bonus_display(TRUE, BONUS_FLOWER); } } else { /* computer can't play. Why? human is hungry and i cannot give it @@ -693,7 +693,7 @@ static gboolean to_computer(gpointer data) /* if not, all staying are captured by computer and computer win */ gamewon = TRUE; sublevel_finished = (staticAwale->CapturedBeans[HUMAN] == 24); - gcompris_display_bonus(sublevel_finished, BONUS_FLOWER); + gc_bonus_display(sublevel_finished, BONUS_FLOWER); } timeout = 0; @@ -903,7 +903,7 @@ updateCapturedBeans () { gamewon = TRUE; sublevel_finished = (i==0); - gcompris_display_bonus(sublevel_finished, BONUS_FLOWER); + gc_bonus_display(sublevel_finished, BONUS_FLOWER); } } } diff --git a/src/boards/awele_alphaBeta.c b/src/boards/awele_alphaBeta.c index 050f787..418856b 100644 --- a/src/boards/awele_alphaBeta.c +++ b/src/boards/awele_alphaBeta.c @@ -163,15 +163,15 @@ short int think( AWALE *static_awale, short int level){ break; } - value = gcompris_alphabeta( TRUE, - t, - use_eval, - &best, - (FirstChildGameFunction) firstChild, - (NextSiblingGameFunction) nextSibling, - -INFINI , - INFINI, - maxprof) ; + value = gc_alphabeta( TRUE, + t, + use_eval, + &best, + (FirstChildGameFunction) firstChild, + (NextSiblingGameFunction) nextSibling, + -INFINI , + INFINI, + maxprof) ; if (best < 0){ g_warning("Leaf node, game is over"); diff --git a/src/boards/canal_lock.c b/src/boards/canal_lock.c index 418e8fe..c43a12f 100644 --- a/src/boards/canal_lock.c +++ b/src/boards/canal_lock.c @@ -229,7 +229,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard) static void canal_lock_next_level() { - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "canal_lock/canal_lock_bg.png"); gc_bar_set_level(gcomprisBoard); @@ -447,10 +447,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } canal_lock_next_level(); } @@ -492,7 +492,7 @@ static void move_boat() else { /* No possible move */ - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); animation = FALSE; return; } @@ -721,7 +721,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) if(lock_water_low && canallock_right_up) toggle_lock(item); else - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); } else if(item == lock_right_item) @@ -729,21 +729,21 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) if(!lock_water_low && canallock_left_up) toggle_lock(item); else - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); } else if(item == canallock_left_item && canallock_right_up) { if(lock_right_up) toggle_lock(item); else - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); } else if(item == canallock_right_item && canallock_left_up) { if(lock_left_up) toggle_lock(item); else - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); } else if(item == tuxboat_item) { @@ -751,7 +751,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) } else { - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); } break; default: @@ -763,7 +763,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) /* gamewon = TRUE; canal_lock_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); */ return FALSE; } diff --git a/src/boards/chess.c b/src/boards/chess.c index de87657..0992b51 100644 --- a/src/boards/chess.c +++ b/src/boards/chess.c @@ -300,8 +300,8 @@ static void chess_next_level() register gshort rank; gchar *img; - img = gcompris_image_to_skin("gcompris-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -543,10 +543,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } chess_next_level(); } @@ -560,11 +560,11 @@ static void display_white_turn(gboolean whiteturn) turn_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", " ", - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) TURN_X, "y", (double) TURN_Y, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); } @@ -581,11 +581,11 @@ static void display_info(gchar *info) info_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", " ", - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) INFO_X, "y", (double) INFO_Y, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_subtitle, + "fill_color_rgba", gc_skin_color_subtitle, NULL); } @@ -826,7 +826,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) fleur = gdk_cursor_new(GDK_FLEUR); gnome_canvas_item_raise_to_top(item); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -896,7 +896,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) gnome_canvas_item_move(item, ofset_x, ofset_y); } - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; position_display(position); diff --git a/src/boards/click_on_letter.c b/src/boards/click_on_letter.c index 2689805..e81b510 100644 --- a/src/boards/click_on_letter.c +++ b/src/boards/click_on_letter.c @@ -157,12 +157,12 @@ static void start_board (GcomprisBoard *agcomprisBoard) ready = sounds_are_fine(); - gcompris_pause_sound(); + gc_sound_pause(); if (agcomprisBoard!=NULL) { gcomprisBoard=agcomprisBoard; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery4_background.png"); gcomprisBoard->level=1; gcomprisBoard->maxlevel=NUMBER_OF_LEVELS; @@ -175,7 +175,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { /* Warning, bar buttons are set in click_on_letter_next_level() to avoid them to appear in the case a dialog is displayed */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, 50, 50, gcomprisBoard->number_of_sublevel); @@ -195,12 +195,12 @@ static void end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); click_on_letter_destroy_all_items(); } gcompris_reset_locale(); gcomprisBoard = NULL; - gcompris_resume_sound(); + gc_sound_resume(); } /* ======================================= */ @@ -238,13 +238,13 @@ static void repeat () gchar *str1 = NULL; gchar *right_letter_ogg = NULL; - str1 = gcompris_alphabet_sound(right_letter); + str1 = gc_sound_alphabet(right_letter); right_letter_ogg = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1); g_free(str1); if(right_letter_ogg) { - gcompris_play_ogg_cb(right_letter_ogg, sound_played); + gc_sound_play_ogg_cb(right_letter_ogg, sound_played); } g_free(right_letter_ogg); @@ -269,7 +269,7 @@ static gboolean sounds_are_fine() gchar *letter = g_new0(gchar, 8); g_unichar_to_utf8(g_utf8_get_char(alphabet), letter); - letter_str = gcompris_alphabet_sound(letter); + letter_str = gc_sound_alphabet(letter); g_free(letter); str2 = gc_file_find_absolute("sounds/$LOCALE/alphabet/%s", letter_str); @@ -323,10 +323,10 @@ click_on_letter_next_level() click_on_letter_destroy_all_items(); gamewon = FALSE; selected_button = NULL; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); g_free (right_letter); /* Try the next level */ - gcompris_play_ogg("sounds/$LOCALE/misc/click_on_letter.ogg", NULL); + gc_sound_play_ogg("sounds/$LOCALE/misc/click_on_letter.ogg", NULL); click_on_letter_create_item(gnome_canvas_root(gcomprisBoard->canvas)); } /* ==================================== */ @@ -423,7 +423,7 @@ static GnomeCanvasItem *click_on_letter_create_item(GnomeCanvasGroup *parent) l_items[i] = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", letters[i], - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "anchor", GTK_ANCHOR_CENTER, "fill_color_rgba", 0x0000ffff, "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2, @@ -453,7 +453,7 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_TUXPLANE); + gc_bonus_end_display(BOARD_FINISHED_TUXPLANE); return; } } @@ -462,7 +462,7 @@ static void game_won() /* ==================================== */ static gboolean process_ok_timeout() { - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); return FALSE; } @@ -627,7 +627,7 @@ config_start(GcomprisBoard *agcomprisBoard, agcomprisBoard->name, aProfile ? aProfile->name : ""); - gcompris_configuration_window(label, conf_ok); + gc_board_config_window_display(label, conf_ok); g_free(label); diff --git a/src/boards/clickgame.c b/src/boards/clickgame.c index 41b4d9f..3be4e58 100644 --- a/src/boards/clickgame.c +++ b/src/boards/clickgame.c @@ -201,7 +201,7 @@ static void clickgame_start (GcomprisBoard *agcomprisBoard) gcomprisBoard->level = 1; gcomprisBoard->maxlevel=6; gcomprisBoard->number_of_sublevel=10; /* Go to next level after this number of 'play' */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -221,7 +221,7 @@ clickgame_end () if(gcomprisBoard!=NULL) { clickgame_pause(TRUE); - gcompris_score_end(); + gc_score_end(); clickgame_destroy_all_items(); gcomprisBoard->level = 1; // Restart this game to zero } @@ -276,27 +276,27 @@ static void clickgame_next_level() switch(gcomprisBoard->level) { case 1: - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "clickgame/nur00523.jpg"); break; case 2: - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "clickgame/nur03006.jpg"); break; case 3: - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "clickgame/nur03011.jpg"); break; case 4: - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "clickgame/nur03010.jpg"); break; case 5: - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "clickgame/nur03013.jpg"); break; default: - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "clickgame/nur03505.jpg"); } @@ -308,7 +308,7 @@ static void clickgame_next_level() /* Make the images tend to 0.5 ratio */ imageZoom=0.5+(0.5/(gcomprisBoard->level)); gcomprisBoard->sublevel=0; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); } @@ -349,14 +349,14 @@ static void clickgame_move_item(FishItem *fishitem) { if(x1>gcomprisBoard->width) { item2del_list = g_list_append (item2del_list, fishitem); - gcompris_play_ogg ("crash", NULL); + gc_sound_play_ogg ("crash", NULL); } } else { if(x2<0) { item2del_list = g_list_append (item2del_list, fishitem); - gcompris_play_ogg ("crash", NULL); + gc_sound_play_ogg ("crash", NULL); } } @@ -553,10 +553,10 @@ static void game_won() gcomprisBoard->sublevel=0; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } clickgame_next_level(); } @@ -592,7 +592,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, FishItem *fishitem) y = item_y; fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -603,15 +603,15 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, FishItem *fishitem) else { clickgame_destroy_item(fishitem); - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); gcomprisBoard->sublevel++; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); if(gcomprisBoard->sublevel>=gcomprisBoard->number_of_sublevel) { gamewon = TRUE; clickgame_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); return FALSE; } /* Drop a new item now to speed up the game */ @@ -677,7 +677,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, FishItem *fishitem) case GDK_BUTTON_RELEASE: if(dragging) { - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; } break; diff --git a/src/boards/clockgame.c b/src/boards/clockgame.c index 6eaffc3..eac8802 100644 --- a/src/boards/clockgame.c +++ b/src/boards/clockgame.c @@ -133,8 +133,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gchar *img; gcomprisBoard=agcomprisBoard; - img = gcompris_image_to_skin("clockgame-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("clockgame-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -147,7 +147,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->maxlevel=6; gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel=3; /* Go to next level after this number of 'play' */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -170,7 +170,7 @@ end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); destroy_all_items(); } gcomprisBoard = NULL; @@ -216,7 +216,7 @@ static void clockgame_next_level() { gc_bar_set_level(gcomprisBoard); - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); destroy_all_items(); @@ -401,7 +401,7 @@ clockgame_create_item(GnomeCanvasGroup *parent) canvasPoints->coords[1]=cy - (needle_size-hour_point_size) * cos(ang); color="darkblue"; color_text="red"; - font = gcompris_skin_font_board_small; + font = gc_skin_font_board_small; } else { @@ -410,7 +410,7 @@ clockgame_create_item(GnomeCanvasGroup *parent) canvasPoints->coords[1]=cy - (needle_size-min_point_size) * cos(ang); color="red"; color_text="red"; - font = gcompris_skin_font_board_tiny; + font = gc_skin_font_board_tiny; } canvasPoints->coords[2]=cx + needle_size * sin(ang); @@ -466,7 +466,7 @@ clockgame_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", "", - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) cx + 1.0, "y", (double) cy + needle_size/2 + 1.0, "anchor", GTK_ANCHOR_CENTER, @@ -478,7 +478,7 @@ clockgame_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", "", - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) cx, "y", (double) cy + needle_size/2, "anchor", GTK_ANCHOR_CENTER, @@ -542,32 +542,32 @@ clockgame_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("Set the watch to:"), - "font", gcompris_skin_font_board_small, + "font", gc_skin_font_board_small, "x", (double) gcomprisBoard->width*0.17 + 1.0, "y", (double) cy + needle_size + needle_size / 3 - 30 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("Set the watch to:"), - "font", gcompris_skin_font_board_small, + "font", gc_skin_font_board_small, "x", (double) gcomprisBoard->width*0.17, "y", (double) cy + needle_size + needle_size / 3 - 30, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("clockgame/text"), + "fill_color_rgba", gc_skin_get_color("clockgame/text"), NULL); time_to_find_item_s = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", "", - "font", gcompris_skin_font_board_big_bold, + "font", gc_skin_font_board_big_bold, "x", (double) gcomprisBoard->width*0.17 + 1.0, "y", (double) cy + needle_size + needle_size / 3 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); display_digital_time(time_to_find_item_s, &timeToFind); @@ -575,11 +575,11 @@ clockgame_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", "", - "font", gcompris_skin_font_board_big_bold, + "font", gc_skin_font_board_big_bold, "x", (double) gcomprisBoard->width*0.17, "y", (double) cy + needle_size + needle_size / 3, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("clockgame/text"), + "fill_color_rgba", gc_skin_get_color("clockgame/text"), NULL); display_digital_time(time_to_find_item, &timeToFind); @@ -615,10 +615,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } clockgame_next_level(); } @@ -635,7 +635,7 @@ static void process_ok() /* Oups, you're wrong */ gamewon = FALSE; } - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); } @@ -663,7 +663,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) y = item_y; fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -710,7 +710,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) case GDK_BUTTON_RELEASE: if(dragging) { - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; } break; diff --git a/src/boards/colors.c b/src/boards/colors.c index 4827cdd..ff2cd78 100644 --- a/src/boards/colors.c +++ b/src/boards/colors.c @@ -166,7 +166,7 @@ colors_config_start(GcomprisBoard *agcomprisBoard, label = g_strdup_printf("%s configuration\n for profile %s", agcomprisBoard->name, aProfile ? aProfile->name : ""); - gcompris_configuration_window(label, conf_ok); + gc_board_config_window_display(label, conf_ok); g_free(label); @@ -222,11 +222,11 @@ static void start_board (GcomprisBoard *agcomprisBoard) { g_hash_table_destroy(config); - gcompris_pause_sound(); + gc_sound_pause(); if(agcomprisBoard!=NULL) { gcomprisBoard=agcomprisBoard; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "colors/colors_bg.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "colors/colors_bg.png"); gcomprisBoard->level=1; gcomprisBoard->maxlevel=1; @@ -263,7 +263,7 @@ static void end_board () { if(gcomprisBoard!=NULL){ pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); colors_destroy_all_items(); // free list while (g_list_length(listColors) > 0) @@ -273,7 +273,7 @@ static void end_board () { } gcompris_reset_locale(); gcomprisBoard = NULL; - gcompris_resume_sound(); + gc_sound_resume(); } /* ===================================================================== @@ -314,7 +314,7 @@ static void repeat (){ /* If we don't find a sound in our locale or the sounds are disabled */ if(str && properties->fx) { - gcompris_play_ogg(str, NULL); + gc_sound_play_ogg(str, NULL); } else { @@ -323,7 +323,7 @@ static void repeat (){ gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", str, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) BOARDWIDTH/2+2, "y", (double) BOARDHEIGHT-25+2, "anchor", GTK_ANCHOR_CENTER, @@ -333,7 +333,7 @@ static void repeat (){ gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", str, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) BOARDWIDTH/2, "y", (double) BOARDHEIGHT-25, "anchor", GTK_ANCHOR_CENTER, @@ -402,7 +402,7 @@ static void game_won() { listColors = g_list_remove(listColors, g_list_nth_data(listColors,0)); if( g_list_length(listColors) <= 0 ) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_TUXLOCO); + gc_bonus_end_display(BOARD_FINISHED_TUXLOCO); return; } @@ -412,7 +412,7 @@ static void game_won() { * * =====================================================================*/ static gboolean process_ok_timeout() { - gcompris_display_bonus(gamewon, BONUS_GNU); + gc_bonus_display(gamewon, BONUS_GNU); return FALSE; } diff --git a/src/boards/crane.c b/src/boards/crane.c index d6b2d27..43b40e0 100644 --- a/src/boards/crane.c +++ b/src/boards/crane.c @@ -204,8 +204,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->number_of_sublevel = 1; /* Go to next level after this number of 'play' */ gc_bar_set(GC_BAR_LEVEL); - img = gcompris_image_to_skin("gcompris-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -345,15 +345,15 @@ static GnomeCanvasItem *crane_create_item() // Display an happy face for end of level static void bonus() { - gcompris_display_bonus(gamewon, BONUS_SMILEY); - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_bonus_display(gamewon, BONUS_SMILEY); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); timer_id = 0; } // Display a 'end of game' animation static void finished() { - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); timer_id = 0; } @@ -736,7 +736,7 @@ static void select_item(GnomeCanvasItem *item, int sound) { "points", crane_rope, NULL); - if (sound) gcompris_play_ogg ("sounds/gobble.ogg", NULL); + if (sound) gc_sound_play_ogg ("sounds/gobble.ogg", NULL); selected_item = item; } diff --git a/src/boards/draw.c b/src/boards/draw.c index ce9c1a0..5f288c9 100644 --- a/src/boards/draw.c +++ b/src/boards/draw.c @@ -266,8 +266,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) /* disable im_context */ gcomprisBoard->disable_im_context = TRUE; - img = gcompris_image_to_skin("gcompris-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -1890,7 +1890,7 @@ static GnomeCanvasItem *create_item(double x, double y, gchar *imagename) item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(item_root_item), gnome_canvas_text_get_type (), "text", "?", - "font", gcompris_skin_font_board_big_bold, + "font", gc_skin_font_board_big_bold, "x", (double) x, "y", (double) y, "anchor", GTK_ANCHOR_CENTER, @@ -1976,7 +1976,7 @@ item_event_resize(GnomeCanvasItem *item, GdkEvent *event, AnchorsItem *anchorsIt case 1: fleur = gdk_cursor_new(get_resize_cursor(anchor)); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -1999,7 +1999,7 @@ item_event_resize(GnomeCanvasItem *item, GdkEvent *event, AnchorsItem *anchorsIt case GDK_BUTTON_RELEASE: if(dragging) { - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; draggingItem = NULL; } @@ -2147,7 +2147,7 @@ item_event_move(GnomeCanvasItem *item, GdkEvent *event, AnchorsItem *anchorsItem fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -2264,7 +2264,7 @@ item_event_move(GnomeCanvasItem *item, GdkEvent *event, AnchorsItem *anchorsItem case GDK_BUTTON_RELEASE: if(dragging) { - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; draggingItem = NULL; diff --git a/src/boards/enumerate.c b/src/boards/enumerate.c index 7e71dd0..b66a782 100644 --- a/src/boards/enumerate.c +++ b/src/boards/enumerate.c @@ -152,7 +152,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->number_of_sublevel=1; /* Go to next level after this number of 'play' */ gc_bar_set(GC_BAR_LEVEL|GC_BAR_OK); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/enumerate_background.png"); enumerate_next_level(); @@ -454,7 +454,7 @@ static GnomeCanvasItem *enumerate_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", "?", - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) ANSWER_X + 2.5*ANSWER_WIDTH, "y", (double) current_y + ANSWER_HEIGHT/2, "anchor", GTK_ANCHOR_EAST, @@ -479,10 +479,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } enumerate_next_level(); } @@ -537,7 +537,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) gnome_canvas_item_raise_to_top(item); fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -592,7 +592,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) case GDK_BUTTON_RELEASE: if(dragging) { - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; } break; @@ -618,10 +618,10 @@ static void process_ok() if(win) { gamewon = TRUE; - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } else { gamewon = FALSE; - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } } diff --git a/src/boards/erase.c b/src/boards/erase.c index f5c9148..9f0ebc9 100644 --- a/src/boards/erase.c +++ b/src/boards/erase.c @@ -175,7 +175,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->maxlevel=6; gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel=10; /* Go to next level after this number of 'play' */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -225,7 +225,7 @@ static void end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); erase_destroy_all_items(); } gcomprisBoard = NULL; @@ -271,7 +271,7 @@ static void erase_next_level() { int layers = 1; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), imageList[current_image++]); if(current_image>NUMBER_OF_IMAGES) @@ -304,7 +304,7 @@ static void erase_next_level() /* Try the next level */ erase_create_item(layers); - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); } @@ -395,12 +395,12 @@ static GnomeCanvasItem *erase_create_item(int layer) } static void bonus() { - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); timer_id = 0; } static void finished() { - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); timer_id = 0; } @@ -408,7 +408,7 @@ static void finished() { static void game_won() { gcomprisBoard->sublevel++; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); if(gcomprisBoard->sublevel>gcomprisBoard->number_of_sublevel) { /* Try the next level */ @@ -424,7 +424,7 @@ static void game_won() g_warning("Double click value is now %d.", DoubleClicLevel[gcomprisBoard->level-1]); } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } erase_next_level(); } diff --git a/src/boards/fifteen.c b/src/boards/fifteen.c index ebd46c3..a1afeb9 100644 --- a/src/boards/fifteen.c +++ b/src/boards/fifteen.c @@ -162,8 +162,8 @@ static void fifteen_next_level() { gchar *img; - img = gcompris_image_to_skin("gcompris-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -249,7 +249,7 @@ static GnomeCanvasItem *fifteen_create_item(GnomeCanvasGroup *parent) "text", buf, "x", (double) PIECE_SIZE / 2.0, "y", (double) PIECE_SIZE / 2.0, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "anchor", GTK_ANCHOR_CENTER, "fill_color", "black", NULL); @@ -296,10 +296,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } fifteen_next_level(); } @@ -326,7 +326,7 @@ test_win (GnomeCanvasItem **board) gamewon = TRUE; fifteen_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } diff --git a/src/boards/gletters.c b/src/boards/gletters.c index 8ea0131..0189de6 100644 --- a/src/boards/gletters.c +++ b/src/boards/gletters.c @@ -174,7 +174,7 @@ static void level_set_score() { l = g_utf8_strlen(letters_array[gcomprisBoard->level-1],-1)/3; gcomprisBoard->number_of_sublevel = (DEFAULT_SUBLEVEL>l?DEFAULT_SUBLEVEL:l); - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -314,7 +314,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gcomprisBoard=agcomprisBoard; load_default_charset(); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery_background.png"); gcomprisBoard->maxlevel=maxLevel; gcomprisBoard->level = 1; level_set_score(); @@ -333,7 +333,7 @@ end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); gletters_destroy_all_items(); g_message("freeing memory"); for (i = 0; i < maxLevel; i++) @@ -419,7 +419,7 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) { for (i=0; i < length_passed; i++){ c = g_utf8_get_char (string_passed); if (is_falling_letter(c)){ - gcompris_im_reset(); + gc_im_reset(); return TRUE; } @@ -433,7 +433,7 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) { /* for 2 (or all) first level don't care abour uppercase/lowercase */ if ((gcomprisBoard->level < level_uppercase) && (is_falling_letter(g_unichar_toupper(c)))){ - gcompris_im_reset(); + gc_im_reset(); return TRUE; } @@ -491,7 +491,7 @@ static void gletters_next_level() fallSpeed=dropRateBase+(dropRateMult/gcomprisBoard->level); gcomprisBoard->sublevel=1; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); } @@ -635,11 +635,11 @@ static GnomeCanvasItem *gletters_create_item(GnomeCanvasGroup *parent) if (with_sound) { gchar *str2 = NULL; - gchar *letter_unichar_name = gcompris_alphabet_sound(letter); + gchar *letter_unichar_name = gc_sound_alphabet(letter); str2 = g_strdup_printf("sounds/$LOCALE/alphabet/%s", letter_unichar_name); - gcompris_play_ogg(str2, NULL); + gc_sound_play_ogg(str2, NULL); g_free(letter_unichar_name); g_free(str2); @@ -656,7 +656,7 @@ static GnomeCanvasItem *gletters_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(item), gnome_canvas_text_get_type (), "text", letter, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) x, "y", (double) -20, "anchor", GTK_ANCHOR_CENTER, @@ -666,7 +666,7 @@ static GnomeCanvasItem *gletters_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(item), gnome_canvas_text_get_type (), "text", letter, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) x, "y", (double) -22, "anchor", GTK_ANCHOR_CENTER, @@ -711,7 +711,7 @@ static void player_win(GnomeCanvasItem *item) g_message("in player_win\n"); gletters_destroy_item(item); - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); gcomprisBoard->sublevel++; @@ -720,18 +720,18 @@ static void player_win(GnomeCanvasItem *item) /* Try the next level */ gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - gcompris_score_end(); - board_finished(BOARD_FINISHED_RANDOM); + gc_score_end(); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } gamewon = TRUE; gletters_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } else { - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); /* Drop a new item now to speed up the game */ if(g_list_length(item_list)==0) @@ -754,7 +754,7 @@ static void player_loose() { g_warning("entering player_loose\n"); - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); g_warning("leaving player_loose\n"); } @@ -866,7 +866,7 @@ gletter_config_start(GcomprisBoard *agcomprisBoard, label = g_strdup_printf("%s configuration\n for profile %s", agcomprisBoard->name, aProfile ? aProfile->name : ""); - gcompris_configuration_window(label, (GcomprisConfCallback )conf_ok); + gc_board_config_window_display(label, (GcomprisConfCallback )conf_ok); g_free(label); diff --git a/src/boards/gtans.c b/src/boards/gtans.c index a58e4ab..5245b8a 100644 --- a/src/boards/gtans.c +++ b/src/boards/gtans.c @@ -95,7 +95,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->maxlevel = 1; gc_bar_set(0); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/gtans_bg.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/gtans_bg.png"); selectedgrande = FALSE; taninitstart(); diff --git a/src/boards/gtans_callbacks.c b/src/boards/gtans_callbacks.c index 9d1ad1a..a87ef94 100644 --- a/src/boards/gtans_callbacks.c +++ b/src/boards/gtans_callbacks.c @@ -186,7 +186,7 @@ on_wdrawareagrande_button_release_event (GtkWidget *widget, /* hide widget because of gnomecanvaswidget on top of bonus image */ gtk_widget_hide(widgetgrande); gtk_widget_hide(widgetpetite); - gcompris_display_bonus( TRUE, BONUS_RANDOM); + gc_bonus_display( TRUE, BONUS_RANDOM); } } diff --git a/src/boards/gtans_interface.c b/src/boards/gtans_interface.c index 2001cb2..9cdd41c 100644 --- a/src/boards/gtans_interface.c +++ b/src/boards/gtans_interface.c @@ -97,9 +97,9 @@ void create_mainwindow (GnomeCanvasGroup *rootitem) GnomeCanvasItem *previous_figure, *next_figure; GnomeCanvasItem *show_figure, *outline_figure, *symetry; - pixmap_l = gcompris_load_skin_pixmap("button_backward.png"); + pixmap_l = gc_skin_pixmap_load("button_backward.png"); - pixmap_r = gcompris_load_skin_pixmap("button_forward.png"); + pixmap_r = gc_skin_pixmap_load("button_forward.png"); previous_figure = gnome_canvas_item_new (rootitem, gnome_canvas_pixbuf_get_type (), @@ -170,7 +170,7 @@ void create_mainwindow (GnomeCanvasGroup *rootitem) (GtkSignalFunc) gc_item_focus_event, NULL); - pixmap_symetry = gcompris_load_skin_pixmap("draw/tool-flip.png"); + pixmap_symetry = gc_skin_pixmap_load("draw/tool-flip.png"); symetry = gnome_canvas_item_new (rootitem, diff --git a/src/boards/hanoi.c b/src/boards/hanoi.c index ef12963..dd9047a 100644 --- a/src/boards/hanoi.c +++ b/src/boards/hanoi.c @@ -156,8 +156,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->number_of_sublevel=1; /* Go to next level after this number of 'play' */ gc_bar_set(GC_BAR_LEVEL); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - gcompris_image_to_skin("gcompris-bg.jpg")); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_skin_image_get("gcompris-bg.jpg")); hanoi_next_level(); @@ -316,7 +316,7 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) "y", (double) 0, NULL)); - pixmap = gcompris_load_skin_pixmap("gcompris-shapelabel.png"); + pixmap = gc_skin_pixmap_load("gcompris-shapelabel.png"); if(pixmap) { gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), @@ -333,7 +333,7 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("Build the same tower in the empty area as the one you see on the right-hand side."), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) BOARDWIDTH/2 +1, "y", (double) BOARDHEIGHT - 50 +1, "anchor", GTK_ANCHOR_NORTH, @@ -344,11 +344,11 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("Build the same tower in the empty area as the one you see on the right-hand side."), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) BOARDWIDTH/2, "y", (double) BOARDHEIGHT - 50, "anchor", GTK_ANCHOR_NORTH, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, "justification", GTK_JUSTIFY_CENTER, NULL); @@ -541,7 +541,7 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", &car, - "font", gcompris_skin_font_board_tiny, + "font", gc_skin_font_board_tiny, "x", (double) position[i][j]->xt, "y", (double) position[i][j]->yt, "anchor", GTK_ANCHOR_NORTH, @@ -571,10 +571,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } hanoi_next_level(); } @@ -645,7 +645,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data) gnome_canvas_item_raise_to_top(data->item_text); fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(data->item, + gc_canvas_item_grab(data->item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -679,7 +679,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data) PieceItem *piece_dst; gint col = 0, line; - gcompris_canvas_item_ungrab(data->item, event->button.time); + gc_canvas_item_ungrab(data->item, event->button.time); dragging = FALSE; /* Search the column (x) where this item is ungrabbed */ @@ -769,7 +769,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data) { gamewon = TRUE; hanoi_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } } break; diff --git a/src/boards/hanoi_real.c b/src/boards/hanoi_real.c index 1e6ea97..32f9341 100644 --- a/src/boards/hanoi_real.c +++ b/src/boards/hanoi_real.c @@ -132,8 +132,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->number_of_sublevel=1; /* Go to next level after this number of 'play' */ gc_bar_set(GC_BAR_LEVEL); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - gcompris_image_to_skin("gcompris-bg.jpg")); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_skin_image_get("gcompris-bg.jpg")); boardRootItem = NULL; @@ -258,7 +258,7 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) "y", (double) 0, NULL)); - pixmap = gcompris_load_skin_pixmap("gcompris-shapelabel.png"); + pixmap = gc_skin_pixmap_load("gcompris-shapelabel.png"); if(pixmap) { gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), @@ -275,22 +275,22 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("Move the entire stack to the right peg, one disc at a time"), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) BOARDWIDTH/2 +1, "y", (double) BOARDHEIGHT - 50 +1, "anchor", GTK_ANCHOR_NORTH, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "justification", GTK_JUSTIFY_CENTER, NULL); gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("Move the entire stack to the right peg, one disc at a time"), - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) BOARDWIDTH/2, "y", (double) BOARDHEIGHT - 50, "anchor", GTK_ANCHOR_NORTH, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, "justification", GTK_JUSTIFY_CENTER, NULL); @@ -405,10 +405,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } hanoi_next_level(); } @@ -472,7 +472,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data) gnome_canvas_item_raise_to_top(data->item); fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(data->item, + gc_canvas_item_grab(data->item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -513,7 +513,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data) disc_h = gdk_pixbuf_get_height(pixmap)/2; gdk_pixbuf_unref(pixmap); - gcompris_canvas_item_ungrab(data->item, event->button.time); + gc_canvas_item_ungrab(data->item, event->button.time); dragging = FALSE; /* Search the column (x) where this item is ungrabbed */ @@ -606,7 +606,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data) { gamewon = TRUE; hanoi_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } } break; diff --git a/src/boards/imageid.c b/src/boards/imageid.c index 4a62406..9187789 100644 --- a/src/boards/imageid.c +++ b/src/boards/imageid.c @@ -163,7 +163,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) if(agcomprisBoard!=NULL) { gcomprisBoard=agcomprisBoard; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "imageid/imageid-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "imageid/imageid-bg.jpg"); gcomprisBoard->level=1; gcomprisBoard->maxlevel=NUMBER_OF_LEVELS; gcomprisBoard->sublevel=1; @@ -172,7 +172,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->number_of_sublevel = NUMBER_OF_SUBLEVELS; assert(NUMBER_OF_LEVELS*NUMBER_OF_SUBLEVELS == g_list_length(board_list)); - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, 50, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -192,7 +192,7 @@ end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); imageid_destroy_all_items(); destroy_board_list(); } @@ -241,7 +241,7 @@ static void imageid_next_level() selected_button = NULL; gamewon = FALSE; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); /* Try the next level */ imageid_create_item(gnome_canvas_root(gcomprisBoard->canvas)); @@ -283,7 +283,7 @@ static GnomeCanvasItem *imageid_create_item(GnomeCanvasGroup *parent) "y", (double) 0, NULL)); - button_pixmap = gcompris_load_skin_pixmap("button_large.png"); + button_pixmap = gc_skin_pixmap_load("button_large.png"); /* display the image */ board = g_list_nth_data(board_list, board_number); assert(board != NULL); @@ -341,20 +341,20 @@ static GnomeCanvasItem *imageid_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[0], - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) xp + gdk_pixbuf_get_width(button_pixmap)/2 + 1.0, "y", (double) yp + gdk_pixbuf_get_height(button_pixmap)/2 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); text1_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[0], - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) xp + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) yp + gdk_pixbuf_get_height(button_pixmap)/2, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); yp += gdk_pixbuf_get_height(button_pixmap) + VERTICAL_SEPARATION; @@ -367,20 +367,20 @@ static GnomeCanvasItem *imageid_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[1], - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) xp + gdk_pixbuf_get_width(button_pixmap)/2 + 1.0, "y", (double) yp + gdk_pixbuf_get_height(button_pixmap)/2 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); text2_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[1], - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) xp + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) yp + gdk_pixbuf_get_height(button_pixmap)/2, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); yp += gdk_pixbuf_get_height(button_pixmap) + VERTICAL_SEPARATION; @@ -394,20 +394,20 @@ static GnomeCanvasItem *imageid_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[2], - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) xp + gdk_pixbuf_get_width(button_pixmap)/2 + 1.0, "y", (double) yp + gdk_pixbuf_get_height(button_pixmap)/2 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); text3_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[2], - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) xp + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) yp + gdk_pixbuf_get_height(button_pixmap)/2, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); gdk_pixbuf_unref(button_pixmap); @@ -431,7 +431,7 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_TUXLOCO); + gc_bonus_end_display(BOARD_FINISHED_TUXLOCO); return; } } @@ -440,7 +440,7 @@ static void game_won() /* ==================================== */ static gboolean process_ok_timeout() { - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); return FALSE; } @@ -514,13 +514,13 @@ static void highlight_selected(GnomeCanvasItem * item) { } if (selected_button != NULL && selected_button != button) { - button_pixmap = gcompris_load_skin_pixmap("button_large.png"); + button_pixmap = gc_skin_pixmap_load("button_large.png"); gnome_canvas_item_set(selected_button, "pixbuf", button_pixmap, NULL); gdk_pixbuf_unref(button_pixmap); } if (selected_button != button) { - button_pixmap_selected = gcompris_load_skin_pixmap("button_large_selected.png"); + button_pixmap_selected = gc_skin_pixmap_load("button_large_selected.png"); gnome_canvas_item_set(button, "pixbuf", button_pixmap_selected, NULL); selected_button = button; gdk_pixbuf_unref(button_pixmap_selected); @@ -757,7 +757,7 @@ config_start(GcomprisBoard *agcomprisBoard, agcomprisBoard->name, aProfile ? aProfile->name : ""); - gcompris_configuration_window( label, + gc_board_config_window_display( label, (GcomprisConfCallback )conf_ok); g_free(label); diff --git a/src/boards/leftright.c b/src/boards/leftright.c index 5eabc4a..3f55138 100644 --- a/src/boards/leftright.c +++ b/src/boards/leftright.c @@ -151,8 +151,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gchar *img; gcomprisBoard=agcomprisBoard; - img = gcompris_image_to_skin("leftright-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("leftright-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); gcomprisBoard->level=1; @@ -160,7 +160,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel = NUMBER_OF_SUBLEVELS; - gcompris_score_start(SCORESTYLE_NOTE, 10, 50, gcomprisBoard->number_of_sublevel); + gc_score_start(SCORESTYLE_NOTE, 10, 50, gcomprisBoard->number_of_sublevel); gc_bar_set(GC_BAR_LEVEL); leftright_next_level(); @@ -177,7 +177,7 @@ static void end_board () { if(gcomprisBoard!=NULL){ pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); leftright_destroy_all_items(); } gcomprisBoard = NULL; @@ -216,7 +216,7 @@ static void leftright_next_level() { leftright_destroy_all_items(); gamewon = FALSE; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); /* Try the next level */ leftright_create_item(gnome_canvas_root(gcomprisBoard->canvas)); @@ -278,7 +278,7 @@ static GnomeCanvasItem *leftright_create_item(GnomeCanvasGroup *parent) { gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("left"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) CENTER_LEFT_X + 1.0, "y", (double) CENTER_LEFT_Y + 1.0, "anchor", GTK_ANCHOR_CENTER, @@ -288,7 +288,7 @@ static GnomeCanvasItem *leftright_create_item(GnomeCanvasGroup *parent) { gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("left"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) CENTER_LEFT_X, "y", (double) CENTER_LEFT_Y, "anchor", GTK_ANCHOR_CENTER, @@ -298,7 +298,7 @@ static GnomeCanvasItem *leftright_create_item(GnomeCanvasGroup *parent) { gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("right"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) CENTER_RIGHT_X + 1.0, "y", (double) CENTER_RIGHT_Y + 1.0, "anchor", GTK_ANCHOR_CENTER, @@ -308,7 +308,7 @@ static GnomeCanvasItem *leftright_create_item(GnomeCanvasGroup *parent) { gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("right"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) CENTER_RIGHT_X, "y", (double) CENTER_RIGHT_Y, "anchor", GTK_ANCHOR_CENTER, @@ -359,7 +359,7 @@ static void game_won() { gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_TUXLOCO); + gc_bonus_end_display(BOARD_FINISHED_TUXLOCO); return; } } @@ -370,7 +370,7 @@ static void game_won() { * * =====================================================================*/ static gboolean process_ok_timeout() { - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); return FALSE; } diff --git a/src/boards/machpuzzle.c b/src/boards/machpuzzle.c index 32dcb20..dfb199d 100644 --- a/src/boards/machpuzzle.c +++ b/src/boards/machpuzzle.c @@ -198,7 +198,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard) static void minigolf_next_level() { - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),"images/foot_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas),"images/foot_background.png"); gc_bar_set_level(gcomprisBoard); @@ -258,10 +258,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } minigolf_next_level(); } @@ -563,7 +563,7 @@ static void minigolf_move(GList *item_list) gamewon = TRUE; minigolf_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); return; } } diff --git a/src/boards/magic_hat.c b/src/boards/magic_hat.c index 546d052..496fc10 100644 --- a/src/boards/magic_hat.c +++ b/src/boards/magic_hat.c @@ -179,8 +179,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) else board_mode = DEFAULT_MODE; - img = gcompris_image_to_skin("gcompris-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); + img = gc_skin_image_get("gcompris-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); magic_hat_next_level(); @@ -225,10 +225,10 @@ static void process_ok() { if (ok) { gamewon = TRUE; - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); } @@ -405,7 +405,7 @@ static GnomeCanvasItem *magic_hat_create_item() // Display a 'end of game' animation static void finished() { - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); timer_id = 0; } @@ -644,7 +644,7 @@ static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) { gdk_pixbuf_unref(pixmap); } - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); } return FALSE; diff --git a/src/boards/maze.c b/src/boards/maze.c index 1dd6fc4..b662780 100644 --- a/src/boards/maze.c +++ b/src/boards/maze.c @@ -190,8 +190,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) { /* disable im_context */ gcomprisBoard->disable_im_context = TRUE; - img = gcompris_image_to_skin("gcompris-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); gcomprisBoard->level=1; @@ -217,7 +217,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) { } if(!modeIs2D || modeIsInvisible) { - pixmap = gcompris_load_skin_pixmap("maze-2d-bubble.png"); + pixmap = gc_skin_pixmap_load("maze-2d-bubble.png"); if(pixmap) { gc_bar_set_repeat_icon(pixmap); gdk_pixbuf_unref(pixmap); @@ -432,7 +432,7 @@ static void repeat () { if(threeDactive) { - pixmap = gcompris_load_skin_pixmap("maze-3d-bubble.png"); + pixmap = gc_skin_pixmap_load("maze-3d-bubble.png"); if(pixmap) { gc_bar_set_repeat_icon(pixmap); gdk_pixbuf_unref(pixmap); @@ -443,7 +443,7 @@ static void repeat () { } else { - pixmap = gcompris_load_skin_pixmap("maze-2d-bubble.png"); + pixmap = gc_skin_pixmap_load("maze-2d-bubble.png"); if(pixmap) { gc_bar_set_repeat_icon(pixmap); gdk_pixbuf_unref(pixmap); @@ -501,11 +501,11 @@ static GnomeCanvasItem *maze_create_item(GnomeCanvasGroup *parent) { warning_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", message, - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) BOARDWIDTH/2, "y", (double) BOARDHEIGHT-20, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); gnome_canvas_item_hide(warning_item); @@ -516,11 +516,11 @@ static GnomeCanvasItem *maze_create_item(GnomeCanvasGroup *parent) { * =====================================================================*/ static void game_won() { twoDdisplay(); - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); /* Try the next level */ gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } maze_next_level(); @@ -788,16 +788,16 @@ draw_background(GnomeCanvasGroup *rootItem) y=cellsize*(y1)+board_border_y; x=cellsize*(x1)+board_border_x; if (x1==0) - draw_a_line(rootItem,x, y, x, y+cellsize, gcompris_skin_get_color("maze/wall color")); + draw_a_line(rootItem,x, y, x, y+cellsize, gc_skin_get_color("maze/wall color")); if (y1==0) - draw_a_line(rootItem,x, y, x+cellsize, y, gcompris_skin_get_color("maze/wall color")); + draw_a_line(rootItem,x, y, x+cellsize, y, gc_skin_get_color("maze/wall color")); if (wall&EAST) - draw_a_line(rootItem,x+cellsize, y, x+cellsize, y+cellsize, gcompris_skin_get_color("maze/wall color")); + draw_a_line(rootItem,x+cellsize, y, x+cellsize, y+cellsize, gc_skin_get_color("maze/wall color")); if (wall&SOUTH) - draw_a_line(rootItem,x, y+cellsize, x+cellsize, y+cellsize, gcompris_skin_get_color("maze/wall color")); + draw_a_line(rootItem,x, y+cellsize, x+cellsize, y+cellsize, gc_skin_get_color("maze/wall color")); } } @@ -1382,8 +1382,8 @@ static void draw3D() static void twoDdisplay() { - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), - gcompris_image_to_skin("gcompris-bg.jpg")); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_skin_image_get("gcompris-bg.jpg")); if (threedgroup) gnome_canvas_item_hide(GNOME_CANVAS_ITEM(threedgroup)); gnome_canvas_item_show(GNOME_CANVAS_ITEM(boardRootItem)); @@ -1392,7 +1392,7 @@ static void twoDdisplay() static void threeDdisplay() { - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/maze-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/maze-bg.jpg"); gnome_canvas_item_hide(GNOME_CANVAS_ITEM(boardRootItem)); threeDactive=TRUE; draw3D(); diff --git a/src/boards/memory.c b/src/boards/memory.c index 5279d1e..8354a84 100644 --- a/src/boards/memory.c +++ b/src/boards/memory.c @@ -31,7 +31,7 @@ #define MAX_MEMORY_WIDTH 7 #define MAX_MEMORY_HEIGHT 6 -//#define TEXT_FONT gcompris_skin_font_board_huge_bold +//#define TEXT_FONT gc_skin_font_board_huge_bold #define TEXT_FONT "Serif bold 28" static gchar *op_fonts[10] = @@ -815,8 +815,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) { GcomprisProperties *properties = gc_prop_get(); - gcompris_pause_sound(); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/gcompris_band.png"); + gc_sound_pause(); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/gcompris_band.png"); base_x1 = BASE_SOUND_X1; base_y1 = BASE_SOUND_Y1; base_x2 = BASE_SOUND_X2; @@ -831,7 +831,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) } else { - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery_background.png"); base_x1 = BASE_CARD_X1; base_y1 = BASE_CARD_Y1; base_x2 = BASE_CARD_X2; @@ -886,7 +886,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) to_tux = FALSE; if (currentUiMode == UIMODE_SOUND){ playing_sound = TRUE; - gcompris_play_ogg_cb("sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg",start_callback); + gc_sound_play_ogg_cb("sounds/LuneRouge/musique/LRBuddhist_gong_05_by_Lionel_Allorge.ogg",start_callback); } else playing_sound = FALSE; @@ -898,7 +898,7 @@ static void end_board () { if (currentUiMode == UIMODE_SOUND) - gcompris_resume_sound(); + gc_sound_resume(); if(gcomprisBoard!=NULL) { @@ -1225,7 +1225,7 @@ static void create_item(GnomeCanvasGroup *parent) tux_score_s = gnome_canvas_item_new (GNOME_CANVAS_GROUP(parent), gnome_canvas_text_get_type (), - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) 100+1.0, "y", (double) 200+1.0, "anchor", GTK_ANCHOR_CENTER, @@ -1234,7 +1234,7 @@ static void create_item(GnomeCanvasGroup *parent) player_score_s = gnome_canvas_item_new (GNOME_CANVAS_GROUP(parent), gnome_canvas_text_get_type (), - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) 100+1.0, "y", (double) BASE_CARD_Y2 - 20+1.0, "anchor", GTK_ANCHOR_CENTER, @@ -1243,7 +1243,7 @@ static void create_item(GnomeCanvasGroup *parent) tux_score = gnome_canvas_item_new (GNOME_CANVAS_GROUP(parent), gnome_canvas_text_get_type (), - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) 100, "y", (double) 200, "anchor", GTK_ANCHOR_CENTER, @@ -1252,7 +1252,7 @@ static void create_item(GnomeCanvasGroup *parent) player_score = gnome_canvas_item_new (GNOME_CANVAS_GROUP(parent), gnome_canvas_text_get_type (), - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) 100, "y", (double) BASE_CARD_Y2 - 20, "anchor", GTK_ANCHOR_CENTER, @@ -1389,15 +1389,15 @@ static void create_item(GnomeCanvasGroup *parent) static void player_win() { - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); /* Try the next level */ if (tux_pairs <= player_pairs) gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_display_bonus((tux_pairs <= player_pairs), BONUS_RANDOM); + gc_bonus_display((tux_pairs <= player_pairs), BONUS_RANDOM); } @@ -1412,7 +1412,7 @@ static void display_card(MemoryItem *memoryItem, CardStatus cardStatus) gnome_canvas_item_hide(memoryItem->backcardItem); gnome_canvas_item_show(memoryItem->frontcardItem); playing_sound = TRUE; - gcompris_play_ogg_cb (memoryItem->data, sound_callback); + gc_sound_play_ogg_cb (memoryItem->data, sound_callback); break; case ON_BACK: gnome_canvas_item_show(memoryItem->backcardItem); @@ -1530,7 +1530,7 @@ static void check_win() // Check win if (compare_card((gpointer) firstCard, (gpointer) secondCard) == 0) { - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); win_id = g_timeout_add (timeout, (GSourceFunc) hide_card, NULL); return; @@ -1722,7 +1722,7 @@ static gint tux_play(){ if (currentUiMode == UIMODE_SOUND) return FALSE; else { - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); win_id = g_timeout_add (1000, (GSourceFunc) hide_card, NULL); return TRUE; @@ -1776,7 +1776,7 @@ static gint tux_play(){ return FALSE; else { if (compare_card(firstCard, secondCard)==0){ - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); g_warning("Now tux win !"); win_id = g_timeout_add (1000, (GSourceFunc) hide_card, NULL); @@ -1802,7 +1802,7 @@ static void sound_callback(gchar *file) if (to_tux) { if (firstCard && secondCard){ if (compare_card(firstCard, secondCard)==0){ - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); win_id = g_timeout_add (1000, (GSourceFunc) hide_card, NULL); tux_id = g_timeout_add (2000, diff --git a/src/boards/menu2.c b/src/boards/menu2.c index 88619e7..76b51f8 100644 --- a/src/boards/menu2.c +++ b/src/boards/menu2.c @@ -223,8 +223,8 @@ static void menu_start (GcomprisBoard *agcomprisBoard) menuitems = g_new(MenuItems, 1); - img = gcompris_image_to_skin("gcompris-menu2bg.png"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-menu2bg.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -415,7 +415,7 @@ menu_config () if(gcomprisBoard!=NULL) { menu_pause(TRUE); - gcompris_config_start(); + gc_config_start(); } } @@ -527,11 +527,11 @@ static void menu_create_item(GnomeCanvasGroup *parent, MenuItems *menuitems, Gco if (!soundfile || !gc_prop_get()->fx) { - pixmap = gcompris_load_skin_pixmap("voice_bad.png"); + pixmap = gc_skin_pixmap_load("voice_bad.png"); } else { - pixmap = gcompris_load_skin_pixmap("voice.png"); + pixmap = gc_skin_pixmap_load("voice.png"); } gnome_canvas_item_new (parent, @@ -547,7 +547,7 @@ static void menu_create_item(GnomeCanvasGroup *parent, MenuItems *menuitems, Gco // display menu icon ========================== BEGIN if(g_strcasecmp(board->type, "menu")==0) { - pixmap = gcompris_load_skin_pixmap("menuicon.png"); + pixmap = gc_skin_pixmap_load("menuicon.png"); item = gnome_canvas_item_new (parent, gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -651,7 +651,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, MenuItems *menuitems) if(!menu_displayed) return TRUE; - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); if (strcmp(board->type,"menu")==0){ gchar *path = g_strdup_printf("%s/%s",board->section, board->name); @@ -706,7 +706,7 @@ set_content(GnomeCanvasRichText *item_content, * Set the shadow */ - color_string = g_strdup_printf("#%x", gcompris_skin_color_shadow >> 8); + color_string = g_strdup_printf("#%x", gc_skin_color_shadow >> 8); gdk_color_parse(color_string, color_s); success = gdk_colormap_alloc_color(gdk_colormap_get_system(), color_s, @@ -715,7 +715,7 @@ set_content(GnomeCanvasRichText *item_content, buffer = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content_s)); txt_tag = gtk_text_buffer_create_tag(buffer, NULL, "foreground-gdk", color_s, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, NULL); gtk_text_buffer_get_end_iter(buffer, &iter_end); gtk_text_buffer_get_start_iter(buffer, &iter_start); @@ -726,7 +726,7 @@ set_content(GnomeCanvasRichText *item_content, /* * Set the text */ - color_string = g_strdup_printf("#%x", gcompris_skin_get_color("menu/text") >> 8); + color_string = g_strdup_printf("#%x", gc_skin_get_color("menu/text") >> 8); gdk_color_parse(color_string, color); success = gdk_colormap_alloc_color(gdk_colormap_get_system(), color, @@ -735,7 +735,7 @@ set_content(GnomeCanvasRichText *item_content, buffer = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content)); txt_tag = gtk_text_buffer_create_tag(buffer, NULL, "foreground-gdk", color, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, NULL); gtk_text_buffer_get_end_iter(buffer, &iter_end); gtk_text_buffer_get_start_iter(buffer, &iter_start); @@ -758,22 +758,22 @@ static void create_info_area(GnomeCanvasGroup *parent, MenuItems *menuitems) gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", " ", - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) x + 1.0, "y", (double) y + 1.0, "anchor", GTK_ANCHOR_NORTH, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); menuitems->boardname_item = \ gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", " ", - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) x, "y", (double) y, "anchor", GTK_ANCHOR_NORTH, - "fill_color_rgba", gcompris_skin_get_color("menu/text"), + "fill_color_rgba", gc_skin_get_color("menu/text"), NULL); menuitems->description_item_s = \ @@ -809,11 +809,11 @@ static void create_info_area(GnomeCanvasGroup *parent, MenuItems *menuitems) gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", " ", - "font", gcompris_skin_font_board_tiny, + "font", gc_skin_font_board_tiny, "x", (double) x + 1.0, "y", (double) y + 90 + 1.0, "anchor", GTK_ANCHOR_NORTH, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "justification", GTK_JUSTIFY_CENTER, NULL); @@ -821,11 +821,11 @@ static void create_info_area(GnomeCanvasGroup *parent, MenuItems *menuitems) gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", " ", - "font", gcompris_skin_font_board_tiny, + "font", gc_skin_font_board_tiny, "x", (double) x, "y", (double) y + 90, "anchor", GTK_ANCHOR_NORTH, - "fill_color_rgba", gcompris_skin_get_color("menu/text"), + "fill_color_rgba", gc_skin_get_color("menu/text"), "justification", GTK_JUSTIFY_CENTER, NULL); @@ -900,7 +900,7 @@ static void create_top(GnomeCanvasGroup *parent, gchar *path) current_top_x = top_x; current_top_y = top_y + top_h/2.0; } else { - pixmap = gcompris_load_skin_pixmap("button_forward.png"); + pixmap = gc_skin_pixmap_load("button_forward.png"); ratio = get_ratio(pixmap, top_arrow_size); gnome_canvas_item_new (parent, @@ -921,7 +921,7 @@ static void create_top(GnomeCanvasGroup *parent, gchar *path) } - board = gcompris_get_board_from_section(path1); + board = gc_menu_section_get(path1); pixmap = gc_pixmap_load(board->icon_name); @@ -981,7 +981,7 @@ display_welcome (void) "y", (double) 0, NULL)); - pixmap = gcompris_load_skin_pixmap("gcompris-about.png"); + pixmap = gc_skin_pixmap_load("gcompris-about.png"); logo = gnome_canvas_item_new (actualSectionItem, @@ -1028,7 +1028,7 @@ menu_config_start(GcomprisBoard *agcomprisBoard, if(gcomprisBoard!=NULL) { menu_pause(TRUE); - gcompris_config_start(); + gc_config_start(); } } diff --git a/src/boards/missingletter.c b/src/boards/missingletter.c index df1223a..4a6e3da 100644 --- a/src/boards/missingletter.c +++ b/src/boards/missingletter.c @@ -162,8 +162,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) { gchar *img; gcomprisBoard=agcomprisBoard; - img = gcompris_image_to_skin("missingletter-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("missingletter-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); gcomprisBoard->level=1; @@ -172,7 +172,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS; /* Go to next level after this number of 'play' */ init_xml(); assert(NUMBER_OF_LEVELS*NUMBER_OF_SUBLEVELS == g_list_length(board_list)); - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, 50, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -191,7 +191,7 @@ static void end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); missing_letter_destroy_all_items(); destroy_board_list(); } @@ -240,7 +240,7 @@ static void missing_letter_next_level() selected_button = NULL; gamewon = FALSE; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); /* Try the next level */ missing_letter_create_item(gnome_canvas_root(gcomprisBoard->canvas)); @@ -289,7 +289,7 @@ static GnomeCanvasItem *missing_letter_create_item(GnomeCanvasGroup *parent) "x", (double) 0, "y", (double) 0, NULL)); - button_pixmap = gcompris_load_skin_pixmap("button.png"); + button_pixmap = gc_skin_pixmap_load("button.png"); /* display the image */ board = g_list_nth_data(board_list, board_number); assert(board != NULL); @@ -301,20 +301,20 @@ static GnomeCanvasItem *missing_letter_create_item(GnomeCanvasGroup *parent) text_s = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _(board->question), - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) txt_area_x + 1.0, "y", (double) txt_area_y + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("missingletter/shadow"), + "fill_color_rgba", gc_skin_get_color("missingletter/shadow"), NULL); text = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _(board->question), - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) txt_area_x, "y", (double) txt_area_y, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("missingletter/question"), + "fill_color_rgba", gc_skin_get_color("missingletter/question"), NULL); gnome_canvas_item_get_bounds(text, &dx1, &dy1, &dx2, &dy2); @@ -365,20 +365,20 @@ static GnomeCanvasItem *missing_letter_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[0], - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2 + 1.0, "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); l1_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[0], - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); yOffset += HORIZONTAL_SEPARATION + gdk_pixbuf_get_height(button_pixmap); @@ -391,20 +391,20 @@ static GnomeCanvasItem *missing_letter_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[1], - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2 + 1.0, "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); l2_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[1], - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); yOffset += HORIZONTAL_SEPARATION + gdk_pixbuf_get_height(button_pixmap); @@ -418,20 +418,20 @@ static GnomeCanvasItem *missing_letter_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[2], - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2 + 1.0, "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); l3_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", buf[2], - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); gdk_pixbuf_unref(button_pixmap); @@ -454,7 +454,7 @@ static void game_won() { gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { - board_finished(BOARD_FINISHED_TUXPLANE); + gc_bonus_end_display(BOARD_FINISHED_TUXPLANE); return; } } @@ -463,7 +463,7 @@ static void game_won() { /* ==================================== */ static gboolean process_ok_timeout() { - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); return FALSE; } @@ -536,13 +536,13 @@ static void highlight_selected(GnomeCanvasItem * item) { } if (selected_button != NULL && selected_button != button) { - button_pixmap = gcompris_load_skin_pixmap("button.png"); + button_pixmap = gc_skin_pixmap_load("button.png"); gnome_canvas_item_set(selected_button, "pixbuf", button_pixmap, NULL); gdk_pixbuf_unref(button_pixmap); } if (selected_button != button) { - button_pixmap_selected = gcompris_load_skin_pixmap("button_selected.png"); + button_pixmap_selected = gc_skin_pixmap_load("button_selected.png"); gnome_canvas_item_set(button, "pixbuf", button_pixmap_selected, NULL); selected_button = button; gdk_pixbuf_unref(button_pixmap_selected); @@ -780,7 +780,7 @@ config_start(GcomprisBoard *agcomprisBoard, agcomprisBoard->name, aProfile ? aProfile->name : ""); - gcompris_configuration_window( label, + gc_board_config_window_display( label, (GcomprisConfCallback )conf_ok); g_free(label); diff --git a/src/boards/money.c b/src/boards/money.c index e2fb349..4b4b48c 100644 --- a/src/boards/money.c +++ b/src/boards/money.c @@ -209,8 +209,8 @@ static void money_next_level() gchar *display_format; gchar *img; - img = gcompris_image_to_skin("money-bg.png"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("money-bg.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -510,7 +510,7 @@ static void money_next_level() gnome_canvas_item_new(boardRootItem, gnome_canvas_text_get_type (), "text", text, - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) (i*BOARDWIDTH)/(number_of_item+1), "y", (double) 180, "anchor", GTK_ANCHOR_CENTER, @@ -549,10 +549,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } money_next_level(); } @@ -570,8 +570,8 @@ static void process_ok() { gamewon = TRUE; money_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } else - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } diff --git a/src/boards/money_widget.c b/src/boards/money_widget.c index 0866943..505fdb0 100644 --- a/src/boards/money_widget.c +++ b/src/boards/money_widget.c @@ -212,7 +212,7 @@ money_widget_set_position (Money_Widget *moneyWidget, moneyWidget->priv->item_total = gnome_canvas_item_new(rootItem, gnome_canvas_text_get_type (), "text", "", - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) x1+(x2-x1)/2, "y", (double) y2 + 10, "anchor", GTK_ANCHOR_CENTER, diff --git a/src/boards/paratrooper.c b/src/boards/paratrooper.c index dd045af..4a380c8 100644 --- a/src/boards/paratrooper.c +++ b/src/boards/paratrooper.c @@ -153,7 +153,7 @@ static void pause_board (gboolean pause) { gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } printf("paratrooper pause start next level\n"); @@ -184,7 +184,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) /* disable im_context */ gcomprisBoard->disable_im_context = TRUE; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery3_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery3_background.png"); /* set initial values for this level */ @@ -573,7 +573,7 @@ static gint paratrooper_move_tux (GtkWidget *widget, gpointer data) { gnome_canvas_item_hide(paratrooperItem.parachute); paratrooperItem.status = TUX_LANDED; - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); next_state(); } else @@ -585,7 +585,7 @@ static gint paratrooper_move_tux (GtkWidget *widget, gpointer data) { gnome_canvas_item_hide(paratrooperItem.parachute); paratrooperItem.status = TUX_CRASHED; - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); next_state(); } } @@ -693,7 +693,7 @@ void next_state() break; case TUX_LANDED: gamewon = TRUE; - gcompris_display_bonus(gamewon, BONUS_TUX); + gc_bonus_display(gamewon, BONUS_TUX); break; case TUX_CRASHED: /* Restart */ diff --git a/src/boards/planegame.c b/src/boards/planegame.c index 41c5607..7f1f81c 100644 --- a/src/boards/planegame.c +++ b/src/boards/planegame.c @@ -143,7 +143,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) /* disable im_context */ gcomprisBoard->disable_im_context = TRUE; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery3_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery3_background.png"); /* set initial values for this level */ @@ -166,7 +166,7 @@ end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); planegame_destroy_all_items(); gcomprisBoard->level = 1; // Restart this game to zero } @@ -299,15 +299,15 @@ static void planegame_next_level() if(gcomprisBoard->level>1) { /* No scoring after level 1 */ - gcompris_score_end(); + gc_score_end(); } else { - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); } } @@ -336,13 +336,13 @@ static void planegame_cloud_colision(CloudItem *clouditem) { if(plane_target == clouditem->number) { - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); item2del_list = g_list_append (item2del_list, clouditem); plane_target++; if(gcomprisBoard->level==1) { - gcompris_score_set(plane_target); + gc_score_set(plane_target); } if(plane_target==plane_last_target) @@ -350,11 +350,11 @@ static void planegame_cloud_colision(CloudItem *clouditem) /* Try the next level */ gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } planegame_next_level(); - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } } } @@ -509,7 +509,7 @@ static GnomeCanvasItem *planegame_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(itemgroup), gnome_canvas_text_get_type (), "text", number, - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) 0, "y", (double) 0, "fill_color", "red", @@ -575,7 +575,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) y = item_y; fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -605,7 +605,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) case GDK_BUTTON_RELEASE: if(dragging) { - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; } break; diff --git a/src/boards/py-mod-admin.c b/src/boards/py-mod-admin.c index 9b9c028..95dce08 100644 --- a/src/boards/py-mod-admin.c +++ b/src/boards/py-mod-admin.c @@ -33,7 +33,7 @@ py_board_run_next (PyObject* self, PyObject* args) } static PyObject* -py_board_config_start (PyObject* self, PyObject* args) +py_gc_board_config_start (PyObject* self, PyObject* args) { PyObject* pyBoard; PyObject* pyProfile; @@ -44,7 +44,7 @@ py_board_config_start (PyObject* self, PyObject* args) /* Parse arguments */ if(!PyArg_ParseTuple(args, - "OO:board_config_start", + "OO:gc_board_config_start", &pyBoard, &pyProfile)) return NULL; @@ -55,7 +55,7 @@ py_board_config_start (PyObject* self, PyObject* args) cGcomprisProfile = pyGcomprisProfile->cdata; /* Call the corresponding C function */ - board_config_start(cGcomprisBoard, cGcomprisProfile); + gc_board_config_start(cGcomprisBoard, cGcomprisProfile); /* Create and return the result */ Py_INCREF(Py_None); @@ -63,14 +63,14 @@ py_board_config_start (PyObject* self, PyObject* args) } static PyObject* -py_board_config_stop (PyObject* self, PyObject* args) +py_gc_board_config_stop (PyObject* self, PyObject* args) { /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris.board_config_stop")) + if(!PyArg_ParseTuple(args, ":gcompris.gc_board_config_stop")) return NULL; /* Call the corresponding C function */ - board_config_stop(); + gc_board_config_stop(); /* Create and return the result */ Py_INCREF(Py_None); @@ -185,7 +185,7 @@ py_gcompris_get_class_from_id (PyObject* self, PyObject* args) } static PyObject* -py_gcompris_get_profiles_list (PyObject* self, PyObject* args) +py_gc_db_profiles_list_get (PyObject* self, PyObject* args) { GList *profiles_list; GList *list; @@ -196,7 +196,7 @@ py_gcompris_get_profiles_list (PyObject* self, PyObject* args) return NULL; /* Call the corresponding C function */ - profiles_list = gcompris_get_profiles_list(); + profiles_list = gc_db_profiles_list_get(); pylist = PyList_New(0); for (list = profiles_list; list != NULL; list = list->next){ @@ -273,7 +273,7 @@ py_gcompris_get_classes_list (PyObject* self, PyObject* args) } static PyObject* -py_gcompris_get_users_from_group (PyObject* self, PyObject* args) +py_gc_db_users_from_group_get (PyObject* self, PyObject* args) { GList *users_list; GList *list; @@ -281,11 +281,11 @@ py_gcompris_get_users_from_group (PyObject* self, PyObject* args) int group_id; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "i:gcompris_get_users_from_group", &group_id)) + if(!PyArg_ParseTuple(args, "i:gc_db_users_from_group_get", &group_id)) return NULL; /* Call the corresponding C function */ - users_list = gcompris_get_users_from_group(group_id); + users_list = gc_db_users_from_group_get(group_id); pylist = PyList_New(0); for (list = users_list; list != NULL; list = list->next){ @@ -295,9 +295,9 @@ py_gcompris_get_users_from_group (PyObject* self, PyObject* args) return pylist; } -/* void *gcompris_set_current_user(GcomprisUser *user); */ +/* void *gc_profile_set_current_user(GcomprisUser *user); */ static PyObject* -py_gcompris_set_current_user (PyObject* self, PyObject* args) +py_gc_profile_set_current_user (PyObject* self, PyObject* args) { PyObject *pyObject_user; pyGcomprisUserObject *pyUser; @@ -311,7 +311,7 @@ py_gcompris_set_current_user (PyObject* self, PyObject* args) user = (GcomprisUser *) pyUser->cdata; /* Call the corresponding C function */ - gcompris_set_current_user(user); + gc_profile_set_current_user(user); /* Create and return the result */ Py_INCREF(Py_None); @@ -320,9 +320,9 @@ py_gcompris_set_current_user (PyObject* self, PyObject* args) -/* GcomprisUser *gcompris_get_current_user(); */ +/* GcomprisUser *gc_profile_get_current_user(); */ static PyObject* -py_gcompris_get_current_user (PyObject* self, PyObject* args) +py_gc_profile_get_current_user (PyObject* self, PyObject* args) { GcomprisUser *user; @@ -331,7 +331,7 @@ py_gcompris_get_current_user (PyObject* self, PyObject* args) return NULL; /* Call the corresponding C function */ - user = gcompris_get_current_user (); + user = gc_profile_get_current_user (); /* Create and return the result */ if (!user) { @@ -344,10 +344,10 @@ py_gcompris_get_current_user (PyObject* self, PyObject* args) static PyMethodDef PythonGcomprisAdminModule[] = { { "board_run_next", py_board_run_next, METH_VARARGS, "board_run_next" }, - { "board_config_start", py_board_config_start, METH_VARARGS, "board_config_start" }, - { "board_config_stop", py_board_config_stop, METH_VARARGS, "board_config_stop" }, + { "gc_board_config_start", py_gc_board_config_start, METH_VARARGS, "gc_board_config_start" }, + { "gc_board_config_stop", py_gc_board_config_stop, METH_VARARGS, "gc_board_config_stop" }, { "get_profile_from_id", py_gcompris_get_profile_from_id, METH_VARARGS, "gcompris_get_profile_from_id" }, - { "get_profiles_list", py_gcompris_get_profiles_list, METH_VARARGS, "gcompris_get_profiles_list" }, + { "get_profiles_list", py_gc_db_profiles_list_get, METH_VARARGS, "gc_db_profiles_list_get" }, { "get_user_from_id", py_gcompris_get_user_from_id, METH_VARARGS, "gcompris_get_user_from_id" }, { "get_users_list", py_gcompris_get_users_list, METH_VARARGS, "gcompris_get_users_list" }, { "get_group_from_id", py_gcompris_get_group_from_id, METH_VARARGS, "gcompris_get_group_from_id" }, @@ -356,10 +356,10 @@ static PyMethodDef PythonGcomprisAdminModule[] = { { "get_classes_list", py_gcompris_get_classes_list, METH_VARARGS, "gcompris_get_classes_list" }, { "get_board_from_id", py_gcompris_get_board_from_id, METH_VARARGS, "gcompris_get_board_from_id" }, { "get_boards_list", py_gc_menu_get_boards, METH_VARARGS, "gc_menu_get_boards" }, - { "get_users_from_group", py_gcompris_get_users_from_group, METH_VARARGS, "gcompris_get_users_from_group" }, - { "get_users_from_group", py_gcompris_get_users_from_group, METH_VARARGS, "gcompris_get_users_from_group" }, - { "get_current_user", py_gcompris_get_current_user, METH_VARARGS, "gcompris_get_current_user" }, - { "set_current_user", py_gcompris_set_current_user, METH_VARARGS, "gcompris_set_current_user" }, + { "get_users_from_group", py_gc_db_users_from_group_get, METH_VARARGS, "gc_db_users_from_group_get" }, + { "get_users_from_group", py_gc_db_users_from_group_get, METH_VARARGS, "gc_db_users_from_group_get" }, + { "get_current_user", py_gc_profile_get_current_user, METH_VARARGS, "gc_profile_get_current_user" }, + { "set_current_user", py_gc_profile_set_current_user, METH_VARARGS, "gc_profile_set_current_user" }, { NULL, NULL, 0, NULL} }; diff --git a/src/boards/py-mod-bonus.c b/src/boards/py-mod-bonus.c index 77a3b2e..66ca9a7 100644 --- a/src/boards/py-mod-bonus.c +++ b/src/boards/py-mod-bonus.c @@ -9,18 +9,18 @@ * "*" C function. */ -/* void gcompris_display_bonus(int gamewon, int bonus_id); */ +/* void gc_bonus_display(int gamewon, int bonus_id); */ static PyObject* -py_gcompris_display_bonus(PyObject* self, PyObject* args) +py_gc_bonus_display(PyObject* self, PyObject* args) { int gamewon; int bonus_id; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "ii:gcompris_display_bonus", &gamewon, &bonus_id)) + if(!PyArg_ParseTuple(args, "ii:gc_bonus_display", &gamewon, &bonus_id)) return NULL; /* Call the corresponding C function */ - gcompris_display_bonus(gamewon, bonus_id); + gc_bonus_display(gamewon, bonus_id); /* Create and return the result */ Py_INCREF(Py_None); @@ -28,17 +28,17 @@ py_gcompris_display_bonus(PyObject* self, PyObject* args) } -/* void board_finished(int type); */ +/* void gc_bonus_end_display(int type); */ static PyObject* -py_gcompris_board_finished(PyObject* self, PyObject* args) +py_gcompris_gc_bonus_end_display(PyObject* self, PyObject* args) { int type; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "i:board_finished", &type)) + if(!PyArg_ParseTuple(args, "i:gc_bonus_end_display", &type)) return NULL; /* Call the corresponding C function */ - board_finished(type); + gc_bonus_end_display(type); /* Create and return the result */ Py_INCREF(Py_None); @@ -47,8 +47,8 @@ py_gcompris_board_finished(PyObject* self, PyObject* args) static PyMethodDef PythonGcomprisBonusModule[] = { - { "display", py_gcompris_display_bonus, METH_VARARGS, "gcompris_display_bonus" }, - { "board_finished", py_gcompris_board_finished, METH_VARARGS, "board_finished" }, + { "display", py_gc_bonus_display, METH_VARARGS, "gc_bonus_display" }, + { "gc_bonus_end_display", py_gcompris_gc_bonus_end_display, METH_VARARGS, "gc_bonus_end_display" }, { NULL, NULL, 0, NULL} }; @@ -66,14 +66,12 @@ void python_gcompris_bonus_module_init(void) PyModule_AddIntConstant(module, "FLOWER", BONUS_FLOWER ); PyModule_AddIntConstant(module, "TUX", BONUS_TUX ); PyModule_AddIntConstant(module, "GNU", BONUS_GNU ); - PyModule_AddIntConstant(module, "LAST", BONUS_LAST ); /* BonusFinishedList constants */ PyModule_AddIntConstant(module, "FINISHED_RANDOM", BOARD_FINISHED_RANDOM ); PyModule_AddIntConstant(module, "FINISHED_TUXPLANE", BOARD_FINISHED_TUXPLANE ); PyModule_AddIntConstant(module, "FINISHED_TUXLOCO", BOARD_FINISHED_TUXLOCO ); PyModule_AddIntConstant(module, "FINISHED_TOOMANYERRORS", BOARD_FINISHED_TOOMANYERRORS ); - PyModule_AddIntConstant(module, "FINISHED_LAST", BOARD_FINISHED_LAST ); /* BonusStatusList constants */ PyModule_AddIntConstant(module, "LOOSE", BOARD_LOOSE ); diff --git a/src/boards/py-mod-gcompris.c b/src/boards/py-mod-gcompris.c index 098c19f..f9b3b8e 100644 --- a/src/boards/py-mod-gcompris.c +++ b/src/boards/py-mod-gcompris.c @@ -125,9 +125,9 @@ py_gc_bar_start(PyObject* self, PyObject* args) } -/* GnomeCanvasItem *gcompris_set_background(GnomeCanvasGroup *parent, gchar *file); */ +/* GnomeCanvasItem *gc_set_background(GnomeCanvasGroup *parent, gchar *file); */ static PyObject* -py_gcompris_set_background(PyObject* self, PyObject* args) +py_gc_set_background(PyObject* self, PyObject* args) { PyObject* pyCanvasGroup; GnomeCanvasGroup* canvasGroup; @@ -136,12 +136,12 @@ py_gcompris_set_background(PyObject* self, PyObject* args) GnomeCanvasItem* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "Os:gcompris_set_background", &pyCanvasGroup, &file)) + if(!PyArg_ParseTuple(args, "Os:gc_set_background", &pyCanvasGroup, &file)) return NULL; canvasGroup = (GnomeCanvasGroup*) pygobject_get(pyCanvasGroup); /* Call the corresponding C function */ - result = gcompris_set_background(canvasGroup, file); + result = gc_set_background(canvasGroup, file); /* Create and return the result */ pyResult = pygobject_new((GObject*)result); @@ -230,34 +230,34 @@ py_gc_bar_hide(PyObject* self, PyObject* args) return Py_None; } -/* GnomeCanvas *gcompris_get_canvas(void); */ +/* GnomeCanvas *gc_get_canvas(void); */ static PyObject* -py_gcompris_get_canvas(PyObject* self, PyObject* args) +py_gc_get_canvas(PyObject* self, PyObject* args) { GnomeCanvas* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris_get_canvas")) + if(!PyArg_ParseTuple(args, ":gc_get_canvas")) return NULL; /* Call the corresponding C function */ - result = gcompris_get_canvas(); + result = gc_get_canvas(); /* Create and return the result */ return (PyObject*) pygobject_new((GObject*) result); } -/* GtkWidget *gcompris_get_window(void); */ +/* GtkWidget *gc_get_window(void); */ static PyObject* -py_gcompris_get_window(PyObject* self, PyObject* args) +py_gc_get_window(PyObject* self, PyObject* args) { GtkWidget* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris_get_window")) + if(!PyArg_ParseTuple(args, ":gc_get_window")) return NULL; /* Call the corresponding C function */ - result = gcompris_get_window(); + result = gc_get_window(); /* Create and return the result */ return (PyObject*)pygobject_new((GObject*)result); @@ -603,19 +603,19 @@ py_gc_prop_get(PyObject* self, PyObject* args) return gcompris_new_pyGcomprisPropertiesObject(result); } -/* GcomprisBoard *gcompris_get_board_from_section(gchar *section); */ +/* GcomprisBoard *gc_menu_section_get(gchar *section); */ static PyObject* -py_gcompris_get_board_from_section(PyObject* self, PyObject* args) +py_gc_menu_section_get(PyObject* self, PyObject* args) { GcomprisBoard* result; gchar *section; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "s:gcompris_get_board_from_section", §ion)) + if(!PyArg_ParseTuple(args, "s:gc_menu_section_get", §ion)) return NULL; /* Call the corresponding C function */ - result = gcompris_get_board_from_section(section); + result = gc_menu_section_get(section); /* Create and return the result */ return gcompris_new_pyGcomprisBoardObject(result); @@ -922,34 +922,34 @@ py_gcompris_get_conf(PyObject* self, PyObject* args) } -/* GcomprisProfile *gcompris_get_current_profile(void); */ +/* GcomprisProfile *gc_profile_get_current(void); */ static PyObject* -py_gcompris_get_current_profile(PyObject* self, PyObject* args) +py_gc_profile_get_current(PyObject* self, PyObject* args) { GcomprisProfile* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris_get_current_profile")) + if(!PyArg_ParseTuple(args, ":gc_profile_get_current")) return NULL; /* Call the corresponding C function */ - result = gcompris_get_current_profile(); + result = gc_profile_get_current(); /* Create and return the result */ return gcompris_new_pyGcomprisProfileObject(result); } -/* GcomprisUser *gcompris_get_current_user(void); */ +/* GcomprisUser *gc_profile_get_current_user(void); */ static PyObject* -py_gcompris_get_current_user(PyObject* self, PyObject* args) +py_gc_profile_get_current_user(PyObject* self, PyObject* args) { GcomprisUser* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris_get_current_user")) + if(!PyArg_ParseTuple(args, ":gc_profile_get_current_user")) return NULL; /* Call the corresponding C function */ - result = gcompris_get_current_user(); + result = gc_profile_get_current_user(); /* Create and return the result */ return gcompris_new_pyGcomprisUserObject(result); @@ -1023,20 +1023,20 @@ static void pyGcomprisConfCallback(GHashTable* table){ static PyObject* -py_gcompris_configuration_window(PyObject* self, PyObject* args){ +py_gc_board_config_window_display(PyObject* self, PyObject* args){ PyObject* pyCallback; gchar *label; /* Parse arguments */ if(!PyArg_ParseTuple(args, - "sO:gcompris_configuration_window", + "sO:gc_board_config_window_display", &label, &pyCallback)) return NULL; if(!PyCallable_Check(pyCallback)) { PyErr_SetString(PyExc_TypeError, - "gcompris_configuration_window second argument must be callable"); + "gc_board_config_window_display second argument must be callable"); return NULL; } @@ -1050,7 +1050,7 @@ py_gcompris_configuration_window(PyObject* self, PyObject* args){ return (PyObject *) \ pygobject_new((GObject*) \ - gcompris_configuration_window( label, + gc_board_config_window_display( label, (GcomprisConfCallback )pyGcomprisConfCallback)); } @@ -1417,7 +1417,7 @@ py_gcompris_textview(PyObject* self, PyObject* args){ /* Parse arguments */ if(!PyArg_ParseTuple(args, - "sszzO:gcompris_configuration_window", + "sszzO:gc_board_config_window_display", &label, &key, &desc, @@ -1490,14 +1490,14 @@ py_gcompris_get_board_dirname (PyObject* self, PyObject* args) } static PyObject* -py_gcompris_get_current_user_dirname (PyObject* self, PyObject* args) +py_gc_profile_get_current_user_dirname (PyObject* self, PyObject* args) { /* Parse arguments */ if(!PyArg_ParseTuple(args, ":gcompris.get_current_user_dirname")) return NULL; /* Call the corresponding C function */ - return PyString_FromString(gcompris_get_current_user_dirname()); + return PyString_FromString(gc_profile_get_current_user_dirname()); } @@ -1533,7 +1533,7 @@ py_gcompris_wordlist_get_from_file (PyObject* self, PyObject* args) } static PyObject* -py_gcompris_im_reset (PyObject* self, PyObject* args) +py_gc_im_reset (PyObject* self, PyObject* args) { /* Parse arguments */ @@ -1541,7 +1541,7 @@ py_gcompris_im_reset (PyObject* self, PyObject* args) return NULL; /* Call the corresponding C function */ - gcompris_im_reset (); + gc_im_reset (); Py_INCREF(Py_None); return Py_None; @@ -1554,13 +1554,13 @@ py_gcompris_im_reset (PyObject* self, PyObject* args) static PyMethodDef PythonGcomprisModule[] = { { "end_board", py_gc_board_end, METH_VARARGS, "gc_board_end" }, { "bar_start", py_gc_bar_start, METH_VARARGS, "gc_bar_start" }, - { "set_background", py_gcompris_set_background, METH_VARARGS, "gcompris_set_background" }, + { "set_background", py_gc_set_background, METH_VARARGS, "gc_set_background" }, { "bar_set_level", py_gc_bar_set_level, METH_VARARGS, "gc_bar_set_level" }, { "bar_set_repeat_icon", py_gc_bar_set_repeat_icon, METH_VARARGS, "gc_bar_set_repeat_icon" }, { "bar_set", py_gc_bar_set, METH_VARARGS, "gc_bar_set" }, { "bar_hide", py_gc_bar_hide, METH_VARARGS, "gc_bar_hide" }, - { "get_canvas", py_gcompris_get_canvas, METH_VARARGS, "gcompris_get_canvas" }, - { "get_window", py_gcompris_get_window, METH_VARARGS, "gcompris_get_window" }, + { "get_canvas", py_gc_get_canvas, METH_VARARGS, "gc_get_canvas" }, + { "get_window", py_gc_get_window, METH_VARARGS, "gc_get_window" }, { "get_locale", py_gc_locale_get, METH_VARARGS, "gc_locale_get" }, { "get_user_default_locale", py_gc_locale_get_user_default, METH_VARARGS, "gc_locale_get_user_default" }, { "set_locale", py_gc_locale_set, METH_VARARGS, "gc_locale_set" }, @@ -1579,15 +1579,15 @@ static PyMethodDef PythonGcomprisModule[] = { METH_VARARGS, "gc_selector_file_stop" }, { "get_database", py_gc_db_get_filename, METH_VARARGS, "gc_db_get_filename" }, { "get_properties", py_gc_prop_get, METH_VARARGS, "gc_prop_get" }, - { "get_board_from_section", py_gcompris_get_board_from_section, METH_VARARGS, "gcompris_get_board_from_section" }, + { "get_board_from_section", py_gc_menu_section_get, METH_VARARGS, "gc_menu_section_get" }, { "spawn_async", (PyCFunction)py_gcompris_spawn_async, METH_VARARGS|METH_KEYWORDS, "gcompris_spawn_sync" }, { "child_watch_add", (PyCFunction)py_gcompris_child_watch_add, METH_VARARGS|METH_KEYWORDS, "gcompris_child_watch_add" }, { "get_board_conf", py_gcompris_get_board_conf, METH_VARARGS, "gcompris_get_board_conf" }, { "get_conf", py_gcompris_get_conf, METH_VARARGS, "gcompris_get_conf" }, { "set_board_conf", py_gcompris_set_board_conf, METH_VARARGS, "gcompris_set_board_conf" }, - { "get_current_profile", py_gcompris_get_current_profile, METH_VARARGS, "gcompris_get_current_profile" }, - { "get_current_user", py_gcompris_get_current_user, METH_VARARGS, "gcompris_get_current_user" }, - { "configuration_window", py_gcompris_configuration_window, METH_VARARGS, "gcompris_configuration_window" }, + { "get_current_profile", py_gc_profile_get_current, METH_VARARGS, "gc_profile_get_current" }, + { "get_current_user", py_gc_profile_get_current_user, METH_VARARGS, "gc_profile_get_current_user" }, + { "configuration_window", py_gc_board_config_window_display, METH_VARARGS, "gc_board_config_window_display" }, { "boolean_box", py_gcompris_boolean_box, METH_VARARGS, "gcompris_boolean_box" }, { "combo_box", py_gcompris_combo_box, METH_VARARGS, "gcompris_combo_box" }, { "radio_buttons", py_gcompris_radio_buttons, METH_VARARGS, "gcompris_radio_buttons" }, @@ -1602,11 +1602,11 @@ static PyMethodDef PythonGcomprisModule[] = { { "get_locales_asset_list", py_gc_locale_gets_asset_list, METH_VARARGS, "gc_locale_gets_asset_list" }, { "textview", py_gcompris_textview, METH_VARARGS, "gcompris_textview" }, { "get_user_dirname", py_gcompris_get_user_dirname, METH_VARARGS, "gcompris_get_user_dirname" }, - { "get_current_user_dirname", py_gcompris_get_current_user_dirname, METH_VARARGS, "gcompris_get_current_user_dirname" }, + { "get_current_user_dirname", py_gc_profile_get_current_user_dirname, METH_VARARGS, "gc_profile_get_current_user_dirname" }, { "get_board_dirname", py_gcompris_get_board_dirname, METH_VARARGS, "gcompris_get_board_dirname" }, { "get_current_board_dirname", py_gcompris_get_current_board_dirname, METH_VARARGS, "gcompris_get_current_board_dirname" }, { "get_wordlist", py_gcompris_wordlist_get_from_file, METH_VARARGS, "gcompris_wordlist_get_from_file" }, - { "im_reset", py_gcompris_im_reset, METH_VARARGS, "gcompris_im_reset" }, + { "im_reset", py_gc_im_reset, METH_VARARGS, "gc_im_reset" }, { NULL, NULL, 0, NULL} }; @@ -1682,10 +1682,10 @@ void python_gcompris_module_init(void) /* Initialize the sub modules */ python_gcompris_bonus_module_init(); - python_gcompris_score_module_init(); - python_gcompris_skin_module_init(); + python_gc_score_module_init(); + python_gc_skin_module_init(); python_gcompris_sound_module_init(); - python_gcompris_timer_module_init(); + python_gc_timer_module_init(); python_gcompris_utils_module_init(); python_gcompris_anim_module_init(); python_gcompris_admin_module_init(); diff --git a/src/boards/py-mod-score.c b/src/boards/py-mod-score.c index c635530..cf2adfd 100644 --- a/src/boards/py-mod-score.c +++ b/src/boards/py-mod-score.c @@ -9,21 +9,21 @@ * "*" C function. */ -/* void gcompris_score_start (ScoreStyleList style, guint x, guint y, guint max); */ +/* void gc_score_start (ScoreStyleList style, guint x, guint y, guint max); */ static PyObject* -py_gcompris_score_start(PyObject* self, PyObject* args) +py_gc_score_start(PyObject* self, PyObject* args) { int style; int x,y; guint max; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "iiii:gcompris_score_start", &style, &x, &y, &max)) + if(!PyArg_ParseTuple(args, "iiii:gc_score_start", &style, &x, &y, &max)) return NULL; if(max<0) return NULL; /* Call the corresponding C function */ - gcompris_score_start(style, x, y, max); + gc_score_start(style, x, y, max); /* Create and return the result */ Py_INCREF(Py_None); @@ -31,16 +31,16 @@ py_gcompris_score_start(PyObject* self, PyObject* args) } -/* void gcompris_score_end(); */ +/* void gc_score_end(); */ static PyObject* -py_gcompris_score_end(PyObject* self, PyObject* args) +py_gc_score_end(PyObject* self, PyObject* args) { /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris_score_end")) + if(!PyArg_ParseTuple(args, ":gc_score_end")) return NULL; /* Call the corresponding C function */ - gcompris_score_end(); + gc_score_end(); /* Create and return the result */ Py_INCREF(Py_None); @@ -48,19 +48,19 @@ py_gcompris_score_end(PyObject* self, PyObject* args) } -/* void gcompris_score_set(guint value); */ +/* void gc_score_set(guint value); */ static PyObject* -py_gcompris_score_set(PyObject* self, PyObject* args) +py_gc_score_set(PyObject* self, PyObject* args) { guint value; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "i:gcompris_score_set", &value)) + if(!PyArg_ParseTuple(args, "i:gc_score_set", &value)) return NULL; if(value<0) return NULL; /* Call the corresponding C function */ - gcompris_score_set(value); + gc_score_set(value); /* Create and return the result */ Py_INCREF(Py_None); @@ -69,13 +69,13 @@ py_gcompris_score_set(PyObject* self, PyObject* args) static PyMethodDef PythonGcomprisScoreModule[] = { - { "start", py_gcompris_score_start, METH_VARARGS, "gcompris_score_start" }, - { "end", py_gcompris_score_end, METH_VARARGS, "gcompris_score_end" }, - { "set", py_gcompris_score_set, METH_VARARGS, "gcompris_score_set" }, + { "start", py_gc_score_start, METH_VARARGS, "gc_score_start" }, + { "end", py_gc_score_end, METH_VARARGS, "gc_score_end" }, + { "set", py_gc_score_set, METH_VARARGS, "gc_score_set" }, { NULL, NULL, 0, NULL} }; -void python_gcompris_score_module_init(void) +void python_gc_score_module_init(void) { PyObject* module; module = Py_InitModule("_gcompris_score", PythonGcomprisScoreModule); @@ -83,7 +83,6 @@ void python_gcompris_score_module_init(void) /* Misc constants */ PyModule_AddIntConstant(module, "STYLE_NOTE", SCORESTYLE_NOTE ); PyModule_AddIntConstant(module, "STYLE_LIFE", SCORESTYLE_LIFE ); - PyModule_AddIntConstant(module, "LAST", SCORE_LAST ); } /* Some usefull code parts ... */ diff --git a/src/boards/py-mod-score.h b/src/boards/py-mod-score.h index 95a6295..c1ca7b5 100644 --- a/src/boards/py-mod-score.h +++ b/src/boards/py-mod-score.h @@ -1,6 +1,6 @@ #ifndef _PY_MOD_score_H_ #define _PY_MOD_score_H_ -void python_gcompris_score_module_init(void); +void python_gc_score_module_init(void); #endif diff --git a/src/boards/py-mod-skin.c b/src/boards/py-mod-skin.c index c6d4211..6ec0179 100644 --- a/src/boards/py-mod-skin.c +++ b/src/boards/py-mod-skin.c @@ -10,114 +10,114 @@ */ -/* gchar *gcompris_image_to_skin(gchar *imagename); */ +/* gchar *gc_skin_image_get(gchar *imagename); */ static PyObject* -py_gcompris_image_to_skin(PyObject* self, PyObject* args) +py_gc_skin_image_get(PyObject* self, PyObject* args) { gchar* imagename; gchar* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "s:gcompris_image_to_skin", &imagename)) + if(!PyArg_ParseTuple(args, "s:gc_skin_image_get", &imagename)) return NULL; /* Call the corresponding C function */ - result = gcompris_image_to_skin(imagename); + result = gc_skin_image_get(imagename); /* Create and return the result */ return Py_BuildValue("s", result); } -/* GdkPixbuf *gcompris_load_skin_pixmap(char *pixmapfile); */ +/* GdkPixbuf *gc_skin_pixmap_load(char *pixmapfile); */ static PyObject* -py_gcompris_load_skin_pixmap(PyObject* self, PyObject* args) +py_gc_skin_pixmap_load(PyObject* self, PyObject* args) { char* pixmapfile; GdkPixbuf* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "s:gcompris_load_skin_pixmap", &pixmapfile)) + if(!PyArg_ParseTuple(args, "s:gc_skin_pixmap_load", &pixmapfile)) return NULL; /* Call the corresponding C function */ - result = gcompris_load_skin_pixmap(pixmapfile); + result = gc_skin_pixmap_load(pixmapfile); /* Create and return the result */ return (PyObject*) pygobject_new((GObject*) result); } -/* guint32 gcompris_skin_get_color_default(gchar* id, guint32 def); */ +/* guint32 gc_skin_get_color_default(gchar* id, guint32 def); */ static PyObject* -py_gcompris_skin_get_color_default(PyObject* self, PyObject* args) +py_gc_skin_get_color_default(PyObject* self, PyObject* args) { gchar* id; guint32 def; guint32 result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "sl:gcompris_skin_get_color_default", &id, &def)) + if(!PyArg_ParseTuple(args, "sl:gc_skin_get_color_default", &id, &def)) return NULL; /* Call the corresponding C function */ - result = gcompris_skin_get_color_default(id, def); + result = gc_skin_get_color_default(id, def); /* Create and return the result */ return PyLong_FromUnsignedLong(result); } -/* gchar* gcompris_skin_get_font_default(gchar* id, gchar* def); */ +/* gchar* gc_skin_get_font_default(gchar* id, gchar* def); */ static PyObject* -py_gcompris_skin_get_font_default(PyObject* self, PyObject* args) +py_gc_skin_get_font_default(PyObject* self, PyObject* args) { gchar* id; gchar* def; gchar* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "ss:gcompris_skin_get_font_default", &id, &def)) + if(!PyArg_ParseTuple(args, "ss:gc_skin_get_font_default", &id, &def)) return NULL; /* Call the corresponding C function */ - result = gcompris_skin_get_font_default(id, def); + result = gc_skin_get_font_default(id, def); /* Create and return the result */ return Py_BuildValue("s", result); } -/* guint32 gcompris_skin_get_color(gchar* id); */ +/* guint32 gc_skin_get_color(gchar* id); */ static PyObject* -py_gcompris_skin_get_color(PyObject* self, PyObject* args) +py_gc_skin_get_color(PyObject* self, PyObject* args) { gchar* id; guint32 result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "s:gcompris_skin_get_color", &id)) + if(!PyArg_ParseTuple(args, "s:gc_skin_get_color", &id)) return NULL; /* Call the corresponding C function */ - result = gcompris_skin_get_color(id); + result = gc_skin_get_color(id); /* Create and return the result */ return PyLong_FromUnsignedLong(result); } -/* gchar* gcompris_skin_get_font(gchar* id); */ +/* gchar* gc_skin_get_font(gchar* id); */ static PyObject* -py_gcompris_skin_get_font(PyObject* self, PyObject* args) +py_gc_skin_get_font(PyObject* self, PyObject* args) { gchar* id; gchar* result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "s:gcompris_skin_get_font_default", &id)) + if(!PyArg_ParseTuple(args, "s:gc_skin_get_font_default", &id)) return NULL; /* Call the corresponding C function */ - result = gcompris_skin_get_font(id); + result = gc_skin_get_font(id); /* Create and return the result */ return Py_BuildValue("s", result); @@ -125,21 +125,21 @@ py_gcompris_skin_get_font(PyObject* self, PyObject* args) static PyMethodDef PythonGcomprisSkinModule[] = { - { "image_to_skin", py_gcompris_image_to_skin, METH_VARARGS, "gcompris_image_to_skin" }, - { "load_pixmap", py_gcompris_load_skin_pixmap, METH_VARARGS, "gcompris_load_skin_pixmap" }, - { "get_color_default", py_gcompris_skin_get_color_default, METH_VARARGS, - "gcompris_skin_get_color_default" }, - { "get_font_default", py_gcompris_skin_get_font_default, METH_VARARGS, - "gcompris_skin_get_font_default" }, - { "get_color", py_gcompris_skin_get_color, METH_VARARGS, - "gcompris_skin_get_color" }, - { "get_font", py_gcompris_skin_get_font, METH_VARARGS, - "gcompris_skin_get_font" }, + { "image_to_skin", py_gc_skin_image_get, METH_VARARGS, "gc_skin_image_get" }, + { "load_pixmap", py_gc_skin_pixmap_load, METH_VARARGS, "gc_skin_pixmap_load" }, + { "get_color_default", py_gc_skin_get_color_default, METH_VARARGS, + "gc_skin_get_color_default" }, + { "get_font_default", py_gc_skin_get_font_default, METH_VARARGS, + "gc_skin_get_font_default" }, + { "get_color", py_gc_skin_get_color, METH_VARARGS, + "gc_skin_get_color" }, + { "get_font", py_gc_skin_get_font, METH_VARARGS, + "gc_skin_get_font" }, { NULL, NULL, 0, NULL} }; -void python_gcompris_skin_module_init(void) +void python_gc_skin_module_init(void) { PyObject* module; module = Py_InitModule("_gcompris_skin", PythonGcomprisSkinModule); diff --git a/src/boards/py-mod-skin.h b/src/boards/py-mod-skin.h index 3deb61e..bee1ad9 100644 --- a/src/boards/py-mod-skin.h +++ b/src/boards/py-mod-skin.h @@ -1,6 +1,6 @@ #ifndef _PY_MOD_SKIN_H_ #define _PY_MOD_SKIN_H_ -void python_gcompris_skin_module_init(void); +void python_gc_skin_module_init(void); #endif diff --git a/src/boards/py-mod-sound.c b/src/boards/py-mod-sound.c index 66c3af7..f068e25 100644 --- a/src/boards/py-mod-sound.c +++ b/src/boards/py-mod-sound.c @@ -10,19 +10,19 @@ * "*" C function. */ -/*void gcompris_play_ogg_list( GList* files ); */ +/*void gc_sound_play_ogg_list( GList* files ); */ static PyObject* -py_gcompris_play_ogg_list(PyObject* self, PyObject* args) +py_gc_sound_play_ogg_list(PyObject* self, PyObject* args) { GList* list; PyObject* pylist; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "O:gcompris_play_ogg_list", &pylist)) + if(!PyArg_ParseTuple(args, "O:gc_sound_play_ogg_list", &pylist)) return NULL; list = (GList*) pygobject_get(pylist); /* Call the corresponding C function */ - gcompris_play_ogg_list(list); + gc_sound_play_ogg_list(list); /* Create and return the result */ Py_INCREF(Py_None); @@ -31,14 +31,14 @@ py_gcompris_play_ogg_list(PyObject* self, PyObject* args) -/* void gcompris_play_ogg(char *, ...); - The method: gcompris_play_ogg_list( GList* ) is used +/* void gc_sound_play_ogg(char *, ...); + The method: gc_sound_play_ogg_list( GList* ) is used to perform the core call. (Because there's no way to construct a variable argument function call. */ static PyObject* -py_gcompris_play_ogg(PyObject* self, PyObject* args) +py_gc_sound_play_ogg(PyObject* self, PyObject* args) { PyObject* item; GList* list = NULL; @@ -53,7 +53,7 @@ py_gcompris_play_ogg(PyObject* self, PyObject* args) } /* Call the corresponding C function */ - gcompris_play_ogg_list(list); + gc_sound_play_ogg_list(list); g_list_free(list); /* Create and return the result */ @@ -64,14 +64,14 @@ py_gcompris_play_ogg(PyObject* self, PyObject* args) static PyObject* -py_gcompris_reopen_sound(PyObject* self, PyObject* args) +py_gc_sound_reopen(PyObject* self, PyObject* args) { /* Parse arguments */ if(!PyArg_ParseTuple(args, ":gcompris.reopen_sound")) return NULL; /* Call the corresponding C function */ - gcompris_reopen_sound(); + gc_sound_reopen(); /* Create and return the result */ Py_INCREF(Py_None); @@ -79,14 +79,14 @@ py_gcompris_reopen_sound(PyObject* self, PyObject* args) } static PyObject* -py_gcompris_close_sound(PyObject* self, PyObject* args) +py_gc_sound_close(PyObject* self, PyObject* args) { /* Parse arguments */ if(!PyArg_ParseTuple(args, ":gcompris.close_sound")) return NULL; /* Call the corresponding C function */ - gcompris_close_sound(); + gc_sound_close(); /* Create and return the result */ Py_INCREF(Py_None); @@ -94,14 +94,14 @@ py_gcompris_close_sound(PyObject* self, PyObject* args) } static PyObject* -py_gcompris_pause_sound(PyObject* self, PyObject* args) +py_gc_sound_pause(PyObject* self, PyObject* args) { /* Parse arguments */ if(!PyArg_ParseTuple(args, ":gcompris.pause_sound")) return NULL; /* Call the corresponding C function */ - gcompris_pause_sound(); + gc_sound_pause(); /* Create and return the result */ Py_INCREF(Py_None); @@ -109,14 +109,14 @@ py_gcompris_pause_sound(PyObject* self, PyObject* args) } static PyObject* -py_gcompris_resume_sound(PyObject* self, PyObject* args) +py_gc_sound_resume(PyObject* self, PyObject* args) { /* Parse arguments */ if(!PyArg_ParseTuple(args, ":gcompris.sound.resume")) return NULL; /* Call the corresponding C function */ - gcompris_resume_sound(); + gc_sound_resume(); /* Create and return the result */ Py_INCREF(Py_None); @@ -166,14 +166,14 @@ void pyGcomprisSoundCallback(gchar *file){ static PyObject* -py_gcompris_play_ogg_cb(PyObject* self, PyObject* args) +py_gc_sound_play_ogg_cb(PyObject* self, PyObject* args) { gchar *file; PyObject* pyCallback; /* Parse arguments */ if(!PyArg_ParseTuple(args, - "sO:gcompris_play_ogg_cb", + "sO:gc_sound_play_ogg_cb", &file, &pyCallback)) return NULL; @@ -181,7 +181,7 @@ py_gcompris_play_ogg_cb(PyObject* self, PyObject* args) if(!PyCallable_Check(pyCallback)) { PyErr_SetString(PyExc_TypeError, - "gcompris_play_ogg_cb second argument must be callable"); + "gc_sound_play_ogg_cb second argument must be callable"); return NULL; } @@ -196,9 +196,9 @@ py_gcompris_play_ogg_cb(PyObject* self, PyObject* args) pyCallback); Py_INCREF(pyCallback); - g_warning("py_gcompris_play_ogg_cb %s", file); + g_warning("py_gc_sound_play_ogg_cb %s", file); - gcompris_play_ogg_cb( file, + gc_sound_play_ogg_cb( file, (GcomprisSoundCallback) pyGcomprisSoundCallback); /* Create and return the result */ @@ -208,13 +208,13 @@ py_gcompris_play_ogg_cb(PyObject* self, PyObject* args) } static PyMethodDef PythonGcomprisSoundModule[] = { - { "play_ogg_list", py_gcompris_play_ogg_list, METH_VARARGS, "gcompris_play_ogg_list" }, - { "play_ogg", py_gcompris_play_ogg, METH_VARARGS, "gcompris_play_ogg" }, - { "reopen", py_gcompris_reopen_sound, METH_VARARGS, "gcompris_reopen_sound" }, - { "close", py_gcompris_close_sound, METH_VARARGS, "gcompris_close_sound" }, - { "pause", py_gcompris_pause_sound, METH_VARARGS, "gcompris_pause_sound" }, - { "resume", py_gcompris_resume_sound, METH_VARARGS, "gcompris_resume_sound" }, - { "play_ogg_cb", py_gcompris_play_ogg_cb, METH_VARARGS, "gcompris_play_ogg_cb" }, + { "play_ogg_list", py_gc_sound_play_ogg_list, METH_VARARGS, "gc_sound_play_ogg_list" }, + { "play_ogg", py_gc_sound_play_ogg, METH_VARARGS, "gc_sound_play_ogg" }, + { "reopen", py_gc_sound_reopen, METH_VARARGS, "gc_sound_reopen" }, + { "close", py_gc_sound_close, METH_VARARGS, "gc_sound_close" }, + { "pause", py_gc_sound_pause, METH_VARARGS, "gc_sound_pause" }, + { "resume", py_gc_sound_resume, METH_VARARGS, "gc_sound_resume" }, + { "play_ogg_cb", py_gc_sound_play_ogg_cb, METH_VARARGS, "gc_sound_play_ogg_cb" }, { NULL, NULL, 0, NULL} }; diff --git a/src/boards/py-mod-timer.c b/src/boards/py-mod-timer.c index d0026c3..0e508a5 100644 --- a/src/boards/py-mod-timer.c +++ b/src/boards/py-mod-timer.c @@ -26,10 +26,10 @@ void pyTimerCallBack(){ } -/* void gcompris_timer_display +/* void gc_timer_display (int x, int y, TimerList type, int second, GcomprisTimerEnd gcomprisTimerEnd); */ static PyObject* -py_gcompris_timer_display(PyObject* self, PyObject* args) +py_gc_timer_display(PyObject* self, PyObject* args) { int x,y; int type; @@ -37,13 +37,13 @@ py_gcompris_timer_display(PyObject* self, PyObject* args) PyObject* pyCallback; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "iiiiO:gcompris_timer_display", &x, &y, &type, &second, &pyCallback)) + if(!PyArg_ParseTuple(args, "iiiiO:gc_timer_display", &x, &y, &type, &second, &pyCallback)) return NULL; if(!PyCallable_Check(pyCallback)) return NULL; pyTimerCallBackFunc = pyCallback; /* Call the corresponding C function */ - gcompris_timer_display(x, y, type, second, pyTimerCallBack ); + gc_timer_display(x, y, type, second, pyTimerCallBack ); /* Create and return the result */ Py_INCREF(Py_None); @@ -51,18 +51,18 @@ py_gcompris_timer_display(PyObject* self, PyObject* args) } -/* void gcompris_timer_add(int second); */ +/* void gc_timer_add(int second); */ static PyObject* -py_gcompris_timer_add(PyObject* self, PyObject* args) +py_gc_timer_add(PyObject* self, PyObject* args) { int second; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "i:gcompris_timer_add", &second)) + if(!PyArg_ParseTuple(args, "i:gc_timer_add", &second)) return NULL; /* Call the corresponding C function */ - gcompris_timer_add(second); + gc_timer_add(second); /* Create and return the result */ Py_INCREF(Py_None); @@ -70,16 +70,16 @@ py_gcompris_timer_add(PyObject* self, PyObject* args) } -/*void gcompris_timer_end(void); */ +/*void gc_timer_end(void); */ static PyObject* -py_gcompris_timer_end(PyObject* self, PyObject* args) +py_gc_timer_end(PyObject* self, PyObject* args) { /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris_timer_end")) + if(!PyArg_ParseTuple(args, ":gc_timer_end")) return NULL; /* Call the corresponding C function */ - gcompris_timer_end(); + gc_timer_end(); /* Create and return the result */ Py_INCREF(Py_None); @@ -87,36 +87,36 @@ py_gcompris_timer_end(PyObject* self, PyObject* args) } -/* guint gcompris_timer_get_remaining(); */ +/* guint gc_timer_get_remaining(); */ static PyObject* -py_gcompris_timer_get_remaining(PyObject* self, PyObject* args) +py_gc_timer_get_remaining(PyObject* self, PyObject* args) { guint result; /* Parse arguments */ - if(!PyArg_ParseTuple(args, ":gcompris_timer_get_remaining")) + if(!PyArg_ParseTuple(args, ":gc_timer_get_remaining")) return NULL; /* Call the corresponding C function */ - result = gcompris_timer_get_remaining(); + result = gc_timer_get_remaining(); /* Create and return the result */ return Py_BuildValue("i", result); } -/* void gcompris_timer_pause(gboolean pause); */ +/* void gc_timer_pause(gboolean pause); */ static PyObject* -py_gcompris_timer_pause(PyObject* self, PyObject* args) +py_gc_timer_pause(PyObject* self, PyObject* args) { gboolean pause; /* Parse arguments */ - if(!PyArg_ParseTuple(args, "i:gcompris_timer_pause", &pause)) + if(!PyArg_ParseTuple(args, "i:gc_timer_pause", &pause)) return NULL; /* Call the corresponding C function */ - gcompris_timer_pause(pause); + gc_timer_pause(pause); /* Create and return the result */ Py_INCREF(Py_None); @@ -125,18 +125,18 @@ py_gcompris_timer_pause(PyObject* self, PyObject* args) static PyMethodDef PythonGcomprisTimerModule[] = { - { "display", py_gcompris_timer_display, METH_VARARGS, "gcompris_timer_display" }, - { "add", py_gcompris_timer_add, METH_VARARGS, "gcompris_timer_add" }, - { "end", py_gcompris_timer_end, METH_VARARGS, "gcompris_timer_end" }, - { "get_remaining", py_gcompris_timer_get_remaining, METH_VARARGS, "gcompris_timer_get_remaining" }, - { "pause", py_gcompris_timer_pause, METH_VARARGS, "gcompris_timer_pause" }, + { "display", py_gc_timer_display, METH_VARARGS, "gc_timer_display" }, + { "add", py_gc_timer_add, METH_VARARGS, "gc_timer_add" }, + { "end", py_gc_timer_end, METH_VARARGS, "gc_timer_end" }, + { "get_remaining", py_gc_timer_get_remaining, METH_VARARGS, "gc_timer_get_remaining" }, + { "pause", py_gc_timer_pause, METH_VARARGS, "gc_timer_pause" }, { NULL, NULL, 0, NULL} }; -void python_gcompris_timer_module_init(void) +void python_gc_timer_module_init(void) { PyObject* module; - module = Py_InitModule("_gcompris_timer", PythonGcomprisTimerModule); + module = Py_InitModule("_gc_timer", PythonGcomprisTimerModule); /* TimerList constants */ PyModule_AddIntConstant(module, "TEXT", GCOMPRIS_TIMER_TEXT ); diff --git a/src/boards/py-mod-timer.h b/src/boards/py-mod-timer.h index 0fb5354..45a54a0 100644 --- a/src/boards/py-mod-timer.h +++ b/src/boards/py-mod-timer.h @@ -1,6 +1,6 @@ #ifndef _PY_MOD_TIMER_H_ #define _PY_MOD_TIMER_H_ -void python_gcompris_timer_module_init(void); +void python_gc_timer_module_init(void); #endif diff --git a/src/boards/python.c b/src/boards/python.c index a185512..9a6095b 100644 --- a/src/boards/python.c +++ b/src/boards/python.c @@ -47,9 +47,9 @@ static void pythonboard_ok (void); static void pythonboard_set_level (guint level); static void pythonboard_config(void); static void pythonboard_repeat (void); -static void pythonboard_config_start (GcomprisBoard *agcomprisBoard, +static void pythongc_board_config_start (GcomprisBoard *agcomprisBoard, GcomprisProfile *aProfile); -static void pythonboard_config_stop (void); +static void pythongc_board_config_stop (void); static gboolean pythonboard_is_ready = FALSE; @@ -75,8 +75,8 @@ static BoardPlugin menu_bp = pythonboard_set_level, pythonboard_config, pythonboard_repeat, - pythonboard_config_start, - pythonboard_config_stop + pythongc_board_config_start, + pythongc_board_config_stop }; static BoardPlugin *bp_board = NULL; @@ -554,7 +554,7 @@ static void pythonboard_repeat (void){ static gboolean python_run_by_config = FALSE; static void -pythonboard_config_start (GcomprisBoard *agcomprisBoard, +pythongc_board_config_start (GcomprisBoard *agcomprisBoard, GcomprisProfile *aProfile ) { @@ -671,7 +671,7 @@ pythonboard_config_start (GcomprisBoard *agcomprisBoard, * - call the board end function * - finalise python interpreter */ -static void pythonboard_config_stop (void){ +static void pythongc_board_config_stop (void){ PyObject* result = NULL; if(python_gcomprisBoard_config!=NULL){ diff --git a/src/boards/railroad.c b/src/boards/railroad.c index 26c74d6..46f2df2 100644 --- a/src/boards/railroad.c +++ b/src/boards/railroad.c @@ -147,7 +147,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) if(agcomprisBoard!=NULL) { gcomprisBoard=agcomprisBoard; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "railroad/railroad-bg.png"); for (i=0; imaxlevel=NUMBER_OF_LEVELS; gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS; /* Go to next level after this number of 'play' */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); - str = gcompris_image_to_skin("button_reload.png"); + str = gc_skin_image_get("button_reload.png"); pixmap = gc_pixmap_load(str); g_free(str); if(pixmap) { @@ -205,7 +205,7 @@ static void end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); railroad_destroy_all_items(); while(g_list_length(listPixmapEngines)>0) { @@ -277,7 +277,7 @@ static void railroad_next_level() railroad_destroy_all_items(); gamewon = FALSE; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); /* Try the next level */ railroad_create_item(gnome_canvas_root(gcomprisBoard->canvas)); @@ -403,10 +403,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } railroad_next_level(); } @@ -438,7 +438,7 @@ static void process_ok() for (i=0; icanvas), "read_colors/read_colors_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "read_colors/read_colors_background.png"); gcomprisBoard->level=1; gcomprisBoard->maxlevel=1; gc_bar_set(0); @@ -171,7 +171,7 @@ static void end_board () { if(gcomprisBoard!=NULL){ pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); read_colors_destroy_all_items(); // free list while (g_list_length(listColors) > 0) @@ -211,7 +211,7 @@ static void read_colors_next_level() { color_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", colors[GPOINTER_TO_INT(g_list_nth_data(listColors,0))], - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) (color_x1+color_x2)/2, "y", (double) (color_y1+color_y2)/2, "anchor", GTK_ANCHOR_CENTER, @@ -317,7 +317,7 @@ static void game_won() { listColors = g_list_remove(listColors, g_list_nth_data(listColors,0)); if( g_list_length(listColors) <= 0 ) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_TUXLOCO); + gc_bonus_end_display(BOARD_FINISHED_TUXLOCO); return; } @@ -327,7 +327,7 @@ static void game_won() { * * =====================================================================*/ static gboolean process_ok_timeout() { - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); if (!gamewon) errors--; if (errors <1) @@ -335,7 +335,7 @@ static gboolean process_ok_timeout() { update_clock(); if (errors <= 1) { - board_finished(BOARD_FINISHED_TOOMANYERRORS); + gc_bonus_end_display(BOARD_FINISHED_TOOMANYERRORS); } return FALSE; diff --git a/src/boards/reading.c b/src/boards/reading.c index 79e5784..7892cb1 100644 --- a/src/boards/reading.c +++ b/src/boards/reading.c @@ -184,8 +184,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard=agcomprisBoard; - img = gcompris_image_to_skin("reading-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("reading-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); wait_for_ready = TRUE; @@ -195,13 +195,13 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->maxlevel = 9; gc_bar_set(GC_BAR_CONFIG|GC_BAR_LEVEL); - font_size = PANGO_PIXELS(pango_font_description_get_size (pango_font_description_from_string (gcompris_skin_font_board_medium))); + font_size = PANGO_PIXELS(pango_font_description_get_size (pango_font_description_from_string (gc_skin_font_board_medium))); interline = (int) (1.5*font_size); PangoContext *pango_context = gtk_widget_get_pango_context (GTK_WIDGET(agcomprisBoard->canvas)); PangoFontMetrics* pango_metrics = pango_context_get_metrics (pango_context, - pango_font_description_from_string (gcompris_skin_font_board_medium), + pango_font_description_from_string (gc_skin_font_board_medium), pango_language_from_string (gc_locale_get())); int ascent = PANGO_PIXELS(pango_font_metrics_get_ascent (pango_metrics)); @@ -368,7 +368,7 @@ static GnomeCanvasItem *display_what_to_do(GnomeCanvasGroup *parent) gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", _("Please, check if the word"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) base_X, "y", (double) base_Y, "anchor", GTK_ANCHOR_CENTER, @@ -378,7 +378,7 @@ static GnomeCanvasItem *display_what_to_do(GnomeCanvasGroup *parent) gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", textToFind, - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) base_X, "y", (double) base_Y + 30, "anchor", GTK_ANCHOR_CENTER, @@ -388,7 +388,7 @@ static GnomeCanvasItem *display_what_to_do(GnomeCanvasGroup *parent) gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", _("is being displayed"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) base_X, "y", (double) base_Y + 60, "anchor", GTK_ANCHOR_CENTER, @@ -456,7 +456,7 @@ static gboolean reading_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(previousFocus.rootItem), gnome_canvas_text_get_type (), "text", word, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) 0, "y", (double) 0, "anchor", anchor, @@ -469,7 +469,7 @@ static gboolean reading_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(previousFocus.rootItem), gnome_canvas_text_get_type (), "markup", oldword, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) 0, "y", (double) 0, "anchor", anchor, @@ -543,7 +543,7 @@ static void ask_ready(gboolean status) } /*----- READY -----*/ - button_pixmap = gcompris_load_skin_pixmap("button_large2.png"); + button_pixmap = gc_skin_pixmap_load("button_large2.png"); item1 = gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), "pixbuf", button_pixmap, @@ -559,7 +559,7 @@ static void ask_ready(gboolean status) item2 = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("I am Ready"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) x_offset + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) y_offset + 40, @@ -583,7 +583,7 @@ static void ask_yes_no() return; /*----- YES -----*/ - button_pixmap = gcompris_load_skin_pixmap("button_large2.png"); + button_pixmap = gc_skin_pixmap_load("button_large2.png"); item = gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), "pixbuf", button_pixmap, @@ -599,7 +599,7 @@ static void ask_yes_no() item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("Yes, I saw it"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) x_offset + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) y_offset + 40, @@ -613,7 +613,7 @@ static void ask_yes_no() /*----- NO -----*/ y_offset += 100; - button_pixmap = gcompris_load_skin_pixmap("button_large2.png"); + button_pixmap = gc_skin_pixmap_load("button_large2.png"); item = gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), "pixbuf", button_pixmap, @@ -629,7 +629,7 @@ static void ask_yes_no() item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", _("No, it was not there"), - "font", gcompris_skin_font_board_big, + "font", gc_skin_font_board_big, "x", (double) x_offset + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) y_offset + 40, @@ -647,11 +647,11 @@ static void player_win() { gamewon = TRUE; wait_for_ready = TRUE; - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); /* Try the next level */ gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } @@ -678,7 +678,7 @@ static void player_loose() g_free(expected); g_free(got); - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); next_level_timer = g_timeout_add(3000, (GtkFunction)reading_next_level, NULL); } @@ -880,7 +880,7 @@ reading_config_start(GcomprisBoard *agcomprisBoard, agcomprisBoard->name, aProfile? aProfile->name: ""); - gcompris_configuration_window( label, + gc_board_config_window_display( label, (GcomprisConfCallback )conf_ok); g_free(label); diff --git a/src/boards/reversecount.c b/src/boards/reversecount.c index 4a68160..81a7e77 100644 --- a/src/boards/reversecount.c +++ b/src/boards/reversecount.c @@ -177,7 +177,7 @@ static void pause_board (gboolean pause) } if(leavenow == TRUE && pause == FALSE) - board_finished(BOARD_FINISHED_TOOMANYERRORS); + gc_bonus_end_display(BOARD_FINISHED_TOOMANYERRORS); board_paused = pause; } @@ -286,14 +286,14 @@ gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) static void process_error() { - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); errors--; if(errors==0) { gamewon = FALSE; leavenow = TRUE; reversecount_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } else { @@ -336,7 +336,7 @@ static void process_ok() static void reversecount_next_level() { - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), imageList[gcomprisBoard->level-1]); gc_bar_set_level(gcomprisBoard); @@ -410,7 +410,7 @@ static void reversecount_next_level() static void reversecount_destroy_all_items() { - gcompris_timer_end(); + gc_timer_end(); if(boardRootItem!=NULL) gtk_object_destroy (GTK_OBJECT(boardRootItem)); @@ -674,10 +674,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } reversecount_next_level(); } @@ -826,13 +826,13 @@ static gint animate_tux() if(fishItem!=NULL) gtk_object_destroy(GTK_OBJECT(fishItem)); - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); if(--number_of_fish == 0) { gamewon = TRUE; reversecount_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } else { diff --git a/src/boards/shapegame.c b/src/boards/shapegame.c index 95bb372..8901aa4 100644 --- a/src/boards/shapegame.c +++ b/src/boards/shapegame.c @@ -278,7 +278,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) tmp = g_malloc(strlen(gcomprisBoard->mode)); tmp = strcpy(tmp, gcomprisBoard->mode + 11); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), tmp); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), tmp); default_background = FALSE; g_free(tmp); } @@ -288,8 +288,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gchar *img; // Default case, load the default background - img = gcompris_image_to_skin("gcompris-shapebg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-shapebg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); } @@ -493,7 +493,7 @@ static gboolean increment_sublevel() gcomprisBoard->sublevel=0; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return FALSE; } @@ -589,11 +589,11 @@ static void process_ok() if(done) { gamewon = TRUE; - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); } else { - gcompris_display_bonus(gamewon, BONUS_FLOWER); + gc_bonus_display(gamewon, BONUS_FLOWER); } } @@ -661,7 +661,7 @@ static void shapegame_init_canvas(GnomeCanvasGroup *parent) NULL); /* Create the tooltip area */ - pixmap = gcompris_load_skin_pixmap("button_large.png"); + pixmap = gc_skin_pixmap_load("button_large.png"); tooltip_root_item = GNOME_CANVAS_GROUP( gnome_canvas_item_new (parent, gnome_canvas_group_get_type (), @@ -683,23 +683,23 @@ static void shapegame_init_canvas(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(tooltip_root_item), gnome_canvas_text_get_type (), "text", "", - "font", gcompris_skin_font_board_small, + "font", gc_skin_font_board_small, "x", (double)gdk_pixbuf_get_width(pixmap)/2 + 1.0, "y", 24.0 + 1.0, "anchor", GTK_ANCHOR_CENTER, "justification", GTK_JUSTIFY_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); tooltip_text_item = \ gnome_canvas_item_new (GNOME_CANVAS_GROUP(tooltip_root_item), gnome_canvas_text_get_type (), "text", "", - "font", gcompris_skin_font_board_small, + "font", gc_skin_font_board_small, "x", (double)gdk_pixbuf_get_width(pixmap)/2, "y", 24.0, "anchor", GTK_ANCHOR_CENTER, "justification", GTK_JUSTIFY_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); /* Hide the tooltip */ @@ -731,7 +731,7 @@ add_shape_to_list_of_shapes(Shape *shape) /* If the first list is full, add the previous/forward buttons */ if(g_hash_table_size(shapelist_table)==(shapeBox.nb_shape_x * shapeBox.nb_shape_y)) { - pixmap = gcompris_load_skin_pixmap("button_backward.png"); + pixmap = gc_skin_pixmap_load("button_backward.png"); previous_shapelist_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(shape_list_root_item), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -748,7 +748,7 @@ add_shape_to_list_of_shapes(Shape *shape) NULL); gdk_pixbuf_unref(pixmap); - pixmap = gcompris_load_skin_pixmap("button_forward.png"); + pixmap = gc_skin_pixmap_load("button_forward.png"); next_shapelist_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(shape_list_root_item), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -954,7 +954,7 @@ static void shape_goes_back_to_list(Shape *shape, GnomeCanvasItem *item) shape->icon_shape=NULL; gnome_canvas_item_hide(item); - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); } } @@ -1064,12 +1064,12 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) while ((p = strstr (soundfile, " "))) { *p='\0'; - gcompris_play_ogg(soundfile, NULL); + gc_sound_play_ogg(soundfile, NULL); soundfile=p+1; g_warning("soundfile = %s\n", soundfile); } - gcompris_play_ogg(soundfile, NULL); + gc_sound_play_ogg(soundfile, NULL); } break; @@ -1089,7 +1089,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) gnome_canvas_item_raise_to_top(shape_list_root_item); gnome_canvas_item_raise_to_top(item); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -1129,7 +1129,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) { Shape *targetshape = NULL; - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); dragging = FALSE; targetshape = find_closest_shape(item_x - offset_x, @@ -1290,7 +1290,7 @@ item_event_edition(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) fleur = gdk_cursor_new(GDK_FLEUR); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, fleur, @@ -1327,7 +1327,7 @@ item_event_edition(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) if(dragging) { - gcompris_canvas_item_ungrab(item, event->button.time); + gc_canvas_item_ungrab(item, event->button.time); gnome_canvas_item_raise_to_top(item); dragging = FALSE; @@ -1541,12 +1541,12 @@ static void create_title(char *name, double x, double y, GtkJustification justif gnome_canvas_item_new (GNOME_CANVAS_GROUP(shape_root_item), gnome_canvas_text_get_type (), "text", name, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", x + 1.0, "y", y + 1.0, "anchor", GTK_ANCHOR_CENTER, "justification", justification, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_raise_to_top(item); @@ -1555,7 +1555,7 @@ static void create_title(char *name, double x, double y, GtkJustification justif gnome_canvas_item_new (GNOME_CANVAS_GROUP(shape_root_item), gnome_canvas_text_get_type (), "text", name, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", x, "y", y, "anchor", GTK_ANCHOR_CENTER, @@ -1650,7 +1650,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) /* If the pixmapfile starts with skin: then get the skin relative image instead */ if(!strncmp(pixmapfile, "skin:", 5)) { gchar *oldpixmapfile = pixmapfile; - pixmapfile = gcompris_image_to_skin(oldpixmapfile+5); + pixmapfile = gc_skin_image_get(oldpixmapfile+5); g_free(oldpixmapfile); } } @@ -1758,9 +1758,9 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) /* get the COLOR of the Title Specified by skin reference */ color_text = (char *)xmlGetProp(xmlnode, BAD_CAST "color_skin"); if(color_text) { - color_rgba = gcompris_skin_get_color(color_text); + color_rgba = gc_skin_get_color(color_text); } else { - color_rgba = gcompris_skin_get_color("gcompris/content"); /* the default */ + color_rgba = gc_skin_get_color("gcompris/content"); /* the default */ } /* get the name and tooltip of the shape */ @@ -2125,7 +2125,7 @@ config_start(GcomprisBoard *agcomprisBoard, agcomprisBoard->name, aProfile? aProfile->name : ""); - gcompris_configuration_window( label, + gc_board_config_window_display( label, (GcomprisConfCallback )conf_ok); g_free(label); diff --git a/src/boards/smallnumbers.c b/src/boards/smallnumbers.c index 7e1a373..eb2a1b0 100644 --- a/src/boards/smallnumbers.c +++ b/src/boards/smallnumbers.c @@ -159,12 +159,12 @@ static void start_board (GcomprisBoard *agcomprisBoard) /* disable im_context */ gcomprisBoard->disable_im_context = TRUE; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery7_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery7_background.png"); gcomprisBoard->level = 1; gcomprisBoard->maxlevel = 9; gcomprisBoard->number_of_sublevel=10; - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); @@ -192,7 +192,7 @@ end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); smallnumbers_destroy_all_items(); } gcomprisBoard = NULL; @@ -293,7 +293,7 @@ static void smallnumbers_next_level() fallSpeed=5000-gcomprisBoard->level*200; imageZoom=0.9+(0.5/gcomprisBoard->level); gcomprisBoard->sublevel=1; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); } @@ -407,7 +407,7 @@ static void smallnumbers_create_item(GnomeCanvasGroup *parent) g_unichar_to_utf8(*unichar_letterItem, letter); - str1 = gcompris_alphabet_sound(letter); + str1 = gc_sound_alphabet(letter); g_free(letter); g_free(lettersItem); @@ -415,7 +415,7 @@ static void smallnumbers_create_item(GnomeCanvasGroup *parent) str2 = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1); - gcompris_play_ogg(str2, NULL); + gc_sound_play_ogg(str2, NULL); g_free(str1); g_free(str2); @@ -425,7 +425,7 @@ static void smallnumbers_create_item(GnomeCanvasGroup *parent) * Now the images */ str1 = g_strdup_printf("level%c.png", numbers[i]); - str2 = gcompris_image_to_skin(str1); + str2 = gc_skin_image_get(str1); smallnumbers_pixmap = gc_pixmap_load(str2); @@ -474,33 +474,33 @@ static gint smallnumbers_drop_items (GtkWidget *widget, gpointer data) static void player_win(GnomeCanvasItem *item) { gtk_object_destroy (GTK_OBJECT(item)); - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); gcomprisBoard->sublevel++; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); if(gcomprisBoard->sublevel>gcomprisBoard->number_of_sublevel) { /* Try the next level */ gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - gcompris_score_end(); - board_finished(BOARD_FINISHED_RANDOM); + gc_score_end(); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } gamewon = TRUE; smallnumbers_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } else { - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); } } static void player_loose() { - gcompris_play_ogg ("crash", NULL); + gc_sound_play_ogg ("crash", NULL); } @@ -589,7 +589,7 @@ smallnumber_config_start(GcomprisBoard *agcomprisBoard, label = g_strdup_printf("%s configuration\n for profile %s", agcomprisBoard->name, aProfile ? aProfile->name : ""); - gcompris_configuration_window(label, (GcomprisConfCallback )conf_ok); + gc_board_config_window_display(label, (GcomprisConfCallback )conf_ok); g_free(label); diff --git a/src/boards/submarine.c b/src/boards/submarine.c index 6232a18..95af0d5 100644 --- a/src/boards/submarine.c +++ b/src/boards/submarine.c @@ -243,7 +243,7 @@ static void pause_board (gboolean pause) static void start_board (GcomprisBoard *agcomprisBoard) { if(agcomprisBoard!=NULL) { gcomprisBoard=agcomprisBoard; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "submarine/sub_bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "submarine/sub_bg.jpg"); gcomprisBoard->level=1; gcomprisBoard->sublevel=1; submarine_next_level(); @@ -587,7 +587,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { speed_item_back = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + (ENGINE_UP_X + ENGINE_DOWN_X)/2 +1, "y", (double) schema_y + ENGINE_UP_Y + 1, "anchor", GTK_ANCHOR_CENTER, @@ -596,7 +596,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { speed_item_front = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + (ENGINE_UP_X + ENGINE_DOWN_X)/2, "y", (double) schema_y + ENGINE_UP_Y, "anchor", GTK_ANCHOR_CENTER, @@ -618,7 +618,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { ballast_av_air_item_back = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + BALLAST_AV_AIR_TEXT_X + 1, "y", (double) schema_y + BALLAST_AV_AIR_TEXT_Y + 1, "anchor", GTK_ANCHOR_CENTER, @@ -627,7 +627,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { ballast_av_air_item_front = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + BALLAST_AV_AIR_TEXT_X, "y", (double) schema_y + BALLAST_AV_AIR_TEXT_Y, "anchor", GTK_ANCHOR_CENTER, @@ -650,7 +650,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { ballast_ar_air_item_back = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + BALLAST_AR_AIR_TEXT_X + 1, "y", (double) schema_y + BALLAST_AR_AIR_TEXT_Y + 1, "anchor", GTK_ANCHOR_CENTER, @@ -659,7 +659,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { ballast_ar_air_item_front = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + BALLAST_AR_AIR_TEXT_X, "y", (double) schema_y + BALLAST_AR_AIR_TEXT_Y, "anchor", GTK_ANCHOR_CENTER, @@ -672,7 +672,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { air_item_back = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + AIR_X +1, "y", (double) schema_y + AIR_Y + 1, "anchor", GTK_ANCHOR_CENTER, @@ -681,7 +681,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { air_item_front = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + AIR_X, "y", (double) schema_y + AIR_Y, "anchor", GTK_ANCHOR_CENTER, @@ -693,7 +693,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { battery_item_back = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + BATTERY_X +1, "y", (double) schema_y + BATTERY_Y + 1, "anchor", GTK_ANCHOR_CENTER, @@ -702,7 +702,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { battery_item_front = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + BATTERY_X, "y", (double) schema_y + BATTERY_Y, "anchor", GTK_ANCHOR_CENTER, @@ -724,7 +724,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { regleur_item_back = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + REGLEUR_TEXT_X +1, "y", (double) schema_y + REGLEUR_TEXT_Y + 1, "anchor", GTK_ANCHOR_CENTER, @@ -733,7 +733,7 @@ static GnomeCanvasItem *submarine_create_item(GnomeCanvasGroup *parent) { regleur_item_front = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", s12, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) schema_x + REGLEUR_TEXT_X, "y", (double) schema_y + REGLEUR_TEXT_Y, "anchor", GTK_ANCHOR_CENTER, @@ -1057,7 +1057,7 @@ static gboolean update_timeout_slow() { /* magnetic detection (dist1) or collision with the whale (dist2 & dist3) */ if ( (dist1 < WHALE_DETECTION_RADIUS || dist2 < WHALE_DETECTION_RADIUS ||dist3 < WHALE_DETECTION_RADIUS) && !submarine_destroyed ) { - gcompris_play_ogg("sounds/crash.ogg", NULL); + gc_sound_play_ogg("sounds/crash.ogg", NULL); gnome_canvas_item_hide(whale); //gc_item_absolute_move(big_explosion, whale_x, whale_y); gnome_canvas_item_show(big_explosion); @@ -1137,7 +1137,7 @@ static void game_won() { gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_TUXLOCO); + gc_bonus_end_display(BOARD_FINISHED_TUXLOCO); return; } } @@ -1152,7 +1152,7 @@ static gboolean quit_after_delay() { return FALSE; } static gboolean ok_timeout() { - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); g_timeout_add(TIME_CLICK_TO_BONUS*5, quit_after_delay, NULL); return FALSE; } @@ -1483,7 +1483,7 @@ static void submarine_explosion() { submarine_destroyed = TRUE; gamewon = FALSE; - gcompris_play_ogg("sounds/crash.ogg", NULL); + gc_sound_play_ogg("sounds/crash.ogg", NULL); /* make the submarine die */ setSpeed(speed_ordered = submarine_horizontal_speed = 0.0); setBattery(battery = 0.0); diff --git a/src/boards/superbrain.c b/src/boards/superbrain.c index e4c8afb..a77c997 100644 --- a/src/boards/superbrain.c +++ b/src/boards/superbrain.c @@ -216,7 +216,7 @@ static void process_ok() { mark_pieces(); if(gamewon) - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } /*-------------------------------------------------------------------------------*/ @@ -227,7 +227,7 @@ static void superbrain_next_level() guint i; gboolean selected_color[MAX_COLORS]; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/superbrain_background.jpg"); gc_bar_set_level(gcomprisBoard); @@ -478,10 +478,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } superbrain_next_level(); } diff --git a/src/boards/target.c b/src/boards/target.c index 07475f1..2787dad 100644 --- a/src/boards/target.c +++ b/src/boards/target.c @@ -195,7 +195,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel=1; /* Go to next level after this number of 'play' */ - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/target_background.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/target_background.jpg"); target_next_level(); @@ -408,7 +408,7 @@ static void display_windspeed() gnome_canvas_item_new (speedRootItem, gnome_canvas_text_get_type (), "text", tmpstr, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) SPEED_CENTER_X, "y", (double) SPEED_CENTER_Y + 110, "anchor", GTK_ANCHOR_CENTER, @@ -457,7 +457,7 @@ static GnomeCanvasItem *target_create_item(GnomeCanvasGroup *parent) item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", tmpstr, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) 0, "y", (double) targetDefinition[gcomprisBoard->level-1].target_width_value[i*2] - 10, "anchor", GTK_ANCHOR_CENTER, @@ -476,7 +476,7 @@ static GnomeCanvasItem *target_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", tmpstr, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) 0, "y", (double) BOARDHEIGHT-TARGET_CENTER_Y -45, "anchor", GTK_ANCHOR_CENTER, @@ -498,10 +498,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } target_next_level(); } @@ -516,12 +516,12 @@ static void process_ok() { gamewon = TRUE; target_destroy_all_items(); - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } else { gamewon = FALSE; - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } } @@ -539,7 +539,7 @@ static void request_score() gchar *tmpstr; gc_bar_set(GC_BAR_LEVEL|GC_BAR_OK); - button_pixmap = gcompris_load_skin_pixmap("button_large2.png"); + button_pixmap = gc_skin_pixmap_load("button_large2.png"); gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), "pixbuf", button_pixmap, @@ -551,7 +551,7 @@ static void request_score() answer_item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", tmpstr, - "font", gcompris_skin_font_board_title_bold, + "font", gc_skin_font_board_title_bold, "x", (double) x_offset + gdk_pixbuf_get_width(button_pixmap)/2, "y", (double) y_offset + gdk_pixbuf_get_height(button_pixmap)/2, "anchor", GTK_ANCHOR_CENTER, diff --git a/src/boards/traffic.c b/src/boards/traffic.c index 932e1d1..6d4878e 100644 --- a/src/boards/traffic.c +++ b/src/boards/traffic.c @@ -155,12 +155,12 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->maxlevel=8; gcomprisBoard->sublevel=1; gcomprisBoard->number_of_sublevel=5; /* Go to next level after this number of 'play' */ - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); - str = gcompris_image_to_skin("button_reload.png"); + str = gc_skin_image_get("button_reload.png"); pixmap = gc_pixmap_load(str); g_free(str); if(pixmap) { @@ -171,8 +171,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT); } - img = gcompris_image_to_skin("traffic-bg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("traffic-bg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -188,7 +188,7 @@ static void end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); traffic_destroy_all_items(); } gcomprisBoard = NULL; @@ -244,7 +244,7 @@ static void traffic_next_level() traffic_destroy_all_items(); gamewon = FALSE; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); /* Try the next level */ traffic_create_item(gnome_canvas_root(gcomprisBoard->canvas)); @@ -309,10 +309,10 @@ static void game_won() gcomprisBoard->sublevel=1; gcomprisBoard->level++; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } traffic_next_level(); } @@ -417,7 +417,7 @@ static int car_cb(GnomeCanvasItem *item, GdkEvent *event, car *thiscar) cursor=gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); else cursor=gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); - gcompris_canvas_item_grab(item, + gc_canvas_item_grab(item, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, cursor, event->button.time); @@ -495,12 +495,12 @@ static int car_cb(GnomeCanvasItem *item, GdkEvent *event, car *thiscar) dx=CLAMP(item_x-start_x,-39,39); if (thiscar->goal && big_x==250+OFSET_X) { - gcompris_canvas_item_ungrab(item,event->button.time); + gc_canvas_item_ungrab(item,event->button.time); gnome_canvas_item_hide(item); moving=FALSE; gamewon = TRUE; - gcompris_display_bonus(gamewon, BONUS_SMILEY); + gc_bonus_display(gamewon, BONUS_SMILEY); } @@ -573,7 +573,7 @@ static int car_cb(GnomeCanvasItem *item, GdkEvent *event, car *thiscar) dy=*ptr-y; gnome_canvas_item_move(item,dx,dy); - gcompris_canvas_item_ungrab(item,event->button.time); + gc_canvas_item_ungrab(item,event->button.time); hit=0; moving=FALSE; } diff --git a/src/boards/wordprocessor.c b/src/boards/wordprocessor.c index 1142e17..d8610ce 100644 --- a/src/boards/wordprocessor.c +++ b/src/boards/wordprocessor.c @@ -162,8 +162,8 @@ static void start_board (GcomprisBoard *agcomprisBoard) gcomprisBoard->number_of_sublevel=1; /* Go to next level after this number of 'play' */ gc_bar_set(0); - img = gcompris_image_to_skin("gcompris-shapebg.jpg"); - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), + img = gc_skin_image_get("gcompris-shapebg.jpg"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), img); g_free(img); @@ -289,7 +289,7 @@ static void display_style_buttons(GnomeCanvasGroup *boardRootItem, _("TEXT"), "P", NULL, NULL }; - pixmap = gcompris_load_skin_pixmap("button_small.png"); + pixmap = gc_skin_pixmap_load("button_small.png"); offset_y = gdk_pixbuf_get_height(pixmap) + 10; text_x = gdk_pixbuf_get_width(pixmap) / 2; @@ -313,22 +313,22 @@ static void display_style_buttons(GnomeCanvasGroup *boardRootItem, item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", styles_tab[i], - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) x + text_x + 1, "y", (double) y + text_y + 1, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gtk_signal_connect(GTK_OBJECT(item), "event", (GtkSignalFunc) item_event, styles_tab[i+1] ); item = gnome_canvas_item_new (boardRootItem, gnome_canvas_text_get_type (), "text", styles_tab[i], - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "x", (double) x + text_x, "y", (double) y + text_y, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); gtk_signal_connect(GTK_OBJECT(item), "event", (GtkSignalFunc) item_event, styles_tab[i+1] ); diff --git a/src/boards/wordsgame.c b/src/boards/wordsgame.c index fc37294..b6a19bc 100644 --- a/src/boards/wordsgame.c +++ b/src/boards/wordsgame.c @@ -182,7 +182,7 @@ static void start_board (GcomprisBoard *agcomprisBoard) /* disable im_context */ //gcomprisBoard->disable_im_context = TRUE; - gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery_background.png"); + gc_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery_background.png"); gcomprisBoard->level = 1; @@ -220,13 +220,13 @@ end_board () if(gcomprisBoard!=NULL) { pause_board(TRUE); - gcompris_score_end(); + gc_score_end(); wordsgame_destroy_all_items(); if (preedit_text){ gtk_object_destroy(GTK_OBJECT(preedit_text)); preedit_text=NULL; } - gcompris_im_reset(); + gc_im_reset(); gcomprisBoard = NULL; if (gc_wordlist != NULL){ @@ -281,7 +281,7 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) preedit_text = \ gnome_canvas_item_new (gnome_canvas_root(gcomprisBoard->canvas), gnome_canvas_text_get_type (), - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) BOARDWIDTH/2, "y", (double) BOARDHEIGHT - 100, "anchor", GTK_ANCHOR_N, @@ -422,13 +422,13 @@ static void wordsgame_next_level() gcomprisBoard->number_of_sublevel = 10 + ((gcomprisBoard->level-1) * 5); - gcompris_score_start(SCORESTYLE_NOTE, + gc_score_start(SCORESTYLE_NOTE, gcomprisBoard->width - 220, gcomprisBoard->height - 50, gcomprisBoard->number_of_sublevel); gc_bar_set_level(gcomprisBoard); - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); wordsgame_destroy_all_items(); @@ -436,7 +436,7 @@ static void wordsgame_next_level() gtk_object_destroy(GTK_OBJECT(preedit_text)); preedit_text=NULL; } - gcompris_im_reset(); + gc_im_reset(); items=g_ptr_array_new(); items2del=g_ptr_array_new(); @@ -609,7 +609,7 @@ static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(item->rootitem), gnome_canvas_text_get_type (), "text", item->word, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) 0, "y", (double) 0, "anchor", GTK_ANCHOR_NW, @@ -620,7 +620,7 @@ static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent) gnome_canvas_item_new (GNOME_CANVAS_GROUP(item->rootitem), gnome_canvas_text_get_type (), "text", item->overword, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) 0, "y", (double) 0, "anchor", GTK_ANCHOR_NW, @@ -672,12 +672,12 @@ static gint wordsgame_drop_items (GtkWidget *widget, gpointer data) static void player_win(LettersItem *item) { - gcompris_play_ogg ("sounds/gobble.ogg", NULL); + gc_sound_play_ogg ("sounds/gobble.ogg", NULL); assert(gcomprisBoard!=NULL); gcomprisBoard->sublevel++; - gcompris_score_set(gcomprisBoard->sublevel); + gc_score_set(gcomprisBoard->sublevel); g_static_rw_lock_writer_lock (&items_lock); @@ -699,11 +699,11 @@ static void player_win(LettersItem *item) gcomprisBoard->level++; gcomprisBoard->sublevel = 0; if(gcomprisBoard->level>gcomprisBoard->maxlevel) { // the current board is finished : bail out - board_finished(BOARD_FINISHED_RANDOM); + gc_bonus_end_display(BOARD_FINISHED_RANDOM); return; } wordsgame_next_level(); - gcompris_play_ogg ("sounds/bonus.ogg", NULL); + gc_sound_play_ogg ("sounds/bonus.ogg", NULL); } else { @@ -739,5 +739,5 @@ static void player_win(LettersItem *item) static void player_loose() { - gcompris_play_ogg ("sounds/crash.ogg", NULL); + gc_sound_play_ogg ("sounds/crash.ogg", NULL); } diff --git a/src/gcompris/about.c b/src/gcompris/about.c index 0dc6f65..dbb7166 100644 --- a/src/gcompris/about.c +++ b/src/gcompris/about.c @@ -78,13 +78,13 @@ void gc_about_start () gc_bar_hide (TRUE); rootitem = \ - gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()), + gnome_canvas_item_new (gnome_canvas_root(gc_get_canvas()), gnome_canvas_group_get_type (), "x", (double)0, "y", (double)0, NULL); - pixmap = gcompris_load_skin_pixmap("help_bg.png"); + pixmap = gc_skin_pixmap_load("help_bg.png"); y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2; x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2; item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -99,60 +99,60 @@ void gc_about_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("About GCompris"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2 + 1.0, "y", (double) y_start + 40 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "weight", PANGO_WEIGHT_HEAVY, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("About GCompris"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2, "y", (double) y_start + 40, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_title, + "fill_color_rgba", gc_skin_color_title, "weight", PANGO_WEIGHT_HEAVY, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Translators:"), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) BOARDWIDTH/2-320 + 1.0, "y", (double) y_start + 90 + 1.0, "anchor", GTK_ANCHOR_NORTH_WEST, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Translators:"), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) BOARDWIDTH/2-320, "y", (double) y_start + 90, "anchor", GTK_ANCHOR_NORTH_WEST, - "fill_color_rgba", gcompris_skin_color_subtitle, + "fill_color_rgba", gc_skin_color_subtitle, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", translators, - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH/2-320 + 1.0, "y", (double) y_start + 120 + 1.0, "anchor", GTK_ANCHOR_NORTH_WEST, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", translators, - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH/2-320, "y", (double) y_start + 120, "anchor", GTK_ANCHOR_NORTH_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Version y_start += 100; @@ -160,44 +160,44 @@ void gc_about_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", "GCompris V" VERSION, - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2 + 1.0, "y", (double) y_start + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", "GCompris V" VERSION, - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2, "y", (double) y_start, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_subtitle, + "fill_color_rgba", gc_skin_color_subtitle, NULL); y_start += 180; gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", gettext(content), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.45 + 1.0, "y", (double) y_start + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", gettext(content), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.45, "y", (double) y_start, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Ofset Reference - pixmap = gcompris_load_skin_pixmap("ofsetlogo.png"); + pixmap = gc_skin_pixmap_load("ofsetlogo.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -210,15 +210,15 @@ void gc_about_start () item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", "OFSET\nhttp://ofset.org", - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) (BOARDWIDTH*0.15), "y", (double) y_start + 80, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba",gcompris_skin_color_subtitle, + "fill_color_rgba",gc_skin_color_subtitle, NULL); // FSF Reference - pixmap = gcompris_load_skin_pixmap("fsflogo.png"); + pixmap = gc_skin_pixmap_load("fsflogo.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -230,16 +230,16 @@ void gc_about_start () item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", "Free Software Foundation\nhttp://www.fsf.org", - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) (BOARDWIDTH*0.75), "y", (double) y_start + 80, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_subtitle, + "fill_color_rgba", gc_skin_color_subtitle, NULL); // GCompris Reference y_start += 70; - pixmap = gcompris_load_skin_pixmap("gcomprislogo.png"); + pixmap = gc_skin_pixmap_load("gcomprislogo.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -252,33 +252,33 @@ void gc_about_start () item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("GCompris Home Page\nhttp://gcompris.net"), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) (BOARDWIDTH*0.5), "y", (double) y_start + 30, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_subtitle, + "fill_color_rgba", gc_skin_color_subtitle, NULL); // Copyright item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", "Copyright 2000-2005 Bruno Coudoin", - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH/2, "y", (double) y - 95, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // License item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("This software is a GNU Package and is released under the GNU General Public License"), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH/2, "y", (double) y - 80, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); /* Location for a potential sponsor */ @@ -288,16 +288,16 @@ void gc_about_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", "Version parrainée par", - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.85, "y", (double) 10, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", "Version parrainée par", - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.85 + 1, "y", (double) 10, "anchor", GTK_ANCHOR_CENTER, @@ -317,7 +317,7 @@ void gc_about_start () } // OK - pixmap = gcompris_load_skin_pixmap("button_large.png"); + pixmap = gc_skin_pixmap_load("button_large.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -337,21 +337,21 @@ void gc_about_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5 + 1.0, "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "weight", PANGO_WEIGHT_HEAVY, NULL); item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5, "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, "weight", PANGO_WEIGHT_HEAVY, NULL); gtk_signal_connect(GTK_OBJECT(item2), "event", @@ -361,7 +361,7 @@ void gc_about_start () (GtkSignalFunc) gc_item_focus_event, item); - pixmap_about = gcompris_load_skin_pixmap("gcompris-about.png"); + pixmap_about = gc_skin_pixmap_load("gcompris-about.png"); plane_x = gdk_pixbuf_get_width(pixmap_about)/2; plane_y = gdk_pixbuf_get_height(pixmap_about)/2 + 40; @@ -421,7 +421,7 @@ void gc_about_stop () */ static gint move_plane (GtkWidget *widget, gpointer data) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); /* Manage the wrapping */ if(plane_x>gcomprisBoard->width) { diff --git a/src/gcompris/anim.c b/src/gcompris/anim.c index 07054ac..889b5a6 100644 --- a/src/gcompris/anim.c +++ b/src/gcompris/anim.c @@ -30,7 +30,8 @@ static GSList *active; /* private callback */ static gboolean anim_tick(void*); -GcomprisAnimation *gc_anim_load(char *filename) +GcomprisAnimation * +gc_anim_load(char *filename) { FILE *f = NULL; @@ -56,7 +57,7 @@ GcomprisAnimation *gc_anim_load(char *filename) /* read filenames, one per line, from the animation spec-file */ while(fscanf(f, "%99s", tmp) == 1) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); files = g_slist_append(files, g_strdup_printf("%s/%s", gcomprisBoard->board_dir, tmp)); } @@ -86,8 +87,9 @@ GcomprisAnimation *gc_anim_load(char *filename) return anim; } -GcomprisAnimCanvasItem *gc_anim_activate(GnomeCanvasGroup *parent, - GcomprisAnimation *anim) +GcomprisAnimCanvasItem * +gc_anim_activate(GnomeCanvasGroup *parent, + GcomprisAnimation *anim) { GcomprisAnimCanvasItem *item = g_malloc(sizeof(GcomprisAnimCanvasItem)); @@ -108,13 +110,15 @@ GcomprisAnimCanvasItem *gc_anim_activate(GnomeCanvasGroup *parent, return item; } -void gc_anim_swap(GcomprisAnimCanvasItem *item, GcomprisAnimation *new_anim) +void +gc_anim_swap(GcomprisAnimCanvasItem *item, GcomprisAnimation *new_anim) { item->anim = new_anim; gc_anim_set_state(item, 0); } -void gc_anim_deactivate(GcomprisAnimCanvasItem *item) +void +gc_anim_deactivate(GcomprisAnimCanvasItem *item) { GSList *node = g_slist_find( active, item ); if( !node ) @@ -133,7 +137,8 @@ void gc_anim_deactivate(GcomprisAnimCanvasItem *item) g_free(item); } -void gc_anim_free(GcomprisAnimation *anim) +void +gc_anim_free(GcomprisAnimation *anim) { int i; for(i=0; inumstates; i++) @@ -143,7 +148,8 @@ void gc_anim_free(GcomprisAnimation *anim) g_free(anim); } -void gc_anim_set_state(GcomprisAnimCanvasItem *item, int state) +void +gc_anim_set_state(GcomprisAnimCanvasItem *item, int state) { if(state < item->anim->numstates) { @@ -163,7 +169,8 @@ void gc_anim_set_state(GcomprisAnimCanvasItem *item, int state) /* private callback functions */ -static gboolean anim_tick(void *ignore) +static gboolean +anim_tick(void *ignore) { if(active == NULL) { diff --git a/src/gcompris/bar.c b/src/gcompris/bar.c index de3a998..ba5e114 100644 --- a/src/gcompris/bar.c +++ b/src/gcompris/bar.c @@ -87,7 +87,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) "y", (double)0, NULL); - pixmap = gcompris_load_skin_pixmap("bar_bg.jpg"); + pixmap = gc_skin_pixmap_load("bar_bg.jpg"); bar_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -99,7 +99,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) // EXIT if(properties->disable_quit == 0) { - pixmap = gcompris_load_skin_pixmap("button_exit.png"); + pixmap = gc_skin_pixmap_load("button_exit.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); exit_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -120,7 +120,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) } // HOME - pixmap = gcompris_load_skin_pixmap("home.png"); + pixmap = gc_skin_pixmap_load("home.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); home_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -141,7 +141,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) // OK - pixmap = gcompris_load_skin_pixmap("ok.png"); + pixmap = gc_skin_pixmap_load("ok.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); ok_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -162,7 +162,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) // LEVEL - pixmap = gcompris_load_skin_pixmap("level1.png"); + pixmap = gc_skin_pixmap_load("level1.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); level_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -183,7 +183,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) NULL); // REPEAT - pixmap = gcompris_load_skin_pixmap("repeat.png"); + pixmap = gc_skin_pixmap_load("repeat.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); repeat_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -203,7 +203,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) NULL); // HELP - pixmap = gcompris_load_skin_pixmap("help.png"); + pixmap = gc_skin_pixmap_load("help.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); help_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -225,7 +225,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) // CONFIG if(properties->disable_config == 0) { - pixmap = gcompris_load_skin_pixmap("config.png"); + pixmap = gc_skin_pixmap_load("config.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); config_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -246,7 +246,7 @@ void gc_bar_start (GnomeCanvas *theCanvas) } // ABOUT - pixmap = gcompris_load_skin_pixmap("about.png"); + pixmap = gc_skin_pixmap_load("about.png"); zoom = (double)(height-BAR_GAP)/(double)gdk_pixbuf_get_height(pixmap); about_item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -293,7 +293,7 @@ void gc_bar_set_level(GcomprisBoard *gcomprisBoard) { str = g_strdup_printf("level%d.png", gcomprisBoard->level); - pixmap = gcompris_load_skin_pixmap(str); + pixmap = gc_skin_pixmap_load(str); g_free(str); /* Warning changing the image needs to update pixbuf_ref for the focus usage */ @@ -347,7 +347,7 @@ gc_bar_set (const GComprisBarFlags flags) else gnome_canvas_item_hide(ok_item); - if(gc_help_has_board(get_current_gcompris_board())) + if(gc_help_has_board(gc_board_get_current())) gnome_canvas_item_show(help_item); else gnome_canvas_item_hide(help_item); @@ -356,7 +356,7 @@ gc_bar_set (const GComprisBarFlags flags) GdkPixbuf *pixmap; /* Set the repeat icon to the original one */ - pixmap = gcompris_load_skin_pixmap("repeat.png"); + pixmap = gc_skin_pixmap_load("repeat.png"); gnome_canvas_item_set (repeat_item, "pixbuf", pixmap, NULL); @@ -382,7 +382,7 @@ gc_bar_set (const GComprisBarFlags flags) gnome_canvas_item_hide(about_item); /* FIXME : Workaround for bugged canvas */ - // gnome_canvas_update_now(get_current_gcompris_board()->canvas); + // gnome_canvas_update_now(gc_board_get_current()->canvas); } @@ -423,10 +423,10 @@ gc_bar_hide (gboolean hide) static void update_exit_button() { - if(get_current_gcompris_board() == NULL) + if(gc_board_get_current() == NULL) return; - if (get_current_gcompris_board()->previous_board == NULL) + if (gc_board_get_current()->previous_board == NULL) { /* We are in the upper menu: show it */ if(exit_item) @@ -447,17 +447,17 @@ static void update_exit_button() */ static gint bar_play_sound (gchar *sound) { - int policy = getSoundPolicy(); + int policy = gc_sound_policy_get(); gchar *str; - setSoundPolicy(PLAY_ONLY_IF_IDLE); + gc_sound_policy_set(PLAY_ONLY_IF_IDLE); str = g_strdup_printf("sounds/$LOCALE/misc/%s.ogg", sound); - gcompris_play_ogg(str, NULL); + gc_sound_play_ogg(str, NULL); g_free(str); - setSoundPolicy(policy); + gc_sound_policy_set(policy); sound_play_id = 0; return (FALSE); } @@ -474,7 +474,7 @@ static void bar_reset_sound_id () static gint item_event_bar(GnomeCanvasItem *item, GdkEvent *event, gchar *data) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); switch (event->type) { @@ -516,12 +516,12 @@ item_event_bar(GnomeCanvasItem *item, GdkEvent *event, gchar *data) gchar *str_number; gchar *number_str = g_strdup_printf("%d", current_level); - gchar *current_level_str = gcompris_alphabet_sound(number_str); + gchar *current_level_str = gc_sound_alphabet(number_str); g_free(number_str); str_number = g_strdup_printf("sounds/$LOCALE/alphabet/%s", current_level_str); - gcompris_play_ogg("sounds/$LOCALE/misc/level.ogg", str_number, NULL); + gc_sound_play_ogg("sounds/$LOCALE/misc/level.ogg", str_number, NULL); g_free(str_number); g_free(current_level_str); @@ -534,13 +534,13 @@ item_event_bar(GnomeCanvasItem *item, GdkEvent *event, gchar *data) } else if(!strcmp((char *)data, "back")) { - gcompris_play_ogg ("gobble", NULL); + gc_sound_play_ogg ("gobble", NULL); gc_bar_hide (TRUE); board_stop(); } else if(!strcmp((char *)data, "help")) { - gcompris_play_ogg ("gobble", NULL); + gc_sound_play_ogg ("gobble", NULL); gc_help_start(gcomprisBoard); } else if(!strcmp((char *)data, "repeat")) @@ -555,7 +555,7 @@ item_event_bar(GnomeCanvasItem *item, GdkEvent *event, gchar *data) if(gcomprisBoard->plugin->config_start != NULL) { gcomprisBoard->plugin->config_start(gcomprisBoard, - gcompris_get_current_profile()); + gc_profile_get_current()); } } else if(!strcmp((char *)data, "about")) diff --git a/src/gcompris/board.c b/src/gcompris/board.c index b47d5d7..71cc8d3 100644 --- a/src/gcompris/board.c +++ b/src/gcompris/board.c @@ -21,6 +21,7 @@ #include #include "gcompris.h" +#include "gc_core.h" static struct BoardPluginData *bp_data; @@ -175,7 +176,7 @@ void init_plugins(void) } #endif -BoardPlugin *get_current_board_plugin(void) +BoardPlugin *gc_board_get_current_board_plugin(void) { if(bp_data->current_gcompris_board) return bp_data->current_gcompris_board->plugin; @@ -183,12 +184,12 @@ BoardPlugin *get_current_board_plugin(void) return NULL; } -GcomprisBoard *get_current_gcompris_board(void) +GcomprisBoard *gc_board_get_current(void) { return bp_data->current_gcompris_board; } -void set_current_gcompris_board(GcomprisBoard * gcomprisBoard) +void gc_board_set_current(GcomprisBoard * gcomprisBoard) { bp_data->current_gcompris_board = gcomprisBoard; } @@ -341,7 +342,7 @@ void board_play(GcomprisBoard *gcomprisBoard) gc_log_start(gcomprisBoard); bp = gcomprisBoard->plugin; - set_current_gcompris_board(gcomprisBoard); + gc_board_set_current(gcomprisBoard); bp->start_board(gcomprisBoard); bp_data->playing = TRUE; @@ -356,21 +357,21 @@ void board_play(GcomprisBoard *gcomprisBoard) void board_pause(int pause) { - if (get_board_playing() && get_current_board_plugin()) + if (get_board_playing() && gc_board_get_current_board_plugin()) { - if(get_current_board_plugin()->pause_board) - get_current_board_plugin()->pause_board(pause); + if(gc_board_get_current_board_plugin()->pause_board) + gc_board_get_current_board_plugin()->pause_board(pause); } } void board_stop(void) { - if (bp_data->playing && get_current_board_plugin()) + if (bp_data->playing && gc_board_get_current_board_plugin()) { bp_data->playing = FALSE; - if (get_current_board_plugin()->end_board) - get_current_board_plugin()->end_board(); + if (gc_board_get_current_board_plugin()->end_board) + gc_board_get_current_board_plugin()->end_board(); gc_board_end(); @@ -399,7 +400,7 @@ void board_run_next_end() next_board->previous_board->plugin->end_board(); /* reset the im context */ - gcompris_im_reset(); + gc_im_reset(); /*run the board */ board_play(next_board); @@ -407,7 +408,7 @@ void board_run_next_end() void board_run_next(GcomprisBoard *board) { - board->previous_board = get_current_gcompris_board(); + board->previous_board = gc_board_get_current(); next_board = board; diff --git a/src/gcompris/board.h b/src/gcompris/board.h index d3a6c26..c4e6a6d 100644 --- a/src/gcompris/board.h +++ b/src/gcompris/board.h @@ -49,10 +49,10 @@ struct BoardPluginData }; void init_plugins(void); -BoardPlugin *get_current_board_plugin(void); +BoardPlugin *gc_board_get_current_board_plugin(void); void set_current_board_plugin(BoardPlugin * ip); -GcomprisBoard *get_current_gcompris_board(void); -void set_current_gcompris_board(GcomprisBoard * gcomprisBoard); +GcomprisBoard *gc_board_get_current(void); +void gc_board_set_current(GcomprisBoard * gcomprisBoard); gboolean board_check_file(GcomprisBoard *gcomprisBoard); void board_play(GcomprisBoard *gcomprisBoard); void board_stop(void); diff --git a/src/gcompris/board_config.c b/src/gcompris/board_config.c index fbd2ce2..35b0343 100644 --- a/src/gcompris/board_config.c +++ b/src/gcompris/board_config.c @@ -27,16 +27,12 @@ static GcomprisBoard *config_board; -void board_config_start(GcomprisBoard *aBoard, GcomprisProfile *aProfile) +void +gc_board_config_start(GcomprisBoard *aBoard, GcomprisProfile *aProfile) { -/* if (config_board){ */ -/* g_warning("board_config_start Cannot configure two boards at same time !\n Call config_end on previous board before !"); */ -/* return; */ -/* } */ - if (aBoard->plugin == NULL){ - g_warning("board_config_start: board %s/%s is not initialised ? Hummmm...", aBoard->section,aBoard->name); + g_warning("gc_board_config_start: board %s/%s is not initialised ? Hummmm...", aBoard->section,aBoard->name); return; } @@ -53,7 +49,8 @@ void board_config_start(GcomprisBoard *aBoard, GcomprisProfile *aProfile) -void board_config_stop() +void +gc_board_config_stop() { if (!config_board) return; @@ -71,7 +68,8 @@ static GcomprisConfCallback Confcallback = NULL; static gchar *label_markup = NULL; -static void check_key(gchar *key) +static void +check_key(gchar *key) { if ((strcmp(key, "locale") == 0) || (strcmp(key, "locale_sound") == 0) || @@ -79,8 +77,9 @@ static void check_key(gchar *key) g_error(" Key %s forbiden ! Change !", key); } -void gcompris_close_board_conf (GtkDialog *dialog, - gpointer user_data) +void +gc_board_conf_close (GtkDialog *dialog, + gpointer user_data) { gtk_object_destroy(GTK_OBJECT(dialog)); g_hash_table_destroy (hash_conf); @@ -95,9 +94,10 @@ void gcompris_close_board_conf (GtkDialog *dialog, g_free(label_markup); } -void gcompris_response_board_conf (GtkButton *button, - gint arg1, - gpointer user_data) +void +_response_board_conf (GtkButton *button, + gint arg1, + gpointer user_data) { if (Confcallback){ @@ -120,15 +120,16 @@ void gcompris_response_board_conf (GtkButton *button, Confcallback = NULL; } - gcompris_close_board_conf (GTK_DIALOG(conf_window), NULL); + gc_board_conf_close (GTK_DIALOG(conf_window), NULL); } #ifdef XF86_VIDMODE static GdkEventConfigure gcompris_last_configure_event; -static gint gcompris_conf_window_configured(GtkWindow *window, - GdkEventConfigure *event, gpointer param) +static gint +_conf_window_configured(GtkWindow *window, + GdkEventConfigure *event, gpointer param) { gint new_x, new_y; double screen_width, screen_height; @@ -137,7 +138,7 @@ static gint gcompris_conf_window_configured(GtkWindow *window, if (memcmp(&gcompris_last_configure_event, event, sizeof(GdkEventConfigure))) { gnome_canvas_get_scroll_region( GNOME_CANVAS( gtk_bin_get_child( GTK_BIN( - gcompris_get_window()))), NULL, NULL, &screen_width, &screen_height); + gc_get_window()))), NULL, NULL, &screen_width, &screen_height); /* strange but gcompris.c sets the scrollheight to screen_height + 30 */ screen_height -= 30; new_x = ((gint)screen_width - event->width) / 2; @@ -152,7 +153,8 @@ static gint gcompris_conf_window_configured(GtkWindow *window, } #endif -GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback) +GtkVBox * +gc_board_config_window_display(gchar *label, GcomprisConfCallback callback) { GtkWidget *header; @@ -161,14 +163,15 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba hash_conf = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); /* main configuration window */ - conf_window = GTK_WINDOW(gtk_dialog_new_with_buttons ("GCompris", - GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET(get_current_gcompris_board()->canvas))), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, - GTK_STOCK_APPLY, - GTK_RESPONSE_APPLY, - NULL)); + conf_window = \ + GTK_WINDOW(gtk_dialog_new_with_buttons ("GCompris", + GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET(gc_board_get_current()->canvas))), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_APPLY, + GTK_RESPONSE_APPLY, + NULL)); /* parameters */ @@ -179,7 +182,7 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure)); gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK); gtk_signal_connect (GTK_OBJECT (conf_window), "configure_event", - GTK_SIGNAL_FUNC (gcompris_conf_window_configured), 0); + GTK_SIGNAL_FUNC (_conf_window_configured), 0); } else #endif @@ -190,8 +193,8 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba GcomprisProperties *properties = gc_prop_get(); if (properties->fullscreen && !properties->noxf86vm) - if (gdk_pointer_grab(gcompris_get_window()->window, TRUE, 0, - GDK_WINDOW(gcompris_get_window()), NULL, GDK_CURRENT_TIME) != + if (gdk_pointer_grab(gc_get_window()->window, TRUE, 0, + GDK_WINDOW(gc_get_window()), NULL, GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) g_warning("Pointer grab failed"); @@ -200,12 +203,12 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba g_signal_connect(G_OBJECT(conf_window), "response", - G_CALLBACK(gcompris_response_board_conf), + G_CALLBACK(_response_board_conf), NULL); g_signal_connect (G_OBJECT(conf_window), "close", - G_CALLBACK(gcompris_close_board_conf), + G_CALLBACK(gc_board_conf_close), NULL); @@ -231,8 +234,9 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba return main_conf_box; } -void gcompris_boolean_box_toggled (GtkToggleButton *togglebutton, - gpointer key) +void +gc_board_conf_boolean_box_toggled (GtkToggleButton *togglebutton, + gpointer key) { gchar *the_key = g_strdup((gchar *)key); gchar *value; @@ -245,7 +249,8 @@ void gcompris_boolean_box_toggled (GtkToggleButton *togglebutton, g_hash_table_replace(hash_conf, (gpointer) the_key, (gpointer) value); } -GtkCheckButton *gcompris_boolean_box(const gchar *label, gchar *key, gboolean initial_value) +GtkCheckButton * +gcompris_boolean_box(const gchar *label, gchar *key, gboolean initial_value) { check_key( key); @@ -264,7 +269,7 @@ GtkCheckButton *gcompris_boolean_box(const gchar *label, gchar *key, gboolean in g_signal_connect (G_OBJECT(CheckBox), "toggled", - G_CALLBACK(gcompris_boolean_box_toggled), + G_CALLBACK(gc_board_conf_boolean_box_toggled), key); return GTK_CHECK_BUTTON(CheckBox); @@ -391,9 +396,10 @@ static void radio_changed(GtkToggleButton *togglebutton, } } -static void create_radio_buttons(gpointer key, - gpointer value, - gpointer hash_radio) +static void +create_radio_buttons(gpointer key, + gpointer value, + gpointer hash_radio) { GtkWidget *radio_button; gchar *key_copy; @@ -420,8 +426,9 @@ static void create_radio_buttons(gpointer key, g_hash_table_replace ( hash_radio, (gpointer) key_copy, (gpointer) radio_button); } -static void destroy_hash (GtkObject *object, - gpointer hash_table) +static void +destroy_hash (GtkObject *object, + gpointer hash_table) { g_hash_table_destroy((GHashTable *)hash_table); radio_group = NULL; @@ -430,10 +437,11 @@ static void destroy_hash (GtkObject *object, g_free(radio_init); } -GHashTable *gcompris_radio_buttons(const gchar *label, - gchar *key, - GHashTable *buttons_label, - gchar *init) +GHashTable * +gcompris_radio_buttons(const gchar *label, + gchar *key, + GHashTable *buttons_label, + gchar *init) { check_key( key); @@ -481,8 +489,9 @@ GHashTable *gcompris_radio_buttons(const gchar *label, return buttons; } -static void spin_changed (GtkSpinButton *spinbutton, - gpointer key) +static void +spin_changed (GtkSpinButton *spinbutton, + gpointer key) { gchar *h_key = g_strdup((gchar *) key); gchar *h_value = g_strdup_printf("%d",gtk_spin_button_get_value_as_int (spinbutton)); @@ -490,7 +499,8 @@ static void spin_changed (GtkSpinButton *spinbutton, g_hash_table_replace (hash_conf, h_key, h_value); } -GtkSpinButton *gcompris_spin_int(const gchar *label, gchar *key, gint min, gint max, gint step, gint init) +GtkSpinButton * +gcompris_spin_int(const gchar *label, gchar *key, gint min, gint max, gint step, gint init) { check_key( key); @@ -546,7 +556,8 @@ GtkSpinButton *gcompris_spin_int(const gchar *label, gchar *key, gint min, gint } -GtkHSeparator *gcompris_separator() +GtkHSeparator * +gcompris_separator() { GtkWidget *separator = gtk_hseparator_new (); @@ -904,8 +915,10 @@ void *gcompris_textbuffer_changed (GtkTextBuffer *buffer, return NULL; } -void *gcompris_textview_yes (GtkButton *button, - gpointer user_data){ +void * +gcompris_textview_yes (GtkButton *button, + gpointer user_data) +{ user_param_type *params= (user_param_type *) user_data; @@ -948,13 +961,13 @@ void *gcompris_textview_yes (GtkButton *button, return NULL; } -GtkTextView *gcompris_textview(const gchar *label, - gchar *key, - const gchar*description, - gchar *init_text, - GcomprisTextCallback validate){ - - +GtkTextView * +gcompris_textview(const gchar *label, + gchar *key, + const gchar*description, + gchar *init_text, + GcomprisTextCallback validate) +{ GtkWidget*frame = gtk_frame_new ("GCompris text tool"); gtk_widget_show(frame); diff --git a/src/gcompris/board_config.h b/src/gcompris/board_config.h index 87185a3..e02d7ae 100644 --- a/src/gcompris/board_config.h +++ b/src/gcompris/board_config.h @@ -1,6 +1,6 @@ /* gcompris - board_config.h * - * Time-stamp: <2006/05/08 23:15:02 bruno> + * Time-stamp: <2006/08/29 01:12:58 bruno> * * Copyright (C) 2001 Pascal Georges * @@ -22,11 +22,9 @@ #ifndef BOARD_CONFIG_H #define BOARD_CONFIG_H -#include "gcompris.h" -gboolean board_config_check(GcomprisBoard *aBoard); -void board_config_start(GcomprisBoard *aBoard, - GcomprisProfile *aProfile); -void board_config_stop(); +void gc_board_config_start(GcomprisBoard *aBoard, + GcomprisProfile *aProfile); +void gc_board_config_stop(); /* Usefull fonctions for configuration of boards */ @@ -37,7 +35,7 @@ void board_config_stop(); /* the callback type */ typedef void (*GcomprisConfCallback) (GHashTable *table); -GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callback); +GtkVBox *gc_board_config_window_display(gchar *label, GcomprisConfCallback callback); GtkCheckButton *gcompris_boolean_box(const gchar *label, gchar *key, gboolean initial_value); @@ -91,13 +89,3 @@ GtkTextView *gcompris_textview(const gchar *label, const gchar*description, gchar *init_text, GcomprisTextCallback validate); - -/***********************************/ - -/* Local Variables: */ -/* mode:c */ -/* eval:(load-library "time-stamp") */ -/* eval:(make-local-variable 'write-file-hooks) */ -/* eval:(add-hook 'write-file-hooks 'time-stamp) */ -/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */ -/* End: */ diff --git a/src/gcompris/bonus.c b/src/gcompris/bonus.c index e81acfc..b81669b 100644 --- a/src/gcompris/bonus.c +++ b/src/gcompris/bonus.c @@ -19,7 +19,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "bonus.h" +#include "gcompris.h" +#include "gc_core.h" + +#include +#include #define SOUNDLISTFILE PACKAGE #define BONUS_DURATION 2000 @@ -30,10 +34,10 @@ static GnomeCanvasItem *door1_item = NULL; static GnomeCanvasItem *door2_item = NULL; static GnomeCanvasItem *tuxplane_item = NULL; -static gboolean board_finished_running = FALSE; +static gboolean gc_bonus_end_display_running = FALSE; static gboolean bonus_display_running = FALSE; -static gint end_bonus_id = 0, board_finished_id = 0; +static gint end_bonus_id = 0, gc_bonus_end_display_id = 0; //static gint end_board_count = 0; static int left_door_limit = 0; @@ -50,7 +54,7 @@ static gchar *greetingsList[] = "sounds/$LOCALE/misc/super.ogg", "sounds/$LOCALE/misc/perfect.ogg" }; -#define NUMBER_OF_GREETINGS 8 +#define NUMBER_OF_GREETINGS G_N_ELEMENTS(greetingsList) // List of sounds to use for loosing static gchar *loosingList[] = @@ -63,12 +67,13 @@ static gchar *loosingList[] = * Function definition * ------------------- */ -void bonus_image(char *,BonusStatusList); -void end_bonus(void); +static void bonus_image(char *,BonusStatusList); +static void end_bonus(void); /* ==================================== */ -void end_board_finished() { +static void +end_gc_bonus_end_display() { double dx1, dy1, dx2, dy2; //end_board_count++; gnome_canvas_item_get_bounds(tuxplane_item, &dx1, &dy1, &dx2, &dy2); @@ -78,9 +83,9 @@ void end_board_finished() { return; } - if (board_finished_id) { - gtk_timeout_remove(board_finished_id); - board_finished_id = 0; + if (gc_bonus_end_display_id) { + gtk_timeout_remove(gc_bonus_end_display_id); + gc_bonus_end_display_id = 0; } if(door1_item) @@ -94,37 +99,40 @@ void end_board_finished() { door2_item = NULL; tuxplane_item = NULL; - board_finished_running = FALSE; + gc_bonus_end_display_running = FALSE; gc_bar_hide(FALSE); // go back to previous board layout - if (get_current_board_plugin()->end_board) - get_current_board_plugin()->end_board(); + if (gc_board_get_current_board_plugin()->end_board) + gc_board_get_current_board_plugin()->end_board(); gc_board_end(); } /* ==================================== */ #define OFFSET 100 -void board_finished(BoardFinishedList type) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); +void +gc_bonus_end_display(BoardFinishedList type) { + GcomprisBoard *gcomprisBoard = gc_board_get_current(); int x,y; GdkPixbuf *pixmap_door1 = NULL,*pixmap_door2 = NULL,*pixmap_tuxplane = NULL; char * str = NULL; + g_assert(type < BOARD_FINISHED_LAST); + gc_bar_hide(TRUE); - if (board_finished_running) + if (gc_bonus_end_display_running) return; else - board_finished_running = TRUE; + gc_bonus_end_display_running = TRUE; /* First pause the board */ board_pause(TRUE); /* WARNING: I remove 1 to the BOARD_FINISHED_LAST because RANDOM is for GOOD end only */ if(type==BOARD_FINISHED_RANDOM) - type = RAND(1,BOARD_FINISHED_LAST-1); + type = RAND(1,BOARD_FINISHED_LAST-2); /* Record the end of board */ gc_log_end (gcomprisBoard, GCOMPRIS_LOG_STATUS_COMPLETED); @@ -196,15 +204,18 @@ void board_finished(BoardFinishedList type) { gdk_pixbuf_unref(pixmap_door2); gdk_pixbuf_unref(pixmap_tuxplane); - board_finished_id = gtk_timeout_add (TUX_TIME_STEP, (GtkFunction) end_board_finished, NULL); + gc_bonus_end_display_id = gtk_timeout_add (TUX_TIME_STEP, (GtkFunction) end_gc_bonus_end_display, NULL); } /* ==================================== */ -void gcompris_display_bonus(BonusStatusList gamewon, BonusList bonus_id) +void +gc_bonus_display(BonusStatusList gamewon, BonusList bonus_id) { gchar *absolute_file; + g_assert(bonus_id < BONUS_LAST); + gc_bar_hide(TRUE); if (bonus_display_running) @@ -217,29 +228,29 @@ void gcompris_display_bonus(BonusStatusList gamewon, BonusList bonus_id) if (absolute_file) { - gcompris_play_ogg(absolute_file, NULL); + gc_sound_play_ogg(absolute_file, NULL); g_free(absolute_file); } else - gcompris_play_ogg("sounds/wahoo.ogg", NULL); + gc_sound_play_ogg("sounds/wahoo.ogg", NULL); } else { absolute_file = gc_file_find_absolute(loosingList[RAND(0, NUMBER_OF_LOOSING-1)]); if (absolute_file) { - gcompris_play_ogg(absolute_file, NULL); + gc_sound_play_ogg(absolute_file, NULL); g_free(absolute_file); } else - gcompris_play_ogg("sounds/crash.ogg", NULL); + gc_sound_play_ogg("sounds/crash.ogg", NULL); } /* First pause the board */ board_pause(TRUE); if(bonus_id==BONUS_RANDOM) - bonus_id = RAND(1, BONUS_LAST); + bonus_id = RAND(1, BONUS_LAST-2); switch(bonus_id) { case BONUS_SMILEY : @@ -261,12 +272,13 @@ void gcompris_display_bonus(BonusStatusList gamewon, BonusList bonus_id) } /* ==================================== */ -void bonus_image(char *image, BonusStatusList gamewon) +static void +bonus_image(char *image, BonusStatusList gamewon) { char *str= NULL; int x,y; GdkPixbuf *pixmap = NULL; - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); /* check that bonus_group is a singleton */ if (bonus_group != NULL) { @@ -328,7 +340,7 @@ void bonus_image(char *image, BonusStatusList gamewon) gnome_canvas_item_new (bonus_group, gnome_canvas_text_get_type (), "text", _("Drawn game"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2 + 1.0, "y", (double) gdk_pixbuf_get_height(pixmap) + 1.0, "anchor", GTK_ANCHOR_CENTER, @@ -337,11 +349,11 @@ void bonus_image(char *image, BonusStatusList gamewon) gnome_canvas_item_new (bonus_group, gnome_canvas_text_get_type (), "text", _("Drawn game"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2, "y", (double) gdk_pixbuf_get_height(pixmap), "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_title, + "fill_color_rgba", gc_skin_color_title, NULL); } @@ -352,7 +364,8 @@ void bonus_image(char *image, BonusStatusList gamewon) } /* ==================================== */ -void end_bonus() +static void +end_bonus() { if (end_bonus_id) { gtk_timeout_remove (end_bonus_id); diff --git a/src/gcompris/bonus.h b/src/gcompris/bonus.h index 57f80cb..d6dd2e3 100644 --- a/src/gcompris/bonus.h +++ b/src/gcompris/bonus.h @@ -22,49 +22,44 @@ #ifndef BONUS_H #define BONUS_H -#include -#include -#include -#include "gcompris.h" - /* The time, in ms, between the click of the player, making a choice - and the moment the bonus appears. Only used when there is no thumb - in the board */ + * and the moment the bonus appears. Only used when there is no thumb + * in the board */ #define TIME_CLICK_TO_BONUS 800 /* BONUS_LAST is equals to the last available bonus type */ typedef enum { - BONUS_RANDOM = 0, - BONUS_SMILEY = 1, - BONUS_FLOWER = 2, - BONUS_TUX = 3, - BONUS_GNU = 4, - BONUS_LAST = 2 + BONUS_RANDOM, + BONUS_SMILEY, + BONUS_FLOWER, + BONUS_TUX, + BONUS_GNU, + BONUS_LAST } BonusList; typedef enum { - BOARD_FINISHED_RANDOM = 0, - BOARD_FINISHED_TUXPLANE = 1, - BOARD_FINISHED_TUXLOCO = 2, - BOARD_FINISHED_TOOMANYERRORS = 3, - BOARD_FINISHED_LAST = 3 + BOARD_FINISHED_RANDOM, + BOARD_FINISHED_TUXPLANE, + BOARD_FINISHED_TUXLOCO, + BOARD_FINISHED_TOOMANYERRORS, + BOARD_FINISHED_LAST } BoardFinishedList; typedef enum { - BOARD_LOOSE = 0, - BOARD_WIN = 1, - BOARD_DRAW = 2, + BOARD_LOOSE, + BOARD_WIN, + BOARD_DRAW, } BonusStatusList; /* * Public BONUS API Entry * ---------------------- */ -void gcompris_display_bonus(BonusStatusList, BonusList); -void board_finished(BoardFinishedList); +void gc_bonus_display(BonusStatusList, BonusList); +void gc_bonus_end_display(BoardFinishedList); #endif diff --git a/src/gcompris/config.c b/src/gcompris/config.c index 1fd18dc..a8e2f2e 100644 --- a/src/gcompris/config.c +++ b/src/gcompris/config.c @@ -145,7 +145,8 @@ static void display_previous_next(guint x_start, guint y_start, /* * Do all the bar display and register the events */ -void gcompris_config_start () +void +gc_config_start () { GcomprisProperties *properties = gc_prop_get(); GdkPixbuf *pixmap = NULL; @@ -165,13 +166,13 @@ void gcompris_config_start () gc_bar_hide(TRUE); rootitem = \ - gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()), + gnome_canvas_item_new (gnome_canvas_root(gc_get_canvas()), gnome_canvas_group_get_type (), "x", (double)0, "y", (double)0, NULL); - pixmap = gcompris_load_skin_pixmap("help_bg.png"); + pixmap = gc_skin_pixmap_load("help_bg.png"); y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2; x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2; item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -186,26 +187,26 @@ void gcompris_config_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("GCompris Configuration"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2 + 1.0, "y", (double) y_start + 40 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "weight", PANGO_WEIGHT_HEAVY, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("GCompris Configuration"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2, "y", (double) y_start + 40, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_title, + "fill_color_rgba", gc_skin_color_title, "weight", PANGO_WEIGHT_HEAVY, NULL); - pixmap_checked = gcompris_load_skin_pixmap("button_checked.png"); - pixmap_unchecked = gcompris_load_skin_pixmap("button_unchecked.png"); + pixmap_checked = gc_skin_pixmap_load("button_checked.png"); + pixmap_unchecked = gc_skin_pixmap_load("button_unchecked.png"); x_start += 150; @@ -226,7 +227,7 @@ void gcompris_config_start () NULL); /* Display a bad icon if this locale is not available */ - pixmap = gcompris_load_skin_pixmap("mini_bad.png"); + pixmap = gc_skin_pixmap_load("mini_bad.png"); item_bad_flag = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -244,11 +245,11 @@ void gcompris_config_start () item_locale_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", gc_locale_get_name(current_locale), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Fullscreen / Window @@ -272,11 +273,11 @@ void gcompris_config_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Fullscreen"), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Screen size @@ -287,11 +288,11 @@ void gcompris_config_start () item_screen_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", gettext(screenname[properties->screensize]), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Music @@ -315,11 +316,11 @@ void gcompris_config_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Music"), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Effect @@ -343,11 +344,11 @@ void gcompris_config_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Effect"), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Timer @@ -358,11 +359,11 @@ void gcompris_config_start () item_timer_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", gettext(timername[properties->timer]), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // Skin @@ -419,11 +420,11 @@ void gcompris_config_start () item_skin_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", first_skin_name, - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); g_free(first_skin_name); } @@ -439,16 +440,16 @@ void gcompris_config_start () item_filter_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "markup", gettext(filtername[0]), - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) x_text_start, "y", (double) y_start, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_color_content, + "fill_color_rgba", gc_skin_color_content, NULL); // OK - pixmap = gcompris_load_skin_pixmap("button_large.png"); + pixmap = gc_skin_pixmap_load("button_large.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -466,21 +467,21 @@ void gcompris_config_start () gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5 + 1.0, "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "weight", PANGO_WEIGHT_HEAVY, NULL); item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5, "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, "weight", PANGO_WEIGHT_HEAVY, NULL); gtk_signal_connect(GTK_OBJECT(item2), "event", @@ -495,7 +496,7 @@ void gcompris_config_start () is_displayed = TRUE; } -void gcompris_config_stop () +void gc_config_stop () { // Destroy the help box if(rootitem!=NULL) @@ -525,6 +526,31 @@ void gcompris_config_stop () } +/** + * Given the locale name, return the full translated name + * If not found, simply return the name + */ +gchar* +gc_locale_get_name(gchar *locale) +{ + guint i = 0; + + /* en (US) is not in the Linguas table */ + if(locale[0] != '\0' && !strncmp(locale, "en", strlen(locale))) + return(_("English (United State)")); + + while(linguas[i] != NULL) + { + + if(!strncmp(locale, linguas[i], strlen(locale))) + return(gettext(linguas[i+1])); + + i=i+2; + } + // Oups this locale is not in the table. Return the first one (system default) + return(linguas[1]); +} + /*-------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------*/ @@ -536,7 +562,7 @@ display_previous_next(guint x_start, guint y_start, GdkPixbuf *pixmap = NULL; GnomeCanvasItem *item; - pixmap = gcompris_load_skin_pixmap("button_backward.png"); + pixmap = gc_skin_pixmap_load("button_backward.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -553,7 +579,7 @@ display_previous_next(guint x_start, guint y_start, gdk_pixbuf_unref(pixmap); - pixmap = gcompris_load_skin_pixmap("button_forward.png"); + pixmap = gc_skin_pixmap_load("button_forward.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), "pixbuf", pixmap, @@ -570,7 +596,8 @@ display_previous_next(guint x_start, guint y_start, gdk_pixbuf_unref(pixmap); } -static void set_locale_flag(gchar *locale) +static void +set_locale_flag(gchar *locale) { gchar *filename; GdkPixbuf *pixmap = NULL; @@ -626,34 +653,10 @@ static void set_locale_flag(gchar *locale) /** - * Given the locale name, return the full translated name - * If not found, simply return the name - */ -gchar* -gc_locale_get_name(gchar *locale) -{ - guint i = 0; - - /* en (US) is not in the Linguas table */ - if(locale[0] != '\0' && !strncmp(locale, "en", strlen(locale))) - return(_("English (United State)")); - - while(linguas[i] != NULL) - { - - if(!strncmp(locale, linguas[i], strlen(locale))) - return(gettext(linguas[i+1])); - - i=i+2; - } - // Oups this locale is not in the table. Return the first one (system default) - return(linguas[1]); -} - -/** * Given the short locale name, return the next one in our linguas table */ -static gchar *get_next_locale(gchar *locale) +static gchar * +get_next_locale(gchar *locale) { guint i = 0; @@ -677,7 +680,8 @@ static gchar *get_next_locale(gchar *locale) /** * Given the short locale name, return the previous one in our linguas table */ -static gchar *get_previous_locale(gchar *locale) +static gchar * +get_previous_locale(gchar *locale) { guint i = 0; @@ -725,12 +729,12 @@ item_event_ok(GnomeCanvasItem *item, GdkEvent *event, gpointer data) gc_locale_set(current_locale); } properties->skin = g_strdup((char *)g_list_nth_data(skinlist, skin_index)); - gcompris_skin_load(properties->skin); - gcompris_config_stop(); - gcompris_properties_save(properties); + gc_skin_load(properties->skin); + gc_config_stop(); + gc_prop_save(properties); if(properties->music || properties->fx) { - initSound(); + gc_sound_init(); } } else if(!strcmp((char *)data, "fullscreen")) diff --git a/src/gcompris/dialog.c b/src/gcompris/dialog.c index 81f69f3..af0cea5 100644 --- a/src/gcompris/dialog.c +++ b/src/gcompris/dialog.c @@ -57,7 +57,7 @@ void gc_dialog_close() { */ void gc_dialog(gchar *str, DialogBoxCallBack dbcb) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); GnomeCanvasItem *item_text = NULL; GnomeCanvasItem *item_text_ok = NULL; GdkPixbuf *pixmap_dialog = NULL; @@ -88,7 +88,7 @@ void gc_dialog(gchar *str, DialogBoxCallBack dbcb) "y", (double) 0, NULL)); - pixmap_dialog = gcompris_load_skin_pixmap("dialogbox.png"); + pixmap_dialog = gc_skin_pixmap_load("dialogbox.png"); itemDialogText = gnome_canvas_item_new (rootDialogItem, gnome_canvas_pixbuf_get_type (), @@ -101,12 +101,12 @@ void gc_dialog(gchar *str, DialogBoxCallBack dbcb) item_text_ok = gnome_canvas_item_new (rootDialogItem, gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5, "y", (double) (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap_dialog))/2 + gdk_pixbuf_get_height(pixmap_dialog) - 35, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, "weight", PANGO_WEIGHT_HEAVY, NULL); @@ -136,7 +136,7 @@ void gc_dialog(gchar *str, DialogBoxCallBack dbcb) buffer = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_text)); txt_tag = gtk_text_buffer_create_tag(buffer, NULL, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, "foreground", "blue", "family-set", TRUE, NULL); diff --git a/src/gcompris/file_selector.c b/src/gcompris/file_selector.c index 3d93b48..87a5486 100644 --- a/src/gcompris/file_selector.c +++ b/src/gcompris/file_selector.c @@ -139,7 +139,7 @@ void gc_selector_file_load (GcomprisBoard *gcomprisBoard, gchar *rootdir, */ void gc_selector_file_stop () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); if(gcomprisBoard!=NULL && file_selector_displayed) board_pause(FALSE); @@ -194,9 +194,9 @@ display_file_selector(int the_mode, mode = the_mode; /* Get the coordinate x y of the control area from the skin */ - control_area_x1 = gcompris_skin_get_number_default("gcompris/fileselectx", 85); - control_area_y1 = gcompris_skin_get_number_default("gcompris/fileselecty", 80); - directory_label_y = gcompris_skin_get_number_default("gcompris/fileselectdiry", 180); + control_area_x1 = gc_skin_get_number_default("gcompris/fileselectx", 85); + control_area_y1 = gc_skin_get_number_default("gcompris/fileselecty", 80); + directory_label_y = gc_skin_get_number_default("gcompris/fileselectdiry", 180); if(file_types) { file_types_string = g_strdup(file_types); @@ -213,13 +213,13 @@ display_file_selector(int the_mode, fileSelectorCallBack=iscb; rootitem = \ - gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()), + gnome_canvas_item_new (gnome_canvas_root(gc_get_canvas()), gnome_canvas_group_get_type (), "x", (double)0, "y", (double)0, NULL); - pixmap = gcompris_load_skin_pixmap("file_selector_bg.png"); + pixmap = gc_skin_pixmap_load("file_selector_bg.png"); y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2; x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2; item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -311,7 +311,7 @@ display_file_selector(int the_mode, * ------- */ - pixmap = gcompris_load_skin_pixmap("button_large.png"); + pixmap = gc_skin_pixmap_load("button_large.png"); // CANCEL item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -331,11 +331,11 @@ display_file_selector(int the_mode, item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("CANCEL"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.33, "y", (double) y - gdk_pixbuf_get_height(pixmap), "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); gtk_signal_connect(GTK_OBJECT(item2), "event", (GtkSignalFunc) item_event_file_selector, @@ -362,11 +362,11 @@ display_file_selector(int the_mode, item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", (mode==MODE_LOAD ? _("LOAD") : _("SAVE")), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.66, "y", (double) y - gdk_pixbuf_get_height(pixmap), "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); gtk_signal_connect(GTK_OBJECT(item2), "event", (GtkSignalFunc) item_event_file_selector, @@ -380,8 +380,8 @@ display_file_selector(int the_mode, file_selector_displayed = TRUE; - full_rootdir = g_strconcat(gcompris_get_current_user_dirname(), "/", rootdir, NULL); - create_rootdir(full_rootdir); + full_rootdir = g_strconcat(gc_profile_get_current_user_dirname(), "/", rootdir, NULL); + gc_util_create_rootdir(full_rootdir); current_rootdir = full_rootdir; @@ -472,7 +472,7 @@ static void display_files(GnomeCanvasItem *root_item, gchar *rootdir) "y1", (double) 0, "x2", (double) DRAWING_AREA_X2- DRAWING_AREA_X1, "y2", (double) DRAWING_AREA_Y2-DRAWING_AREA_Y1, - "fill_color_rgba", gcompris_skin_get_color("gcompris/fileselectbg"), + "fill_color_rgba", gc_skin_get_color("gcompris/fileselectbg"), NULL); @@ -503,7 +503,7 @@ static void display_files(GnomeCanvasItem *root_item, gchar *rootdir) "text", rootdir, "x", (double)control_area_x1, "y", (double)directory_label_y, - "fill_color_rgba", gcompris_skin_get_color("gcompris/fileselectcol"), + "fill_color_rgba", gc_skin_get_color("gcompris/fileselectcol"), "anchor", GTK_ANCHOR_NW, NULL); @@ -544,7 +544,7 @@ static void display_files(GnomeCanvasItem *root_item, gchar *rootdir) if(g_file_test(allfilename, G_FILE_TEST_IS_DIR)) { - pixmap_current = gc_pixmap_load(gcompris_image_to_skin("directory.png")); + pixmap_current = gc_pixmap_load(gc_skin_image_get("directory.png")); } else if(ext) { /* Need to find an icon for this extension */ GcomprisMimeType *mimeType = NULL; @@ -556,19 +556,19 @@ static void display_files(GnomeCanvasItem *root_item, gchar *rootdir) pixmap_current = gc_pixmap_load(mimeType->icon); if(pixmap_current==NULL) { g_warning("Cannot find icon %s for mimetype %s", mimeType->icon, mimeType->description); - pixmap_current = gc_pixmap_load(gcompris_image_to_skin("file.png")); + pixmap_current = gc_pixmap_load(gc_skin_image_get("file.png")); } else { /* We can remove the extension now that we have an icon */ *ext='\0'; } } else { - pixmap_current = gc_pixmap_load(gcompris_image_to_skin("file.png")); + pixmap_current = gc_pixmap_load(gc_skin_image_get("file.png")); } } else { - pixmap_current = gc_pixmap_load(gcompris_image_to_skin("file.png")); + pixmap_current = gc_pixmap_load(gc_skin_image_get("file.png")); } } else { - pixmap_current = gc_pixmap_load(gcompris_image_to_skin("file.png")); + pixmap_current = gc_pixmap_load(gc_skin_image_get("file.png")); } item = gnome_canvas_item_new (gnome_canvas_root(canvas), @@ -604,7 +604,7 @@ static void display_files(GnomeCanvasItem *root_item, gchar *rootdir) "x", (double)ix + (IMAGE_WIDTH + IMAGE_GAP)/2, "y", (double)iy + IMAGE_HEIGHT - 5, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("gcompris/fileselectcol"), + "fill_color_rgba", gc_skin_get_color("gcompris/fileselectcol"), NULL); if(g_file_test(allfilename, G_FILE_TEST_IS_DIR)) { diff --git a/src/gcompris/gameutil.c b/src/gcompris/gameutil.c index 250586d..502870f 100644 --- a/src/gcompris/gameutil.c +++ b/src/gcompris/gameutil.c @@ -23,6 +23,11 @@ #include #include +/* for gc_util_create_rootdir */ +#include +#include +#include + /* libxml includes */ #include @@ -430,7 +435,7 @@ GnomeCanvasGroup *gc_difficulty_display(GnomeCanvasGroup *parent, return NULL; filename = g_strdup_printf("difficulty_star%d.png", difficulty); - pixmap = gcompris_load_skin_pixmap(filename); + pixmap = gc_skin_pixmap_load(filename); g_free(filename); if(!pixmap) @@ -602,3 +607,30 @@ gc_file_find_absolute(const gchar *format, ...) g_free(filename); return absolute_filename; } + +/** Create a directory if needed. + * If a file is given, it is removed and a directory is created instead. + * + * \param rootdir: the directory to create + * + * return 0 if OK, -1 if ERROR + */ +int +gc_util_create_rootdir (gchar *rootdir) +{ + + /* Case where ~/.gcompris already exist as a file. We remove it */ + if(g_file_test(rootdir, G_FILE_TEST_IS_REGULAR)) { + unlink(rootdir); + } + + if(g_file_test(rootdir, G_FILE_TEST_IS_DIR)) { + return 0; + } + +#if defined WIN32 + return(mkdir(rootdir)); +#else + return(mkdir(rootdir, 0755)); +#endif +} diff --git a/src/gcompris/gameutil.h b/src/gcompris/gameutil.h index f530553..98ce3bc 100644 --- a/src/gcompris/gameutil.h +++ b/src/gcompris/gameutil.h @@ -64,5 +64,6 @@ GnomeCanvasGroup *gc_difficulty_display(GnomeCanvasGroup *parent, double x, doub /* find the complete filename looking for the file everywhere (printf formatting supported) */ gchar *gc_file_find_absolute(const gchar *filename, ...); +int gc_util_create_rootdir (gchar *rootdir); #endif diff --git a/src/gcompris/gc_core.h b/src/gcompris/gc_core.h index 341a113..1950fa1 100644 --- a/src/gcompris/gc_core.h +++ b/src/gcompris/gc_core.h @@ -45,4 +45,8 @@ void gc_menu_load(); /** mimetype */ void gc_mime_type_load(); +/* log */ +void gc_log_start (GcomprisBoard *gcomprisBoard); +void gc_log_set_key (GcomprisBoard *gcomprisBoard, guint keyval); + #endif diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c index 0cd4658..71523e2 100644 --- a/src/gcompris/gcompris.c +++ b/src/gcompris/gcompris.c @@ -80,7 +80,7 @@ static void map_cb (GtkWidget *widget, gpointer data); static gint board_widget_key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer client_data); -void gcompris_terminate(int signum); +void gc_terminate(int signum); static GcomprisProperties *properties = NULL; static gboolean antialiased = FALSE; @@ -90,9 +90,9 @@ static gboolean is_mapped = FALSE; /* Some constants. */ static GnomeCanvasItem *backgroundimg = NULL; -static gchar *gcompris_locale = NULL; -static gchar *gcompris_user_default_locale = NULL; -static gboolean gcompris_debug = FALSE; +static gchar *gc_locale = NULL; +static gchar *gc_user_default_locale = NULL; +static gboolean gc_debug = FALSE; /****************************************************************************/ /* Command line params */ @@ -246,10 +246,10 @@ static gint xf86_focus_changed(GtkWindow *window, /****************************************************************************/ /* Remove any dialog box */ -static void gcompris_close_all_dialog() { +static void gc_close_all_dialog() { gc_dialog_close(); gc_help_stop(); - gcompris_config_stop(); + gc_config_stop(); gc_about_stop(); gc_selector_file_stop(); gc_selector_images_stop(); @@ -279,10 +279,10 @@ board_widget_key_press_callback (GtkWidget *widget, 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); + gc_prop_save(properties); gc_menu_load(); - gcompris_close_all_dialog(); + gc_close_all_dialog(); board_stop(); return TRUE; @@ -291,10 +291,10 @@ board_widget_key_press_callback (GtkWidget *widget, if(event->state & GDK_CONTROL_MASK && ((event->keyval == GDK_p) || (event->keyval == GDK_P))) { properties->key="thanks_for_your_help"; - gcompris_properties_save(properties); + gc_prop_save(properties); gc_menu_load(); - gcompris_close_all_dialog(); + gc_close_all_dialog(); board_stop(); return TRUE; @@ -310,9 +310,9 @@ board_widget_key_press_callback (GtkWidget *widget, switch (event->keyval) { case GDK_Escape: - gcompris_close_all_dialog(); + gc_close_all_dialog(); - if (get_current_gcompris_board()->previous_board != NULL) + if (gc_board_get_current()->previous_board != NULL) board_stop(); return TRUE; case GDK_F5: @@ -388,10 +388,10 @@ board_widget_key_press_callback (GtkWidget *widget, if(strncmp(current_keycode, keycode[i-1], KEYCODE_LENGTH) == 0) { properties->key="thanks_for_your_help"; - gcompris_properties_save(properties); + gc_prop_save(properties); gc_menu_load(); - gcompris_close_all_dialog(); + gc_close_all_dialog(); board_stop(); return TRUE; @@ -401,7 +401,7 @@ board_widget_key_press_callback (GtkWidget *widget, #endif /* pass through the IM context */ - if (get_current_gcompris_board() && (!get_current_gcompris_board()->disable_im_context)) + if (gc_board_get_current() && (!gc_board_get_current()->disable_im_context)) { if (gtk_im_context_filter_keypress (properties->context, event)) { @@ -415,17 +415,17 @@ board_widget_key_press_callback (GtkWidget *widget, /* NOTE: If a board receives key press, it must bind the ENTER Keys to OK * whenever possible */ - if (get_current_board_plugin()!=NULL && get_current_board_plugin()->key_press) + if (gc_board_get_current_board_plugin()!=NULL && gc_board_get_current_board_plugin()->key_press) { - return(get_current_board_plugin()->key_press (event->keyval, NULL, NULL)); + return(gc_board_get_current_board_plugin()->key_press (event->keyval, NULL, NULL)); } - else if (get_current_board_plugin()!=NULL && get_current_board_plugin()->ok && + else if (gc_board_get_current_board_plugin()!=NULL && gc_board_get_current_board_plugin()->ok && (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return || event->keyval == GDK_KP_Space)) { /* Else we send the OK signal. */ - get_current_board_plugin()->ok (); + gc_board_get_current_board_plugin()->ok (); return TRUE; } @@ -436,18 +436,18 @@ board_widget_key_press_callback (GtkWidget *widget, /** * Return the main canvas we run in */ -GnomeCanvas *gcompris_get_canvas() +GnomeCanvas *gc_get_canvas() { return canvas; } -GtkWidget *gcompris_get_window() +GtkWidget *gc_get_window() { return window; } -GnomeCanvasItem *gcompris_set_background(GnomeCanvasGroup *parent, gchar *file) +GnomeCanvasItem *gc_set_background(GnomeCanvasGroup *parent, gchar *file) { GdkPixbuf *background_pixmap = NULL; @@ -658,7 +658,7 @@ void gc_cursor_set(guint gdk_cursor_type) static void setup_window () { GcomprisBoard *board_to_start; - GdkPixbuf *gcompris_icon_pixbuf; + GdkPixbuf *icon_pixbuf; gchar *icon_file; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -676,18 +676,18 @@ static void setup_window () if(!icon_file) g_warning ("Couldn't find file %s !", icon_file); - gcompris_icon_pixbuf = gc_net_load_pixmap(icon_file); - if (!gcompris_icon_pixbuf) + icon_pixbuf = gc_net_load_pixmap(icon_file); + if (!icon_pixbuf) { g_warning ("Failed to load pixbuf file: %s\n", icon_file); } g_free(icon_file); - if (gcompris_icon_pixbuf) + if (icon_pixbuf) { - gtk_window_set_icon (GTK_WINDOW (window), gcompris_icon_pixbuf); - gdk_pixbuf_unref (gcompris_icon_pixbuf); + gtk_window_set_icon (GTK_WINDOW (window), icon_pixbuf); + gdk_pixbuf_unref (icon_pixbuf); } gtk_window_set_title(GTK_WINDOW (window), "GCompris"); @@ -759,7 +759,7 @@ static void setup_window () gtk_signal_connect_after (GTK_OBJECT (canvas_bg), "key_press_event", GTK_SIGNAL_FUNC (board_widget_key_press_callback), 0); - gcompris_im_init(window); + gc_im_init(window); if(properties->fullscreen) @@ -781,7 +781,7 @@ static void setup_window () gc_mime_type_load(); /* Save the root_menu */ - properties->menu_board = gcompris_get_board_from_section(properties->root_menu); + properties->menu_board = gc_menu_section_get(properties->root_menu); /* By default, the menu will be started */ board_to_start = properties->menu_board; @@ -789,7 +789,7 @@ static void setup_window () /* Get and Run the root menu */ if(properties->administration) { - board_to_start = gcompris_get_board_from_section("/administration/administration"); + board_to_start = gc_menu_section_get("/administration/administration"); } else { @@ -804,23 +804,23 @@ static void setup_window () GList *group_id; for (group_id = properties->profile->group_ids; group_id != NULL; group_id = group_id->next) - if (g_list_length(gcompris_get_users_from_group( *((int *) group_id->data))) > 0){ + if (g_list_length(gc_db_users_from_group_get( *((int *) group_id->data))) > 0){ found = TRUE; break; } /* No profile start normally */ if (found) - board_to_start = gcompris_get_board_from_section("/login/login"); + board_to_start = gc_menu_section_get("/login/login"); else { - board_to_start = gcompris_get_board_from_section(properties->root_menu); + board_to_start = gc_menu_section_get(properties->root_menu); /* this will set user information to system one */ - gcompris_set_current_user(NULL); + gc_profile_set_current_user(NULL); } } else /* this will set user information to system one */ - gcompris_set_current_user(NULL); + gc_profile_set_current_user(NULL); } if(!board_to_start) { @@ -854,9 +854,9 @@ static void setup_window () void gc_board_end() { - if (get_current_gcompris_board()->previous_board) { + if (gc_board_get_current()->previous_board) { /* Run the previous board */ - board_play (get_current_gcompris_board()->previous_board); + board_play (gc_board_get_current()->previous_board); } } @@ -893,7 +893,7 @@ void gc_fullscreen_set(gboolean state) /* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab handling. */ -int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, +int gc_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, GdkCursor *cursor, guint32 etime) { int retval; @@ -914,7 +914,7 @@ int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, return retval; } -void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) +void gc_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime) { gnome_canvas_item_ungrab(item, etime); #ifdef XF86_VIDMODE @@ -934,7 +934,7 @@ static void cleanup() signal(SIGSEGV, NULL); board_stop(); - gcompris_db_exit(); + gc_db_exit(); gc_fullscreen_set(FALSE); } @@ -977,7 +977,7 @@ static void map_cb (GtkWidget *widget, gpointer data) * Process the cleanup of the child (no zombies) * --------------------------------------------- */ -void gcompris_terminate(int signum) +void gc_terminate(int signum) { g_warning("gcompris got the %d signal, starting exit procedure", signum); @@ -991,7 +991,7 @@ static void load_properties () gchar *prefix_dir; gchar *tmpstr; - properties = gcompris_properties_new (); + properties = gc_prop_new (); /* Initialize the binary relocation API * http://autopackage.org/docs/binreloc/ @@ -1065,8 +1065,8 @@ const gchar *gc_locale_get() const gchar *locale; /* First check locale got overrided by the user */ - if(gcompris_locale != NULL) - return(gcompris_locale); + if(gc_locale != NULL) + return(gc_locale); locale = g_getenv("LC_ALL"); if(locale == NULL) @@ -1087,7 +1087,7 @@ const gchar *gc_locale_get() */ char *gc_locale_get_user_default() { - return gcompris_user_default_locale; + return gc_user_default_locale; } /* @@ -1098,32 +1098,32 @@ void gc_locale_set(gchar *locale) { g_message("gc_locale_set '%s'\n", locale); - if(gcompris_locale != NULL) - g_free(gcompris_locale); + if(gc_locale != NULL) + g_free(gc_locale); #if defined WIN32 /* On windows, it always works */ - gcompris_locale = g_strdup(locale); + gc_locale = g_strdup(locale); setlocale(LC_MESSAGES, locale); setlocale(LC_ALL, locale); #else - gcompris_locale = g_strdup(setlocale(LC_MESSAGES, locale)); - if (!gcompris_locale) - gcompris_locale = g_strdup(locale); + gc_locale = g_strdup(setlocale(LC_MESSAGES, locale)); + if (!gc_locale) + gc_locale = g_strdup(locale); #endif - if(gcompris_locale!=NULL && strcmp(locale, gcompris_locale)) - g_warning("Requested locale '%s' got '%s'", locale, gcompris_locale); + if(gc_locale!=NULL && strcmp(locale, gc_locale)) + g_warning("Requested locale '%s' got '%s'", locale, gc_locale); - if(gcompris_locale==NULL) - g_warning("Failed to set requested locale %s got %s", locale, gcompris_locale); + if(gc_locale==NULL) + g_warning("Failed to set requested locale %s got %s", locale, gc_locale); /* Override the env locale to what the user requested */ /* This makes gettext to give us the new locale text */ - my_setenv ("LC_ALL", gc_locale_get()); - my_setenv ("LC_MESSAGES", gc_locale_get()); - my_setenv ("LANGUAGE", gc_locale_get()); - my_setenv ("LANG", gc_locale_get()); + gc_setenv ("LC_ALL", gc_locale_get()); + gc_setenv ("LC_MESSAGES", gc_locale_get()); + gc_setenv ("LANGUAGE", gc_locale_get()); + gc_setenv ("LANG", gc_locale_get()); /* This does update gettext translation uppon next gettext call */ /* Call for localization startup */ @@ -1145,7 +1145,7 @@ void gc_log_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) { - if(gcompris_debug) + if(gc_debug) g_printerr ("%s: %s\n\n", "gcompris", message); } @@ -1289,18 +1289,18 @@ static gint xf86_focus_changed(GtkWindow *window, */ int -gcompris_init (int argc, char *argv[]) +gc_init (int argc, char *argv[]) { poptContext pctx; int popt_option; /* First, Remove the gnome crash dialog because it locks the user when in full screen */ - signal(SIGSEGV, gcompris_terminate); - signal(SIGINT, gcompris_terminate); + signal(SIGSEGV, gc_terminate); + signal(SIGINT, gc_terminate); load_properties(); - gcompris_skin_load(properties->skin); + gc_skin_load(properties->skin); bindtextdomain (GETTEXT_PACKAGE, properties->package_locale_dir); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -1324,15 +1324,15 @@ gcompris_init (int argc, char *argv[]) /* Save the default locale */ #if defined WIN32 - gcompris_user_default_locale = g_win32_getlocale(); + gc_user_default_locale = g_win32_getlocale(); // Set the user's choice locale if(properties->locale[0]=='\0') { - gc_locale_set(gcompris_user_default_locale); + gc_locale_set(gc_user_default_locale); } else { gc_locale_set(properties->locale); } #else - gcompris_user_default_locale = g_strdup(setlocale(LC_MESSAGES, NULL)); + gc_user_default_locale = g_strdup(setlocale(LC_MESSAGES, NULL)); // Set the user's choice locale gc_locale_set(properties->locale); #endif @@ -1352,7 +1352,7 @@ gcompris_init (int argc, char *argv[]) if (popt_debug) { - gcompris_debug = TRUE; + gc_debug = TRUE; } if (popt_fullscreen) @@ -1434,7 +1434,7 @@ gcompris_init (int argc, char *argv[]) printf(_("The list of available activities is :\n")); properties->root_menu = "/"; - gcompris_db_init(); + gc_db_init(); gc_menu_load(); @@ -1496,7 +1496,7 @@ gcompris_init (int argc, char *argv[]) } /* shared_dir initialised, now we can set the default */ - properties->database = get_default_database_name ( properties->shared_dir ); + properties->database = gc_prop_default_database_name_get ( properties->shared_dir ); g_warning( "Infos:\n Shared dir '%s'\n Users dir '%s'\n Database '%s'\n", properties->shared_dir, properties->users_dir, @@ -1571,11 +1571,11 @@ gcompris_init (int argc, char *argv[]) * And after a possible alternate database as been provided * */ - gcompris_db_init(); + gc_db_init(); /* An alternate profile is requested, check it does exists */ if (popt_profile){ - properties->profile = gcompris_get_profile_from_name(popt_profile); + properties->profile = gc_db_profile_from_name_get(popt_profile); if(properties->profile == NULL) { @@ -1590,7 +1590,7 @@ gcompris_init (int argc, char *argv[]) GList * profile_list; int i; - profile_list = gcompris_get_profiles_list(); + profile_list = gc_db_profiles_list_get(); printf(_("The list of available profiles is:\n")); for(i=0; i< g_list_length(profile_list); i++) @@ -1617,7 +1617,7 @@ gcompris_init (int argc, char *argv[]) /*------------------------------------------------------------*/ if(properties->music || properties->fx) - initSound(); + gc_sound_init(); /* Gdk-Pixbuf */ gdk_rgb_init(); @@ -1630,9 +1630,9 @@ gcompris_init (int argc, char *argv[]) gtk_widget_show_all (window); if (properties->music) - gcompris_play_ogg("music/intro.ogg", "sounds/$LOCALE/misc/welcome.ogg", NULL); + gc_sound_play_ogg("music/intro.ogg", "sounds/$LOCALE/misc/welcome.ogg", NULL); else - gcompris_play_ogg("sounds/$LOCALE/misc/welcome.ogg", NULL); + gc_sound_play_ogg("sounds/$LOCALE/misc/welcome.ogg", NULL); gtk_main (); return 0; diff --git a/src/gcompris/gcompris.h b/src/gcompris/gcompris.h index 258faca..0a85de8 100644 --- a/src/gcompris/gcompris.h +++ b/src/gcompris/gcompris.h @@ -85,7 +85,7 @@ void gc_board_end(void); /* Control Bar methods */ void gc_bar_start (GnomeCanvas *theCanvas); -GnomeCanvasItem *gcompris_set_background(GnomeCanvasGroup *parent, gchar *file); +GnomeCanvasItem *gc_set_background(GnomeCanvasGroup *parent, gchar *file); void gc_bar_set_level (GcomprisBoard *gcomprisBoard); void gc_bar_set_repeat_icon (GdkPixbuf *pixmap); @@ -113,8 +113,8 @@ void gc_bar_set (const GComprisBarFlags flags); void gc_bar_hide (gboolean hide); /* General */ -GnomeCanvas *gcompris_get_canvas(void); -GtkWidget *gcompris_get_window(void); +GnomeCanvas *gc_get_canvas(void); +GtkWidget *gc_get_window(void); const gchar *gc_locale_get(void); void gc_locale_set(gchar *locale); @@ -160,9 +160,9 @@ void gc_confirm_box_stop (void); /* Use these instead of the gnome_canvas ones for proper fullscreen mousegrab handling. */ -int gcompris_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, +int gc_canvas_item_grab (GnomeCanvasItem *item, unsigned int event_mask, GdkCursor *cursor, guint32 etime); -void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); +void gc_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); /* Trace Log */ #define GCOMPRIS_LOG_STATUS_PASSED "PASSED" @@ -170,10 +170,6 @@ void gcompris_canvas_item_ungrab (GnomeCanvasItem *item, guint32 etime); #define GCOMPRIS_LOG_STATUS_DRAW "DRAW" #define GCOMPRIS_LOG_STATUS_COMPLETED "COMPLETED" -/* gcompris internal only */ -void gc_log_start (GcomprisBoard *gcomprisBoard); -void gc_log_set_key (GcomprisBoard *gcomprisBoard, guint keyval); - /* Use it to tell the teacher where the kid failed */ void gc_log_set_comment (GcomprisBoard *gcomprisBoard, gchar *expected, gchar* got); @@ -182,7 +178,7 @@ void gc_log_end (GcomprisBoard *gcomprisBoard, gchar *status); /* For menu type activity */ GList *gc_menu_getlist(gchar *section); -GcomprisBoard *gcompris_get_board_from_section(gchar *section); +GcomprisBoard *gc_menu_section_get(gchar *section); GList *gc_menu_get_boards(); /*=========================================================*/ diff --git a/src/gcompris/gcompris_alphabeta.c b/src/gcompris/gcompris_alphabeta.c index 4663ee3..06f5b86 100644 --- a/src/gcompris/gcompris_alphabeta.c +++ b/src/gcompris/gcompris_alphabeta.c @@ -21,7 +21,7 @@ #include "gcompris.h" -/* gcompris_alphabeta returns the best value of evaluation functions */ +/* gc_alphabeta returns the best value of evaluation functions */ /* set the bestChild to the index of child with this value */ /* maximize : TRUE if depth is maximize one, neither FALSE. */ /* treeGame : pointer on game to pass to others functions, */ @@ -31,7 +31,7 @@ /* nextSibling : return pointer on next sibling of a node. */ /* heuristic : evaluation function of game. */ /* depth is max depth of recursion */ -gint gcompris_alphabeta (gboolean maximize, +gint gc_alphabeta (gboolean maximize, gpointer treeGame, EvalFunction heuristic, gint *bestChild, @@ -51,11 +51,11 @@ gint gcompris_alphabeta (gboolean maximize, *bestChild = -1; -/* g_warning("gcompris_alphabeta %d %d %d", depth, alpha, beta); */ +/* g_warning("gc_alphabeta %d %d %d", depth, alpha, beta); */ /* directly return value for leaf node*/ if ((!child) || (depth == 0)){ -/* g_warning("gcompris_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ +/* g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ return heuristic(treeGame); } @@ -64,7 +64,7 @@ gint gcompris_alphabeta (gboolean maximize, if (maximize) { m = alpha; while (child){ - t = gcompris_alphabeta (!maximize, + t = gc_alphabeta (!maximize, child, heuristic, &nextBest, @@ -79,20 +79,20 @@ gint gcompris_alphabeta (gboolean maximize, *bestChild = index; } if ( m >= beta){ -/* g_warning("gcompris_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ +/* g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ return m; } index++; child = nextSibling(child); } -/* g_warning("gcompris_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ +/* g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ return m; } else { /* minimize */ m = beta; while (child){ - t = gcompris_alphabeta (!maximize, + t = gc_alphabeta (!maximize, child, heuristic, &nextBest, @@ -107,13 +107,13 @@ gint gcompris_alphabeta (gboolean maximize, *bestChild = index; } if ( m <= alpha){ -/* g_warning("gcompris_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ +/* g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ return m; } index++; child = nextSibling(child); } -/* g_warning("gcompris_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ +/* g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */ return m; } diff --git a/src/gcompris/gcompris_alphabeta.h b/src/gcompris/gcompris_alphabeta.h index 486f3fd..92ae5cf 100644 --- a/src/gcompris/gcompris_alphabeta.h +++ b/src/gcompris/gcompris_alphabeta.h @@ -1,6 +1,6 @@ /* gcompris - gcompris_alphabeta.h * - * Time-stamp: <2006/02/05 09:27:20 yves> + * Time-stamp: <2006/08/28 21:20:56 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -24,7 +24,7 @@ #include "gcompris.h" -/* gcompris_alphabeta returns the best value of evaluation functions */ +/* gc_alphabeta returns the best value of evaluation functions */ /* set the bestChild to the index of child with this value */ /* maximize : TRUE if depth is maximize one, neither FALSE. */ /* treeGame : pointer on game to pass to others functions, */ @@ -40,16 +40,16 @@ typedef gboolean (*LeafFunction) (gpointer treeGame); typedef gpointer (*FirstChildGameFunction) (gpointer treeGame); typedef gpointer (*NextSiblingGameFunction) (gpointer treeGame); -gint gcompris_alphabeta (gboolean maximize, - gpointer treeGame, - EvalFunction heuristic, - gint *bestChild, - FirstChildGameFunction firstChild, - NextSiblingGameFunction nextSibling, - gint alpha, - gint beta, - gint depth - ); +gint gc_alphabeta (gboolean maximize, + gpointer treeGame, + EvalFunction heuristic, + gint *bestChild, + FirstChildGameFunction firstChild, + NextSiblingGameFunction nextSibling, + gint alpha, + gint beta, + gint depth + ); #endif diff --git a/src/gcompris/gcompris_config.h b/src/gcompris/gcompris_config.h index 4fd68e6..350d34a 100644 --- a/src/gcompris/gcompris_config.h +++ b/src/gcompris/gcompris_config.h @@ -24,7 +24,7 @@ #define MAX_TIMER_VALUE 3 #define MAX_SCREEN_VALUE 2 -void gcompris_config_start (); -void gcompris_config_stop (); +void gc_config_start (); +void gc_config_stop (); #endif diff --git a/src/gcompris/gcompris_confirm.c b/src/gcompris/gcompris_confirm.c index 689bb11..82ee63f 100644 --- a/src/gcompris/gcompris_confirm.c +++ b/src/gcompris/gcompris_confirm.c @@ -127,7 +127,7 @@ void gc_confirm_box (gchar *title, void gc_confirm_box_stop () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); // Destroy the box /* FIXME: Crashes randomly */ @@ -203,13 +203,13 @@ display_confirm(gchar *title, confirmCallBack=iscb; rootitem = \ - gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()), + gnome_canvas_item_new (gnome_canvas_root(gc_get_canvas()), gnome_canvas_group_get_type (), "x", (double)0, "y", (double)0, NULL); - pixmap = gcompris_load_skin_pixmap("help_bg.png"); + pixmap = gc_skin_pixmap_load("help_bg.png"); y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2; if (y_start < 0) y_start = 0; @@ -230,9 +230,9 @@ display_confirm(gchar *title, "text", title, "x", (gdouble) titre_x + titre_w/2 + 1.0, "y", (gdouble) titre_y + titre_h/2 + 1.0, - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -240,9 +240,9 @@ display_confirm(gchar *title, "text", title, "x", (gdouble) titre_x + titre_w/2, "y", (gdouble) titre_y + titre_h/2, - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_title, + "fill_color_rgba", gc_skin_color_title, NULL); richtext_s = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -284,9 +284,9 @@ display_confirm(gchar *title, * ------- */ - pixmap = gcompris_load_skin_pixmap("button_large.png"); - pixmap_stick = gcompris_load_skin_pixmap("button_checked.png"); - pixmap_cross = gcompris_load_skin_pixmap("bad.png"); + pixmap = gc_skin_pixmap_load("button_large.png"); + pixmap_stick = gc_skin_pixmap_load("button_checked.png"); + pixmap_cross = gc_skin_pixmap_load("bad.png"); // CANCEL no_button = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -329,11 +329,11 @@ display_confirm(gchar *title, gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", no_text, - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) button_x + gdk_pixbuf_get_width(pixmap) + button_x_int , "y", (double) button_y + 2*button_h/3, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpfg"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpfg"), NULL); // OK @@ -377,11 +377,11 @@ display_confirm(gchar *title, item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", yes_text, - "font", gcompris_skin_font_subtitle, + "font", gc_skin_font_subtitle, "x", (double) button_x + gdk_pixbuf_get_width(pixmap) + button_x_int , "y", (double) button_y + button_h/3, "anchor", GTK_ANCHOR_WEST, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpfg"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpfg"), NULL); confirm_displayed = TRUE; @@ -417,7 +417,7 @@ set_content(GnomeCanvasRichText *item_content, * Set the shadow */ - color_string = g_strdup_printf("#%x", gcompris_skin_color_shadow >> 8); + color_string = g_strdup_printf("#%x", gc_skin_color_shadow >> 8); gdk_color_parse(color_string, color_s); g_free(color_string); success = gdk_colormap_alloc_color(gdk_colormap_get_system(), @@ -427,7 +427,7 @@ set_content(GnomeCanvasRichText *item_content, buffer = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content_s)); txt_tag = gtk_text_buffer_create_tag(buffer, NULL, "foreground-gdk", color_s, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, NULL); gtk_text_buffer_get_end_iter(buffer, &iter_end); gtk_text_buffer_get_start_iter(buffer, &iter_start); @@ -437,7 +437,7 @@ set_content(GnomeCanvasRichText *item_content, /* * Set the text */ - color_string = g_strdup_printf("#%x", gcompris_skin_get_color("gcompris/helpunselect") >> 8); + color_string = g_strdup_printf("#%x", gc_skin_get_color("gcompris/helpunselect") >> 8); gdk_color_parse(color_string, color); g_free(color_string); success = gdk_colormap_alloc_color(gdk_colormap_get_system(), @@ -447,7 +447,7 @@ set_content(GnomeCanvasRichText *item_content, buffer = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content)); txt_tag = gtk_text_buffer_create_tag(buffer, NULL, "foreground-gdk", color, - "font", gcompris_skin_font_board_medium, + "font", gc_skin_font_board_medium, NULL); gtk_text_buffer_get_end_iter(buffer, &iter_end); gtk_text_buffer_get_start_iter(buffer, &iter_start); diff --git a/src/gcompris/gcompris_db.c b/src/gcompris/gcompris_db.c index 881cfcc..45ba57f 100644 --- a/src/gcompris/gcompris_db.c +++ b/src/gcompris/gcompris_db.c @@ -114,7 +114,7 @@ extern GnomeCanvas *canvas; END;" -int gcompris_db_init() +int gc_db_init() { #ifdef USE_SQLITE gboolean creation = FALSE; @@ -306,7 +306,7 @@ int gcompris_db_init() #endif } -void gcompris_db_exit() +void gc_db_exit() { #ifdef USE_SQLITE sqlite3_close(gcompris_db); @@ -317,7 +317,7 @@ void gcompris_db_exit() #define BOARDS_SET_DATE(date) \ "UPDATE informations SET init_date=\'%s\';",date -void gcompris_db_set_date(gchar *date) +void gc_db_set_date(gchar *date) { #ifdef USE_SQLITE @@ -349,7 +349,7 @@ void gcompris_db_set_date(gchar *date) #define BOARDS_UPDATE_VERSION(version) \ "UPDATE informations SET gcompris_version=\'%s\';",version -void gcompris_db_set_version(gchar *version) +void gc_db_set_version(gchar *version) { #ifdef USE_SQLITE @@ -380,7 +380,7 @@ void gcompris_db_set_version(gchar *version) #define BOARDS_CHECK \ "SELECT gcompris_version, init_date FROM informations;" -gboolean gcompris_db_check_boards() +gboolean gc_db_check_boards() { #ifdef USE_SQLITE @@ -429,7 +429,7 @@ gboolean gcompris_db_check_boards() "SELECT board_id FROM boards WHERE name=\'%s\';",n -void gcompris_db_board_update(guint *board_id, +void gc_db_board_update(guint *board_id, guint *section_id, gchar *name, gchar *section, @@ -684,7 +684,7 @@ GList *gc_menu_load_db(GList *boards_list) #endif } -GList *gcompris_db_read_board_from_section(gchar *section) +GList *gc_db_read_board_from_section(gchar *section) { return NULL; } @@ -693,7 +693,7 @@ GList *gcompris_db_read_board_from_section(gchar *section) #define BOARD_ID_READ \ "SELECT board_id FROM boards;" -GList *gcompris_db_get_board_id(GList *list) +GList *gc_db_get_board_id(GList *list) { #ifdef USE_SQLITE @@ -738,7 +738,7 @@ GList *gcompris_db_get_board_id(GList *list) #define DELETE_BOARD(table, board_id) \ "DELETE FROM %s WHERE board_id=%d;", table, board_id -void gcompris_db_remove_board(int board_id) +void gc_db_remove_board(int board_id) { #ifdef USE_SQLITE g_warning("Supress board %d from db.", board_id); @@ -937,7 +937,7 @@ GcomprisProfile *gcompris_get_profile_from_id(gint profile_id) * \return *GcomprisProfile */ GcomprisProfile * -gcompris_get_profile_from_name(gchar *profile_name) +gc_db_profile_from_name_get(gchar *profile_name) { #ifdef USE_SQLITE GcomprisProfile *profile = NULL; @@ -987,7 +987,7 @@ gcompris_get_profile_from_name(gchar *profile_name) #define GET_ACTIVE_PROFILE_ID \ "SELECT profile_id FROM informations;" -GcomprisProfile *gcompris_db_get_profile() +GcomprisProfile *gc_db_get_profile() { #ifdef USE_SQLITE char *zErrMsg; @@ -1021,7 +1021,7 @@ GcomprisProfile *gcompris_db_get_profile() #define USERS_FROM_GROUP(n) \ "SELECT users.user_id, users.login, users.lastname, users.firstname, users.birthdate, users.class_id FROM users, list_users_in_groups WHERE users.user_id = list_users_in_groups.user_id AND list_users_in_groups.group_id = %d;",n -GList *gcompris_get_users_from_group(gint group_id) +GList *gc_db_users_from_group_get(gint group_id) { #ifdef USE_SQLITE char *zErrMsg; @@ -1307,7 +1307,7 @@ void gcompris_set_board_conf(GcomprisProfile *profile, #define GET_CONF(p, b) \ "SELECT conf_key, conf_value FROM board_profile_conf WHERE profile_id=%d AND board_id=%d;", p, b -GHashTable *gcompris_get_conf_with_table(int profile_id, int board_id, GHashTable *table ) +GHashTable *gc_db_conf_with_table_get(int profile_id, int board_id, GHashTable *table ) { GHashTable *hash_conf = table; @@ -1361,7 +1361,7 @@ GHashTable *gcompris_get_conf(GcomprisProfile *profile, GcomprisBoard *board ) GHashTable *hash_result = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); #ifdef USE_SQLITE - return gcompris_get_conf_with_table( profile->profile_id, board->board_id, hash_result) ; + return gc_db_conf_with_table_get( profile->profile_id, board->board_id, hash_result) ; #else return hash_result; #endif @@ -1374,19 +1374,19 @@ GHashTable *gcompris_get_board_conf() /* priority order : board + Profile conf, else profile Default (all boards) conf, if not Default profile + board */ /* conf values for default profile and current board */ - hash_result = gcompris_get_conf_with_table(1, - get_current_gcompris_board()->board_id, + hash_result = gc_db_conf_with_table_get(1, + gc_board_get_current()->board_id, hash_result); /* conf values for profile (board independant) */ - if(gcompris_get_current_profile()) { - hash_result = gcompris_get_conf_with_table(gcompris_get_current_profile()->profile_id, + if(gc_profile_get_current()) { + hash_result = gc_db_conf_with_table_get(gc_profile_get_current()->profile_id, -1, hash_result); /* conf value for current profile and current board */ - hash_result = gcompris_get_conf_with_table(gcompris_get_current_profile()->profile_id, - get_current_gcompris_board()->board_id, + hash_result = gc_db_conf_with_table_get(gc_profile_get_current()->profile_id, + gc_board_get_current()->board_id, hash_result); } @@ -1397,7 +1397,7 @@ GHashTable *gcompris_get_board_conf() "SELECT profile_id, name, profile_directory, description FROM profiles;" -GList *gcompris_get_profiles_list() +GList *gc_db_profiles_list_get() { #ifdef USE_SQLITE @@ -1568,7 +1568,7 @@ GcomprisGroup *gcompris_get_group_from_id(int group_id) group->description = g_strdup(result[i++]); } - group->user_ids = gcompris_get_users_from_group(group_id); + group->user_ids = gc_db_users_from_group_get(group_id); return group ; @@ -1619,7 +1619,7 @@ GList *gcompris_get_groups_list() group->class_id = atoi(result[i++]); group->description = g_strdup(result[i++]); - group->user_ids = gcompris_get_users_from_group(group->group_id); + group->user_ids = gc_db_users_from_group_get(group->group_id); groups_list = g_list_append(groups_list, group); } @@ -1830,7 +1830,7 @@ GList *gcompris_get_classes_list() #define DB_IS_ACTIVITY_IN_PROFILE_ID(profile_id, name) \ "SELECT activities_out.board_id FROM activities_out, boards WHERE boards.name='%s' AND activities_out.out_id='%d' AND activities_out.board_id=boards.board_id;", name, profile_id -int gcompris_is_activity_in_profile(GcomprisProfile *profile, char *activity_name) +int gc_db_is_activity_in_profile(GcomprisProfile *profile, char *activity_name) { #ifdef USE_SQLITE char *zErrMsg; diff --git a/src/gcompris/gcompris_db.h b/src/gcompris/gcompris_db.h index 49827bf..8ea453b 100644 --- a/src/gcompris/gcompris_db.h +++ b/src/gcompris/gcompris_db.h @@ -28,16 +28,16 @@ #endif /* Database management */ -int gcompris_db_init(); -void gcompris_db_exit(); +int gc_db_init(); +void gc_db_exit(); -gboolean gcompris_db_check_boards(); +gboolean gc_db_check_boards(); -void gcompris_db_set_date(gchar *date); +void gc_db_set_date(gchar *date); -void gcompris_db_set_version(gchar *version); +void gc_db_set_version(gchar *version); -void gcompris_db_board_update(guint *board_id, +void gc_db_board_update(guint *board_id, guint *section_id, gchar *name, gchar *section, @@ -58,27 +58,27 @@ void gcompris_db_board_update(guint *board_id, gchar *credit ); -void gcompris_db_save_user(int *user_id, +void gc_db_save_user(int *user_id, gchar *login, gchar *name, gchar *firstname, gchar *birthday, int class_id); -GList *gcompris_db_read_board_from_section(gchar *section); +GList *gc_db_read_board_from_section(gchar *section); GList *gc_menu_load_db(GList *boards); -GList *gcompris_db_get_board_id(GList *list); +GList *gc_db_get_board_id(GList *list); -void gcompris_db_remove_board(int board_id); +void gc_db_remove_board(int board_id); /* Profile management */ GcomprisProfile *gcompris_get_profile_from_id(gint profile_id); -GcomprisProfile *gcompris_get_profile_from_name(gchar *profile_name); -GList *gcompris_get_profiles_list(); +GcomprisProfile *gc_db_profile_from_name_get(gchar *profile_name); +GList *gc_db_profiles_list_get(); /* Classes management */ @@ -95,9 +95,9 @@ GcomprisUser *gcompris_get_user_from_id(gint user_id); GList *gcompris_get_users_list(); -GcomprisProfile *gcompris_db_get_profile(); +GcomprisProfile *gc_db_get_profile(); -GList *gcompris_get_users_from_group(gint group_id); +GList *gc_db_users_from_group_get(gint group_id); void gcompris_set_board_conf(GcomprisProfile *profile, GcomprisBoard *board, @@ -114,11 +114,11 @@ GHashTable *gcompris_get_board_conf(); GHashTable *gcompris_get_conf(GcomprisProfile *profile, GcomprisBoard *board); /*internal initialisation use only, do not use it for boards*/ -GHashTable *gcompris_get_conf_with_table(int profile_id, int board_id, GHashTable *table ); +GHashTable *gc_db_conf_with_table_get(int profile_id, int board_id, GHashTable *table ); GcomprisBoard *gcompris_get_board_from_id(int board_id); -int gcompris_is_activity_in_profile(GcomprisProfile *profile, char *activity_name); +int gc_db_is_activity_in_profile(GcomprisProfile *profile, char *activity_name); #endif diff --git a/src/gcompris/gcompris_files.c b/src/gcompris/gcompris_files.c index e91d8d1..e40c8fd 100644 --- a/src/gcompris/gcompris_files.c +++ b/src/gcompris/gcompris_files.c @@ -21,7 +21,8 @@ #include "gcompris_files.h" -gchar *gcompris_get_user_dirname(GcomprisUser *user) +gchar* +gcompris_get_user_dirname(GcomprisUser *user) { GcomprisProperties *properties = gc_prop_get (); @@ -30,31 +31,34 @@ gchar *gcompris_get_user_dirname(GcomprisUser *user) user->login, NULL); - create_rootdir(user_dirname); + gc_util_create_rootdir(user_dirname); return user_dirname; } -gchar *gcompris_get_current_user_dirname() +gchar* +gc_profile_get_current_user_dirname() { - return gcompris_get_user_dirname(gcompris_get_current_user()); + return gcompris_get_user_dirname(gc_profile_get_current_user()); } -gchar *gcompris_get_board_dirname(GcomprisBoard *board) +gchar* +gcompris_get_board_dirname(GcomprisBoard *board) { GcomprisProperties *properties = gc_prop_get (); gchar *board_main = g_strconcat (properties->shared_dir, "/boards", NULL); - create_rootdir(board_main); + gc_util_create_rootdir(board_main); gchar *board_dirname = g_strconcat (board_main, "/", board->name, NULL); - create_rootdir(board_dirname); + gc_util_create_rootdir(board_dirname); g_free(board_main); return board_dirname; } -gchar *gcompris_get_current_board_dirname() +gchar* +gcompris_get_current_board_dirname() { - return gcompris_get_board_dirname(get_current_gcompris_board()); + return gcompris_get_board_dirname(gc_board_get_current()); } diff --git a/src/gcompris/gcompris_files.h b/src/gcompris/gcompris_files.h index 64fe894..41e3abe 100644 --- a/src/gcompris/gcompris_files.h +++ b/src/gcompris/gcompris_files.h @@ -26,7 +26,7 @@ gchar *gcompris_get_user_dirname(GcomprisUser *user); -gchar *gcompris_get_current_user_dirname(); +gchar *gc_profile_get_current_user_dirname(); gchar *gcompris_get_board_dirname(GcomprisBoard *board); diff --git a/src/gcompris/gcompris_im.c b/src/gcompris/gcompris_im.c index 859af63..46cddc4 100644 --- a/src/gcompris/gcompris_im.c +++ b/src/gcompris/gcompris_im.c @@ -33,7 +33,8 @@ static gint window_focus_callback (GtkWidget *widget, gpointer user_data); -void gcompris_im_init(GtkWidget *window) +void +gc_im_init(GtkWidget *window) { GcomprisProperties *properties = gc_prop_get (); @@ -41,10 +42,10 @@ void gcompris_im_init(GtkWidget *window) /* set IMContext */ properties->context = gtk_im_multicontext_new (); - if(gcompris_get_current_profile()) + if(gc_profile_get_current()) { GHashTable *init_im = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - init_im = gcompris_get_conf_with_table (gcompris_get_current_profile()->profile_id, + init_im = gc_db_conf_with_table_get (gc_profile_get_current()->profile_id, -1, init_im ); @@ -73,28 +74,31 @@ void gcompris_im_init(GtkWidget *window) } -void gcompris_im_reset() +void +gc_im_reset() { GcomprisProperties *properties = gc_prop_get (); gtk_im_context_reset (properties->context); } -static gint im_context_commit_callback (GtkIMContext *imcontext, - gchar *arg1, - gpointer user_data) +static gint +im_context_commit_callback (GtkIMContext *imcontext, + gchar *arg1, + gpointer user_data) { - if (get_current_board_plugin()!=NULL && get_current_board_plugin()->key_press) + if (gc_board_get_current_board_plugin()!=NULL && gc_board_get_current_board_plugin()->key_press) { - int result = get_current_board_plugin()->key_press (0, arg1, NULL); + int result = gc_board_get_current_board_plugin()->key_press (0, arg1, NULL); // g_free(arg1); return(result); } return FALSE; } -static gint im_context_preedit_callback (GtkIMContext *imcontext, - gpointer user_data) +static gint +im_context_preedit_callback (GtkIMContext *imcontext, + gpointer user_data) { gchar *preedit_string; PangoAttrList *attrs; @@ -105,9 +109,9 @@ static gint im_context_preedit_callback (GtkIMContext *imcontext, &attrs, &cursor_pos); - if (get_current_board_plugin()!=NULL && get_current_board_plugin()->key_press) + if (gc_board_get_current_board_plugin()!=NULL && gc_board_get_current_board_plugin()->key_press) { - int result = get_current_board_plugin()->key_press (0, NULL, preedit_string); + int result = gc_board_get_current_board_plugin()->key_press (0, NULL, preedit_string); g_free(preedit_string); pango_attr_list_unref (attrs); return(result); @@ -115,9 +119,10 @@ static gint im_context_preedit_callback (GtkIMContext *imcontext, return FALSE; } -static gint window_focus_callback (GtkWidget *widget, - GdkEventFocus *event, - gpointer user_data) +static gint +window_focus_callback (GtkWidget *widget, + GdkEventFocus *event, + gpointer user_data) { GcomprisProperties *properties = gc_prop_get (); if (event->in) diff --git a/src/gcompris/gcompris_im.h b/src/gcompris/gcompris_im.h index f872350..4ed122c 100644 --- a/src/gcompris/gcompris_im.h +++ b/src/gcompris/gcompris_im.h @@ -1,6 +1,6 @@ /* gcompris - gcompris_im.h * - * Time-stamp: <2005/10/02 22:12:39 bruno> + * Time-stamp: <2006/08/29 01:18:09 bruno> * * Copyright (C) 2005 Bruno Coudoin * @@ -26,11 +26,8 @@ #ifndef GCOMPRIS_IM_H #define GCOMPRIS_IM_H -void gcompris_im_init(); - -void gcompris_board_change_context(); - -void gcompris_im_reset(); +void gc_im_init(); +void gc_im_reset(); #endif diff --git a/src/gcompris/help.c b/src/gcompris/help.c index 4ed3dd1..ade43b3 100644 --- a/src/gcompris/help.c +++ b/src/gcompris/help.c @@ -111,13 +111,13 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) gc_help_has_board(gcomprisBoard); rootitem = \ - gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()), + gnome_canvas_item_new (gnome_canvas_root(gc_get_canvas()), gnome_canvas_group_get_type (), "x", (double)0, "y", (double)0, NULL); - pixmap = gcompris_load_skin_pixmap("help_bg.png"); + pixmap = gc_skin_pixmap_load("help_bg.png"); y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2; x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2; item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -135,20 +135,20 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", text_to_display, - "font", gcompris_skin_font_board_tiny, + "font", gc_skin_font_board_tiny, "x", (double) BOARDWIDTH*0.10 + 1.0, "y", (double) y_start + 1.0, "anchor", GTK_ANCHOR_NW, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", text_to_display, - "font", gcompris_skin_font_board_tiny, + "font", gc_skin_font_board_tiny, "x", (double) BOARDWIDTH*0.10, "y", (double) y_start, "anchor", GTK_ANCHOR_NW, - "fill_color_rgba", gcompris_skin_color_title, + "fill_color_rgba", gc_skin_color_title, NULL); g_free(text_to_display); } @@ -157,28 +157,28 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", name, - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2 + 1.0, "y", (double) y_start + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "weight", PANGO_WEIGHT_HEAVY, NULL); gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", name, - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH/2, "y", (double) y_start, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_title, + "fill_color_rgba", gc_skin_color_title, "weight", PANGO_WEIGHT_HEAVY, NULL); y_start += 120; - pixmap = gcompris_load_skin_pixmap("button_up.png"); + pixmap = gc_skin_pixmap_load("button_up.png"); // Prerequisite Button if(prerequisite) @@ -197,11 +197,11 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) item_prerequisite_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Prerequisite"), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.20, "y", (double) y_start - gdk_pixbuf_get_height(pixmap) + GAP_TO_BUTTON, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpunselect"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpunselect"), NULL); gtk_signal_connect(GTK_OBJECT(item_prerequisite_text), "event", (GtkSignalFunc) item_event_help, @@ -225,11 +225,11 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) item_goal_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Goal"), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.4, "y", (double) y_start - gdk_pixbuf_get_height(pixmap) + GAP_TO_BUTTON, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpunselect"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpunselect"), NULL); gtk_signal_connect(GTK_OBJECT(item_goal_text), "event", (GtkSignalFunc) item_event_help, @@ -253,11 +253,11 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) item_manual_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Manual"), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.6, "y", (double) y_start - gdk_pixbuf_get_height(pixmap) + GAP_TO_BUTTON, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpunselect"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpunselect"), NULL); gtk_signal_connect(GTK_OBJECT(item_manual_text), "event", (GtkSignalFunc) item_event_help, @@ -281,11 +281,11 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) item_credit_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("Credit"), - "font", gcompris_skin_font_content, + "font", gc_skin_font_content, "x", (double) BOARDWIDTH*0.8, "y", (double) y_start - gdk_pixbuf_get_height(pixmap) + GAP_TO_BUTTON, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpunselect"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpunselect"), NULL); gtk_signal_connect(GTK_OBJECT(item_credit_text), "event", (GtkSignalFunc) item_event_help, @@ -330,14 +330,14 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW (view), FALSE); PangoFontDescription *font_desc; - font_desc = pango_font_description_from_string (gcompris_skin_font_content); + font_desc = pango_font_description_from_string (gc_skin_font_content); gtk_widget_modify_font (view, font_desc); pango_font_description_free (font_desc); GdkColor fg_color; GdkColor bg_color; - gcompris_skin_get_gdkcolor("gcompris/helpfg", &fg_color); - gcompris_skin_get_gdkcolor("gcompris/helpbg", &bg_color); + gc_skin_get_gdkcolor("gcompris/helpfg", &fg_color); + gc_skin_get_gdkcolor("gcompris/helpbg", &bg_color); gtk_widget_modify_base(view, GTK_STATE_NORMAL, &bg_color); gtk_widget_modify_text(view, GTK_STATE_NORMAL, &fg_color); @@ -360,7 +360,7 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) set_content(text_to_display); // OK - pixmap = gcompris_load_skin_pixmap("button_large.png"); + pixmap = gc_skin_pixmap_load("button_large.png"); item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_pixbuf_get_type (), @@ -379,21 +379,21 @@ void gc_help_start (GcomprisBoard *gcomprisBoard) gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5 + 1.0, "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20 + 1.0, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, + "fill_color_rgba", gc_skin_color_shadow, "weight", PANGO_WEIGHT_HEAVY, NULL); item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5, "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, "weight", PANGO_WEIGHT_HEAVY, NULL); gtk_signal_connect(GTK_OBJECT(item2), "event", @@ -443,20 +443,20 @@ static void select_item(GnomeCanvasItem *item, GnomeCanvasItem *item_text) if(item_selected) { - pixmap = gcompris_load_skin_pixmap("button_up.png"); + pixmap = gc_skin_pixmap_load("button_up.png"); /* Warning changing the image needs to update pixbuf_ref for the focus usage */ g_object_set_data (G_OBJECT (item_selected), "pixbuf_ref", pixmap); gnome_canvas_item_set(item_selected, "pixbuf", pixmap, NULL); gnome_canvas_item_set(item_selected_text, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpunselect"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpunselect"), NULL); gdk_pixbuf_unref(pixmap); } - pixmap = gcompris_load_skin_pixmap("button_up_selected.png"); + pixmap = gc_skin_pixmap_load("button_up_selected.png"); /* Warning changing the image needs to update pixbuf_ref for the focus usage */ g_object_set_data (G_OBJECT (item), "pixbuf_ref", pixmap); gnome_canvas_item_set(item, @@ -464,7 +464,7 @@ static void select_item(GnomeCanvasItem *item, GnomeCanvasItem *item_text) NULL); gdk_pixbuf_unref(pixmap); gnome_canvas_item_set(item_text, - "fill_color_rgba", gcompris_skin_get_color("gcompris/helpselect"), + "fill_color_rgba", gc_skin_get_color("gcompris/helpselect"), NULL); item_selected = item; item_selected_text = item_text; diff --git a/src/gcompris/images_selector.c b/src/gcompris/images_selector.c index aa1b0ab..d9dcb71 100644 --- a/src/gcompris/images_selector.c +++ b/src/gcompris/images_selector.c @@ -124,7 +124,7 @@ gc_selector_images_start (GcomprisBoard *gcomprisBoard, gchar *dataset, imageSelectorCallBack=iscb; rootitem = \ - gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()), + gnome_canvas_item_new (gnome_canvas_root(gc_get_canvas()), gnome_canvas_group_get_type (), "x", (double)0, "y", (double)0, @@ -132,7 +132,7 @@ gc_selector_images_start (GcomprisBoard *gcomprisBoard, gchar *dataset, images_selector_displayed = TRUE; - pixmap = gcompris_load_skin_pixmap("images_selector_bg.png"); + pixmap = gc_skin_pixmap_load("images_selector_bg.png"); y_start = (BOARDHEIGHT - gdk_pixbuf_get_height(pixmap))/2; x_start = (BOARDWIDTH - gdk_pixbuf_get_width(pixmap))/2; item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), @@ -146,7 +146,7 @@ gc_selector_images_start (GcomprisBoard *gcomprisBoard, gchar *dataset, y_start += 110; - pixmap = gcompris_load_skin_pixmap("button_large.png"); + pixmap = gc_skin_pixmap_load("button_large.png"); /* * Create the list scrollbar @@ -172,7 +172,7 @@ gc_selector_images_start (GcomprisBoard *gcomprisBoard, gchar *dataset, "y1", (double) 0, "x2", (double) LIST_AREA_X2 - LIST_AREA_X1, "y2", (double) LIST_AREA_Y2 - LIST_AREA_Y1, - "fill_color_rgba", gcompris_skin_get_color("gcompris/imageselectbg"), + "fill_color_rgba", gc_skin_get_color("gcompris/imageselectbg"), NULL); @@ -218,7 +218,7 @@ gc_selector_images_start (GcomprisBoard *gcomprisBoard, gchar *dataset, "y1", (double) 0, "x2", (double) DRAWING_AREA_X2 - DRAWING_AREA_X1, "y2", (double) DRAWING_AREA_Y2 - DRAWING_AREA_Y1, - "fill_color_rgba", gcompris_skin_get_color("gcompris/imageselectbg"), + "fill_color_rgba", gc_skin_get_color("gcompris/imageselectbg"), NULL); @@ -315,11 +315,11 @@ gc_selector_images_start (GcomprisBoard *gcomprisBoard, gchar *dataset, item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), gnome_canvas_text_get_type (), "text", _("OK"), - "font", gcompris_skin_font_title, + "font", gc_skin_font_title, "x", (double) BOARDWIDTH*0.5, "y", (double) y - gdk_pixbuf_get_height(pixmap) + 15, "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, + "fill_color_rgba", gc_skin_color_text_button, NULL); gtk_signal_connect(GTK_OBJECT(item2), "event", (GtkSignalFunc) item_event_images_selector, @@ -337,7 +337,7 @@ gc_selector_images_start (GcomprisBoard *gcomprisBoard, gchar *dataset, */ void gc_selector_images_stop () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); + GcomprisBoard *gcomprisBoard = gc_board_get_current(); if(gcomprisBoard!=NULL && images_selector_displayed) { diff --git a/src/gcompris/log.c b/src/gcompris/log.c index f81088e..f793288 100644 --- a/src/gcompris/log.c +++ b/src/gcompris/log.c @@ -1,4 +1,4 @@ -/* gcompris - reporting.c +/* gcompris - log.c * * Time-stamp: <2003/10/29 18:55:55 bcoudoin> * @@ -166,7 +166,7 @@ void gc_log_end (GcomprisBoard *gcomprisBoard, gchar *status) { struct tm *tp; - GcomprisUser *gcomprisUser = gcompris_get_current_user(); + GcomprisUser *gcomprisUser = gc_profile_get_current_user(); const char *username = g_get_user_name(); if(gcomprisBoard_set != gcomprisBoard) diff --git a/src/gcompris/main.c b/src/gcompris/main.c index 87fd640..b279853 100644 --- a/src/gcompris/main.c +++ b/src/gcompris/main.c @@ -24,12 +24,12 @@ #include "gcompris.h" int -gcompris_init (int argc, char *argv[]); +gc_init (int argc, char *argv[]); int main (int argc, char *argv[]) { - gcompris_init(argc, argv); + gc_init(argc, argv); return(0); } diff --git a/src/gcompris/menu.c b/src/gcompris/menu.c index d0d01d5..3af3e94 100644 --- a/src/gcompris/menu.c +++ b/src/gcompris/menu.c @@ -164,9 +164,9 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, /* Display the resource on stdout */ if (properties->display_resource && !strcmp((char *)xmlnode->name, "resource") - && gcompris_get_current_profile()) + && gc_profile_get_current()) { - if(gcompris_is_activity_in_profile(gcompris_get_current_profile(), gcomprisBoard->name)) + if(gc_db_is_activity_in_profile(gc_profile_get_current(), gcomprisBoard->name)) { char *resource = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 0); printf("%s\n", resource); @@ -187,7 +187,7 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, } if (db){ - gcompris_db_board_update( &gcomprisBoard->board_id, + gc_db_board_update( &gcomprisBoard->board_id, &gcomprisBoard->section_id, gcomprisBoard->name, gcomprisBoard->section, @@ -313,7 +313,8 @@ _read_xml_file(GcomprisBoard *gcomprisBoard, /* Return the first board with the given section */ -GcomprisBoard *gcompris_get_board_from_section(gchar *section) +GcomprisBoard * +gc_menu_section_get(gchar *section) { GList *list = NULL; @@ -332,11 +333,12 @@ GcomprisBoard *gcompris_get_board_from_section(gchar *section) g_free(fullname); } - g_warning("gcompris_get_board_from_section searching '%s' but NOT FOUND\n", section); + g_warning("gc_menu_section_get searching '%s' but NOT FOUND\n", section); return NULL; } -static int boardlist_compare_func(const void *a, const void *b) +static int +boardlist_compare_func(const void *a, const void *b) { return strcasecmp(((GcomprisBoard *) a)->difficulty, ((GcomprisBoard *) b)->difficulty); } @@ -349,7 +351,7 @@ static int boardlist_compare_func(const void *a, const void *b) * */ int -gcompris_board_has_activity(gchar *section, gchar *name) +gc_menu_has_activity(gchar *section, gchar *name) { GList *list = NULL; GcomprisProperties *properties = gc_prop_get(); @@ -373,7 +375,7 @@ gcompris_board_has_activity(gchar *section, gchar *name) strcmp(board->section, section) != 0) { /* We must check this menu is not empty recursively */ - if(gcompris_board_has_activity(board->section, board->name)) + if(gc_menu_has_activity(board->section, board->name)) { g_free(section_name); return(1); @@ -422,7 +424,7 @@ GList *gc_menu_getlist(gchar *section) if(strcmp(board->type, "menu") == 0) { /* We must check first this menu is not empty */ - if(gcompris_board_has_activity(board->section, board->name)) + if(gc_menu_has_activity(board->section, board->name)) result_list = g_list_append(result_list, board); } else @@ -521,7 +523,7 @@ void gc_menu_load_dir(char *dirname, gboolean db){ return; } else { if (db) - list_old_boards_id = gcompris_db_get_board_id(list_old_boards_id); + list_old_boards_id = gc_db_get_board_id(list_old_boards_id); while((one_dirent = g_dir_read_name(dir)) != NULL) { /* add the board to the list */ @@ -556,8 +558,8 @@ void gc_menu_load_dir(char *dirname, gboolean db){ "/administration", strlen("/administration"))!=0)) { - if (gcompris_get_current_profile() && - !(g_list_find_custom(gcompris_get_current_profile()->activities, + if (gc_profile_get_current() && + !(g_list_find_custom(gc_profile_get_current()->activities, &(board_read->board_id), compare_id))) { boards_list = g_list_append(boards_list, board_read); } else { @@ -575,7 +577,7 @@ void gc_menu_load_dir(char *dirname, gboolean db){ /* remove suppressed boards from db */ while (list_old_boards_id != NULL){ int *data=list_old_boards_id->data; - gcompris_db_remove_board(*data); + gc_db_remove_board(*data); list_old_boards_id=g_list_remove(list_old_boards_id, data); g_free(data); } @@ -598,7 +600,7 @@ void gc_menu_load() return; } - if ((!properties->reread_menu) && gcompris_db_check_boards()){ + if ((!properties->reread_menu) && gc_db_check_boards()){ boards_list = gc_menu_load_db(boards_list); if (!properties->administration){ @@ -608,7 +610,7 @@ void gc_menu_load() for (list = boards_list; list != NULL; list = list->next){ board = (GcomprisBoard *)list->data; - if (g_list_find_custom(gcompris_get_current_profile()->activities, + if (g_list_find_custom(gc_profile_get_current()->activities, &(board->board_id), compare_id)) out_boards = g_list_append(out_boards, board); } @@ -617,7 +619,7 @@ void gc_menu_load() } } else { - int db = (gcompris_get_current_profile() ? TRUE: FALSE); + int db = (gc_profile_get_current() ? TRUE: FALSE); properties->reread_menu = TRUE; gc_menu_load_dir(properties->package_data_dir, db); GDate *today = g_date_new(); @@ -625,8 +627,8 @@ void gc_menu_load() gchar date[11]; g_date_strftime (date, 11, "%F", today); - gcompris_db_set_date(date); - gcompris_db_set_version(VERSION); + gc_db_set_date(date); + gc_db_set_version(VERSION); g_date_free(today); } diff --git a/src/gcompris/profile.c b/src/gcompris/profile.c index 1c2be1e..b73f2ae 100644 --- a/src/gcompris/profile.c +++ b/src/gcompris/profile.c @@ -26,15 +26,15 @@ /** Return the current profile or NULL if sqlite not activated * */ -GcomprisProfile -*gcompris_get_current_profile() +GcomprisProfile* +gc_profile_get_current() { GcomprisProperties *properties = gc_prop_get(); if (properties->profile) return properties->profile; - properties->profile = gcompris_db_get_profile(); + properties->profile = gc_db_get_profile(); return properties->profile; @@ -42,7 +42,7 @@ GcomprisProfile void -gcompris_set_current_user(GcomprisUser *user) +gc_profile_set_current_user(GcomprisUser *user) { GcomprisProperties *properties = gc_prop_get(); @@ -80,7 +80,8 @@ gcompris_set_current_user(GcomprisUser *user) } -GcomprisUser *gcompris_get_current_user() +GcomprisUser* +gc_profile_get_current_user() { GcomprisProperties *properties = gc_prop_get(); return properties->logged_user; diff --git a/src/gcompris/profile.h b/src/gcompris/profile.h index 362757f..fa5ed74 100644 --- a/src/gcompris/profile.h +++ b/src/gcompris/profile.h @@ -1,6 +1,6 @@ /* gcompris - profile.h * - * Time-stamp: <2006/08/11 17:30:14 bruno> + * Time-stamp: <2006/08/29 01:16:51 bruno> * * Copyright (C) 2005 Bruno Coudoin * @@ -81,7 +81,7 @@ struct _GcomprisGroup { typedef struct _GcomprisGroup GcomprisGroup; /* find a group */ -GcomprisGroup *gcompris_group_load(gint *group_id); +GcomprisGroup *gc_profile_group_load(gint *group_id); /*****************************************************************************/ /* The following structure dsecribes a user */ @@ -137,19 +137,10 @@ typedef struct { /* active profil */ -GcomprisProfile *gcompris_get_current_profile(); +GcomprisProfile *gc_profile_get_current(); /* list of Gcomprisusers */ -void gcompris_set_current_user(GcomprisUser *user); -GcomprisUser *gcompris_get_current_user(); +void gc_profile_set_current_user(GcomprisUser *user); +GcomprisUser *gc_profile_get_current_user(); #endif - - -/* Local Variables: */ -/* mode:c */ -/* eval:(load-library "time-stamp") */ -/* eval:(make-local-variable 'write-file-hooks) */ -/* eval:(add-hook 'write-file-hooks 'time-stamp) */ -/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */ -/* End: */ diff --git a/src/gcompris/properties.c b/src/gcompris/properties.c index 5fe4920..5c457a6 100644 --- a/src/gcompris/properties.c +++ b/src/gcompris/properties.c @@ -20,11 +20,9 @@ */ #include -#include -#include #include -#include #include +#include #include "gcompris.h" @@ -47,7 +45,8 @@ static gchar *config_file = NULL; * return 1 if parsing OK, 0 otherwise * the return value is returned in retval */ -guint scan_get_int(GScanner *scanner, int *retval) { +static guint +scan_get_int(GScanner *scanner, int *retval) { GTokenType token = g_scanner_get_next_token (scanner); token = g_scanner_get_next_token (scanner); if(token == G_TOKEN_INT) { @@ -62,7 +61,8 @@ guint scan_get_int(GScanner *scanner, int *retval) { /* * return String if parsing OK, NULL otherwise */ -gchar *scan_get_string(GScanner *scanner) { +static gchar * +scan_get_string(GScanner *scanner) { GTokenType token = g_scanner_get_next_token (scanner); token = g_scanner_get_next_token (scanner); if(token == G_TOKEN_STRING) { @@ -73,36 +73,13 @@ gchar *scan_get_string(GScanner *scanner) { return NULL; } -/* - * create the root dir if needed - * - * return 0 if OK, -1 if ERROR - */ -int -create_rootdir (gchar *rootdir) -{ - - /* Case where ~/.gcompris already exist as a file. We remove it */ - if(g_file_test(rootdir, G_FILE_TEST_IS_REGULAR)) { - unlink(rootdir); - } - - if(g_file_test(rootdir, G_FILE_TEST_IS_DIR)) { - return 0; - } - -#if defined WIN32 - return(mkdir(rootdir)); -#else - return(mkdir(rootdir, 0755)); -#endif -} /* get the gcompris user directory name */ /* Architecture dependant: "gcompris" in Win9x, */ /* "/.gcompris" in POSIX compliant systems */ -gchar *get_gcompris_user_root_directory () +gchar * +gc_prop_user_root_directory_get () { G_CONST_RETURN gchar *home_dir = g_get_home_dir(); @@ -117,16 +94,17 @@ gchar *get_gcompris_user_root_directory () * must not be freed by the caller. * */ -gchar *get_gcompris_conf_name() +gchar * +gc_prop_config_file_get() { if(config_file) return(config_file); /* Was never called, must calculate it */ if (g_get_home_dir()==NULL) { - config_file = g_strconcat(get_gcompris_user_root_directory(), "/gcompris.cfg", NULL); + config_file = g_strconcat(gc_prop_user_root_directory_get(), "/gcompris.cfg", NULL); } else { - config_file = g_strconcat(get_gcompris_user_root_directory(), "/gcompris.conf", NULL); + config_file = g_strconcat(gc_prop_user_root_directory_get(), "/gcompris.conf", NULL); } return(config_file); @@ -136,24 +114,26 @@ gchar *get_gcompris_conf_name() #define DEFAULT_DATABASE "gcompris_sqlite.db" #define PROFILES_ROOT "profiles" -gchar *get_default_database_name (gchar *shared_dir) +gchar * +gc_prop_default_database_name_get (gchar *shared_dir) { gchar *dir_base = g_strconcat( shared_dir, "/", PROFILES_ROOT, NULL); - create_rootdir(dir_base); + gc_util_create_rootdir(dir_base); g_free(dir_base); return g_strconcat( shared_dir, "/", PROFILES_ROOT, "/", DEFAULT_DATABASE, NULL); } -GcomprisProperties *gcompris_properties_new () +GcomprisProperties * +gc_prop_new () { GcomprisProperties *tmp; - char *config_file = get_gcompris_conf_name(); + char *config_file = gc_prop_config_file_get(); GScanner *scanner; int filefd; gchar *full_rootdir; const gchar *locale; - gchar *gcompris_user_dir; + gchar *user_dir; tmp = (GcomprisProperties *) malloc (sizeof (GcomprisProperties)); tmp->music = 1; @@ -189,31 +169,31 @@ GcomprisProperties *gcompris_properties_new () tmp->package_python_plugin_dir = NULL; tmp->system_icon_dir = NULL; - gcompris_user_dir = get_gcompris_user_root_directory() ; - create_rootdir( gcompris_user_dir ); + user_dir = gc_prop_user_root_directory_get() ; + gc_util_create_rootdir( user_dir ); - tmp->shared_dir = g_strconcat(gcompris_user_dir, "/shared", NULL); - create_rootdir( tmp->shared_dir ); + tmp->shared_dir = g_strconcat(user_dir, "/shared", NULL); + gc_util_create_rootdir( tmp->shared_dir ); - tmp->users_dir = g_strconcat(gcompris_user_dir, "/users", NULL); - create_rootdir( tmp->users_dir ); + tmp->users_dir = g_strconcat(user_dir, "/users", NULL); + gc_util_create_rootdir( tmp->users_dir ); - tmp->user_data_dir = g_strconcat(gcompris_user_dir, "/Plugins/boards", NULL); - create_rootdir( tmp->user_data_dir ); + tmp->user_data_dir = g_strconcat(user_dir, "/Plugins/boards", NULL); + gc_util_create_rootdir( tmp->user_data_dir ); /* Needs to be set after command line parsing */ tmp->database = NULL; - full_rootdir = g_strconcat(gcompris_user_dir, "/user_data", NULL); - create_rootdir(full_rootdir); + full_rootdir = g_strconcat(user_dir, "/user_data", NULL); + gc_util_create_rootdir(full_rootdir); g_free(full_rootdir); - full_rootdir = g_strconcat(gcompris_user_dir, "/user_data/images", NULL); - create_rootdir(full_rootdir); + full_rootdir = g_strconcat(user_dir, "/user_data/images", NULL); + gc_util_create_rootdir(full_rootdir); g_free(full_rootdir); - full_rootdir = g_strconcat(gcompris_user_dir, "/", PROFILES_ROOT, NULL); - create_rootdir(full_rootdir); + full_rootdir = g_strconcat(user_dir, "/", PROFILES_ROOT, NULL); + gc_util_create_rootdir(full_rootdir); g_free(full_rootdir); g_warning("config_file %s", config_file); @@ -332,7 +312,8 @@ GcomprisProperties *gcompris_properties_new () return (tmp); } -void gcompris_properties_destroy (GcomprisProperties *props) +void +gc_prop_destroy (GcomprisProperties *props) { if(props->locale!=NULL) g_free(props->locale); @@ -340,9 +321,10 @@ void gcompris_properties_destroy (GcomprisProperties *props) free (props); } -void gcompris_properties_save (GcomprisProperties *props) +void +gc_prop_save (GcomprisProperties *props) { - char *config_file = get_gcompris_conf_name(); + char *config_file = gc_prop_config_file_get(); FILE *filefd; filefd = fopen(config_file, "w+"); @@ -370,7 +352,7 @@ void gcompris_properties_save (GcomprisProperties *props) int -my_setenv (const char * name, const char * value) { +gc_setenv (const char * name, const char * value) { #if defined WIN32 size_t namelen = strlen(name); size_t valuelen = (value==NULL ? 0 : strlen(value)); diff --git a/src/gcompris/properties.h b/src/gcompris/properties.h index b129f20..45d5c2b 100644 --- a/src/gcompris/properties.h +++ b/src/gcompris/properties.h @@ -1,6 +1,6 @@ /* gcompris - properties.h * - * Time-stamp: <2006/08/13 16:55:16 bruno> + * Time-stamp: <2006/08/28 23:54:33 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -57,7 +57,7 @@ typedef struct { gint reread_menu; gchar *shared_dir; gchar *users_dir; - /* this are set by gcompris_im_init() */ + /* this are set by gc_im_init() */ GtkIMContext *context; gchar *default_context; gint experimental; @@ -66,20 +66,11 @@ typedef struct { } GcomprisProperties; GcomprisProperties *gc_prop_get (void); -GcomprisProperties *gcompris_properties_new (void); -void gcompris_properties_destroy (GcomprisProperties *props); -void gcompris_properties_save (GcomprisProperties *props); +GcomprisProperties *gc_prop_new (void); +void gc_prop_destroy (GcomprisProperties *props); +void gc_prop_save (GcomprisProperties *props); -gchar *get_default_database_name (gchar *shared_dir); -int create_rootdir (gchar *rootdir); -int my_setenv (const char * name, const char * value); +gchar *gc_prop_default_database_name_get (gchar *shared_dir); +int gc_setenv (const char * name, const char * value); #endif - -/* Local Variables: */ -/* mode:c */ -/* eval:(load-library "time-stamp") */ -/* eval:(make-local-variable 'write-file-hooks) */ -/* eval:(add-hook 'write-file-hooks 'time-stamp) */ -/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */ -/* End: */ diff --git a/src/gcompris/score.c b/src/gcompris/score.c index 4b4bbf1..e775666 100644 --- a/src/gcompris/score.c +++ b/src/gcompris/score.c @@ -49,7 +49,8 @@ static void display_number(GnomeCanvasGroup *parent, /* * Do all the score display */ -void gcompris_score_start (ScoreStyleList style, guint gx, guint gy, guint gmax) +void +gc_score_start (ScoreStyleList style, guint gx, guint gy, guint gmax) { currentStyle = style; @@ -67,7 +68,8 @@ void gcompris_score_start (ScoreStyleList style, guint gx, guint gy, guint gmax) } -void gcompris_score_end() +void +gc_score_end() { if(boardRootItem!=NULL) gtk_object_destroy (GTK_OBJECT(boardRootItem)); @@ -75,7 +77,8 @@ void gcompris_score_end() boardRootItem=NULL; } -void gcompris_score_set(guint value) +void +gc_score_set(guint value) { if(boardRootItem!=NULL) @@ -83,7 +86,7 @@ void gcompris_score_set(guint value) boardRootItem = GNOME_CANVAS_GROUP( gnome_canvas_item_new ( - gnome_canvas_root(get_current_gcompris_board()->canvas), + gnome_canvas_root(gc_board_get_current()->canvas), gnome_canvas_group_get_type (), "x", (double) x, "y", (double) y, @@ -95,7 +98,7 @@ void gcompris_score_set(guint value) gchar *tmp; GdkPixbuf *button_pixmap = NULL; - button_pixmap = gcompris_load_skin_pixmap("button_large.png"); + button_pixmap = gc_skin_pixmap_load("button_large.png"); gnome_canvas_item_new (boardRootItem, gnome_canvas_pixbuf_get_type (), "pixbuf", button_pixmap, @@ -122,10 +125,11 @@ void gcompris_score_set(guint value) #define NUMBERSWIDTH 110 -static void display_number(GnomeCanvasGroup *parent, - guint x, - guint y, - char *operand_str) +static void +display_number(GnomeCanvasGroup *parent, + guint x, + guint y, + char *operand_str) { x -= NUMBERSWIDTH; @@ -133,7 +137,7 @@ static void display_number(GnomeCanvasGroup *parent, gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", operand_str, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) x+2, "y", (double) y+2, "anchor", GTK_ANCHOR_CENTER, @@ -142,7 +146,7 @@ static void display_number(GnomeCanvasGroup *parent, gnome_canvas_item_new (parent, gnome_canvas_text_get_type (), "text", operand_str, - "font", gcompris_skin_font_board_huge_bold, + "font", gc_skin_font_board_huge_bold, "x", (double) x, "y", (double) y, "anchor", GTK_ANCHOR_CENTER, diff --git a/src/gcompris/score.h b/src/gcompris/score.h index 63da1dd..04618a0 100644 --- a/src/gcompris/score.h +++ b/src/gcompris/score.h @@ -24,17 +24,14 @@ #include "gcompris.h" -/* SCORE_LAST is equals to the last available score type */ - typedef enum { - SCORESTYLE_NOTE = 0, - SCORESTYLE_LIFE = 1, - SCORE_LAST = 1 + SCORESTYLE_NOTE, + SCORESTYLE_LIFE, } ScoreStyleList; -void gcompris_score_start (ScoreStyleList style, guint x, guint y, guint max); -void gcompris_score_end(); -void gcompris_score_set(guint value); +void gc_score_start (ScoreStyleList style, guint x, guint y, guint max); +void gc_score_end(); +void gc_score_set(guint value); #endif diff --git a/src/gcompris/skin.c b/src/gcompris/skin.c index b3028b7..91b89ed 100644 --- a/src/gcompris/skin.c +++ b/src/gcompris/skin.c @@ -23,30 +23,30 @@ #include #include -GHashTable* gcompris_skin_fonts = NULL; -GHashTable* gcompris_skin_colors = NULL; -GHashTable* gcompris_skin_numbers = NULL; - -guint32 gcompris_skin_color_title; -guint32 gcompris_skin_color_text_button; -guint32 gcompris_skin_color_content; -guint32 gcompris_skin_color_subtitle; -guint32 gcompris_skin_color_shadow; - -gchar* gcompris_skin_font_title; -gchar* gcompris_skin_font_subtitle; -gchar* gcompris_skin_font_content; - -gchar* gcompris_skin_font_board_tiny; -gchar* gcompris_skin_font_board_small; -gchar* gcompris_skin_font_board_medium; -gchar* gcompris_skin_font_board_big; -gchar* gcompris_skin_font_board_big_bold; -gchar* gcompris_skin_font_board_fixed; -gchar* gcompris_skin_font_board_title; -gchar* gcompris_skin_font_board_title_bold; -gchar* gcompris_skin_font_board_huge; -gchar* gcompris_skin_font_board_huge_bold; +GHashTable* gc_skin_fonts = NULL; +GHashTable* gc_skin_colors = NULL; +GHashTable* gc_skin_numbers = NULL; + +guint32 gc_skin_color_title; +guint32 gc_skin_color_text_button; +guint32 gc_skin_color_content; +guint32 gc_skin_color_subtitle; +guint32 gc_skin_color_shadow; + +gchar* gc_skin_font_title; +gchar* gc_skin_font_subtitle; +gchar* gc_skin_font_content; + +gchar* gc_skin_font_board_tiny; +gchar* gc_skin_font_board_small; +gchar* gc_skin_font_board_medium; +gchar* gc_skin_font_board_big; +gchar* gc_skin_font_board_big_bold; +gchar* gc_skin_font_board_fixed; +gchar* gc_skin_font_board_title; +gchar* gc_skin_font_board_title_bold; +gchar* gc_skin_font_board_huge; +gchar* gc_skin_font_board_huge_bold; /* @@ -56,7 +56,8 @@ gchar* gcompris_skin_font_board_huge_bold; * * The caller must free the returned string */ -gchar *gcompris_image_to_skin(gchar *pixmapfile) +gchar * +gc_skin_image_get(gchar *pixmapfile) { GcomprisProperties *properties = gc_prop_get(); gchar *filename; @@ -90,12 +91,13 @@ gchar *gcompris_image_to_skin(gchar *pixmapfile) * If not found, try in the default skin directory * If not found abort gcompris */ -GdkPixbuf *gcompris_load_skin_pixmap(char *pixmapfile) +GdkPixbuf * +gc_skin_pixmap_load(char *pixmapfile) { gchar *filename; GdkPixbuf *result_pixbuf; - filename = gcompris_image_to_skin(pixmapfile); + filename = gc_skin_image_get(pixmapfile); result_pixbuf = gc_pixmap_load (filename); @@ -108,7 +110,8 @@ GdkPixbuf *gcompris_load_skin_pixmap(char *pixmapfile) * Utility function used when freeing the memory used by * a hashtable containing strings. */ -void gcompris_skin_free_string(gpointer data) +static void +gc_skin_free_string(gpointer data) { g_free(data); } @@ -117,53 +120,54 @@ void gcompris_skin_free_string(gpointer data) * Initialize some common variables * (the one that have to be defined in each skin) */ -void gcompris_skin_setup_vars(void) +void +gc_skin_setup_vars(void) { - gcompris_skin_color_title = - gcompris_skin_get_color_default("gcompris/title", COLOR_TITLE); - gcompris_skin_color_text_button = - gcompris_skin_get_color_default("gcompris/text button", COLOR_TEXT_BUTTON); - gcompris_skin_color_content = - gcompris_skin_get_color_default("gcompris/content", COLOR_CONTENT); - gcompris_skin_color_subtitle = - gcompris_skin_get_color_default("gcompris/subtitle", COLOR_SUBTITLE); - gcompris_skin_color_shadow = - gcompris_skin_get_color_default("gcompris/shadow", COLOR_SHADOW); + gc_skin_color_title = + gc_skin_get_color_default("gcompris/title", COLOR_TITLE); + gc_skin_color_text_button = + gc_skin_get_color_default("gcompris/text button", COLOR_TEXT_BUTTON); + gc_skin_color_content = + gc_skin_get_color_default("gcompris/content", COLOR_CONTENT); + gc_skin_color_subtitle = + gc_skin_get_color_default("gcompris/subtitle", COLOR_SUBTITLE); + gc_skin_color_shadow = + gc_skin_get_color_default("gcompris/shadow", COLOR_SHADOW); - gcompris_skin_font_title = - gcompris_skin_get_font_default("gcompris/title", FONT_TITLE); - gcompris_skin_font_subtitle = - gcompris_skin_get_font_default("gcompris/subtitle", FONT_SUBTITLE); - gcompris_skin_font_content = - gcompris_skin_get_font_default("gcompris/content", FONT_CONTENT); + gc_skin_font_title = + gc_skin_get_font_default("gcompris/title", FONT_TITLE); + gc_skin_font_subtitle = + gc_skin_get_font_default("gcompris/subtitle", FONT_SUBTITLE); + gc_skin_font_content = + gc_skin_get_font_default("gcompris/content", FONT_CONTENT); - gcompris_skin_font_board_tiny = - gcompris_skin_get_font_default("gcompris/board/tiny", FONT_BOARD_TINY); - gcompris_skin_font_board_small = - gcompris_skin_get_font_default("gcompris/board/small", FONT_BOARD_SMALL); - gcompris_skin_font_board_medium = - gcompris_skin_get_font_default("gcompris/board/medium", FONT_BOARD_MEDIUM); - gcompris_skin_font_board_big = - gcompris_skin_get_font_default("gcompris/board/big", FONT_BOARD_BIG); - gcompris_skin_font_board_big_bold = - gcompris_skin_get_font_default("gcompris/board/big bold", FONT_BOARD_BIG_BOLD); - gcompris_skin_font_board_fixed = - gcompris_skin_get_font_default("gcompris/board/fixed", FONT_BOARD_FIXED); - gcompris_skin_font_board_title = - gcompris_skin_get_font_default("gcompris/board/title", FONT_BOARD_TITLE); - gcompris_skin_font_board_title_bold = - gcompris_skin_get_font_default("gcompris/board/title bold", FONT_BOARD_TITLE_BOLD); - gcompris_skin_font_board_huge = - gcompris_skin_get_font_default("gcompris/board/huge", FONT_BOARD_HUGE); - gcompris_skin_font_board_huge_bold = - gcompris_skin_get_font_default("gcompris/board/huge bold", FONT_BOARD_HUGE_BOLD); + gc_skin_font_board_tiny = + gc_skin_get_font_default("gcompris/board/tiny", FONT_BOARD_TINY); + gc_skin_font_board_small = + gc_skin_get_font_default("gcompris/board/small", FONT_BOARD_SMALL); + gc_skin_font_board_medium = + gc_skin_get_font_default("gcompris/board/medium", FONT_BOARD_MEDIUM); + gc_skin_font_board_big = + gc_skin_get_font_default("gcompris/board/big", FONT_BOARD_BIG); + gc_skin_font_board_big_bold = + gc_skin_get_font_default("gcompris/board/big bold", FONT_BOARD_BIG_BOLD); + gc_skin_font_board_fixed = + gc_skin_get_font_default("gcompris/board/fixed", FONT_BOARD_FIXED); + gc_skin_font_board_title = + gc_skin_get_font_default("gcompris/board/title", FONT_BOARD_TITLE); + gc_skin_font_board_title_bold = + gc_skin_get_font_default("gcompris/board/title bold", FONT_BOARD_TITLE_BOLD); + gc_skin_font_board_huge = + gc_skin_get_font_default("gcompris/board/huge", FONT_BOARD_HUGE); + gc_skin_font_board_huge_bold = + gc_skin_get_font_default("gcompris/board/huge bold", FONT_BOARD_HUGE_BOLD); } /* * Convert from string a color expressed in the form 0xRRGGBBAA * to a unsigned 32 bit integer. */ -gboolean gcompris_skin_str_to_color(gchar* data, guint32* color){ +gboolean gc_skin_str_to_color(gchar* data, guint32* color){ char c; int i; int n = 32; @@ -242,7 +246,8 @@ gboolean gcompris_skin_str_to_color(gchar* data, guint32* color){ * Parse a skin.xml file located in the skin directory * and load the skin properties into memory */ -static void skin_xml_load (gchar* skin) +static void +skin_xml_load (gchar* skin) { gchar* xmlfilename; xmlDocPtr xmldoc; @@ -301,8 +306,8 @@ static void skin_xml_load (gchar* skin) key = (gchar *)xmlGetProp(node, BAD_CAST "id"); data =(gchar *) xmlGetProp(node, BAD_CAST "rgba"); if((key!=NULL)&&(data!=NULL)){ - if(gcompris_skin_str_to_color(data, &color)){ - g_hash_table_insert(gcompris_skin_colors, key, GUINT_TO_POINTER(color)); + if(gc_skin_str_to_color(data, &color)){ + g_hash_table_insert(gc_skin_colors, key, GUINT_TO_POINTER(color)); } else { if(key!=NULL) g_free(key); } @@ -313,7 +318,7 @@ static void skin_xml_load (gchar* skin) key = (gchar *)xmlGetProp(node, BAD_CAST "id"); data = (gchar *)xmlGetProp(node, BAD_CAST "name"); if((key!=NULL)&&(data!=NULL)){ - g_hash_table_insert(gcompris_skin_fonts, key, data); + g_hash_table_insert(gc_skin_fonts, key, data); } else { if(key!=NULL) g_free(key); if(data!=NULL) g_free(data); @@ -324,7 +329,7 @@ static void skin_xml_load (gchar* skin) data = (gchar *)xmlGetProp(node, BAD_CAST "value"); if((key!=NULL)&&(data!=NULL)){ int number = atoi(data); - g_hash_table_insert(gcompris_skin_numbers, key, GUINT_TO_POINTER(number)); + g_hash_table_insert(gc_skin_numbers, key, GUINT_TO_POINTER(number)); } else { if(key!=NULL) g_free(key); if(data!=NULL) g_free(data); @@ -340,49 +345,52 @@ static void skin_xml_load (gchar* skin) * Parse the default skin.xml file and the one located in the skin * directory then load all skins properties into memory */ -void gcompris_skin_load (gchar* skin) +void +gc_skin_load (gchar* skin) { if(skin==NULL) return; - gcompris_skin_free(); + gc_skin_free(); - gcompris_skin_fonts = g_hash_table_new_full(g_str_hash, g_str_equal, - gcompris_skin_free_string, - gcompris_skin_free_string); - gcompris_skin_colors = g_hash_table_new_full(g_str_hash, g_str_equal, - gcompris_skin_free_string, + gc_skin_fonts = g_hash_table_new_full(g_str_hash, g_str_equal, + gc_skin_free_string, + gc_skin_free_string); + gc_skin_colors = g_hash_table_new_full(g_str_hash, g_str_equal, + gc_skin_free_string, NULL); - gcompris_skin_numbers = g_hash_table_new_full(g_str_hash, g_str_equal, - gcompris_skin_free_string, + gc_skin_numbers = g_hash_table_new_full(g_str_hash, g_str_equal, + gc_skin_free_string, NULL); skin_xml_load(DEFAULT_SKIN); if(strcmp(skin,DEFAULT_SKIN)!=0) skin_xml_load(skin); - gcompris_skin_setup_vars(); + gc_skin_setup_vars(); } /* * Free the memory used to store the skin properties. */ -void gcompris_skin_free (void) +void +gc_skin_free (void) { - if(gcompris_skin_fonts!=NULL) - g_hash_table_destroy(gcompris_skin_fonts); + if(gc_skin_fonts!=NULL) + g_hash_table_destroy(gc_skin_fonts); - if(gcompris_skin_colors!=NULL) - g_hash_table_destroy(gcompris_skin_colors); + if(gc_skin_colors!=NULL) + g_hash_table_destroy(gc_skin_colors); } /* * Get the skin color associated to the id */ -guint32 gcompris_skin_get_color_default(gchar* id, guint32 def) +guint32 +gc_skin_get_color_default(gchar* id, guint32 def) { gpointer result; - result = g_hash_table_lookup(gcompris_skin_colors, (gpointer)id); + result = g_hash_table_lookup(gc_skin_colors, (gpointer)id); if(result!=NULL) return GPOINTER_TO_UINT(result); return def; @@ -393,14 +401,15 @@ guint32 gcompris_skin_get_color_default(gchar* id, guint32 def) * * The color is returned in the given gdkcolor */ -void gcompris_skin_get_gdkcolor_default(gchar* id, guint32 def, GdkColor *gdkcolor) +void +gc_skin_get_gdkcolor_default(gchar* id, guint32 def, GdkColor *gdkcolor) { gchar *tmp; guint32 color; - color = gcompris_skin_get_color_default(id, def); + color = gc_skin_get_color_default(id, def); - tmp = g_strdup_printf("#%06X", gcompris_skin_get_color(id) >> 8); + tmp = g_strdup_printf("#%06X", gc_skin_get_color(id) >> 8); gdk_color_parse(tmp, gdkcolor); g_free(tmp); } @@ -408,10 +417,11 @@ void gcompris_skin_get_gdkcolor_default(gchar* id, guint32 def, GdkColor *gdkcol /* * Get the skin font name associated to the id */ -gchar* gcompris_skin_get_font_default(gchar* id, gchar* def) +gchar* +gc_skin_get_font_default(gchar* id, gchar* def) { gpointer result; - result = g_hash_table_lookup(gcompris_skin_fonts, (gpointer)id); + result = g_hash_table_lookup(gc_skin_fonts, (gpointer)id); if(result!=NULL) return (gchar*)result; return def; @@ -420,10 +430,11 @@ gchar* gcompris_skin_get_font_default(gchar* id, gchar* def) /* * Get the skin 'number' associated to the id */ -guint32 gcompris_skin_get_number_default(gchar* id, guint32 def) +guint32 +gc_skin_get_number_default(gchar* id, guint32 def) { gpointer result; - result = g_hash_table_lookup(gcompris_skin_numbers, (gpointer)id); + result = g_hash_table_lookup(gc_skin_numbers, (gpointer)id); if(result!=NULL) return GPOINTER_TO_UINT(result); return def; diff --git a/src/gcompris/skin.h b/src/gcompris/skin.h index c912266..f5cc2ac 100644 --- a/src/gcompris/skin.h +++ b/src/gcompris/skin.h @@ -23,42 +23,42 @@ #include #include "gcompris.h" -extern guint32 gcompris_skin_color_title; -extern guint32 gcompris_skin_color_text_button; -extern guint32 gcompris_skin_color_content; -extern guint32 gcompris_skin_color_subtitle; -extern guint32 gcompris_skin_color_shadow; +extern guint32 gc_skin_color_title; +extern guint32 gc_skin_color_text_button; +extern guint32 gc_skin_color_content; +extern guint32 gc_skin_color_subtitle; +extern guint32 gc_skin_color_shadow; -extern gchar* gcompris_skin_font_title; -extern gchar* gcompris_skin_font_subtitle; -extern gchar* gcompris_skin_font_content; +extern gchar* gc_skin_font_title; +extern gchar* gc_skin_font_subtitle; +extern gchar* gc_skin_font_content; -extern gchar* gcompris_skin_font_board_tiny; -extern gchar* gcompris_skin_font_board_small; -extern gchar* gcompris_skin_font_board_medium; -extern gchar* gcompris_skin_font_board_big; -extern gchar* gcompris_skin_font_board_big_bold; -extern gchar* gcompris_skin_font_board_fixed; -extern gchar* gcompris_skin_font_board_title; -extern gchar* gcompris_skin_font_board_title_bold; -extern gchar* gcompris_skin_font_board_huge; -extern gchar* gcompris_skin_font_board_huge_bold; +extern gchar* gc_skin_font_board_tiny; +extern gchar* gc_skin_font_board_small; +extern gchar* gc_skin_font_board_medium; +extern gchar* gc_skin_font_board_big; +extern gchar* gc_skin_font_board_big_bold; +extern gchar* gc_skin_font_board_fixed; +extern gchar* gc_skin_font_board_title; +extern gchar* gc_skin_font_board_title_bold; +extern gchar* gc_skin_font_board_huge; +extern gchar* gc_skin_font_board_huge_bold; -gchar *gcompris_image_to_skin(gchar *imagename); -GdkPixbuf *gcompris_load_skin_pixmap(char *pixmapfile); +gchar *gc_skin_image_get(gchar *imagename); +GdkPixbuf *gc_skin_pixmap_load(char *pixmapfile); -void gcompris_skin_load (gchar* skin); -void gcompris_skin_free (void); +void gc_skin_load (gchar* skin); +void gc_skin_free (void); -guint32 gcompris_skin_get_color_default(gchar* id, guint32 def); -void gcompris_skin_get_gdkcolor_default(gchar* id, guint32 def, GdkColor *gdkcolor); -gchar* gcompris_skin_get_font_default(gchar* id, gchar* def); -guint32 gcompris_skin_get_number_default(gchar* id, guint32 def); +guint32 gc_skin_get_color_default(gchar* id, guint32 def); +void gc_skin_get_gdkcolor_default(gchar* id, guint32 def, GdkColor *gdkcolor); +gchar* gc_skin_get_font_default(gchar* id, gchar* def); +guint32 gc_skin_get_number_default(gchar* id, guint32 def); -#define gcompris_skin_get_gdkcolor(id, gdkcolor) gcompris_skin_get_gdkcolor_default(id, 0x0D0DFA00, gdkcolor) -#define gcompris_skin_get_color(id) gcompris_skin_get_color_default(id, 0x0D0DFA00) -#define gcompris_skin_get_font(id) gcompris_skin_get_font_default(id, "Sans 12") -#define gcompris_skin_get_number(id) gcompris_skin_get_number_default(id, 0) +#define gc_skin_get_gdkcolor(id, gdkcolor) gc_skin_get_gdkcolor_default(id, 0x0D0DFA00, gdkcolor) +#define gc_skin_get_color(id) gc_skin_get_color_default(id, 0x0D0DFA00) +#define gc_skin_get_font(id) gc_skin_get_font_default(id, "Sans 12") +#define gc_skin_get_number(id) gc_skin_get_number_default(id, 0) #endif diff --git a/src/gcompris/soundutil.c b/src/gcompris/soundutil.c index b0a5a9a..b3c0609 100644 --- a/src/gcompris/soundutil.c +++ b/src/gcompris/soundutil.c @@ -55,24 +55,25 @@ static gpointer scheduler (gpointer user_data); static gpointer scheduler_bgnd (gpointer user_data); /* sound control */ -GObject *gcompris_sound_controller = NULL; -void gcompris_sound_callback(GcomprisSound *ctl, gchar *file, gpointer user_data); +GObject *gc_sound_controller = NULL; +void gc_sound_callback(GcomprisSound *ctl, gchar *file, gpointer user_data); GHashTable *sound_callbacks = NULL; /* ===================================================================== * * =====================================================================*/ -void initSound() +void +gc_sound_init() { - gcompris_sound_controller = g_object_new (GCOMPRIS_SOUND_TYPE, NULL); + gc_sound_controller = g_object_new (GCOMPRIS_SOUND_TYPE, NULL); - g_signal_connect( gcompris_sound_controller, + g_signal_connect( gc_sound_controller, "sound-played", - (GCallback) gcompris_sound_callback, + (GCallback) gc_sound_callback, NULL); - g_assert( gcompris_sound_controller != NULL ); + g_assert( gc_sound_controller != NULL ); /* Check to run the init once only */ if(sound_init == 1) { @@ -106,7 +107,8 @@ void initSound() perror("create failed for scheduler background"); } -void gcompris_close_sound() +void +gc_sound_close() { if ( ! ( sound_closed || ( ( gc_prop_get()->music == 0 ) && ( gc_prop_get()->fx == 0) ) ) ){ @@ -116,7 +118,8 @@ void gcompris_close_sound() sound_closed = TRUE; } } -void gcompris_reopen_sound() +void +gc_sound_reopen() { if (sound_closed){ sdlplayer_reopen(); @@ -126,18 +129,21 @@ void gcompris_reopen_sound() } } -void gcompris_pause_sound(){ +void +gc_sound_pause(){ sdlplayer_pause(); } -void gcompris_resume_sound(){ +void +gc_sound_resume(){ sdlplayer_resume(); } /* ===================================================================== * * =====================================================================*/ -void setSoundPolicy(int policy) +void +gc_sound_policy_set(int policy) { switch (policy) { @@ -149,7 +155,8 @@ void setSoundPolicy(int policy) /* ===================================================================== * * =====================================================================*/ -int getSoundPolicy() +int +gc_sound_policy_get() { return sound_policy; } @@ -159,7 +166,8 @@ int getSoundPolicy() * - launches a single thread for playing and play any file found * in the gcompris music directory ======================================================================*/ -static gpointer scheduler_bgnd (gpointer user_data) +static gpointer +scheduler_bgnd (gpointer user_data) { GcomprisProperties *properties = gc_prop_get(); gint i; @@ -242,7 +250,8 @@ static gpointer scheduler_bgnd (gpointer user_data) * - then launches another thread if some sounds are pending * - the thread never ends ======================================================================*/ -static gpointer scheduler (gpointer user_data) +static gpointer +scheduler (gpointer user_data) { char *sound = NULL; @@ -266,7 +275,8 @@ static gpointer scheduler (gpointer user_data) /* ===================================================================== * Thread function for playing a single file ======================================================================*/ -static void* thread_play_ogg (gchar *file) +static void* +thread_play_ogg (gchar *file) { gchar *absolute_file; @@ -279,8 +289,8 @@ static void* thread_play_ogg (gchar *file) g_warning(" Calling gcompris internal sdlplayer_file (%s)", absolute_file); sdlplayer(absolute_file, 128); - g_signal_emit (gcompris_sound_controller, - GCOMPRIS_SOUND_GET_CLASS (gcompris_sound_controller)->sound_played_signal_id, + g_signal_emit (gc_sound_controller, + GCOMPRIS_SOUND_GET_CLASS (gc_sound_controller)->sound_played_signal_id, 0 /* details */, g_strdup(file)); g_warning(" sdlplayer_file(%s) ended.", absolute_file); @@ -293,7 +303,8 @@ static void* thread_play_ogg (gchar *file) /* ===================================================================== * Returns the next sound play, or NULL if there is no ======================================================================*/ -char* get_next_sound_to_play( ) +static char* +get_next_sound_to_play( ) { char* tmpSound = NULL; @@ -313,11 +324,10 @@ char* get_next_sound_to_play( ) /* ===================================================================== * Play a OGG sound file. - * gcompris_play_ogg function to process the sounds. + * gc_sound_play_ogg function to process the sounds. ======================================================================*/ - void -gcompris_play_ogg_cb(const gchar *file, GcomprisSoundCallback cb) +gc_sound_play_ogg_cb(const gchar *file, GcomprisSoundCallback cb) { g_assert ( cb != NULL); @@ -335,15 +345,16 @@ gcompris_play_ogg_cb(const gchar *file, GcomprisSoundCallback cb) g_hash_table_replace (sound_callbacks, (gpointer)intern_file, cb); - gcompris_play_ogg(intern_file, NULL); + gc_sound_play_ogg(intern_file, NULL); } /* ===================================================================== * Play a list of OGG sound files. The list must be NULL terminated * This function wraps the var args into a GList and call the - * gcompris_play_ogg_list function to process the sounds. + * gc_sound_play_ogg_list function to process the sounds. ======================================================================*/ -void gcompris_play_ogg(const gchar *sound, ...) +void +gc_sound_play_ogg(const gchar *sound, ...) { va_list ap; char* tmp = NULL; @@ -363,7 +374,7 @@ void gcompris_play_ogg(const gchar *sound, ...) } va_end(ap); - gcompris_play_ogg_list( list ); + gc_sound_play_ogg_list( list ); g_list_free(list); } @@ -375,7 +386,8 @@ void gcompris_play_ogg(const gchar *sound, ...) * If it doesn't exists, then the test is done with a music file: * music/ =====================================================================*/ -void gcompris_play_ogg_list( GList* files ) +void +gc_sound_play_ogg_list( GList* files ) { GList* list; @@ -414,7 +426,8 @@ void gcompris_play_ogg_list( GList* files ) * \return a newly allocated string of the form U0033.ogg */ -gchar *gcompris_alphabet_sound(gchar *chars) +gchar * +gc_sound_alphabet(gchar *chars) { gchar *next, *str, *prev, *result; gint i; @@ -448,7 +461,7 @@ gchar *gcompris_alphabet_sound(gchar *chars) } -void gcompris_sound_callback(GcomprisSound *ctl, gchar *file, gpointer user_data) +void gc_sound_callback(GcomprisSound *ctl, gchar *file, gpointer user_data) { GcomprisSoundCallback cb; @@ -476,8 +489,8 @@ struct _GcomprisSoundPrivate #include "gcompris-marshal.h" static void -gcompris_sound_instance_init (GTypeInstance *instance, - gpointer g_class) +gc_sound_instance_init (GTypeInstance *instance, + gpointer g_class) { GcomprisSound *self = (GcomprisSound *)instance; self->private = g_new (GcomprisSoundPrivate, 1); @@ -491,8 +504,8 @@ default_sound_played_signal_handler (GcomprisSound *obj, gchar *file, gpointer u } static void -gcompris_sound_class_init (gpointer g_class, - gpointer g_class_data) +gc_sound_class_init (gpointer g_class, + gpointer g_class_data) { GcomprisSoundClass *klass = GCOMPRIS_SOUND_CLASS (g_class); @@ -512,7 +525,7 @@ gcompris_sound_class_init (gpointer g_class, } -GType gcompris_sound_get_type (void) +GType gc_sound_get_type (void) { static GType type = 0; if (type == 0) { @@ -520,12 +533,12 @@ GType gcompris_sound_get_type (void) sizeof (GcomprisSoundClass), NULL, /* base_init */ NULL, /* base_finalize */ - gcompris_sound_class_init, /* class_init */ + gc_sound_class_init, /* class_init */ NULL, /* class_finalize */ NULL, /* class_data */ sizeof (GcomprisSound), 0, /* n_preallocs */ - gcompris_sound_instance_init /* instance_init */ + gc_sound_instance_init /* instance_init */ }; type = g_type_register_static (G_TYPE_OBJECT, "GcomprisSoundType", diff --git a/src/gcompris/soundutil.h b/src/gcompris/soundutil.h index dbf7fe1..b5fe904 100644 --- a/src/gcompris/soundutil.h +++ b/src/gcompris/soundutil.h @@ -35,16 +35,16 @@ typedef enum typedef void (*GcomprisSoundCallback) (gchar *); -void gcompris_play_ogg(const gchar *, ...); -void gcompris_play_ogg_cb(const gchar *, GcomprisSoundCallback); -void gcompris_play_ogg_list( GList* files ); -void setSoundPolicy(int); -int getSoundPolicy(void); -void initSound(void); -void gcompris_reopen_sound(void); -void gcompris_close_sound(void); -void gcompris_pause_sound(void); -void gcompris_resume_sound(void); +void gc_sound_play_ogg(const gchar *, ...); +void gc_sound_play_ogg_cb(const gchar *, GcomprisSoundCallback); +void gc_sound_play_ogg_list( GList* files ); +void gc_sound_policy_set(int); +int gc_sound_policy_get(void); +void gc_sound_init(void); +void gc_sound_reopen(void); +void gc_sound_close(void); +void gc_sound_pause(void); +void gc_sound_resume(void); int decode_ogg_file(char *infile); void display_ao_devices(); @@ -60,7 +60,7 @@ void sdlplayer_pause(); void sdlplayer_resume(); int sdlplayer(char *filename, int volume); -gchar *gcompris_alphabet_sound(gchar *chars); +gchar *gc_sound_alphabet(gchar *chars); /*************************************************************/ @@ -71,7 +71,7 @@ gchar *gcompris_alphabet_sound(gchar *chars); */ #include -#define GCOMPRIS_SOUND_TYPE (gcompris_sound_get_type ()) +#define GCOMPRIS_SOUND_TYPE (gc_sound_get_type ()) #define GCOMPRIS_SOUND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCOMPRIS_SOUND_TYPE, GcomprisSound)) #define GCOMPRIS_SOUND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GCOMPRIS_SOUND_TYPE, GcomprisSoundClass)) #define GCOMPRIS_SOUND_IS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCOMPRIS_SOUND_TYPE)) @@ -96,7 +96,7 @@ struct _GcomprisSoundClass { }; /* used by MAMAN_TYPE_FILE */ -GType gcompris_sound_get_type (void); +GType gc_sound_get_type (void); /* API. */ @@ -104,6 +104,6 @@ GType gcompris_sound_get_type (void); /* Declaration of GCompris Sound Controller */ -extern GObject *gcompris_sound_controller; +extern GObject *gc_sound_controller; #endif diff --git a/src/gcompris/timer.c b/src/gcompris/timer.c index e037bef..0ceb311 100644 --- a/src/gcompris/timer.c +++ b/src/gcompris/timer.c @@ -31,7 +31,6 @@ static double ystep; static int timer; static double subratio; static TimerList type; -GnomeCanvasItem *item; static gint timer_increment (GtkWidget *widget, gpointer data); static gint subtimer_increment (GtkWidget *widget, gpointer data); static void start_animation(); @@ -40,11 +39,14 @@ static gint animate_id = 0; static gint subanimate_id = 0; static GcomprisTimerEnd gcomprisTimerEnd; -void gcompris_timer_display(int ax, int ay, TimerList atype, int second, GcomprisTimerEnd agcomprisTimerEnd) +GnomeCanvasItem *gc_timer_item; + +void +gc_timer_display(int ax, int ay, TimerList atype, int second, GcomprisTimerEnd agcomprisTimerEnd) { GdkFont *gdk_font; GdkPixbuf *pixmap = NULL; - GcomprisProperties *properties = gc_prop_get(); + GcomprisProperties *properties = gc_prop_get(); /* Timer is not requested */ if(properties->timer==0) @@ -52,12 +54,12 @@ void gcompris_timer_display(int ax, int ay, TimerList atype, int second, Gcompri gdk_font = gdk_font_load (FONT_BOARD_MEDIUM); - gcompris_timer_end(); + gc_timer_end(); paused = FALSE; boardRootItem = GNOME_CANVAS_GROUP( - gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()), + gnome_canvas_item_new (gnome_canvas_root(gc_get_canvas()), gnome_canvas_group_get_type (), "x", (double) 0, "y", (double) 0, @@ -91,12 +93,12 @@ void gcompris_timer_display(int ax, int ay, TimerList atype, int second, Gcompri { pixmap = gc_pixmap_load(filename); - item = gnome_canvas_item_new (boardRootItem, - gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, - "x", x, - "y", y, - NULL); + gc_timer_item = gnome_canvas_item_new (boardRootItem, + gnome_canvas_pixbuf_get_type (), + "pixbuf", pixmap, + "x", x, + "y", y, + NULL); gdk_pixbuf_unref(pixmap); } @@ -108,26 +110,26 @@ void gcompris_timer_display(int ax, int ay, TimerList atype, int second, Gcompri { gchar *tmpstr = g_strdup_printf("Remaining Time = %d", timer); /* Display the value for this timer */ - item = gnome_canvas_item_new (boardRootItem, - gnome_canvas_text_get_type (), - "text", tmpstr, - "font_gdk", gdk_font, - "x", x, - "y", y, - "anchor", GTK_ANCHOR_CENTER, - "fill_color", "white", - NULL); + gc_timer_item = gnome_canvas_item_new (boardRootItem, + gnome_canvas_text_get_type (), + "text", tmpstr, + "font_gdk", gdk_font, + "x", x, + "y", y, + "anchor", GTK_ANCHOR_CENTER, + "fill_color", "white", + NULL); g_free(tmpstr); } break; case GCOMPRIS_TIMER_BALLOON: pixmap = gc_pixmap_load("gcompris/misc/tuxballoon.png"); - item = gnome_canvas_item_new (boardRootItem, - gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, - "x", x, - "y", y, - NULL); + gc_timer_item = gnome_canvas_item_new (boardRootItem, + gnome_canvas_pixbuf_get_type (), + "pixbuf", pixmap, + "x", x, + "y", y, + NULL); /* Calc the number of step needed to reach the sea based on user y and second */ ystep = (BOARDHEIGHT-y-gdk_pixbuf_get_height(pixmap))/second; @@ -153,12 +155,14 @@ void gcompris_timer_display(int ax, int ay, TimerList atype, int second, Gcompri start_animation(); } -void gcompris_timer_add(int second) +void +gc_timer_add(int second) { timer +=second; } -void gcompris_timer_end() +void +gc_timer_end() { if(boardRootItem!=NULL) gtk_object_destroy (GTK_OBJECT(boardRootItem)); @@ -175,7 +179,8 @@ void gcompris_timer_end() subanimate_id = 0; } -void gcompris_timer_pause(gboolean pause) +void +gc_timer_pause(gboolean pause) { if(boardRootItem==NULL) return; @@ -199,13 +204,18 @@ void gcompris_timer_pause(gboolean pause) } -guint gcompris_timer_get_remaining() +guint +gc_timer_get_remaining() { return(timer); } - -static void start_animation() +/* + * Local functions + * --------------- + */ +static void +start_animation() { switch(type) @@ -228,14 +238,15 @@ static void start_animation() } -static void display_time_ellapsed() +static void +display_time_ellapsed() { switch(type) { case GCOMPRIS_TIMER_TEXT: /* Display the value for this timer */ - if(item) - gnome_canvas_item_set(item, + if(gc_timer_item) + gnome_canvas_item_set(gc_timer_item, "text", _("Time Elapsed"), NULL); break; @@ -246,7 +257,8 @@ static void display_time_ellapsed() } -static gint subtimer_increment(GtkWidget *widget, gpointer data) +static gint +subtimer_increment(GtkWidget *widget, gpointer data) { if(paused) return(FALSE); @@ -256,11 +268,11 @@ static gint subtimer_increment(GtkWidget *widget, gpointer data) case GCOMPRIS_TIMER_BALLOON: /* Display the value for this timer */ y+=ystep/subratio; - if(item) - gnome_canvas_item_set(item, + if(gc_timer_item) + gnome_canvas_item_set(gc_timer_item, "y", y, NULL); - // gnome_canvas_update_now(gcompris_get_canvas()); + // gnome_canvas_update_now(gc_get_canvas()); break; default: break; @@ -268,7 +280,8 @@ static gint subtimer_increment(GtkWidget *widget, gpointer data) return (TRUE); } -static gint timer_increment(GtkWidget *widget, gpointer data) +static gint +timer_increment(GtkWidget *widget, gpointer data) { if(paused) return(FALSE); @@ -291,7 +304,7 @@ static gint timer_increment(GtkWidget *widget, gpointer data) { case GCOMPRIS_TIMER_SAND: case GCOMPRIS_TIMER_CLOCK: - if(item) + if(gc_timer_item) { GcomprisProperties *properties = gc_prop_get(); GdkPixbuf *pixmap = NULL; @@ -310,7 +323,7 @@ static gint timer_increment(GtkWidget *widget, gpointer data) if (g_file_test ((filefull), G_FILE_TEST_EXISTS)) { pixmap = gc_pixmap_load(filename); - gnome_canvas_item_set(item, + gnome_canvas_item_set(gc_timer_item, "pixbuf", pixmap, NULL); gdk_pixbuf_unref(pixmap); @@ -321,10 +334,10 @@ static gint timer_increment(GtkWidget *widget, gpointer data) break; case GCOMPRIS_TIMER_TEXT: /* Display the value for this timer */ - if(item) + if(gc_timer_item) { char *tmpstr = g_strdup_printf(_("Remaining Time = %d"), timer); - gnome_canvas_item_set(item, + gnome_canvas_item_set(gc_timer_item, "text", tmpstr, NULL); g_free(tmpstr); diff --git a/src/gcompris/timer.h b/src/gcompris/timer.h index c48931c..dd28d46 100644 --- a/src/gcompris/timer.h +++ b/src/gcompris/timer.h @@ -29,19 +29,19 @@ typedef enum { - GCOMPRIS_TIMER_TEXT = 0, - GCOMPRIS_TIMER_SAND = 1, - GCOMPRIS_TIMER_BALLOON = 2, - GCOMPRIS_TIMER_CLOCK = 3, + GCOMPRIS_TIMER_TEXT, + GCOMPRIS_TIMER_SAND, + GCOMPRIS_TIMER_BALLOON, + GCOMPRIS_TIMER_CLOCK, } TimerList; /* Callback when the timer is completed */ typedef void (*GcomprisTimerEnd) (); -void gcompris_timer_display(int x, int y, TimerList type, int second, GcomprisTimerEnd gcomprisTimerEnd); -void gcompris_timer_add(int second); -void gcompris_timer_end(void); -guint gcompris_timer_get_remaining(); -void gcompris_timer_pause(gboolean pause); +void gc_timer_display(int x, int y, TimerList type, int second, GcomprisTimerEnd gcomprisTimerEnd); +void gc_timer_add(int second); +void gc_timer_end(void); +guint gc_timer_get_remaining(); +void gc_timer_pause(gboolean pause); #endif -- cgit v0.9.1