Support a compile-time embedded option (disables the menu bar)

Many minor fixes
This commit is contained in:
Pierre Pronchery 2009-02-19 01:35:24 +00:00
parent a65a14044b
commit 04f15396e9
5 changed files with 521 additions and 438 deletions

View File

@ -15,14 +15,17 @@ INSTALL = install
all: $(TARGETS)
editor_OBJS = editor.o main.o
editor_OBJS = callbacks.o editor.o main.o
editor_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
editor_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
editor: $(editor_OBJS)
$(CC) -o editor $(editor_OBJS) $(editor_LDFLAGS)
editor.o: editor.c ../config.h
callbacks.o: callbacks.c callbacks.h
$(CC) $(editor_CFLAGS) -c callbacks.c
editor.o: editor.c callbacks.h editor.h ../config.h
$(CC) $(editor_CFLAGS) -c editor.c
main.o: main.c

402
src/callbacks.c Normal file
View File

@ -0,0 +1,402 @@
/* $Id$ */
static char const _copyright[] =
"Copyright (c) 2008 Pierre Pronchery <khorben@defora.org>";
/* This file is part of DeforaOS Desktop Editor */
static char const _license[] =
"Editor is free software; you can redistribute it and/or modify it under the\n"
"terms of the GNU General Public License version 3 as published by the Free\n"
"Software Foundation.\n"
"\n"
"Editor is distributed in the hope that it will be useful, but WITHOUT ANY\n"
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n"
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n"
"details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with\n"
"Editor; if not, see <http://www.gnu.org/licenses/>.\n";
#include <stdlib.h>
#include "editor.h"
#include "callbacks.h"
#include "../config.h"
/* private */
/* constants */
static char const * _authors[] =
{
"Pierre Pronchery <khorben@defora.org>",
NULL
};
/* public */
/* functions */
gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
{
Editor * editor = data;
return editor_close(editor);
}
/* on_edit_preferences */
static void _preferences_set(Editor * editor);
static void _preferences_on_cancel(GtkWidget * widget, gpointer data);
static gboolean _preferences_on_close(GtkWidget * widget, GdkEvent * event,
gpointer data);
static void _preferences_on_ok(GtkWidget * widget, gpointer data);
void on_edit_preferences(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
GtkWidget * vbox;
GtkWidget * hbox;
GtkSizeGroup * group;
if(editor->pr_window != NULL)
{
gtk_widget_show(editor->pr_window);
return;
}
editor->pr_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable(GTK_WINDOW(editor->pr_window), FALSE);
gtk_window_set_title(GTK_WINDOW(editor->pr_window),
"Text editor preferences");
gtk_window_set_transient_for(GTK_WINDOW(editor->pr_window), GTK_WINDOW(
editor->window));
g_signal_connect(G_OBJECT(editor->pr_window), "delete_event",
G_CALLBACK(_preferences_on_close), editor);
vbox = gtk_vbox_new(FALSE, 0);
/* dialog */
hbox = gtk_hbox_new(FALSE, 0);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
widget = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_size_group_add_widget(group, widget);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
_preferences_on_ok), editor);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
gtk_size_group_add_widget(group, widget);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
_preferences_on_cancel), editor);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
gtk_container_add(GTK_CONTAINER(editor->pr_window), vbox);
_preferences_set(editor);
gtk_widget_show_all(editor->pr_window);
}
static void _preferences_set(Editor * editor)
{
}
static void _preferences_on_cancel(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
gtk_widget_hide(editor->pr_window);
_preferences_set(editor);
}
static gboolean _preferences_on_close(GtkWidget * widget, GdkEvent * event,
gpointer data)
{
Editor * editor = data;
_preferences_on_cancel(widget, editor);
return FALSE;
}
static void _preferences_on_ok(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
gtk_widget_hide(editor->pr_window);
/* FIXME apply settings */
}
/* on_file_close */
void on_file_close(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_close(editor);
}
/* on_file_new */
void on_file_new(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open(editor, NULL);
}
/* on_file_open */
void on_file_open(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open_dialog(editor);
}
/* on_file_save */
void on_file_save(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save(editor);
}
/* on_file_save_as */
void on_file_save_as(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save_as_dialog(editor);
}
/* on_help_about */
static gboolean _about_on_closex(GtkWidget * widget, GdkEvent * event,
gpointer data);
#if !GTK_CHECK_VERSION(2, 6, 0)
static void _about_on_close(GtkWidget * widget, gpointer data);
static void _about_on_credits(GtkWidget * widget, gpointer data);
static void _about_on_license(GtkWidget * widget, gpointer data);
#endif
void on_help_about(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
static GtkWidget * window = NULL;
#if GTK_CHECK_VERSION(2, 6, 0)
gsize cnt = 65536;
gchar * buf;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
if((buf = malloc(sizeof(*buf) * cnt)) == NULL)
{
editor_error(editor, "malloc", 0);
return;
}
window = gtk_about_dialog_new();
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(
editor->window));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), NULL);
g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(
gtk_widget_hide), NULL);
gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(window), PACKAGE);
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window), VERSION);
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(window), _copyright);
gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(window), _authors);
if(g_file_get_contents("/usr/share/common-licenses/GPL-2", &buf, &cnt,
NULL) == TRUE)
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window), buf);
else
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window),
_license);
free(buf);
gtk_widget_show(window);
}
#else
GtkWidget * vbox;
GtkWidget * hbox;
GtkWidget * button;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_title(GTK_WINDOW(window), "About Editor");
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(
editor->window));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), window);
vbox = gtk_vbox_new(FALSE, 2);
gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(PACKAGE " " VERSION),
FALSE, FALSE, 2);
gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(_copyright), FALSE,
FALSE, 2);
hbox = gtk_hbox_new(TRUE, 4);
button = gtk_button_new_with_mnemonic("C_redits");
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
_about_on_credits), window);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4);
button = gtk_button_new_with_mnemonic("_License");
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
_about_on_license), window);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4);
button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
_about_on_close), window);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show_all(window);
}
#endif /* !GTK_CHECK_VERSION(2, 6, 0) */
static gboolean _about_on_closex(GtkWidget * widget, GdkEvent * event,
gpointer data)
{
gtk_widget_hide(widget);
return TRUE;
}
#if !GTK_CHECK_VERSION(2, 6, 0)
static void _about_on_close(GtkWidget * widget, gpointer data)
{
GtkWidget * window = data;
gtk_widget_hide(window);
}
static void _about_on_credits(GtkWidget * widget, gpointer data)
{
static GtkWidget * window = NULL;
GtkWidget * about = data;
GtkWidget * vbox;
GtkWidget * notebook;
GtkWidget * textview;
GtkTextBuffer * tbuf;
GtkTextIter iter;
GtkWidget * hbox;
size_t i;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_title(GTK_WINDOW(window), "Credits");
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(about));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), NULL);
vbox = gtk_vbox_new(FALSE, 0);
textview = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
gtk_text_buffer_set_text(tbuf, "", 0);
for(i = 0; _authors[i] != NULL; i++)
{
gtk_text_buffer_get_end_iter(tbuf, &iter);
gtk_text_buffer_insert(tbuf, &iter, _authors[i], strlen(
_authors[i]));
}
widget = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(widget),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(widget), textview);
notebook = gtk_notebook_new();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget,
gtk_label_new("Written by"));
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 4);
hbox = gtk_hbox_new(FALSE, 0);
widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
_about_on_close), window);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show_all(window);
}
static void _about_on_license(GtkWidget * widget, gpointer data)
{
static GtkWidget * window = NULL;
GtkWidget * about = data;
GtkWidget * vbox;
GtkWidget * textview;
GtkTextBuffer * tbuf;
GtkWidget * hbox;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_title(GTK_WINDOW(window), "License");
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(about));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), NULL);
vbox = gtk_vbox_new(FALSE, 0);
textview = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
gtk_text_buffer_set_text(tbuf, _license, strlen(_license));
widget = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(widget),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(widget), textview);
gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 4);
hbox = gtk_hbox_new(FALSE, 0);
widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(G_OBJECT(widget), "clicked",
G_CALLBACK(_about_on_close), window);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show_all(window);
}
#endif /* !GTK_CHECK_VERSION(2, 6, 0) */
/* on_new */
void on_new(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open(editor, NULL);
}
/* on_open */
void on_open(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open_dialog(editor);
}
/* on_save */
void on_save(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save(editor);
}
/* on_save_as */
void on_save_as(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save_as_dialog(editor);
}

