WebSVN – tpanel – Diff – /trunk/src/tbutton.cpp

 /*
- * Copyright (C) 2020 to 2024 by Andreas Theofilu <andreas@theosys.at>
+ * Copyright (C) 2020 to 2025 by Andreas Theofilu <andreas@theosys.at>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
 #include <memory>
 #include <algorithm>
 #include <codecvt>
 #include <fstream>
+#include <unistd.h>
 #include <include/core/SkPixmap.h>
 #include <include/core/SkSize.h>
 #include <include/core/SkColor.h>
 #include <include/core/SkFont.h>
 #include <include/core/SkTypeface.h>
 #include "tsystemsound.h"
 #include "timgcache.h"
 #include "turl.h"
 #include "tlock.h"
 #include "ttpinit.h"
+#include "tlauncher.h"
 #if TESTMODE == 1
 #include "testmode.h"
 #endif
 #if __cplusplus < 201402L
         MSG_ERROR("Invalid NULL parameter passed!");
         TError::setError();
         return TExpat::npos;
+    }
+    vector<string> guestures = { "ga", "gu", "gd", "gr", "gl", "gt", "tu", "td", "tr", "tl" };
     mChanged = true;
     int lastLevel = 0;
     int lastJoyX = 0;
     int lastJoyY = 0;
     vector<ATTRIBUTE_t> attrs = xml->getAttributes(index);
     string ename, content;
     size_t oldIndex = index;
     while((index = xml->getNextElementFromIndex(index, &ename, &content, &attrs)) != TExpat::npos)
+    {
+        MSG_DEBUG("Element: " << ename << " at index " << index);
-        if (ename.compare("bi") == 0)
+        if (ename.compare("bi") == 0)               // Button index
+        {
             bi = xml->convertElementToInt(content);
             MSG_DEBUG("Processing button index: " << bi);
+        }
         else if (ename.compare("na") == 0)          // Name
             PUSH_FUNC_T pf;
             pf.pfName = content;
             pf.pfType = xml->getAttribute("type", attrs);
             pushFunc.push_back(pf);
+        }
-        else if (ename.compare("er") == 0)          // Function call TP5
+        else if ((ename.compare("ep") == 0 || ename.compare("er") == 0) && xml->isElementTypeStart(index))          // Function call TP5: Event on press/release
+        {
             PUSH_FUNC_T pf;
+            pf.event = ename.compare("ep") == 0 ? EVENT_PRESS : EVENT_RELEASE;
             string e;
             while ((index = xml->getNextElementFromIndex(index, &e, &content, &attrs)) != TExpat::npos)
+            {
                 if (e.compare("pgFlip") == 0)
+                {
+                    pf.action = BT_ACTION_PGFLIP;
                     pf.item = xml->getAttributeInt("item", attrs);
                     pf.pfType = xml->getAttribute("type", attrs);
                     pf.pfName = content;
                     pushFunc.push_back(pf);
+                }
+                else if (e.compare("launch") == 0)
+                {
+                    pf.action = BT_ACTION_LAUNCH;
+                    pf.item = xml->getAttributeInt("item", attrs);
+                    pf.ID = xml->getAttributeInt("id", attrs);
+                    pf.pfAction = xml->getAttribute("action", attrs);
+                    pf.pfName = content;
+                    pushFunc.push_back(pf);
+                }
+                oldIndex = index;
+            }
+            index = oldIndex + 1;
+        }
-        else if (ename.compare("ep") == 0)          // TP5: Call an application
+        else if (isButtonEvent(ename, guestures) && xml->isElementTypeStart(index))     // Fuction call TP5: Event on guesture
+        {
-            CALL_APP_t ep;
+            PUSH_FUNC pf;
+            pf.event = getButtonEvent(ename);
             string e;
             while ((index = xml->getNextElementFromIndex(index, &e, &content, &attrs)) != TExpat::npos)
+            {
-                if (e.compare("launch") == 0)
+                if (e.compare("pgFlip") == 0)
+                {
-                    ep.item = xml->getAttributeInt("item", attrs);
+                    pf.action = BT_ACTION_PGFLIP;
-                    ep.action = xml->getAttribute("action", attrs);
+                    pf.item = xml->getAttributeInt("item", attrs);
-                    ep.id = xml->getAttributeInt("id", attrs);
+                    pf.pfType = xml->getAttribute("type", attrs);
-                    ep.name = content;
+                    pf.pfName = content;
-                    callApp.push_back(ep);
+                    pushFunc.push_back(pf);
+                }
+                else if (e.compare("launch") == 0)
+                {
+                    pf.action = BT_ACTION_LAUNCH;
+                    pf.item = xml->getAttributeInt("item", attrs);
+                    pf.ID = xml->getAttributeInt("id", attrs);
+                    pf.pfAction = xml->getAttribute("action", attrs);
+                    pf.pfName = content;
+                    pushFunc.push_back(pf);
+                }
+                oldIndex = index;
+            }
+            index = oldIndex + 1;
+        }
         else if (ename.compare("sr") == 0)          // Section state resources
+        {
             SR_T bsr;
             bsr.number = xml->getAttributeInt("number", attrs); // State number
+            MSG_DEBUG("Button: " << na << ": State element: " << bsr.number);
             string e;
             while ((index = xml->getNextElementFromIndex(index, &e, &content, &attrs)) != TExpat::npos)
+            {
                 if (e.compare("do") == 0)           // Draw order
+                }
                 else if (e.compare("bitmapEntry") == 0) // G5 start of bitmap table
+                {
                     string fname;
                     BITMAPS_t bitmapEntry;
+                    MSG_DEBUG("Section: " << e);
                     while ((index = xml->getNextElementFromIndex(index, &fname, &content, &attrs)) != TExpat::npos)
+                    {
                         if (fname.compare("fileName") == 0)
                             bitmapEntry.fileName = content;
                             bitmapEntry.justification = static_cast<ORIENTATION>(xml->convertElementToInt(content));
                         else if (fname.compare("offsetX") == 0)
                             bitmapEntry.offsetX = xml->convertElementToInt(content);
                         else if (fname.compare("offsetY") == 0)
                             bitmapEntry.offsetY = xml->convertElementToInt(content);
+                        oldIndex = index;
+                    }
                     bsr.bitmaps.push_back(bitmapEntry);
+                    if (index == TExpat::npos)
+                        index = oldIndex + 1;
+                }
                 else if (e.compare("sd") == 0)      // Sound file
                     bsr.sd = content;
                 else if (e.compare("sb") == 0)      // index external graphic
                     bsr.sb = xml->convertElementToInt(content);
                 oldIndex = index;
+            }
             sr.push_back(bsr);
+            if (index == TExpat::npos)
+                index = oldIndex + 1;
+        }
         if (index == TExpat::npos)
             index = oldIndex + 1;
+        else if (index > oldIndex)
+            oldIndex = index;
+    }
+    MSG_DEBUG("Index after loop: " << (index == TExpat::npos ? 0 : index) << ", old index: " << oldIndex);
     visible = !hd;  // set the initial visibility
     if (gPageManager)
+    {
         TButtonStates *pbs = gPageManager->addButtonState(type, ap, ad, ch, cp, lp, lv);
+    }
 */
     MSG_DEBUG("Added button " << bi << " --> " << na);
     if (index == TExpat::npos)
