UI: experimental keypad to replace android keypad

Author: chrisws

src/lib/maapi.h

@@ -16,48 +16,29 @@
   02111-1307, USA.
 */
 
-#if !defined(MAAPI_H)
-#define MAAPI_H
-
-#include <stdint.h>
+#pragma once
+#include <cstdint>
 
 #define EXTENT_Y(e) ((short)(e))
 #define EXTENT_X(e) ((short)((e) >> 16))
 #define TRANS_NONE 0
 #define FONT_TYPE_SERIF 0
 #define FONT_TYPE_SANS_SERIF 1
 #define FONT_TYPE_MONOSPACE 2
-// same values as tizen enum FontStyle
 #define FONT_STYLE_NORMAL 0x0001
 #define FONT_STYLE_BOLD 0x0002
 #define FONT_STYLE_ITALIC 0x0004
-#define HANDLE_LOCAL 0
-#define RES_OUT_OF_MEMORY -1
-#define RES_BAD_INPUT -2
 #define RES_OK 1
 #define HANDLE_SCREEN 0
 #define RES_FONT_OK 1
-#define MAK_MENU 293
 #define EVENT_TYPE_POINTER_PRESSED 8
 #define EVENT_TYPE_POINTER_RELEASED 9
 #define EVENT_TYPE_POINTER_DRAGGED 10
 #define EVENT_TYPE_KEY_PRESSED 11
 #define EVENT_TYPE_OPTIONS_BOX_BUTTON_CLICKED 41
 #define EVENT_TYPE_SCREEN_CHANGED 21
 
-#ifndef _WCHAR_DEFINED
-#define _WCHAR_DEFINED
-typedef wchar_t wchar;
-#endif  //_WCHAR_DEFINED
-
-#ifndef _SYSV_TYPES_DEFINED
-#define _SYSV_TYPES_DEFINED
-typedef unsigned short ushort;
-typedef unsigned int uint;
-#endif  //_SYSV_TYPES_DEFINED
-
 typedef int MAExtent;
