Skip to content

Commit

Permalink
UI: use a wrapper enum to avoid implementing AsRef<str> for Var
Browse files Browse the repository at this point in the history 
It works but they are some duplicated code parts
  • Loading branch information
@Kryptos-FR
Kryptos-FR committed Jul 15, 2022
1 parent 84059ff commit 6e74ca9
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 84 deletions.
208 changes: 125 additions & 83 deletions rust/src/shards/gui/widgets/text_input.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,87 +48,83 @@ impl Default for TextInput {
}
}

impl AsRef<str> for Var {
enum VarTextBuffer<'a> {
Editable(&'a mut Var),
ReadOnly(Var),
}

impl AsRef<str> for VarTextBuffer<'_> {
fn as_ref(&self) -> &str {
if self.valueType != shardsc::SHType_String
&& self.valueType != shardsc::SHType_Path
&& self.valueType != shardsc::SHType_ContextVar
&& self.valueType != shardsc::SHType_None
{
panic!("Expected None, String, Path or ContextVar variable, but casting failed.")
}

if self.valueType == shardsc::SHType_None {
return "";
}
let var = match self {
VarTextBuffer::Editable(var) => var.as_ref(),
VarTextBuffer::ReadOnly(var) => var,
};

unsafe {
CStr::from_ptr(
self.payload.__bindgen_anon_1.__bindgen_anon_2.stringValue as *mut std::os::raw::c_char,
)
.to_str()
.unwrap()
}
VarTextBuffer::as_str(var)
}
}

