daxvena/elemeld - Change JVO3ABY7VTFBUPUEPNXVSGWLCBJLPDHLSLZJEW2LSEOFUR5Z4RIAC

Tightened up the X11 interface I am going to keep doing this until the interface can abstract over any display server.

Created by daxvena on February 9, 2016

JVO3ABY7VTFBUPUEPNXVSGWLCBJLPDHLSLZJEW2LSEOFUR5Z4RIAC

Dependencies

In channels

main

Change contents

Deletion in src/main.rs at line 47 [3.10002]
B:BD[3.11006] → [3.11006:11056]
```
        let root = display.default_root_window();
```

Replacement in src/main.rs at line 56 [3.10002]

B:BD[3.11343] → [3.11343:11396]

        display.xi_select_events(root, &mut events);

[3.11343]

[3.11396]

        display.xi_select_events(&mut events);

Replacement in src/main.rs at line 80 [3.10002]

B:BD[3.12266] → [3.12266:12327]

B:BD[3.12327] → [2.50:197]

        let (_, _, x, y, _, _, _) = display.query_pointer();
        let (width, height) = {
            let screen = display.default_screen_of_display();
            (screen.width, screen.height)
        };

[3.12266]

[3.12327]

        let (x, y) = display.query_pointer();
        let (width, height) = display.query_screen();

Deletion in src/main.rs at line 99 [3.10002]

B:BD[3.12713] → [3.12713:12780]

        self.udp_socket.send_to(b"cursor move\n", &addr).unwrap();

Insertion in src/main.rs at line 104 [3.10002]

[3.12901]


        let message = format!("cursor: {},{}", self.x, self.y);
        self.udp_socket.send_to(message.as_bytes(), &addr).unwrap();

Replacement in src/main.rs at line 121 [3.10002]

B:BD[3.13284] → [3.13284:13620]

            let root = self.display.default_root_window();
            self.display.hide_cursor(root);
            self.display.grab_pointer(root, true,
                                      PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
                                      GrabModeAsync, GrabModeAsync, 0, 0, CurrentTime);

[3.13284]

[3.13620]

            self.display.hide_cursor();
            self.display.grab_pointer(PointerMotionMask | ButtonPressMask | ButtonReleaseMask);

Replacement in src/main.rs at line 132 [3.10002]

B:BD[3.13790] → [3.13790:13918]

            self.display.ungrab_pointer(CurrentTime);
            self.display.show_cursor(self.display.default_root_window());

[3.13790]

[3.13918]

            self.display.ungrab_pointer();
            self.display.show_cursor();

Deletion in src/main.rs at line 139 [3.10002]
B:BD[3.14002] → [3.14002:14057]
```
        let root = self.display.default_root_window();
```

Replacement in src/main.rs at line 141 [3.10002]

∅:D[2.435] → [3.14201:14283]

B:BD[3.14201] → [3.14201:14283]

        self.display.warp_pointer(0, root, 0, 0, 0, 0, self.real_x, self.real_y);

[2.435]

[3.14283]

        self.display.warp_pointer(self.real_x, self.real_y);

Deletion in src/main.rs at line 146 [3.10002]
B:BD[3.14360] → [3.14360:14415]
```
        let root = self.display.default_root_window();
```

Replacement in src/main.rs at line 148 [3.10002]

B:BD[3.14475] → [3.14475:14557]

        self.display.warp_pointer(0, root, 0, 0, 0, 0, self.real_x, self.real_y);

[3.14475]

[3.14557]

        self.display.warp_pointer(self.real_x, self.real_y);

Deletion in src/main.rs at line 161 [3.10002]

B:BD[3.14846] → [3.14846:14982]

                // TODO: Would XEventsQueued with QueuedAlready make more sense?
                assert!(self.display.pending() != 0);

Replacement in src/main.rs at line 162 [3.10002]

