rustdesk/qemu-display
1
0
Fork 0
mirror of https://github.com/rustdesk/qemu-display.git synced 2025-07-01 15:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to gtk4 0.5

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-11-15 11:36:27 +04:00
parent bb87cfc1fc
commit 721962af92
2 changed files with 92 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
qemu-rdw/src/display.rs
View File

@ -53,56 +53,63 @@ mod imp {
} }
impl ObjectImpl for Display { impl ObjectImpl for Display {
fn constructed(&self, obj: &Self::Type) { fn constructed(&self) {
self.parent_constructed(obj); self.parent_constructed();
obj.set_mouse_absolute(true); self.obj().set_mouse_absolute(true);
obj.connect_key_event(clone!(@weak obj => move |_, keyval, keycode, event| { self.obj().connect_key_event(
clone!(@weak self as this => move |_, keyval, keycode, event| {
log::debug!("key-event: {:?}", (keyval, keycode, event)); log::debug!("key-event: {:?}", (keyval, keycode, event));
if let Some(qnum) = KEYMAP_XORGEVDEV2QNUM.get(keycode as usize) { if let Some(qnum) = KEYMAP_XORGEVDEV2QNUM.get(keycode as usize) {
MainContext::default().spawn_local(clone!(@weak obj => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
if event.contains(rdw::KeyEvent::PRESS) { if event.contains(rdw::KeyEvent::PRESS) {
let _ = obj.console().keyboard.press(*qnum as u32).await; let _ = this.obj().console().keyboard.press(*qnum as u32).await;
} }
if event.contains(rdw::KeyEvent::RELEASE) { if event.contains(rdw::KeyEvent::RELEASE) {
let _ = obj.console().keyboard.release(*qnum as u32).await; let _ = this.obj().console().keyboard.release(*qnum as u32).await;
} }
})); }));
} }
})); }),
);
obj.connect_motion(clone!(@weak obj => move |_, x, y| { self.obj()
.connect_motion(clone!(@weak self as this => move |_, x, y| {
log::debug!("motion: {:?}", (x, y)); log::debug!("motion: {:?}", (x, y));
MainContext::default().spawn_local(clone!(@weak obj => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
let _ = obj.console().mouse.set_abs_position(x as _, y as _).await; let _ = this.obj().console().mouse.set_abs_position(x as _, y as _).await;
})); }));
})); }));
obj.connect_motion_relative(clone!(@weak obj => move |_, dx, dy| { self.obj()
.connect_motion_relative(clone!(@weak self as this => move |_, dx, dy| {
log::debug!("motion-relative: {:?}", (dx, dy)); log::debug!("motion-relative: {:?}", (dx, dy));
MainContext::default().spawn_local(clone!(@weak obj => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
let _ = obj.console().mouse.rel_motion(dx as _, dy as _).await; let _ = this.obj().console().mouse.rel_motion(dx as _, dy as _).await;
})); }));
})); }));
obj.connect_mouse_press(clone!(@weak obj => move |_, button| { self.obj()
.connect_mouse_press(clone!(@weak self as this => move |_, button| {
log::debug!("mouse-press: {:?}", button); log::debug!("mouse-press: {:?}", button);
MainContext::default().spawn_local(clone!(@weak obj => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
let button = from_gdk_button(button); let button = from_gdk_button(button);
let _ = obj.console().mouse.press(button).await; let _ = this.obj().console().mouse.press(button).await;
})); }));
})); }));
obj.connect_mouse_release(clone!(@weak obj => move |_, button| { self.obj()
.connect_mouse_release(clone!(@weak self as this => move |_, button| {
log::debug!("mouse-release: {:?}", button); log::debug!("mouse-release: {:?}", button);
MainContext::default().spawn_local(clone!(@weak obj => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
let button = from_gdk_button(button); let button = from_gdk_button(button);
let _ = obj.console().mouse.release(button).await; let _ = this.obj().console().mouse.release(button).await;
})); }));
})); }));
obj.connect_scroll_discrete(clone!(@weak obj => move |_, scroll| { self.obj()
.connect_scroll_discrete(clone!(@weak self as this => move |_, scroll| {
use qemu_display::MouseButton; use qemu_display::MouseButton;
log::debug!("scroll-discrete: {:?}", scroll); log::debug!("scroll-discrete: {:?}", scroll);
@ -115,32 +122,31 @@ mod imp {
return; return;
} }
}; };
MainContext::default().spawn_local(clone!(@weak obj => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
let _ = obj.console().mouse.press(button).await; let _ = this.obj().console().mouse.press(button).await;
let _ = obj.console().mouse.release(button).await; let _ = this.obj().console().mouse.release(button).await;
})); }));
})); }));
obj.connect_resize_request(clone!(@weak obj => move |_, width, height, wmm, hmm| { self.obj().connect_resize_request(clone!(@weak self as this => move |_, width, height, wmm, hmm| {
log::debug!("resize-request: {:?}", (width, height, wmm, hmm)); log::debug!("resize-request: {:?}", (width, height, wmm, hmm));
MainContext::default().spawn_local(clone!(@weak obj => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
let _ = obj.console().proxy.set_ui_info(wmm as _, hmm as _, 0, 0, width, height).await; let _ = this.obj().console().proxy.set_ui_info(wmm as _, hmm as _, 0, 0, width, height).await;
})); }));
})); }));
} }
} }
impl WidgetImpl for Display { impl WidgetImpl for Display {
fn realize(&self, widget: &Self::Type) { fn realize(&self) {
self.parent_realize(widget); self.parent_realize();
MainContext::default().spawn_local(clone!(@weak widget => async move { MainContext::default().spawn_local(clone!(@weak self as this => async move {
let self_ = Self::from_instance(&widget); let console = this.console.get().unwrap();
let console = self_.console.get().unwrap();
// we have to use a channel, because widget is not Send.. // we have to use a channel, because widget is not Send..
let (sender, mut receiver) = futures::channel::mpsc::unbounded(); let (sender, mut receiver) = futures::channel::mpsc::unbounded();
console.register_listener(ConsoleHandler { sender }).await.unwrap(); console.register_listener(ConsoleHandler { sender }).await.unwrap();
MainContext::default().spawn_local(clone!(@weak widget => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
while let Some(e) = receiver.next().await { while let Some(e) = receiver.next().await {
use ConsoleEvent::*; use ConsoleEvent::*;
match e { match e {
@ -149,15 +155,15 @@ mod imp {
log::warn!("Format not yet supported: {:X}", s.format); log::warn!("Format not yet supported: {:X}", s.format);
continue; continue;
} }
widget.set_display_size(Some((s.width as _, s.height as _))); this.obj().set_display_size(Some((s.width as _, s.height as _)));
widget.update_area(0, 0, s.width as _, s.height as _, s.stride as _, &s.data); this.obj().update_area(0, 0, s.width as _, s.height as _, s.stride as _, &s.data);
} }
Update(u) => { Update(u) => {
if u.format != 0x20020888 { if u.format != 0x20020888 {
log::warn!("Format not yet supported: {:X}", u.format); log::warn!("Format not yet supported: {:X}", u.format);
continue; continue;
} }
widget.update_area(u.x as _, u.y as _, u.w as _, u.h as _, u.stride as _, &u.data); this.obj().update_area(u.x as _, u.y as _, u.w as _, u.h as _, u.stride as _, &u.data);
} }
#[cfg(windows)] #[cfg(windows)]
ScanoutDMABUF(_) => { ScanoutDMABUF(_) => {
@ -165,8 +171,8 @@ mod imp {
} }
#[cfg(unix)] #[cfg(unix)]
ScanoutDMABUF(s) => { ScanoutDMABUF(s) => {
widget.set_display_size(Some((s.width as _, s.height as _))); this.obj().set_display_size(Some((s.width as _, s.height as _)));
widget.set_dmabuf_scanout(rdw::RdwDmabufScanout { this.obj().set_dmabuf_scanout(rdw::RdwDmabufScanout {
width: s.width, width: s.width,
height: s.height, height: s.height,
stride: s.stride, stride: s.stride,
@ -177,7 +183,7 @@ mod imp {
}); });
} }
UpdateDMABUF { wait_tx, .. } => { UpdateDMABUF { wait_tx, .. } => {
widget.render(); this.obj().render();
let _ = wait_tx.send(()); let _ = wait_tx.send(());
} }
Disconnected => { Disconnected => {
@ -192,23 +198,23 @@ mod imp {
c.hot_y, c.hot_y,
1, 1,
); );
widget.define_cursor(Some(cursor)); this.obj().define_cursor(Some(cursor));
} }
MouseSet(m) => { MouseSet(m) => {
if m.on != 0 { if m.on != 0 {
widget.set_cursor_position(Some((m.x as _, m.y as _))); this.obj().set_cursor_position(Some((m.x as _, m.y as _)));
} else { } else {
widget.set_cursor_position(None); this.obj().set_cursor_position(None);
} }
} }
} }
} }
})); }));
let mut abs_changed = console.mouse.receive_is_absolute_changed().await; let mut abs_changed = console.mouse.receive_is_absolute_changed().await;
MainContext::default().spawn_local(clone!(@weak widget => async move { MainContext::default().spawn_local(clone!(@weak this => async move {
while let Some(abs) = abs_changed.next().await { while let Some(abs) = abs_changed.next().await {
if let Ok(abs) = abs.get().await { if let Ok(abs) = abs.get().await {
widget.set_mouse_absolute(abs); this.obj().set_mouse_absolute(abs);
} }
} }
})); }));
@ -225,7 +231,7 @@ glib::wrapper! {
impl Display { impl Display {
pub fn new(console: Console) -> Self { pub fn new(console: Console) -> Self {
let obj = glib::Object::new::<Self>(&[]).unwrap(); let obj = glib::Object::new(&[]);
let self_ = imp::Display::from_instance(&obj); let self_ = imp::Display::from_instance(&obj);
self_.console.set(console).unwrap(); self_.console.set(console).unwrap();
obj obj

2
qemu-vte/Cargo.toml
View File

@ -13,4 +13,4 @@ futures = "0.3.13"
[dependencies.vte] [dependencies.vte]
package = "vte4" package = "vte4"
version = "0.1" version = "0.5"