impl egui::TextBuffer for Var {
impl egui::TextBuffer for VarTextBuffer<'_> {
fn is_mutable(&self) -> bool {
true
matches!(*self, VarTextBuffer::Editable(_))
}

fn insert_text(&mut self, text: &str, char_index: usize) -> usize {
let byte_idx = if !self.is_string() {
0usize
let byte_idx = if let VarTextBuffer::Editable(var) = self {
if !var.is_string() {
0usize
} else {
self.byte_index_from_char_index(char_index)
}
} else {
self.byte_index_from_char_index(char_index)
0usize
};

let text_len = text.len();
let (current_len, current_cap) = unsafe {
(
self.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen as usize,
self
.payload
.__bindgen_anon_1
.__bindgen_anon_2
.stringCapacity as usize,
)
};
if let VarTextBuffer::Editable(var) = self {
let text_len = text.len();
let (current_len, current_cap) = unsafe {
(
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen as usize,
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringCapacity as usize,
)
};

if current_cap == 0usize {
// new string
let var = Var::ephemeral_string(text);
cloneVar(self, &var);
} else if (current_cap - current_len) >= text_len {
// text can fit within existing capacity
unsafe {
let base_ptr =
self.payload.__bindgen_anon_1.__bindgen_anon_2.stringValue as *mut std::os::raw::c_char;
// move the rest of the string to the end
std::ptr::copy(
base_ptr.add(byte_idx),
base_ptr.add(byte_idx).add(text_len),
current_len - byte_idx,
);
// insert the new text
let bytes = text.as_ptr() as *const std::os::raw::c_char;
std::ptr::copy_nonoverlapping(bytes, base_ptr.add(byte_idx), text_len);
// update the length
let new_len = current_len + text_len;
self.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen = new_len as u32;
// fixup null-terminator
*base_ptr.add(new_len) = 0;
if current_cap == 0usize {
// new string
let tmp = Var::ephemeral_string(text);
cloneVar(var, &tmp);
} else if (current_cap - current_len) >= text_len {
// text can fit within existing capacity
unsafe {
let base_ptr =
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringValue as *mut std::os::raw::c_char;
// move the rest of the string to the end
std::ptr::copy(
base_ptr.add(byte_idx),
base_ptr.add(byte_idx).add(text_len),
current_len - byte_idx,
);
// insert the new text
let bytes = text.as_ptr() as *const std::os::raw::c_char;
std::ptr::copy_nonoverlapping(bytes, base_ptr.add(byte_idx), text_len);
// update the length
let new_len = current_len + text_len;
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen = new_len as u32;
// fixup null-terminator
*base_ptr.add(new_len) = 0;
}
} else {
let mut str = String::from(VarTextBuffer::as_str_from_mut(var));
str.insert_str(byte_idx, text);
let tmp = Var::ephemeral_string(str.as_str());
cloneVar(var, &tmp);
}

text.chars().count()
} else {
// not enough capacity, allocate a new string
let mut str = String::from(self.as_str());
str.insert_str(byte_idx, text);
let var = Var::ephemeral_string(str.as_str());
cloneVar(self, &var);
0usize
}

text.chars().count()
}

fn delete_char_range(&mut self, char_range: std::ops::Range<usize>) {
Expand All @@ -142,21 +138,69 @@ impl egui::TextBuffer for Var {
return;
}

if let VarTextBuffer::Editable(var) = self {
unsafe {
let current_len = var.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen as usize;
let base_ptr =
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringValue as *mut std::os::raw::c_char;
// move rest of the text at the deletion location
std::ptr::copy(
base_ptr.add(byte_end),
base_ptr.add(byte_start),
current_len - byte_end,
);
// update the length
let new_len = current_len - byte_end + byte_start;
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen = new_len as u32;
// fixup null-terminator
*base_ptr.add(new_len) = 0;
}
}
}
}

impl VarTextBuffer<'_> {
fn as_str_from_mut(var: &mut Var) -> &str {
if var.valueType != shardsc::SHType_String
&& var.valueType != shardsc::SHType_Path
&& var.valueType != shardsc::SHType_ContextVar
&& var.valueType != shardsc::SHType_None
{
panic!("Expected None, String, Path or ContextVar variable, but casting failed.")
}

if var.valueType == shardsc::SHType_None {
return "";
}

unsafe {
CStr::from_ptr(
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringValue as *mut std::os::raw::c_char,
)
.to_str()
.unwrap()
}
}

fn as_str(var: &Var) -> &str {
if var.valueType != shardsc::SHType_String
&& var.valueType != shardsc::SHType_Path
&& var.valueType != shardsc::SHType_ContextVar
&& var.valueType != shardsc::SHType_None
{
panic!("Expected None, String, Path or ContextVar variable, but casting failed.")
}

if var.valueType == shardsc::SHType_None {
return "";
}

unsafe {
let current_len = self.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen as usize;
let base_ptr =
self.payload.__bindgen_anon_1.__bindgen_anon_2.stringValue as *mut std::os::raw::c_char;
// move rest of the text at the deletion location
std::ptr::copy(
base_ptr.add(byte_end),
base_ptr.add(byte_start),
current_len - byte_end,
);
// update the length
let new_len = current_len - byte_end + byte_start;
self.payload.__bindgen_anon_1.__bindgen_anon_2.stringLen = new_len as u32;
// fixup null-terminator
*base_ptr.add(new_len) = 0;
CStr::from_ptr(
var.payload.__bindgen_anon_1.__bindgen_anon_2.stringValue as *mut std::os::raw::c_char,
)
.to_str()
.unwrap()
}
}
}
Expand Down Expand Up @@ -287,12 +331,10 @@ impl Shard for TextInput {

fn activate(&mut self, _context: &Context, _input: &Var) -> Result<Var, &str> {
if let Some(ui) = util::get_current_parent(self.parents.get())? {
let mut str: &str;
let text: &mut dyn egui::TextBuffer = if self.mutable_text {
self.variable.get_mut()
let text = &mut if self.mutable_text {
VarTextBuffer::Editable(self.variable.get_mut())
} else {
str = self.variable.get().as_ref().try_into()?;
&mut str
VarTextBuffer::ReadOnly(self.variable.get())
};
let text_edit = egui::TextEdit::singleline(text);
let response = ui.add(text_edit);
Expand Down
2 changes: 1 addition & 1 deletion rust/src/shards/http.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl RequestBase {
.insert_fast_static(cstr!("status"), response.status().as_u16().try_into()?);

let headers = self.output_table.get_mut_fast_static(cstr!("headers"));
let mut headers: Table = <&mut Var as AsRef<Var>>::as_ref(&headers).try_into()?;
let mut headers: Table = headers.as_ref().try_into()?;
for (key, value) in response.headers() {
let key = CString::new(key.as_str()).map_err(|e| {
shlog!("Failure details: {}", e);
Expand Down

0 comments on commit 6e74ca9

Please sign in to comment.