remove the the redundant code, fix a bug

This commit is contained in:
Determinant 2017-07-12 00:00:51 -04:00
parent 5e5debc48f
commit aea61a74fb
2 changed files with 30 additions and 0 deletions

View file

@ -43,6 +43,8 @@ pub trait WindowExt {
fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
fn send_xim_spot(&self, x: i16, y: i16);
/// This function returns the underlying `xcb_connection_t` of an xlib `Display`.
///
/// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
@ -121,6 +123,12 @@ impl WindowExt for Window {
}
}
fn send_xim_spot(&self, x: i16, y: i16) {
if let LinuxWindow::X(ref w) = self.window {
w.send_xim_spot(x, y);
}
}
#[inline]
fn get_wayland_surface(&self) -> Option<*mut libc::c_void> {
use wayland_client::Proxy;

View file

@ -685,6 +685,7 @@ impl Window2 {
x_events_loop.windows.lock().unwrap().insert(win.id(), WindowData {
im: im,
ic: ic,
spot: ffi::XPoint {x: 0, y: 0},
config: None,
multitouch: window.multitouch,
cursor_pos: None,
@ -701,6 +702,26 @@ impl Window2 {
pub fn id(&self) -> WindowId {
self.window.id()
}
#[inline]
pub fn send_xim_spot(&self, x: i16, y: i16) {
if let (Some(windows), Some(display)) = (self.windows.upgrade(), self.display.upgrade()) {
let nspot = ffi::XPoint{x: x, y: y};
let mut windows = windows.lock().unwrap();
let mut w = windows.get_mut(&self.window.id()).unwrap();
if w.spot.x == x && w.spot.y == y {
return
}
w.spot = nspot;
unsafe {
let preedit_attr = (display.xlib.XVaCreateNestedList)
(0, b"spotLocation\0", &nspot, ptr::null::<()>());
(display.xlib.XSetICValues)(w.ic, b"preeditAttributes\0",
preedit_attr, ptr::null::<()>());
(display.xlib.XFree)(preedit_attr);
}
}
}
}
impl Drop for Window2 {
@ -722,6 +743,7 @@ struct WindowData {
config: Option<WindowConfig>,
im: ffi::XIM,
ic: ffi::XIC,
spot: ffi::XPoint,
multitouch: bool,
cursor_pos: Option<(f64, f64)>,
}