From d6b9faacc994a71b8fe3d3ba749cbc54cfe83994 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 12 Jul 2017 13:26:11 -0400 Subject: [PATCH] rename the field --- src/platform/linux/x11/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platform/linux/x11/mod.rs b/src/platform/linux/x11/mod.rs index 7469405b..1fa11c9e 100644 --- a/src/platform/linux/x11/mod.rs +++ b/src/platform/linux/x11/mod.rs @@ -701,7 +701,7 @@ impl Window2 { x_events_loop.windows.lock().unwrap().insert(win.id(), WindowData { im: im, ic: ic, - spot: ffi::XPoint {x: 0, y: 0}, + ic_spot: ffi::XPoint {x: 0, y: 0}, config: None, multitouch: window.multitouch, cursor_pos: None, @@ -725,10 +725,10 @@ impl Window2 { 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 { + if w.ic_spot.x == x && w.ic_spot.y == y { return } - w.spot = nspot; + w.ic_spot = nspot; unsafe { let preedit_attr = (display.xlib.XVaCreateNestedList) (0, b"spotLocation\0", &nspot, ptr::null::<()>()); @@ -759,7 +759,7 @@ struct WindowData { config: Option, im: ffi::XIM, ic: ffi::XIC, - spot: ffi::XPoint, + ic_spot: ffi::XPoint, multitouch: bool, cursor_pos: Option<(f64, f64)>, }