cursor: Load style before initializing server. Fixes initialization of cursor styles and scaling on outputs.

Author: phkaeser

doc/ROADMAP.md

@@ -44,14 +44,14 @@ See the [Detailed Feature List](FEATURES.md) for details.
     * Fix: Handle `Terminal` flag and launch applications in a suitable terminal.
   * Support keypad (tap to click) and middle click alternatives.
   * Support configurable means (eg. Alt+) to emulate right-click on laptop.
-  * Fix: On scaled output, pointer cursor is tiny.
   * Write log to logfile (vs. stderr).
   * Have a naive app to show battery status.
   * Wire up backlight control to window menu.
 
 * Bug fixes
   * [done] Fix crash when changing to different terminal ([#438](https://github.com/phkaeser/wlmaker/issues/438)).
   * [done]  wlmaker not showing window of wlroots clients  ([#439](https://github.com/phkaeser/wlmaker/issues/439)).
+  * [done] Cursor remains small (not scaled) on output with scale > 1.0 ([#444](https://github.com/phkaeser/wlmaker/issues/444)).
 
 ## [0.7](https://github.com/phkaeser/wlmaker/releases/tag/v0.7)
 

src/action.c

@@ -270,12 +270,12 @@ void wlmaker_action_execute(wlmaker_server_t *server_ptr,
         workspace_ptr = wlmtk_workspace_create(
             server_ptr->wlr_output_layout_ptr,
             "New",
-            &server_ptr->style.tile);
+            &server_ptr->style_ptr->tile);
         if (NULL != workspace_ptr) {
             BS_ASSERT_NOTNULL(wlmaker_background_create(
                                   workspace_ptr,
                                   server_ptr->wlr_output_layout_ptr,
-                                  server_ptr->style.background_color));
+                                  server_ptr->style_ptr->background_color));
             wlmtk_root_add_workspace(server_ptr->root_ptr, workspace_ptr);
         }
         break;

src/cursor.c

@@ -81,21 +81,21 @@ wlmaker_cursor_t *wlmaker_cursor_create(
         cursor_ptr->wlr_cursor_ptr, wlr_output_layout_ptr);
 
     cursor_ptr->wlr_xcursor_manager_ptr = wlr_xcursor_manager_create(
-        server_ptr->style.cursor.name_ptr,
-        server_ptr->style.cursor.size);
+        server_ptr->style_ptr->cursor.name_ptr,
+        server_ptr->style_ptr->cursor.size);
     if (NULL == cursor_ptr->wlr_xcursor_manager_ptr) {
         bs_log(BS_ERROR, "Failed wlr_xcursor_manager_create(%s, %"PRIu64")",
-               server_ptr->style.cursor.name_ptr,
-               server_ptr->style.cursor.size);
+               server_ptr->style_ptr->cursor.name_ptr,
+               server_ptr->style_ptr->cursor.size);
         wlmaker_cursor_destroy(cursor_ptr);
         return NULL;
     }
     if (!wlr_xcursor_manager_load(cursor_ptr->wlr_xcursor_manager_ptr,
                                   config_output_scale)) {
 
         bs_log(BS_ERROR, "Failed wlr_xcursor_manager_load() for %s, %"PRIu64,
-               server_ptr->style.cursor.name_ptr,
-               server_ptr->style.cursor.size);
+               server_ptr->style_ptr->cursor.name_ptr,
+               server_ptr->style_ptr->cursor.size);
         wlmaker_cursor_destroy(cursor_ptr);
         return NULL;
     }

src/icon_manager.c

@@ -368,7 +368,7 @@ wlmaker_toplevel_icon_t *wlmaker_toplevel_icon_create(
 
     if (!wlmtk_tile_init(
             &toplevel_icon_ptr->super_tile,
-            &icon_manager_ptr->server_ptr->style.tile)) {
+            &icon_manager_ptr->server_ptr->style_ptr->tile)) {
         wlmaker_toplevel_icon_destroy(toplevel_icon_ptr);
         return NULL;
     }

src/server.c

@@ -116,12 +116,14 @@ const uint32_t wlmaker_modifier_default_mask = (
 wlmaker_server_t *wlmaker_server_create(
     bspl_dict_t *config_dict_ptr,
     wlmaker_files_t *files_ptr,
+    const wlmaker_config_style_t *style_ptr,
     const wlmaker_server_options_t *options_ptr)
 {
     wlmaker_server_t *server_ptr = logged_calloc(1, sizeof(wlmaker_server_t));
     if (NULL == server_ptr) return NULL;
     server_ptr->options_ptr = options_ptr;
     server_ptr->files_ptr = files_ptr;
+    server_ptr->style_ptr = style_ptr;
 
     server_ptr->config_dict_ptr = bspl_dict_ref(config_dict_ptr);
     if (NULL == server_ptr->config_dict_ptr) {

src/server.h

@@ -198,7 +198,7 @@ struct _wlmaker_server_t {
     struct wl_listener        unclaimed_button_event_listener;
 
     /** The current configuration style. */
-    wlmaker_config_style_t    style;
+    const wlmaker_config_style_t *style_ptr;
 };
 
 /** Specifies the key + modifier to bind. */
@@ -218,7 +218,8 @@ struct _wlmaker_key_combo_t {
  *
  * @param config_dict_ptr     Configuration, as dictionary object. The server
  *                            will keep a reference on it until destroyed.
- * @param files_ptr
+ * @param files_ptr           Files handle. Must outlive the server.
+ * @param style_ptr           Style. Must outlive the server.
  * @param options_ptr         Options for the server. The server expects the
  *                            pointed area to outlive the server.
  *
@@ -228,6 +229,7 @@ struct _wlmaker_key_combo_t {
 wlmaker_server_t *wlmaker_server_create(
     bspl_dict_t *config_dict_ptr,
     wlmaker_files_t *files_ptr,
+    const wlmaker_config_style_t *style_ptr,
     const wlmaker_server_options_t *options_ptr);
 
 /**

src/tl_menu.c

@@ -180,7 +180,7 @@ wlmaker_tl_menu_t *wlmaker_tl_menu_create(
         wlmaker_action_item_t *ai_ptr = wlmaker_action_item_create_from_desc(
             desc_ptr,
             tl_menu_ptr,
-            &server_ptr->style.menu.item,
+            &server_ptr->style_ptr->menu.item,
             server_ptr);
         if (NULL == ai_ptr) {
             bs_log(BS_ERROR, "Failed wlmaker_action_item_create_from_desc()");
@@ -194,7 +194,7 @@ wlmaker_tl_menu_t *wlmaker_tl_menu_create(
     }
 
     tl_menu_ptr->workspaces_submenu_ptr = wlmtk_menu_create(
-        &server_ptr->style.menu);
+        &server_ptr->style_ptr->menu);
     if (NULL == tl_menu_ptr->workspaces_submenu_ptr) {
         wlmaker_tl_menu_destroy(tl_menu_ptr);
         return NULL;
@@ -330,7 +330,7 @@ void _wlmaker_tl_menu_workspace_iterator_create_item(
     ws_item_ptr->window_ptr = tl_menu_ptr->window_ptr;
 
     ws_item_ptr->menu_item_ptr = wlmtk_menu_item_create(
-        &tl_menu_ptr->server_ptr->style.menu.item);
+        &tl_menu_ptr->server_ptr->style_ptr->menu.item);
     if (NULL == ws_item_ptr->menu_item_ptr) {
         _destroy(ws_item_ptr);
         return;

src/toolkit/input.c

@@ -85,8 +85,4 @@ void wlmtk_pointer_set_cursor(
         _wlmtk_pointer_cursor_names[cursor]);
 }
 
-/* == Local (static) methods =============================================== */
-
-/* == Unit Tests =========================================================== */
-
 /* == End of input.c ======================================================= */

src/wlmaker.c

@@ -280,15 +280,15 @@ bool create_workspaces(
         wlmtk_workspace_t *workspace_ptr = wlmtk_workspace_create(
             server_ptr->wlr_output_layout_ptr,
             s.name,
-            &server_ptr->style.tile);
+            &server_ptr->style_ptr->tile);
         if (NULL == workspace_ptr) {
             bs_log(BS_ERROR, "Failed wlmtk_workspace_create(\"%s\")", s.name);
             rv = false;
             break;
         }
 
         if (s.color == 0) {
-            s.color = server_ptr->style.background_color;
+            s.color = server_ptr->style_ptr->background_color;
         }
         wlmaker_background_t *background_ptr = wlmaker_background_create(
             workspace_ptr,
@@ -383,13 +383,10 @@ int main(__UNUSED__ int argc, __UNUSED__ const char **argv)
         return EXIT_FAILURE;
     }
 
-    wlmaker_server_t *server_ptr = wlmaker_server_create(
-        config_dict_ptr, files_ptr, &wlmaker_server_options);
-    if (NULL == server_ptr) return EXIT_FAILURE;
-
+    wlmaker_config_style_t style = {};
     bspl_dict_t *style_dict_ptr = bspl_dict_from_object(
         wlmaker_config_object_load(
-            server_ptr->files_ptr,
+            files_ptr,
             "style",
             wlmaker_arg_theme_file_ptr,
             "Themes/Default.plist",
@@ -399,15 +396,19 @@ int main(__UNUSED__ int argc, __UNUSED__ const char **argv)
     if (!bspl_decode_dict(
             style_dict_ptr,
             wlmaker_config_style_desc,
-            &server_ptr->style)) return EXIT_FAILURE;
+            &style)) return EXIT_FAILURE;
     bspl_dict_unref(style_dict_ptr);
 
+    wlmaker_server_t *server_ptr = wlmaker_server_create(
+        config_dict_ptr, files_ptr, &style, &wlmaker_server_options);
+    if (NULL == server_ptr) return EXIT_FAILURE;
+
     // TODO(kaeser@gubbe.ch): Uh, that's ugly...
     server_ptr->root_menu_ptr = wlmaker_root_menu_create(
         server_ptr,
         wlmaker_arg_root_menu_file_ptr,
-        &server_ptr->style.window,
-        &server_ptr->style.menu);
+        &server_ptr->style_ptr->window,
+        &server_ptr->style_ptr->menu);
     if (NULL == server_ptr->root_menu_ptr) {
         return EXIT_FAILURE;
     }
@@ -452,11 +453,11 @@ int main(__UNUSED__ int argc, __UNUSED__ const char **argv)
         }
 
         dock_ptr = wlmaker_dock_create(
-            server_ptr, state_dict_ptr, &server_ptr->style);
+            server_ptr, state_dict_ptr, &style);
         clip_ptr = wlmaker_clip_create(
-            server_ptr, state_dict_ptr, &server_ptr->style);
+            server_ptr, state_dict_ptr, &style);
         task_list_ptr = wlmaker_task_list_create(
-            server_ptr, &server_ptr->style);
+            server_ptr, &style);
         if (NULL == dock_ptr || NULL == clip_ptr || NULL == task_list_ptr) {
             bs_log(BS_ERROR, "Failed to create dock, clip or task list.");
         } else {

src/xdg_toplevel.c

@@ -37,6 +37,7 @@
 #include <wlr/version.h>
 #undef WLR_USE_UNSTABLE
 
+#include "config.h"
 #include "server.h"
 #include "tl_menu.h"
 #include "toolkit/toolkit.h"
@@ -346,8 +347,8 @@ struct wlmaker_xdg_toplevel *_wlmaker_xdg_toplevel_create_injected(
 
     wlmaker_xdg_toplevel_ptr->window_ptr = wlmtk_window_create(
         wlmtk_base_element(&wlmaker_xdg_toplevel_ptr->base),
-        &wlmaker_xdg_toplevel_ptr->server_ptr->style.window,
-        &wlmaker_xdg_toplevel_ptr->server_ptr->style.menu);
+        &wlmaker_xdg_toplevel_ptr->server_ptr->style_ptr->window,
+        &wlmaker_xdg_toplevel_ptr->server_ptr->style_ptr->menu);
     if (NULL == wlmaker_xdg_toplevel_ptr->window_ptr) goto error;
     wlmtk_window_set_properties(
         wlmaker_xdg_toplevel_ptr->window_ptr,
@@ -923,6 +924,7 @@ struct _xdg_toplevel_test_data {
     struct wlr_xdg_toplevel   wlr_xdg_toplevel;
 
     struct _wlmaker_test_layout test_layout;
+    wlmaker_config_style_t    style;
     wlmaker_server_t          server;
 
     int32_t                   set_size_width;
@@ -1050,6 +1052,7 @@ void *_wlmaker_xdg_toplevel_test_setup(void)
         td_ptr->test_layout.wlr_output_layout_ptr,
         &td_ptr->test_layout.wlr_output);
 
+    td_ptr->server.style_ptr = &td_ptr->style;
     td_ptr->server.wlr_scene_ptr = wlr_scene_create();
     if (NULL == td_ptr->server.wlr_scene_ptr) goto error;