Fix timer

[apps/agl-service-windowmanager-2017.git] / src / window_manager.cpp

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index de322df..5b86af8 100644 (file)
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -19,6 +19,7 @@
 
 #include "window_manager.hpp"
 #include "json_helper.hpp"
+#include "wm_config.hpp"
 #include "applist.hpp"
 
 extern "C"
@@ -29,7 +30,7 @@ extern "C"
 namespace wm
 {
 
-static const unsigned kTimeOut = 3000000UL; /* 3s */
+static const uint64_t kTimeOut = 3ULL; /* 3s */
 
 /* DrawingArea name used by "{layout}.{area}" */
 const char kNameLayoutNormal[] = "normal";
@@ -146,6 +147,7 @@ WindowManager::WindowManager(wl::display *d)
 
 int WindowManager::init()
 {
+    int ret;
     if (!this->display->ok())
     {
         return -1;
@@ -201,7 +203,8 @@ int WindowManager::init()
     // Third level objects
     this->display->roundtrip();
 
-    return init_layers();
+    ret = init_layers();
+    return ret;
 }
 
 int WindowManager::dispatch_pending_events()
@@ -654,12 +657,22 @@ int WindowManager::init_layers()
         return -1;
     }
 
+    WMConfig wm_config;
+    wm_config.loadConfigs();
+
     auto &c = this->controller;
 
     auto &o = this->outputs.front();
     auto &s = c->screens.begin()->second;
     auto &layers = c->layers;
 
+    this->layers.loadAreaDb();
+    const compositor::rect base = this->layers.getAreaSize("fullscreen");
+
+    const std::string aspect_setting = wm_config.getConfigAspect();
+    const compositor::rect scale_rect =
+        this->layers.getScaleDestRect(o->width, o->height, aspect_setting);
+
     // Write output dimensions to ivi controller...
     c->output_size = compositor::size{uint32_t(o->width), uint32_t(o->height)};
     c->physical_size = compositor::size{uint32_t(o->physical_width),
@@ -674,9 +687,11 @@ int WindowManager::init_layers()
     // Quick and dirty setup of layers
     for (auto const &i : this->layers.mapping)
     {
-        c->layer_create(i.second.layer_id, o->width, o->height);
+        c->layer_create(i.second.layer_id, scale_rect.w, scale_rect.h);
         auto &l = layers[i.second.layer_id];
-        l->set_destination_rectangle(0, 0, o->width, o->height);
+        l->set_source_rectangle(0, 0, base.w, base.h);
+        l->set_destination_rectangle(
+            scale_rect.x, scale_rect.y, scale_rect.w, scale_rect.h);
         l->set_visibility(1);
         HMI_DEBUG("wm", "Setting up layer %s (%d) for surface role match \"%s\"",
                   i.second.name.c_str(), i.second.layer_id, i.second.role.c_str());
@@ -687,9 +702,6 @@ int WindowManager::init_layers()
 
     this->layout_commit();
 
-    this->layers.loadAreaDb();
-    this->layers.setupArea(o->width, o->height);
-
     return 0;
 }
 
@@ -1440,12 +1452,18 @@ void WindowManager::emitScreenUpdated(unsigned req_num)
 
 void WindowManager::setTimer()
 {
+    struct timespec ts;
+    if (clock_gettime(CLOCK_BOOTTIME, &ts) != 0) {
+        HMI_ERROR("wm", "Could't set time (clock_gettime() returns with error");
+        return;
+    }
+
     HMI_SEQ_DEBUG(g_app_list.currentRequestNumber(), "Timer set activate");
     if (g_timer_ev_src == nullptr)
     {
         // firsttime set into sd_event
         int ret = sd_event_add_time(afb_daemon_get_event_loop(), &g_timer_ev_src,
-            CLOCK_REALTIME, time(NULL) * (1000000UL) + kTimeOut, 1, processTimerHandler, this);
+            CLOCK_BOOTTIME, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL, 1, processTimerHandler, this);
         if (ret < 0)
         {
             HMI_ERROR("wm", "Could't set timer");
@@ -1454,7 +1472,7 @@ void WindowManager::setTimer()
     else
     {
         // update timer limitation after second time
-        sd_event_source_set_time(g_timer_ev_src, time(NULL) * (1000000UL) + kTimeOut);
+        sd_event_source_set_time(g_timer_ev_src, (uint64_t)(ts.tv_sec + kTimeOut) * 1000000ULL);
         sd_event_source_set_enabled(g_timer_ev_src, SD_EVENT_ONESHOT);
     }
 }