merge tcl definitions into tcl-sys

Author: arihant2math

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
-members = [ "shared-build",
-    "tcl-sys", "tk-sys",
+members = [
+    "shared-build", "tcl", "tcl-sys", "tk-sys"
 ]
 resolver = "3"
 

shared-build/src/lib.rs

@@ -36,6 +36,7 @@ pub fn build(
     get_lib_dirs: fn() -> Vec<String>,
     get_include_dirs: fn() -> Vec<String>,
     get_libs: fn() -> Vec<String>,
+    tk: bool,
 ) {
     println!("cargo:rerun-if-changed={wrapper_file}");
     println!("cargo:rerun-if-changed=build.rs");
@@ -53,6 +54,9 @@ pub fn build(
         .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
         .blocklist_function("Tcl_DecrRefCount")
         .blocklist_function("Tcl_IncrRefCount");
+    if tk {
+        builder = builder.blocklist_item("Tcl_.*");
+    }
     for dir in get_include_dirs() {
         builder = builder.clang_arg(format!("-I{dir}"));
     }

tcl-sys/build.rs

@@ -74,5 +74,5 @@ mod os {
 use os::{get_include_dirs, get_lib_dirs, get_libs};
 
 fn main() {
-    shared_build::build(WRAPPER_FILE, get_lib_dirs, get_include_dirs, get_libs);
+    shared_build::build(WRAPPER_FILE, get_lib_dirs, get_include_dirs, get_libs, false);
 }

tcl-sys/examples/get_var.rs

@@ -0,0 +1,51 @@
+use std::ffi::{CStr, CString};
+
+fn main() {
+    // readline
+    let mut var1 = String::new();
+    std::io::stdin()
+        .read_line(&mut var1)
+        .expect("Failed to read line");
+    let mut var2 = String::new();
+    std::io::stdin()
+        .read_line(&mut var2)
+        .expect("Failed to read line");
+    let var1 = var1.trim();
+    let var2 = var2.trim();
+    println!("var1: {}", var1);
+    println!("var2: {}", var2);
+    let var1 = CString::new(var1).unwrap();
+    let var2 = CString::new(var2).unwrap();
+    let var2 = if var2.is_empty() {
+        std::ptr::null()
+    } else {
+        var2.as_ptr()
+    };
+    unsafe {
+        let interp = tcl_sys::Tcl_CreateInterp();
+        tcl_sys::Tcl_Init(interp);
+        let out = tcl_sys::Tcl_GetVar(interp, var1.as_ptr() as _, tcl_sys::TCL_LEAVE_ERR_MSG as _);
+        if out.is_null() {
+            let err_obj = tcl_sys::Tcl_GetObjResult(interp);
+            let err_msg = tcl_sys::Tcl_GetString(err_obj);
+            let err = CStr::from_ptr(err_msg as _);
+            println!("Variable not found: {err:?}");
+        } else {
+            println!("Variable found");
+            let converted_string = CStr::from_ptr(out as _);
+            println!("{converted_string:?}");
+        }
+        let res = tcl_sys::Tcl_GetVar2Ex(interp, var1.as_ptr() as _, var2 as _, tcl_sys::TCL_LEAVE_ERR_MSG as _);
+        if res.is_null() {
+            let err_obj = tcl_sys::Tcl_GetObjResult(interp);
+            let err_msg = tcl_sys::Tcl_GetString(err_obj);
+            let err = CStr::from_ptr(err_msg as _);
+            println!("Variable not found: {err:?}");
+        } else {
+            println!("Variable found");
+            let string = tcl_sys::Tcl_GetString(res);
+            let converted_string = CStr::from_ptr(string as _);
+            println!("{converted_string:?}");
+        }
+    }
+}

tk-sys/Cargo.toml

@@ -15,6 +15,9 @@ description = "Raw TK bindings for Rust"
 [lib]
 name = "tk_sys"
 
+[dependencies]
+tcl-sys = { version = "0.3", path = "../tcl-sys" }
+
 [build-dependencies]
 pkg-config = { workspace = true }
 shared-build = { path = "../shared-build" }

tk-sys/build.rs

@@ -79,5 +79,5 @@ mod os {
 use os::{get_include_dirs, get_lib_dirs, get_libs};
 
 fn main() {
-    shared_build::build(WRAPPER_FILE, get_lib_dirs, get_include_dirs, get_libs);
+    shared_build::build(WRAPPER_FILE, get_lib_dirs, get_include_dirs, get_libs, true);
 }

tk-sys/examples/simple.rs

@@ -0,0 +1,13 @@
+fn main() {
+    unsafe {
+        let interp = tcl_sys::Tcl_CreateInterp();
+        tk_sys::Tk_Init(interp);
+        let window = tk_sys::Tk_MainWindow(interp);
+        tk_sys::Tk_SetAppName(window, b"simple\0".as_ptr() as _);
+        tcl_sys::Tcl_Eval(interp, b"button .b -text \"Click Me\" -command {puts \"Hello from Tk\"}\0".as_ptr() as _);
+        tcl_sys::Tcl_Eval(interp, b"pack .b\0".as_ptr() as _);
+
+        // Start the main event loop
+        tk_sys::Tk_MainLoop();
+    }
+}

tk-sys/src/lib.rs

@@ -2,5 +2,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
+use tcl_sys::*;
+
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 include!(concat!(env!("OUT_DIR"), "/custom.rs"));

tk-sys/tests/simple.rs

@@ -5,21 +5,21 @@ fn convert_str(s: &str) -> *const std::ffi::c_char {
 #[test]
 fn test_basic() {
     unsafe {
-        let interp = tk_sys::Tcl_CreateInterp();
+        let interp = tcl_sys::Tcl_CreateInterp();
         assert!(!interp.is_null());
-        tk_sys::Tcl_DeleteInterp(interp);
+        tcl_sys::Tcl_DeleteInterp(interp);
     }
 }
 
 #[test]
 fn test_mem() {
     unsafe {
-        let interp = tk_sys::Tcl_CreateInterp();
-        let ptr = tk_sys::Tcl_Alloc(100);
+        let interp = tcl_sys::Tcl_CreateInterp();
+        let ptr = tcl_sys::Tcl_Alloc(100);
         assert!(!ptr.is_null());
-        tk_sys::Tcl_Free(ptr);
-        let mut value = *tk_sys::Tcl_NewStringObj(convert_str("true"), -1);
-        tk_sys::Tcl_DecrRefCount(&mut value);
-        tk_sys::Tcl_DeleteInterp(interp);
+        tcl_sys::Tcl_Free(ptr);
+        let mut value = *tcl_sys::Tcl_NewStringObj(convert_str("true"), -1);
+        tcl_sys::Tcl_DecrRefCount(&mut value);
+        tcl_sys::Tcl_DeleteInterp(interp);
     }
 }