diff options
Diffstat (limited to 'src/x11/mod.rs')
| -rw-r--r-- | src/x11/mod.rs | 114 |
1 files changed, 105 insertions, 9 deletions
diff --git a/src/x11/mod.rs b/src/x11/mod.rs index 61488a1..76339f5 100644 --- a/src/x11/mod.rs +++ b/src/x11/mod.rs @@ -9,6 +9,8 @@ mod ffi; pub struct Window { display: *mut ffi::Display, window: ffi::Window, + im: ffi::XIM, + ic: ffi::XIC, context: ffi::GLXContext, is_closed: AtomicBool, wm_delete_window: ffi::Atom, @@ -80,7 +82,7 @@ impl Window { swa.event_mask = ffi::ExposureMask | ffi::ResizeRedirectMask | ffi::VisibilityChangeMask | ffi::KeyPressMask | ffi::PointerMotionMask | ffi::KeyPressMask | ffi::KeyReleaseMask | ffi::ButtonPressMask | - ffi::ButtonReleaseMask; + ffi::ButtonReleaseMask | ffi::KeymapStateMask; swa }; @@ -109,6 +111,29 @@ impl Window { wm_delete_window }; + // creating + let im = unsafe { + let im = ffi::XOpenIM(display, ptr::null(), ptr::mut_null(), ptr::mut_null()); + if im.is_null() { + return Err(format!("XOpenIM failed")); + } + im + }; + + // creating input context + let ic = unsafe { + use std::c_str::ToCStr; + + let ic = ffi::XCreateIC(im, "inputStyle".to_c_str().as_ptr(), + ffi::XIMPreeditNothing | ffi::XIMStatusNothing, "clientWindow".to_c_str().as_ptr(), + window, ptr::null()); + if ic.is_null() { + return Err(format!("XCreateIC failed")); + } + ffi::XSetICFocus(ic); + ic + }; + // creating GL context let context = unsafe { ffi::glXCreateContext(display, visual_infos, ptr::null(), 1) @@ -118,6 +143,8 @@ impl Window { Ok(Window{ display: display, window: window, + im: im, + ic: ic, context: context, is_closed: AtomicBool::new(false), wm_delete_window: wm_delete_window, @@ -136,8 +163,31 @@ impl Window { } } + fn get_geometry(&self) -> Option<(int, int, uint, uint)> { + unsafe { + use std::mem; + + let mut root: ffi::Window = mem::uninitialized(); + let mut x: libc::c_int = mem::uninitialized(); + let mut y: libc::c_int = mem::uninitialized(); + let mut width: libc::c_uint = mem::uninitialized(); + let mut height: libc::c_uint = mem::uninitialized(); + let mut border: libc::c_uint = mem::uninitialized(); + let mut depth: libc::c_uint = mem::uninitialized(); + + if ffi::XGetGeometry(self.display, self.window, + &mut root, &mut x, &mut y, &mut width, &mut height, + &mut border, &mut depth) == 0 + { + return None; + } + + Some((x as int, y as int, width as uint, height as uint)) + } + } + pub fn get_position(&self) -> Option<(int, int)> { - unimplemented!() + self.get_geometry().map(|(x, y, _, _)| (x, y)) } pub fn set_position(&self, x: uint, y: uint) { @@ -145,7 +195,7 @@ impl Window { } pub fn get_inner_size(&self) -> Option<(uint, uint)> { - unimplemented!() + self.get_geometry().map(|(_, _, w, h)| (w, h)) } pub fn get_outer_size(&self) -> Option<(uint, uint)> { @@ -176,6 +226,10 @@ impl Window { } match xev.type_ { + ffi::KeymapNotify => { + unsafe { ffi::XRefreshKeyboardMapping(&xev) } + }, + ffi::ClientMessage => { use Closed; use std::sync::atomics::Relaxed; @@ -201,11 +255,32 @@ impl Window { }, ffi::KeyPress | ffi::KeyRelease => { - use {Pressed, Released}; - let event: &ffi::XKeyEvent = unsafe { mem::transmute(&xev) }; + use {Pressed, Released, ReceivedCharacter}; + let event: &mut ffi::XKeyEvent = unsafe { mem::transmute(&xev) }; + + if event.type_ == ffi::KeyPress { + let raw_ev: *mut ffi::XKeyEvent = event; + unsafe { ffi::XFilterEvent(mem::transmute(raw_ev), self.window) }; + } let keysym = unsafe { ffi::XKeycodeToKeysym(self.display, event.keycode as ffi::KeyCode, 0) }; + let written = unsafe { + use std::str; + + let mut buffer: [u8, ..16] = [mem::uninitialized(), ..16]; + let raw_ev: *mut ffi::XKeyEvent = event; + let count = ffi::Xutf8LookupString(self.ic, mem::transmute(raw_ev), + mem::transmute(buffer.as_mut_ptr()), + buffer.len() as libc::c_int, ptr::mut_null(), ptr::mut_null()); + + str::from_utf8(buffer.as_slice().slice_to(count as uint)).unwrap_or("").to_string() + }; + + for chr in written.as_slice().chars() { + events.push(ReceivedCharacter(chr)); + } + match events::keycode_to_element(keysym as libc::c_uint) { Some(elem) if xev.type_ == ffi::KeyPress => { events.push(Pressed(elem)); @@ -220,8 +295,27 @@ impl Window { ffi::ButtonPress | ffi::ButtonRelease => { use {Pressed, Released}; + use events; let event: &ffi::XButtonEvent = unsafe { mem::transmute(&xev) }; - //events.push(CursorPositionChanged(event.x as uint, event.y as uint)); + + let elem = match event.button { + ffi::Button1 => Some(events::Button1), + ffi::Button2 => Some(events::Button2), + ffi::Button3 => Some(events::Button3), + ffi::Button4 => Some(events::Button4), + ffi::Button5 => Some(events::Button5), + _ => None + }; + + if elem.is_some() { + let elem = elem.unwrap(); + + if xev.type_ == ffi::ButtonPress { + events.push(Pressed(elem)); + } else if xev.type_ == ffi::ButtonRelease { + events.push(Released(elem)); + } + } }, _ => () @@ -276,8 +370,10 @@ impl Window { impl Drop for Window { fn drop(&mut self) { - unsafe { ffi::glXDestroyContext(self.display, self.context) } - unsafe { ffi::XDestroyWindow(self.display, self.window) } - unsafe { ffi::XCloseDisplay(self.display) } + unsafe { ffi::glXDestroyContext(self.display, self.context); } + unsafe { ffi::XDestroyIC(self.ic); } + unsafe { ffi::XCloseIM(self.im); } + unsafe { ffi::XDestroyWindow(self.display, self.window); } + unsafe { ffi::XCloseDisplay(self.display); } } } |