Guard IME under U8G2 flag and restore font/limits

Author: vicliu624

src/modules/CannedMessageModule.cpp

@@ -44,10 +44,6 @@ extern MessageStore messageStore;
 #endif
 #endif
 
-#if defined(USE_TEXT_INPUT_IME) || defined(USE_U8G2_EINK_TEXT)
-#define MESHTASTIC_HAS_IME 1
-#endif
-
 #ifndef INPUTBROKER_MATRIX_TYPE
 #define INPUTBROKER_MATRIX_TYPE 0
 #endif
@@ -124,7 +120,7 @@ static void renderEmote(OLEDDisplay *display, int &nextX, int lineY, int rowHeig
     }
 }
 
-#if defined(MESHTASTIC_HAS_IME)
+#if defined(USE_U8G2_EINK_TEXT)
 static bool isChineseImeAllowed()
 {
     return config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_CN;
@@ -232,18 +228,6 @@ void CannedMessageModule::cycleImeMode()
     imeSelectedOffset = 0;
 }
 
-void CannedMessageModule::resetImeState()
-{
-    imeMode = ImeMode::EN;
-    ime.setEnabled(false);
-    ime.reset();
-    imePage = 0;
-    imePageSize = 0;
-    imeSelectedOffset = 0;
-    imeCandidateHitCount = 0;
-}
-#endif // MESHTASTIC_HAS_IME
-
 static U8G2_FOR_ADAFRUIT_GFX *getU8g2Fonts(OLEDDisplay *display)
 {
 #if defined(USE_EINK)
@@ -924,7 +908,6 @@ bool CannedMessageModule::handleMessageSelectorInput(const InputEvent *event, bo
         cursor = 0;
         payload = 0;
         currentMessageIndex = -1;
-        resetImeState();
 
         // Notify UI that we want to redraw/close this screen
         UIFrameEvent e;
@@ -962,7 +945,6 @@ bool CannedMessageModule::handleMessageSelectorInput(const InputEvent *event, bo
             // Set runState to inactive so we return to main UI
             runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
             currentMessageIndex = -1;
-            resetImeState();
 
             // Notify UI to regenerate frame set and redraw
             UIFrameEvent e;
@@ -1014,7 +996,6 @@ bool CannedMessageModule::handleMessageSelectorInput(const InputEvent *event, bo
 
                         // Return to inactive state
                         this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-                        resetImeState();
                         this->currentMessageIndex = -1;
                         this->freetext = "";
                         this->cursor = 0;
@@ -1160,7 +1141,6 @@ bool CannedMessageModule::handleFreeTextInput(const InputEvent *event)
         cursor = 0;
         payload = 0;
         currentMessageIndex = -1;
-        resetImeState();
 
         // Notify UI that we want to redraw/close this screen
         UIFrameEvent e;
@@ -1670,7 +1650,14 @@ int32_t CannedMessageModule::runOnce()
 
     // Normal module disable/idle handling
     if ((this->runState == CANNED_MESSAGE_RUN_STATE_DISABLED) || (this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE)) {
-        resetImeState();
+#if defined(USE_U8G2_EINK_TEXT)
+        imeMode = ImeMode::EN;
+        ime.setEnabled(false);
+        ime.reset();
+        imePage = 0;
+        imeSelectedOffset = 0;
+        imeCandidateHitCount = 0;
+#endif
         // Clean up virtual keyboard if needed when going inactive
         if (graphics::NotificationRenderer::virtualKeyboard && graphics::NotificationRenderer::textInputCallback == nullptr) {
             LOG_INFO("Performing delayed virtual keyboard cleanup");
@@ -1720,7 +1707,6 @@ int32_t CannedMessageModule::runOnce()
         (this->runState == CANNED_MESSAGE_RUN_STATE_MESSAGE_SELECTION)) {
         LOG_DEBUG("[CANNED] sending/ack/message selection -> inactive (payload=%d)", this->payload);
         this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-        resetImeState();
         e.action = UIFrameEvent::Action::REGENERATE_FRAMESET;
         this->currentMessageIndex = -1;
         this->freetext = "";
@@ -1731,7 +1717,6 @@ int32_t CannedMessageModule::runOnce()
     else if (this->runState == CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE && this->payload == 0) {
         LOG_DEBUG("[CANNED] sending active -> inactive (payload=0)");
         this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-        resetImeState();
         this->currentMessageIndex = -1;
         this->freetext = "";
         this->cursor = 0;
@@ -1745,7 +1730,6 @@ int32_t CannedMessageModule::runOnce()
         this->freetext = "";
         this->cursor = 0;
         this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-        resetImeState();
 
         // Clean up virtual keyboard if it exists during timeout
         if (graphics::NotificationRenderer::virtualKeyboard) {
@@ -1778,15 +1762,11 @@ int32_t CannedMessageModule::runOnce()
                 // Now deactivate this module
                 LOG_DEBUG("[CANNED] freetext sent -> inactive");
                 this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-#if defined(USE_U8G2_EINK_TEXT)
-                resetImeState();
-#endif
 
                 return INT32_MAX; // don’t fall back into canned list
             } else {
                 LOG_DEBUG("[CANNED] freetext empty -> inactive");
                 this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-                resetImeState();
             }
         } else {
             if (strcmp(this->messages[this->currentMessageIndex], "[Select Destination]") == 0) {
@@ -1812,14 +1792,12 @@ int32_t CannedMessageModule::runOnce()
                     // Now deactivate this module
                     LOG_DEBUG("[CANNED] canned message sent -> inactive");
                     this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-                    resetImeState();
 
                     return INT32_MAX; // don’t fall back into canned list
                 }
             } else {
                 LOG_DEBUG("[CANNED] action select invalid index -> inactive");
                 this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-                resetImeState();
             }
         }
         // fallback clean-up if nothing above returned
@@ -1887,19 +1865,19 @@ int32_t CannedMessageModule::runOnce()
             case INPUT_BROKER_MSG_TAB: // Tab key: handled by input handler
                 return 0;
             case INPUT_BROKER_LEFT:
-            case INPUT_BROKER_RIGHT:
-                break;
-            default:
-                // Only insert ASCII printable characters (32–126)
-                if (this->payload >= 32 && this->payload <= 126) {
-                    requestFocus();
-                    insertTextAtCursor(String((char)this->payload));
-                }
-                break;
+        case INPUT_BROKER_RIGHT:
+            break;
+        default:
+            // Only insert ASCII printable characters (32–126)
+            if (this->payload >= 32 && this->payload <= 126) {
+                requestFocus();
+                insertTextAtCursor(String((char)this->payload));
             }
-            // Prevent reprocessing stale payloads (e.g., lingering backspace after IME commits)
-            this->payload = 0;
+            break;
         }
+        // Prevent reprocessing stale payloads (e.g., lingering backspace after IME commits)
+        this->payload = 0;
+    }
         this->lastTouchMillis = millis();
         this->notifyObservers(&e);
         return INACTIVATE_AFTER_MS;
@@ -3130,3 +3108,5 @@ String CannedMessageModule::drawWithCursor(String text, int cursor)
     String result = text.substring(0, cursor) + "_" + text.substring(cursor);
     return result;
 }
+
+#endif

src/modules/CannedMessageModule.h

@@ -2,11 +2,7 @@
 #if HAS_SCREEN
 #include "ProtobufModule.h"
 #include "input/InputBroker.h"
-#if defined(USE_TEXT_INPUT_IME) || defined(USE_U8G2_EINK_TEXT)
-#define MESHTASTIC_HAS_IME 1
-#endif
-
-#if defined(MESHTASTIC_HAS_IME)
+#if defined(USE_U8G2_EINK_TEXT)
 #include "modules/ChineseIme.h"
 #endif
 
@@ -196,7 +192,7 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
     std::vector<uint8_t> activeChannelIndices;
     std::vector<NodeEntry> filteredNodes;
 
-#if defined(MESHTASTIC_HAS_IME)
+#if defined(USE_U8G2_EINK_TEXT)
     ChineseIme ime;
     ImeMode imeMode = ImeMode::EN;
     int imePage = 0;
@@ -232,7 +228,7 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
     void moveCursorLeftUtf8();
     void moveCursorRightUtf8();
     void resetImeState();
-#if defined(MESHTASTIC_HAS_IME)
+#if defined(USE_U8G2_EINK_TEXT)
     void cycleImeMode();
 #endif
 #if defined(USE_VIRTUAL_KEYBOARD)