-typedef void* MAAddress;
 typedef intptr_t MAHandle;
 
 typedef struct MARect {
@@ -170,7 +151,7 @@ void maDrawText(int left, int top, const char *str, int length);
 /**
  * Copies the back buffer to the physical screen.
  */
-void maUpdateScreen(void);
+void maUpdateScreen();
 
 /**
  * Returns the size in pixels of Latin-1 text as it would appear on-screen.
@@ -181,7 +162,7 @@ MAExtent maGetTextSize(const char *str);
  * Returns the screen size.
  * Returns the screen size.
  */
-MAExtent maGetScrSize(void);
+MAExtent maGetScrSize();
 
 /**
  * Returns a handle to one of the default fonts of the device, in the style and size you specify.
@@ -231,14 +212,14 @@ void maDrawImageRegion(MAHandle image, const MARect *srcRect, const MAPoint2d *d
  * \param width Width, in pixels, of the new image. Must be \> 0.
  * \param height Height, in pixels, of the new image. Must be \> 0.
  * \see maSetDrawTarget()
- * \returns #RES_OK if succeded and #RES_OUT_OF_MEMORY if failed.
+ * \returns #RES_OK if succeeded and #RES_OUT_OF_MEMORY if failed.
  */
 int maCreateDrawableImage(MAHandle placeholder, int width, int height);
 
 /**
  *  Creates a new placeholder and returns the handle to it.
  */
-MAHandle maCreatePlaceholder(void);
+MAHandle maCreatePlaceholder();
 
 /**
  * Releases a handle returned by maCreatePlaceholder().
@@ -264,13 +245,13 @@ void maDestroyPlaceholder(MAHandle handle);
  * The destination rectangle is defined as { 0,0, \a srcRect.width, \a srcRect.height }.
  * Parts of the destination array that are outside the destination rectangle are not modified.
  * If \a srcRect is outside the bounds of the source image,
- * or if \a srcRect.width is greater than \a scanlength, a MoSync Panic is thrown.
+ * or if \a srcRect.width is greater than \a scanLength, a MoSync Panic is thrown.
  * \param image The handle to the source image.
  * \param dst The address of the destination array.
- * \param scanlength The width of the image, in pixels, represented by the destination array.
+ * \param scanLength The width of the image, in pixels, represented by the destination array.
  * \param srcRect The portion of the source image to be copied.
  */
-void maGetImageData(MAHandle image, void *dst, const MARect *srcRect, int scanlength);
+void maGetImageData(MAHandle image, void *dst, const MARect *srcRect, int scanLength);
 
 /**
  * Sets the current draw target.
@@ -287,17 +268,17 @@ MAHandle maSetDrawTarget(MAHandle image);
  * Returns the number of milliseconds that has passed since some unknown point in time.
  * Accuracy is platform-specific, but should be better than 20 ms.
  */
-int maGetMilliSecondCount(void);
+int maGetMilliSecondCount();
 
 /**
  * Shows the virtual keyboard.
  */
-void maShowVirtualKeyboard(void);
+void maShowVirtualKeyboard();
 
 /**
  * Hides the virtual keyboard.
  */
-void maHideVirtualKeyboard(void);
+void maHideVirtualKeyboard();
 
 /**
  * There is a FIFO buffer that contains up to #EVENT_BUFFER_SIZE events.
@@ -339,4 +320,3 @@ void maPushEvent(MAEvent *event);
  */
 void maWait(int timeout);
 
-#endif

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/EditorBar.java

@@ -326,6 +326,12 @@ public void run() {
     return result;
   }
 
+  public int getDensity() {
+    DisplayMetrics metrics = new DisplayMetrics();
+    getWindowManager().getDefaultDisplay().getMetrics(metrics);
+    return metrics.densityDpi;
+  }
+
   public String getIpAddress() {
     String result = "";
     try {

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.11.0'
+    classpath 'com.android.tools.build:gradle:8.11.1'
   }
 }
 

src/platform/android/build.gradle

@@ -8,9 +8,9 @@
 
 #include "config.h"
 
-#include "ui/textedit.h"
 #include "platform/android/jni/runtime.h"
 #include "common/device.h"
+#include "ui/textedit.h"
 #include "ui/keypad.h"
 
 // whether to hide the status message
@@ -126,11 +126,12 @@ void showHelp(TextEditHelpWidget *helpWidget) {
 void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
   logEntered();
 
+  showKeypad(false);
   int w = _output->getWidth();
   int h = _output->getHeight();
   int charWidth = _output->getCharWidth();
   int charHeight = _output->getCharHeight();
-  int prevScreenId = _output->selectScreen(SOURCE_SCREEN);
+  int prevScreenId = _output->selectScreen(FORM_SCREEN);
   TextEditInput *editWidget;
   if (_editor != nullptr) {
     editWidget = _editor;
@@ -155,7 +156,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
   if (_keypad != nullptr) {
     _output->addInput(_keypad);
   } else {
-    _keypad = new KeypadInput(false, false, charWidth, charHeight);
+    _keypad = new KeypadInput(false, false, charWidth, charHeight, _density);
     _output->addInput(_keypad);
   }
 
@@ -183,7 +184,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
     switch (event.type) {
     case EVENT_TYPE_POINTER_RELEASED:
     case EVENT_TYPE_OPTIONS_BOX_BUTTON_CLICKED:
-      if (statusMessage.update(editWidget, _output)) {
+      if (widget == editWidget && statusMessage.update(editWidget, _output)) {
         _output->redraw();
       }
       break;
@@ -248,12 +249,11 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
           _output->redraw();
           _state = kActiveState;
           waitForBack();
-          _output->selectScreen(SOURCE_SCREEN);
+          _output->selectScreen(FORM_SCREEN);
           _state = kEditState;
           break;
         case SB_KEY_CTRL('t'):
           statusMessage.toggleEnabled(editWidget);
-          redraw = true;
           break;
         default:
           redraw = widget->edit(event.key, _output->getScreenWidth(), charWidth);
@@ -271,6 +271,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
       helpWidget->hide();
       editWidget->setFocus(true);
       statusMessage.setFind(false, editWidget);
+      statusMessage.update(editWidget, _output);
       _state = kEditState;
       _output->redraw();
     }

src/platform/android/jni/editor.cpp

@@ -234,6 +234,7 @@ Runtime::Runtime(android_app *app) :
   _looper = ALooper_forThread();
   _sensorManager = ASensorManager_getInstance();
   memset(&_sensors, 0, sizeof(_sensors));
+  _density = getInteger("getDensity");
 }
 
 Runtime::~Runtime() {
@@ -855,8 +856,12 @@ MAEvent Runtime::processEvents(int waitFlag) {
   switch (waitFlag) {
   case 1:
     // wait for an event
-    _output->flush(true);
-    if (!hasEvent()) {
+    if (!hasEvent() || _eventQueue->peek()->type == EVENT_TYPE_POINTER_DRAGGED) {
+      // drain any motion events so we only return the latest
+      while (hasEvent()) {
+        delete popEvent();
+      }
+      _output->flush(true);
       pollEvents(true);
     }
     break;

src/platform/android/jni/runtime.cpp

@@ -86,6 +86,7 @@ struct Runtime : public System {
 private:
   void editSource(String loadPath, bool restoreOnExit) override;
 
+  int _density;
   bool _keypadActive;
   bool _hasFocus;
   Graphics *_graphics;

src/platform/android/jni/runtime.h

@@ -202,7 +202,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
   int h = _output->getHeight();
   int charWidth = _output->getCharWidth();
   int charHeight = _output->getCharHeight();
-  int prevScreenId = _output->selectScreen(SOURCE_SCREEN);
+  int prevScreenId = _output->selectScreen(FORM_SCREEN);
   TextEditInput *editWidget;
   if (_editor != nullptr) {
     editWidget = _editor;
@@ -232,7 +232,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
   if (_keypad != nullptr) {
     _output->addInput(_keypad);
   } else {
-    _keypad = new KeypadInput(false, true, charWidth, charHeight);
+    _keypad = new KeypadInput(false, true, charWidth, charHeight, 0);
     _output->addInput(_keypad);
   }
 
@@ -457,7 +457,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
           _output->redraw();
           _state = kActiveState;
           waitForBack();
-          _output->selectScreen(SOURCE_SCREEN);
+          _output->selectScreen(FORM_SCREEN);
           _state = kEditState;
           break;
         case SB_KEY_ALT('0'):

src/platform/sdl/editor.cpp

@@ -109,7 +109,7 @@ Screen *AnsiWidget::createScreen(int screenId) {
   if (result == nullptr) {
     if (screenId == TEXT_SCREEN || screenId == MENU_SCREEN) {
       result = new TextScreen(_width, _height, _fontSize);
-    } else if (screenId == SOURCE_SCREEN) {
+    } else if (screenId == FORM_SCREEN) {
       result = new FormInputScreen(_width, _height, _fontSize);
     } else {
       result = new GraphicScreen(_width, _height, _fontSize);
@@ -494,6 +494,11 @@ void AnsiWidget::pointerReleaseEvent(const MAEvent &event) {
   } else if (_swipeExit) {
     _swipeExit = false;
   } else {
+    if (_activeButton && (_activeButton->floatTop() || _activeButton->floatBottom())) {
+      // release keypad/toolbar button
+      _activeButton->clicked(event.point.x, event.point.y, false);
+      drawActiveButton();
+    }
     int maxScroll = (_front->_curY - _front->_height) + (2 * _fontSize);
     if (_yMove != -1 && maxScroll > 0) {
       _front->drawInto();

src/ui/ansiwidget.cpp

@@ -25,7 +25,8 @@
 #define SOURCE_SCREEN  3
 #define CONSOLE_SCREEN 4
 #define MENU_SCREEN    5
-#define MAX_SCREENS    6
+#define FORM_SCREEN    6
+#define MAX_SCREENS    7
 
 using namespace strlib;