B:BD[3.15032] → [3.15032:15080]

                    Event::MotionNotify(e) => {

[3.15032]

[3.15080]

                    Some(Event::MotionNotify(e)) => {

Replacement in src/main.rs at line 165 [3.10002]

B:BD[3.15167] → [3.15167:15211]

                    Event::KeyPress(e) => {

[3.15167]

[3.15211]

                    Some(Event::KeyPress(e)) => {

Replacement in src/main.rs at line 167 [3.10002]

B:BD[3.15234] → [3.15234:15281]

                    Event::ButtonPress(e) => {

[3.15234]

[3.15281]

                    Some(Event::ButtonPress(e)) => {

Replacement in src/main.rs at line 169 [3.10002]

B:BD[3.15381] → [3.15381:15465]

                        self.udp_socket.send_to(b"button press\n", &addr).unwrap();

[3.15381]

[3.15465]

                        self.udp_socket.send_to(b"button press", &addr).unwrap();

Replacement in src/main.rs at line 171 [3.10002]

B:BD[3.15488] → [3.15488:15537]

                    Event::ButtonRelease(e) => {

[3.15488]

[3.15537]

                    Some(Event::ButtonRelease(e)) => {

Replacement in src/main.rs at line 173 [3.10002]

B:BD[3.15637] → [3.15637:15723]

                        self.udp_socket.send_to(b"button release\n", &addr).unwrap();

[3.15637]

[3.15723]

                        self.udp_socket.send_to(b"button release", &addr).unwrap();

Replacement in src/main.rs at line 175 [3.10002]

B:BD[3.15746] → [3.15746:15876]

                    Event::GenericEvent(e) => {
                        let (_, _, x, y, _, _, _) = self.display.query_pointer();

[3.15746]

[3.15876]

                    Some(Event::GenericEvent(e)) => {
                        let (x, y) = self.display.query_pointer();

Replacement in src/main.rs at line 179 [3.10002]

B:BD[3.15949] → [3.15949:15990]

                    _ => unreachable!(),

[3.15949]

[3.15990]

                    Some(_) => unreachable!(),
                    None => (),

Replacement in src/main.rs at line 187 [3.10002]

B:BD[3.16204] → [3.16204:16290]

                        print!("{}: {}", addr, str::from_utf8(&buf[..len]).unwrap());

[3.16204]

[3.16290]

                        println!("{}: {}", addr, str::from_utf8(&buf[..len]).unwrap());

Deletion in src/x11.rs at line 2 [3.308]
B:BD[3.330] → [3.330:343]
```
use xfixes;
```

Replacement in src/x11.rs at line 5 [3.308]

B:BD[3.386] → [3.386:459]

    // Structs
    Cursor,
    Screen,
    Time,
    Window,
    XColor,

[3.386]

[3.459]

    // Events
    XKeyPressedEvent,
    XKeyReleasedEvent,
    XButtonPressedEvent,
    XButtonReleasedEvent,
    XMotionEvent,
    XEnterWindowEvent,
    XLeaveWindowEvent,
    XFocusInEvent,
    XFocusOutEvent,
    XKeymapEvent,
    XExposeEvent,
    XGraphicsExposeEvent,
    XNoExposeEvent,
    XVisibilityEvent,
    XCreateWindowEvent,
    XDestroyWindowEvent,
    XUnmapEvent,
    XMapEvent,
    XMapRequestEvent,
    XReparentEvent,
    XConfigureEvent,
    XConfigureRequestEvent,
    XGravityEvent,
    XResizeRequestEvent,
    XCirculateEvent,
    XCirculateRequestEvent,
    XPropertyEvent,
    XSelectionClearEvent,
    XSelectionRequestEvent,
    XSelectionEvent,
    XColormapEvent,
    XClientMessageEvent,
    XMappingEvent,
    XGenericEventCookie,

Replacement in src/x11.rs at line 41 [3.308]
B:BD[3.460] → [3.460:473]
```
    // Masks
```
[3.460]
[3.473]
```
    // Event masks
```
Deletion in src/x11.rs at line 68 [3.308]
B:BD[3.1067] → [3.1067:1117]
```
    // Other
    GrabModeAsync,
    CurrentTime,
```

Replacement in src/x11.rs at line 77 [3.308]

B:BD[3.1233] → [3.1233:1248]

    // Structs

[3.1233]

[3.1248]

    // XInput objects
    XIAllDevices,
    XIAllMasterDevices,

Deletion in src/x11.rs at line 82 [3.308]
B:BD[3.1266] → [3.1266:1306]
```
    // Devices
    XIAllMasterDevices,
```

Insertion in src/x11.rs at line 83 [3.308]

[3.1320]

    XI_DeviceChanged,
    XI_KeyPress,
    XI_KeyRelease,
    XI_ButtonPress,
    XI_ButtonRelease,
    XI_Motion,
    XI_Enter,
    XI_Leave,
    XI_FocusIn,
    XI_FocusOut,
    XI_HierarchyChanged,
    XI_PropertyEvent,
    XI_RawKeyPress,
    XI_RawKeyRelease,
    XI_RawButtonPress,
    XI_RawButtonRelease,

Insertion in src/x11.rs at line 100 [3.308]

[3.1338]

    XI_TouchBegin,
    XI_TouchUpdate,
    XI_TouchEnd,
    XI_TouchOwnership,
    XI_RawTouchBegin,
    XI_RawTouchUpdate,
    XI_RawTouchEnd,
    XI_BarrierHit,
    XI_BarrierLeave,

Deletion in src/x11.rs at line 110 [3.308]

B:BD[3.1356] → [3.1356:1996]


    // Masks
    XI_DeviceChangedMask,
    XI_KeyPressMask,
    XI_KeyReleaseMask,
    XI_ButtonPressMask,
    XI_ButtonReleaseMask,
    XI_MotionMask,
    XI_EnterMask,
    XI_LeaveMask,
    XI_FocusInMask,
    XI_FocusOutMask,
    XI_HierarchyChangedMask,
    XI_PropertyEventMask,
    XI_RawKeyPressMask,
    XI_RawKeyReleaseMask,
    XI_RawButtonPressMask,
    XI_RawButtonReleaseMask,
    XI_RawMotionMask,
    XI_TouchBeginMask,
    XI_TouchEndMask,
    XI_TouchOwnershipChangedMask,
    XI_TouchUpdateMask,
    XI_RawTouchBeginMask,
    XI_RawTouchEndMask,
    XI_RawTouchUpdateMask,
    XI_BarrierHitMask,
    XI_BarrierLeaveMask,

Insertion in src/x11.rs at line 112 [3.308]
[3.2000]
[3.2000]
```
use xfixes;
pub use x11_dl::keysym::*;
```
Insertion in src/x11.rs at line 120 [3.308]
[3.2135]
[3.2135]
```
    root: xlib::Window,
```

Insertion in src/x11.rs at line 134 [3.308]

[3.2496]

        let root = unsafe { (xlib.XDefaultRootWindow)(display) };

Replacement in src/x11.rs at line 139 [3.308]

B:BD[3.2596] → [3.2596:2625]

            display: display

[3.2596]

[3.2625]

            display: display,
            root: root,

Replacement in src/x11.rs at line 149 [3.308]

B:BD[3.2779] → [3.2779:2890]

    pub fn default_root_window(&self) -> u64 {
        unsafe { (self.xlib.XDefaultRootWindow)(self.display) }

[3.2779]

[3.2890]

    pub fn flush(&self) {
        unsafe { (self.xlib.XFlush)(self.display) };

Replacement in src/x11.rs at line 153 [3.308]

B:BD[3.2897] → [3.2897:3025]

    pub fn default_screen_of_display(&self) -> &Screen {
        unsafe { &*(self.xlib.XDefaultScreenOfDisplay)(self.display) }

[3.2897]

[3.3025]

    pub fn grab_pointer(&self, event_mask: i64) {
        unsafe { (self.xlib.XGrabPointer)(
            self.display, self.root, xlib::True, event_mask as u32,
            xlib::GrabModeAsync, xlib::GrabModeAsync, 0, 0, xlib::CurrentTime
        ) };

Replacement in src/x11.rs at line 160 [3.308]

B:BD[3.3032] → [3.3032:3111]

    pub fn flush(&self) {
        unsafe { (self.xlib.XFlush)(self.display) };

[3.3032]

[3.3111]

    pub fn grab_keyboard(&self) {
        unsafe { (self.xlib.XGrabKeyboard)(
            self.display, self.root, xlib::True,
            xlib::GrabModeAsync, xlib::GrabModeAsync, xlib::CurrentTime
        ) };

Replacement in src/x11.rs at line 167 [3.308]

B:BD[3.3118] → [3.3118:3549]

    pub fn grab_pointer(&self, grab_window: Window, owner_events: bool,
                        event_mask: i64, pointer_mode: i32, keyboard_mode: i32,
                        confine_to: Window, cursor: Cursor, time: Time)
    {
        unsafe { (self.xlib.XGrabPointer)(
            self.display, grab_window, owner_events as i32, event_mask as u32,
            pointer_mode, keyboard_mode, confine_to, cursor, time
        ) };

[3.3118]

[3.3549]

    pub fn grab_key(&self, keycode: i32, modifiers: u32) {
        unsafe { (self.xlib.XGrabKey)(
            self.display, keycode, modifiers, self.root, xlib::True,
            xlib::GrabModeAsync, xlib::GrabModeAsync)
        };

Replacement in src/x11.rs at line 174 [3.308]

B:BD[3.3556] → [3.3556:3736]

    pub fn next_event(&self) -> Event {
        let mut event: xlib::XEvent = unsafe { mem::uninitialized() };
        unsafe { (self.xlib.XNextEvent)(self.display, &mut event) };

[3.3556]

[3.3736]

    pub fn next_event(&self) -> Option<Event> {
        // TODO: Would XEventsQueued with QueuedAlready make more sense?
        let num_events = unsafe { (self.xlib.XPending)(self.display) };
        if num_events <= 0 {
            return None;
        }
        let event = unsafe {
            let mut event = mem::uninitialized();
            (self.xlib.XNextEvent)(self.display, &mut event);
            event
        };

Replacement in src/x11.rs at line 187 [3.308]
B:BD[3.3737] → [3.3737:3770]
```
        match event.get_type() {
```
[3.3737]
[3.3770]
```
        Some(match event.get_type() {
```

Replacement in src/x11.rs at line 223 [3.308]

B:BD[3.6333] → [3.6333:6439]

        }
    }
    pub fn pending(&self) -> i32 {
        unsafe { (self.xlib.XPending)(self.display) }

[3.6333]

[3.6439]

})

Replacement in src/x11.rs at line 226 [3.308]

B:BD[3.6446] → [3.6446:6525]

    pub fn query_pointer(&self) -> (Window, Window, i32, i32, i32, i32, u32) {

[3.6446]

[3.6525]

    pub fn query_pointer(&self) -> (i32, i32) {

Replacement in src/x11.rs at line 228 [3.308]

B:BD[3.6542] → [3.6542:7002]

            let root = self.default_root_window();
            let mut root_return: Window = mem::uninitialized();
            let mut child_return: Window = mem::uninitialized();
            let mut root_x: i32 = mem::uninitialized();
            let mut root_y: i32 = mem::uninitialized();
            let mut child_x: i32 = mem::uninitialized();
            let mut child_y: i32 = mem::uninitialized();
            let mut mask: u32 = mem::uninitialized();

[3.6542]

[3.7002]

            let mut root = mem::uninitialized();
            let mut child = mem::uninitialized();
            let mut root_x = mem::uninitialized();
            let mut root_y = mem::uninitialized();
            let mut child_x = mem::uninitialized();
            let mut child_y = mem::uninitialized();
            let mut mask = mem::uninitialized();

Replacement in src/x11.rs at line 236 [3.308]

B:BD[3.7003] → [3.7003:7140]

            (self.xlib.XQueryPointer)(self.display, root,
                &mut root_return, &mut child_return, &mut root_x, &mut root_y,

[3.7003]

[3.7140]

            (self.xlib.XQueryPointer)(self.display, self.root,
                &mut root, &mut child, &mut root_x, &mut root_y,

Replacement in src/x11.rs at line 241 [3.308]

B:BD[3.7210] → [3.7210:7290]

            (root_return, child_return, root_x, root_y, child_x, child_y, mask)

[3.7210]

[3.7290]

            (root_x, root_y)

Replacement in src/x11.rs at line 245 [3.308]

B:BD[3.7307] → [3.7307:7442]

    pub fn select_input(&self, w: Window, event_mask: i64) {
        unsafe { (self.xlib.XSelectInput)(self.display, w, event_mask) };

[3.7307]

[3.7442]

    pub fn query_screen(&self) -> (i32, i32) {
        let screen = unsafe {
            &*(self.xlib.XDefaultScreenOfDisplay)(self.display)
        };
        (screen.width, screen.height)
    }
    pub fn select_input(&self, event_mask: i64) {
        unsafe { (self.xlib.XSelectInput)(self.display, self.root, event_mask) };

Replacement in src/x11.rs at line 256 [3.308]

B:BD[3.7449] → [3.7449:7563]

    pub fn ungrab_pointer(&self, time: Time) {
        unsafe { (self.xlib.XUngrabPointer)(self.display, time) };

[3.7449]

[3.7563]

    pub fn ungrab_pointer(&self) {
        unsafe { (self.xlib.XUngrabPointer)(self.display, xlib::CurrentTime) };

Replacement in src/x11.rs at line 260 [3.308]

B:BD[3.7570] → [3.7570:7765]

    pub fn warp_pointer(&self, src_w: Window, dest_w: Window,
                        src_x: i32, src_y: i32, src_width: u32, src_height: u32,
                        dest_x: i32, dest_y: i32) {

[3.7570]

[3.7765]

    pub fn warp_pointer(&self, x: i32, y: i32) {

Replacement in src/x11.rs at line 262 [3.308]

B:BD[3.7808] → [3.7808:7913]

            self.display, src_w, dest_w, src_x, src_y,
            src_width, src_height, dest_x, dest_y

[3.7808]

[3.7913]

            self.display, 0, self.root, 0, 0, 0, 0, x, y

Replacement in src/x11.rs at line 267 [3.308]

B:BD[3.7958] → [3.7958:8156]

    pub fn xi_select_events(&self, win: Window, mask: &mut [XIEventMask]) {
        unsafe { (self.xinput2.XISelectEvents)(self.display, win, &mut mask[0] as *mut XIEventMask, mask.len() as i32) };

[3.7958]

[3.8156]

    pub fn xi_select_events(&self, mask: &mut [XIEventMask]) {
        unsafe { (self.xinput2.XISelectEvents)(
            self.display, self.root,
            &mut mask[0] as *mut XIEventMask, mask.len() as i32
        ) };

Replacement in src/x11.rs at line 275 [3.308]

B:BD[3.8177] → [3.8177:8288]

    pub fn show_cursor(&self, w: Window) {
        unsafe { (self.xfixes.XFixesShowCursor)(self.display, w) };

[3.8177]

[3.8288]

    pub fn show_cursor(&self) {
        unsafe { (self.xfixes.XFixesShowCursor)(self.display, self.root) };

Replacement in src/x11.rs at line 279 [3.308]

B:BD[3.8295] → [3.8295:8406]

    pub fn hide_cursor(&self, w: Window) {
        unsafe { (self.xfixes.XFixesHideCursor)(self.display, w) };

[3.8295]

[3.8406]

    pub fn hide_cursor(&self) {
        unsafe { (self.xfixes.XFixesHideCursor)(self.display, self.root) };

Replacement in src/x11.rs at line 291 [3.308]

B:BD[3.8550] → [3.8550:9989]

    KeyPress(xlib::XKeyPressedEvent),
    KeyRelease(xlib::XKeyReleasedEvent),
    ButtonPress(xlib::XButtonPressedEvent),
    ButtonRelease(xlib::XButtonReleasedEvent),
    MotionNotify(xlib::XMotionEvent),
    EnterNotify(xlib::XEnterWindowEvent),
    LeaveNotify(xlib::XLeaveWindowEvent),
    FocusIn(xlib::XFocusInEvent),
    FocusOut(xlib::XFocusOutEvent),
    KeymapNotify(xlib::XKeymapEvent),
    Expose(xlib::XExposeEvent),
    GraphicsExpose(xlib::XGraphicsExposeEvent),
    NoExpose(xlib::XNoExposeEvent),
    VisibilityNotify(xlib::XVisibilityEvent),
    CreateNotify(xlib::XCreateWindowEvent),
    DestroyNotify(xlib::XDestroyWindowEvent),
    UnmapNotify(xlib::XUnmapEvent),
    MapNotify(xlib::XMapEvent),
    MapRequest(xlib::XMapRequestEvent),
    ReparentNotify(xlib::XReparentEvent),
    ConfigureNotify(xlib::XConfigureEvent),
    ConfigureRequest(xlib::XConfigureRequestEvent),
    GravityNotify(xlib::XGravityEvent),
    ResizeRequest(xlib::XResizeRequestEvent),
    CirculateNotify(xlib::XCirculateEvent),
    CirculateRequest(xlib::XCirculateRequestEvent),
    PropertyNotify(xlib::XPropertyEvent),
    SelectionClear(xlib::XSelectionClearEvent),
    SelectionRequest(xlib::XSelectionRequestEvent),
    SelectionNotify(xlib::XSelectionEvent),
    ColormapNotify(xlib::XColormapEvent),
    ClientMessage(xlib::XClientMessageEvent),
    MappingNotify(xlib::XMappingEvent),
    GenericEvent(xlib::XGenericEventCookie),

[3.8550]

[3.9989]

    KeyPress(XKeyPressedEvent),
    KeyRelease(XKeyReleasedEvent),
    ButtonPress(XButtonPressedEvent),
    ButtonRelease(XButtonReleasedEvent),
    MotionNotify(XMotionEvent),
    EnterNotify(XEnterWindowEvent),
    LeaveNotify(XLeaveWindowEvent),
    FocusIn(XFocusInEvent),
    FocusOut(XFocusOutEvent),
    KeymapNotify(XKeymapEvent),
    Expose(XExposeEvent),
    GraphicsExpose(XGraphicsExposeEvent),
    NoExpose(XNoExposeEvent),
    VisibilityNotify(XVisibilityEvent),
    CreateNotify(XCreateWindowEvent),
    DestroyNotify(XDestroyWindowEvent),
    UnmapNotify(XUnmapEvent),
    MapNotify(XMapEvent),
    MapRequest(XMapRequestEvent),
    ReparentNotify(XReparentEvent),
    ConfigureNotify(XConfigureEvent),
    ConfigureRequest(XConfigureRequestEvent),
    GravityNotify(XGravityEvent),
    ResizeRequest(XResizeRequestEvent),
    CirculateNotify(XCirculateEvent),
    CirculateRequest(XCirculateRequestEvent),
    PropertyNotify(XPropertyEvent),
    SelectionClear(XSelectionClearEvent),
    SelectionRequest(XSelectionRequestEvent),
    SelectionNotify(XSelectionEvent),
    ColormapNotify(XColormapEvent),
    ClientMessage(XClientMessageEvent),
    MappingNotify(XMappingEvent),
    GenericEvent(XGenericEventCookie),