Merge remote-tracking branch 'origin/emulator' into dev_aaron

emulator/emulated/test2.txt

@@ -1 +0,0 @@
-hallo welt

emulator/qt/ll_tft.cpp

@@ -44,13 +44,15 @@ void ll_tft_draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color) {
 }
 
 uint8_t ll_tft_num_fonts() {
-    return 1;
+    return 2;
 }
 
 QFont get_font(uint8_t fontnum) {
     switch(fontnum) {
         case 0:
             return QFont("Monospace",8);
+        case 1:
+            return QFont("DejaVu Sans Mono",14);
         default:
         return QFont();
     }

emulator/qt/mainwindow.cpp

@@ -34,6 +34,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), image(DISPLAY_WID
     ui->setupUi(this);
     image.fill(Qt::black);
     currentScale = 1;
+    ui->widgetDisplay->setMouseTracking(true);
+    ui->widgetDisplay->installEventFilter(this);
 }
 
 void MainWindow::draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color)
@@ -159,7 +161,28 @@ void MainWindow::mouseMoveEvent(QMouseEvent *evt)
 {
    //qDebug() << "move" << evt->pos();
     checkAndSendEvent(evt->pos(),true);
+}
 
+
+bool MainWindow::eventFilter(QObject *obj, QEvent *evt)
+{
+   if(obj==ui->widgetDisplay) {
+        switch(evt->type()) {
+            case QEvent::MouseMove:
+            {
+                QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(evt);
+                QPoint p = (mouseEvent->pos()-QPoint(1,1))/currentScale;
+                if(p.x()<DISPLAY_WIDTH && p.y()<DISPLAY_HEIGHT) {
+                    ui->txtMousePos->setText(QString("Mouse Position: (%1,%2)").arg(p.x()).arg(p.y()));
+                }
+            }
+            break;
+
+            default: break;
+        }
+   }
+
+     return false;
 }
 
 

emulator/qt/mainwindow.h

@@ -25,6 +25,7 @@ public:
     void draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolor, QFont font, char c);
 
 protected:
+     bool eventFilter(QObject * obj , QEvent * env);
      void paintEvent(QPaintEvent * evt);
      void mousePressEvent(QMouseEvent* evt);
      void mouseReleaseEvent(QMouseEvent* evt);

emulator/qt/mainwindow.ui

@@ -43,6 +43,13 @@
         </item>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="txtMousePos">
+        <property name="text">
+         <string>Mouse Position: out of bounds</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">