daxvena/elemeld - Change 7MWGEO4D53CRQYELJQJ3PMI3BZJNAJJRX7AESNZ4NMF23XGBFEGAC

Introduced selection events

Created by daxvena on March 16, 2016

7MWGEO4D53CRQYELJQJ3PMI3BZJNAJJRX7AESNZ4NMF23XGBFEGAC

Dependencies

In channels

main

Change contents

Deletion in src/cluster.rs at line 11 [4.13]
B:BD[4.162] → [4.162:188]
```
    screens: Vec<Screen>,
```
Insertion in src/cluster.rs at line 12 [4.13]
[5.25]
[5.25]
```
    screens: Vec<Screen>,
```
Insertion in src/cluster.rs at line 14 [4.13]
[5.43]
[5.43]
```
    selections: Vec<Index>,
```
Insertion in src/cluster.rs at line 45 [4.13]
[4.329]
[6.589]
```
            local_screen: 0,
```
Deletion in src/cluster.rs at line 50 [4.13]
∅:D[6.741] → [5.139:168]
B:BD[4.384] → [5.139:168]
```
            local_screen: 0,
```
Insertion in src/cluster.rs at line 54 [4.13]
[5.286]
[4.451]
```
            selections: vec![0, 0],
```

Insertion in src/cluster.rs at line 76 [4.13]

[7.239]

            HostEvent::Selection(event) => {
                println!("{:?}", event);
                None
            },

Deletion in src/elemeld.rs at line 15 [4.8294]
B:BD[7.632] → [7.632:656]
```
    config: &'a Config,
```
Replacement in src/elemeld.rs at line 36 [4.8294]
∅:D[8.1491] → [7.946:978]
B:BD[7.946] → [7.946:978]
```
        // Setup host interface
```
[8.1491]
[7.978]
```
        // Initialize host interface
```
Replacement in src/elemeld.rs at line 43 [4.8294]
B:BD[7.1211] → [7.1211:1236]
```
        // Setup cluster
```
[7.1211]
[4.8692]
```
        // Initialize cluster
```
Replacement in src/elemeld.rs at line 48 [4.8294]
B:BD[4.8783] → [7.1295:1326]
```
        // Setup net interface
```
[4.8783]
[8.1686]
```
        // Initialize net interface
```
Deletion in src/elemeld.rs at line 57 [4.8294]
∅:D[8.2008] → [7.1620:1648]
B:BD[4.8801] → [7.1620:1648]
```
            config: config,
```
Insertion in src/io.rs at line 29 [10.11]
[9.515]
[10.588]
```
    Selection(Selection),
```

Insertion in src/io.rs at line 64 [10.11]

[9.941]


#[derive(Clone, Copy, Serialize, Deserialize, Debug)]
pub enum Selection {
    Primary,
    Clipboard,
}

Deletion in src/main.rs at line 1 [11.10002]
B:BD[11.10002] → [9.942:997]
B:BD[9.997] → [12.2761:2762]
```
#![allow(dead_code, unused_variables, unused_imports)]
```
Deletion in src/main.rs at line 29 [11.10002]
B:BD[8.6525] → [3.2023:2046]
∅:D[3.2046] → [8.6525:6549]
B:BD[8.6525] → [8.6525:6549]
```
// use docopt::Docopt;
use std::net::Ipv4Addr;
```
Insertion in src/main.rs at line 61 [11.10002]
[8.6803]
[7.6141]
```
    info!("Starting event loop");
```
Deletion in src/main.rs at line 64 [11.10002]
B:BD[7.6184] → [3.2776:2777]
Deletion in src/x11.rs at line 5 [11.308]
B:BD[11.344] → [9.4506:4529]
```
use x11_dl::keysym::*;
```
Insertion in src/x11.rs at line 13 [11.308]
[9.4622]
[13.2694]
```
use std::ffi::CString;
```
Insertion in src/x11.rs at line 20 [11.308]
[11.2102]
[11.2102]
```
    xfixes_event_base: i32,
```
Insertion in src/x11.rs at line 24 [11.308]
[13.2720]
[9.4645]
```
    clipboard: xlib::Atom,
```
Deletion in src/x11.rs at line 32 [11.308]
B:BD[11.2181] → [9.4726:4756]
```
        // Connect to display
```

