From fe233eef74e001a8c664c64daf35500978c2aa6d Mon Sep 17 00:00:00 2001
From: Ilia Bozhinov <ammen99@gmail.com>
Date: Sat, 22 Jun 2019 23:32:31 +0200
Subject: [PATCH] update for the new protocol

---
 proto/wayfire-shell.xml |  4 ++++
 src/layouts.tpp         |  6 ++++--
 src/main.cpp            | 36 ++++++++++++++++++++++++++++++++++--
 src/wayland-window.cpp  |  8 ++++++--
 src/wayland-window.hpp  |  2 +-
 5 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/proto/wayfire-shell.xml b/proto/wayfire-shell.xml
index d1d4f82..8abb7e6 100644
--- a/proto/wayfire-shell.xml
+++ b/proto/wayfire-shell.xml
@@ -1,6 +1,9 @@
 <protocol name="wayfire_shell">
     <interface name="zwf_shell_manager_v1" version="1">
         <description summary="DE integration">
+            IMPORTANT: most of wayfire-shell is going to be deprecated. Try to
+            use layer-shell instead.
+
             The purpose of this protocol is to enable the creation of different
             desktop-interface windows like panels, backgrounds, docks,
             lockscreens, etc. It also aims to allow the creation of full-blown
@@ -90,6 +93,7 @@
             <entry name="bottom" value="2"/>
             <entry name="panel" value="3"/>
             <entry name="overlay" value="4"/>
+            <entry name="desktop_widget" value="5"/>
         </enum>
 
         <request name="configure">
diff --git a/src/layouts.tpp b/src/layouts.tpp
index 1831f18..b2b4201 100644
--- a/src/layouts.tpp
+++ b/src/layouts.tpp
@@ -90,7 +90,7 @@ std::vector<std::vector<Key>> numeric_keys = {
         {KEY_0 | USE_SHIFT, ")", 1},
         {KEY_SEMICOLON, ";", 1},
         {KEY_SEMICOLON | USE_SHIFT, ":", 1},
-        {KEY_ENTER, "↵", 1}
+        {KEY_ENTER, "↵", 3}
     },
     {
         {KEY_LEFTBRACE, "[", 1},
@@ -105,7 +105,9 @@ std::vector<std::vector<Key>> numeric_keys = {
         {KEY_APOSTROPHE, "\'", 1},
         {KEY_APOSTROPHE | USE_SHIFT, "\"", 1},
         {KEY_GRAVE, "`", 1},
-        {KEY_GRAVE | USE_SHIFT, "~", 1}
+        {KEY_GRAVE | USE_SHIFT, "~", 1},
+        {KEY_COMMA, ",", 1},
+        {KEY_DOT, ".", 1}
     },
     {
         {ABC_TOGGLE, "abc", 1},
diff --git a/src/main.cpp b/src/main.cpp
index 9b95f0d..0adef44 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,5 @@
 #include "osk.hpp"
+#include <getopt.h>
 #include <iostream>
 #include <linux/input-event-codes.h>
 
@@ -14,6 +15,8 @@ namespace wf
     namespace osk
     {
         int spacing = 8;
+        int default_x = 100;
+        int default_y = 100;
         int default_width = 800;
         int default_height = 400;
 
@@ -119,7 +122,7 @@ namespace wf
         Keyboard::Keyboard()
         {
             window = std::make_unique<WaylandWindow>
-                (default_width, default_height);
+                (default_x, default_y, default_width, default_height);
             vk = std::make_unique<VirtualKeyboardDevice> ();
 
             init_layouts();
@@ -170,8 +173,37 @@ namespace wf
     }
 }
 
-int main()
+int main(int argc, char **argv)
 {
+    struct option opts[] = {
+        { "geometry",          required_argument, NULL, 'g' },
+        { 0,                   0,                 NULL,  0  }
+    };
+
+    int c, i;
+    while((c = getopt_long(argc, argv, "g:", opts, &i)) != -1)
+    {
+        using namespace wf::osk;
+        switch(c)
+        {
+            case 'g':
+                if (sscanf(optarg, "%d,%d %dx%d", &default_x, &default_y,
+                        &default_width, &default_height) != 4)
+                {
+                    std::cerr << "Invalid geometry: " << optarg << std::endl;
+                    std::exit(-1);
+                } else
+                {
+                    std::cout << "Geometry " << default_x << "," << default_y << " "
+                        << default_width << "x" << default_height;
+                }
+
+                break;
+            default:
+                std::cerr << "Unrecognized argument " << char(c) << std::endl;
+        }
+    }
+
     auto app = Gtk::Application::create();
     wf::osk::Keyboard::create();
     return app->run(wf::osk::Keyboard::get().get_window());
diff --git a/src/wayland-window.cpp b/src/wayland-window.cpp
index 0b2247c..7671b68 100644
--- a/src/wayland-window.cpp
+++ b/src/wayland-window.cpp
@@ -74,12 +74,15 @@ namespace wf
         return instance;
     }
 
-    WaylandWindow::WaylandWindow(int width, int height)
+    WaylandWindow::WaylandWindow(int x, int y, int width, int height)
         : Gtk::Window()
     {
         auto display = WaylandDisplay::get();
 
+        /* Trick: first show the window, get frame size, then subtract it again */
         this->set_size_request(width, height);
+        this->set_default_size(width, height);
+        this->set_type_hint(Gdk::WINDOW_TYPE_HINT_DOCK);
         this->show_all();
 
         auto gdk_window = this->get_window()->gobj();
@@ -92,8 +95,9 @@ namespace wf
         }
 
         wm_surface = zwf_shell_manager_v1_get_wm_surface(display.wf_manager,
-            surface, ZWF_WM_SURFACE_V1_ROLE_OVERLAY, NULL);
+            surface, ZWF_WM_SURFACE_V1_ROLE_DESKTOP_WIDGET, NULL);
         zwf_wm_surface_v1_set_keyboard_mode(wm_surface,
             ZWF_WM_SURFACE_V1_KEYBOARD_FOCUS_MODE_NO_FOCUS);
+        zwf_wm_surface_v1_configure(wm_surface, x, y);
     }
 }
diff --git a/src/wayland-window.hpp b/src/wayland-window.hpp
index 2385fba..4fea46f 100644
--- a/src/wayland-window.hpp
+++ b/src/wayland-window.hpp
@@ -22,6 +22,6 @@ namespace wf
     {
         zwf_wm_surface_v1 *wm_surface;
         public:
-        WaylandWindow(int width, int height);
+        WaylandWindow(int x, int y, int width, int height);
     };
 }