daxvena/elemeld - Change IB7BAT6ELPDA7V3G53E4D4TNVUHXBXEPI7NYYDN6KR6T2LVH5QYQC

x11 loop instead of recursion

Created by daxvena on September 19, 2020

IB7BAT6ELPDA7V3G53E4D4TNVUHXBXEPI7NYYDN6KR6T2LVH5QYQC

Dependencies

In channels

main

Change contents

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

B:BD[3.338] → [3.338:432]

B:BD[3.432] → [2.1118:1163]

        // TODO: Add XEventsQueued constants to xlib
        #[allow(non_upper_case_globals)]
        const QueuedAfterReading: c_int = 1;

[3.338]

[3.475]

        loop {
            // TODO: Add XEventsQueued constants to xlib
            #[allow(non_upper_case_globals)]
            const QueuedAfterReading: c_int = 1;

Replacement in src/x11.rs at line 343 [4.308]

B:BD[3.476] → [3.476:582]

∅:D[3.582] → [5.11099:11110]

B:BD[5.11099] → [5.11099:11110]

        let num_events = unsafe {
            (self.xlib.XEventsQueued)(self.display, QueuedAfterReading)
        };

[3.476]

[5.11110]

            let num_events = unsafe {
                (self.xlib.XEventsQueued)(self.display, QueuedAfterReading)
            };
            if num_events <= 0 {
                self.io.clear_read_ready(cx, mio::Ready::readable())?;
                return Poll::Pending;
            }

Replacement in src/x11.rs at line 352 [4.308]

B:BD[6.15178] → [6.15178:15207]

B:BD[6.15207] → [3.583:650]

∅:D[3.650] → [5.11187:11221]

B:BD[5.11187] → [5.11187:11221]

∅:D[5.11221] → [6.15232:15242]

B:BD[6.15232] → [6.15232:15242]

        if num_events <= 0 {
            self.io.clear_read_ready(cx, mio::Ready::readable())?;
            return Poll::Pending;
        }

[5.11111]

[7.3570]

            let event = unsafe {
                let mut event = MaybeUninit::uninit();
                (self.xlib.XNextEvent)(self.display, event.as_mut_ptr());
                event.assume_init()
            };

Replacement in src/x11.rs at line 358 [4.308]

B:BD[7.3571] → [5.11222:11404]

∅:D[5.11404] → [7.4129:4140]

B:BD[7.4129] → [7.4129:4140]

        let event = unsafe {
            let mut event = MaybeUninit::uninit();
            (self.xlib.XNextEvent)(self.display, event.as_mut_ptr());
            event.assume_init()
        };

[7.3571]

[7.4140]

            let host_event = match event.get_type() {
                // Standard events
                xlib::ButtonPress => Some(HostEvent::Button(Self::map_button_event(event.into(), true))),
                xlib::ButtonRelease => Some(HostEvent::Button(Self::map_button_event(event.into(), false))),
                xlib::KeyPress => Some(HostEvent::Key(self.map_key_event(event.into(), true))),
                xlib::KeyRelease => Some(HostEvent::Key(self.map_key_event(event.into(), false))),
                xlib::MappingNotify => None,
                xlib::GenericEvent => self.map_generic_event(event.into()),

Replacement in src/x11.rs at line 367 [4.308]

B:BD[7.4141] → [5.11405:11993]

        let host_event = match event.get_type() {
            // Standard events
            xlib::ButtonPress => Some(HostEvent::Button(Self::map_button_event(event.into(), true))),
            xlib::ButtonRelease => Some(HostEvent::Button(Self::map_button_event(event.into(), false))),
            xlib::KeyPress => Some(HostEvent::Key(self.map_key_event(event.into(), true))),
            xlib::KeyRelease => Some(HostEvent::Key(self.map_key_event(event.into(), false))),
            xlib::MappingNotify => None,
            xlib::GenericEvent => self.map_generic_event(event.into()),

[7.4141]

[5.11993]

                // XFixes selection events
                event_type if event_type - self.xfixes_event_base == xfixes::XFixesSelectionNotify =>
                    self.map_selection_event(event.into()),

Replacement in src/x11.rs at line 371 [4.308]

B:BD[5.11994] → [5.11994:12187]

            // XFixes selection events
            event_type if event_type - self.xfixes_event_base == xfixes::XFixesSelectionNotify =>
                self.map_selection_event(event.into()),

[5.11994]

[5.12187]

                event_type => {
                    warn!("Unexpected X11 event: {}", event_type);
                    None
                }
            };

Replacement in src/x11.rs at line 377 [4.308]

B:BD[5.12188] → [5.12188:12300]

            event_type => {
                warn!("Unexpected X11 event: {}", event_type);
                None

[5.12188]

[5.12300]

            if let Some(host_event) = host_event {
                return Poll::Ready(Some(Ok(host_event)));

Deletion in src/x11.rs at line 380 [4.308]
∅:D[5.12314] → [7.4347:4358]
B:BD[7.4347] → [7.4347:4358]
B:BD[7.4358] → [5.12315:12343]
B:BD[5.12343] → [3.651:718]
∅:D[3.718] → [5.12406:12446]
B:BD[5.12406] → [5.12406:12446]
```
        };
        match host_event {
            Some(host_event) => Poll::Ready(Some(Ok(host_event))),
            None => self.poll_next(cx),
```