Replacement in src/x11.rs at line 33 [11.308]

B:BD[11.2229] → [9.4757:4827]


        // FIXME: Should I use XQueryExtension for these extensions?

[11.2229]

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

Deletion in src/x11.rs at line 35 [11.308]
B:BD[11.2286] → [10.2114:2169]
```
        let xtest = xtest::Xf86vmode::open().unwrap();
```

Insertion in src/x11.rs at line 41 [11.308]

[11.2495]


        // Query XInput2
        unsafe {
            let mut major_opcode = mem::uninitialized();
            let mut first_event = mem::uninitialized();
            let mut first_error = mem::uninitialized();
            if (xlib.XQueryExtension)(display,
                CString::new("XInputExtension").unwrap().as_ptr(),
                &mut major_opcode,
                &mut first_event,
                &mut first_error,
            ) == xlib::False {
                panic!("Failed to query XInputExtension");
            };
        }
        // Query XFixes
        let xfixes_event_base = unsafe {
            let mut event_base: i32 = mem::uninitialized();
            let mut error_base: i32 = mem::uninitialized();
            if (xfixes.XFixesQueryExtension)(display,
                &mut event_base,
                &mut error_base,
            ) == xlib::False {
                panic!("Failed to query XFixes");
            }

Insertion in src/x11.rs at line 68 [11.308]
[11.2496]
[13.2721]
```
            event_base
        };
```

Insertion in src/x11.rs at line 72 [11.308]

[13.2787]

[4.15954]

        let clipboard = unsafe { (xlib.XInternAtom)(
            display, CString::new("CLIPBOARD").unwrap().as_ptr(), 0
        ) };

Deletion in src/x11.rs at line 78 [11.308]
B:BD[11.2538] → [11.2538:2568]
```
            xinput2: xinput2,
```
Insertion in src/x11.rs at line 79 [11.308]
[10.2196]
[11.2568]
```
            xinput2: xinput2,
```

Insertion in src/x11.rs at line 81 [11.308]

[11.2596]

[13.2788]

            xfixes_event_base: xfixes_event_base,

Insertion in src/x11.rs at line 85 [11.308]
[13.2842]
[9.4858]
```
            clipboard: clipboard,
```

Replacement in src/x11.rs at line 91 [11.308]

B:BD[9.4957] → [9.4957:5055]

        // Initialize last_pos for computing deltas
        host.last_pos.set(host.cursor_pos());

[9.4957]

[9.5055]

        host.init();
        host
    }

Replacement in src/x11.rs at line 95 [11.308]

B:BD[9.5056] → [9.5056:5088]

        // Setup default events

[9.5056]

