Merge lp:~ricmm/platform-api/set-dimensions into lp:platform-api

[Ricardo Mendoza]

Add function to specify initial window geometry before creation.

[Gerry Boland (gerboland)]

What is APP_DESKTOP_FILE_PATH? I can't find reference to it. It is supposed to be defined as $HOME/.local/share/applications ?

+ std::getline(infile, line);
+ while (std::getline(infile, line))
Why the first getline? Just to skip the [--] line?

Looks fine otherwise

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/platform-api-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/175/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/platform-api-ci/177/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/177/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/platform-api-autolanding/90/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-autolanding/9/console

review: Needs Fixing (continuous-integration)

[lp:~ricmm/platform-api/set-dimensions]

186. By Ricardo Mendoza on 2014-01-07

Fix conflicts

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/platform-api-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/185/rebuild

review: Approve (continuous-integration)

=== modified file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2013-06-18 00:05:11 +0000
+++ android/default/default_ubuntu_application_ui.cpp	2014-01-07 20:37:41 +0000
@@ -228,6 +228,17 @@
     p->value->set_input_event_cb_and_ctx(cb, ctx);
 }
 
+void
+ua_ui_window_properties_set_dimensions(
+    UAUiWindowProperties *properties,
+    uint32_t width,
+    uint32_t height)
+{
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    (void) width;
+    (void) height;
+}
+
 /*
  * Session
  */

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-28 10:51:15 +0000
+++ debian/changelog	2014-01-07 20:37:41 +0000
@@ -1,3 +1,9 @@
+platform-api (0.20-0ubuntu1) trusty; urgency=low
+
+  * Added *_set_dimensions() function to the window properties.
+
+ -- Ricardo Mendoza <[e-mail]>  Tue, 10 Dec 2013 23:24:57 -0500
+
 platform-api (0.19+14.04.20131128.1-0ubuntu1) trusty; urgency=low
 
   [ Kevin Gunn ]

=== modified file 'include/ubuntu/application/ui/window_properties.h'
--- include/ubuntu/application/ui/window_properties.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/ui/window_properties.h	2014-01-07 20:37:41 +0000
@@ -76,6 +76,12 @@
         UAUiWindowProperties *properties,
         UAUiWindowInputEventCb cb,
         void *ctx);
+
+    UBUNTU_DLL_PUBLIC void
+    ua_ui_window_properties_set_dimensions(
+        UAUiWindowProperties *properties,
+        uint32_t width,
+        uint32_t height);
     
 #ifdef __cplusplus
 }

=== modified file 'src/ubuntu/hybris/ubuntu_application_api_hybris.cpp'
--- src/ubuntu/hybris/ubuntu_application_api_hybris.cpp	2013-06-20 12:37:44 +0000
+++ src/ubuntu/hybris/ubuntu_application_api_hybris.cpp	2014-01-07 20:37:41 +0000
@@ -92,6 +92,7 @@
 IMPLEMENT_FUNCTION1(const char*, ua_ui_window_properties_get_title, UAUiWindowProperties*);
 IMPLEMENT_VOID_FUNCTION2(ua_ui_window_properties_set_role, UAUiWindowProperties*, UAUiWindowRole);
 IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_input_cb_and_ctx, UAUiWindowProperties*, UAUiWindowInputEventCb, void*);
+IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_dimensions, UAUiWindowProperties*, uint32_t, uint32_t);
 
 // UAUiWindow
 IMPLEMENT_FUNCTION2(UAUiWindow*, ua_ui_window_new_for_application_with_properties, UApplicationInstance*, UAUiWindowProperties*);

=== modified file 'src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp	2013-10-14 09:47:52 +0000
+++ src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp	2014-01-07 20:37:41 +0000
@@ -232,6 +232,12 @@
     properties->set_input_cb_and_ctx(cb, ctx);
 }
 
+void ua_ui_window_properties_set_dimensions(UAUiWindowProperties *u_properties, uint32_t width, uint32_t height)
+{
+    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
+    properties->set_dimensions(width, height);
+}
+
 UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
 {
     auto instance = uamc::Instance::from_u_application_instance(u_instance);

=== modified file 'src/ubuntu/mirclient/window_properties_mirclient.cpp'
--- src/ubuntu/mirclient/window_properties_mirclient.cpp	2013-11-20 09:39:29 +0000
+++ src/ubuntu/mirclient/window_properties_mirclient.cpp	2014-01-07 20:37:41 +0000
@@ -54,6 +54,12 @@
     input_ctx = ctx;
 }
 
