all: remove control center in its entirety
This commit is contained in:
parent
1dfd6169f8
commit
769d12a525
97 changed files with 59 additions and 10580 deletions
73
src/state.rs
73
src/state.rs
|
|
@ -19,10 +19,6 @@ use {
|
|||
},
|
||||
compositor::{LIBEI_SOCKET, LogLevel},
|
||||
config::ConfigProxy,
|
||||
control_center::{
|
||||
CCI_COLOR_MANAGEMENT, CCI_COMPOSITOR, CCI_GPUS, CCI_IDLE, CCI_LOOK_AND_FEEL,
|
||||
CCI_OUTPUTS, CCI_XWAYLAND, ControlCenters,
|
||||
},
|
||||
copy_device::CopyDeviceRegistry,
|
||||
cpu_worker::CpuWorker,
|
||||
criteria::{clm::ClMatcherManager, tlm::TlMatcherManager},
|
||||
|
|
@ -31,7 +27,6 @@ use {
|
|||
damage::DamageVisualizer,
|
||||
dbus::Dbus,
|
||||
drm_feedback::{DrmFeedback, DrmFeedbackIds},
|
||||
egui_adapter::egui_platform::EggState,
|
||||
ei::{
|
||||
ei_acceptor::EiAcceptor,
|
||||
ei_client::{EiClient, EiClients},
|
||||
|
|
@ -304,8 +299,6 @@ pub struct State {
|
|||
pub eventfd_cache: Rc<EventfdCache>,
|
||||
pub lazy_event_sources: Rc<LazyEventSources>,
|
||||
pub bo_drop_queue: Rc<ObjectDropQueue<Rc<dyn BufferObject>>>,
|
||||
pub egg_state: EggState,
|
||||
pub control_centers: ControlCenters,
|
||||
pub virtual_outputs: VirtualOutputs,
|
||||
pub clean_logs_older_than: Cell<Option<SystemTime>>,
|
||||
}
|
||||
|
|
@ -366,10 +359,9 @@ impl IdleState {
|
|||
self.timeout_changed(state);
|
||||
}
|
||||
|
||||
fn timeout_changed(&self, state: &State) {
|
||||
fn timeout_changed(&self, _state: &State) {
|
||||
self.timeout_changed.set(true);
|
||||
self.change.trigger();
|
||||
state.trigger_cci(CCI_IDLE);
|
||||
}
|
||||
|
||||
pub fn add_inhibitor(&self, state: &State, inhibitor: &Rc<ZwpIdleInhibitorV1>) {
|
||||
|
|
@ -385,10 +377,9 @@ impl IdleState {
|
|||
}
|
||||
}
|
||||
|
||||
fn inhibitors_changed(&self, state: &State) {
|
||||
fn inhibitors_changed(&self, _state: &State) {
|
||||
self.inhibitors_changed.set(true);
|
||||
self.change.trigger();
|
||||
state.trigger_cci(CCI_IDLE);
|
||||
}
|
||||
|
||||
fn resume_inhibited_notifications(&self) {
|
||||
|
|
@ -500,39 +491,30 @@ impl ConnectorData {
|
|||
return;
|
||||
}
|
||||
*self.state.borrow_mut() = s.clone();
|
||||
macro_rules! b {
|
||||
($expr:expr) => {{
|
||||
let e = $expr;
|
||||
if e {
|
||||
state.trigger_cci(CCI_OUTPUTS);
|
||||
}
|
||||
e
|
||||
}};
|
||||
}
|
||||
if b!(old.enabled != s.enabled) {
|
||||
if old.enabled != s.enabled {
|
||||
self.head_managers.handle_enabled_change(state, s.enabled);
|
||||
}
|
||||
if b!(old.active != s.active) {
|
||||
if old.active != s.active {
|
||||
self.head_managers.handle_active_change(s.active);
|
||||
}
|
||||
if b!(old.non_desktop_override != s.non_desktop_override) {
|
||||
if old.non_desktop_override != s.non_desktop_override {
|
||||
self.head_managers
|
||||
.handle_non_desktop_override_changed(s.non_desktop_override);
|
||||
}
|
||||
if b!(old.vrr != s.vrr) {
|
||||
if old.vrr != s.vrr {
|
||||
self.head_managers.handle_vrr_change(s.vrr);
|
||||
}
|
||||
if b!(old.tearing != s.tearing) {
|
||||
if old.tearing != s.tearing {
|
||||
self.head_managers.handle_tearing_enabled_change(s.tearing);
|
||||
}
|
||||
if b!(old.format != s.format) {
|
||||
if old.format != s.format {
|
||||
self.head_managers.handle_format_change(s.format);
|
||||
}
|
||||
if b!((old.color_space, old.eotf) != (s.color_space, s.eotf)) {
|
||||
if (old.color_space, old.eotf) != (s.color_space, s.eotf) {
|
||||
self.head_managers
|
||||
.handle_colors_change(s.color_space, s.eotf);
|
||||
}
|
||||
if b!(old.mode != s.mode) {
|
||||
if old.mode != s.mode {
|
||||
self.head_managers.handle_mode_change(s.mode);
|
||||
for head in self.wlr_output_heads.lock().values() {
|
||||
head.handle_mode_change(s.mode);
|
||||
|
|
@ -555,14 +537,12 @@ impl DrmDevData {
|
|||
self.dev.clone().make_render_device();
|
||||
}
|
||||
|
||||
pub fn set_direct_scanout_enabled(&self, state: &State, enabled: bool) {
|
||||
pub fn set_direct_scanout_enabled(&self, _state: &State, enabled: bool) {
|
||||
self.dev.set_direct_scanout_enabled(enabled);
|
||||
state.trigger_cci(CCI_GPUS);
|
||||
}
|
||||
|
||||
pub fn set_flip_margin(&self, state: &State, margin: u64) {
|
||||
pub fn set_flip_margin(&self, _state: &State, margin: u64) {
|
||||
self.dev.set_flip_margin(margin);
|
||||
state.trigger_cci(CCI_GPUS);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -671,7 +651,6 @@ impl State {
|
|||
}
|
||||
|
||||
pub fn set_render_ctx(&self, ctx: Option<Rc<dyn GfxContext>>) {
|
||||
self.egg_state.clear();
|
||||
self.explicit_sync_supported.set(false);
|
||||
self.render_ctx.set(ctx.clone());
|
||||
self.render_ctx_version.fetch_add(1);
|
||||
|
|
@ -787,7 +766,6 @@ impl State {
|
|||
}
|
||||
|
||||
self.expose_new_singletons();
|
||||
self.trigger_cci(CCI_COLOR_MANAGEMENT | CCI_GPUS);
|
||||
}
|
||||
|
||||
fn reload_cursors(&self) {
|
||||
|
|
@ -1033,7 +1011,6 @@ impl State {
|
|||
} else {
|
||||
self.stop_xwayland();
|
||||
}
|
||||
self.trigger_cci(CCI_XWAYLAND);
|
||||
}
|
||||
|
||||
pub fn set_xwayland_use_wire_scale(&self, use_wire_scale: bool) {
|
||||
|
|
@ -1041,7 +1018,6 @@ impl State {
|
|||
return;
|
||||
}
|
||||
self.update_xwayland_wire_scale();
|
||||
self.trigger_cci(CCI_XWAYLAND);
|
||||
}
|
||||
|
||||
pub fn next_serial(&self, client: Option<&Client>) -> u64 {
|
||||
|
|
@ -1191,8 +1167,6 @@ impl State {
|
|||
self.xdg_surface_configure_events.clear();
|
||||
self.lazy_event_sources.clear();
|
||||
self.bo_drop_queue.kill();
|
||||
self.egg_state.clear();
|
||||
self.control_centers.clear();
|
||||
self.virtual_outputs.clear();
|
||||
}
|
||||
|
||||
|
|
@ -1744,13 +1718,11 @@ impl State {
|
|||
pub fn set_color_management_enabled(&self, enabled: bool) {
|
||||
self.color_management_enabled.set(enabled);
|
||||
self.expose_new_singletons();
|
||||
self.trigger_cci(CCI_COLOR_MANAGEMENT);
|
||||
}
|
||||
|
||||
pub fn set_primary_selection_enabled(&self, enabled: bool) {
|
||||
self.enable_primary_selection.set(enabled);
|
||||
self.expose_new_singletons();
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
}
|
||||
|
||||
pub fn set_explicit_sync_enabled(&self, enabled: bool) {
|
||||
|
|
@ -1761,7 +1733,6 @@ impl State {
|
|||
pub fn set_log_level(&self, level: LogLevel) {
|
||||
if let Some(logger) = &self.logger {
|
||||
logger.set_level(level);
|
||||
self.trigger_cci(CCI_COMPOSITOR);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1794,7 +1765,6 @@ impl State {
|
|||
self.root.clone().node_visit(&mut V);
|
||||
self.damage(self.root.extents.get());
|
||||
self.icons.clear();
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
}
|
||||
|
||||
pub fn reset_colors(&self) {
|
||||
|
|
@ -1829,7 +1799,6 @@ impl State {
|
|||
pub fn set_ei_socket_enabled(self: &Rc<Self>, enabled: bool) {
|
||||
self.enable_ei_acceptor.set(enabled);
|
||||
self.update_ei_acceptor();
|
||||
self.trigger_cci(CCI_COMPOSITOR);
|
||||
}
|
||||
|
||||
pub fn set_workspace_display_order(&self, order: WorkspaceDisplayOrder) {
|
||||
|
|
@ -1837,7 +1806,6 @@ impl State {
|
|||
for output in self.root.outputs.lock().values() {
|
||||
output.handle_workspace_display_order_update();
|
||||
}
|
||||
self.trigger_cci(CCI_COMPOSITOR);
|
||||
}
|
||||
|
||||
fn spaces_changed(&self) {
|
||||
|
|
@ -1859,7 +1827,6 @@ impl State {
|
|||
self.root.clone().node_visit(&mut V);
|
||||
self.damage(self.root.extents.get());
|
||||
self.icons.update_sizes(self);
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
}
|
||||
|
||||
pub fn set_show_bar(&self, show: bool) {
|
||||
|
|
@ -1874,18 +1841,15 @@ impl State {
|
|||
|
||||
pub fn set_ui_drag_enabled(&self, enabled: bool) {
|
||||
self.ui_drag_enabled.set(enabled);
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
}
|
||||
|
||||
pub fn set_ui_drag_threshold(&self, threshold: i32) {
|
||||
self.ui_drag_threshold_squared
|
||||
.set(threshold.saturating_mul(threshold));
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
}
|
||||
|
||||
pub fn set_show_pin_icon(&self, show: bool) {
|
||||
self.show_pin_icon.set(show);
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
for stacked in self.root.stacked.iter() {
|
||||
if let Some(float) = stacked.deref().clone().node_into_float() {
|
||||
float.schedule_render_titles();
|
||||
|
|
@ -1895,7 +1859,6 @@ impl State {
|
|||
|
||||
pub fn set_float_above_fullscreen(&self, v: bool) {
|
||||
self.float_above_fullscreen.set(v);
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
for seat in self.globals.seats.lock().values() {
|
||||
seat.emulate_cursor_moved();
|
||||
seat.trigger_tree_changed(false);
|
||||
|
|
@ -1909,7 +1872,6 @@ impl State {
|
|||
}
|
||||
|
||||
fn fonts_changed(&self) {
|
||||
self.trigger_cci(CCI_LOOK_AND_FEEL);
|
||||
struct V;
|
||||
impl NodeVisitorBase for V {
|
||||
fn visit_container(&mut self, node: &Rc<ContainerNode>) {
|
||||
|
|
@ -1933,7 +1895,6 @@ impl State {
|
|||
theme.font.set(self.theme.default_font.clone());
|
||||
theme.bar_font.set(None);
|
||||
theme.title_font.set(None);
|
||||
self.egg_state.reset_fonts();
|
||||
self.fonts_changed();
|
||||
}
|
||||
|
||||
|
|
@ -1954,16 +1915,6 @@ impl State {
|
|||
self.fonts_changed();
|
||||
}
|
||||
|
||||
pub fn set_egui_fonts(&self, proportional: Option<Vec<&str>>, monospace: Option<Vec<&str>>) {
|
||||
if let Some(fonts) = &proportional {
|
||||
self.egg_state.set_proportional_fonts(fonts);
|
||||
}
|
||||
if let Some(fonts) = &monospace {
|
||||
self.egg_state.set_monospace_fonts(fonts);
|
||||
}
|
||||
self.fonts_changed();
|
||||
}
|
||||
|
||||
pub fn set_bar_position(&self, p: BarPosition) {
|
||||
self.theme.bar_position.set(p);
|
||||
self.spaces_changed();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue