#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#include <enchant.h>
-
#include "utils.h"
#include "alertpanel.h"
#include "gtkaspell.h"
#define ASPELL_NORMALMODE 2
#define ASPELL_BADSPELLERMODE 3
-#define GTKASPELLWORDSIZE 1024
-
/* size of the text buffer used in various word-processing routines. */
#define BUFSIZE 1024
gchar *error_message;
} GtkAspellCheckers;
-typedef struct _Dictionary {
- gchar *fullname;
- gchar *dictname;
-} Dictionary;
-
-typedef struct _GtkAspeller {
- Dictionary *dictionary;
- EnchantBroker *broker;
- EnchantDict *speller;
-} GtkAspeller;
-
-typedef void (*ContCheckFunc) (gpointer *gtkaspell);
-
-struct _GtkAspell
-{
- GtkAspeller *gtkaspeller;
- GtkAspeller *alternate_speller;
- gchar theword[GTKASPELLWORDSIZE];
- gint start_pos;
- gint end_pos;
- gint orig_pos;
- gint end_check_pos;
- gboolean misspelled;
- gboolean check_while_typing;
- gboolean recheck_when_changing_dict;
- gboolean use_alternate;
- gboolean use_both_dicts;
-
- ContCheckFunc continue_check;
-
- GtkWidget *replace_entry;
- GtkWidget *parent_window;
-
- gint max_sug;
- GList *suggestions_list;
-
- GtkTextView *gtktext;
- GdkColor highlight;
- GtkAccelGroup *accel_group;
- void (*menu_changed_cb)(void *data);
- void *menu_changed_data;
-};
-
/******************************************************************************/
static GtkAspellCheckers *gtkaspellcheckers;
/* Checker actions */
static gboolean check_at (GtkAspell *gtkaspell,
int from_pos);
-static gboolean check_next_prev (GtkAspell *gtkaspell,
- gboolean forward);
+static gboolean check_at_cb (gpointer data);
static GList* misspelled_suggest (GtkAspell *gtkaspell,
gchar *word);
+static gboolean find_misspelled_cb (gpointer data,
+ gboolean forward);
static void add_word_to_session_cb (GtkWidget *w,
gpointer data);
static void add_word_to_personal_cb (GtkWidget *w,
gpointer data);
static void replace_real_word (GtkAspell *gtkaspell,
const gchar *newword);
+static void replace_real_word_cb (gpointer data,
+ const gchar *newword);
static void check_with_alternate_cb (GtkWidget *w,
gpointer data);
-static void use_alternate_dict (GtkAspell *gtkaspell);
static void toggle_check_while_typing_cb (GtkWidget *w,
gpointer data);
Dictionary *b);
static void dictionary_delete (Dictionary *dict);
static Dictionary * dictionary_dup (const Dictionary *dict);
-static void free_suggestions_list (GtkAspell *gtkaspell);
static void reset_theword_data (GtkAspell *gtkaspell);
static void free_checkers (gpointer elt,
gpointer data);
{
GtkTextBuffer *buffer;
- g_return_val_if_fail(view, 0);
+ cm_return_val_if_fail(view, 0);
buffer = gtk_text_view_get_buffer(view);
- g_return_val_if_fail(buffer, 0);
+ cm_return_val_if_fail(buffer, 0);
return gtk_text_buffer_get_char_count(buffer);
}
GtkTextMark * mark;
GtkTextIter iter;
- g_return_val_if_fail(view, 0);
+ cm_return_val_if_fail(view, 0);
buffer = gtk_text_view_get_buffer(view);
- g_return_val_if_fail(buffer, 0);
+ cm_return_val_if_fail(buffer, 0);
mark = gtk_text_buffer_get_insert(buffer);
- g_return_val_if_fail(mark, 0);
+ cm_return_val_if_fail(mark, 0);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
GtkTextBuffer *buffer;
GtkTextIter iter;
- g_return_if_fail(view);
+ cm_return_if_fail(view);
buffer = gtk_text_view_get_buffer(view);
- g_return_if_fail(buffer);
+ cm_return_if_fail(buffer);
gtk_text_buffer_get_iter_at_offset(buffer, &iter, offset);
gtk_text_buffer_place_cursor(buffer, &iter);
const char *gtkaspell_checkers_strerror(void)
{
- g_return_val_if_fail(gtkaspellcheckers, "");
+ cm_return_val_if_fail(gtkaspellcheckers, "");
return gtkaspellcheckers->error_message;
}
void gtkaspell_checkers_reset_error(void)
{
- g_return_if_fail(gtkaspellcheckers);
+ cm_return_if_fail(gtkaspellcheckers);
g_free(gtkaspellcheckers->error_message);
gboolean use_both_dicts,
GtkTextView *gtktext,
GtkWindow *parent_win,
+ void (dict_changed_cb)(void *data),
void (*spell_menu_cb)(void *data),
void *data)
{
GtkAspeller *gtkaspeller;
GtkTextBuffer *buffer;
- g_return_val_if_fail(gtktext, NULL);
+ cm_return_val_if_fail(gtktext, NULL);
if (!dictionary || !*dictionary) {
gtkaspell_checkers_error_message(
g_strdup(_("No dictionary selected.")));
gtkaspell->use_alternate = use_alternate;
gtkaspell->use_both_dicts = use_both_dicts;
gtkaspell->parent_window = GTK_WIDGET(parent_win);
+ gtkaspell->dict_changed_cb = dict_changed_cb;
gtkaspell->menu_changed_cb = spell_menu_cb;
gtkaspell->menu_changed_data = data;
gtkaspeller_delete(gtkaspell->alternate_speller);
if (gtkaspell->suggestions_list)
- free_suggestions_list(gtkaspell);
+ gtkaspell_free_suggestions_list(gtkaspell);
debug_print("Aspell: deleting gtkaspell %p\n", gtkaspell);
gtkaspell = NULL;
}
+void gtkaspell_dict_changed(GtkAspell *gtkaspell)
+{
+ if(!gtkaspell || !gtkaspell->dict_changed_cb ||
+ !gtkaspell->menu_changed_data)
+ return;
+
+ gtkaspell->dict_changed_cb(gtkaspell->menu_changed_data);
+}
+
static void entry_insert_cb(GtkTextBuffer *textbuf,
GtkTextIter *iter,
gchar *newtext,
{
guint pos;
- g_return_if_fail(gtkaspell->gtkaspeller->speller);
+ cm_return_if_fail(gtkaspell->gtkaspeller->speller);
if (!gtkaspell->check_while_typing)
return;
int origpos;
gint start, end;
- g_return_if_fail(gtkaspell->gtkaspeller->speller);
+ cm_return_if_fail(gtkaspell->gtkaspeller->speller);
if (!gtkaspell->check_while_typing)
return;
/* gtk_editable_select_region(GTK_EDITABLE(gtktext), origpos, origpos); */
}
-static void button_press_intercept_cb(GtkTextView *gtktext,
- GtkMenu *menu, GtkAspell *gtkaspell)
+void gtkaspell_make_context_menu(GtkMenu *menu, GtkAspell *gtkaspell)
{
GtkMenuItem *menuitem;
GSList *spell_menu = NULL;
GSList *items;
gboolean suggest = FALSE;
- menuitem = GTK_MENU_ITEM(gtk_separator_menu_item_new());
- gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), GTK_WIDGET(menuitem));
- gtk_widget_show(GTK_WIDGET(menuitem));
-
- gtktext = gtkaspell->gtktext;
-
- gtkaspell->orig_pos = get_textview_buffer_offset(gtktext);
-
- if (check_at(gtkaspell, gtkaspell->orig_pos)) {
-
- if (misspelled_suggest(gtkaspell, gtkaspell->theword)) {
- spell_menu = make_sug_menu(gtkaspell);
- suggest = TRUE;
- }
+ if (gtkaspell->misspelled &&
+ misspelled_suggest(gtkaspell, gtkaspell->theword)) {
+ spell_menu = make_sug_menu(gtkaspell);
+ suggest = TRUE;
}
if (!spell_menu)
spell_menu = gtkaspell_make_config_menu(gtkaspell);
+ menuitem = GTK_MENU_ITEM(gtk_separator_menu_item_new());
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), GTK_WIDGET(menuitem));
+ gtk_widget_show(GTK_WIDGET(menuitem));
+
spell_menu = g_slist_reverse(spell_menu);
for (items = spell_menu;
items; items = items->next) {
g_slist_free(spell_menu);
g_signal_connect(G_OBJECT(menu), "deactivate",
- G_CALLBACK(destroy_menu),
+ G_CALLBACK(destroy_menu),
gtkaspell);
if (suggest)
g_signal_connect(G_OBJECT(menu),
"key_press_event",
- G_CALLBACK(aspell_key_pressed), gtkaspell);
+ G_CALLBACK(aspell_key_pressed),
+ gtkaspell);
+}
+
+static void set_position_cb(gpointer data, gint pos)
+{
+ GtkAspell *gtkaspell = (GtkAspell *) data;
+ set_textview_buffer_offset(gtkaspell->gtktext, pos);
+}
+
+void gtkaspell_context_set(GtkAspell *gtkaspell)
+{
+ gtkaspell->ctx.set_position = set_position_cb;
+ gtkaspell->ctx.set_menu_pos = set_menu_pos;
+ gtkaspell->ctx.find_misspelled = find_misspelled_cb;
+ gtkaspell->ctx.check_word = check_at_cb;
+ gtkaspell->ctx.replace_word = replace_real_word_cb;
+ gtkaspell->ctx.data = (gpointer) gtkaspell;
+}
+static void button_press_intercept_cb(GtkTextView *gtktext,
+ GtkMenu *menu, GtkAspell *gtkaspell)
+{
+ gtktext = gtkaspell->gtktext;
+ gtkaspell->orig_pos = get_textview_buffer_offset(gtktext);
+ gtkaspell->misspelled = check_at(gtkaspell, gtkaspell->orig_pos);
+ gtkaspell_context_set(gtkaspell);
+ gtkaspell_make_context_menu(menu, gtkaspell);
}
/* Checker creation */
static GtkAspeller *gtkaspeller_new(Dictionary *dictionary)
GtkAspeller *tmp;
Dictionary *dict;
- g_return_val_if_fail(gtkaspellcheckers, NULL);
+ cm_return_val_if_fail(gtkaspellcheckers, NULL);
- g_return_val_if_fail(dictionary, NULL);
+ cm_return_val_if_fail(dictionary, NULL);
if (dictionary->dictname == NULL)
gtkaspell_checkers_error_message(
g_strdup(_("No dictionary selected.")));
- g_return_val_if_fail(dictionary->fullname, NULL);
+ cm_return_val_if_fail(dictionary->fullname, NULL);
dict = dictionary_dup(dictionary);
EnchantBroker *broker;
EnchantDict *speller;
- g_return_val_if_fail(gtkaspellcheckers, NULL);
- g_return_val_if_fail(dict, NULL);
+ cm_return_val_if_fail(gtkaspellcheckers, NULL);
+ cm_return_val_if_fail(dict, NULL);
gtkaspeller = g_new(GtkAspeller, 1);
static GtkAspeller *gtkaspeller_delete(GtkAspeller *gtkaspeller)
{
- g_return_val_if_fail(gtkaspellcheckers, NULL);
+ cm_return_val_if_fail(gtkaspellcheckers, NULL);
gtkaspellcheckers->checkers =
g_slist_remove(gtkaspellcheckers->checkers,
static GtkAspeller *gtkaspeller_real_delete(GtkAspeller *gtkaspeller)
{
- g_return_val_if_fail(gtkaspeller, NULL);
- g_return_val_if_fail(gtkaspeller->speller, NULL);
+ cm_return_val_if_fail(gtkaspeller, NULL);
+ cm_return_val_if_fail(gtkaspeller->speller, NULL);
enchant_broker_free_dict(gtkaspeller->broker, gtkaspeller->speller);
enchant_broker_free(gtkaspeller->broker);
static EnchantDict *set_dictionary(EnchantBroker *broker, Dictionary *dict)
{
- g_return_val_if_fail(broker, FALSE);
- g_return_val_if_fail(dict, FALSE);
+ cm_return_val_if_fail(broker, FALSE);
+ cm_return_val_if_fail(dict, FALSE);
return enchant_broker_request_dict(broker, dict->dictname );
}
static void set_use_both_cb(GtkMenuItem *w, GtkAspell *gtkaspell)
{
gtkaspell->use_both_dicts = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w));
-
- if (gtkaspell->recheck_when_changing_dict) {
- gtkaspell_highlight_all(gtkaspell);
- }
+ gtkaspell_dict_changed(gtkaspell);
if (gtkaspell->menu_changed_cb)
gtkaspell->menu_changed_cb(gtkaspell->menu_changed_data);
GList *list = NULL;
char **suggestions;
size_t num_sug, i;
- g_return_val_if_fail(word, NULL);
+ cm_return_val_if_fail(word, NULL);
if (*word == 0)
return NULL;
- free_suggestions_list(gtkaspell);
+ gtkaspell_free_suggestions_list(gtkaspell);
suggestions = enchant_dict_suggest(gtkaspell->gtkaspeller->speller, word, strlen(word), &num_sug);
+ list = g_list_append(list, g_strdup(word));
if (suggestions == NULL || num_sug == 0) {
- gtkaspell->max_sug = - 1;
- gtkaspell->suggestions_list = NULL;
- return NULL;
+ gtkaspell->max_sug = -1;
+ gtkaspell->suggestions_list = list;
+ return list;
}
- list = g_list_append(list, g_strdup(word));
for (i = 0; i < num_sug; i++)
list = g_list_append(list, g_strdup((gchar *)suggestions[i]));
}
/* misspelled_test() - Just test if word is correctly spelled */
-static int misspelled_test(GtkAspell *gtkaspell, char *word)
+int gtkaspell_misspelled_test(GtkAspell *gtkaspell, char *word)
{
gint result = 0;
- g_return_val_if_fail(word, 0);
+ cm_return_val_if_fail(word, 0);
if (*word == 0)
return 0;
result = enchant_dict_check(gtkaspell->gtkaspeller->speller, word, strlen(word));
if (result && gtkaspell->use_both_dicts && gtkaspell->alternate_speller) {
- use_alternate_dict(gtkaspell);
+ gtkaspell_use_alternate_dict(gtkaspell);
result = enchant_dict_check(gtkaspell->gtkaspeller->speller, word, strlen(word));
- use_alternate_dict(gtkaspell);
+ gtkaspell_use_alternate_dict(gtkaspell);
}
- return result;
+ return (result && strcasecmp(word, "sylpheed") &&
+ strcasecmp(word, "claws-mail"));
}
char buf[GTKASPELLWORDSIZE];
GtkTextView *gtktext;
- g_return_val_if_fail(from_pos >= 0, FALSE);
+ cm_return_val_if_fail(from_pos >= 0, FALSE);
gtktext = gtkaspell->gtktext;
&start, &end))
return FALSE;
- if (misspelled_test(gtkaspell, buf)
- && strcasecmp(buf, "sylpheed") && strcasecmp(buf, "claws-mail")) {
+ if (gtkaspell_misspelled_test(gtkaspell, buf)) {
strncpy(gtkaspell->theword, (gchar *)buf, GTKASPELLWORDSIZE - 1);
gtkaspell->theword[GTKASPELLWORDSIZE - 1] = 0;
gtkaspell->start_pos = start;
gtkaspell->end_pos = end;
- free_suggestions_list(gtkaspell);
+ gtkaspell_free_suggestions_list(gtkaspell);
change_color(gtkaspell, start, end, (gchar *)buf, &(gtkaspell->highlight));
return TRUE;
}
}
-static gboolean check_next_prev(GtkAspell *gtkaspell, gboolean forward)
+static gboolean check_at_cb(gpointer data)
+{
+ GtkAspell *gtkaspell = (GtkAspell *)data;
+ return check_at(gtkaspell, gtkaspell->start_pos);
+}
+
+static gboolean find_misspelled_cb(gpointer data, gboolean forward)
{
+ GtkAspell *gtkaspell = (GtkAspell *)data;
+ gboolean misspelled;
gint pos;
gint minpos;
gint maxpos;
gint direc = -1;
- gboolean misspelled;
minpos = 0;
maxpos = gtkaspell->end_check_pos;
pos > minpos && pos <= maxpos)
pos += direc;
}
+
+ return misspelled;
+}
+
+gboolean gtkaspell_check_next_prev(GtkAspell *gtkaspell, gboolean forward)
+{
+ gboolean misspelled = gtkaspell->ctx.find_misspelled(gtkaspell->ctx.data,
+ forward);
if (misspelled) {
GSList *list, *cur;
GtkWidget *menu;
if (forward)
gtkaspell->orig_pos = gtkaspell->end_pos;
- set_textview_buffer_offset(gtkaspell->gtktext,
- gtkaspell->end_pos);
- /* scroll line to window center */
- gtk_text_view_scroll_to_mark(gtkaspell->gtktext,
- gtk_text_buffer_get_insert(
- gtk_text_view_get_buffer(gtkaspell->gtktext)),
- 0.0, TRUE, 0.0, 0.5);
- /* let textview recalculate coordinates (set_menu_pos) */
- while (gtk_events_pending ())
- gtk_main_iteration ();
+ gtkaspell->ctx.set_position(gtkaspell->ctx.data, gtkaspell->end_pos);
+
+ /* only execute when in textview context */
+ if (gtkaspell == (GtkAspell *)gtkaspell->ctx.data) {
+ /* scroll line to window center */
+ gtk_text_view_scroll_to_mark(gtkaspell->gtktext,
+ gtk_text_buffer_get_insert(
+ gtk_text_view_get_buffer(gtkaspell->gtktext)),
+ 0.0, TRUE, 0.0, 0.5);
+ /* let textview recalculate coordinates (set_menu_pos) */
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+ }
list = make_sug_menu(gtkaspell);
menu = gtk_menu_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(cur->data));
g_slist_free(list);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
- set_menu_pos, gtkaspell, 0, GDK_CURRENT_TIME);
+ gtkaspell->ctx.set_menu_pos,
+ gtkaspell->ctx.data,
+ 0, GDK_CURRENT_TIME);
g_signal_connect(G_OBJECT(menu), "deactivate",
- G_CALLBACK(destroy_menu),
+ G_CALLBACK(destroy_menu),
gtkaspell);
g_signal_connect(G_OBJECT(menu),
"key_press_event",
- G_CALLBACK(aspell_key_pressed), gtkaspell);
+ G_CALLBACK(aspell_key_pressed),
+ gtkaspell);
} else {
reset_theword_data(gtkaspell);
alertpanel_notice(_("No misspelled word found."));
- set_textview_buffer_offset(gtkaspell->gtktext,
- gtkaspell->orig_pos);
+ gtkaspell->ctx.set_position(gtkaspell->ctx.data,
+ gtkaspell->orig_pos);
}
return misspelled;
gtkaspell->continue_check = NULL;
gtkaspell->end_check_pos =
get_textview_buffer_charcount(gtkaspell->gtktext);
- check_next_prev(gtkaspell, FALSE);
+ gtkaspell_context_set(gtkaspell);
+ gtkaspell_check_next_prev(gtkaspell, FALSE);
}
void gtkaspell_check_forwards_go(GtkAspell *gtkaspell)
gtkaspell->continue_check = NULL;
gtkaspell->end_check_pos =
get_textview_buffer_charcount(gtkaspell->gtktext);
- check_next_prev(gtkaspell, TRUE);
+ gtkaspell_context_set(gtkaspell);
+ gtkaspell_check_next_prev(gtkaspell, TRUE);
}
void gtkaspell_check_all(GtkAspell *gtkaspell)
GtkTextBuffer *buffer;
GtkTextIter startiter, enditer;
- g_return_if_fail(gtkaspell);
- g_return_if_fail(gtkaspell->gtktext);
+ cm_return_if_fail(gtkaspell);
+ cm_return_if_fail(gtkaspell->gtktext);
gtktext = gtkaspell->gtktext;
buffer = gtk_text_view_get_buffer(gtktext);
gtkaspell->continue_check = continue_check;
gtkaspell->end_check_pos = end;
- gtkaspell->misspelled = check_next_prev(gtkaspell, TRUE);
+ gtkaspell_context_set(gtkaspell);
+ gtkaspell->misspelled = gtkaspell_check_next_prev(gtkaspell, TRUE);
}
static void continue_check(gpointer *data)
GtkAspell *gtkaspell = (GtkAspell *) data;
gint pos = get_textview_buffer_offset(gtkaspell->gtktext);
if (pos < gtkaspell->end_check_pos && gtkaspell->misspelled)
- gtkaspell->misspelled = check_next_prev(gtkaspell, TRUE);
+ gtkaspell->misspelled = gtkaspell_check_next_prev(gtkaspell, TRUE);
else
gtkaspell->continue_check = NULL;
}
guint len;
GtkTextView *gtktext;
- g_return_if_fail(gtkaspell->gtkaspeller->speller);
+ cm_return_if_fail(gtkaspell->gtkaspeller->speller);
gtktext = gtkaspell->gtktext;
0, -1);
if (strcmp(newword, gtkaspell->theword)) {
- replace_real_word(gtkaspell, newword);
+ gtkaspell->ctx.replace_word(gtkaspell->ctx.data, newword);
if ((e->type == GDK_KEY_PRESS &&
((GdkEventKey *) e)->state & GDK_CONTROL_MASK)) {
newword = gtk_label_get_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN((w)))));
- replace_real_word(gtkaspell, newword);
+ gtkaspell->ctx.replace_word(gtkaspell->ctx.data, newword);
if ((e->type == GDK_KEY_PRESS &&
((GdkEventKey *) e)->state & GDK_CONTROL_MASK) ||
set_textview_buffer_offset(gtktext, gtkaspell->orig_pos);
}
+static void replace_real_word_cb(gpointer data, const gchar *newword)
+{
+ replace_real_word((GtkAspell *)data, newword);
+}
+
/* Accept this word for this session */
static void add_word_to_session_cb(GtkWidget *w, gpointer data)
{
- guint pos;
GtkTextView *gtktext;
GtkAspell *gtkaspell = (GtkAspell *) data;
gtktext = gtkaspell->gtktext;
- pos = get_textview_buffer_offset(gtktext);
enchant_dict_add_to_session(gtkaspell->gtkaspeller->speller, gtkaspell->theword, strlen(gtkaspell->theword));
- check_at(gtkaspell, gtkaspell->start_pos);
+ gtkaspell->ctx.check_word(gtkaspell->ctx.data);
+ gtkaspell_dict_changed(gtkaspell);
gtk_menu_shell_deactivate(GTK_MENU_SHELL(GTK_WIDGET(w)->parent));
enchant_dict_add_to_pwl(gtkaspell->gtkaspeller->speller, gtkaspell->theword, strlen(gtkaspell->theword));
- check_at(gtkaspell, gtkaspell->start_pos);
-
+ gtkaspell->ctx.check_word(gtkaspell->ctx.data);
+ gtkaspell_dict_changed(gtkaspell);
+
gtk_menu_shell_deactivate(GTK_MENU_SHELL(GTK_WIDGET(w)->parent));
set_point_continue(gtkaspell);
}
static void check_with_alternate_cb(GtkWidget *w, gpointer data)
{
- GtkAspell *gtkaspell = (GtkAspell *) data;
+ GtkAspell *gtkaspell = (GtkAspell *)data;
gint misspelled;
gtk_menu_shell_deactivate(GTK_MENU_SHELL(GTK_WIDGET(w)->parent));
- use_alternate_dict(gtkaspell);
- misspelled = check_at(gtkaspell, gtkaspell->start_pos);
+ gtkaspell_use_alternate_dict(gtkaspell);
+ misspelled = gtkaspell->ctx.check_word(gtkaspell->ctx.data);
if (!gtkaspell->continue_check) {
GSList *list, *cur;
misspelled_suggest(gtkaspell, gtkaspell->theword);
- set_textview_buffer_offset(gtkaspell->gtktext,
+ gtkaspell->ctx.set_position(gtkaspell->ctx.data,
gtkaspell->end_pos);
list = make_sug_menu(gtkaspell);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(cur->data));
g_slist_free(list);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
- set_menu_pos, gtkaspell, 0,
+ gtkaspell->ctx.set_menu_pos,
+ gtkaspell->ctx.data, 0,
GDK_CURRENT_TIME);
g_signal_connect(G_OBJECT(menu), "deactivate",
- G_CALLBACK(destroy_menu),
+ G_CALLBACK(destroy_menu),
gtkaspell);
g_signal_connect(G_OBJECT(menu),
"key_press_event",
- G_CALLBACK(aspell_key_pressed), gtkaspell);
+ G_CALLBACK(aspell_key_pressed),
+ gtkaspell);
return;
}
} else
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_window_set_title(GTK_WINDOW(dialog),_("Replace unknown word"));
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_move(GTK_WINDOW(dialog), xx, yy);
g_signal_connect_swapped(G_OBJECT(dialog), "destroy",
Dictionary *dict;
dict_list = gtkaspell_get_dictionary_list(refresh);
- g_return_val_if_fail(dict_list, NULL);
+ cm_return_val_if_fail(dict_list, NULL);
store = gtk_list_store_new(SET_GTKASPELL_SIZE,
G_TYPE_STRING,
GtkTreeModel *model;
gchar *dict_fullname = NULL;
- g_return_val_if_fail(GTK_IS_COMBO_BOX(combo), NULL);
- g_return_val_if_fail(gtk_combo_box_get_active_iter(combo, &iter), NULL);
+ cm_return_val_if_fail(GTK_IS_COMBO_BOX(combo), NULL);
+ cm_return_val_if_fail(gtk_combo_box_get_active_iter(combo, &iter), NULL);
model = gtk_combo_box_get_model(combo);
if(model == NULL)
GtkTreeIter iter;
gchar *dict_name = NULL;
- g_return_val_if_fail(combo != NULL, 0);
- g_return_val_if_fail(dictionary != NULL, 0);
- g_return_val_if_fail(GTK_IS_COMBO_BOX(combo), 0);
+ cm_return_val_if_fail(combo != NULL, 0);
+ cm_return_val_if_fail(dictionary != NULL, 0);
+ cm_return_val_if_fail(GTK_IS_COMBO_BOX(combo), 0);
if((model = gtk_combo_box_get_model(combo)) == NULL)
return 0;
return 0;
}
-static void use_alternate_dict(GtkAspell *gtkaspell)
+void gtkaspell_use_alternate_dict(GtkAspell *gtkaspell)
{
GtkAspeller *tmp;
static void destroy_menu(GtkWidget *widget,
gpointer user_data) {
-
GtkAspell *gtkaspell = (GtkAspell *)user_data;
if (gtkaspell->accel_group) {
Dictionary *dict;
GtkAspeller *gtkaspeller;
- g_return_val_if_fail(gtkaspell, FALSE);
- g_return_val_if_fail(dictionary, FALSE);
+ cm_return_val_if_fail(gtkaspell, FALSE);
+ cm_return_val_if_fail(dictionary, FALSE);
dict = g_new0(Dictionary, 1);
dict->dictname = g_strdup(dictionary);
}
- if (strchr(dict->fullname, '-')) {
+ if (dict->fullname && strchr(dict->fullname, '-')) {
*(strchr(dict->fullname, '-')) = '\0';
*(strchr(dict->dictname, '-')) = '\0';
}
+ if (!dict->fullname || !(*dict->fullname)) {
+ dictionary_delete(dict);
+ return FALSE;
+ }
gtkaspeller = gtkaspeller_new(dict);
if (!gtkaspeller) {
Dictionary *dict;
GtkAspeller *gtkaspeller;
- g_return_val_if_fail(gtkaspell, FALSE);
- g_return_val_if_fail(alt_dictionary, FALSE);
+ cm_return_val_if_fail(gtkaspell, FALSE);
+ cm_return_val_if_fail(alt_dictionary, FALSE);
dict = g_new0(Dictionary, 1);
if (strrchr(alt_dictionary, '/')) {
dict->dictname = g_strdup(alt_dictionary);
}
- if (strchr(dict->fullname, '-')) {
+ if (dict->fullname && strchr(dict->fullname, '-')) {
*(strchr(dict->fullname, '-')) = '\0';
*(strchr(dict->dictname, '-')) = '\0';
}
+ if (!dict->fullname || !(*dict->fullname)) {
+ dictionary_delete(dict);
+ return FALSE;
+ }
+
gtkaspeller = gtkaspeller_new(dict);
if (!gtkaspeller) {
return;
gtkaspell_change_dict(gtkaspell, fullname, TRUE);
- if (gtkaspell->recheck_when_changing_dict) {
- gtkaspell_highlight_all(gtkaspell);
- }
+ gtkaspell_dict_changed(gtkaspell);
+
if (gtkaspell->menu_changed_cb)
gtkaspell->menu_changed_cb(gtkaspell->menu_changed_data);
}
gpointer data)
{
GtkAspell *gtkaspell = (GtkAspell *) data;
- use_alternate_dict(gtkaspell);
- if (gtkaspell->recheck_when_changing_dict) {
- gtkaspell_highlight_all(gtkaspell);
- }
+ gtkaspell_use_alternate_dict(gtkaspell);
+ gtkaspell_dict_changed(gtkaspell);
+
if (gtkaspell->menu_changed_cb)
gtkaspell->menu_changed_cb(gtkaspell->menu_changed_data);
}
gtktext = gtkaspell->gtktext;
- set_textview_buffer_offset(gtktext, gtkaspell->orig_pos);
+ gtkaspell->ctx.set_position(gtkaspell->ctx.data, gtkaspell->orig_pos);
if (gtkaspell->continue_check)
- gtkaspell->continue_check((gpointer *) gtkaspell);
+ gtkaspell->continue_check((gpointer *) gtkaspell->ctx.data);
}
static void allocate_color(GtkAspell *gtkaspell, gint rgbvalue)
return dict2;
}
-static void free_suggestions_list(GtkAspell *gtkaspell)
+void gtkaspell_free_suggestions_list(GtkAspell *gtkaspell)
{
GList *list;
gtkaspell->theword[0] = 0;
gtkaspell->max_sug = -1;
- free_suggestions_list(gtkaspell);
+ gtkaspell_free_suggestions_list(gtkaspell);
}
static void free_checkers(gpointer elt, gpointer data)
{
GtkAspeller *gtkaspeller = elt;
- g_return_if_fail(gtkaspeller);
+ cm_return_if_fail(gtkaspeller);
gtkaspeller_real_delete(gtkaspeller);
}
projects / claws.git / blobdiff