Use "daemon" instead of "demon"

Trivial patch that simply changes the "demon" word to "daemon". As the
latter is the more common variant to designate a process toiling in
the background, I'm just assuming "demon" was a typo.
main
William Barsse 3 years ago committed by Tassilo Horn
parent 8f06f4c196
commit 613b4eeaeb
  1. 12
      README.md
  2. 2
      swayr/src/bin/swayrd.rs
  3. 8
      swayr/src/daemon.rs
  4. 2
      swayr/src/layout.rs
  5. 6
      swayr/src/lib.rs

@ -28,10 +28,10 @@
[![latest release](https://img.shields.io/crates/v/swayr.svg)](https://crates.io/crates/swayr) [![latest release](https://img.shields.io/crates/v/swayr.svg)](https://crates.io/crates/swayr)
Swayr consists of a demon, and a client. The demon `swayrd` records Swayr consists of a daemon, and a client. The `swayrd` daemon records
window/workspace creations, deletions, and focus changes using sway's JSON IPC window/workspace creations, deletions, and focus changes using sway's JSON IPC
interface. The client `swayr` offers subcommands, see `swayr --help`, and interface. The `swayr` client offers subcommands, see `swayr --help`, and
sends them to the demon which executes them. sends them to the daemon which executes them.
### <a id="swayr-commands">Swayr commands</a> ### <a id="swayr-commands">Swayr commands</a>
@ -223,7 +223,7 @@ cargo install-update -- swayr
### <a id="swayr-usage">Usage</a> ### <a id="swayr-usage">Usage</a>
You need to start the swayr demon `swayrd` in your sway config You need to start the swayr daemon (`swayrd`) in your sway config
(`~/.config/sway/config`) like so: (`~/.config/sway/config`) like so:
``` ```
@ -238,8 +238,8 @@ issue with backtrace and logging at the `debug` level and attach that to your
bug report. Valid log levels in the order from logging more to logging less bug report. Valid log levels in the order from logging more to logging less
are: `trace`, `debug`, `info`, `warn`, `error`, `off`. are: `trace`, `debug`, `info`, `warn`, `error`, `off`.
Next to starting the demon, you want to bind swayr commands to some keys like Beyond starting the daemon, you will want to bind swayr commands to some keys
so: like so:
``` ```
bindsym $mod+Space exec env RUST_BACKTRACE=1 \ bindsym $mod+Space exec env RUST_BACKTRACE=1 \

@ -20,5 +20,5 @@ use env_logger::Env;
fn main() { fn main() {
env_logger::Builder::from_env(Env::default().default_filter_or("warn")) env_logger::Builder::from_env(Env::default().default_filter_or("warn"))
.init(); .init();
swayr::demon::run_demon(); swayr::daemon::run_daemon();
} }

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <https://www.gnu.org/licenses/>. // this program. If not, see <https://www.gnu.org/licenses/>.
//! Functions and data structures of the swayrd demon. //! Functions and data structures of the swayrd daemon.
use crate::cmds; use crate::cmds;
use crate::config; use crate::config;
@ -28,11 +28,13 @@ use std::sync::RwLock;
use std::thread; use std::thread;
use swayipc as s; use swayipc as s;
pub fn run_demon() {
pub fn run_daemon() {
let extra_props: Arc<RwLock<HashMap<i64, t::ExtraProps>>> = let extra_props: Arc<RwLock<HashMap<i64, t::ExtraProps>>> =
Arc::new(RwLock::new(HashMap::new())); Arc::new(RwLock::new(HashMap::new()));
let extra_props_for_ev_handler = extra_props.clone(); let extra_props_for_ev_handler = extra_props.clone();
thread::spawn(move || { thread::spawn(move || {
monitor_sway_events(extra_props_for_ev_handler); monitor_sway_events(extra_props_for_ev_handler);
}); });
@ -121,7 +123,7 @@ pub fn monitor_sway_events(
} }
} }
} }
log::debug!("Swayr demon shutting down.") log::debug!("Swayr daemon shutting down.")
} }
fn handle_window_event( fn handle_window_event(

@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along with // You should have received a copy of the GNU General Public License along with
// this program. If not, see <https://www.gnu.org/licenses/>. // this program. If not, see <https://www.gnu.org/licenses/>.
//! Functions and data structures of the swayrd demon. //! Functions and data structures of the swayrd daemon.
use crate::config; use crate::config;
use crate::shared::ipc; use crate::shared::ipc;

@ -14,14 +14,14 @@
// this program. If not, see <https://www.gnu.org/licenses/>. // this program. If not, see <https://www.gnu.org/licenses/>.
//! **Swayr** is a LRU window-switcher and more for the sway window manager. //! **Swayr** is a LRU window-switcher and more for the sway window manager.
//! It consists of a demon, and a client. The demon `swayrd` records //! It consists of a daemon, and a client. The `swayrd` daemon records
//! window/workspace creations, deletions, and focus changes using sway's JSON //! window/workspace creations, deletions, and focus changes using sway's JSON
//! IPC interface. The client `swayr` offers subcommands, see `swayr --help`. //! IPC interface. The `swayr` client offers subcommands, see `swayr --help`.
pub mod client; pub mod client;
pub mod cmds; pub mod cmds;
pub mod config; pub mod config;
pub mod demon; pub mod daemon;
pub mod layout; pub mod layout;
pub mod shared; pub mod shared;
pub mod tree; pub mod tree;

Loading…
Cancel
Save