FLTK: fix INPUT display pos when scrolled

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2014-06-14
+	Fix crash evaluating "a \\ b"
+	Fix INPUT command in FLTK for scrolled display
+
 2014-06-11
 	Android changes:
 	- Run by URL/QrCode.

src/platform/fltk/dev_fltk.cxx

@@ -617,8 +617,8 @@ char *dev_gets(char *dest, int size) {
   wnd->_tabGroup->selected_child(wnd->_outputGroup);
   wnd->_outputGroup->begin();
 
-  LineInput *in = new LineInput(wnd->_out->getX() + 2,
-                                wnd->_out->getY() + 1,
+  LineInput *in = new LineInput(wnd->_out->getX(true) + 2,
+                                wnd->_out->getY(true) + 1,
                                 20, wnd->_out->textHeight() + 4);
   wnd->_outputGroup->end();
   in->callback(enter_cb);

src/platform/fltk/display.cxx

@@ -374,12 +374,24 @@ void DisplayWidget::setColor(long color) {
   _ansiWidget->setColor(color);
 }
 
-int DisplayWidget::getX() {
-  return _ansiWidget->getX();
+int DisplayWidget::getX(bool offset) {
+  int result = _ansiWidget->getX();
+  if (offset) {
+    int x, y;
+    _ansiWidget->getScroll(x, y);
+    result -= x;
+  }
+  return result;
 }
 
-int DisplayWidget::getY() {
-  return _ansiWidget->getY();
+int DisplayWidget::getY(bool offset) {
+  int result = _ansiWidget->getY();
+  if (offset) {
+    int x, y;
+    _ansiWidget->getScroll(x, y);
+    result -= y;
+  }
+  return result;
 }
 
 void DisplayWidget::setPixel(int x, int y, int c) {

src/platform/fltk/display.h

@@ -56,8 +56,8 @@ class DisplayWidget : public fltk::Widget, IButtonListener {
   void saveImage(const char *fn, int x, int y, int w, int h);
   void setTextColor(long fg, long bg);
   void setColor(long color);
-  int  getX();
-  int  getY();
+  int  getX(bool offset=false);
+  int  getY(bool offset=false);
   void setPixel(int x, int y, int c);
   void setXY(int x, int y);
   void setStartSize(int w, int h) { _startW=w; _startH=h; }