Skip to content

More tkinter #5784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

More tkinter #5784

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
acdeadc
fix build
arihant2math May 12, 2025
4a0c51a
fix usage of Tcl_GetVar2Ex
arihant2math May 12, 2025
e46f033
no panic on mainloop
arihant2math May 12, 2025
4a88e3c
add static var
arihant2math May 12, 2025
41a921b
fix getvar
arihant2math May 12, 2025
6ad5a90
add globalgetvar support
arihant2math May 12, 2025
1407613
formatting
arihant2math May 12, 2025
7e85e04
address review
arihant2math May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 78 additions & 8 deletions stdlib/src/tkinter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ mod _tkinter {
impl TclObject {}

static QUIT_MAIN_LOOP: AtomicBool = AtomicBool::new(false);
static ERROR_IN_CMD: AtomicBool = AtomicBool::new(false);

#[pyattr]
#[pyclass(name = "tkapp")]
Expand Down Expand Up @@ -125,7 +126,7 @@ mod _tkinter {
interactive: i32,
#[pyarg(any)]
wantobjects: i32,
#[pyarg(any, default = "true")]
#[pyarg(any, default = true)]
want_tk: bool,
#[pyarg(any)]
sync: i32,
Expand Down Expand Up @@ -168,6 +169,14 @@ mod _tkinter {
)))
}

#[derive(Debug, FromArgs)]
struct TkAppGetVarArgs {
#[pyarg(any)]
name: PyObjectRef,
#[pyarg(any, default)]
name2: Option<String>,
}

// TODO: DISALLOW_INSTANTIATION
#[pyclass(with(Constructor))]
impl TkApp {
Expand Down Expand Up @@ -247,21 +256,45 @@ mod _tkinter {
Self::unicode_from_string(s, len as _, vm)
}

#[pymethod]
fn getvar(&self, arg: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
fn var_invoke(&self) {
if self.threaded && self.thread_id != unsafe { tk_sys::Tcl_GetCurrentThread() } {
// TODO: do stuff
}
}

fn inner_getvar(
&self,
args: TkAppGetVarArgs,
flags: u32,
vm: &VirtualMachine,
) -> PyResult<PyObjectRef> {
let TkAppGetVarArgs { name, name2 } = args;
// TODO: technically not thread safe
let name = varname_converter(arg, vm)?;
let name = varname_converter(name, vm)?;

let name = ffi::CString::new(name)?;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I doubt this is buildable.

ToPyException requires vm

let name2 = ffi::CString::new(name2.unwrap_or_default())?;
let name2_ptr = if name2.is_empty() {
ptr::null()
} else {
name2.as_ptr()
};
let res = unsafe {
tk_sys::Tcl_GetVar2Ex(
self.interpreter,
ptr::null(),
name.as_ptr() as _,
tk_sys::TCL_LEAVE_ERR_MSG as _,
name2_ptr as _,
flags as _,
)
};
if res == ptr::null_mut() {
todo!();
// TODO: Should be tk error
unsafe {
let err_obj = tk_sys::Tcl_GetObjResult(self.interpreter);
let err_str_obj = tk_sys::Tcl_GetString(err_obj);
let err_cstr = ffi::CStr::from_ptr(err_str_obj as _);
return Err(vm.new_type_error(format!("{err_cstr:?}")));
}
}
let res = if self.want_objects {
self.from_object(res, vm)
Expand All @@ -271,6 +304,26 @@ mod _tkinter {
Ok(res)
}

#[pymethod]
fn getvar(&self, args: TkAppGetVarArgs, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
self.var_invoke();
self.inner_getvar(args, tk_sys::TCL_LEAVE_ERR_MSG, vm)
}

#[pymethod]
fn globalgetvar(
&self,
args: TkAppGetVarArgs,
vm: &VirtualMachine,
) -> PyResult<PyObjectRef> {
self.var_invoke();
self.inner_getvar(
args,
tk_sys::TCL_LEAVE_ERR_MSG | tk_sys::TCL_GLOBAL_ONLY,
vm,
)
}

#[pymethod]
fn getint(&self, arg: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
if let Some(int) = arg.downcast_ref::<PyInt>() {
Expand All @@ -289,7 +342,22 @@ mod _tkinter {
#[pymethod]
fn mainloop(&self, threshold: Option<i32>) -> PyResult<()> {
let threshold = threshold.unwrap_or(0);
todo!();
// self.dispatching = true;
QUIT_MAIN_LOOP.store(false, Ordering::Relaxed);
while unsafe { tk_sys::Tk_GetNumMainWindows() } > threshold
&& !QUIT_MAIN_LOOP.load(Ordering::Relaxed)
&& !ERROR_IN_CMD.load(Ordering::Relaxed)
{
let mut result = 0;
if self.threaded {
result = unsafe { tk_sys::Tcl_DoOneEvent(0 as _) } as i32;
} else {
result = unsafe { tk_sys::Tcl_DoOneEvent(tk_sys::TCL_DONT_WAIT as _) } as i32;
// TODO: sleep for the proper time
std::thread::sleep(std::time::Duration::from_millis(1));
}
}
Ok(())
}

#[pymethod]
Expand All @@ -306,6 +374,8 @@ mod _tkinter {
let threaded = {
let part1 = String::from("tcl_platform");
let part2 = String::from("threaded");
let part1 = ffi::CString::new(part1)?;
let part2 = ffi::CString::new(part2)?;
let part1_ptr = part1.as_ptr();
let part2_ptr = part2.as_ptr();
tk_sys::Tcl_GetVar2Ex(
Expand Down
Loading