daxvena/elemeld - Change MT3IK66TJ6KVVJLT3JBN5CIJTZVD5WSYRK5WDVRGQ4BPFXACXJKQC

handle x11 open errors & use c types

Created by daxvena on September 6, 2020

MT3IK66TJ6KVVJLT3JBN5CIJTZVD5WSYRK5WDVRGQ4BPFXACXJKQC

Dependencies

In channels

main

Change contents

Replacement in src/x11.rs at line 17 [5.308]
B:BD[4.583] → [3.0:25]
```
use std::os::raw::c_int;
```
[4.583]
[6.5198]
```
use std::os::raw::{c_int, c_uchar, c_uint};
```
Replacement in src/x11.rs at line 42 [5.308]
∅:D[7.4725] → [5.2153:2181]
∅:D[8.15953] → [5.2153:2181]
∅:D[6.5435] → [5.2153:2181]
B:BD[5.2153] → [5.2153:2181]
```
    pub fn open() -> Self {
```
[6.5435]
[6.5436]
```
    pub fn open() -> Result<Self, x11_dl::error::OpenError> {
```

Replacement in src/x11.rs at line 44 [5.308]

B:BD[6.5453] → [6.5453:5505]

            let xlib = xlib::Xlib::open().unwrap();

[6.5453]

[6.5505]

            let xlib = xlib::Xlib::open()?;

Replacement in src/x11.rs at line 56 [5.308]

B:BD[5.2341] → [6.5856:5937]

            // Query X
            let xfixes = xfixes::XFixes::open().unwrap();

[5.2341]

[6.5937]

            // Query XFixes
            let xfixes = xfixes::XFixes::open()?;

Replacement in src/x11.rs at line 90 [5.308]

B:BD[6.6943] → [6.6943:7004]

            let xinput2 = xinput2::XInput2::open().unwrap();

[6.6943]

[3.128]

            let xinput2 = xinput2::XInput2::open()?;

Replacement in src/x11.rs at line 107 [5.308]

B:BD[6.7379] → [6.7379:7455]

            let mut mask = [0u8; (xinput2::XI_LASTEVENT as usize + 7) / 8];

[6.7379]

[6.7455]

            let mut mask = [0; (xinput2::XI_LASTEVENT as usize + 7) / 8];

Replacement in src/x11.rs at line 112 [5.308]

B:BD[6.7630] → [6.7630:7722]

                mask_len: mask.len() as i32,
                mask: &mut mask[0] as *mut u8,

[6.7630]

[6.7722]

                mask_len: mask.len() as c_int,
                mask: &mut mask[0] as *mut c_uchar,

Replacement in src/x11.rs at line 118 [5.308]

B:BD[6.7808] → [6.7808:7891]

                &mut events[0] as *mut xinput2::XIEventMask, events.len() as i32);

[6.7808]

[7.5055]

                &mut events[0] as *mut xinput2::XIEventMask, events.len() as c_int);

Replacement in src/x11.rs at line 120 [5.308]

B:BD[7.5056] → [6.7892:7951]

            let xtest = xtest::Xf86vmode::open().unwrap();

[7.5056]

[9.2065]

            let xtest = xtest::Xf86vmode::open()?;

Replacement in src/x11.rs at line 141 [5.308]
B:BD[6.8344] → [6.8344:8361]
```
            host
```
[6.8344]
[6.8361]
```
            Ok(host)
```

Replacement in src/x11.rs at line 154 [5.308]

B:BD[6.8635] → [6.8635:8714]

            (self.xlib.XKeycodeToKeysym)(self.display, event.keycode as u8, 0)

[6.8635]

[6.8714]

            (self.xlib.XKeycodeToKeysym)(self.display, event.keycode as c_uchar, 0)

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

B:BD[7.10959] → [10.57:171]

            (self.xtest.XTestFakeButtonEvent)(self.display, event.button, event.state as i32, xlib::CurrentTime);

[7.10959]

[6.9463]

            (self.xtest.XTestFakeButtonEvent)(self.display, event.button, event.state as c_int, xlib::CurrentTime);

Replacement in src/x11.rs at line 233 [5.308]

∅:D[11.126] → [7.13528:13625]

B:BD[7.13528] → [7.13528:13625]

            (self.xtest.XTestFakeKeyEvent)(self.display, keycode as u32, event.state as i32, 0);

[11.126]

[6.9474]

            (self.xtest.XTestFakeKeyEvent)(self.display, keycode as c_uint, event.state as c_int, 0);

Replacement in src/x11.rs at line 277 [5.308]

B:BD[6.10142] → [6.10142:10219]

        let mask = (xlib::ButtonPressMask | xlib::ButtonReleaseMask) as u32;

[6.10142]

[12.5200]

        let mask = (xlib::ButtonPressMask | xlib::ButtonReleaseMask) as c_uint;

Replacement in src/x11.rs at line 330 [5.308]

B:BD[6.10841] → [6.10841:10928]

    fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Option<Self::Item>> {

[6.10841]

[2.267]

    fn poll_next(
        self: Pin<&mut Self>,
        cx: &mut Context,
    ) -> Poll<Option<Self::Item>> {

Replacement in src/x11.rs at line 338 [5.308]

B:BD[2.432] → [2.432:475]

        const QueuedAfterReading: i32 = 1;

[2.432]

[2.475]

        const QueuedAfterReading: c_int = 1;