replace ConceptFrame with FallbackFrame

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+#### Breaking Changes
+
+- `ConceptFrame` is removed, as well as the `frames` cargo feature, and replaced by a more minimalistic
+  `FallbackFrame`. Dependency on `andrew` and `fontconfig` is dropped in the process. If fancier
+  decorations are needed, they should be implemented using the `Frame` trait.
+
 ## 0.13.0 - 2021-03-04
 
 #### Breaking Changes

Cargo.toml

@@ -17,18 +17,15 @@ nix = "0.19"
 dlib = "0.5"
 lazy_static = "1.0"
 memmap2 = "0.2.0"
-andrew = { version = "0.3.0", optional = true }
 log = "0.4"
 wayland-client = "0.28"
 wayland-protocols = { version = "0.28" , features = ["client", "unstable_protocols"] }
 wayland-cursor = "0.28"
 calloop = { version = "0.6.1", optional = true }
-servo-fontconfig = { version = "0.5", optional = true }
 
 [features]
-default = ["frames", "calloop", "dlopen"]
+default = ["calloop", "dlopen"]
 dlopen = ["wayland-client/dlopen"]
-frames = ["andrew", "servo-fontconfig"]
 
 [dev-dependencies]
 image = "0.23"

examples/image_viewer.rs

@@ -6,7 +6,7 @@ use std::io::{BufWriter, Seek, SeekFrom, Write};
 
 use sctk::reexports::client::protocol::{wl_shm, wl_surface};
 use sctk::shm::MemPool;
-use sctk::window::{ConceptFrame, Event as WEvent, State};
+use sctk::window::{Event as WEvent, FallbackFrame, State};
 
 sctk::default_environment!(ImViewerExample, desktop);
 
@@ -62,7 +62,7 @@ fn main() {
     // specifies the type we want to use to draw the borders. To create your own
     // decorations you just need an object to implement the `Frame` trait.
     let mut window = env
-        .create_window::<ConceptFrame, _>(
+        .create_window::<FallbackFrame, _>(
             surface,            // the wl_surface that serves as the basis of this window
             None,               // None for theme_manager, since we don't theme pointer outself
             image.dimensions(), // the initial internal dimensions of the window

examples/kbd_input.rs

@@ -7,7 +7,7 @@ use sctk::reexports::calloop;
 use sctk::reexports::client::protocol::{wl_keyboard, wl_shm, wl_surface};
 use sctk::seat::keyboard::{map_keyboard_repeat, Event as KbEvent, RepeatKind};
 use sctk::shm::MemPool;
-use sctk::window::{ConceptFrame, Event as WEvent};
+use sctk::window::{Event as WEvent, FallbackFrame};
 
 sctk::default_environment!(KbdInputExample, desktop);
 
@@ -38,7 +38,7 @@ fn main() {
     let surface = env.create_surface().detach();
 
     let mut window = env
-        .create_window::<ConceptFrame, _>(
+        .create_window::<FallbackFrame, _>(
             surface,
             None,
             dimensions,

examples/pointer_input.rs

@@ -5,7 +5,7 @@ use std::io::{BufWriter, Seek, SeekFrom, Write};
 
 use sctk::reexports::client::protocol::{wl_pointer, wl_shm, wl_surface};
 use sctk::shm::MemPool;
-use sctk::window::{ConceptFrame, Event as WEvent};
+use sctk::window::{Event as WEvent, FallbackFrame};
 
 #[derive(Debug)]
 enum NextAction {
@@ -75,7 +75,7 @@ fn main() {
         .detach();
 
     let mut window = env
-        .create_window::<ConceptFrame, _>(
+        .create_window::<FallbackFrame, _>(
             surface,
             None,
             window_config.dimensions(),

examples/selection.rs

@@ -8,7 +8,7 @@ use sctk::{
     primary_selection::PrimarySelectionSourceEvent,
     seat::keyboard::{map_keyboard_repeat, Event as KbEvent, KeyState, RepeatKind},
     shm::MemPool,
-    window::{ConceptFrame, Event as WEvent},
+    window::{Event as WEvent, FallbackFrame},
 };
 
 use sctk::reexports::{
@@ -42,7 +42,7 @@ fn main() {
     let surface = env.create_surface().detach();
 
     let mut window = env
-        .create_window::<ConceptFrame, _>(
+        .create_window::<FallbackFrame, _>(
             surface,
             None,
             dimensions,