-        return oldIndex + 1;
+        index = oldIndex + 1;
+    MSG_DEBUG("Returning index " << index);
     return index;
+}
 bool TButton::createSoftButton(const EXTBUTTON_t& bt)
+{
         int number = srIter->number;
         if (srIter->sb > 0)
             continue;
-        bool bmExistMi = false;
-        bool bmExistBm = false;
-        bool reload = false;
-        if (!srIter->mi.empty())
+        if (!TTPInit::isTP5())
+        {
+            bool bmExistMi = false;
-            if ((bmExistMi = TImgCache::existBitmap(srIter->mi, _BMTYPE_CHAMELEON)) == false)
+            bool bmExistBm = false;
+            bool reload = false;
+            if (!srIter->mi.empty())
+            {
+                if ((bmExistMi = TImgCache::existBitmap(srIter->mi, _BMTYPE_CHAMELEON)) == false)
+                {
-                mChanged = true;
+                    mChanged = true;
-                reload = true;
+                    reload = true;
+                }
+            }
-        }
-        if (!srIter->bm.empty())
+            if (!srIter->bm.empty())
-        {
-            if ((bmExistBm = TImgCache::existBitmap(srIter->bm, _BMTYPE_BITMAP)) == false)
+            {
+                if ((bmExistBm = TImgCache::existBitmap(srIter->bm, _BMTYPE_BITMAP)) == false)
+                {
-                mChanged = true;
+                    mChanged = true;
-                reload = true;
+                    reload = true;
+                }
+            }
-        }
-        if (!force)
+            if (!force)
-        {
+            {
-            if (!reload)   // If the image already exist, do not load it again.
+                if (!reload)   // If the image already exist, do not load it again.
-                continue;
+                    continue;
-        }
+            }
-        if (!bmExistMi && !srIter->mi.empty())        // Do we have a chameleon image?
+            if (!bmExistMi && !srIter->mi.empty())        // Do we have a chameleon image?
-        {
+            {
-            sk_sp<SkData> image;
+                sk_sp<SkData> image;
-            SkBitmap bm;
+                SkBitmap bm;
-            if (!(image = readImage(srIter->mi)))
+                if (!(image = readImage(srIter->mi)))
-                return false;
+                    return false;
-            DecodeDataToBitmap(image, &bm);
+                DecodeDataToBitmap(image, &bm);
-            if (bm.empty())
+                if (bm.empty())
-            {
+                {
-                MSG_WARNING("Could not create a picture for element " << number << " on button " << bi << " (" << na << ")");
+                    MSG_WARNING("Could not create a picture for element " << number << " on button " << bi << " (" << na << ")");
-                return false;
+                    return false;
+                }
+                TImgCache::addImage(srIter->mi, bm, _BMTYPE_CHAMELEON);
+                srIter->mi_width = bm.info().width();
+                srIter->mi_height = bm.info().height();
+                mChanged = true;
+            }
-            TImgCache::addImage(srIter->mi, bm, _BMTYPE_CHAMELEON);
+            if (!bmExistBm && !srIter->bm.empty())        // Do we have a bitmap?
-            srIter->mi_width = bm.info().width();
+            {
-            srIter->mi_height = bm.info().height();
+                sk_sp<SkData> image;
-            mChanged = true;
+                SkBitmap bm;
-        }
-        if (!bmExistBm && !srIter->bm.empty())        // Do we have a bitmap?
+                if (!(image = readImage(srIter->bm)))
-        {
-            sk_sp<SkData> image;
+                    return false;
-            SkBitmap bm;
-            if (!(image = readImage(srIter->bm)))
+                DecodeDataToBitmap(image, &bm);
-                return false;
-            DecodeDataToBitmap(image, &bm);
+                if (bm.empty())
+                {
+                    MSG_WARNING("Could not create a picture for element " << number << " on button " << bi << " (" << na << ")");
+                    return false;
+                }
-            if (bm.empty())
+                TImgCache::addImage(srIter->bm, bm, _BMTYPE_BITMAP);
-            {
+                srIter->bm_width = bm.info().width();
-                MSG_WARNING("Could not create a picture for element " << number << " on button " << bi << " (" << na << ")");
+                srIter->bm_height = bm.info().height();
-                return false;
+                mChanged = true;
+            }
+        }
+        else
+        {
+            if (srIter->bitmaps.size() > 0)
+            {
+                vector<BITMAPS_t>::iterator bmIter;
+                sk_sp<SkData> image;
+                SkBitmap bm;
+                for (bmIter = srIter->bitmaps.begin(); bmIter != srIter->bitmaps.end(); ++bmIter)
+                {
+                    if (force || !TImgCache::existBitmap(bmIter->fileName, _BMTYPE_BITMAP))
+                    {
+                        if (!(image = readImage(bmIter->fileName)))
+                        {
+                            MSG_WARNING("Error reading image " << bmIter->fileName << "!");
+                            continue;
+                        }
+                        DecodeDataToBitmap(image, &bm);
+                        if (bm.empty())
+                        {
+                            MSG_WARNING("Could not create a picture for element " << number << " on button " << bi << " (" << na << ")");
+                            continue;
+                        }
-            TImgCache::addImage(srIter->bm, bm, _BMTYPE_BITMAP);
+                        TImgCache::addImage(bmIter->fileName, bm, _BMTYPE_BITMAP);
-            srIter->bm_width = bm.info().width();
+                        bmIter->width = bm.info().width();
-            srIter->bm_height = bm.info().height();
+                        bmIter->height = bm.info().height();
-            mChanged = true;
+                        mChanged = true;
+                    }
+                }
+            }
+        }
+    }
     return true;
+}
     setScreenDone();
 #endif
     return true;
+}
-bool TButton::setBitmap(const string& file, int instance)
+bool TButton::setBitmap(const string& file, int instance, int index, int justify, int x, int y)
+{
-    DECL_TRACER("TButton::setBitmap(const string& file, int instance)");
+    DECL_TRACER("TButton::setBitmap(const string& file, int instance, int index, int justify, int x, int y)");
     if (instance >= (int)sr.size())
+    {
         MSG_ERROR("Invalid parameters!");
         return false;
+    {
         loop = (int)sr.size();
         inst = 0;
+    }
-    for (int i = 0; i < loop; ++i)
+    if (!TTPInit::isTP5())
+    {
-        if (sr[inst].bm == file)
+        for (int i = 0; i < loop; ++i)
+        {
+            if (!TTPInit::isTP5())
+            {
+                if (sr[inst].bm == file)
+                {
+                    inst++;
+                    continue;
+                }
+            }
+            mChanged = true;
+            sr[inst].bm = file;
+            if (!file.empty() && !TImgCache::existBitmap(file, _BMTYPE_BITMAP))
+            {
+                sk_sp<SkData> image;
+                SkBitmap bm;
+                image = readImage(file);
+                if (image)
+                {
+                    DecodeDataToBitmap(image, &bm);
+                    if (!bm.empty())
+                    {
+                        TImgCache::addImage(file, bm, _BMTYPE_BITMAP);
+                        sr[inst].bm_width = bm.info().width();
+                        sr[inst].bm_height = bm.info().height();
+                    }
+                }
+            }
             inst++;
-            continue;
+        }
+    }
+    else    // TP5
+    {
+        ORIENTATION just = ORI_CENTER_MIDDLE;
+        if (justify < 0 || justify > 11)
-        mChanged = true;
+            just = ORI_CENTER_MIDDLE;
-        sr[inst].bm = file;
+        else
+            just = static_cast<ORIENTATION>(justify);
-        if (!file.empty() && !TImgCache::existBitmap(file, _BMTYPE_BITMAP))
+        // Index 0 = Chameleon image
+        if (index == 0)
+        {
-            sk_sp<SkData> image;
             SkBitmap bm;
+            if (!file.empty() && !TImgCache::existBitmap(file, _BMTYPE_CHAMELEON))
+            {
-            image = readImage(file);
+                sk_sp<SkData> image;
+                image = readImage(file);
-            if (image)
+                if (image)
+                {
+                    DecodeDataToBitmap(image, &bm);
+                    if (!bm.empty())
+                        TImgCache::addImage(file, bm, _BMTYPE_BITMAP);
+                }
+            }
+            if (instance < 0)   // Set to all instances?
+            {
+                for (size_t i = 0; i < sr.size(); ++i)
+                {
+                    if (sr[i].mi != file)
+                    {
-                DecodeDataToBitmap(image, &bm);
+                        sr[i].mi = file;
-                if (!bm.empty())
+                        if (!bm.empty())
+                        {
+                            sr[i].mi_width = bm.info().width();
+                            sr[i].mi_height = bm.info().height();
+                        }
+                        mChanged = true;
+                    }
+                }
+            }
+            else
+            {
+                if (sr[inst].mi != file)
+                {
-                    TImgCache::addImage(sr[inst].bm, bm, _BMTYPE_BITMAP);
+                    sr[inst].mi = file;
+                    if (!bm.empty())
+                    {
-                    sr[inst].bm_width = bm.info().width();
+                        sr[inst].mi_width = bm.info().width();
-                    sr[inst].bm_height = bm.info().height();
+                        sr[inst].mi_height = bm.info().height();
+                    }
+                    mChanged = true;
+                }
+            }
+        }
+        else if (instance > 0)
+        {
+            if (!file.empty() && !TImgCache::existBitmap(file, _BMTYPE_BITMAP))
+            {
+                sk_sp<SkData> image;
+                SkBitmap bm;
+                image = readImage(file);
+                if (image)
+                {
+                    DecodeDataToBitmap(image, &bm);
+                    if (!bm.empty())
+                    {
+                        TImgCache::addImage(file, bm, _BMTYPE_BITMAP);
+                        sr[inst].bm_width = bm.info().width();
+                        sr[inst].bm_height = bm.info().height();
+                    }
+                }
+            }
+            for (size_t i = 0; i < 5; ++i)
+            {
+                if (i >= sr[inst].bitmaps.size() && !file.empty())
+                {
+                    BITMAPS_t bm;
+                    if (i == (static_cast<size_t>(index - 1)))
+                    {
+                        bm.fileName = file;
+                        bm.justification = just;
+                        bm.offsetX = x;
+                        bm.offsetY = y;
+                        mChanged = true;
+                    }
+                    sr[inst].bitmaps.push_back(bm);
+                }
+                else if (i == static_cast<size_t>(index - 1))
+                {
+                    BITMAPS_t bm = sr[inst].bitmaps[i];
+                    if (bm.fileName != file)
+                    {
+                        bm.fileName = file;
+                        bm.justification = just;
+                        bm.offsetX = x;
+                        bm.offsetY = y;
+                        sr[inst].bitmaps[i] = bm;
+                        mChanged = true;
+                    }
+                }
-        inst++;
+            }
+        }
+    }
     if (!createButtons(true))   // We're forcing the image to load
         return false;
     if (inst < 0)
         instance = 0;
     else if ((size_t)inst >= sr.size())
         instance = (int)(sr.size() - 1);
+    bool tp5 = TTPInit::isTP5();   // TRUE = TP5
+    string bmFile;
     /*
      * Here we test if we have a cameleon image. If there is a mask (sr[].mi)
      * and no frame (sr[].bs) then we have a cameleon image. A bitmap is
      * optional. If there is one it will be used to draw with the mask.
      * Otherwise the mask may be used as an overlay for a bitmap on another
      * button below the mask.
      */
-    if (!sr[instance].mi.empty() && sr[instance].bs.empty())       // Chameleon image?
+    if ((!tp5 && !sr[instance].mi.empty() && sr[instance].bs.empty()) || (tp5 && !sr[instance].mi.empty()))       // Chameleon image?
+    {
+        if (tp5)
+        {
+            if (sr[instance].bitmaps.size() > 0)
-        MSG_DEBUG("Chameleon image consisting of mask " << sr[instance].mi << " and bitmap " << (sr[instance].bm.empty() ? "NONE" : sr[instance].bm) << " ...");
+                bmFile = sr[instance].bitmaps[0].fileName;
+        }
+        else
+            bmFile = sr[instance].bm;
+        MSG_DEBUG("Chameleon image consisting of mask " << sr[instance].mi << " and bitmap " << (bmFile.empty() ? "NONE" : bmFile) << " ...");
         SkBitmap bmMi;
         SkBitmap bmBm;
         if (!TImgCache::getBitmap(sr[instance].mi, &bmMi, _BMTYPE_CHAMELEON, &sr[instance].mi_width, &sr[instance].mi_height))
+        {
         MSG_DEBUG("Chameleon image size: " << bmMi.info().width() << " x " << bmMi.info().height());
         SkBitmap imgRed(bmMi);
         SkBitmap imgMask;
         bool haveBothImages = true;
+        // On TP5:
+        // If we have a chameleon image the base is in field "mi", as it was it TP4 already,
+        // and the first image in the list of images is the mask. This means that we must
+        // first create the chameleon image out of this images the same as we did for TP4.
+        // The other images, if there any, will be put on top of the chameleon image.
-        if (!sr[instance].bm.empty() || (TTPInit::getTP5() && !sr[instance].bitmaps.empty()))
+        if (!bmFile.empty())
+        {
-            if (TTPInit::getTP5())
+            if (!TImgCache::getBitmap(bmFile, &bmBm, _BMTYPE_BITMAP, &sr[instance].bm_width, &sr[instance].bm_height))
+            {
-                if (!buttonBitmap5(&bmBm, instance))
+                sk_sp<SkData> data = readImage(bmFile);
-                    haveBothImages = false;
+                bool loaded = false;
-                else
+                if (data)
+                {
-                    sr[instance].bm_width = bm->info().width();
+                    DecodeDataToBitmap(data, &bmBm);
-                    sr[instance].bm_height = bm->info().height();
-                    if (!imgMask.installPixels(bmBm.pixmap()))
+                    if (!bmBm.empty())
+                    {
-                        MSG_ERROR("Error installing pixmap " << sr[instance].bm << " for chameleon image!");
-                        if (!allocPixels(imgRed.info().width(), imgRed.info().height(), &imgMask))
+                        TImgCache::addImage(bmFile, bmBm, _BMTYPE_BITMAP);
-                            return false;
+                        loaded = true;
-                        imgMask.eraseColor(SK_ColorTRANSPARENT);
+                        sr[instance].bm_width = bmBm.info().width();
-                        haveBothImages = false;
+                        sr[instance].bm_height = bmBm.info().height();
+                    }
+                }
+                if (!loaded)
+                {
+                    MSG_ERROR("Missing image " << bmFile << "!");
+                    TError::setError();
+                    return false;
+                }
+            }
+/*
+            if (!buttonBitmap5(&bmBm, instance))
+                haveBothImages = false;
             else
+            {
-                if (!TImgCache::getBitmap(sr[instance].bm, &bmBm, _BMTYPE_BITMAP, &sr[instance].bm_width, &sr[instance].bm_height))
-                {
-                    sk_sp<SkData> data = readImage(sr[instance].bm);
+                sr[instance].bm_width = bm->info().width();
-                    bool loaded = false;
-                    if (data)
-                    {
-                        DecodeDataToBitmap(data, &bmBm);
+                sr[instance].bm_height = bm->info().height();
-                        if (!bmBm.empty())
-                        {
-                            TImgCache::addImage(sr[instance].bm, bmBm, _BMTYPE_BITMAP);
-                            loaded = true;
-                            sr[instance].bm_width = bmBm.info().width();
-                            sr[instance].bm_height = bmBm.info().height();
-                        }
-                    }
-                    if (!loaded)
-                    {
-                        MSG_ERROR("Missing image " << sr[instance].bm << "!");
-                        TError::setError();
-                        return false;
-                    }
-                }
-                if (!bmBm.empty())
+                if (!imgMask.installPixels(bmBm.pixmap()))
+                {
-                    if (!imgMask.installPixels(bmBm.pixmap()))
-                    {
-                        MSG_ERROR("Error installing pixmap " << sr[instance].bm << " for chameleon image!");
+                    MSG_ERROR("Error installing pixmap " << sr[instance].bm << " for chameleon image!");
-                        if (!allocPixels(imgRed.info().width(), imgRed.info().height(), &imgMask))
+                    if (!allocPixels(imgRed.info().width(), imgRed.info().height(), &imgMask))
-                            return false;
+                        return false;
-                        imgMask.eraseColor(SK_ColorTRANSPARENT);
+                    imgMask.eraseColor(SK_ColorTRANSPARENT);
-                        haveBothImages = false;
+                    haveBothImages = false;
-                    }
+                }
-                else
+            }
+*/
+            if (!bmBm.empty())
+            {
+                if (!imgMask.installPixels(bmBm.pixmap()))
+                {
-                    MSG_WARNING("No or invalid bitmap! Ignoring bitmap for cameleon image.");
+                    MSG_ERROR("Error installing pixmap " << bmFile << " for chameleon image!");
                     if (!allocPixels(imgRed.info().width(), imgRed.info().height(), &imgMask))
                         return false;
                     imgMask.eraseColor(SK_ColorTRANSPARENT);
                     haveBothImages = false;
+                }
+            }
+            else
+            {
+                MSG_WARNING("No or invalid bitmap! Ignoring bitmap for cameleon image.");
+                if (!allocPixels(imgRed.info().width(), imgRed.info().height(), &imgMask))
+                    return false;
+                imgMask.eraseColor(SK_ColorTRANSPARENT);
+                haveBothImages = false;
+            }
+        }
         else
             haveBothImages = false;
         MSG_DEBUG("Bitmap image size: " << bmBm.info().width() << " x " << bmBm.info().height());
         MSG_DEBUG("Bitmap mask size: " << imgMask.info().width() << " x " << imgMask.info().height());
         SkBitmap img = drawImageButton(imgRed, imgMask, sr[instance].mi_width, sr[instance].mi_height, TColor::getSkiaColor(sr[instance].cf), TColor::getSkiaColor(sr[instance].cb));
         if (img.empty())
+        {
-            MSG_ERROR("Error creating the cameleon image \"" << sr[instance].mi << "\" / \"" << sr[instance].bm << "\"!");
+            MSG_ERROR("Error creating the cameleon image \"" << sr[instance].mi << "\" / \"" << bmFile << "\"!");
             TError::setError();
             return false;
+        }
         MSG_DEBUG("Have both images: " << (haveBothImages ? "YES" : "NO"));
             if (!haveBothImages)
+            {
                 sk_sp<SkImage> _image = SkImages::RasterFromBitmap(img);
                 can.drawImage(_image, 0, 0, SkSamplingOptions(), &paint);
-                if (!sr[instance].bm.empty())
+                if (!bmFile.empty())
+                {
                     imgMask.installPixels(bmBm.pixmap());
                     paint.setBlendMode(SkBlendMode::kSrcOver);
                     _image = SkImages::RasterFromBitmap(imgMask);
                     can.drawImage(_image, position.left, position.top, SkSamplingOptions(), &paint);
+            }
             else
+            {
                 sk_sp<SkImage> _image = SkImages::RasterFromBitmap(img);
                 can.drawImage(_image, position.left, position.top, SkSamplingOptions(), &paint);
+                // On TP5 we must draw the other images, if there are any, on top of the one we have already.
+                if (!buttonBitmap5(bm, instance, true))
+                {
+                    MSG_WARNING("Couldn't draw all bitmaps!");
+                }
+            }
+        }
         else    // Scale to fit
+        {
             if (!haveBothImages)
                 SkRect rect;
                 rect.setXYWH(0, 0, imgRed.info().width(), imgRed.info().height());
                 sk_sp<SkImage> im = SkImages::RasterFromBitmap(img);
                 can.drawImageRect(im, rect, SkSamplingOptions(), &paint);
-                if (!sr[instance].bm.empty())
+                if (!bmFile.empty())
+                {
                     imgMask.installPixels(bmBm.pixmap());
                     rect.setXYWH(position.left, position.top, position.width, position.height);
                     im = SkImages::RasterFromBitmap(imgMask);
                     paint.setBlendMode(SkBlendMode::kSrcOver);
             else
+            {
                 SkRect rect = SkRect::MakeXYWH(position.left, position.top, position.width, position.height);
                 sk_sp<SkImage> im = SkImages::RasterFromBitmap(img);
                 can.drawImageRect(im, rect, SkSamplingOptions(), &paint);
+                // On TP5 we must draw the other images, if there are any, on top of the one we have already.
+                if (!buttonBitmap5(bm, instance, true))
+                {
+                    MSG_WARNING("Couldn't draw all bitmaps!");
+                }
+            }
+        }
+    }
-    else if (!sr[instance].bm.empty())
+    else if (!tp5 && !sr[instance].bm.empty())
+    {
         MSG_TRACE("Drawing normal image " << sr[instance].bm << " ...");
         SkBitmap image;
             SkRect rect = SkRect::MakeXYWH(position.left, position.top, isize.width, isize.height);
             sk_sp<SkImage> im = SkImages::RasterFromBitmap(image);
             can.drawImageRect(im, rect, SkSamplingOptions(), &paint);
+        }
+    }
+    else if (tp5 && sr[instance].bitmaps.size() > 0)    // TP5: Put all images together
+    {
+        MSG_TRACE("Draw TP5 image stack.");
+        vector<BITMAPS_t>::iterator bmIter;
+        for (bmIter = sr[instance].bitmaps.begin(); bmIter != sr[instance].bitmaps.end(); ++bmIter)
+        {
+            SkBitmap image;
+            if (!TImgCache::getBitmap(bmIter->fileName, &image, _BMTYPE_BITMAP, &bmIter->width, &bmIter->height))
+            {
+                sk_sp<SkData> data = readImage(sr[instance].bm);
+                bool loaded = false;
+                if (data)
+                {
+                    DecodeDataToBitmap(data, &image);
+                    if (!image.empty())
+                    {
+                        TImgCache::addImage(bmIter->fileName, image, _BMTYPE_BITMAP);
+                        loaded = true;
+                        bmIter->width = image.info().width();
+                        bmIter->height = image.info().height();
+                    }
+                }
+                if (!loaded)
+                {
+                    MSG_ERROR("Missing image " << bmIter->fileName << "!");
+                    continue;        // We want the button even without an image
+                }
+            }
+            if (image.empty())
+            {
+                MSG_ERROR("Error creating the image \"" << bmIter->fileName << "\"!");
+                continue;
+            }
+            IMAGE_SIZE_t isize = calcImageSize(image.info().width(), image.info().height(), instance, true);
+            POSITION_t position = calcImagePosition((sr[instance].sb ? isize.width : image.info().width()), (sr[instance].sb ? isize.height : image.info().height()), SC_BITMAP, instance);
+            if (!position.valid)
+            {
+                MSG_ERROR("Error calculating the position of the image for button number " << bi);
+                continue;
+            }
+            MSG_DEBUG("Putting bitmap on top of image ...");
+            SkPaint paint;
+            paint.setBlendMode(SkBlendMode::kSrcOver);
+            SkCanvas can(*bm, SkSurfaceProps());
+            if (sr[instance].sb == 0)   // Scale bitmap?
+            {                           // No, keep size
+                if ((bmIter->justification == ORI_ABSOLUT && bmIter->offsetX >= 0 && bmIter->offsetY >= 0) || bmIter->justification != ORI_ABSOLUT)  // Draw the full image
+                {
+                    sk_sp<SkImage> _image = SkImages::RasterFromBitmap(image);
+                    can.drawImage(_image, position.left, position.top, SkSamplingOptions(), &paint);
+                }
+                else    // We need only a subset of the image
+                {
+                    MSG_DEBUG("Create a subset of an image ...");
+                    // Create a new Info to have the size of the subset.
+                    SkImageInfo info = SkImageInfo::Make(position.width, position.height, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+                    size_t byteSize = info.computeMinByteSize();
+                    if (byteSize == 0)
+                    {
+                        MSG_ERROR("Unable to calculate size of image!");
+                        continue;
+                    }
+                    MSG_DEBUG("Rectangle of part: x: " << position.left << ", y: " << position.top << ", w: " << position.width << ", h: " << position.height);
+                    SkBitmap part;      // Bitmap receiving the wanted part from the whole image
+                    SkIRect irect = SkIRect::MakeXYWH(position.left, position.top, position.width, position.height);
+                    image.extractSubset(&part, irect);  // Extract the part of the image containg the pixels we want
+                    sk_sp<SkImage> _image = SkImages::RasterFromBitmap(part);
+                    can.drawImage(_image, 0, 0, SkSamplingOptions(), &paint); // Draw the image
+                }
+            }
+            else    // Scale to fit
+            {
+                SkRect rect = SkRect::MakeXYWH(position.left, position.top, isize.width, isize.height);
+                sk_sp<SkImage> im = SkImages::RasterFromBitmap(image);
+                can.drawImageRect(im, rect, SkSamplingOptions(), &paint);
+            }
+        }
+    }
     else
+    {
         MSG_DEBUG("No bitmap defined.");
+    }
  * The result could be combinated with an chameleon image, if there is one.
+ *
  * @param bm        A pointer to the bitmap where the result shuld be drawn.
  *                  This pointer must not be NULL.
  * @param instances The instance where the bitmaps should be taken from.
+ * @param ignFirst  TRUE = the 1st image in list is ignored.
+ * @return TRUE on success
  */
-bool TButton::buttonBitmap5(SkBitmap* bm, int instance)
+bool TButton::buttonBitmap5(SkBitmap* bm, int instance, bool ignFirst)
+{
-    DECL_TRACER("TButton::buttonBitmap5(SkBitmap* bm, int instance)");
+    DECL_TRACER("TButton::buttonBitmap5(SkBitmap* bm, int instance, bool ignFirst)");
     if (!bm)
+    {
         MSG_WARNING("Method parameter was NULL!");
         return false;
     if (sr[instance].bitmaps.empty())
         return true;
     vector<BITMAPS_t>::iterator iter;
+    bool first = true;
     for (iter = sr[instance].bitmaps.begin(); iter != sr[instance].bitmaps.end(); ++iter)
+    {
+        if (ignFirst && first)
+        {
+            first = false;
+            continue;
+        }
         SkBitmap bmBm;
         int width, height;
         if (!TImgCache::getBitmap(iter->fileName, &bmBm, _BMTYPE_BITMAP, &width, &height))
+        {
                 setScreenDone();
 #endif
                 return false;
+            }
+        }
-        else if (!TTPInit::getTP5() && mDOrder[i] == ORD_ELEM_ICON)
+        else if (!TTPInit::isTP5() && mDOrder[i] == ORD_ELEM_ICON)
+        {
             if (!buttonIcon(&imgButton, instance))
+            {
 #if TESTMODE == 1
                 setScreenDone();
         MSG_DEBUG("Executing a push function ...");
         vector<PUSH_FUNC_T>::iterator iter;
         for (iter = pushFunc.begin(); iter != pushFunc.end(); ++iter)
+        {
-            MSG_DEBUG("Testing for function \"" << iter->pfType << "\"");
             if (fb == FB_MOMENTARY || fb == FB_NONE)
                 mActInstance = 0;
             else if (fb == FB_ALWAYS_ON || fb == FB_INV_CHANNEL)
                 mActInstance = 1;
-            if (strCaseCompare(iter->pfType, "SSHOW") == 0)            // show popup
-            {
-                if (gPageManager)
-                    gPageManager->showSubPage(iter->pfName);
+            if (!TTPInit::isTP5() || iter->action == BT_ACTION_PGFLIP)
-            }
-            else if (strCaseCompare(iter->pfType, "SHIDE") == 0)       // hide popup
+            {
-                if (gPageManager)
-                    gPageManager->hideSubPage(iter->pfName);
-            }
-            else if (strCaseCompare(iter->pfType, "SCGROUP") == 0)     // hide group
-            {
-                if (gPageManager)
-                    gPageManager->closeGroup(iter->pfName);
+                MSG_DEBUG("Testing for function \"" << iter->pfType << "\"");
-            }
-            else if (strCaseCompare(iter->pfType, "SCPAGE") == 0)      // flip to page
+                if (strCaseCompare(iter->pfType, "SSHOW") == 0)            // show popup
-            {
-                if (gPageManager && !iter->pfName.empty())
-                    gPageManager->setPage(iter->pfName);
-            }
-            else if (strCaseCompare(iter->pfType, "STAN") == 0)        // Flip to standard page
-            {
-                if (gPageManager)
+                {
+                    if (gPageManager)
+                        gPageManager->showSubPage(iter->pfName);
+                }
+                else if (strCaseCompare(iter->pfType, "SHIDE") == 0)       // hide popup
+                {
+                    if (gPageManager)
+                        gPageManager->hideSubPage(iter->pfName);
+                }
+                else if (strCaseCompare(iter->pfType, "SCGROUP") == 0)     // hide group
+                {
+                    if (gPageManager)
+                        gPageManager->closeGroup(iter->pfName);
+                }
+                else if (strCaseCompare(iter->pfType, "SCPAGE") == 0)      // flip to page
+                {
-                    if (!iter->pfName.empty())
+                    if (gPageManager && !iter->pfName.empty())
                         gPageManager->setPage(iter->pfName);
+                }
+                else if (strCaseCompare(iter->pfType, "STAN") == 0)        // Flip to standard page
-                    else
+                {
+                    if (gPageManager)
+                    {
+                        if (!iter->pfName.empty())
-                        TPage *page = gPageManager->getActualPage();
+                            gPageManager->setPage(iter->pfName);
-                        if (!page)
+                        else
+                        {
+                            TPage *page = gPageManager->getActualPage();
+                            if (!page)
+                            {
-                            MSG_DEBUG("Internal error: No actual page found!");
+                                MSG_DEBUG("Internal error: No actual page found!");
-                            return false;
+                                return false;
-                        }
+                            }
-                        TSettings *settings = gPageManager->getSettings();
+                            TSettings *settings = gPageManager->getSettings();
-                        if (settings && settings->getPowerUpPage().compare(page->getName()) != 0)
+                            if (settings && settings->getPowerUpPage().compare(page->getName()) != 0)
-                            gPageManager->setPage(settings->getPowerUpPage());
+                                gPageManager->setPage(settings->getPowerUpPage());
+                        }
+                    }
+                }
-            }
-            else if (strCaseCompare(iter->pfType, "FORGET") == 0)      // Flip to page and forget
+                else if (strCaseCompare(iter->pfType, "FORGET") == 0)      // Flip to page and forget
-            {
-                if (gPageManager && !iter->pfName.empty())
-                        gPageManager->setPage(iter->pfName, true);
-            }
-            else if (strCaseCompare(iter->pfType, "PREV") == 0)        // Flip to previous page
-            {
-                if (gPageManager)
+                {
-                    int old = gPageManager->getPreviousPageNumber();
+                    if (gPageManager && !iter->pfName.empty())
-                    if (old > 0)
-                        gPageManager->setPage(old);
+                            gPageManager->setPage(iter->pfName, true);
+                }
-            }
-            else if (strCaseCompare(iter->pfType, "STOGGLE") == 0)     // Toggle popup state
+                else if (strCaseCompare(iter->pfType, "PREV") == 0)        // Flip to previous page
-            {
-                if (!iter->pfName.empty() && gPageManager)
+                {
+                    if (gPageManager)
+                    {
-                    TSubPage *page = gPageManager->getSubPage(iter->pfName);
+                        int old = gPageManager->getPreviousPageNumber();
-                    if (!page)      // Is the page not in cache?
-                    {               // No, then load it
+                        if (old > 0)
-                        gPageManager->showSubPage(iter->pfName);
+                            gPageManager->setPage(old);
-                        return true;
+                    }
-                    if (page->isVisible())
-                        gPageManager->hideSubPage(iter->pfName);
-                    else
-                        gPageManager->showSubPage(iter->pfName);
+                }
-            }
-            else if (strCaseCompare(iter->pfType, "SCPANEL") == 0)   // Hide all popups
+                else if (strCaseCompare(iter->pfType, "STOGGLE") == 0)     // Toggle popup state
-            {
-                if (gPageManager)
+                {
+                    if (!iter->pfName.empty() && gPageManager)
+                    {
-                    TSubPage *page = gPageManager->getFirstSubPage();
+                        TSubPage *page = gPageManager->getSubPage(iter->pfName);
+                        if (!page)      // Is the page not in cache?
+                        {               // No, then load it
+                            gPageManager->showSubPage(iter->pfName);
+                            return true;
+                        }
+                        if (page->isVisible())
+                            gPageManager->hideSubPage(iter->pfName);
-                    while (page)
+                        else
+                            gPageManager->showSubPage(iter->pfName);
+                    }
+                }
+                else if (strCaseCompare(iter->pfType, "SCPANEL") == 0)   // Hide all popups
+                {
+                    if (gPageManager)
+                    {
+                        TSubPage *page = gPageManager->getFirstSubPage();
+                        while (page)
+                        {
-                        page->drop();
+                            page->drop();
-                        page = gPageManager->getNextSubPage();
+                            page = gPageManager->getNextSubPage();
+                        }
+                    }
+                }
+                else
+                {
+                    MSG_WARNING("Unknown page flip command " << iter->pfType);
+                }
+            }
-            else
+            else if (iter->action == BT_ACTION_LAUNCH)
+            {
+#ifdef __ANDROID__
+                MSG_DEBUG("Launching the external program " << iter->pfName << "...");
+#else
-                MSG_WARNING("Unknown page flip command " << iter->pfType);
+                MSG_DEBUG("Launching the external program " << iter->pfName << "...");
+                TLauncher::launch(iter->pfName);
+#endif  // __ANDROID__
+            }
+        }
+    }
     if (!cm.empty() && co == 0 && pressed)      // Feed command to ourself?
     TButtonStates *s = gPageManager->getButtonState(type, mButtonID);
     MSG_DEBUG("Found button ID: " << getButtonIDstr(s->getID()) << ", type: " << buttonTypeToString(s->getType()) << ", lastLevel: " << s->getLastLevel() << ", lastJoyX: " << s->getLastJoyX() << ", lasJoyY: " << s->getLastJoyY());
     return s;
+}
+bool TButton::isButtonEvent(const string& token, const vector<string>& events)
+{
+    DECL_TRACER("TButton::isButtonEvent(const string& token, const vector<string>& events)");
+    if (events.empty() || token.empty())
+        return false;
+    vector<string>::const_iterator iter;
+    for (iter = events.cbegin(); iter != events.cend(); ++iter)
+    {
+        if (*iter == token)
+            return true;
+    }
+    return false;
+}
+BUTTON_EVENT_t TButton::getButtonEvent(const string& token)
+{
+    DECL_TRACER("TButton::getButtonEvent(const string& token)");
+    if (token == "ga")
+        return EVENT_GUESTURE_ANY;
+    else if (token == "gu")
+        return EVENT_GUESTURE_UP;
+    else if (token == "gd")
+        return EVENT_GUESTURE_DOWN;
+    else if (token == "gr")
+        return EVENT_GUESTURE_RIGHT;
+    else if (token == "gl")
+        return EVENT_GUESTURE_LEFT;
+    else if (token == "gt")
+        return EVENT_GUESTURE_DBLTAP;
+    else if (token == "tu")
+        return EVENT_GUESTURE_2FUP;
+    else if (token == "td")
+        return EVENT_GUESTURE_2FDN;
+    else if (token == "tr")
+        return EVENT_GUESTURE_2FRT;
+    else if (token == "tl")
+        return EVENT_GUESTURE_2FLT;
+    return EVENT_NONE;
+}
 int TButton::getLevelValue()
+{
     DECL_TRACER("TButton::getLevelValue()");
     TButtonStates *buttonStates = getButtonState();

Subversion Repositories tpanel

(root)/trunk/src/tbutton.cpp – Rev 482 → 486