View File

@ -1,31 +1,32 @@
/* $Id$ */
static char const _copyright[] =
"Copyright (c) 2008 Pierre Pronchery <khorben@defora.org>";
/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop Editor */
static char const _license[] =
"Editor is free software; you can redistribute it and/or modify it under the\n"
"terms of the GNU General Public License version 3 as published by the Free\n"
"Software Foundation.\n"
"\n"
"Editor is distributed in the hope that it will be useful, but WITHOUT ANY\n"
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n"
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n"
"details.\n"
"\n"
"You should have received a copy of the GNU General Public License along with\n"
"Editor; if not, see <http://www.gnu.org/licenses/>.\n";
/* Editor is free software; you can redistribute it and/or modify it under the
* terms of the GNU General Public License version 3 as published by the Free
* Software Foundation.
*
* Editor 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
* Editor; if not, see <http://www.gnu.org/licenses/>. */
#include <sys/stat.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <gdk/gdkkeysyms.h>
#include "callbacks.h"
#include "editor.h"
#include "../config.h"
/* types */
#ifndef FOR_EMBEDDED
struct _menu
{
char * name;
@ -39,42 +40,24 @@ struct _menubar
char * name;
struct _menu * menu;
};
#endif
/* constants */
static char const * _authors[] =
#ifndef FOR_EMBEDDED
static struct _menu _menu_file[] =
{
"Pierre Pronchery <khorben@defora.org>",
NULL
};
/* FIXME callbacks should be in a separate file */
static void _on_close(GtkWidget * widget, gpointer data);
static gboolean _on_closex(GtkWidget * widget, GdkEvent * event, gpointer data);
static void _on_edit_preferences(GtkWidget * widget, gpointer data);
static void _on_file_close(GtkWidget * widget, gpointer data);
static void _on_file_new(GtkWidget * widget, gpointer data);
static void _on_file_open(GtkWidget * widget, gpointer data);
static void _on_file_save(GtkWidget * widget, gpointer data);
static void _on_file_save_as(GtkWidget * widget, gpointer data);
static void _on_help_about(GtkWidget * widget, gpointer data);
static void _on_new(GtkWidget * widget, gpointer data);
static void _on_open(GtkWidget * widget, gpointer data);
static void _on_save(GtkWidget * widget, gpointer data);
static void _on_save_as(GtkWidget * widget, gpointer data);
struct _menu _menu_file[] =
{
{ "_New", G_CALLBACK(_on_file_new), GTK_STOCK_NEW, GDK_N },
{ "_Open", G_CALLBACK(_on_file_open), GTK_STOCK_OPEN, GDK_O },
{ "_New", G_CALLBACK(on_file_new), GTK_STOCK_NEW, GDK_N },
{ "_Open", G_CALLBACK(on_file_open), GTK_STOCK_OPEN, GDK_O },
{ "", NULL, NULL, 0 },
{ "_Save", G_CALLBACK(_on_file_save), GTK_STOCK_SAVE, GDK_S },
{ "_Save as...", G_CALLBACK(_on_file_save_as), GTK_STOCK_SAVE_AS, 0 },
{ "_Save", G_CALLBACK(on_file_save), GTK_STOCK_SAVE, GDK_S },
{ "_Save as...", G_CALLBACK(on_file_save_as), GTK_STOCK_SAVE_AS, 0 },
{ "", NULL, NULL, 0 },
{ "_Close", G_CALLBACK(_on_file_close), GTK_STOCK_CLOSE, 0 },
{ "_Close", G_CALLBACK(on_file_close), GTK_STOCK_CLOSE, 0 },
{ NULL, NULL, NULL, 0 }
};
struct _menu _menu_edit[] =
static struct _menu _menu_edit[] =
{
{ "_Undo", NULL, GTK_STOCK_UNDO, GDK_Z }, /* FIXME implement */
{ "_Redo", NULL, GTK_STOCK_REDO, GDK_R }, /* FIXME implement */
@ -83,17 +66,17 @@ struct _menu _menu_edit[] =
{ "_Copy", NULL, GTK_STOCK_COPY, 0 }, /* FIXME implement */
{ "_Paste", NULL, GTK_STOCK_PASTE, 0 }, /* FIXME implement */
{ "", NULL, NULL, 0 },
{ "_Preferences", G_CALLBACK(_on_edit_preferences),
{ "_Preferences", G_CALLBACK(on_edit_preferences),
GTK_STOCK_PREFERENCES, GDK_P },
{ NULL, NULL, NULL, 0 }
};
struct _menu _menu_help[] =
static struct _menu _menu_help[] =
{
#if GTK_CHECK_VERSION(2, 6, 0)
{ "_About", G_CALLBACK(_on_help_about), GTK_STOCK_ABOUT, 0 },
{ "_About", G_CALLBACK(on_help_about), GTK_STOCK_ABOUT, 0 },
#else
{ "_About", G_CALLBACK(_on_help_about), NULL, 0 },
{ "_About", G_CALLBACK(on_help_about), NULL, 0 },
#endif
{ NULL, NULL, NULL, 0 }
};
@ -105,11 +88,15 @@ static struct _menubar _menubar[] =
{ "_Help", _menu_help },
{ NULL, NULL }
};
#endif
/* Editor */
/* editor_new */
static void _new_set_title(Editor * editor);
#ifndef FOR_EMBEDDED
static GtkWidget * _new_menubar(Editor * editor);
#endif
Editor * editor_new(void)
{
@ -128,36 +115,32 @@ Editor * editor_new(void)
gtk_window_set_default_size(GTK_WINDOW(editor->window), 600, 400);
_new_set_title(editor);
g_signal_connect(G_OBJECT(editor->window), "delete-event", G_CALLBACK(
_on_closex), editor);
on_closex), editor);
vbox = gtk_vbox_new(FALSE, 0);
/* menubar */
#ifndef FOR_EMBEDDED
gtk_box_pack_start(GTK_BOX(vbox), _new_menubar(editor), FALSE, FALSE,
0);
#endif
/* toolbar */
toolbar = gtk_toolbar_new();
tb_button = gtk_tool_button_new_from_stock(GTK_STOCK_NEW);
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(_on_new),
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(on_new),
editor);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_button, -1);
tb_button = gtk_tool_button_new_from_stock(GTK_STOCK_OPEN);
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(_on_open),
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(on_open),
editor);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_button, -1);
tb_button = gtk_separator_tool_item_new();
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_button, -1);
tb_button = gtk_tool_button_new_from_stock(GTK_STOCK_SAVE);
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(_on_save),
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(on_save),
editor);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_button, -1);
tb_button = gtk_tool_button_new_from_stock(GTK_STOCK_SAVE_AS);
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(
_on_save_as), editor);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_button, -1);
tb_button = gtk_separator_tool_item_new();
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_button, -1);
tb_button = gtk_tool_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(G_OBJECT(tb_button), "clicked", G_CALLBACK(_on_close),
editor);
on_save_as), editor);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tb_button, -1);
gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
/* view */
@ -191,6 +174,7 @@ static void _new_set_title(Editor * editor)
gtk_window_set_title(GTK_WINDOW(editor->window), buf);
}
#ifndef FOR_EMBEDDED
static GtkWidget * _new_menubar(Editor * editor)
{
GtkWidget * tb_menubar;
@ -221,7 +205,8 @@ static GtkWidget * _new_menubar(Editor * editor)
p->stock, NULL);
if(p->callback != NULL)
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(p->callback), editor);
G_CALLBACK(p->callback),
editor);
else
gtk_widget_set_sensitive(menuitem, FALSE);
if(p->accel != 0)
@ -237,375 +222,10 @@ static GtkWidget * _new_menubar(Editor * editor)
gtk_window_add_accel_group(GTK_WINDOW(editor->window), group);
return tb_menubar;
}
static int _editor_error(Editor * editor, char const * message, int ret)
{
GtkWidget * dialog;
dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(
gtk_widget_destroy), NULL);
gtk_widget_show(dialog);
return ret;
}
static gboolean _on_closex(GtkWidget * widget, GdkEvent * event,
gpointer data)
{
Editor * editor = data;
return editor_close(editor);
}
static void _on_close(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_close(editor);
}
static void _preferences_set(Editor * editor);
/* callbacks */
static void _preferences_on_cancel(GtkWidget * widget, gpointer data);
static gboolean _preferences_on_close(GtkWidget * widget, GdkEvent * event,
gpointer data);
static void _preferences_on_ok(GtkWidget * widget, gpointer data);
static void _on_edit_preferences(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
GtkWidget * vbox;
GtkWidget * hbox;
GtkSizeGroup * group;
if(editor->pr_window != NULL)
{
gtk_widget_show(editor->pr_window);
return;
}
editor->pr_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable(GTK_WINDOW(editor->pr_window), FALSE);
gtk_window_set_title(GTK_WINDOW(editor->pr_window),
"Text editor preferences");
gtk_window_set_transient_for(GTK_WINDOW(editor->pr_window), GTK_WINDOW(
editor->window));
g_signal_connect(G_OBJECT(editor->pr_window), "delete_event",
G_CALLBACK(_preferences_on_close), editor);
vbox = gtk_vbox_new(FALSE, 0);
/* dialog */
hbox = gtk_hbox_new(FALSE, 0);
group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
widget = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_size_group_add_widget(group, widget);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
_preferences_on_ok), editor);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
gtk_size_group_add_widget(group, widget);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
_preferences_on_cancel), editor);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
gtk_container_add(GTK_CONTAINER(editor->pr_window), vbox);
_preferences_set(editor);
gtk_widget_show_all(editor->pr_window);
}
static void _preferences_set(Editor * editor)
{
}
static void _preferences_on_cancel(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
gtk_widget_hide(editor->pr_window);
_preferences_set(editor);
}
static gboolean _preferences_on_close(GtkWidget * widget, GdkEvent * event,
gpointer data)
{
Editor * editor = data;
_preferences_on_cancel(widget, editor);
return FALSE;
}
static void _preferences_on_ok(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
gtk_widget_hide(editor->pr_window);
/* FIXME apply settings */
}
static void _on_file_close(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_close(editor);
}
static void _on_file_new(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open(editor, NULL);
}
static void _on_file_open(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open_dialog(editor);
}
static void _on_file_save(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save(editor);
}
static void _on_file_save_as(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save_as_dialog(editor);
}
/* callbacks */
static gboolean _about_on_closex(GtkWidget * widget, GdkEvent * event,
gpointer data);
#if !GTK_CHECK_VERSION(2, 6, 0)
static void _about_on_close(GtkWidget * widget, gpointer data);
static void _about_on_credits(GtkWidget * widget, gpointer data);
static void _about_on_license(GtkWidget * widget, gpointer data);
#endif
static void _on_help_about(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
static GtkWidget * window = NULL;
#if GTK_CHECK_VERSION(2, 6, 0)
gsize cnt = 65536;
gchar * buf;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
if((buf = malloc(sizeof(*buf) * cnt)) == NULL)
{
_editor_error(editor, "malloc", 0);
return;
}
window = gtk_about_dialog_new();
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(
editor->window));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), NULL);
g_signal_connect(G_OBJECT(window), "response", G_CALLBACK(
gtk_widget_hide), NULL);
gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(window), PACKAGE);
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window), VERSION);
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(window), _copyright);
gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(window), _authors);
if(g_file_get_contents("/usr/share/common-licenses/GPL-2", &buf, &cnt,
NULL) == TRUE)
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window), buf);
else
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(window),
_license);
free(buf);
gtk_widget_show(window);
}
#else
GtkWidget * vbox;
GtkWidget * hbox;
GtkWidget * button;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_title(GTK_WINDOW(window), "About Editor");
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(
editor->window));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), window);
vbox = gtk_vbox_new(FALSE, 2);
gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(PACKAGE " " VERSION),
FALSE, FALSE, 2);
gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(_copyright), FALSE,
FALSE, 2);
hbox = gtk_hbox_new(TRUE, 4);
button = gtk_button_new_with_mnemonic("C_redits");
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
_about_on_credits), window);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4);
button = gtk_button_new_with_mnemonic("_License");
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
_about_on_license), window);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 4);
button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(
_about_on_close), window);
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show_all(window);
}
#endif /* !GTK_CHECK_VERSION(2, 6, 0) */
static gboolean _about_on_closex(GtkWidget * widget, GdkEvent * event,
gpointer data)
{
gtk_widget_hide(widget);
return TRUE;
}
#if !GTK_CHECK_VERSION(2, 6, 0)
static void _about_on_close(GtkWidget * widget, gpointer data)
{
GtkWidget * window = data;
gtk_widget_hide(window);
}
static void _about_on_credits(GtkWidget * widget, gpointer data)
{
static GtkWidget * window = NULL;
GtkWidget * about = data;
GtkWidget * vbox;
GtkWidget * notebook;
GtkWidget * textview;
GtkTextBuffer * tbuf;
GtkTextIter iter;
GtkWidget * hbox;
size_t i;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_title(GTK_WINDOW(window), "Credits");
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(about));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), NULL);
vbox = gtk_vbox_new(FALSE, 0);
textview = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
gtk_text_buffer_set_text(tbuf, "", 0);
for(i = 0; _authors[i] != NULL; i++)
{
gtk_text_buffer_get_end_iter(tbuf, &iter);
gtk_text_buffer_insert(tbuf, &iter, _authors[i], strlen(
_authors[i]));
}
widget = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(widget),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(widget), textview);
notebook = gtk_notebook_new();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget,
gtk_label_new("Written by"));
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 4);
hbox = gtk_hbox_new(FALSE, 0);
widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
_about_on_close), window);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show_all(window);
}
static void _about_on_license(GtkWidget * widget, gpointer data)
{
static GtkWidget * window = NULL;
GtkWidget * about = data;
GtkWidget * vbox;
GtkWidget * textview;
GtkTextBuffer * tbuf;
GtkWidget * hbox;
if(window != NULL)
{
gtk_widget_show(window);
return;
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_title(GTK_WINDOW(window), "License");
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(about));
g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(
_about_on_closex), NULL);
vbox = gtk_vbox_new(FALSE, 0);
textview = gtk_text_view_new();
gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
gtk_text_buffer_set_text(tbuf, _license, strlen(_license));
widget = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(widget),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(widget), textview);
gtk_box_pack_start(GTK_BOX(vbox), widget, TRUE, TRUE, 4);
hbox = gtk_hbox_new(FALSE, 0);
widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(G_OBJECT(widget), "clicked",
G_CALLBACK(_about_on_close), window);
gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show_all(window);
}
#endif /* !GTK_CHECK_VERSION(2, 6, 0) */
static void _on_new(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open(editor, NULL);
}
static void _on_open(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_open_dialog(editor);
}
static void _on_save(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save(editor);
}
static void _on_save_as(GtkWidget * widget, gpointer data)
{
Editor * editor = data;
editor_save_as_dialog(editor);
}
/* editor_delete */
void editor_delete(Editor * editor)
{
free(editor);
@ -613,10 +233,27 @@ void editor_delete(Editor * editor)
/* useful */
/* editor_error */
int editor_error(Editor * editor, char const * message, int ret)
{
GtkWidget * dialog;
dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
gtk_window_set_title(GTK_WINDOW(dialog), "Error");
g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(
gtk_widget_destroy), NULL);
gtk_widget_show(dialog);
return ret;
}
/* editor_close */
gboolean editor_close(Editor * editor)
{
GtkWidget * dialog;
int ret;
int res;
if(gtk_text_buffer_get_modified(gtk_text_view_get_buffer(GTK_TEXT_VIEW(
editor->view))) == FALSE)
@ -627,31 +264,57 @@ gboolean editor_close(Editor * editor)
dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s",
"Changes are not saved."
" Are you sure you want to close?");
ret = gtk_dialog_run(GTK_DIALOG(dialog));
"There are unsaved changes.\n"
"Are you sure you want to close?");
gtk_window_set_title(GTK_WINDOW(dialog), "Warning");
res = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
if(ret == GTK_RESPONSE_NO)
if(res == GTK_RESPONSE_NO)
return TRUE;
gtk_main_quit();
return FALSE;
}
/* editor_open */
void editor_open(Editor * editor, char const * filename)
{
GtkWidget * dialog;
int res;
FILE * fp;
GtkTextBuffer * tbuf;
GtkTextIter iter;
char buf[BUFSIZ];
size_t len;
/* FIXME close previously opened file */
if(gtk_text_buffer_get_modified(gtk_text_view_get_buffer(GTK_TEXT_VIEW(
editor->view))) == TRUE)
{
dialog = gtk_message_dialog_new(GTK_WINDOW(editor->window),
GTK_DIALOG_MODAL
| GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s",
"There are unsaved changes.\n"
"Are you sure you want to lose them?");
gtk_window_set_title(GTK_WINDOW(dialog), "Warning");
res = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
if(res == GTK_RESPONSE_NO)
return;
}
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view));
gtk_text_buffer_set_text(tbuf, "", 0);
if(filename == NULL)
{
gtk_text_buffer_set_modified(GTK_TEXT_BUFFER(
gtk_text_view_get_buffer(GTK_TEXT_VIEW(
editor->view))), FALSE);
return;
}
if((fp = fopen(filename, "r")) == NULL)
{
_editor_error(editor, filename, 0);
snprintf(buf, sizeof(buf), "%s: %s", filename, strerror(errno));
editor_error(editor, buf, 1);
return;
}
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view));
@ -665,10 +328,11 @@ void editor_open(Editor * editor, char const * filename)
gtk_text_buffer_set_modified(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(
GTK_TEXT_VIEW(editor->view))), FALSE);
editor->filename = g_strdup(filename);
_new_set_title(editor);
_new_set_title(editor); /* XXX make it a generic private function */
}
/* editor_open_dialog */
void editor_open_dialog(Editor * editor)
{
GtkWidget * dialog;
@ -690,6 +354,7 @@ void editor_open_dialog(Editor * editor)
}
/* editor_save */
gboolean editor_save(Editor * editor)
{
FILE * fp;
@ -706,7 +371,10 @@ gboolean editor_save(Editor * editor)
}
if((fp = fopen(editor->filename, "w")) == NULL)
{
_editor_error(editor, "Could not save file", 0);
buf = g_strdup_printf("%s: %s", editor->filename, strerror(
errno));
editor_error(editor, buf, 1);
g_free(buf);
return FALSE;
}
tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view));
@ -720,7 +388,7 @@ gboolean editor_save(Editor * editor)
{
g_free(buf);
fclose(fp);
_editor_error(editor, "Partial write", 0);
editor_error(editor, "Partial write", 0);
return FALSE;
}
g_free(buf);
@ -730,6 +398,7 @@ gboolean editor_save(Editor * editor)
}
/* editor_save_as */
gboolean editor_save_as(Editor * editor, char const * filename)
{
struct stat st;
@ -743,6 +412,7 @@ gboolean editor_save_as(Editor * editor, char const * filename)
| GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, "%s",
"File exists. Overwrite?");
gtk_window_set_title(GTK_WINDOW(dialog), "Warning");
ret = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
if(ret == GTK_RESPONSE_NO)
@ -750,7 +420,7 @@ gboolean editor_save_as(Editor * editor, char const * filename)
}
g_free(editor->filename);
if((editor->filename = g_strdup(filename)) == NULL)
return _editor_error(editor, "Allocation error", FALSE);
return editor_error(editor, "Allocation error", FALSE);
if(editor_save(editor) != TRUE)
return FALSE;
_new_set_title(editor);
@ -758,6 +428,7 @@ gboolean editor_save_as(Editor * editor, char const * filename)
}
/* editor_save_as_dialog */
gboolean editor_save_as_dialog(Editor * editor)
{
GtkWidget * dialog;

View File

@ -39,9 +39,12 @@ Editor * editor_new(void);
void editor_delete(Editor * editor);
/* useful */
int editor_error(Editor * editor, char const * message, int ret);
gboolean editor_close(Editor * editor);
void editor_open(Editor * editor, char const * filename);
void editor_open_dialog(Editor * editor);
gboolean editor_save(Editor * editor);
gboolean editor_save_as(Editor * editor, char const * filename);
gboolean editor_save_as_dialog(Editor * editor);

View File

@ -1,4 +1,5 @@
targets=editor
#cppflags=-D FOR_EMBEDDED
cflags_force=-W `pkg-config --cflags gtk+-2.0`
cflags=-Wall -g -O2
ldflags_force=`pkg-config --libs gtk+-2.0`
@ -6,8 +7,11 @@ dist=Makefile,editor.h
[editor]
type=binary
sources=editor.c,main.c
sources=callbacks.c,editor.c,main.c
install=$(BINDIR)
[callbacks.c]
depends=callbacks.h
[editor.c]
depends=../config.h
depends=callbacks.h,editor.h,../config.h