+void uamc::WindowProperties::set_dimensions(uint32_t width, uint32_t height)
+{
+    parameters.width = width;
+    parameters.height = height;
+}
+
 void uamc::WindowProperties::set_role(UAUiWindowRole role)
 {
     if (role == U_ON_SCREEN_KEYBOARD_ROLE) {

=== modified file 'src/ubuntu/mirclient/window_properties_mirclient_priv.h'
--- src/ubuntu/mirclient/window_properties_mirclient_priv.h	2013-08-19 21:02:27 +0000
+++ src/ubuntu/mirclient/window_properties_mirclient_priv.h	2014-01-07 20:37:41 +0000
@@ -47,6 +47,7 @@
     
     void set_title(char const* title, size_t length);
     void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
+    void set_dimensions(uint32_t width, uint32_t height);
     void set_role(UAUiWindowRole role);    
     
     MirSurfaceParameters const& surface_parameters() const;

=== modified file 'src/ubuntu/mircommon/application_options_mir.cpp'
--- src/ubuntu/mircommon/application_options_mir.cpp	2013-06-06 23:35:14 +0000
+++ src/ubuntu/mircommon/application_options_mir.cpp	2014-01-07 20:37:41 +0000
@@ -24,8 +24,12 @@
 #include <getopt.h>
 
 #include <tuple>
+#include <iostream>
+#include <fstream>
 #include <string>
 
+#include <unistd.h>
+
 namespace uam = ubuntu::application::mir;
 
 UApplicationOptions* uam::Options::as_u_application_options()
@@ -43,11 +47,11 @@
 UAUiStage
 string_to_stage(std::string const& s)
 {
-    if (s == "main_stage")
+    if (s == "main_stage" || s == "MainStage")
         return U_MAIN_STAGE;
-    else if (s == "side_stage")
+    else if (s == "side_stage" || s == "SideStage")
         return U_SIDE_STAGE;
-    else if (s == "share_stage")
+    else if (s == "share_stage" || s == "ShareStage")
         return U_SHARE_STAGE;
 }
 
@@ -95,6 +99,60 @@
 
     auto app_options = new uam::Options;
 
+    // Construct legacy desktop file path
+    std::string desktop_file_name;
+    if (getenv("APP_ID"))
+    {
+        desktop_file_name = getenv("APP_ID");
+        desktop_file_name.append(".desktop");
+    }
+
+    // Click desktop path
+    std::string local_path;
+    if (getenv("APP_DESKTOP_FILE_PATH"))
+        local_path = getenv("APP_DESKTOP_FILE_PATH");;        
+
+    // Check StageHint
+    std::string line, stage_hint;
+    std::string stage_key("X-Ubuntu-StageHint");
+    
+    std::ifstream infile;
+    std::string search_paths[2] = {"/usr/share/applications/", local_path};
+    search_paths[0].append(desktop_file_name);
+    for (std::string path : search_paths)
+    {
+        if (path.empty())
+            continue;
+
+        infile.open(path);
+        if (!infile)
+            continue;
+
+        std::getline(infile, line);
+        while (std::getline(infile, line))
+        {
+            if (infile.eof())
+                break;
+          
+            // Check for non key-value line 
+            if (line.find("=") == std::string::npos)
+                continue;
+            
+            std::string lhs = line.substr(0,line.find("="));
+            std::string rhs = line.substr(line.find("="));
+
+            // Fetch Stage
+            if (lhs.compare(stage_key) == 0)
+            {
+                stage_hint = rhs.substr(1);
+                break;
+            }
+        }
+    }
+
+    if (!stage_hint.empty())
+        app_options->stage = string_to_stage(stage_hint);
+
     while(true)
     {
         int option_index = 0;
@@ -124,6 +182,7 @@
                     app_options->form_factor = string_to_form_factor(std::string(optarg));
                     break;
                 case stage_hint_index:
+                    // Override if set
                     app_options->stage = string_to_stage(std::string(optarg));
                     break;
                 case desktop_file_hint_index:

=== modified file 'src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp	2014-01-07 11:00:33 +0000
+++ src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp	2014-01-07 20:37:41 +0000
@@ -259,6 +259,12 @@
     properties->set_input_cb_and_ctx(cb, ctx);
 }
 
+void ua_ui_window_properties_set_dimensions(UAUiWindowProperties *u_properties, uint32_t width, uint32_t height)
+{
+    auto properties = uams::WindowProperties::from_u_window_properties(u_properties);
+    properties->set_dimensions(width, height);
+}
+
 UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
 {
     auto input_platform = global_mirserver_context()->input_platform;

=== modified file 'src/ubuntu/mirserver/window_properties_mirserver.cpp'
--- src/ubuntu/mirserver/window_properties_mirserver.cpp	2014-01-07 11:00:33 +0000
+++ src/ubuntu/mirserver/window_properties_mirserver.cpp	2014-01-07 20:37:41 +0000
@@ -51,6 +51,11 @@
     input_ctx = ctx;
 }
 
+void uams::WindowProperties::set_dimensions(uint32_t width, uint32_t height)
+{
+    parameters = parameters.of_size(width, height);
+}
+
 void uams::WindowProperties::set_pixel_format(MirPixelFormat const& format)
 {
     parameters = parameters.of_pixel_format(format);

=== modified file 'src/ubuntu/mirserver/window_properties_mirserver_priv.h'
--- src/ubuntu/mirserver/window_properties_mirserver_priv.h	2014-01-07 11:00:33 +0000
+++ src/ubuntu/mirserver/window_properties_mirserver_priv.h	2014-01-07 20:37:41 +0000
@@ -44,6 +44,7 @@
     
     void set_title(char const* title, size_t length);
     void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
+    void set_dimensions(uint32_t width, uint32_t height);
     void set_pixel_format( MirPixelFormat const& format);
     
     ::mir::shell::SurfaceCreationParameters const& surface_parameters() const;