Mac OS text input: Fl::compose_state is a number of bytes (not of cha…

…racters). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9757 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Dec 15, 2012 · 05d20db · 05d20db
1 parent 22b4198
commit 05d20db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx
@@ -514,8 +514,9 @@ int Fl_Text_Editor::handle_key() {
   int del = 0;
   if (Fl::compose(del)) {
     if (del) {
-      int dp = insert_position(), di = del;
-      while (di--) dp = buffer()->prev_char_clipped(dp);
+      // del is a number of bytes
+      int dp = insert_position() - del;
+      if ( dp < 0 ) dp = 0;
       buffer()->select(dp, insert_position());
     }
     kill_selection(this);

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
@@ -1958,7 +1958,7 @@ - (void)setMarkedText:(id)aString selectedRange:(NSRange)newSelection  {
 	received, newSelection.location, newSelection.length, Fl::e_length, Fl::compose_state, [received length]);*/
   Fl_Window *target = [(FLWindow*)[self window] getFl_Window];
   Fl::handle(FL_KEYBOARD, target);
-  Fl::compose_state = [received length];
+  Fl::compose_state = Fl::e_length;
   fl_unlock_function();
 }