aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
authorLauris Kaplinski <lauris@src.gnome.org>2000-08-23 08:22:18 +0800
committerLauris Kaplinski <lauris@src.gnome.org>2000-08-23 08:22:18 +0800
commit1e5ae349da6db9a0af7714037e23ee599f60c068 (patch)
treee4e514e57d513ea0c63aa9309f5d7feefbe74ce0 /widgets/table
parent6b2a9a563f754366af99671e5df19fbc4c8c7ad8 (diff)
downloadgsoc2013-evolution-1e5ae349da6db9a0af7714037e23ee599f60c068.tar.gz
gsoc2013-evolution-1e5ae349da6db9a0af7714037e23ee599f60c068.tar.zst
gsoc2013-evolution-1e5ae349da6db9a0af7714037e23ee599f60c068.zip
Handle iso-8859-1 keys nicely in e-text and e-table. Other encodings to
come... svn path=/trunk/; revision=4972
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/e-cell-text.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 279ef4975b..5a7f8d514e 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -35,6 +35,7 @@
#include "e-cell-text.h"
#include "e-util/e-util.h"
#include "e-util/e-font.h"
+#include "e-util/e-unicode.h"
#include "e-table-item.h"
#include "e-text-event-processor.h"
#include "e-text-event-processor-emacs-like.h"
@@ -912,11 +913,23 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col,
e_tep_event.key.time = key.time;
e_tep_event.key.state = key.state;
e_tep_event.key.keyval = key.keyval;
+
+ /* This is probably ugly hack, but we have to handle UTF-8 input somehow */
+#if 0
e_tep_event.key.length = key.length;
e_tep_event.key.string = key.string;
+#else
+ e_tep_event.key.string = e_utf8_from_gtk_event_key (canvas, key.keyval, key.string);
+ if (e_tep_event.key.string != NULL) {
+ e_tep_event.key.length = strlen (e_tep_event.key.string);
+ } else {
+ e_tep_event.key.length = 0;
+ }
+#endif
+
_get_tep (edit);
- return_val = e_text_event_processor_handle_event (edit->tep,
- &e_tep_event);
+ return_val = e_text_event_processor_handle_event (edit->tep, &e_tep_event);
+ if (e_tep_event.key.string) g_free (e_tep_event.key.string);
break;
}
}