kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

config: clean up and document theming

Browse source
This commit is contained in:
Julian Orth 2022-05-15 20:10:04 +02:00
parent 4780315f50
commit 6916f03e94
17 changed files with 745 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

121
jay-config/src/_private/client.rs
View file

@ -13,7 +13,7 @@ use {
},
input::{acceleration::AccelProfile, capability::Capability, InputDevice, Seat},
keyboard::keymap::Keymap,
theme::Color,
theme::{colors::Colorable, sized::Resizable, Color},
Axis, Command, Direction, LogLevel, ModifiedKeySym, PciId, Timer, Workspace,
},
std::{
@ -149,7 +149,7 @@ pub unsafe extern "C" fn handle_msg(data: *const u8, msg: *const u8, size: usize
}
macro_rules! get_response {
($res:expr, $def:expr, $ty:ident, $($field:ident),+) => {
($res:expr, $def:expr, $ty:ident { $($field:ident),+ }) => {
let ($($field,)+) = match $res {
Response::$ty { $($field,)+ } => ($($field,)+),
_ => {
@ -231,19 +231,19 @@ impl Client {
pub fn seats(&self) -> Vec<Seat> {
let res = self.send_with_response(&ClientMessage::GetSeats);
get_response!(res, vec![], GetSeats, seats);
get_response!(res, vec![], GetSeats { seats });
seats
}
pub fn mono(&self, seat: Seat) -> bool {
let res = self.send_with_response(&ClientMessage::GetMono { seat });
get_response!(res, false, GetMono, mono);
get_response!(res, false, GetMono { mono });
mono
}
pub fn get_timer(&self, name: &str) -> Timer {
let res = self.send_with_response(&ClientMessage::GetTimer { name });
get_response!(res, Timer(0), GetTimer, timer);
get_response!(res, Timer(0), GetTimer { timer });
timer
}
@ -270,13 +270,13 @@ impl Client {
pub fn get_workspace(&self, name: &str) -> Workspace {
let res = self.send_with_response(&ClientMessage::GetWorkspace { name });
get_response!(res, Workspace(0), GetWorkspace, workspace);
get_response!(res, Workspace(0), GetWorkspace { workspace });
workspace
}
pub fn get_connector(&self, ty: ConnectorType, idx: u32) -> Connector {
let res = self.send_with_response(&ClientMessage::GetConnector { ty, idx });
get_response!(res, Connector(0), GetConnector, connector);
get_response!(res, Connector(0), GetConnector { connector });
connector
}
@ -290,7 +290,7 @@ impl Client {
pub fn split(&self, seat: Seat) -> Axis {
let res = self.send_with_response(&ClientMessage::GetSplit { seat });
get_response!(res, Axis::Horizontal, GetSplit, axis);
get_response!(res, Axis::Horizontal, GetSplit { axis });
axis
}
@ -300,48 +300,64 @@ impl Client {
pub fn get_fullscreen(&self, seat: Seat) -> bool {
let res = self.send_with_response(&ClientMessage::GetFullscreen { seat });
get_response!(res, false, GetFullscreen, fullscreen);
get_response!(res, false, GetFullscreen { fullscreen });
fullscreen
}
pub fn reset_font(&self) {
self.send(&ClientMessage::ResetFont);
}
pub fn set_font(&self, font: &str) {
self.send(&ClientMessage::SetFont { font });
}
pub fn get_font(&self) -> String {
let res = self.send_with_response(&ClientMessage::GetFont);
get_response!(res, String::new(), GetFont { font });
font
}
pub fn get_floating(&self, seat: Seat) -> bool {
let res = self.send_with_response(&ClientMessage::GetFloating { seat });
get_response!(res, false, GetFloating { floating });
floating
}
pub fn set_floating(&self, seat: Seat, floating: bool) {
self.send(&ClientMessage::SetFloating { seat, floating });
}
pub fn toggle_floating(&self, seat: Seat) {
self.send(&ClientMessage::ToggleFloating { seat });
self.set_floating(seat, !self.get_floating(seat));
}
pub fn set_title_color(&self, color: Color) {
self.send(&ClientMessage::SetTitleColor { color });
pub fn reset_colors(&self) {
self.send(&ClientMessage::ResetColors);
}
pub fn set_border_color(&self, color: Color) {
self.send(&ClientMessage::SetBorderColor { color });
pub fn reset_sizes(&self) {
self.send(&ClientMessage::ResetSizes);
}
pub fn set_title_underline_color(&self, color: Color) {
self.send(&ClientMessage::SetTitleUnderlineColor { color });
pub fn get_color(&self, colorable: Colorable) -> Color {
let res = self.send_with_response(&ClientMessage::GetColor { colorable });
get_response!(res, Color::BLACK, GetColor { color });
color
}
pub fn set_background_color(&self, color: Color) {
self.send(&ClientMessage::SetBackgroundColor { color });
pub fn set_color(&self, colorable: Colorable, color: Color) {
self.send(&ClientMessage::SetColor { colorable, color });
}
pub fn get_title_height(&self) -> i32 {
let res = self.send_with_response(&ClientMessage::GetTitleHeight);
get_response!(res, 0, GetTitleHeight, height);
height
pub fn get_size(&self, sized: Resizable) -> i32 {
let res = self.send_with_response(&ClientMessage::GetSize { sized });
get_response!(res, 0, GetSize { size });
size
}
pub fn get_border_width(&self) -> i32 {
let res = self.send_with_response(&ClientMessage::GetBorderWidth);
get_response!(res, 0, GetBorderWidth, width);
width
}
pub fn set_title_height(&self, height: i32) {
self.send(&ClientMessage::SetTitleHeight { height })
}
pub fn set_border_width(&self, width: i32) {
self.send(&ClientMessage::SetBorderWidth { width })
pub fn set_size(&self, sized: Resizable, size: i32) {
self.send(&ClientMessage::SetSize { sized, size })
}
pub fn set_mono(&self, seat: Seat, mono: bool) {
@ -374,13 +390,13 @@ impl Client {
pub fn get_seat(&self, name: &str) -> Seat {
let res = self.send_with_response(&ClientMessage::GetSeat { name });
get_response!(res, Seat(0), GetSeat, seat);
get_response!(res, Seat(0), GetSeat { seat });
seat
}
pub fn get_input_devices(&self, seat: Option<Seat>) -> Vec<InputDevice> {
let res = self.send_with_response(&ClientMessage::GetInputDevices { seat });
get_response!(res, vec!(), GetInputDevices, devices);
get_response!(res, vec!(), GetInputDevices { devices });
devices
}
@ -406,43 +422,43 @@ impl Client {
pub fn device_connectors(&self, device: DrmDevice) -> Vec<Connector> {
let res = self.send_with_response(&ClientMessage::GetDeviceConnectors { device });
get_response!(res, vec![], GetDeviceConnectors, connectors);
get_response!(res, vec![], GetDeviceConnectors { connectors });
connectors
}
pub fn drm_device_syspath(&self, device: DrmDevice) -> String {
let res = self.send_with_response(&ClientMessage::GetDrmDeviceSyspath { device });
get_response!(res, String::new(), GetDrmDeviceSyspath, syspath);
get_response!(res, String::new(), GetDrmDeviceSyspath { syspath });
syspath
}
pub fn drm_device_vendor(&self, device: DrmDevice) -> String {
let res = self.send_with_response(&ClientMessage::GetDrmDeviceVendor { device });
get_response!(res, String::new(), GetDrmDeviceVendor, vendor);
get_response!(res, String::new(), GetDrmDeviceVendor { vendor });
vendor
}
pub fn drm_device_model(&self, device: DrmDevice) -> String {
let res = self.send_with_response(&ClientMessage::GetDrmDeviceModel { device });
get_response!(res, String::new(), GetDrmDeviceModel, model);
get_response!(res, String::new(), GetDrmDeviceModel { model });
model
}
pub fn drm_device_pci_id(&self, device: DrmDevice) -> PciId {
let res = self.send_with_response(&ClientMessage::GetDrmDevicePciId { device });
get_response!(res, Default::default(), GetDrmDevicePciId, pci_id);
get_response!(res, Default::default(), GetDrmDevicePciId { pci_id });
pci_id
}
pub fn connector_connected(&self, connector: Connector) -> bool {
let res = self.send_with_response(&ClientMessage::ConnectorConnected { connector });
get_response!(res, false, ConnectorConnected, connected);
get_response!(res, false, ConnectorConnected { connected });
connected
}
pub fn connector_type(&self, connector: Connector) -> ConnectorType {
let res = self.send_with_response(&ClientMessage::ConnectorType { connector });
get_response!(res, CON_UNKNOWN, ConnectorType, ty);
get_response!(res, CON_UNKNOWN, ConnectorType { ty });
ty
}
@ -451,10 +467,11 @@ impl Client {
get_response!(
res,
Mode::zeroed(),
ConnectorMode,
width,
height,
refresh_millihz
ConnectorMode {
width,
height,
refresh_millihz
}
);
Mode {
width,
@ -465,7 +482,7 @@ impl Client {
pub fn drm_devices(&self) -> Vec<DrmDevice> {
let res = self.send_with_response(&ClientMessage::GetDrmDevices);
get_response!(res, vec![], GetDrmDevices, devices);
get_response!(res, vec![], GetDrmDevices { devices });
devices
}
@ -514,13 +531,13 @@ impl Client {
pub fn device_name(&self, device: InputDevice) -> String {
let res = self.send_with_response(&ClientMessage::GetDeviceName { device });
get_response!(res, String::new(), GetDeviceName, name);
get_response!(res, String::new(), GetDeviceName { name });
name
}
pub fn has_capability(&self, device: InputDevice, cap: Capability) -> bool {
let res = self.send_with_response(&ClientMessage::HasCapability { device, cap });
get_response!(res, false, HasCapability, has);
get_response!(res, false, HasCapability { has });
has
}
@ -534,13 +551,13 @@ impl Client {
pub fn seat_get_repeat_rate(&self, seat: Seat) -> (i32, i32) {
let res = self.send_with_response(&ClientMessage::SeatGetRepeatRate { seat });
get_response!(res, (25, 250), GetRepeatRate, rate, delay);
get_response!(res, (25, 250), GetRepeatRate { rate, delay });
(rate, delay)
}
pub fn parse_keymap(&self, keymap: &str) -> Keymap {
let res = self.send_with_response(&ClientMessage::ParseKeymap { keymap });
get_response!(res, Keymap(0), ParseKeymap, keymap);
get_response!(res, Keymap(0), ParseKeymap { keymap });
keymap
}

65
jay-config/src/_private/ipc.rs
View file

@ -3,7 +3,7 @@ use {
drm::{connector_type::ConnectorType, Connector, DrmDevice},
input::{acceleration::AccelProfile, capability::Capability, InputDevice, Seat},
keyboard::{keymap::Keymap, mods::Modifiers, syms::KeySym},
theme::Color,
theme::{colors::Colorable, sized::Resizable, Color},
Axis, Direction, LogLevel, PciId, Timer, Workspace,
},
bincode::{BorrowDecode, Decode, Encode},
@ -56,6 +56,11 @@ pub enum ServerMessage {
#[derive(Encode, BorrowDecode, Debug)]
pub enum ClientMessage<'a> {
Reload,
Quit,
SwitchTo {
vtnr: u32,
},
Log {
level: LogLevel,
msg: &'a str,
@ -65,10 +70,6 @@ pub enum ClientMessage<'a> {
GetSeat {
name: &'a str,
},
Quit,
SwitchTo {
vtnr: u32,
},
SetSeat {
device: InputDevice,
seat: Seat,
@ -139,24 +140,20 @@ pub enum ClientMessage<'a> {
kb: InputDevice,
grab: bool,
},
GetTitleHeight,
GetBorderWidth,
SetTitleHeight {
height: i32,
ResetSizes,
GetSize {
sized: Resizable,
},
SetBorderWidth {
width: i32,
SetSize {
sized: Resizable,
size: i32,
},
SetTitleColor {
color: Color,
ResetColors,
GetColor {
colorable: Colorable,
},
SetTitleUnderlineColor {
color: Color,
},
SetBorderColor {
color: Color,
},
SetBackgroundColor {
SetColor {
colorable: Colorable,
color: Color,
},
CreateSplit {
@ -169,9 +166,13 @@ pub enum ClientMessage<'a> {
FocusParent {
seat: Seat,
},
ToggleFloating {
GetFloating {
seat: Seat,
},
SetFloating {
seat: Seat,
floating: bool,
},
HasCapability {
device: InputDevice,
cap: Capability,
@ -246,7 +247,6 @@ pub enum ClientMessage<'a> {
GetFullscreen {
seat: Seat,
},
Reload,
GetDeviceConnectors {
device: DrmDevice,
},
@ -263,6 +263,11 @@ pub enum ClientMessage<'a> {
GetDrmDevicePciId {
device: DrmDevice,
},
ResetFont,
GetFont,
SetFont {
font: &'a str,
},
}
#[derive(Encode, Decode, Debug)]
@ -290,11 +295,8 @@ pub enum Response {
GetInputDevices {
devices: Vec<InputDevice>,
},
GetTitleHeight {
height: i32,
},
GetBorderWidth {
width: i32,
GetSize {
size: i32,
},
HasCapability {
has: bool,
@ -343,6 +345,15 @@ pub enum Response {
GetDrmDevicePciId {
pci_id: PciId,
},
GetFloating {
floating: bool,
},
GetColor {
color: Color,
},
GetFont {
font: String,
},
}
#[derive(Encode, Decode, Debug)]