Drop -listener from crate name

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-08-16 00:11:18 +04:00
parent 75a0fd7bc7
commit 848cd7af0a
25 changed files with 16 additions and 16 deletions

View File

@ -1,7 +1,7 @@
[workspace] [workspace]
members = [ members = [
"keycodemap", "keycodemap",
"qemu-display-listener", "qemu-display",
"qemu-rdw", "qemu-rdw",
"qemu-vnc", "qemu-vnc",
"qemu-vte", "qemu-vte",

View File

@ -1,5 +1,5 @@
[package] [package]
name = "qemu-display-listener" name = "qemu-display"
version = "0.1.0" version = "0.1.0"
authors = ["Marc-André Lureau <marcandre.lureau@redhat.com>"] authors = ["Marc-André Lureau <marcandre.lureau@redhat.com>"]
edition = "2018" edition = "2018"

View File

@ -11,7 +11,7 @@ log = "0.4"
pretty_env_logger = "0.4" pretty_env_logger = "0.4"
once_cell = "1.5" once_cell = "1.5"
zbus = { version = "2.0.0-beta" } zbus = { version = "2.0.0-beta" }
qemu-display-listener = { path = "../qemu-display-listener", features = ["glib"] } qemu-display = { path = "../qemu-display", features = ["glib"] }
keycodemap = { path = "../keycodemap" } keycodemap = { path = "../keycodemap" }
gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" } gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
rdw = { git = "https://gitlab.gnome.org/malureau/rdw.git" } rdw = { git = "https://gitlab.gnome.org/malureau/rdw.git" }

View File

@ -2,7 +2,7 @@ use std::error::Error;
use std::result::Result; use std::result::Result;
use std::thread; use std::thread;
use qemu_display_listener::Audio; use qemu_display::Audio;
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct Handler { pub struct Handler {
@ -17,7 +17,7 @@ impl Handler {
let thread = thread::spawn(move || loop { let thread = thread::spawn(move || loop {
match rx.recv() { match rx.recv() {
Ok(event) => { Ok(event) => {
use qemu_display_listener::AudioOutEvent::*; use qemu_display::AudioOutEvent::*;
match event { match event {
Init { id, info } => { Init { id, info } => {

View File

@ -5,7 +5,7 @@ use std::result::Result;
use crate::glib::{self, clone, prelude::*, SignalHandlerId, SourceId}; use crate::glib::{self, clone, prelude::*, SignalHandlerId, SourceId};
use gtk::{gdk, gio, prelude::DisplayExt, prelude::*}; use gtk::{gdk, gio, prelude::DisplayExt, prelude::*};
use qemu_display_listener::{ use qemu_display::{
self as qdl, AsyncClipboardProxy, Clipboard, ClipboardEvent, ClipboardSelection, self as qdl, AsyncClipboardProxy, Clipboard, ClipboardEvent, ClipboardSelection,
}; };

View File

@ -3,7 +3,7 @@ use gtk::{glib, prelude::*};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use keycodemap::KEYMAP_XORGEVDEV2QNUM; use keycodemap::KEYMAP_XORGEVDEV2QNUM;
use qemu_display_listener::Console; use qemu_display::Console;
use rdw::DisplayExt; use rdw::DisplayExt;
mod imp { mod imp {
@ -102,7 +102,7 @@ mod imp {
})); }));
obj.connect_scroll_discrete(clone!(@weak obj => move |_, scroll| { obj.connect_scroll_discrete(clone!(@weak obj => move |_, scroll| {
use qemu_display_listener::MouseButton; use qemu_display::MouseButton;
log::debug!("scroll-discrete: {:?}", scroll); log::debug!("scroll-discrete: {:?}", scroll);
@ -144,7 +144,7 @@ mod imp {
rx.attach( rx.attach(
None, None,
clone!(@weak widget => @default-panic, move |evt| { clone!(@weak widget => @default-panic, move |evt| {
use qemu_display_listener::ConsoleEvent::*; use qemu_display::ConsoleEvent::*;
log::debug!("Console event: {:?}", evt); log::debug!("Console event: {:?}", evt);
match evt { match evt {
@ -255,8 +255,8 @@ impl DisplayQemu {
} }
} }
fn from_gdk_button(button: u32) -> qemu_display_listener::MouseButton { fn from_gdk_button(button: u32) -> qemu_display::MouseButton {
use qemu_display_listener::MouseButton::*; use qemu_display::MouseButton::*;
match button { match button {
1 => Left, 1 => Left,

View File

@ -2,7 +2,7 @@ use gio::ApplicationFlags;
use glib::{clone, MainContext}; use glib::{clone, MainContext};
use gtk::{gio, glib, prelude::*}; use gtk::{gio, glib, prelude::*};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use qemu_display_listener::{Chardev, Console, Introspect}; use qemu_display::{Chardev, Console, Introspect};
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::os::unix::net::UnixStream; use std::os::unix::net::UnixStream;
use zbus::Connection; use zbus::Connection;

View File

@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
qemu-display-listener = { path = "../qemu-display-listener" } qemu-display = { path = "../qemu-display" }
keycodemap = { path ="../keycodemap" } keycodemap = { path ="../keycodemap" }
vnc = "0.4.0" vnc = "0.4.0"
clap = "3.0.0-beta.2" clap = "3.0.0-beta.2"

View File

@ -9,7 +9,7 @@ use std::{io, thread, time};
use clap::Clap; use clap::Clap;
use image::GenericImage; use image::GenericImage;
use keycodemap::*; use keycodemap::*;
use qemu_display_listener::{Console, ConsoleEvent, MouseButton, VMProxy}; use qemu_display::{Console, ConsoleEvent, MouseButton, VMProxy};
use vnc::{ use vnc::{
server::Event as VncEvent, server::FramebufferUpdate, Encoding, Error as VncError, PixelFormat, server::Event as VncEvent, server::FramebufferUpdate, Encoding, Error as VncError, PixelFormat,
Rect, Screen, Server as VncServer, Rect, Screen, Server as VncServer,

View File

@ -8,7 +8,7 @@ log = "0.4"
pretty_env_logger = "0.4" pretty_env_logger = "0.4"
once_cell = "1.5" once_cell = "1.5"
zbus = { version = "2.0.0-beta" } zbus = { version = "2.0.0-beta" }
qemu-display-listener = { path = "../qemu-display-listener", features = ["glib"] } qemu-display = { path = "../qemu-display", features = ["glib"] }
futures = "0.3.13" futures = "0.3.13"
[dependencies.vte] [dependencies.vte]

View File

@ -1,6 +1,6 @@
use futures::prelude::*; use futures::prelude::*;
use glib::{clone, MainContext}; use glib::{clone, MainContext};
use qemu_display_listener::Chardev; use qemu_display::Chardev;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::os::unix::net::UnixStream; use std::os::unix::net::UnixStream;
use vte::prelude::*; use vte::prelude::*;