PolytreeDE
/
polytreewm
1
0
Fork 0
Code Issues 4 Releases Activity

Disable error handling

This commit is contained in:
Alex Kotov 2022-09-09 19:27:29 +04:00
parent 21080d2cbb
commit a98a7d5a50
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rust-polytreewm/src/api/xbase.rs
View File

@ -7,12 +7,12 @@ use std::os::raw::*;
#[no_mangle]
unsafe extern "C" fn xbase_new(
program_title: *const c_char,
x_error_handler: xbase::ErrorHandler,
_x_error_handler: xbase::ErrorHandler,
) -> *mut Xbase {
let program_title = CStr::from_ptr(program_title).to_str().unwrap();
let layout = Layout::new::<Xbase>();
let ptr = alloc(layout) as *mut Xbase;
*ptr = Xbase::new(program_title.to_string(), x_error_handler).unwrap();
*ptr = Xbase::new(program_title.to_string() /*, x_error_handler*/).unwrap();
ptr
}

13
rust-polytreewm/src/xbase.rs
View File

@ -15,14 +15,14 @@ pub struct Xbase {
x_screen: c_int,
x_root: c_ulong,
screen_sizes: geom::Sizes,
x_error: Option<ErrorHandler>,
// x_error: Option<ErrorHandler>,
atoms: Atoms,
}
impl Xbase {
pub fn new(
program_title: String,
x_error_handler: ErrorHandler,
// x_error_handler: ErrorHandler,
) -> Result<Self, Box<dyn std::error::Error>> {
unsafe {
if xlib::XSupportsLocale() == 0 {
@ -42,7 +42,7 @@ impl Xbase {
xlib::XDisplayHeight(x_display, x_screen),
);
let x_error = xlib::XSetErrorHandler(Some(x_error_wm_check));
// let x_error = xlib::XSetErrorHandler(Some(x_error_wm_check));
xlib::XSelectInput(
x_display,
@ -50,7 +50,7 @@ impl Xbase {
xlib::SubstructureRedirectMask,
);
xlib::XSync(x_display, xlib::False);
xlib::XSetErrorHandler(Some(x_error_handler));
// xlib::XSetErrorHandler(Some(x_error_handler));
xlib::XSync(x_display, xlib::False);
let atoms = Atoms::create(x_display);
@ -61,7 +61,7 @@ impl Xbase {
x_screen,
x_root,
screen_sizes,
x_error,
// x_error,
atoms,
})
}
@ -73,7 +73,7 @@ impl Drop for Xbase {
unsafe { xlib::XCloseDisplay(self.x_display) };
}
}
/*
unsafe extern "C" fn x_error_wm_check(
_display: *mut Display,
_x_error_event: *mut xlib::XErrorEvent,
@ -82,3 +82,4 @@ unsafe extern "C" fn x_error_wm_check(
// panic!("another window manager is already running");
0
}
*/