From 448cf7785524ac23edcee46f52e1b1bf4266a39c Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Thu, 21 Jun 2018 17:24:21 +0000
Subject: Android: on-screen keyboard no longer pops up on text output widgets

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12959 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Input.cxx        | 4 ++--
 src/Fl_Text_Display.cxx | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx
index f466e65d1..832c3bfd3 100644
--- a/src/Fl_Input.cxx
+++ b/src/Fl_Input.cxx
@@ -464,10 +464,8 @@ int Fl_Input::handle(int event) {
 	this->mark( this->position() );
 	Fl::reset_marked_text();
       }
-      Fl::screen_driver()->release_keyboard();
       break;
     case FL_FOCUS:
-      Fl::screen_driver()->request_keyboard();
       switch (Fl::event_key()) {
         case FL_Right:
           position(0);
@@ -686,12 +684,14 @@ Fl_Multiline_Input::Fl_Multiline_Input(int X,int Y,int W,int H,const char *l)
 Fl_Output::Fl_Output(int X,int Y,int W,int H, const char *l)
 : Fl_Input(X, Y, W, H, l) {
   type(FL_NORMAL_OUTPUT);
+  clear_flag(NEEDS_KEYBOARD);
 }
 
 
 Fl_Multiline_Output::Fl_Multiline_Output(int X,int Y,int W,int H,const char *l)
 : Fl_Output(X,Y,W,H,l) {
   type(FL_MULTILINE_OUTPUT);
+  clear_flag(NEEDS_KEYBOARD);
 }
 
 
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx
index 0d89237b6..0091e892e 100644
--- a/src/Fl_Text_Display.cxx
+++ b/src/Fl_Text_Display.cxx
@@ -179,6 +179,7 @@ Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l)
   color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
   box(FL_DOWN_FRAME);
   set_flag(SHORTCUT_LABEL);
+  clear_flag(NEEDS_KEYBOARD);
 
   end();
 }
-- 
cgit v1.2.3