diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-03-11 22:01:55 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-03-11 22:01:55 +0000 |
| commit | 823a6cc2adebca1146fac784d6b9844263bd477b (patch) | |
| tree | 3e9f7269f347cdb55c0bf03b55fc22fa8e25e930 /src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx | |
| parent | f11fe83e5ece71bf85d10079bafa10763cb674d2 (diff) | |
Android "Hello" compiles and runs!
http://matthiasm.com/andoidFLTK.jpg
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11351 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx')
| -rw-r--r-- | src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx index 34001a695..6e06c85ab 100644 --- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx +++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx @@ -20,6 +20,15 @@ #include "../../config_lib.h" #include "Fl_PicoAndroid_Window_Driver.H" +#include "Fl_PicoAndroid_Screen_Driver.H" + +#include <jni.h> +#include <errno.h> + +#include <android/sensor.h> +#include <android/log.h> +#include <android_native_app_glue.h> + #include <FL/x.H> #include <FL/Fl.H> #include <FL/Fl_Window.H> @@ -45,6 +54,8 @@ Fl_PicoAndroid_Window_Driver::~Fl_PicoAndroid_Window_Driver() Fl_X *Fl_PicoAndroid_Window_Driver::makeWindow() { + Fl_PicoAndroid_Screen_Driver *scr = (Fl_PicoAndroid_Screen_Driver*)Fl::screen_driver(); + Fl_Group::current(0); if (pWindow->parent() && !Fl_X::i(pWindow->window())) { pWindow->set_visible(); @@ -65,6 +76,7 @@ Fl_X *Fl_PicoAndroid_Window_Driver::makeWindow() } else { // pNativeWindow = SDL_CreateWindow(pWindow->label(), pWindow->x(), pWindow->y(), pWindow->w(), pWindow->h(), 0); } + pNativeWindow = scr->pApp->window; // x->xid = SDL_CreateRenderer(pNativeWindow, -1, SDL_RENDERER_ACCELERATED); x->next = Fl_X::first; x->wait_for_expose = 0; @@ -81,12 +93,18 @@ Fl_X *Fl_PicoAndroid_Window_Driver::makeWindow() return x; } +#include <FL/fl_draw.h> void Fl_PicoAndroid_Window_Driver::flush() { -// SDL_RenderClear((SDL_Renderer*)fl_window); + Fl_PicoAndroid_Screen_Driver *scr = (Fl_PicoAndroid_Screen_Driver*)Fl::screen_driver(); +// LOGI("Flush..."); + glClearColor(0, 0, 0, 1); + glClear(GL_COLOR_BUFFER_BIT); pWindow->flush(); -// SDL_RenderPresent((SDL_Renderer*)fl_window); +// fl_color(FL_RED); +// fl_rectf(10, 10, 300, 400); + scr->drawFrame(); } |