Menu
▾
▴
[Corem-cvs] CORE CVS: src smugg
|
From: CORE C. L. <cor...@so...> - 2000-12-19 16:43:22
|
Core CVS committal
Author : smugg
Project : core
Module : src
Modified Files:
main.c prefs.c
Log Message:
forgot to add a parser thing
===================================================================
RCS file: /cvsroot/corem/core/src/main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- main.c 2000/12/19 16:24:10 1.18
+++ main.c 2000/12/19 16:42:51 1.19
@@ -64,6 +64,7 @@
}
rc_set_defaults();
+ rc_parse_into_hash();
/* Create main window */
create_core_main_window();
@@ -78,9 +79,9 @@
GtkWidget *main_menu;
GtkWidget *pane;
gint i = 0;
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
set_theme_dir();
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
title = g_strdup_printf("Core %s", CORE_VERSION);
main_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_usize(GTK_WIDGET(main_win), 800,
@@ -91,39 +92,41 @@
gtk_signal_connect(GTK_OBJECT(main_win), "destroy",
core_main_quit, NULL);
gtk_widget_realize(main_win);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
main_vbox = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 0);
gtk_container_add(GTK_CONTAINER(main_win), main_vbox);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
mhandle = gtk_handle_box_new();
gtk_handle_box_set_shadow_type(GTK_HANDLE_BOX(mhandle),
GTK_SHADOW_NONE);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(mhandle),
GTK_POS_LEFT);
gtk_handle_box_set_snap_edge(GTK_HANDLE_BOX(mhandle),
GTK_POS_LEFT);
gtk_box_pack_start(GTK_BOX(main_vbox), mhandle, FALSE, FALSE, 0);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
thandle = gtk_handle_box_new();
create_main_toolbar();
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
hpane = gtk_hpaned_new();
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
{
pane = core_create_folder_pane();
gtk_paned_pack1(GTK_PANED(hpane), pane, TRUE, TRUE);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
pane = core_create_mlist_pane();
gtk_paned_pack2(GTK_PANED(hpane), pane, TRUE, TRUE);
}
-g_print("%d", i); i++; /***************9***************/
+g_print("%d\n", i); i++; /***************9***************/
+ /*FIXME*/ /*FIXME*/ /*FIXME*/ /*FIXME*/ /*FIXME*/
main_menu = create_main_menu();
-g_print("%d", i); i++;
+ /*FIXME*/ /*FIXME*/ /*FIXME*/ /*FIXME*/ /*FIXME*/
+g_print("%d\n", i); i++;
gtk_container_set_border_width(GTK_CONTAINER(main_menu), 0);
gtk_container_add(GTK_CONTAINER(mhandle), main_menu);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
gtk_handle_box_set_shadow_type(GTK_HANDLE_BOX(thandle),
GTK_SHADOW_NONE);
gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(thandle),
@@ -131,21 +134,21 @@
gtk_handle_box_set_snap_edge(GTK_HANDLE_BOX(thandle),
GTK_POS_LEFT);
gtk_box_pack_start(GTK_BOX(main_vbox), thandle, FALSE, FALSE, 0);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
gtk_box_pack_start(GTK_BOX(main_vbox), hpane, TRUE, TRUE, 0);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
gtk_widget_show_all(main_win);
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
if (GPOINTER_TO_INT(rc_get_value("tb_show")) == 0) {
gtk_widget_hide(thandle);
}
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
if (GPOINTER_TO_INT(rc_get_value("tb_buttons")) == 0) {
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_TEXT);
gtk_widget_queue_resize(GTK_WIDGET(thandle));
}
-g_print("%d", i); i++;
+g_print("%d\n", i); i++;
if (GPOINTER_TO_INT(rc_get_value("tb_buttons")) == 1) {
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_ICONS);
===================================================================
RCS file: /cvsroot/corem/core/src/prefs.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- prefs.c 2000/12/19 16:24:10 1.12
+++ prefs.c 2000/12/19 16:42:51 1.13
@@ -328,130 +328,6 @@
}
-/*void config_read()
-{
- FILE *config_file;
- gchar *home;
- gchar *line;
- gchar *rc;
-
- bzero(&config, sizeof(ConfigData));
-
- config.xsize = 800;
- config.ysize = 600;
- config.tb_show = 1;
- config.tb_buttons = 2; 0 = TEXT 1 = ICONS 2 = BOTH
- config.default_font =
- g_strdup
- ("-schumacher-clean-medium-r-normal-*-*-120-*-*-c-*-iso8859-1");
- config.new_font =
- g_strdup
- ("-schumacher-clean-bold-r-normal-*-*-120-*-*-c-*-iso646.1991-irv");
- config.ml_priority = 0;
- config.ml_read = 1;
- config.ml_attachment = 1;
- config.ml_score = 0;
- config.ml_from = 1;
- config.ml_subject = 1;
- config.ml_date = 1;
- config.ml_server = 0;
- config.ml_linestyle = 2;
- config.fl_linestyle = 2;
- config.theme = g_strdup("Default");
- home = getenv("HOME");
- rc = g_strconcat(home, "/.corerc", NULL);
-
- config_file = fopen(rc, "r");
- if (config_file == NULL) {
- config_write();
- return;
- }
- line = get_next_line(config_file);
- while (line != NULL) {
- if (g_strncasecmp(line, "xsize=", 6) == 0) {
- config.xsize = atoi(line + 6);
- } else if (g_strncasecmp(line, "ysize=", 6) == 0) {
- config.ysize = atoi(line + 6);
- } else if (g_strncasecmp(line, "tb_show=", 8) == 0) {
- config.tb_show = atoi(line + 8);
- } else if (g_strncasecmp(line, "tb_buttons=", 11) == 0) {
- config.tb_buttons = atoi(line + 11);
- } else if (g_strncasecmp(line, "default_font=", 13) == 0) {
- config.default_font = g_strdup(line + 13);
- } else if (g_strncasecmp(line, "new_font=", 9) == 0) {
- config.new_font = g_strdup(line + 9);
- } else if (g_strncasecmp(line, "ml_priority=", 12) == 0) {
- config.ml_priority = atoi(line + 12);
- } else if (g_strncasecmp(line, "ml_read=", 8) == 0) {
- config.ml_read = atoi(line + 8);
- } else if (g_strncasecmp(line, "ml_attachment=", 14) == 0) {
- config.ml_attachment = atoi(line + 14);
- } else if (g_strncasecmp(line, "ml_score=", 9) == 0) {
- config.ml_score = atoi(line + 9);
- } else if (g_strncasecmp(line, "ml_from=", 8) == 0) {
- config.ml_from = atoi(line + 8);
- } else if (g_strncasecmp(line, "ml_subject=", 11) == 0) {
- config.ml_subject = atoi(line + 11);
- } else if (g_strncasecmp(line, "ml_date=", 8) == 0) {
- config.ml_date = atoi(line + 8);
- } else if (g_strncasecmp(line, "ml_server=", 10) == 0) {
- config.ml_server = atoi(line + 10);
- } else if (g_strncasecmp(line, "ml_linestyle=", 13) == 0) {
- config.ml_linestyle = atoi(line + 13);
- } else if (g_strncasecmp(line, "fl_linestyle=", 13) == 0) {
- config.fl_linestyle = atoi(line + 13);
- } else if (g_strncasecmp(line, "theme=", 6) == 0) {
- config.theme = g_strdup(line + 6);
- }
- g_free(line);
- line = get_next_line(config_file);
- }
- if (line)
- g_free(line);
- fclose(config_file);
- g_free(rc);
-}
-
-void config_write()
-{
- FILE *config_file;
- gchar *home;
- gchar *rc;
-
- home = getenv("HOME");
- rc = g_strconcat(home, "/.corerc", NULL);
- config_file = fopen(rc, "w");
- if (config_file == NULL) {
- fprintf(config_file,
- "%sERROR: %sMalloc failed, Exiting....\n", RED,
- GREEN);
- return;
- }
-
- fprintf(config_file,
- "# ~/.corerc: Created by core, do not modify\n");
- fprintf(config_file, "xsize=%d\n", config.xsize);
- fprintf(config_file, "ysize=%d\n", config.ysize);
- fprintf(config_file, "tb_show=%d\n", config.tb_show);
- fprintf(config_file, "tb_buttons=%d\n", config.tb_buttons);
- fprintf(config_file, "default_font=%s\n", config.default_font);
- fprintf(config_file, "new_font=%s\n", config.new_font);
- fprintf(config_file, "ml_priority=%d\n", config.ml_priority);
- fprintf(config_file, "ml_read=%d\n", config.ml_read);
- fprintf(config_file, "ml_attachment=%d\n", config.ml_attachment);
- fprintf(config_file, "ml_score=%d\n", config.ml_score);
- fprintf(config_file, "ml_from=%d\n", config.ml_from);
- fprintf(config_file, "ml_subject=%d\n", config.ml_subject);
- fprintf(config_file, "ml_date=%d\n", config.ml_date);
- fprintf(config_file, "ml_server=%d\n", config.ml_server);
- fprintf(config_file, "ml_linestyle=%d\n", config.ml_linestyle);
- fprintf(config_file, "fl_linestyle=%d\n", config.fl_linestyle);
- fprintf(config_file, "theme=%s\n", config.theme);
- g_free(rc);
- return;
-}
-*/
-
int rc_remove_key(char * key)
{
char *tmp;
@@ -547,7 +423,67 @@
int rc_parse_into_hash()
{
+ FILE *config_file;
+ gchar *line;
+ gchar *rc;
+
+ if (!getenv("HOME")) {
+ fprintf(stderr, "%sERROR:%s Environment variable HOME not set.\n", RED, GREEN);
+ return FALSE;
+ }
+
+ rc = g_strconcat(getenv("HOME"), "/.corerc", NULL);
+ config_file = fopen(rc, "r");
+ if (config_file == NULL) {
+ rc_write();
+ return FALSE;
+ }
+ line = get_next_line(config_file);
+ while (line != NULL) {
+ if (g_strncasecmp(line, "xsize=", 6) == 0) {
+ rc_set_value("xsize", line + 6);
+ } else if (g_strncasecmp(line, "ysize=", 6) == 0) {
+ rc_set_value("ysize", line + 6);
+ } else if (g_strncasecmp(line, "tb_show=", 8) == 0) {
+ rc_set_value("tb_show", line + 8);
+ } else if (g_strncasecmp(line, "tb_buttons=", 11) == 0) {
+ rc_set_value("tb_buttons", line + 11);
+ } else if (g_strncasecmp(line, "default_font=", 13) == 0) {
+ rc_set_value("default_font", line + 13);
+ } else if (g_strncasecmp(line, "new_font=", 9) == 0) {
+ rc_set_value("new_font", line + 9);
+ } else if (g_strncasecmp(line, "ml_priority=", 12) == 0) {
+ rc_set_value("ml_priority",line + 12);
+ } else if (g_strncasecmp(line, "ml_read=", 8) == 0) {
+ rc_set_value("ml_read", line + 8);
+ } else if (g_strncasecmp(line, "ml_attachment=", 14) == 0) {
+ rc_set_value("ml_attachment", line + 14);
+ } else if (g_strncasecmp(line, "ml_score=", 9) == 0) {
+ rc_set_value("ml_score", line + 9);
+ } else if (g_strncasecmp(line, "ml_from=", 8) == 0) {
+ rc_set_value("ml_from", line + 8);
+ } else if (g_strncasecmp(line, "ml_subject=", 11) == 0) {
+ rc_set_value("ml_subject", line + 11);
+ } else if (g_strncasecmp(line, "ml_date=", 8) == 0) {
+ rc_set_value("ml_date", line + 8);
+ } else if (g_strncasecmp(line, "ml_server=", 10) == 0) {
+ rc_set_value("ml_server", line + 10);
+ } else if (g_strncasecmp(line, "ml_linestyle=", 13) == 0) {
+ rc_set_value("ml_linestyle", line + 13);
+ } else if (g_strncasecmp(line, "fl_linestyle=", 13) == 0) {
+ rc_set_value("fl_linestyle", line + 13);
+ } else if (g_strncasecmp(line, "theme=", 6) == 0) {
+ rc_set_value("theme", line + 6);
+ }
+ g_free(line);
+ line = get_next_line(config_file);
+ }
+
+ if (line)
+ g_free(line);
+ fclose(config_file);
+ g_free(rc);
return TRUE;
}
|
