X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fgtk%2Fapp-config.c;h=315242154a6c7972a829e540379a2e1396336c7e;hb=121bcb38f29409f10de63a68d86620c4beb75c97;hp=a073e44e146c90184059877e4c9cd85d56520ab3;hpb=cc7dd9b04f44a9777fbb87f0c03b8685c97b5178;p=emu8051.git diff --git a/src/gtk/app-config.c b/src/gtk/app-config.c index a073e44..3152421 100644 --- a/src/gtk/app-config.c +++ b/src/gtk/app-config.c @@ -3,19 +3,7 @@ * * Copyright (C) 2013 Hugo Villeneuve * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * This file is released under the GPLv2 */ #if HAVE_CONFIG_H @@ -53,6 +41,8 @@ app_config_init(void) /* UI settings */ cfg->win_width = 640; cfg->win_height = 480; + cfg->win_pos_x = 10; + cfg->win_pos_y = 10; cfg->hpane_pos = 100; cfg->vpane_pos = 200; cfg->main_pane_pos = 200; @@ -65,19 +55,20 @@ app_config_init(void) } static int -app_config_key_file_get_int(GKeyFile *kf, const char *grp, const char *key, int *value) +app_config_key_file_get_int(GKeyFile *kf, const char *grp, const char *key, + int *value) { - char *str = g_key_file_get_value(kf, grp, key, NULL); + char *str = g_key_file_get_value(kf, grp, key, NULL); - log_debug("key: %s", key); + log_debug("key: %s", key); - if (G_LIKELY(str)) { - *value = atoi(str); - log_debug(" value = %d", *value); - g_free(str); - } + if (G_LIKELY(str)) { + *value = atoi(str); + log_debug(" value = %d", *value); + g_free(str); + } - return str != NULL; + return str != NULL; } static void @@ -90,6 +81,8 @@ app_config_load_from_key_file(GKeyFile *kf) /* ui */ app_config_key_file_get_int(kf, "ui", "win_width", &cfg->win_width); app_config_key_file_get_int(kf, "ui", "win_height", &cfg->win_height); + app_config_key_file_get_int(kf, "ui", "win_pos_x", &cfg->win_pos_x); + app_config_key_file_get_int(kf, "ui", "win_pos_y", &cfg->win_pos_y); app_config_key_file_get_int(kf, "ui", "hpane_pos", &cfg->hpane_pos); app_config_key_file_get_int(kf, "ui", "vpane_pos", &cfg->vpane_pos); app_config_key_file_get_int(kf, "ui", "main_pane_pos", @@ -114,7 +107,7 @@ app_config_get_dir_path(void) { char *dir_path; - dir_path = g_build_filename(g_get_user_config_dir(), PACKAGE, + dir_path = g_build_filename(g_get_user_config_dir(), PACKAGE_NAME, profile_name, NULL); return dir_path; @@ -127,7 +120,7 @@ app_config_get_file_path(void) char *dir_path; char file[MAX_FILENAME_LENGTH]; - sprintf(file, "%s.conf", PACKAGE); + sprintf(file, "%s.conf", PACKAGE_NAME); dir_path = app_config_get_dir_path(); @@ -171,10 +164,9 @@ app_config_save(void) dir_path = app_config_get_dir_path(); - if (g_mkdir_with_parents(dir_path, 0700) != -1) - { + if (g_mkdir_with_parents(dir_path, 0700) != -1) { char *file_path; - GString* buf = g_string_sized_new(1024); + GString *buf = g_string_sized_new(1024); g_string_append(buf, "\n[emulation]\n"); @@ -185,6 +177,8 @@ app_config_save(void) g_string_append_printf(buf, "win_width=%d\n", cfg->win_width); g_string_append_printf(buf, "win_height=%d\n", cfg->win_height); + g_string_append_printf(buf, "win_pos_x=%d\n", cfg->win_pos_x); + g_string_append_printf(buf, "win_pos_y=%d\n", cfg->win_pos_y); g_string_append_printf(buf, "hpane_pos=%d\n", cfg->hpane_pos); g_string_append_printf(buf, "vpane_pos=%d\n", cfg->vpane_pos); g_string_append_printf(buf, "main_pane_pos=%d\n",