[Bf-blender-cvs] [411bcf1fe73] master: Cleanup: simplify 3D text insert, remove checks for ascii escape codes

[Campbell Barton]

Commit: 411bcf1fe7345f2e513b49249c34d3601631a5d7
Author: Campbell Barton
Date:   Thu Jul 14 16:26:24 2022 +1000
Branches: master
https://developer.blender.org/rB411bcf1fe7345f2e513b49249c34d3601631a5d7

Cleanup: simplify 3D text insert, remove checks for ascii escape codes

3D text included checks for escape codes such as \n\r\b which have not
been included in wmEvent.ascii since [0] (2009).

Remove these and use more straightforward logic for overriding the
events text input.

[0] 66437a62a73966de8ccb673473ba69d6c1ed66a3

===================================================================

M	source/blender/editors/curve/editfont.c

===================================================================

diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 33e3837c9d4..623f41dcd20 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -59,7 +59,7 @@ static int kill_selection(Object *obedit, int ins);
 /** \name Internal Utilities
  * \{ */
 
-static char32_t findaccent(char32_t char1, uint code)
+static char32_t findaccent(char32_t char1, const char code)
 {
   char32_t new = 0;
 
@@ -1638,12 +1638,12 @@ static int insert_text_invoke(bContext *C, wmOperator *op, const wmEvent *event)
   Object *obedit = CTX_data_edit_object(C);
   Curve *cu = obedit->data;
   EditFont *ef = cu->editfont;
-  static int accentcode = 0;
-  uintptr_t ascii = WM_event_utf8_to_ascii(event);
+  static bool accentcode = false;
   const bool alt = event->modifier & KM_ALT;
   const bool shift = event->modifier & KM_SHIFT;
   const bool ctrl = event->modifier & KM_CTRL;
   int event_type = event->type, event_val = event->val;
+  char32_t insert_char_override = 0;
   char32_t inserted_text[2] = {0};
 
   if (RNA_struct_property_is_set(op->ptr, "text")) {
@@ -1652,48 +1652,47 @@ static int insert_text_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
   if (RNA_struct_property_is_set(op->ptr, "accent")) {
     if (ef->len != 0 && ef->pos > 0) {
-      accentcode = 1;
+      accentcode = true;
     }
     return OPERATOR_FINISHED;
   }
 
-  /* tab should exit editmode, but we allow it to be typed using modifier keys */
-  if (event_type == EVT_TABKEY) {
-    if ((alt || ctrl || shift) == 0) {
-      return OPERATOR_PASS_THROUGH;
-    }
-
-    ascii = 9;
-  }
-
   if (event_type == EVT_BACKSPACEKEY) {
     if (alt && ef->len != 0 && ef->pos > 0) {
-      accentcode = 1;
+      accentcode = true;
     }
     return OPERATOR_PASS_THROUGH;
   }
 
-  if (event_val && (ascii || event->utf8_buf[0])) {
-    /* handle case like TAB (== 9) */
-    if ((ascii > 31 && ascii < 254 && ascii != 127) || (ELEM(ascii, 13, 10)) || (ascii == 8) ||
-        (event->utf8_buf[0])) {
+  /* Tab typically exit edit-mode, but we allow it to be typed using modifier keys. */
+  if (event_type == EVT_TABKEY) {
+    if ((alt || ctrl || shift) == 0) {
+      return OPERATOR_PASS_THROUGH;
+    }
+    insert_char_override = '\t';
+  }
 
+  if (event_val && (insert_char_override || event->utf8_buf[0])) {
+    if (insert_char_override) {
+      /* Handle case like TAB ('\t'). */
+      inserted_text[0] = insert_char_override;
+      insert_into_textbuf(obedit, insert_char_override);
+      text_update_edited(C, obedit, FO_EDIT);
+    }
+    else {
+      BLI_assert(event->utf8_buf[0]);
       if (accentcode) {
         if (ef->pos > 0) {
-          inserted_text[0] = findaccent(ef->textbuf[ef->pos - 1], ascii);
+          inserted_text[0] = findaccent(ef->textbuf[ef->pos - 1],
+                                        BLI_str_utf8_as_unicode(event->utf8_buf));
           ef->textbuf[ef->pos - 1] = inserted_text[0];
         }
-        accentcode = 0;
+        accentcode = false;
       }
       else if (event->utf8_buf[0]) {
         inserted_text[0] = BLI_str_utf8_as_unicode(event->utf8_buf);
-        ascii = inserted_text[0];
-        insert_into_textbuf(obedit, ascii);
-        accentcode = 0;
-      }
-      else if (ascii) {
-        insert_into_textbuf(obedit, ascii);
-        accentcode = 0;
+        insert_into_textbuf(obedit, inserted_text[0]);
+        accentcode = false;
       }
       else {
         BLI_assert(0);
@@ -1702,11 +1701,6 @@ static int insert_text_invoke(bContext *C, wmOperator *op, const wmEvent *event)
       kill_selection(obedit, 1);
       text_update_edited(C, obedit, FO_EDIT);
     }
-    else {
-      inserted_text[0] = ascii;
-      insert_into_textbuf(obedit, ascii);
-      text_update_edited(C, obedit, FO_EDIT);
-    }
   }
   else {
     return OPERATOR_PASS_THROUGH;
@@ -1722,7 +1716,7 @@ static int insert_text_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 
   /* reset property? */
   if (event_val == 0) {
-    accentcode = 0;
+    accentcode = false;
   }
 
   return OPERATOR_FINISHED;