there was an attempt at variable intrepolation support
This commit is contained in:
parent
3cbd81219b
commit
f173ec04e3
4 changed files with 100 additions and 855 deletions
815
Cargo.lock
generated
815
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -11,8 +11,10 @@ gtk = { version = "0.9", features = [ "v3_16" ] }
|
|||
gdk = { version = "", features = ["v3_16"] }
|
||||
gio = { version = "", features = ["v2_44"] }
|
||||
|
||||
regex = "1"
|
||||
|
||||
hocon = { version = "0.3", features = [ "serde-support" ]}
|
||||
|
||||
hocon = { version = "0.3", default-features = false, features = [ "serde-support" ]}
|
||||
|
||||
try_match = "0.2.2"
|
||||
|
||||
|
@ -20,8 +22,3 @@ anyhow = "1.0"
|
|||
#thiserror = "1.0"
|
||||
|
||||
|
||||
[target.x86_64-unknown-linux-gnu]
|
||||
rustflags = [
|
||||
"-C", "link-arg=-fuse-ld=lld",
|
||||
]
|
||||
|
||||
|
|
|
@ -1,11 +1,14 @@
|
|||
use anyhow::*;
|
||||
use hocon::*;
|
||||
use hocon_ext::HoconExt;
|
||||
use std::collections::HashMap;
|
||||
use std::{collections::HashMap, convert::TryFrom};
|
||||
use try_match::try_match;
|
||||
|
||||
pub mod hocon_ext;
|
||||
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub struct AttrValue(pub String);
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct WidgetDefinition {
|
||||
pub name: String,
|
||||
|
@ -22,8 +25,7 @@ pub enum ElementUse {
|
|||
pub struct WidgetUse {
|
||||
pub name: String,
|
||||
pub children: Vec<ElementUse>,
|
||||
pub num_attrs: HashMap<String, f64>,
|
||||
pub str_attrs: HashMap<String, String>,
|
||||
pub attrs: HashMap<String, AttrValue>,
|
||||
}
|
||||
|
||||
impl WidgetUse {
|
||||
|
@ -31,8 +33,7 @@ impl WidgetUse {
|
|||
WidgetUse {
|
||||
name,
|
||||
children,
|
||||
num_attrs: HashMap::new(),
|
||||
str_attrs: HashMap::new(),
|
||||
attrs: HashMap::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -85,25 +86,18 @@ pub fn parse_widget_use(data: HashMap<String, Hocon>) -> Result<WidgetUse> {
|
|||
)),
|
||||
}?;
|
||||
|
||||
let str_attrs: HashMap<String, String> = widget_config
|
||||
let attrs: HashMap<String, AttrValue> = widget_config
|
||||
.into_iter()
|
||||
.filter_map(|(key, value)| {
|
||||
Some((
|
||||
key.clone(),
|
||||
try_match!(Hocon::String(x) = value).ok()?.clone(),
|
||||
))
|
||||
})
|
||||
.collect();
|
||||
|
||||
let num_attrs: HashMap<String, f64> = widget_config
|
||||
.iter()
|
||||
.filter_map(|(key, value)| {
|
||||
Some((
|
||||
key.to_string(),
|
||||
try_match!(Hocon::Integer(x) = value)
|
||||
.map(|&x| x as f64)
|
||||
.or_else(|_| try_match!(Hocon::Real(x) = value).map(|&x| x as f64))
|
||||
.ok()?,
|
||||
match value {
|
||||
Hocon::String(s) => AttrValue(s.to_string()),
|
||||
Hocon::Integer(n) => AttrValue(format!("{}", n)),
|
||||
Hocon::Real(n) => AttrValue(format!("{}", n)),
|
||||
Hocon::Boolean(b) => AttrValue(format!("{}", b)),
|
||||
_ => return None,
|
||||
},
|
||||
))
|
||||
})
|
||||
.collect();
|
||||
|
@ -111,8 +105,7 @@ pub fn parse_widget_use(data: HashMap<String, Hocon>) -> Result<WidgetUse> {
|
|||
Ok(WidgetUse {
|
||||
name: widget_name.to_string(),
|
||||
children,
|
||||
str_attrs,
|
||||
num_attrs,
|
||||
attrs,
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -150,6 +143,7 @@ mod test {
|
|||
name: "example_widget".to_string(),
|
||||
structure: ElementUse::Widget(WidgetUse {
|
||||
name: "layout_horizontal".to_string(),
|
||||
attrs: HashMap::new(),
|
||||
children: vec![
|
||||
ElementUse::Widget(WidgetUse::new(
|
||||
"text".to_string(),
|
||||
|
|
93
src/main.rs
93
src/main.rs
|
@ -1,11 +1,14 @@
|
|||
#![feature(try_blocks)]
|
||||
extern crate gio;
|
||||
extern crate gtk;
|
||||
|
||||
use anyhow::*;
|
||||
use anyhow::{self, Context, Result};
|
||||
use gdk::*;
|
||||
use gio::prelude::*;
|
||||
use gtk::prelude::*;
|
||||
use gtk::{Adjustment, Application, ApplicationWindow, Button, Scale};
|
||||
use regex::Regex;
|
||||
use std::{collections::HashMap, str::FromStr};
|
||||
|
||||
pub mod config;
|
||||
pub mod widgets;
|
||||
|
@ -20,6 +23,7 @@ fn main() -> Result<()> {
|
|||
window.set_wmclass("noswallow", "noswallow");
|
||||
window.set_type_hint(gdk::WindowTypeHint::Dock);
|
||||
window.set_position(gtk::WindowPosition::Center);
|
||||
window.set_keep_above(true);
|
||||
|
||||
let element = config::parse_element_use(
|
||||
config::parse_hocon(
|
||||
|
@ -37,7 +41,10 @@ fn main() -> Result<()> {
|
|||
.unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
window.add(&element_to_gtk_widget(&element).unwrap());
|
||||
|
||||
let widget_state = WidgetState(HashMap::new());
|
||||
|
||||
window.add(&element_to_gtk_widget(&widget_state, &element).unwrap());
|
||||
|
||||
window.show_all();
|
||||
});
|
||||
|
@ -46,16 +53,21 @@ fn main() -> Result<()> {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
fn element_to_gtk_widget(element: &config::ElementUse) -> Option<gtk::Widget> {
|
||||
fn element_to_gtk_widget(
|
||||
widget_state: &WidgetState,
|
||||
element: &config::ElementUse,
|
||||
) -> Option<gtk::Widget> {
|
||||
match element {
|
||||
config::ElementUse::Text(text) => Some(gtk::Label::new(Some(&text)).upcast()),
|
||||
config::ElementUse::Widget(widget) => {
|
||||
widget_use_to_gtk_container(&widget).or(widget_use_to_gtk_widget(&widget))
|
||||
}
|
||||
config::ElementUse::Widget(widget) => widget_use_to_gtk_container(widget_state, &widget)
|
||||
.or(widget_use_to_gtk_widget(widget_state, &widget)),
|
||||
}
|
||||
}
|
||||
|
||||
fn widget_use_to_gtk_container(widget: &config::WidgetUse) -> Option<gtk::Widget> {
|
||||
fn widget_use_to_gtk_container(
|
||||
widget_state: &WidgetState,
|
||||
widget: &config::WidgetUse,
|
||||
) -> Option<gtk::Widget> {
|
||||
let container_widget: gtk::Container = match widget.name.as_str() {
|
||||
"layout_horizontal" => gtk::Box::new(gtk::Orientation::Horizontal, 0).upcast(),
|
||||
"button" => gtk::Button::new().upcast(),
|
||||
|
@ -63,20 +75,73 @@ fn widget_use_to_gtk_container(widget: &config::WidgetUse) -> Option<gtk::Widget
|
|||
};
|
||||
|
||||
for child in &widget.children {
|
||||
container_widget.add(&element_to_gtk_widget(child)?);
|
||||
container_widget.add(&element_to_gtk_widget(widget_state, child)?);
|
||||
}
|
||||
Some(container_widget.upcast())
|
||||
}
|
||||
|
||||
fn widget_use_to_gtk_widget(widget: &config::WidgetUse) -> Option<gtk::Widget> {
|
||||
fn widget_use_to_gtk_widget(
|
||||
widget_state: &WidgetState,
|
||||
widget: &config::WidgetUse,
|
||||
) -> Option<gtk::Widget> {
|
||||
let new_widget: gtk::Widget = match widget.name.as_str() {
|
||||
"slider" => gtk::Scale::new(
|
||||
gtk::Orientation::Horizontal,
|
||||
Some(>k::Adjustment::new(50.0, 0.0, 100.0, 1.0, 1.0, 1.0)),
|
||||
)
|
||||
.upcast(),
|
||||
"slider" => {
|
||||
let slider_value: f64 = widget_state.resolve(widget.attrs.get("value")?)?;
|
||||
|
||||
gtk::Scale::new(
|
||||
gtk::Orientation::Horizontal,
|
||||
Some(>k::Adjustment::new(
|
||||
slider_value,
|
||||
0.0,
|
||||
100.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
)),
|
||||
)
|
||||
.upcast()
|
||||
}
|
||||
|
||||
_ => return None,
|
||||
};
|
||||
Some(new_widget)
|
||||
}
|
||||
|
||||
struct WidgetState(HashMap<String, config::AttrValue>);
|
||||
|
||||
impl WidgetState {
|
||||
pub fn resolve<T>(&self, value: &config::AttrValue) -> Option<String>
|
||||
where
|
||||
T: FromStr,
|
||||
{
|
||||
let var_pattern: Regex = Regex::new(r"\$\$\{(.*)\}").unwrap();
|
||||
let config::AttrValue(value) = value;
|
||||
|
||||
let mut missing_var: Option<String> = None;
|
||||
var_pattern.replace_all(value, |caps: ®ex::Captures| {
|
||||
self.lookup_full::<T>(&caps[1]).unwrap_or_else(|| {
|
||||
missing_var = Some(caps[1].to_string());
|
||||
"missing".to_string()
|
||||
})
|
||||
});
|
||||
|
||||
// TODO REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEe
|
||||
|
||||
unimplemented!();
|
||||
}
|
||||
|
||||
pub fn lookup_full<T>(&self, key: &str) -> Option<String>
|
||||
where
|
||||
T: FromStr,
|
||||
{
|
||||
self.resolve::<T>(self.0.get(key)?)
|
||||
}
|
||||
}
|
||||
|
||||
// macro_rules! build {
|
||||
// ($var_name:ident = $value:expr ; $code:block) => {{
|
||||
// let mut $var_name = $value;
|
||||
// $code;
|
||||
// $var_name
|
||||
// }};
|
||||
// }
|
||||
|
|
Loading…
Add table
Reference in a new issue