[9.5088]

    fn init(&self) {
        // Initialize last_pos for computing cursor deltas
        self.last_pos.set(self.cursor_pos());
        // Setup selection events
        self.select_selection_input(self.root, xlib::XA_PRIMARY, xfixes::XFixesSetSelectionOwnerNotifyMask);
        self.select_selection_input(self.root, self.clipboard, xfixes::XFixesSetSelectionOwnerNotifyMask);
        // Setup raw motion events

Replacement in src/x11.rs at line 113 [11.308]

B:BD[9.5420] → [9.5420:5477]

        host.xi_select_events(&mut events);
        host

[9.5420]

[11.2635]

        self.select_events(self.root, &mut events);

Insertion in src/x11.rs at line 129 [11.308]

[11.3032]

[9.5721]

    // xfixes
    fn select_selection_input(&self, window: xlib::Window, atom: xlib::Atom, event_mask: u64) {
        unsafe { (self.xfixes.XFixesSelectSelectionInput)(
            self.display, window, atom, event_mask
        ) };
    }

Replacement in src/x11.rs at line 137 [11.308]

B:BD[9.5736] → [9.5736:5804]

    fn xi_select_events(&self, mask: &mut [xinput2::XIEventMask]) {

[9.5736]

[9.5804]

    fn select_events(&self, window: xlib::Window, mask: &mut [xinput2::XIEventMask]) {

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

B:BD[9.5852] → [9.5852:5889]

            self.display, self.root,

[9.5852]

[9.5889]

            self.display, window,

Insertion in src/x11.rs at line 178 [11.308]

[14.1808]

[8.7352]

    fn recv_selection_event(&self, event: xfixes::XFixesSelectionNotifyEvent) -> Option<HostEvent> {
        match event.subtype {
            xfixes::XFixesSetSelectionOwnerNotify => {
                if event.selection == xlib::XA_PRIMARY {
                    Some(HostEvent::Selection(Selection::Primary))
                } else if event.selection == self.clipboard {
                    Some(HostEvent::Selection(Selection::Clipboard))
                } else {
                    warn!("Unexpected selection source: {}", event.selection);
                    None
                }
            },
            subtype => {
                warn!("Unexpected XFixesSelection sub event: {}", subtype);
                None
            }
        }
    }

Replacement in src/x11.rs at line 306 [11.308]

B:BD[9.15282] → [9.15282:15779]

B:BD[9.15779] → [2.132:190]

∅:D[15.2185] → [9.15840:15886]

∅:D[2.190] → [9.15840:15886]

B:BD[9.15840] → [9.15840:15886]

        match event.get_type() {
            xlib::GenericEvent => self.recv_generic_event(From::from(event)),
            xlib::ButtonPress => self.recv_button_event(From::from(event), true),
            xlib::ButtonRelease => self.recv_button_event(From::from(event), false),
            xlib::KeyPress => self.recv_key_event(From::from(event), true),
            xlib::KeyRelease => self.recv_key_event(From::from(event), false),
            xlib::MappingNotify => None,
            event => {
                warn!("Unexpected X11 event: {}", event);
                None
            },
        }

[9.15282]

[9.15886]

        let event_type = event.get_type();
        // Standard events
        match event_type {
            xlib::GenericEvent => return self.recv_generic_event(From::from(event)),
            xlib::ButtonPress => return self.recv_button_event(From::from(event), true),
            xlib::ButtonRelease => return self.recv_button_event(From::from(event), false),
            xlib::KeyPress => return self.recv_key_event(From::from(event), true),
            xlib::KeyRelease => return self.recv_key_event(From::from(event), false),
            xlib::MappingNotify => return None,
            _ => (),
        };
        // XFixes selection events
        match event_type - self.xfixes_event_base {
            xfixes::XFixesSelectionNotify => return self.recv_selection_event(From::from(event)),
            _ => (),
        };
        warn!("Unexpected X11 event: {}", event_type);
        None

Insertion in src/x11.rs at line 335 [11.308]

[8.7947]

[10.5968]

            event => warn!("Unexpected host event: {:?}", event),

Introduced selection events

Dependencies

In channels

Change contents

Deletion in src/cluster.rs at line 11 [4.13]

Insertion in src/cluster.rs at line 12 [4.13]

Insertion in src/cluster.rs at line 14 [4.13]

Insertion in src/cluster.rs at line 45 [4.13]

Deletion in src/cluster.rs at line 50 [4.13]

Insertion in src/cluster.rs at line 54 [4.13]

Insertion in src/cluster.rs at line 76 [4.13]

Deletion in src/elemeld.rs at line 15 [4.8294]

Replacement in src/elemeld.rs at line 36 [4.8294]

Replacement in src/elemeld.rs at line 43 [4.8294]

Replacement in src/elemeld.rs at line 48 [4.8294]

Deletion in src/elemeld.rs at line 57 [4.8294]

Insertion in src/io.rs at line 29 [10.11]

Insertion in src/io.rs at line 64 [10.11]

Deletion in src/main.rs at line 1 [11.10002]

Deletion in src/main.rs at line 29 [11.10002]

Insertion in src/main.rs at line 61 [11.10002]

Deletion in src/main.rs at line 64 [11.10002]

Deletion in src/x11.rs at line 5 [11.308]

Insertion in src/x11.rs at line 13 [11.308]

Insertion in src/x11.rs at line 20 [11.308]

Insertion in src/x11.rs at line 24 [11.308]

Deletion in src/x11.rs at line 32 [11.308]