Removes the old-style decorations code. At least most of it.

src/CMakeLists.txt

@@ -32,13 +32,11 @@ SET(SOURCES
   menu.c
   menu_item.c
   output.c
-  resizebar.c
   server.c
   subprocess_monitor.c
   task_list.c
   tile.c
   tile_container.c
-  titlebar.c
   view.c
   wlmtk_xdg_popup.c
   wlmtk_xdg_toplevel.c
@@ -67,13 +65,11 @@ SET(HEADERS
   menu.h
   menu_item.h
   output.h
-  resizebar.h
   server.h
   subprocess_monitor.h
   task_list.h
   tile_container.h
   tile.h
-  titlebar.h
   view.h
   wlmtk_xdg_popup.h
   wlmtk_xdg_toplevel.h
@@ -85,7 +81,7 @@ SET(HEADERS
 )
 
 ADD_EXECUTABLE(wlmaker wlmaker.c ${SOURCES} ${HEADERS})
-ADD_DEPENDENCIES(wlmaker protocol_headers decorations toolkit)
+ADD_DEPENDENCIES(wlmaker protocol_headers toolkit)
 
 TARGET_COMPILE_DEFINITIONS(
   wlmaker PRIVATE WLMAKER_ICON_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/wlmaker")
@@ -115,7 +111,7 @@ TARGET_INCLUDE_DIRECTORIES(
 TARGET_LINK_LIBRARIES(
   wlmaker PRIVATE
   base
-  decorations
+  toolkit
   wlmaker_protocols
   PkgConfig::CAIRO
   PkgConfig::LIBDRM
@@ -126,7 +122,7 @@ TARGET_LINK_LIBRARIES(
 )
 
 ADD_EXECUTABLE(wlmaker_test wlmaker_test.c ${SOURCES} ${HEADERS})
-ADD_DEPENDENCIES(wlmaker_test protocol_headers decorations toolkit)
+ADD_DEPENDENCIES(wlmaker_test protocol_headers toolkit)
 TARGET_INCLUDE_DIRECTORIES(
   wlmaker_test PRIVATE
   ${PROJECT_BINARY_DIR}/third_party/protocols
@@ -142,7 +138,7 @@ TARGET_INCLUDE_DIRECTORIES(
 TARGET_LINK_LIBRARIES(
   wlmaker_test PRIVATE
   base
-  decorations
+  toolkit
   wlmaker_protocols
   PkgConfig::CAIRO
   PkgConfig::LIBDRM

src/config.c

@@ -72,20 +72,6 @@ const wlmaker_config_theme_t  wlmaker_config_theme = {
     .window_margin_color = 0xff000000,  // Pich black, opaque.
     .window_margin_width = 1,
 
-    .titlebar_focussed_fill = {
-        .type = WLMTK_STYLE_COLOR_HGRADIENT,
-        .param = { .hgradient = { .from = 0xff505a5e,.to = 0xff202a2e }}
-    },
-    .titlebar_focussed_text_color = 0xffffffff,
-    .titlebar_blurred_fill = {
-        .type = WLMTK_STYLE_COLOR_HGRADIENT,
-        .param = { .hgradient = { .from = 0xffc2c0c5,.to = 0xff828085 }}
-    },
-    .titlebar_blurred_text_color = 0xff000000,
-    .resizebar_fill = {
-        .type = WLMTK_STYLE_COLOR_SOLID,
-        .param = { .solid = { .color = 0xffc2c0c5 }}
-    },
     .tile_fill = {
         .type = WLMTK_STYLE_COLOR_DGRADIENT,
         .param = { .hgradient = { .from = 0xffa6a6b6,.to = 0xff515561 }}

src/config.h

@@ -51,18 +51,6 @@ typedef struct {
     /** Width of the window margin, in pixels. */
     uint32_t                  window_margin_width;
 
-    /** Color of the title text when focussed. */
-    uint32_t                  titlebar_focussed_text_color;
-    /** Color of the title text when blurred. */
-    uint32_t                  titlebar_blurred_text_color;
-
-    /** Fill style of the title bar, when focussed. Including buttons. */
-    wlmtk_style_fill_t        titlebar_focussed_fill;
-    /** Fill style of the title bar, when blurred. Including buttons. */
-    wlmtk_style_fill_t       titlebar_blurred_fill;
-
-    /** Fill style of the resize bar. */
-    wlmtk_style_fill_t        resizebar_fill;
     /** Fill style of a tile. */
     wlmtk_style_fill_t        tile_fill;
     /** File style of the title element of an iconified. */

src/decorations.h

@@ -39,32 +39,6 @@ extern const uint32_t         wlmaker_decorations_tile_size;
 /** Size of the clip button (length of the catheti) */
 extern const uint32_t         wlmaker_decorations_clip_button_size;
 
-/**
- * Creates a cairo image surface for the background of the title bar.
- *
- * @param width               Full with of the title bar. The width depends on
- *                            the window size; the height of the title bar is
- *                            hardcoded.
- * @param fill_ptr            Specification for the fill.
- *
- * @return a `cairo_surface_t` image target, filled as specificed.
- */
-cairo_surface_t *wlmaker_decorations_titlebar_create_background(
-    uint32_t width, const wlmtk_style_fill_t *fill_ptr);
-
-/**
- * Creates a cairo image surface for the background of the resize bar.
- *
- * @param width               Full with of the resize bar. The width depends on
- *                            the window size; the height of the reizse bar is
- *                            hardcoded.
- * @param fill_ptr            Specification for the fill.
- *
- * @return a `cairo_surface_t` image target, filled as specificed.
- */
-cairo_surface_t *wlmaker_decorations_resizebar_create_background(
-    uint32_t width, const wlmtk_style_fill_t *fill_ptr);
-
 /**
  * Draws a tile into the `cairo_t`.
  *