Merge branch 'main' into hidpi

This commit is contained in:
Ottatop 2024-03-30 15:59:12 -05:00
commit d6ccb53087
3 changed files with 11 additions and 3 deletions

View file

@ -73,7 +73,7 @@ You will need:
```sh ```sh
sudo pacman -S wayland wayland-protocols libxkbcommon systemd-libs libinput mesa seatd xorg-xwayland sudo pacman -S wayland wayland-protocols libxkbcommon systemd-libs libinput mesa seatd xorg-xwayland
``` ```
- Debian: - Debian/Ubuntu:
```sh ```sh
sudo apt install libwayland-dev libxkbcommon-dev libudev-dev libinput-dev libgdm-dev libseat-dev xwayland sudo apt install libwayland-dev libxkbcommon-dev libudev-dev libinput-dev libgdm-dev libseat-dev xwayland
``` ```
@ -83,11 +83,19 @@ You will need:
```sh ```sh
sudo pacman -S protobuf sudo pacman -S protobuf
``` ```
- Debian/Ubuntu:
```sh
sudo apt install protobuf-compiler
```
- [LuaRocks](https://luarocks.org/), the Lua package manager, to use the Lua API - [LuaRocks](https://luarocks.org/), the Lua package manager, to use the Lua API
- Arch: - Arch:
```sh ```sh
sudo pacman -S luarocks sudo pacman -S luarocks
``` ```
- Debian/Ubuntu:
```sh
sudo apt install luarocks
```
- You must run `eval $(luarocks path --lua-version 5.4)` so that your config can find the API - You must run `eval $(luarocks path --lua-version 5.4)` so that your config can find the API
library files. It is recommended to place this command in your shell's startup script. library files. It is recommended to place this command in your shell's startup script.

View file

@ -253,7 +253,7 @@ impl Input {
/// ``` /// ```
/// use pinnacle_api::input::XkbConfig; /// use pinnacle_api::input::XkbConfig;
/// ///
/// input.set_xkb_config(Xkbconfig { /// input.set_xkb_config(XkbConfig {
/// layout: Some("us,fr,ge"), /// layout: Some("us,fr,ge"),
/// options: Some("ctrl:swapcaps,caps:shift"), /// options: Some("ctrl:swapcaps,caps:shift"),
/// ..Default::default() /// ..Default::default()

View file

@ -83,7 +83,7 @@ impl Process {
/// process.spawn_with_callbacks(["alacritty"], SpawnCallbacks { /// process.spawn_with_callbacks(["alacritty"], SpawnCallbacks {
/// stdout: Some(Box::new(|line| println!("stdout: {line}"))), /// stdout: Some(Box::new(|line| println!("stdout: {line}"))),
/// stderr: Some(Box::new(|line| println!("stderr: {line}"))), /// stderr: Some(Box::new(|line| println!("stderr: {line}"))),
/// stdout: Some(Box::new(|code, msg| println!("exit code: {code:?}, exit_msg: {msg}"))), /// exit: Some(Box::new(|code, msg| println!("exit code: {code:?}, exit_msg: {msg}"))),
/// }); /// });
/// ``` /// ```
pub fn spawn_with_callbacks( pub fn spawn_with_callbacks(