Compare commits
8 Commits
travis
...
audio_trai
| Author | SHA1 | Date | |
|---|---|---|---|
| 6251a65764 | |||
| a9145628a8 | |||
| 590f803cd9 | |||
| 02c60b23ea | |||
| 686f5a0f4c | |||
| 687a3f7393 | |||
| ee847ff896 | |||
| b7beebc20f |
@@ -36,6 +36,13 @@ which = "*"
|
||||
xdg = "*"
|
||||
libnotify = { git = "https://github.com/hasufell/rust-libnotify.git", branch = "git-deps", optional = true }
|
||||
png = "^0.9.0"
|
||||
lazy_static = "^0.2.8"
|
||||
w_result = "^0.1.2"
|
||||
|
||||
|
||||
[dependencies.x11]
|
||||
version = "^2.14.0"
|
||||
features = ["xlib", "xtst"]
|
||||
|
||||
[dependencies.gtk]
|
||||
git = "https://github.com/gtk-rs/gtk.git"
|
||||
|
||||
10
README.md
10
README.md
@@ -27,7 +27,7 @@ the cloned repository:
|
||||
cargo install
|
||||
```
|
||||
|
||||
Features
|
||||
Features/Differences
|
||||
--------
|
||||
|
||||
Additonal features compared to [nicklan/pnmixer](https://github.com/nicklan/pnmixer):
|
||||
@@ -40,17 +40,15 @@ Removed features:
|
||||
* normalize volume
|
||||
* slider orientation of volume popup
|
||||
* settings for displaying text volume on volume popup
|
||||
* gtk+:2 support
|
||||
|
||||
Behavior
|
||||
--------
|
||||
|
||||
Pretty much the same. Differences are:
|
||||
Differences:
|
||||
|
||||
* volume slider is shown even when volume is muted
|
||||
|
||||
TODO
|
||||
----
|
||||
|
||||
- [ ] [hotkey support](https://github.com/hasufell/pnmixer-rust/issues/5)
|
||||
- [x] [hotkey support](https://github.com/hasufell/pnmixer-rust/issues/5)
|
||||
- [ ] [translation](https://github.com/hasufell/pnmixer-rust/issues/4)
|
||||
- [X] [documentation](https://github.com/hasufell/pnmixer-rust/issues/3)
|
||||
|
||||
188
data/ui/hotkey-dialog.glade
Normal file
188
data/ui/hotkey-dialog.glade
Normal file
@@ -0,0 +1,188 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Generated with glade 3.18.3 -->
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.12"/>
|
||||
<object class="GtkDialog" id="hotkey_dialog">
|
||||
<property name="width_request">300</property>
|
||||
<property name="height_request">200</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="border_width">5</property>
|
||||
<property name="title">Set xxx HotKey</property>
|
||||
<property name="modal">True</property>
|
||||
<property name="destroy_with_parent">True</property>
|
||||
<property name="icon_name">input-keyboard</property>
|
||||
<property name="type_hint">dialog</property>
|
||||
<child internal-child="vbox">
|
||||
<object class="GtkBox" id="dialog-vbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="spacing">2</property>
|
||||
<child internal-child="action_area">
|
||||
<object class="GtkButtonBox" id="dialog-action_area1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="layout_style">end</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="button1">
|
||||
<property name="use_action_appearance">False</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="box4">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">center</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image4">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="icon_name">gtk-cancel</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_start">5</property>
|
||||
<property name="label" translatable="yes">Cancel</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack_type">end</property>
|
||||
<property name="position">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="hbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="image1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_start">10</property>
|
||||
<property name="margin_end">10</property>
|
||||
<property name="pixel_size">57</property>
|
||||
<property name="icon_name">input-keyboard</property>
|
||||
<property name="icon_size">3</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="vbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">Defining HotKey</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="hotkey_reset_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">(press <Ctrl>C to reset)</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkHSeparator" id="hseparator1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="instruction_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label">Press new HotKey for xxx</property>
|
||||
<property name="use_markup">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="key_pressed_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<action-widgets>
|
||||
<action-widget response="0">button1</action-widget>
|
||||
</action-widgets>
|
||||
</object>
|
||||
</interface>
|
||||
@@ -926,10 +926,229 @@
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
<object class="GtkBox" id="hotkeys_vbox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="valign">start</property>
|
||||
<property name="margin_start">5</property>
|
||||
<property name="margin_end">5</property>
|
||||
<property name="margin_top">5</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkFrame" id="frame8">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="shadow_type">none</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="vbox6">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_start">12</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="hotkeys_enable_check">
|
||||
<property name="label" translatable="yes">Enable HotKeys</property>
|
||||
<property name="use_action_appearance">False</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="padding">5</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkGrid" id="hotkeys_grid">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="row_spacing">12</property>
|
||||
<property name="column_spacing">12</property>
|
||||
<property name="column_homogeneous">True</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label20">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="label" translatable="yes">Command</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label7">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="label" translatable="yes">Mute/Unmute:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label8">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="label" translatable="yes">Volume Up:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label18">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">start</property>
|
||||
<property name="label" translatable="yes">Volume Down:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label21">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">HotKey</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkEventBox" id="hotkeys_mute_eventbox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="hotkeys_mute_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">(None)</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkEventBox" id="hotkeys_up_eventbox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="hotkeys_up_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">(None)</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkEventBox" id="hotkeys_down_eventbox">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="hotkeys_down_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">(None)</property>
|
||||
<attributes>
|
||||
<attribute name="weight" value="bold"/>
|
||||
</attributes>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label19">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">Double-click a HotKey to assign a new HotKey</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">4</property>
|
||||
<property name="width">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child type="label">
|
||||
<object class="GtkLabel" id="label24">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="margin_bottom">5</property>
|
||||
<property name="label" translatable="yes"><b>HotKey Settings</b></property>
|
||||
<property name="use_markup">True</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
<property name="padding">5</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="position">3</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child type="tab">
|
||||
<placeholder/>
|
||||
<object class="GtkLabel" id="hotkeys_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="label" translatable="yes">HotKeys</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="position">3</property>
|
||||
<property name="tab_fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
|
||||
423
src/alsa_card.rs
423
src/alsa_card.rs
@@ -1,3 +1,5 @@
|
||||
#![allow(illegal_floating_point_literal_pattern)]
|
||||
|
||||
//! Alsa audio subsystem.
|
||||
//!
|
||||
//! This mod mainly defines the `AlsaCard` struct, which is the only data
|
||||
@@ -10,17 +12,21 @@ use alsa::mixer::SelemChannelId::*;
|
||||
use alsa::mixer::{Mixer, Selem, SelemId};
|
||||
use alsa::poll::PollDescriptors;
|
||||
use alsa_sys;
|
||||
use audio::*;
|
||||
use errors::*;
|
||||
use glib;
|
||||
use glib_sys;
|
||||
use libc::c_uint;
|
||||
use libc::pollfd;
|
||||
use libc::size_t;
|
||||
use std::cell::Cell;
|
||||
use std::cell::RefCell;
|
||||
use std::mem;
|
||||
use std::ptr;
|
||||
use std::rc::Rc;
|
||||
use std::u8;
|
||||
use support_alsa::*;
|
||||
use support_audio::*;
|
||||
|
||||
|
||||
|
||||
@@ -67,8 +73,6 @@ impl AlsaCard {
|
||||
/// If an elem name is provided, it will be tried. If `None` is provided
|
||||
/// or the given elem name does not exist or is not playable, any other
|
||||
/// playable elem is tried.
|
||||
/// ## `cb`
|
||||
/// Callback for the various `AlsaEvent`s.
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
@@ -122,11 +126,11 @@ impl AlsaCard {
|
||||
|
||||
let acard = Box::new(AlsaCard {
|
||||
_cannot_construct: (),
|
||||
card: card,
|
||||
mixer: mixer,
|
||||
selem_id: selem_id,
|
||||
card,
|
||||
mixer,
|
||||
selem_id,
|
||||
watch_ids: Cell::new(vec![]),
|
||||
cb: cb,
|
||||
cb,
|
||||
});
|
||||
|
||||
let watch_ids = AlsaCard::watch_poll_descriptors(vec_pollfd,
|
||||
@@ -136,89 +140,13 @@ impl AlsaCard {
|
||||
return Ok(acard);
|
||||
}
|
||||
|
||||
|
||||
/// Get the name of the alsa card.
|
||||
pub fn card_name(&self) -> Result<String> {
|
||||
return self.card.get_name().from_err();
|
||||
}
|
||||
|
||||
|
||||
/// Get the name of the channel.
|
||||
pub fn chan_name(&self) -> Result<String> {
|
||||
let n = self.selem_id
|
||||
.get_name()
|
||||
.map(|y| String::from(y))?;
|
||||
return Ok(n);
|
||||
}
|
||||
|
||||
|
||||
/// Get the `Selem`, looked up by the `SelemId`.
|
||||
pub fn selem(&self) -> Selem {
|
||||
return self.mixer.find_selem(&self.selem_id).unwrap();
|
||||
fn selem(&self) -> Selem {
|
||||
let selem_id = &self.selem_id;
|
||||
let selem = self.mixer.find_selem(selem_id);
|
||||
return selem.unwrap();
|
||||
}
|
||||
|
||||
|
||||
/// Get the current volume. The returned value corresponds to the
|
||||
/// volume range and might need to be interpreted (such as converting
|
||||
/// to percentage). This always gets
|
||||
/// the volume of the `FrontRight` channel, because the seems to be
|
||||
/// the safest bet.
|
||||
pub fn get_vol(&self) -> Result<i64> {
|
||||
let selem = self.selem();
|
||||
let volume = selem.get_playback_volume(FrontRight);
|
||||
|
||||
return volume.from_err();
|
||||
}
|
||||
|
||||
|
||||
/// Sets the volume of the current card configuration.
|
||||
/// ## `new_vol`
|
||||
/// The volume corresponding to the volume range of the `Selem`. This
|
||||
/// might need to be translated properly first from other formats
|
||||
/// (like percentage).
|
||||
pub fn set_vol(&self, new_vol: i64) -> Result<()> {
|
||||
let selem = self.selem();
|
||||
return selem.set_playback_volume_all(new_vol).from_err();
|
||||
}
|
||||
|
||||
|
||||
/// Gets the volume range of the currently selected card configuration.
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
/// `(min, max)`
|
||||
pub fn get_volume_range(&self) -> (i64, i64) {
|
||||
let selem = self.selem();
|
||||
return selem.get_playback_volume_range();
|
||||
}
|
||||
|
||||
|
||||
/// Whether the current card configuration can be muted.
|
||||
pub fn has_mute(&self) -> bool {
|
||||
let selem = self.selem();
|
||||
return selem.has_playback_switch();
|
||||
}
|
||||
|
||||
|
||||
/// Get the mute state of the current card configuration.
|
||||
pub fn get_mute(&self) -> Result<bool> {
|
||||
let selem = self.selem();
|
||||
let val = selem.get_playback_switch(FrontRight)?;
|
||||
return Ok(val == 0);
|
||||
}
|
||||
|
||||
|
||||
/// Set the mute state of the current card configuration.
|
||||
/// ## `mute`
|
||||
/// Passing `true` here means the card will be muted.
|
||||
pub fn set_mute(&self, mute: bool) -> Result<()> {
|
||||
let selem = self.selem();
|
||||
/* true -> mute, false -> unmute */
|
||||
let _ = selem.set_playback_switch_all(!mute as i32)?;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
||||
/// Watch the given alsa card poll descriptors and
|
||||
/// return the corresponding watch IDs for saving
|
||||
/// in the `AlsaCard` struct.
|
||||
@@ -248,7 +176,6 @@ impl AlsaCard {
|
||||
return watch_ids;
|
||||
}
|
||||
|
||||
|
||||
/// Unwatch the given poll descriptors.
|
||||
fn unwatch_poll_descriptors(watch_ids: &Vec<u32>) {
|
||||
for watch_id in watch_ids {
|
||||
@@ -269,6 +196,269 @@ impl Drop for AlsaCard {
|
||||
}
|
||||
|
||||
|
||||
/// Alsa implementation of the `AudioFrontend`.
|
||||
pub struct AlsaBackend {
|
||||
_cannot_construct: (),
|
||||
/// The alsa card.
|
||||
pub acard: RefCell<Box<AlsaCard>>,
|
||||
/// Last timestamp of an internal action we triggered, e.g.
|
||||
/// by setting the volume or the mute state.
|
||||
pub last_action_timestamp: Rc<RefCell<i64>>,
|
||||
/// A set of handlers that react to audio signals. We can
|
||||
/// connect to these.
|
||||
pub handlers: Handlers,
|
||||
/// The step at which to increase/decrease the volume.
|
||||
/// This value is basically from the preferences.
|
||||
pub scroll_step: Cell<u32>,
|
||||
}
|
||||
|
||||
|
||||
impl AlsaBackend {
|
||||
/// Creates the `AlsaBackend`, containing an `AlsaCard`
|
||||
/// and additional information.
|
||||
pub fn new(card_name: Option<String>,
|
||||
elem_name: Option<String>)
|
||||
-> Result<AlsaBackend> {
|
||||
|
||||
|
||||
let last_action_timestamp = Rc::new(RefCell::new(0));
|
||||
let handlers = Handlers::new();
|
||||
|
||||
let cb = {
|
||||
let myhandler = handlers.clone();
|
||||
let ts = last_action_timestamp.clone();
|
||||
Rc::new(move |event| {
|
||||
on_alsa_event(&mut *ts.borrow_mut(),
|
||||
&myhandler.borrow(),
|
||||
event)
|
||||
})
|
||||
};
|
||||
|
||||
let acard = AlsaCard::new(card_name, elem_name, cb);
|
||||
|
||||
if acard.is_err() {
|
||||
invoke_handlers(&handlers.borrow(),
|
||||
AudioSignal::NoCard,
|
||||
AudioUser::Unknown);
|
||||
} else {
|
||||
invoke_handlers(&handlers.borrow(),
|
||||
AudioSignal::CardInitialized,
|
||||
AudioUser::Unknown);
|
||||
}
|
||||
|
||||
let alsa_backend = AlsaBackend {
|
||||
_cannot_construct: (),
|
||||
acard: RefCell::new(acard?),
|
||||
last_action_timestamp: last_action_timestamp.clone(),
|
||||
handlers,
|
||||
scroll_step: Cell::new(5),
|
||||
};
|
||||
|
||||
return Ok(alsa_backend);
|
||||
}
|
||||
|
||||
|
||||
/// Gets the volume range of the currently selected card configuration.
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
/// `(min, max)`
|
||||
fn get_volume_range(&self) -> (i64, i64) {
|
||||
let acard = self.acard.borrow();
|
||||
let selem = acard.selem();
|
||||
return selem.get_playback_volume_range();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl AudioFrontend for AlsaBackend {
|
||||
fn switch_card(&self,
|
||||
card_name: Option<String>,
|
||||
elem_name: Option<String>,
|
||||
user: AudioUser)
|
||||
-> Result<()> {
|
||||
debug!("Switching cards");
|
||||
debug!("Old card name: {}", self.card_name().unwrap());
|
||||
debug!("Old chan name: {}", self.chan_name().unwrap());
|
||||
let cb = self.acard
|
||||
.borrow()
|
||||
.cb
|
||||
.clone();
|
||||
|
||||
{
|
||||
let mut ac = self.acard.borrow_mut();
|
||||
*ac = AlsaCard::new(card_name, elem_name, cb)?;
|
||||
}
|
||||
|
||||
invoke_handlers(&self.handlers.borrow(),
|
||||
AudioSignal::CardInitialized,
|
||||
user);
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
fn card_name(&self) -> Result<String> {
|
||||
return self.acard
|
||||
.borrow()
|
||||
.card
|
||||
.get_name()
|
||||
.from_err();
|
||||
}
|
||||
|
||||
fn chan_name(&self) -> Result<String> {
|
||||
let n = self.acard
|
||||
.borrow()
|
||||
.selem_id
|
||||
.get_name()
|
||||
.map(|y| String::from(y))?;
|
||||
return Ok(n);
|
||||
}
|
||||
|
||||
fn playable_chan_names(&self) -> Vec<String> {
|
||||
return get_playable_selem_names(&self.acard.borrow().mixer);
|
||||
}
|
||||
|
||||
fn get_vol(&self) -> Result<f64> {
|
||||
let acard = self.acard.borrow();
|
||||
let selem = acard.selem();
|
||||
let volume = selem.get_playback_volume(FrontRight)?;
|
||||
|
||||
return vol_to_percent(volume, self.get_volume_range());
|
||||
}
|
||||
|
||||
fn set_vol(&self,
|
||||
new_vol: f64,
|
||||
user: AudioUser,
|
||||
dir: VolDir,
|
||||
auto_unmute: bool)
|
||||
-> Result<()> {
|
||||
|
||||
{
|
||||
let mut rc = self.last_action_timestamp.borrow_mut();
|
||||
*rc = glib::get_monotonic_time();
|
||||
}
|
||||
|
||||
let alsa_vol = percent_to_vol(new_vol, self.get_volume_range(), dir)?;
|
||||
|
||||
/* only invoke handlers etc. if volume did actually change */
|
||||
{
|
||||
let old_alsa_vol =
|
||||
percent_to_vol(self.get_vol()?, self.get_volume_range(), dir)?;
|
||||
|
||||
if old_alsa_vol == alsa_vol {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
/* auto-unmute */
|
||||
if auto_unmute && self.has_mute() && self.get_mute()? {
|
||||
self.set_mute(false, user)?;
|
||||
}
|
||||
|
||||
debug!("Setting vol on card {:?} and chan {:?} to {:?} by user {:?}",
|
||||
self.card_name().unwrap(),
|
||||
self.chan_name().unwrap(),
|
||||
new_vol,
|
||||
user);
|
||||
|
||||
|
||||
self.acard
|
||||
.borrow()
|
||||
.selem()
|
||||
.set_playback_volume_all(alsa_vol)?;
|
||||
|
||||
invoke_handlers(&self.handlers.borrow(),
|
||||
AudioSignal::ValuesChanged,
|
||||
user);
|
||||
return Ok(());
|
||||
|
||||
}
|
||||
|
||||
fn vol_level(&self) -> VolLevel {
|
||||
let muted = self.get_mute().unwrap_or(false);
|
||||
if muted {
|
||||
return VolLevel::Muted;
|
||||
}
|
||||
let cur_vol = try_r!(self.get_vol(), VolLevel::Muted);
|
||||
match cur_vol {
|
||||
0. => return VolLevel::Off,
|
||||
0.0...33.0 => return VolLevel::Low,
|
||||
0.0...66.0 => return VolLevel::Medium,
|
||||
0.0...100.0 => return VolLevel::High,
|
||||
_ => return VolLevel::Off,
|
||||
}
|
||||
}
|
||||
|
||||
fn increase_vol(&self, user: AudioUser, auto_unmute: bool) -> Result<()> {
|
||||
let old_vol = self.get_vol()?;
|
||||
let new_vol = old_vol + (self.scroll_step.get() as f64);
|
||||
|
||||
return self.set_vol(new_vol, user, VolDir::Up, auto_unmute);
|
||||
}
|
||||
|
||||
fn decrease_vol(&self, user: AudioUser, auto_unmute: bool) -> Result<()> {
|
||||
let old_vol = self.get_vol()?;
|
||||
let new_vol = old_vol - (self.scroll_step.get() as f64);
|
||||
|
||||
return self.set_vol(new_vol, user, VolDir::Down, auto_unmute);
|
||||
}
|
||||
|
||||
fn has_mute(&self) -> bool {
|
||||
let acard = self.acard.borrow();
|
||||
let selem = acard.selem();
|
||||
return selem.has_playback_switch();
|
||||
}
|
||||
|
||||
fn get_mute(&self) -> Result<bool> {
|
||||
let acard = self.acard.borrow();
|
||||
let selem = acard.selem();
|
||||
let val = selem.get_playback_switch(FrontRight)?;
|
||||
return Ok(val == 0);
|
||||
}
|
||||
|
||||
fn set_mute(&self, mute: bool, user: AudioUser) -> Result<()> {
|
||||
let mut rc = self.last_action_timestamp.borrow_mut();
|
||||
*rc = glib::get_monotonic_time();
|
||||
|
||||
debug!("Setting mute to {} on card {:?} and chan {:?} by user {:?}",
|
||||
mute,
|
||||
self.card_name().unwrap(),
|
||||
self.chan_name().unwrap(),
|
||||
user);
|
||||
|
||||
let acard = self.acard.borrow();
|
||||
let selem = acard.selem();
|
||||
/* true -> mute, false -> unmute */
|
||||
let _ = selem.set_playback_switch_all(!mute as i32)?;
|
||||
|
||||
invoke_handlers(&self.handlers.borrow(),
|
||||
AudioSignal::ValuesChanged,
|
||||
user);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
fn toggle_mute(&self, user: AudioUser) -> Result<()> {
|
||||
let muted = self.get_mute()?;
|
||||
return self.set_mute(!muted, user);
|
||||
}
|
||||
|
||||
fn connect_handler(&self, cb: Box<Fn(AudioSignal, AudioUser)>) {
|
||||
self.handlers.add_handler(cb);
|
||||
}
|
||||
|
||||
fn set_scroll_step(&self, scroll_step: u32) {
|
||||
self.scroll_step.set(scroll_step);
|
||||
}
|
||||
|
||||
fn get_scroll_step(&self) -> u32 {
|
||||
return self.scroll_step.get();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/// The C callback function registered in `watch_poll_descriptors()`.
|
||||
extern "C" fn watch_cb(chan: *mut glib_sys::GIOChannel,
|
||||
cond: glib_sys::GIOCondition,
|
||||
@@ -316,7 +506,6 @@ extern "C" fn watch_cb(chan: *mut glib_sys::GIOChannel,
|
||||
error!("GIO error has occurred");
|
||||
cb(AlsaEvent::AlsaCardError);
|
||||
}
|
||||
_ => warn!("Unknown status from g_io_channel_read_chars()"),
|
||||
}
|
||||
return true as glib_sys::gboolean;
|
||||
}
|
||||
@@ -324,3 +513,61 @@ extern "C" fn watch_cb(chan: *mut glib_sys::GIOChannel,
|
||||
|
||||
return true as glib_sys::gboolean;
|
||||
}
|
||||
|
||||
|
||||
/// Invokes the registered handlers.
|
||||
fn invoke_handlers(handlers: &Vec<Box<Fn(AudioSignal, AudioUser)>>,
|
||||
signal: AudioSignal,
|
||||
user: AudioUser) {
|
||||
debug!("Invoking handlers for signal {:?} by user {:?}",
|
||||
signal,
|
||||
user);
|
||||
if handlers.is_empty() {
|
||||
debug!("No handler found");
|
||||
} else {
|
||||
debug!("Executing handlers")
|
||||
}
|
||||
for handler in handlers {
|
||||
let unboxed = handler.as_ref();
|
||||
unboxed(signal, user);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// The callback for alsa events that is passed to the alsa subsystem.
|
||||
/// This is the bridge between low-level alsa events and "high-level"
|
||||
/// audio system signals.
|
||||
fn on_alsa_event(last_action_timestamp: &mut i64,
|
||||
handlers: &Vec<Box<Fn(AudioSignal, AudioUser)>>,
|
||||
alsa_event: AlsaEvent) {
|
||||
let last: i64 = *last_action_timestamp;
|
||||
|
||||
if last != 0 {
|
||||
let now: i64 = glib::get_monotonic_time();
|
||||
let delay: i64 = now - last;
|
||||
if delay < 1000000 {
|
||||
return;
|
||||
}
|
||||
debug!("Discarding last time stamp, too old");
|
||||
*last_action_timestamp = 0;
|
||||
}
|
||||
|
||||
/* external change */
|
||||
match alsa_event {
|
||||
AlsaEvent::AlsaCardError => {
|
||||
invoke_handlers(handlers,
|
||||
self::AudioSignal::CardError,
|
||||
self::AudioUser::Unknown);
|
||||
}
|
||||
AlsaEvent::AlsaCardDiconnected => {
|
||||
invoke_handlers(handlers,
|
||||
self::AudioSignal::CardDisconnected,
|
||||
self::AudioUser::Unknown);
|
||||
}
|
||||
AlsaEvent::AlsaCardValuesChanged => {
|
||||
invoke_handlers(handlers,
|
||||
self::AudioSignal::ValuesChanged,
|
||||
self::AudioUser::Unknown);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
//! Global application state.
|
||||
|
||||
|
||||
use audio::{Audio, AudioUser};
|
||||
use alsa_card::*;
|
||||
use audio::*;
|
||||
use errors::*;
|
||||
use gtk;
|
||||
use hotkeys::Hotkeys;
|
||||
use prefs::*;
|
||||
use std::cell::RefCell;
|
||||
use std::rc::Rc;
|
||||
use support_audio::*;
|
||||
use ui_entry::Gui;
|
||||
|
||||
@@ -16,52 +19,78 @@ use notif::*;
|
||||
|
||||
// TODO: destructors
|
||||
/// The global application state struct.
|
||||
pub struct AppS {
|
||||
pub struct AppS<T>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
_cant_construct: (),
|
||||
/// Mostly static GUI state.
|
||||
pub gui: Gui,
|
||||
/// Audio state.
|
||||
pub audio: Audio,
|
||||
pub audio: Rc<T>,
|
||||
/// Preferences state.
|
||||
pub prefs: RefCell<Prefs>,
|
||||
#[cfg(feature = "notify")]
|
||||
/// Notification state.
|
||||
pub notif: Notif,
|
||||
/// Notification state. In case of initialization failure, this
|
||||
/// is set to `None`.
|
||||
pub notif: Option<Notif>,
|
||||
/// Hotkey state.
|
||||
pub hotkeys: RefCell<Box<Hotkeys<T>>>, // Gets an Rc to Audio.
|
||||
}
|
||||
|
||||
|
||||
impl AppS {
|
||||
/// Create a new application state using the `AlsaBackend`.
|
||||
pub fn new_alsa_appstate() -> AppS<AlsaBackend> {
|
||||
let prefs = RefCell::new(unwrap_error!(Prefs::new(), None));
|
||||
|
||||
let card_name = prefs.borrow()
|
||||
.device_prefs
|
||||
.card
|
||||
.clone();
|
||||
let chan_name = prefs.borrow()
|
||||
.device_prefs
|
||||
.channel
|
||||
.clone();
|
||||
let audio = Rc::new(unwrap_error!(AlsaBackend::new(Some(card_name),
|
||||
Some(chan_name)),
|
||||
None));
|
||||
return AppS::new(prefs, audio);
|
||||
}
|
||||
|
||||
|
||||
impl<T> AppS<T>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
/// Create an application state instance. There should really only be one.
|
||||
pub fn new() -> AppS {
|
||||
pub fn new(prefs: RefCell<Prefs>, audio: Rc<T>) -> Self {
|
||||
let builder_popup_window =
|
||||
gtk::Builder::new_from_string(include_str!(concat!(env!("CARGO_MANIFEST_DIR"),
|
||||
"/data/ui/popup-window.glade")));
|
||||
let builder_popup_menu =
|
||||
gtk::Builder::new_from_string(include_str!(concat!(env!("CARGO_MANIFEST_DIR"),
|
||||
"/data/ui/popup-menu.glade")));
|
||||
let prefs = RefCell::new(Prefs::new().unwrap());
|
||||
let gui =
|
||||
Gui::new(builder_popup_window, builder_popup_menu, &prefs.borrow());
|
||||
|
||||
let card_name = prefs.borrow()
|
||||
.device_prefs
|
||||
.card
|
||||
.clone();
|
||||
let chan_name = prefs.borrow()
|
||||
.device_prefs
|
||||
.channel
|
||||
.clone();
|
||||
|
||||
// TODO: better error handling
|
||||
#[cfg(feature = "notify")]
|
||||
let notif = Notif::new(&prefs.borrow()).unwrap();
|
||||
let notif = result_warn!(Notif::new(&prefs.borrow()), None).ok();
|
||||
|
||||
|
||||
let hotkeys = unwrap_error!(wresult_warn!(
|
||||
Hotkeys::new(&prefs.borrow(),
|
||||
audio.clone()), None),
|
||||
None);
|
||||
|
||||
let gui =
|
||||
Gui::new(builder_popup_window, builder_popup_menu, &prefs.borrow());
|
||||
|
||||
return AppS {
|
||||
_cant_construct: (),
|
||||
gui,
|
||||
audio: Audio::new(Some(card_name), Some(chan_name)).unwrap(),
|
||||
audio,
|
||||
prefs,
|
||||
#[cfg(feature = "notify")]
|
||||
notif,
|
||||
hotkeys: RefCell::new(hotkeys),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -72,31 +101,32 @@ impl AppS {
|
||||
pub fn update_tray_icon(&self) -> Result<()> {
|
||||
debug!("Update tray icon!");
|
||||
return self.gui.tray_icon.update_all(&self.prefs.borrow(),
|
||||
&self.audio,
|
||||
self.audio.as_ref(),
|
||||
None);
|
||||
}
|
||||
|
||||
/// Update the Popup Window state.
|
||||
pub fn update_popup_window(&self) -> Result<()> {
|
||||
debug!("Update PopupWindow!");
|
||||
return self.gui.popup_window.update(&self.audio);
|
||||
return self.gui.popup_window.update(self.audio.as_ref());
|
||||
}
|
||||
|
||||
#[cfg(feature = "notify")]
|
||||
/// Update the notification state.
|
||||
pub fn update_notify(&self) -> Result<()> {
|
||||
return self.notif.reload(&self.prefs.borrow());
|
||||
pub fn update_notify(&self) {
|
||||
match self.notif {
|
||||
Some(ref n) => n.reload(&self.prefs.borrow()),
|
||||
None => warn!("Notification system not unitialized, skipping update"),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "notify"))]
|
||||
/// Update the notification state.
|
||||
pub fn update_notify(&self) -> Result<()> {
|
||||
return Ok(());
|
||||
}
|
||||
pub fn update_notify(&self) {}
|
||||
|
||||
/// Update the audio state.
|
||||
pub fn update_audio(&self, user: AudioUser) -> Result<()> {
|
||||
return audio_reload(&self.audio, &self.prefs.borrow(), user);
|
||||
return audio_reload(self.audio.as_ref(), &self.prefs.borrow(), user);
|
||||
}
|
||||
|
||||
/// Update the config file.
|
||||
@@ -104,4 +134,10 @@ impl AppS {
|
||||
let prefs = self.prefs.borrow_mut();
|
||||
return prefs.store_config();
|
||||
}
|
||||
|
||||
/// Update hotkey state.
|
||||
pub fn update_hotkeys(&self) -> Result<()> {
|
||||
let prefs = self.prefs.borrow();
|
||||
return self.hotkeys.borrow_mut().reload(&prefs);
|
||||
}
|
||||
}
|
||||
|
||||
371
src/audio.rs
371
src/audio.rs
@@ -8,15 +8,11 @@
|
||||
//! of the underlying audio implementation, may it be alsa or whatever.
|
||||
|
||||
|
||||
use alsa_card::*;
|
||||
use errors::*;
|
||||
use glib;
|
||||
use std::cell::Cell;
|
||||
use std::cell::Ref;
|
||||
use std::cell::RefCell;
|
||||
use std::f64;
|
||||
use std::rc::Rc;
|
||||
use support_alsa::*;
|
||||
use support_audio::*;
|
||||
|
||||
|
||||
@@ -64,162 +60,39 @@ pub struct Handlers {
|
||||
|
||||
|
||||
impl Handlers {
|
||||
fn new() -> Handlers {
|
||||
pub fn new() -> Handlers {
|
||||
return Handlers { inner: Rc::new(RefCell::new(vec![])) };
|
||||
}
|
||||
|
||||
|
||||
fn borrow(&self) -> Ref<Vec<Box<Fn(AudioSignal, AudioUser)>>> {
|
||||
pub fn borrow(&self) -> Ref<Vec<Box<Fn(AudioSignal, AudioUser)>>> {
|
||||
return self.inner.borrow();
|
||||
}
|
||||
|
||||
|
||||
fn add_handler(&self, cb: Box<Fn(AudioSignal, AudioUser)>) {
|
||||
pub fn add_handler(&self, cb: Box<Fn(AudioSignal, AudioUser)>) {
|
||||
self.inner.borrow_mut().push(cb);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// High-level Audio struct, which could theoretically be backend
|
||||
/// agnostic.
|
||||
pub struct Audio {
|
||||
_cannot_construct: (),
|
||||
/// The alsa card.
|
||||
pub acard: RefCell<Box<AlsaCard>>,
|
||||
/// Last timestamp of an internal action we triggered, e.g.
|
||||
/// by setting the volume or the mute state.
|
||||
pub last_action_timestamp: Rc<RefCell<i64>>,
|
||||
/// A set of handlers that react to audio signals. We can
|
||||
/// connect to these.
|
||||
pub handlers: Handlers,
|
||||
/// The step at which to increase/decrease the volume.
|
||||
/// This value is basically from the preferences.
|
||||
pub scroll_step: Cell<u32>,
|
||||
}
|
||||
|
||||
|
||||
impl Audio {
|
||||
/// Create a new Audio instance. This tries very hard to get
|
||||
/// a working configuration from the backend.
|
||||
/// ## `card_name`
|
||||
/// If a card name is provided, it will be tried. If `None` is provided
|
||||
/// or the given card name does not exist or is not playable, any other
|
||||
/// playable card is tried.
|
||||
/// ## `elem_name`
|
||||
/// If an elem name is provided, it will be tried. If `None` is provided
|
||||
/// or the given elem name does not exist or is not playable, any other
|
||||
/// playable elem is tried.
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
/// `Ok(Audio)` on success, `Err(error)` otherwise.
|
||||
pub fn new(card_name: Option<String>,
|
||||
elem_name: Option<String>)
|
||||
-> Result<Audio> {
|
||||
|
||||
let handlers = Handlers::new();
|
||||
let last_action_timestamp = Rc::new(RefCell::new(0));
|
||||
|
||||
let cb = {
|
||||
let myhandler = handlers.clone();
|
||||
let ts = last_action_timestamp.clone();
|
||||
Rc::new(move |event| {
|
||||
on_alsa_event(&mut *ts.borrow_mut(),
|
||||
&myhandler.borrow(),
|
||||
event)
|
||||
})
|
||||
};
|
||||
|
||||
let acard = AlsaCard::new(card_name, elem_name, cb);
|
||||
|
||||
/* additionally dispatch signals */
|
||||
if acard.is_err() {
|
||||
invoke_handlers(&handlers.borrow(),
|
||||
AudioSignal::NoCard,
|
||||
AudioUser::Unknown);
|
||||
} else {
|
||||
invoke_handlers(&handlers.borrow(),
|
||||
AudioSignal::CardInitialized,
|
||||
AudioUser::Unknown);
|
||||
}
|
||||
|
||||
let audio = Audio {
|
||||
_cannot_construct: (),
|
||||
acard: RefCell::new(acard?),
|
||||
last_action_timestamp: last_action_timestamp.clone(),
|
||||
handlers: handlers.clone(),
|
||||
scroll_step: Cell::new(5),
|
||||
};
|
||||
|
||||
return Ok(audio);
|
||||
}
|
||||
|
||||
|
||||
/// Switches the current alsa card. Behaves the same way in regards to
|
||||
/// `card_name` and `elem_name` as the `Audio::new()` method.
|
||||
// TODO: explain more, specify details that need to be implemented
|
||||
pub trait AudioFrontend {
|
||||
/// Switches the current card. Must invoke handlers.
|
||||
/// ## `user`
|
||||
/// Where the card switch originates from.
|
||||
pub fn switch_acard(&self,
|
||||
card_name: Option<String>,
|
||||
elem_name: Option<String>,
|
||||
user: AudioUser)
|
||||
-> Result<()> {
|
||||
debug!("Switching cards");
|
||||
debug!("Old card name: {}",
|
||||
self.acard
|
||||
.borrow()
|
||||
.card_name()
|
||||
.unwrap());
|
||||
debug!("Old chan name: {}",
|
||||
self.acard
|
||||
.borrow()
|
||||
.chan_name()
|
||||
.unwrap());
|
||||
let cb = self.acard
|
||||
.borrow()
|
||||
.cb
|
||||
.clone();
|
||||
{
|
||||
let mut ac = self.acard.borrow_mut();
|
||||
*ac = AlsaCard::new(card_name, elem_name, cb)?;
|
||||
}
|
||||
fn switch_card(&self,
|
||||
card_name: Option<String>,
|
||||
elem_name: Option<String>,
|
||||
user: AudioUser)
|
||||
-> Result<()>;
|
||||
|
||||
invoke_handlers(&self.handlers.borrow(),
|
||||
AudioSignal::CardInitialized,
|
||||
user);
|
||||
/// Current volume. Between 0 and 100.
|
||||
/// This always gets the volume of the `FrontRight` channel, because the
|
||||
/// seems to be the safest bet.
|
||||
fn get_vol(&self) -> Result<f64>;
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
||||
/// Current volume.
|
||||
pub fn vol(&self) -> Result<f64> {
|
||||
let alsa_vol = self.acard
|
||||
.borrow()
|
||||
.get_vol()?;
|
||||
return vol_to_percent(alsa_vol, self.acard.borrow().get_volume_range());
|
||||
}
|
||||
|
||||
|
||||
/// Current volume level, nicely usable for e.g. selecting from a set
|
||||
/// of images.
|
||||
pub fn vol_level(&self) -> VolLevel {
|
||||
let muted = self.get_mute().unwrap_or(false);
|
||||
if muted {
|
||||
return VolLevel::Muted;
|
||||
}
|
||||
let cur_vol = try_r!(self.vol(), VolLevel::Muted);
|
||||
match cur_vol {
|
||||
0. => return VolLevel::Off,
|
||||
0.0...33.0 => return VolLevel::Low,
|
||||
0.0...66.0 => return VolLevel::Medium,
|
||||
0.0...100.0 => return VolLevel::High,
|
||||
_ => return VolLevel::Off,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Set the current volume.
|
||||
/// Set the current volume. Must invoke handlers.
|
||||
/// ## `new_vol`
|
||||
/// Set the volume to this value.
|
||||
/// ## `user`
|
||||
@@ -229,220 +102,60 @@ impl Audio {
|
||||
/// or increase. This helps with rounding problems.
|
||||
/// ## `auto_unmute`
|
||||
/// Whether to automatically unmute if the volume changes.
|
||||
pub fn set_vol(&self,
|
||||
new_vol: f64,
|
||||
user: AudioUser,
|
||||
dir: VolDir,
|
||||
auto_unmute: bool)
|
||||
-> Result<()> {
|
||||
{
|
||||
let mut rc = self.last_action_timestamp.borrow_mut();
|
||||
*rc = glib::get_monotonic_time();
|
||||
}
|
||||
|
||||
let alsa_vol = percent_to_vol(new_vol,
|
||||
self.acard.borrow().get_volume_range(),
|
||||
dir)?;
|
||||
|
||||
/* only invoke handlers etc. if volume did actually change */
|
||||
{
|
||||
let old_alsa_vol =
|
||||
percent_to_vol(self.vol()?,
|
||||
self.acard.borrow().get_volume_range(),
|
||||
dir)?;
|
||||
|
||||
if old_alsa_vol == alsa_vol {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
/* auto-unmute */
|
||||
if auto_unmute && self.has_mute() && self.get_mute()? {
|
||||
self.set_mute(false, user)?;
|
||||
}
|
||||
|
||||
debug!("Setting vol on card {:?} and chan {:?} to {:?} by user {:?}",
|
||||
self.acard
|
||||
.borrow()
|
||||
.card_name()
|
||||
.unwrap(),
|
||||
self.acard
|
||||
.borrow()
|
||||
.chan_name()
|
||||
.unwrap(),
|
||||
new_vol,
|
||||
user);
|
||||
|
||||
self.acard
|
||||
.borrow()
|
||||
.set_vol(alsa_vol)?;
|
||||
|
||||
invoke_handlers(&self.handlers.borrow(),
|
||||
AudioSignal::ValuesChanged,
|
||||
user);
|
||||
return Ok(());
|
||||
}
|
||||
fn set_vol(&self,
|
||||
new_vol: f64,
|
||||
user: AudioUser,
|
||||
dir: VolDir,
|
||||
auto_unmute: bool)
|
||||
-> Result<()>;
|
||||
|
||||
/// Current volume level, nicely usable for e.g. selecting from a set
|
||||
/// of images.
|
||||
fn vol_level(&self) -> VolLevel;
|
||||
|
||||
/// Increase the volume. The step to increasy by is taken from
|
||||
/// `self.scroll_step`.
|
||||
/// ## `user`
|
||||
/// Where the card switch originates from.
|
||||
pub fn increase_vol(&self,
|
||||
user: AudioUser,
|
||||
auto_unmute: bool)
|
||||
-> Result<()> {
|
||||
let old_vol = self.vol()?;
|
||||
let new_vol = old_vol + (self.scroll_step.get() as f64);
|
||||
|
||||
return self.set_vol(new_vol, user, VolDir::Up, auto_unmute);
|
||||
}
|
||||
|
||||
fn increase_vol(&self, user: AudioUser, auto_unmute: bool) -> Result<()>;
|
||||
|
||||
/// Decrease the volume. The step to decrease by is taken from
|
||||
/// `self.scroll_step`.
|
||||
/// ## `user`
|
||||
/// Where the card switch originates from.
|
||||
pub fn decrease_vol(&self,
|
||||
user: AudioUser,
|
||||
auto_unmute: bool)
|
||||
-> Result<()> {
|
||||
let old_vol = self.vol()?;
|
||||
let new_vol = old_vol - (self.scroll_step.get() as f64);
|
||||
|
||||
return self.set_vol(new_vol, user, VolDir::Down, auto_unmute);
|
||||
}
|
||||
|
||||
fn decrease_vol(&self, user: AudioUser, auto_unmute: bool) -> Result<()>;
|
||||
|
||||
/// Whether the current audio configuration can be muted.
|
||||
pub fn has_mute(&self) -> bool {
|
||||
return self.acard.borrow().has_mute();
|
||||
}
|
||||
|
||||
fn has_mute(&self) -> bool;
|
||||
|
||||
/// Get the mute state of the current audio configuration.
|
||||
pub fn get_mute(&self) -> Result<bool> {
|
||||
return self.acard.borrow().get_mute();
|
||||
}
|
||||
|
||||
fn get_mute(&self) -> Result<bool>;
|
||||
|
||||
/// Set the mute state of the current audio configuration.
|
||||
pub fn set_mute(&self, mute: bool, user: AudioUser) -> Result<()> {
|
||||
let mut rc = self.last_action_timestamp.borrow_mut();
|
||||
*rc = glib::get_monotonic_time();
|
||||
|
||||
debug!("Setting mute to {} on card {:?} and chan {:?} by user {:?}",
|
||||
mute,
|
||||
self.acard
|
||||
.borrow()
|
||||
.card_name()
|
||||
.unwrap(),
|
||||
self.acard
|
||||
.borrow()
|
||||
.chan_name()
|
||||
.unwrap(),
|
||||
user);
|
||||
|
||||
self.acard
|
||||
.borrow()
|
||||
.set_mute(mute)?;
|
||||
|
||||
invoke_handlers(&self.handlers.borrow(),
|
||||
AudioSignal::ValuesChanged,
|
||||
user);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
/// Must invoke handlers.
|
||||
fn set_mute(&self, mute: bool, user: AudioUser) -> Result<()>;
|
||||
|
||||
/// Toggle the mute state of the current audio configuration.
|
||||
pub fn toggle_mute(&self, user: AudioUser) -> Result<()> {
|
||||
let muted = self.get_mute()?;
|
||||
return self.set_mute(!muted, user);
|
||||
}
|
||||
|
||||
fn toggle_mute(&self, user: AudioUser) -> Result<()>;
|
||||
|
||||
/// Connect a signal handler to the audio subsystem. This can
|
||||
/// be done from anywhere, e.g. in the UI code to react to
|
||||
/// certain signals. Multiple handlers for the same signals are fine,
|
||||
/// they will be executed in order.
|
||||
pub fn connect_handler(&self, cb: Box<Fn(AudioSignal, AudioUser)>) {
|
||||
self.handlers.add_handler(cb);
|
||||
}
|
||||
|
||||
fn connect_handler(&self, cb: Box<Fn(AudioSignal, AudioUser)>);
|
||||
|
||||
/// Get the current card name.
|
||||
pub fn card_name(&self) -> Result<String> {
|
||||
return self.acard.borrow().card_name();
|
||||
}
|
||||
|
||||
fn card_name(&self) -> Result<String>;
|
||||
|
||||
/// Get the currently playable channel names.
|
||||
pub fn playable_chan_names(&self) -> Vec<String> {
|
||||
return get_playable_selem_names(&self.acard.borrow().mixer);
|
||||
}
|
||||
|
||||
fn playable_chan_names(&self) -> Vec<String>;
|
||||
|
||||
/// Get the current active channel name.
|
||||
pub fn chan_name(&self) -> Result<String> {
|
||||
return self.acard.borrow().chan_name();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Invokes the registered handlers.
|
||||
fn invoke_handlers(handlers: &Vec<Box<Fn(AudioSignal, AudioUser)>>,
|
||||
signal: AudioSignal,
|
||||
user: AudioUser) {
|
||||
debug!("Invoking handlers for signal {:?} by user {:?}",
|
||||
signal,
|
||||
user);
|
||||
if handlers.is_empty() {
|
||||
debug!("No handler found");
|
||||
} else {
|
||||
debug!("Executing handlers")
|
||||
}
|
||||
for handler in handlers {
|
||||
let unboxed = handler.as_ref();
|
||||
unboxed(signal, user);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// The callback for alsa events that is passed to the alsa subsystem.
|
||||
/// This is the bridge between low-level alsa events and "high-level"
|
||||
/// audio system signals.
|
||||
fn on_alsa_event(last_action_timestamp: &mut i64,
|
||||
handlers: &Vec<Box<Fn(AudioSignal, AudioUser)>>,
|
||||
alsa_event: AlsaEvent) {
|
||||
let last: i64 = *last_action_timestamp;
|
||||
|
||||
if last != 0 {
|
||||
let now: i64 = glib::get_monotonic_time();
|
||||
let delay: i64 = now - last;
|
||||
if delay < 1000000 {
|
||||
return;
|
||||
}
|
||||
debug!("Discarding last time stamp, too old");
|
||||
*last_action_timestamp = 0;
|
||||
}
|
||||
|
||||
/* external change */
|
||||
match alsa_event {
|
||||
AlsaEvent::AlsaCardError => {
|
||||
invoke_handlers(handlers,
|
||||
self::AudioSignal::CardError,
|
||||
self::AudioUser::Unknown);
|
||||
}
|
||||
AlsaEvent::AlsaCardDiconnected => {
|
||||
invoke_handlers(handlers,
|
||||
self::AudioSignal::CardDisconnected,
|
||||
self::AudioUser::Unknown);
|
||||
}
|
||||
AlsaEvent::AlsaCardValuesChanged => {
|
||||
invoke_handlers(handlers,
|
||||
self::AudioSignal::ValuesChanged,
|
||||
self::AudioUser::Unknown);
|
||||
}
|
||||
e => warn!("Unhandled alsa event: {:?}", e),
|
||||
}
|
||||
fn chan_name(&self) -> Result<String>;
|
||||
|
||||
/// Set the scroll step.
|
||||
fn set_scroll_step(&self, scroll_step: u32);
|
||||
|
||||
/// Get the scroll step.
|
||||
fn get_scroll_step(&self) -> u32;
|
||||
}
|
||||
|
||||
12
src/bin.rs
12
src/bin.rs
@@ -6,29 +6,23 @@ extern crate pnmixerlib;
|
||||
use pnmixerlib::*;
|
||||
|
||||
use app_state::*;
|
||||
#[cfg(feature = "notify")]
|
||||
use libnotify::*;
|
||||
use std::rc::Rc;
|
||||
|
||||
|
||||
fn main() {
|
||||
gtk::init().unwrap();
|
||||
|
||||
// TODO: error handling
|
||||
#[cfg(feature = "notify")]
|
||||
init("PNMixer-rs").unwrap();
|
||||
|
||||
flexi_logger::LogOptions::new()
|
||||
.log_to_file(false)
|
||||
// ... your configuration options go here ...
|
||||
.init(Some("pnmixer=debug".to_string()))
|
||||
.unwrap_or_else(|e| panic!("Logger initialization failed with {}", e));
|
||||
|
||||
let apps = Rc::new(AppS::new());
|
||||
let apps = Rc::new(new_alsa_appstate());
|
||||
|
||||
ui_entry::init(apps);
|
||||
|
||||
gtk::main();
|
||||
|
||||
#[cfg(feature = "notify")]
|
||||
uninit();
|
||||
// TODO: clean deallocation?
|
||||
}
|
||||
|
||||
125
src/errors.rs
125
src/errors.rs
@@ -15,6 +15,13 @@ error_chain! {
|
||||
Toml(toml::de::Error);
|
||||
Png(png::DecodingError);
|
||||
}
|
||||
|
||||
errors {
|
||||
GtkResponseCancel(t: String) {
|
||||
description("User hit cancel")
|
||||
display("User hit cancel: {}", t)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -107,3 +114,121 @@ macro_rules! try_e {
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
#[macro_export]
|
||||
/// Unwraps a `Result<T, E>` by yielding a value of the samet ype
|
||||
/// for either case.
|
||||
macro_rules! unwrap_any {
|
||||
($expr:expr, $fmt_ok:expr, $fmt_err:expr) => (match $expr {
|
||||
::std::result::Result::Ok(val) => $fmt_ok,
|
||||
::std::result::Result::Err(err) => $fmt_err,
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
#[macro_export]
|
||||
/// Warns on err and yields `()` without returning the function.
|
||||
macro_rules! just_warn {
|
||||
($expr:expr) => (match $expr {
|
||||
::std::result::Result::Ok(_) => (),
|
||||
::std::result::Result::Err(err) => {
|
||||
warn!("{:?}", err);
|
||||
()
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#[macro_export]
|
||||
/// Present a gtk error dialog with given message.
|
||||
/// Provides only a close button.
|
||||
macro_rules! error_dialog {
|
||||
($msg:expr, $parent:expr) => {
|
||||
{
|
||||
use gtk::DialogExt;
|
||||
use gtk::WidgetExt;
|
||||
use gtk::WindowExt;
|
||||
|
||||
let parent: Option<>k::Window> = $parent;
|
||||
let dialog = gtk::MessageDialog::new(parent,
|
||||
gtk::DIALOG_DESTROY_WITH_PARENT,
|
||||
gtk::MessageType::Error,
|
||||
gtk::ButtonsType::Close,
|
||||
$msg);
|
||||
dialog.set_title("PNMixer-rs Error");
|
||||
|
||||
dialog.run();
|
||||
dialog.destroy();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#[macro_export]
|
||||
/// Present a gtk error dialog with the error from the `Result` type,
|
||||
/// if any.
|
||||
/// Provides only a close button.
|
||||
macro_rules! result_warn {
|
||||
($expr:expr, $parent:expr) => (match $expr {
|
||||
::std::result::Result::Ok(v) => Ok(v),
|
||||
::std::result::Result::Err(err) => {
|
||||
use std::error::Error;
|
||||
let warn_string = format!("{}{}", err.description(),
|
||||
err.cause().map(|e| format!("\n\nCause: {}", e.description())).unwrap_or(String::from("")));
|
||||
warn!("{}", warn_string);
|
||||
error_dialog!(warn_string.as_str(), $parent);
|
||||
Err(err)
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#[macro_export]
|
||||
/// Convert `WResult` to `Result`. All warnings are printed via the `log`
|
||||
/// crate and are shown via Gtk dialogs.
|
||||
macro_rules! wresult_warn {
|
||||
($expr:expr, $parent:expr) => (match $expr {
|
||||
::w_result::WResult::WOk(t, ws) => {
|
||||
use std::error::Error;
|
||||
for w in ws {
|
||||
let warn_string = format!("{}{}", w.description(),
|
||||
w.cause().map(|e| format!("\n\nCause: {}", e.description())).unwrap_or(String::from("")));
|
||||
warn!("{}", warn_string);
|
||||
error_dialog!(warn_string.as_str(), $parent);
|
||||
}
|
||||
Ok(t)
|
||||
},
|
||||
::w_result::WResult::WErr(err) => Err(err),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#[macro_export]
|
||||
/// If there is an error in the expression, push it to
|
||||
/// the given mutable warning vector.
|
||||
macro_rules! push_warning {
|
||||
($expr:expr, $vec:ident) => (match $expr {
|
||||
Err(e) => $vec.push(e),
|
||||
_ => ()
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
#[macro_export]
|
||||
/// If there is a value in the Result type, unwrap it, otherwise error-log
|
||||
/// the error, show it via gtk dialog and exit the whole program.
|
||||
macro_rules! unwrap_error {
|
||||
($expr:expr, $parent:expr) => (match $expr {
|
||||
::std::result::Result::Ok(v) => v,
|
||||
::std::result::Result::Err(err) => {
|
||||
use std::error::Error;
|
||||
let err_string = format!("{}{}", err.description(),
|
||||
err.cause().map(|e| format!("\n\nCause: {}", e.description())).unwrap_or(String::from("")));
|
||||
|
||||
error!("{}", err_string);
|
||||
error_dialog!(err_string.as_str(), $parent);
|
||||
::std::process::exit(1);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
77
src/gdk_x11.rs
Normal file
77
src/gdk_x11.rs
Normal file
@@ -0,0 +1,77 @@
|
||||
//! Glue code between gdk and x11, allowing some `gdk_x11_*` functions.
|
||||
//!
|
||||
//! This is not a complete binding, but just provides what we need in a
|
||||
//! reasonable way.
|
||||
|
||||
|
||||
use gdk;
|
||||
use gdk_sys::GdkDisplay;
|
||||
use glib::translate::*;
|
||||
use x11::xlib::{Display, Window};
|
||||
|
||||
|
||||
// https://developer.gnome.org/gdk3/stable/gdk3-X-Window-System-Interaction.html
|
||||
mod ffi {
|
||||
use gdk_sys::{GdkDisplay, GdkWindow};
|
||||
use x11::xlib::{Display, Window};
|
||||
|
||||
extern "C" {
|
||||
pub fn gdk_x11_get_default_xdisplay() -> *mut Display;
|
||||
pub fn gdk_x11_get_default_root_xwindow() -> Window;
|
||||
pub fn gdk_x11_window_foreign_new_for_display(display: *mut GdkDisplay,
|
||||
window: Window) -> * mut GdkWindow;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Gets the default GTK+ display.
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
/// the Xlib Display* for the display specified in the `--display`
|
||||
/// command line option or the `DISPLAY` environment variable.
|
||||
pub fn gdk_x11_get_default_xdisplay() -> *mut Display {
|
||||
unsafe {
|
||||
return ffi::gdk_x11_get_default_xdisplay();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Gets the root window of the default screen (see `gdk_x11_get_default_screen()`).
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
/// an Xlib Window.
|
||||
pub fn gdk_x11_get_default_root_xwindow() -> Window {
|
||||
unsafe {
|
||||
return ffi::gdk_x11_get_default_root_xwindow();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Wraps a native window in a GdkWindow. The function will try to look up the
|
||||
/// window using `gdk_x11_window_lookup_for_display()` first. If it does not find
|
||||
/// it there, it will create a new window.
|
||||
///
|
||||
/// This may fail if the window has been destroyed. If the window was already
|
||||
/// known to GDK, a new reference to the existing GdkWindow is returned.
|
||||
/// ## `display`
|
||||
/// the GdkDisplay where the window handle comes from.
|
||||
/// ## ` window`
|
||||
/// an Xlib Window
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
/// a GdkWindow wrapper for the native window, or `None` if the window has been
|
||||
/// destroyed. The wrapper will be newly created, if one doesn’t exist already.
|
||||
pub fn gdk_x11_window_foreign_new_for_display(gdk_display: &mut gdk::Display,
|
||||
xwindow: Window)
|
||||
-> Option<gdk::Window> {
|
||||
unsafe {
|
||||
let display: *mut GdkDisplay =
|
||||
mut_override(gdk_display.to_glib_none().0);
|
||||
|
||||
return from_glib_full(
|
||||
ffi::gdk_x11_window_foreign_new_for_display(display, xwindow));
|
||||
}
|
||||
}
|
||||
181
src/hotkey.rs
Normal file
181
src/hotkey.rs
Normal file
@@ -0,0 +1,181 @@
|
||||
//! The hotkey subsystem.
|
||||
//!
|
||||
//! This file defines what's a hotkey and deals with the low-level XKBlib and
|
||||
//! Gtk/Gdk.
|
||||
|
||||
|
||||
use errors::*;
|
||||
use gdk;
|
||||
use gdk_sys;
|
||||
use gdk_x11::*;
|
||||
use gtk;
|
||||
use x11;
|
||||
use libc::c_int;
|
||||
use libc::c_uint;
|
||||
|
||||
|
||||
/// `xmodmap -pm`
|
||||
/// List of key modifiers which will be ignored whenever
|
||||
/// we check whether the defined hotkeys have been pressed.
|
||||
lazy_static! {
|
||||
static ref KEY_MASKS: Vec<c_uint> = vec![
|
||||
gdk_sys::GdkModifierType::empty().bits(), // No Modkey
|
||||
gdk_sys::GDK_MOD2_MASK.bits(), // Numlock
|
||||
gdk_sys::GDK_LOCK_MASK.bits(), // Capslock
|
||||
gdk_sys::GDK_MOD2_MASK.bits() | gdk_sys::GDK_LOCK_MASK.bits(),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
#[derive(Debug)]
|
||||
/// A hotkey, described by the underlying gdk/X11 representation.
|
||||
pub struct Hotkey {
|
||||
/// The hardware keycode.
|
||||
pub code: gdk::key,
|
||||
/// The modifier keys and mouse button that have been pressed
|
||||
/// in addition to the main key (e.g. Numlock/Capslock).
|
||||
/// This is the raw bit representation and can be converted to
|
||||
/// `gtk::ModifierType` via `self.mods()`.
|
||||
pub mod_bits: u32, // Makes serialize/deserialize easier
|
||||
/// X key symbol.
|
||||
pub sym: u64,
|
||||
/// Gtk Accelerator string.
|
||||
pub gtk_accel: String,
|
||||
}
|
||||
|
||||
impl Hotkey {
|
||||
/// Creates a new hotkey and grabs it.
|
||||
pub fn new(code: gdk::key, mods: gdk::ModifierType) -> Result<Hotkey> {
|
||||
let display = gdk_x11_get_default_xdisplay();
|
||||
let mod_bits = mods.bits();
|
||||
let sym =
|
||||
unsafe { x11::xlib::XkbKeycodeToKeysym(display, code as u8, 0, 0) };
|
||||
let gtk_accel = gtk::accelerator_name(sym as u32, mods)
|
||||
.ok_or("Could net get accelerator name")?;
|
||||
|
||||
let hotkey = Hotkey {
|
||||
code,
|
||||
mod_bits,
|
||||
sym,
|
||||
gtk_accel,
|
||||
};
|
||||
|
||||
hotkey.grab()?;
|
||||
|
||||
return Ok(hotkey);
|
||||
}
|
||||
|
||||
/// Creates a new hotkey from an accelerator string and grabs it.
|
||||
pub fn new_from_accel(accel: &str) -> Result<Hotkey> {
|
||||
let (code, mods) = hotkey_accel_to_code(accel);
|
||||
return Hotkey::new(code, mods);
|
||||
}
|
||||
|
||||
/// Grab a key manually. Should be paired with a ungrab() call.
|
||||
pub fn grab(&self) -> Result<()> {
|
||||
let display = gdk_x11_get_default_xdisplay();
|
||||
|
||||
/* Init error handling */
|
||||
let old_hdlr = unsafe {
|
||||
GRAB_ERROR = 0;
|
||||
x11::xlib::XSetErrorHandler(Some(grab_error_handler))
|
||||
};
|
||||
|
||||
/* Grab the key */
|
||||
for key in KEY_MASKS.iter() {
|
||||
unsafe {
|
||||
x11::xlib::XGrabKey(display,
|
||||
self.code,
|
||||
self.mod_bits | key,
|
||||
gdk_x11_get_default_root_xwindow(),
|
||||
1,
|
||||
x11::xlib::GrabModeAsync,
|
||||
x11::xlib::GrabModeAsync);
|
||||
}
|
||||
}
|
||||
|
||||
/* Synchronize X */
|
||||
unsafe {
|
||||
x11::xlib::XFlush(display);
|
||||
x11::xlib::XSync(display, false as c_int);
|
||||
}
|
||||
|
||||
/* Restore error handler */
|
||||
unsafe {
|
||||
x11::xlib::XSetErrorHandler(old_hdlr);
|
||||
}
|
||||
|
||||
/* Check for error */
|
||||
unsafe {
|
||||
ensure!(GRAB_ERROR == 0, "Error grabbing");
|
||||
}
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
/// Ungrab a key manually. Should be paired with a grab() call.
|
||||
pub fn ungrab(&self) {
|
||||
let display = gdk_x11_get_default_xdisplay();
|
||||
|
||||
for key in KEY_MASKS.iter() {
|
||||
unsafe {
|
||||
x11::xlib::XUngrabKey(display,
|
||||
self.code,
|
||||
self.mod_bits | key,
|
||||
gdk_x11_get_default_root_xwindow());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Checks if the keycode we got (minus modifiers like
|
||||
/// numlock/capslock) matches the hotkey.
|
||||
/// Thus numlock + o will match o.
|
||||
pub fn matches(&self, code: gdk::key, mods: gdk::ModifierType) -> bool {
|
||||
if code != self.code {
|
||||
return false;
|
||||
}
|
||||
|
||||
for key in KEY_MASKS.iter() {
|
||||
if (self.mod_bits | key) == mods.bits() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Hotkey {
|
||||
fn drop(&mut self) {
|
||||
debug!("Ungrabbing hotkey");
|
||||
self.ungrab();
|
||||
}
|
||||
}
|
||||
|
||||
/// Translate a Gtk Accelerator string to a key code and mods.
|
||||
pub fn hotkey_accel_to_code(accel: &str) -> (gdk::key, gdk::ModifierType) {
|
||||
let display = gdk_x11_get_default_xdisplay();
|
||||
let (sym, mods) = gtk::accelerator_parse(accel);
|
||||
|
||||
unsafe {
|
||||
if sym != 0 {
|
||||
return (x11::xlib::XKeysymToKeycode(display, sym as u64) as i32,
|
||||
mods);
|
||||
} else {
|
||||
return (-1, mods);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static mut GRAB_ERROR: u8 = 0;
|
||||
|
||||
extern "C" fn grab_error_handler(_: *mut x11::xlib::Display,
|
||||
_: *mut x11::xlib::XErrorEvent)
|
||||
-> c_int {
|
||||
warn!("Error while grabbing hotkey");
|
||||
unsafe {
|
||||
GRAB_ERROR = 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
301
src/hotkeys.rs
Normal file
301
src/hotkeys.rs
Normal file
@@ -0,0 +1,301 @@
|
||||
//! The hotkeys subsystem.
|
||||
//!
|
||||
//! This handles the PNMixer-rs specific hotkeys as a whole,
|
||||
//! including communication with Xlib and intercepting key presses
|
||||
//! before they can be interpreted by Gtk/Gdk.
|
||||
|
||||
|
||||
use audio::*;
|
||||
use errors::*;
|
||||
use errors;
|
||||
use gdk;
|
||||
use gdk_sys;
|
||||
use gdk_x11;
|
||||
use glib::translate::*;
|
||||
use glib_sys;
|
||||
use hotkey::*;
|
||||
use prefs::*;
|
||||
use std::mem;
|
||||
use std::rc::Rc;
|
||||
use w_result::*;
|
||||
use x11;
|
||||
|
||||
|
||||
|
||||
/// The possible Hotkeys for manipulating the volume.
|
||||
pub struct Hotkeys<T>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
enabled: bool,
|
||||
mute_key: Option<Hotkey>,
|
||||
up_key: Option<Hotkey>,
|
||||
down_key: Option<Hotkey>,
|
||||
|
||||
// need this to access audio in 'key_filter'
|
||||
audio: Rc<T>,
|
||||
auto_unmute: bool,
|
||||
}
|
||||
|
||||
impl<T> Hotkeys<T>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
/// Creates the hotkeys subsystem and binds the hotkeys.
|
||||
pub fn new(prefs: &Prefs,
|
||||
audio: Rc<T>)
|
||||
-> WResult<Box<Hotkeys<T>>, errors::Error, errors::Error> {
|
||||
debug!("Creating hotkeys control");
|
||||
let mut hotkeys =
|
||||
Box::new(Hotkeys {
|
||||
enabled: false,
|
||||
mute_key: None,
|
||||
up_key: None,
|
||||
down_key: None,
|
||||
audio: audio,
|
||||
auto_unmute: prefs.behavior_prefs.unmute_on_vol_change,
|
||||
});
|
||||
let mut warn = vec![];
|
||||
push_warning!(hotkeys.reload(prefs), warn);
|
||||
|
||||
/* bind hotkeys */
|
||||
let data_ptr =
|
||||
unsafe {
|
||||
mem::transmute::<&Hotkeys<T>,
|
||||
glib_sys::gpointer>(hotkeys.as_ref())
|
||||
};
|
||||
hotkeys_add_filter(Some(key_filter::<T>), data_ptr);
|
||||
return WOk(hotkeys, warn);
|
||||
}
|
||||
|
||||
/// Reload the Hotkeys from the preferences.
|
||||
/// If hotkeys are disabled, just sets all members to `None`.
|
||||
/// This has to be called each time the preferences are modified.
|
||||
///
|
||||
/// # Returns
|
||||
///
|
||||
/// `Ok(())` on success, otherwise `Err(str)` if some of the hotkeys
|
||||
/// could not be grabbed, where `str` is a String that can be
|
||||
/// presented via e.g. `run_error_dialog()`.
|
||||
pub fn reload(&mut self, prefs: &Prefs) -> Result<()> {
|
||||
self.enabled = prefs.hotkey_prefs.enable_hotkeys;
|
||||
self.mute_key = None;
|
||||
self.up_key = None;
|
||||
self.down_key = None;
|
||||
|
||||
/* Return if hotkeys are disabled */
|
||||
if self.enabled == false {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let hotkey_prefs = &prefs.hotkey_prefs;
|
||||
let new_hotkey = |keyname: &Option<String>| -> (Option<Hotkey>, bool) {
|
||||
match keyname {
|
||||
&Some(ref k) => {
|
||||
let hotkey = Hotkey::new_from_accel(k.as_str());
|
||||
if hotkey.as_ref().is_err() {
|
||||
(None, true)
|
||||
} else {
|
||||
(Some(hotkey.unwrap()), false)
|
||||
}
|
||||
}
|
||||
&None => (None, false), // no actual error, just no key
|
||||
}
|
||||
};
|
||||
|
||||
/* Setup mute hotkey */
|
||||
let (m_unmute_key, mute_err) =
|
||||
new_hotkey(&hotkey_prefs.mute_unmute_key);
|
||||
if m_unmute_key.is_some() {
|
||||
self.mute_key = Some(m_unmute_key.unwrap());
|
||||
}
|
||||
|
||||
/* Setup volume uphotkey */
|
||||
let (m_up_key, up_err) = new_hotkey(&hotkey_prefs.vol_up_key);
|
||||
if m_up_key.is_some() {
|
||||
self.up_key = Some(m_up_key.unwrap());
|
||||
}
|
||||
|
||||
/* Setup volume down hotkey */
|
||||
let (m_down_key, down_err) = new_hotkey(&hotkey_prefs.vol_down_key);
|
||||
if m_down_key.is_some() {
|
||||
self.down_key = Some(m_down_key.unwrap());
|
||||
}
|
||||
|
||||
if mute_err || up_err || down_err {
|
||||
bail!("Could not grab the following hotkeys:\n{}{}{}",
|
||||
if mute_err { "(Mute/Unmute)\n" } else { "" },
|
||||
if up_err { "(Volume Up)\n" } else { "" },
|
||||
if down_err { "(Volume Down)\n" } else { "" },
|
||||
);
|
||||
}
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
/// Bind hotkeys manually. Should be paired with an `unbind()` call.
|
||||
pub fn bind(&self) {
|
||||
debug!("Bind hotkeys");
|
||||
if self.mute_key.is_some() {
|
||||
if self.mute_key
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.grab()
|
||||
.is_err() {
|
||||
warn!("Could not grab mute key");
|
||||
};
|
||||
}
|
||||
if self.up_key.is_some() {
|
||||
if self.up_key
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.grab()
|
||||
.is_err() {
|
||||
warn!("Could not grab volume up key");
|
||||
};
|
||||
}
|
||||
if self.down_key.is_some() {
|
||||
if self.down_key
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.grab()
|
||||
.is_err() {
|
||||
warn!("Could not grab volume down key");
|
||||
};
|
||||
}
|
||||
|
||||
let data_ptr =
|
||||
unsafe { mem::transmute::<&Hotkeys<T>, glib_sys::gpointer>(self) };
|
||||
hotkeys_add_filter(Some(key_filter::<T>), data_ptr);
|
||||
}
|
||||
|
||||
/// Unbind hotkeys manually. Should be paired with a `bind()` call.
|
||||
pub fn unbind(&self) {
|
||||
debug!("Unbind hotkeys");
|
||||
if self.mute_key.is_some() {
|
||||
self.mute_key
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.ungrab();
|
||||
}
|
||||
if self.up_key.is_some() {
|
||||
self.up_key
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.ungrab();
|
||||
}
|
||||
if self.down_key.is_some() {
|
||||
self.down_key
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.ungrab();
|
||||
}
|
||||
|
||||
let data_ptr =
|
||||
unsafe { mem::transmute::<&Hotkeys<T>, glib_sys::gpointer>(self) };
|
||||
hotkeys_remove_filter(Some(key_filter::<T>), data_ptr);
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> Drop for Hotkeys<T>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
fn drop(&mut self) {
|
||||
debug!("Freeing hotkeys");
|
||||
self.mute_key = None;
|
||||
self.up_key = None;
|
||||
self.down_key = None;
|
||||
|
||||
let data_ptr = unsafe {
|
||||
mem::transmute::<&mut Hotkeys<T>, glib_sys::gpointer>(self)
|
||||
};
|
||||
|
||||
hotkeys_remove_filter(Some(key_filter::<T>), data_ptr)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Attaches the `key_filter()` function as a filter
|
||||
/// to the root window, so it will intercept window events.
|
||||
fn hotkeys_add_filter(function: gdk_sys::GdkFilterFunc,
|
||||
data: glib_sys::gpointer) {
|
||||
// TODO: all the unwrapping :/
|
||||
let window = gdk_x11::gdk_x11_window_foreign_new_for_display(
|
||||
&mut gdk::Display::get_default().unwrap(),
|
||||
gdk_x11::gdk_x11_get_default_root_xwindow()
|
||||
).unwrap();
|
||||
|
||||
unsafe {
|
||||
gdk_sys::gdk_window_add_filter(window.to_glib_none().0, function, data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Removes the previously attached `key_filter()` function from
|
||||
/// the root window.
|
||||
fn hotkeys_remove_filter(function: gdk_sys::GdkFilterFunc,
|
||||
data: glib_sys::gpointer) {
|
||||
// TODO: all the unwrapping :/
|
||||
let window = gdk_x11::gdk_x11_window_foreign_new_for_display(
|
||||
&mut gdk::Display::get_default().unwrap(),
|
||||
gdk_x11::gdk_x11_get_default_root_xwindow()
|
||||
).unwrap();
|
||||
|
||||
unsafe {
|
||||
gdk_sys::gdk_window_remove_filter(window.to_glib_none().0,
|
||||
function,
|
||||
data);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// This function is called before Gtk/Gdk can respond
|
||||
/// to any(!) window event and handles pressed hotkeys.
|
||||
extern "C" fn key_filter<T>(gdk_xevent: *mut gdk_sys::GdkXEvent,
|
||||
_: *mut gdk_sys::GdkEvent,
|
||||
data: glib_sys::gpointer)
|
||||
-> gdk_sys::GdkFilterReturn
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let xevent = gdk_xevent as *mut x11::xlib::XKeyEvent;
|
||||
|
||||
let hotkeys: &Hotkeys<T> =
|
||||
unsafe { mem::transmute::<glib_sys::gpointer, &Hotkeys<T>>(data) };
|
||||
let mute_key = &hotkeys.mute_key;
|
||||
let up_key = &hotkeys.up_key;
|
||||
let down_key = &hotkeys.down_key;
|
||||
let audio = &hotkeys.audio;
|
||||
|
||||
let xevent_type = unsafe { (*xevent).type_ };
|
||||
if xevent_type == x11::xlib::KeyPress {
|
||||
return gdk_sys::GdkFilterReturn::Continue;
|
||||
}
|
||||
|
||||
let xevent_key = unsafe { (*xevent).keycode };
|
||||
let xevent_state = unsafe { (*xevent).state };
|
||||
|
||||
|
||||
if mute_key.as_ref().is_some() &&
|
||||
mute_key.as_ref()
|
||||
.unwrap()
|
||||
.matches(xevent_key as i32,
|
||||
gdk::ModifierType::from_bits(xevent_state).unwrap()) {
|
||||
just_warn!(audio.toggle_mute(AudioUser::Hotkeys));
|
||||
} else if up_key.as_ref().is_some() &&
|
||||
up_key.as_ref()
|
||||
.unwrap()
|
||||
.matches(xevent_key as i32,
|
||||
gdk::ModifierType::from_bits(xevent_state)
|
||||
.unwrap()) {
|
||||
just_warn!(audio.increase_vol(AudioUser::Hotkeys, hotkeys.auto_unmute));
|
||||
|
||||
} else if down_key.as_ref().is_some() &&
|
||||
down_key.as_ref()
|
||||
.unwrap()
|
||||
.matches(xevent_key as i32,
|
||||
gdk::ModifierType::from_bits(xevent_state)
|
||||
.unwrap()) {
|
||||
just_warn!(audio.decrease_vol(AudioUser::Hotkeys, hotkeys.auto_unmute));
|
||||
}
|
||||
|
||||
return gdk_sys::GdkFilterReturn::Continue;
|
||||
}
|
||||
51
src/lib.rs
51
src/lib.rs
@@ -34,37 +34,42 @@ extern crate alloc_system;
|
||||
|
||||
pub extern crate flexi_logger;
|
||||
#[macro_use]
|
||||
pub extern crate log;
|
||||
extern crate log;
|
||||
|
||||
#[macro_use]
|
||||
pub extern crate error_chain;
|
||||
extern crate error_chain;
|
||||
|
||||
#[macro_use]
|
||||
pub extern crate serde_derive;
|
||||
pub extern crate toml;
|
||||
pub extern crate serde;
|
||||
extern crate serde_derive;
|
||||
extern crate toml;
|
||||
extern crate serde;
|
||||
|
||||
pub extern crate alsa;
|
||||
pub extern crate alsa_sys;
|
||||
pub extern crate ffi;
|
||||
pub extern crate gdk;
|
||||
pub extern crate gdk_pixbuf;
|
||||
pub extern crate gdk_pixbuf_sys;
|
||||
pub extern crate gdk_sys;
|
||||
pub extern crate gio;
|
||||
pub extern crate glib;
|
||||
pub extern crate glib_sys;
|
||||
pub extern crate gobject_sys;
|
||||
extern crate alsa;
|
||||
extern crate alsa_sys;
|
||||
extern crate ffi;
|
||||
extern crate gdk;
|
||||
extern crate gdk_pixbuf;
|
||||
extern crate gdk_pixbuf_sys;
|
||||
extern crate gdk_sys;
|
||||
extern crate gio;
|
||||
extern crate glib;
|
||||
extern crate glib_sys;
|
||||
extern crate gobject_sys;
|
||||
pub extern crate gtk;
|
||||
pub extern crate gtk_sys;
|
||||
pub extern crate libc;
|
||||
pub extern crate png;
|
||||
pub extern crate which;
|
||||
pub extern crate xdg;
|
||||
extern crate gtk_sys;
|
||||
extern crate libc;
|
||||
extern crate png;
|
||||
extern crate w_result;
|
||||
extern crate which;
|
||||
extern crate x11;
|
||||
extern crate xdg;
|
||||
|
||||
#[cfg(feature = "notify")]
|
||||
pub extern crate libnotify;
|
||||
|
||||
#[macro_use]
|
||||
extern crate lazy_static;
|
||||
|
||||
#[macro_use]
|
||||
pub mod errors;
|
||||
|
||||
@@ -74,6 +79,9 @@ pub mod glade_helpers;
|
||||
pub mod alsa_card;
|
||||
pub mod app_state;
|
||||
pub mod audio;
|
||||
pub mod gdk_x11;
|
||||
pub mod hotkey;
|
||||
pub mod hotkeys;
|
||||
pub mod prefs;
|
||||
pub mod support_alsa;
|
||||
pub mod support_audio;
|
||||
@@ -81,6 +89,7 @@ pub mod support_cmd;
|
||||
#[macro_use]
|
||||
pub mod support_ui;
|
||||
pub mod ui_entry;
|
||||
pub mod ui_hotkey_dialog;
|
||||
pub mod ui_popup_menu;
|
||||
pub mod ui_popup_window;
|
||||
pub mod ui_prefs_dialog;
|
||||
|
||||
56
src/notif.rs
56
src/notif.rs
@@ -21,7 +21,7 @@ pub struct Notif {
|
||||
enabled: Cell<bool>,
|
||||
from_popup: Cell<bool>,
|
||||
from_tray: Cell<bool>,
|
||||
// TODO: from hotkey
|
||||
from_hotkeys: Cell<bool>,
|
||||
from_external: Cell<bool>,
|
||||
|
||||
volume_notif: libnotify::Notification,
|
||||
@@ -30,30 +30,36 @@ pub struct Notif {
|
||||
|
||||
impl Notif {
|
||||
/// Create a new notification instance from the current preferences.
|
||||
/// This should only be done once at startup. This also initializes
|
||||
/// the libnotify system.
|
||||
pub fn new(prefs: &Prefs) -> Result<Self> {
|
||||
libnotify::init("PNMixer-rs")?;
|
||||
|
||||
let notif = Notif {
|
||||
enabled: Cell::new(false),
|
||||
from_popup: Cell::new(false),
|
||||
from_tray: Cell::new(false),
|
||||
from_hotkeys: Cell::new(false),
|
||||
from_external: Cell::new(false),
|
||||
|
||||
volume_notif: libnotify::Notification::new("", None, None),
|
||||
text_notif: libnotify::Notification::new("", None, None),
|
||||
};
|
||||
|
||||
notif.reload(prefs)?;
|
||||
notif.reload(prefs);
|
||||
|
||||
return Ok(notif);
|
||||
}
|
||||
|
||||
/// Reload the notification instance from the current
|
||||
/// preferences.
|
||||
pub fn reload(&self, prefs: &Prefs) -> Result<()> {
|
||||
pub fn reload(&self, prefs: &Prefs) {
|
||||
let timeout = prefs.notify_prefs.notifcation_timeout;
|
||||
|
||||
self.enabled.set(prefs.notify_prefs.enable_notifications);
|
||||
self.from_popup.set(prefs.notify_prefs.notify_popup);
|
||||
self.from_tray.set(prefs.notify_prefs.notify_mouse_scroll);
|
||||
self.from_hotkeys.set(prefs.notify_prefs.notify_hotkeys);
|
||||
self.from_external.set(prefs.notify_prefs.notify_external);
|
||||
|
||||
self.volume_notif.set_timeout(timeout as i32);
|
||||
@@ -64,13 +70,13 @@ impl Notif {
|
||||
self.text_notif.set_timeout(timeout as i32);
|
||||
self.text_notif.set_hint("x-canonical-private-synchronous",
|
||||
Some("".to_variant()));
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
/// Shows a volume notification, e.g. for volume or mute state change.
|
||||
pub fn show_volume_notif(&self, audio: &Audio) -> Result<()> {
|
||||
let vol = audio.vol()?;
|
||||
pub fn show_volume_notif<T>(&self, audio: &T) -> Result<()>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let vol = audio.get_vol()?;
|
||||
let vol_level = audio.vol_level();
|
||||
|
||||
let icon = {
|
||||
@@ -88,12 +94,8 @@ impl Notif {
|
||||
VolLevel::Muted => String::from("Volume muted"),
|
||||
_ => {
|
||||
format!("{} ({})\nVolume: {}",
|
||||
audio.acard
|
||||
.borrow()
|
||||
.card_name()?,
|
||||
audio.acard
|
||||
.borrow()
|
||||
.chan_name()?,
|
||||
audio.card_name()?,
|
||||
audio.chan_name()?,
|
||||
vol as i32)
|
||||
}
|
||||
}
|
||||
@@ -120,38 +122,48 @@ impl Notif {
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Notif {
|
||||
fn drop(&mut self) {
|
||||
libnotify::uninit();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// Initialize the notification subsystem.
|
||||
pub fn init_notify(appstate: Rc<AppS>) {
|
||||
debug!("Blah");
|
||||
pub fn init_notify<T>(appstate: Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
{
|
||||
/* connect handler */
|
||||
let apps = appstate.clone();
|
||||
appstate.audio.connect_handler(Box::new(move |s, u| {
|
||||
let notif = &apps.notif;
|
||||
if !notif.enabled.get() {
|
||||
if notif.is_none() || !notif.as_ref().unwrap().enabled.get() {
|
||||
return;
|
||||
}
|
||||
let notif = notif.as_ref().unwrap();
|
||||
match (s,
|
||||
u,
|
||||
(notif.from_popup.get(),
|
||||
notif.from_tray.get(),
|
||||
notif.from_external.get())) {
|
||||
notif.from_external.get(),
|
||||
notif.from_hotkeys.get())) {
|
||||
(AudioSignal::NoCard, _, _) => try_w!(notif.show_text_notif("No sound card", "No playable soundcard found")),
|
||||
(AudioSignal::CardDisconnected, _, _) => try_w!(notif.show_text_notif("Soundcard disconnected", "Soundcard has been disconnected, reloading sound system...")),
|
||||
(AudioSignal::CardError, _, _) => (),
|
||||
(AudioSignal::ValuesChanged,
|
||||
AudioUser::TrayIcon,
|
||||
(_, true, _)) => try_w!(notif.show_volume_notif(&apps.audio)),
|
||||
(_, true, _, _)) => try_w!(notif.show_volume_notif(apps.audio.as_ref())),
|
||||
(AudioSignal::ValuesChanged,
|
||||
AudioUser::Popup,
|
||||
(true, _, _)) => try_w!(notif.show_volume_notif(&apps.audio)),
|
||||
(true, _, _, _)) => try_w!(notif.show_volume_notif(apps.audio.as_ref())),
|
||||
(AudioSignal::ValuesChanged,
|
||||
AudioUser::Unknown,
|
||||
(_, _, true)) => try_w!(notif.show_volume_notif(&apps.audio)),
|
||||
|
||||
// TODO hotkeys
|
||||
(_, _, true, _)) => try_w!(notif.show_volume_notif(apps.audio.as_ref())),
|
||||
(AudioSignal::ValuesChanged,
|
||||
AudioUser::Hotkeys,
|
||||
(_, _, _, true)) => try_w!(notif.show_volume_notif(apps.audio.as_ref())),
|
||||
_ => (),
|
||||
}
|
||||
}));
|
||||
|
||||
36
src/prefs.rs
36
src/prefs.rs
@@ -165,8 +165,8 @@ pub struct NotifyPrefs {
|
||||
pub notifcation_timeout: i64,
|
||||
pub notify_mouse_scroll: bool,
|
||||
pub notify_popup: bool,
|
||||
pub notify_external: bool,
|
||||
// TODO: notify_hotkeys?
|
||||
pub notify_external: bool,
|
||||
pub notify_hotkeys: bool,
|
||||
}
|
||||
|
||||
#[cfg(feature = "notify")]
|
||||
@@ -178,11 +178,23 @@ impl Default for NotifyPrefs {
|
||||
notify_mouse_scroll: true,
|
||||
notify_popup: true,
|
||||
notify_external: true,
|
||||
notify_hotkeys: true,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[derive(Deserialize, Debug, Serialize, Default)]
|
||||
/// Hotkey preferences.
|
||||
/// The `String`s represent gtk accelerator strings.
|
||||
pub struct HotkeyPrefs {
|
||||
pub enable_hotkeys: bool,
|
||||
pub mute_unmute_key: Option<String>,
|
||||
pub vol_up_key: Option<String>,
|
||||
pub vol_down_key: Option<String>,
|
||||
}
|
||||
|
||||
|
||||
#[derive(Deserialize, Debug, Serialize, Default)]
|
||||
#[serde(default)]
|
||||
/// Main preferences struct, holding all sub-preferences.
|
||||
@@ -191,8 +203,8 @@ pub struct Prefs {
|
||||
pub view_prefs: ViewPrefs,
|
||||
pub behavior_prefs: BehaviorPrefs,
|
||||
#[cfg(feature = "notify")]
|
||||
pub notify_prefs: NotifyPrefs,
|
||||
// TODO: HotKeys?
|
||||
pub notify_prefs: NotifyPrefs,
|
||||
pub hotkey_prefs: HotkeyPrefs,
|
||||
}
|
||||
|
||||
impl Prefs {
|
||||
@@ -223,6 +235,7 @@ impl Prefs {
|
||||
}
|
||||
|
||||
|
||||
// TODO: unused
|
||||
/// Reload the current preferences from the config file.
|
||||
pub fn reload_config(&mut self) -> Result<()> {
|
||||
debug!("Reloading config...");
|
||||
@@ -237,12 +250,21 @@ impl Prefs {
|
||||
/// Store the current preferences to the config file.
|
||||
pub fn store_config(&self) -> Result<()> {
|
||||
let config_path = get_xdg_dirs().place_config_file("pnmixer.toml")
|
||||
.from_err()?;
|
||||
.chain_err(|| {
|
||||
format!("Could not create config directory at {:?}",
|
||||
get_xdg_dirs().get_config_home())
|
||||
})?;
|
||||
|
||||
debug!("Storing config in {:?}", config_path);
|
||||
|
||||
let mut f = File::create(config_path)?;
|
||||
f.write_all(self.to_str().as_bytes())?;
|
||||
let mut f = File::create(config_path.clone())
|
||||
.chain_err(|| format!("Could not open/create config file {:?} for writing",
|
||||
config_path))?;
|
||||
f.write_all(self.to_str().as_bytes())
|
||||
.chain_err(|| {
|
||||
format!("Could not write to config file {:?}",
|
||||
config_path)
|
||||
})?;
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
//! but are important helpers.
|
||||
|
||||
|
||||
use audio::{Audio, AudioUser};
|
||||
use audio::*;
|
||||
use errors::*;
|
||||
use prefs::*;
|
||||
use support_alsa::*;
|
||||
@@ -54,14 +54,13 @@ pub fn lrint(v: f64, dir: VolDir) -> f64 {
|
||||
|
||||
|
||||
/// Reload the audio system.
|
||||
pub fn audio_reload(audio: &Audio,
|
||||
prefs: &Prefs,
|
||||
user: AudioUser)
|
||||
-> Result<()> {
|
||||
pub fn audio_reload<T>(audio: &T, prefs: &Prefs, user: AudioUser) -> Result<()>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let card = &prefs.device_prefs.card;
|
||||
let channel = &prefs.device_prefs.channel;
|
||||
// TODO: is this clone safe?
|
||||
return audio.switch_acard(Some(card.clone()), Some(channel.clone()), user);
|
||||
return audio.switch_card(Some(card.clone()), Some(channel.clone()), user);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
//! Helper functions for invoking system commands.
|
||||
|
||||
|
||||
use errors::*;
|
||||
use glib;
|
||||
use prefs::Prefs;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
use app_state::*;
|
||||
use audio::{AudioUser, AudioSignal};
|
||||
use audio::*;
|
||||
use gtk::DialogExt;
|
||||
use gtk::MessageDialogExt;
|
||||
use gtk::WidgetExt;
|
||||
@@ -56,20 +56,22 @@ impl Gui {
|
||||
|
||||
|
||||
/// Initialize the GUI system.
|
||||
pub fn init(appstate: Rc<AppS>) {
|
||||
pub fn init<T>(appstate: Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
{
|
||||
/* "global" audio signal handler */
|
||||
let apps = appstate.clone();
|
||||
appstate.audio.connect_handler(
|
||||
Box::new(move |s, u| match (s, u) {
|
||||
(AudioSignal::CardDisconnected, _) => {
|
||||
try_w!(audio_reload(&apps.audio,
|
||||
try_w!(audio_reload(apps.audio.as_ref(),
|
||||
&apps.prefs.borrow(),
|
||||
AudioUser::Unknown));
|
||||
},
|
||||
(AudioSignal::CardError, _) => {
|
||||
if run_audio_error_dialog(&apps.gui.popup_menu.menu_window) == (GTK_RESPONSE_YES as i32) {
|
||||
try_w!(audio_reload(&apps.audio,
|
||||
try_w!(audio_reload(apps.audio.as_ref(),
|
||||
&apps.prefs.borrow(),
|
||||
AudioUser::Unknown));
|
||||
}
|
||||
|
||||
134
src/ui_hotkey_dialog.rs
Normal file
134
src/ui_hotkey_dialog.rs
Normal file
@@ -0,0 +1,134 @@
|
||||
//! The ui hotkey preferences dialog.
|
||||
//!
|
||||
//! Usually run from the preferences window.
|
||||
|
||||
|
||||
use errors::*;
|
||||
use gdk::DeviceExt;
|
||||
use gdk;
|
||||
use gdk_sys;
|
||||
use glib::translate::*;
|
||||
use gtk::prelude::*;
|
||||
use gtk;
|
||||
use gtk_sys;
|
||||
use libc::c_uint;
|
||||
use std;
|
||||
|
||||
|
||||
|
||||
/// Hotkey dialog struct holding the relevant gtk widgets.
|
||||
pub struct HotkeyDialog {
|
||||
hotkey_dialog: gtk::Dialog,
|
||||
// instruction_label: gtk::Label, // not needed
|
||||
key_pressed_label: gtk::Label,
|
||||
}
|
||||
|
||||
impl HotkeyDialog {
|
||||
/// Creates a new hotkey dialog.
|
||||
pub fn new<P>(parent: &P, hotkey: String) -> HotkeyDialog
|
||||
where P: IsA<gtk::Window>
|
||||
{
|
||||
let builder =
|
||||
gtk::Builder::new_from_string(include_str!(concat!(env!("CARGO_MANIFEST_DIR"),
|
||||
"/data/ui/hotkey-dialog.glade")));
|
||||
|
||||
let hotkey_dialog: gtk::Dialog = builder.get_object("hotkey_dialog")
|
||||
.unwrap();
|
||||
let instruction_label: gtk::Label = builder.get_object("instruction_label")
|
||||
.unwrap();
|
||||
let key_pressed_label: gtk::Label = builder.get_object("key_pressed_label")
|
||||
.unwrap();
|
||||
|
||||
hotkey_dialog.set_title(format!("Set {} HotKey", hotkey).as_str());
|
||||
instruction_label.set_markup(format!("Press new HotKey for <b>{}</b>",
|
||||
hotkey)
|
||||
.as_str());
|
||||
|
||||
hotkey_dialog.set_transient_for(parent);
|
||||
|
||||
{
|
||||
let key_pressed_label = key_pressed_label.clone();
|
||||
hotkey_dialog.connect_key_press_event(move |_, e| {
|
||||
let mut state = e.get_state();
|
||||
|
||||
unsafe {
|
||||
let mut keyval: c_uint = 0;
|
||||
let mut consumed: gdk_sys::GdkModifierType =
|
||||
gdk_sys::GdkModifierType::empty();
|
||||
gdk_sys::gdk_keymap_translate_keyboard_state(
|
||||
gdk_sys::gdk_keymap_get_default(),
|
||||
e.get_hardware_keycode() as u32,
|
||||
state.to_glib(),
|
||||
e.get_group() as i32,
|
||||
&mut keyval as *mut c_uint,
|
||||
std::ptr::null_mut(),
|
||||
std::ptr::null_mut(),
|
||||
&mut consumed as *mut gdk_sys::GdkModifierType);
|
||||
|
||||
let consumed: gdk::ModifierType = from_glib(!consumed);
|
||||
state = state & consumed;
|
||||
state = state & gtk::accelerator_get_default_mod_mask();
|
||||
|
||||
let key_text = gtk::accelerator_name(keyval, state);
|
||||
key_pressed_label.set_text(key_text
|
||||
.unwrap_or(String::from("(None)"))
|
||||
.as_str());
|
||||
};
|
||||
return Inhibit(false);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
hotkey_dialog.connect_key_release_event(move |w, _| {
|
||||
w.response(gtk_sys::GtkResponseType::Ok as i32);
|
||||
return Inhibit(false);
|
||||
});
|
||||
|
||||
return HotkeyDialog {
|
||||
hotkey_dialog,
|
||||
key_pressed_label,
|
||||
};
|
||||
}
|
||||
|
||||
/// Runs the hotkey dialog and returns a String representing the hotkey
|
||||
/// that has been pressed.
|
||||
pub fn run(&self) -> Result<String> {
|
||||
self.hotkey_dialog.show_now();
|
||||
let device = gtk::get_current_event_device()
|
||||
.ok_or("Could not get current device")?;
|
||||
let window = self.hotkey_dialog
|
||||
.get_window()
|
||||
.ok_or("Could not get window")?;
|
||||
|
||||
let m_grab_status =
|
||||
device.grab(&window,
|
||||
gdk::GrabOwnership::Application,
|
||||
true,
|
||||
gdk::KEY_PRESS_MASK,
|
||||
None,
|
||||
gdk_sys::GDK_CURRENT_TIME as u32);
|
||||
|
||||
if m_grab_status != gdk::GrabStatus::Success {
|
||||
bail!("Could not grab the keyboard");
|
||||
}
|
||||
|
||||
let resp = self.hotkey_dialog.run();
|
||||
device.ungrab(gdk_sys::GDK_CURRENT_TIME as u32);
|
||||
|
||||
if resp != gtk::ResponseType::Ok.into() {
|
||||
bail!(ErrorKind::GtkResponseCancel(String::from("not assigning hotkey")));
|
||||
}
|
||||
|
||||
return Ok(self.key_pressed_label
|
||||
.get_text()
|
||||
.ok_or("Could not get text")?);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl Drop for HotkeyDialog {
|
||||
fn drop(&mut self) {
|
||||
self.hotkey_dialog.destroy();
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
//! * Quit
|
||||
|
||||
use app_state::*;
|
||||
use audio::AudioUser;
|
||||
use audio::*;
|
||||
use gtk::prelude::*;
|
||||
use gtk;
|
||||
use std::rc::Rc;
|
||||
@@ -40,7 +40,9 @@ create_builder_item!(PopupMenu,
|
||||
|
||||
|
||||
/// Initialize the popup menu subsystem, registering all callbacks.
|
||||
pub fn init_popup_menu(appstate: Rc<AppS>) {
|
||||
pub fn init_popup_menu<T>(appstate: Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
/* audio.connect_handler */
|
||||
{
|
||||
let apps = appstate.clone();
|
||||
@@ -74,7 +76,8 @@ pub fn init_popup_menu(appstate: Rc<AppS>) {
|
||||
let apps = appstate.clone();
|
||||
let mixer_item = &appstate.gui.popup_menu.mixer_item;
|
||||
mixer_item.connect_activate(move |_| {
|
||||
try_w!(execute_vol_control_command(&apps.prefs.borrow()));
|
||||
let _ = result_warn!(execute_vol_control_command(&apps.prefs.borrow()),
|
||||
Some(&apps.gui.popup_menu.menu_window));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -112,7 +115,7 @@ pub fn init_popup_menu(appstate: Rc<AppS>) {
|
||||
let apps = appstate.clone();
|
||||
let reload_item = &appstate.gui.popup_menu.reload_item;
|
||||
reload_item.connect_activate(move |_| {
|
||||
try_w!(audio_reload(&apps.audio,
|
||||
try_w!(audio_reload(apps.audio.as_ref(),
|
||||
&apps.prefs.borrow(),
|
||||
AudioUser::Popup))
|
||||
});
|
||||
@@ -128,7 +131,9 @@ pub fn init_popup_menu(appstate: Rc<AppS>) {
|
||||
|
||||
|
||||
/// When the about menu item is activated.
|
||||
fn on_about_item_activate(appstate: &AppS) {
|
||||
fn on_about_item_activate<T>(appstate: &AppS<T>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let popup_menu = &appstate.gui.popup_menu.menu_window;
|
||||
let about_dialog = create_about_dialog();
|
||||
about_dialog.set_skip_taskbar_hint(true);
|
||||
@@ -170,14 +175,18 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.",
|
||||
|
||||
|
||||
/// When the Preferences item is activated.
|
||||
fn on_prefs_item_activate(appstate: &Rc<AppS>) {
|
||||
fn on_prefs_item_activate<T>(appstate: &Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
/* TODO: only create if needed */
|
||||
show_prefs_dialog(appstate);
|
||||
}
|
||||
|
||||
|
||||
/// When the Mute item is checked.
|
||||
fn set_mute_check(apps: &Rc<AppS>) {
|
||||
fn set_mute_check<T>(apps: &Rc<AppS<T>>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let mute_check = &apps.gui.popup_menu.mute_check;
|
||||
let m_muted = apps.audio.get_mute();
|
||||
match m_muted {
|
||||
|
||||
@@ -62,17 +62,21 @@ impl PopupWindow {
|
||||
|
||||
/// Update the popup window state, including the slider
|
||||
/// and the mute checkbutton.
|
||||
pub fn update(&self, audio: &Audio) -> Result<()> {
|
||||
let cur_vol = audio.vol()?;
|
||||
pub fn update<T>(&self, audio: &T) -> Result<()>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let cur_vol = audio.get_vol()?;
|
||||
set_slider(&self.vol_scale_adj, cur_vol);
|
||||
|
||||
self.update_mute_check(&audio);
|
||||
self.update_mute_check(audio);
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
/// Update the mute checkbutton.
|
||||
pub fn update_mute_check(&self, audio: &Audio) {
|
||||
pub fn update_mute_check<T>(&self, audio: &T)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let m_muted = audio.get_mute();
|
||||
|
||||
glib::signal_handler_block(&self.mute_check, self.toggle_signal.get());
|
||||
@@ -109,7 +113,9 @@ impl PopupWindow {
|
||||
|
||||
|
||||
/// Initialize the popup window subsystem.
|
||||
pub fn init_popup_window(appstate: Rc<AppS>) {
|
||||
pub fn init_popup_window<T>(appstate: Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
/* audio.connect_handler */
|
||||
{
|
||||
let apps = appstate.clone();
|
||||
@@ -130,11 +136,12 @@ pub fn init_popup_window(appstate: Rc<AppS>) {
|
||||
* and not the real value reported by the audio system.
|
||||
*/
|
||||
(_, AudioUser::Popup) => {
|
||||
apps.gui.popup_window.update_mute_check(&apps.audio);
|
||||
apps.gui.popup_window.update_mute_check(apps.audio
|
||||
.as_ref());
|
||||
}
|
||||
/* external change, safe to update slider too */
|
||||
(_, _) => {
|
||||
try_w!(apps.gui.popup_window.update(&apps.audio));
|
||||
try_w!(apps.gui.popup_window.update(apps.audio.as_ref()));
|
||||
}
|
||||
}
|
||||
}));
|
||||
@@ -205,19 +212,22 @@ pub fn init_popup_window(appstate: Rc<AppS>) {
|
||||
.popup_window
|
||||
.popup_window
|
||||
.hide();
|
||||
try_w!(execute_vol_control_command(&apps.prefs.borrow()));
|
||||
let _ = result_warn!(execute_vol_control_command(&apps.prefs.borrow()),
|
||||
Some(&apps.gui.popup_menu.menu_window));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// When the popup window is shown.
|
||||
fn on_popup_window_show(appstate: &AppS) {
|
||||
fn on_popup_window_show<T>(appstate: &AppS<T>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let popup_window = &appstate.gui.popup_window;
|
||||
appstate.gui.popup_window.set_vol_increment(&appstate.prefs.borrow());
|
||||
glib::signal_handler_block(&popup_window.vol_scale_adj,
|
||||
popup_window.changed_signal.get());
|
||||
try_w!(appstate.gui.popup_window.update(&appstate.audio));
|
||||
try_w!(appstate.gui.popup_window.update(appstate.audio.as_ref()));
|
||||
glib::signal_handler_unblock(&popup_window.vol_scale_adj,
|
||||
popup_window.changed_signal.get());
|
||||
popup_window.vol_scale.grab_focus();
|
||||
@@ -256,9 +266,11 @@ fn on_popup_window_event(w: >k::Window, e: &gdk::Event) -> gtk::Inhibit {
|
||||
|
||||
|
||||
/// When the volume scale slider is moved.
|
||||
fn on_vol_scale_value_changed(appstate: &AppS) {
|
||||
fn on_vol_scale_value_changed<T>(appstate: &AppS<T>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let audio = &appstate.audio;
|
||||
let old_vol = try_w!(audio.vol());
|
||||
let old_vol = try_w!(audio.get_vol());
|
||||
|
||||
let val = appstate.gui
|
||||
.popup_window
|
||||
@@ -278,7 +290,9 @@ fn on_vol_scale_value_changed(appstate: &AppS) {
|
||||
|
||||
|
||||
/// When the mute checkbutton is toggled.
|
||||
fn on_mute_check_toggled(appstate: &AppS) {
|
||||
fn on_mute_check_toggled<T>(appstate: &AppS<T>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let audio = &appstate.audio;
|
||||
try_w!(audio.toggle_mute(AudioUser::Popup))
|
||||
}
|
||||
|
||||
@@ -3,14 +3,18 @@
|
||||
|
||||
|
||||
use app_state::*;
|
||||
use audio::{AudioUser, AudioSignal};
|
||||
use audio::*;
|
||||
use errors::*;
|
||||
use gdk;
|
||||
use gtk::ResponseType;
|
||||
use gtk::prelude::*;
|
||||
use gtk;
|
||||
use prefs::*;
|
||||
use std::ascii::AsciiExt;
|
||||
use std::cell::RefCell;
|
||||
use std::rc::Rc;
|
||||
use support_audio::*;
|
||||
use ui_hotkey_dialog::HotkeyDialog;
|
||||
|
||||
|
||||
|
||||
@@ -51,6 +55,21 @@ pub struct PrefsDialog {
|
||||
noti_popup_check: gtk::CheckButton,
|
||||
#[cfg(feature = "notify")]
|
||||
noti_ext_check: gtk::CheckButton,
|
||||
#[cfg(feature = "notify")]
|
||||
noti_hotkey_check: gtk::CheckButton,
|
||||
|
||||
/* HotkeyPrefs */
|
||||
hotkeys_enable_check: gtk::CheckButton,
|
||||
hotkeys_mute_label: gtk::Label,
|
||||
hotkeys_up_label: gtk::Label,
|
||||
hotkeys_down_label: gtk::Label,
|
||||
|
||||
/* Hotkey stuff (not prefs) */
|
||||
hotkeys_mute_eventbox: gtk::EventBox,
|
||||
hotkeys_up_eventbox: gtk::EventBox,
|
||||
hotkeys_down_eventbox: gtk::EventBox,
|
||||
|
||||
hotkey_dialog: RefCell<Option<HotkeyDialog>>,
|
||||
}
|
||||
|
||||
impl PrefsDialog {
|
||||
@@ -99,6 +118,26 @@ impl PrefsDialog {
|
||||
noti_popup_check: builder.get_object("noti_popup_check").unwrap(),
|
||||
#[cfg(feature = "notify")]
|
||||
noti_ext_check: builder.get_object("noti_ext_check").unwrap(),
|
||||
#[cfg(feature = "notify")]
|
||||
noti_hotkey_check: builder.get_object("noti_hotkey_check").unwrap(),
|
||||
|
||||
/* HotkeyPrefs */
|
||||
hotkeys_enable_check: builder.get_object("hotkeys_enable_check")
|
||||
.unwrap(),
|
||||
hotkeys_mute_label: builder.get_object("hotkeys_mute_label")
|
||||
.unwrap(),
|
||||
hotkeys_up_label: builder.get_object("hotkeys_up_label").unwrap(),
|
||||
hotkeys_down_label: builder.get_object("hotkeys_down_label")
|
||||
.unwrap(),
|
||||
|
||||
/* Hotkey stuff (not prefs) */
|
||||
hotkeys_mute_eventbox: builder.get_object("hotkeys_mute_eventbox")
|
||||
.unwrap(),
|
||||
hotkeys_up_eventbox: builder.get_object("hotkeys_up_eventbox")
|
||||
.unwrap(),
|
||||
hotkeys_down_eventbox: builder.get_object("hotkeys_down_eventbox")
|
||||
.unwrap(),
|
||||
hotkey_dialog: RefCell::new(None),
|
||||
};
|
||||
|
||||
#[cfg(feature = "notify")]
|
||||
@@ -173,7 +212,27 @@ impl PrefsDialog {
|
||||
.set_active(prefs.notify_prefs.notify_mouse_scroll);
|
||||
self.noti_popup_check.set_active(prefs.notify_prefs.notify_popup);
|
||||
self.noti_ext_check.set_active(prefs.notify_prefs.notify_external);
|
||||
self.noti_hotkey_check
|
||||
.set_active(prefs.notify_prefs.notify_hotkeys);
|
||||
}
|
||||
|
||||
/* hotkey prefs */
|
||||
self.hotkeys_enable_check.set_active(prefs.hotkey_prefs.enable_hotkeys);
|
||||
self.hotkeys_mute_label.set_text(prefs.hotkey_prefs
|
||||
.mute_unmute_key
|
||||
.clone()
|
||||
.unwrap_or(String::from("(None)"))
|
||||
.as_str());
|
||||
self.hotkeys_up_label.set_text(prefs.hotkey_prefs
|
||||
.vol_up_key
|
||||
.clone()
|
||||
.unwrap_or(String::from("(None)"))
|
||||
.as_str());
|
||||
self.hotkeys_down_label.set_text(prefs.hotkey_prefs
|
||||
.vol_down_key
|
||||
.clone()
|
||||
.unwrap_or(String::from("(None)"))
|
||||
.as_str());
|
||||
}
|
||||
|
||||
|
||||
@@ -236,6 +295,28 @@ impl PrefsDialog {
|
||||
notify_mouse_scroll: self.noti_mouse_check.get_active(),
|
||||
notify_popup: self.noti_popup_check.get_active(),
|
||||
notify_external: self.noti_ext_check.get_active(),
|
||||
notify_hotkeys: self.noti_hotkey_check.get_active(),
|
||||
};
|
||||
|
||||
let hotkey_prefs = HotkeyPrefs {
|
||||
enable_hotkeys: self.hotkeys_enable_check.get_active(),
|
||||
mute_unmute_key:
|
||||
self.hotkeys_mute_label.get_text().and_then(|s| if s ==
|
||||
"(None)" {
|
||||
None
|
||||
} else {
|
||||
Some(s)
|
||||
}),
|
||||
vol_up_key:
|
||||
self.hotkeys_up_label.get_text().and_then(|s| if s ==
|
||||
"(None)" {
|
||||
None
|
||||
} else {
|
||||
Some(s)
|
||||
}),
|
||||
vol_down_key: self.hotkeys_down_label.get_text().and_then(|s| {
|
||||
if s == "(None)" { None } else { Some(s) }
|
||||
}),
|
||||
};
|
||||
|
||||
return Prefs {
|
||||
@@ -244,6 +325,7 @@ impl PrefsDialog {
|
||||
behavior_prefs,
|
||||
#[cfg(feature = "notify")]
|
||||
notify_prefs,
|
||||
hotkey_prefs,
|
||||
};
|
||||
|
||||
}
|
||||
@@ -252,7 +334,9 @@ impl PrefsDialog {
|
||||
|
||||
/// Show the preferences dialog. This is created and destroyed dynamically
|
||||
/// and not persistent across the application lifetime.
|
||||
pub fn show_prefs_dialog(appstate: &Rc<AppS>) {
|
||||
pub fn show_prefs_dialog<T>(appstate: &Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
if appstate.gui
|
||||
.prefs_dialog
|
||||
.borrow()
|
||||
@@ -277,7 +361,9 @@ pub fn show_prefs_dialog(appstate: &Rc<AppS>) {
|
||||
|
||||
/// Initialize the internal prefs dialog handler that connects to the audio
|
||||
/// system.
|
||||
pub fn init_prefs_callback(appstate: Rc<AppS>) {
|
||||
pub fn init_prefs_callback<T>(appstate: Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
let apps = appstate.clone();
|
||||
appstate.audio.connect_handler(Box::new(move |s, u| {
|
||||
/* skip if prefs window is not present */
|
||||
@@ -301,7 +387,9 @@ pub fn init_prefs_callback(appstate: Rc<AppS>) {
|
||||
|
||||
|
||||
/// Initialize the preferences dialog gtk callbacks.
|
||||
fn init_prefs_dialog(appstate: &Rc<AppS>) {
|
||||
fn init_prefs_dialog<T>(appstate: &Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
|
||||
/* prefs_dialog.connect_show */
|
||||
{
|
||||
@@ -355,21 +443,58 @@ fn init_prefs_dialog(appstate: &Rc<AppS>) {
|
||||
|
||||
if response_id == ResponseType::Ok.into() ||
|
||||
response_id == ResponseType::Apply.into() {
|
||||
// TODO: update hotkeys
|
||||
try_w!(apps.update_notify());
|
||||
try_w!(apps.update_tray_icon());
|
||||
try_w!(apps.update_popup_window());
|
||||
try_w!(apps.update_tray_icon());
|
||||
let _ = result_warn!(apps.update_hotkeys(),
|
||||
Some(&apps.gui.popup_menu.menu_window));
|
||||
apps.update_notify();
|
||||
try_w!(apps.update_audio(AudioUser::PrefsWindow));
|
||||
try_w!(apps.update_config());
|
||||
let _ = result_warn!(apps.update_config(),
|
||||
Some(&apps.gui.popup_menu.menu_window));
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
/* prefs_dialog.hotkeys_mute_eventbox */
|
||||
{
|
||||
let apps = appstate.clone();
|
||||
let m_pd = appstate.gui.prefs_dialog.borrow();
|
||||
let pd = m_pd.as_ref().unwrap();
|
||||
|
||||
pd.hotkeys_mute_eventbox.connect_button_press_event(move |w, e| {
|
||||
return Inhibit(on_hotkey_event_box_button_press_event(&apps, &w, e));
|
||||
});
|
||||
}
|
||||
|
||||
/* prefs_dialog.hotkeys_up_eventbox */
|
||||
{
|
||||
let apps = appstate.clone();
|
||||
let m_pd = appstate.gui.prefs_dialog.borrow();
|
||||
let pd = m_pd.as_ref().unwrap();
|
||||
|
||||
pd.hotkeys_up_eventbox.connect_button_press_event(move |w, e| {
|
||||
return Inhibit(on_hotkey_event_box_button_press_event(&apps, &w, e));
|
||||
});
|
||||
}
|
||||
|
||||
/* prefs_dialog.hotkeys_down_eventbox */
|
||||
{
|
||||
let apps = appstate.clone();
|
||||
let m_pd = appstate.gui.prefs_dialog.borrow();
|
||||
let pd = m_pd.as_ref().unwrap();
|
||||
|
||||
pd.hotkeys_down_eventbox.connect_button_press_event(move |w, e| {
|
||||
return Inhibit(on_hotkey_event_box_button_press_event(&apps, &w, e));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Fill the card combo box in the Devices tab.
|
||||
fn fill_card_combo(appstate: &AppS) {
|
||||
fn fill_card_combo<T>(appstate: &AppS<T>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let m_cc = appstate.gui.prefs_dialog.borrow();
|
||||
let card_combo = &m_cc.as_ref().unwrap().card_combo;
|
||||
card_combo.remove_all();
|
||||
@@ -396,7 +521,9 @@ fn fill_card_combo(appstate: &AppS) {
|
||||
|
||||
|
||||
/// Fill the channel combo box in the Devices tab.
|
||||
fn fill_chan_combo(appstate: &AppS, cardname: Option<String>) {
|
||||
fn fill_chan_combo<T>(appstate: &AppS<T>, cardname: Option<String>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let m_cc = appstate.gui.prefs_dialog.borrow();
|
||||
let chan_combo = &m_cc.as_ref().unwrap().chan_combo;
|
||||
chan_combo.remove_all();
|
||||
@@ -424,3 +551,84 @@ fn fill_chan_combo(appstate: &AppS, cardname: Option<String>) {
|
||||
chan_combo.set_active(c_index);
|
||||
|
||||
}
|
||||
|
||||
|
||||
fn on_hotkey_event_box_button_press_event<T>(appstate: &AppS<T>,
|
||||
widget: >k::EventBox,
|
||||
event: &gdk::EventButton)
|
||||
-> bool
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let borrow = appstate.gui.prefs_dialog.borrow();
|
||||
let prefs_dialog = &borrow.as_ref().unwrap();
|
||||
/* we want a left-click */
|
||||
if event.get_button() != 1 {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* we want it to be double-click */
|
||||
if event.get_event_type() != gdk::EventType::DoubleButtonPress {
|
||||
return false;
|
||||
}
|
||||
|
||||
let (hotkey_label, hotkey) = {
|
||||
if *widget == prefs_dialog.hotkeys_mute_eventbox {
|
||||
(prefs_dialog.hotkeys_mute_label.clone(),
|
||||
String::from("Mute/Unmute"))
|
||||
} else if *widget == prefs_dialog.hotkeys_up_eventbox {
|
||||
(prefs_dialog.hotkeys_up_label.clone(), String::from("Volume Up"))
|
||||
} else if *widget == prefs_dialog.hotkeys_down_eventbox {
|
||||
(prefs_dialog.hotkeys_down_label.clone(),
|
||||
String::from("Volume Down"))
|
||||
} else {
|
||||
warn!("Unknown hotkey eventbox");
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/* Ensure there's no dialog already running */
|
||||
if prefs_dialog.hotkey_dialog.borrow().is_some() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Unbind hotkeys */
|
||||
appstate.hotkeys.borrow().unbind();
|
||||
|
||||
/* Run the hotkey dialog */
|
||||
let hotkey_dialog = &prefs_dialog.hotkey_dialog;
|
||||
*hotkey_dialog.borrow_mut() =
|
||||
Some(HotkeyDialog::new(&prefs_dialog.prefs_dialog, hotkey));
|
||||
let key_pressed = hotkey_dialog.borrow()
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.run();
|
||||
*hotkey_dialog.borrow_mut() = None;
|
||||
|
||||
/* Bind hotkeys */
|
||||
appstate.hotkeys.borrow().bind();
|
||||
|
||||
/* Check the response */
|
||||
match key_pressed {
|
||||
Ok(k) => {
|
||||
println!("k: {}", k);
|
||||
if k.eq_ignore_ascii_case("<Primary>c") {
|
||||
hotkey_label.set_text("(None)");
|
||||
} else {
|
||||
hotkey_label.set_text(k.as_str());
|
||||
}
|
||||
}
|
||||
Err(Error(ErrorKind::GtkResponseCancel(msg), _)) => {
|
||||
info!("{}", ErrorKind::GtkResponseCancel(msg));
|
||||
return false;
|
||||
}
|
||||
Err(e) => {
|
||||
// Could not grab hotkey, most likely
|
||||
error_dialog!(e.description(),
|
||||
Some(&appstate.gui.popup_menu.menu_window));
|
||||
warn!("{}", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -42,7 +42,8 @@ pub struct TrayIcon {
|
||||
impl TrayIcon {
|
||||
/// Constructor. `audio_pix` is initialized as empty GdkPixbuf, to save
|
||||
/// one iteration of png decoding (`update_all()` is triggered immediately
|
||||
/// on startup through `tray_icon.connect_size_changed`.
|
||||
/// on startup through `tray_icon.connect_size_changed` usually,
|
||||
/// otherwise we have to trigger it manually).
|
||||
pub fn new(prefs: &Prefs) -> Result<TrayIcon> {
|
||||
let draw_vol_meter = prefs.view_prefs.draw_vol_meter;
|
||||
|
||||
@@ -95,16 +96,14 @@ impl TrayIcon {
|
||||
|
||||
|
||||
/// Update the tooltip of the tray icon.
|
||||
fn update_tooltip(&self, audio: &Audio) {
|
||||
let cardname = audio.acard
|
||||
.borrow()
|
||||
.card_name()
|
||||
.unwrap_or(String::from("Unknown card"));
|
||||
let channame = audio.acard
|
||||
.borrow()
|
||||
.chan_name()
|
||||
.unwrap_or(String::from("unknown channel"));
|
||||
let vol = audio.vol()
|
||||
fn update_tooltip<T>(&self, audio: &T)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let cardname =
|
||||
audio.card_name().unwrap_or(String::from("Unknown card"));
|
||||
let channame =
|
||||
audio.chan_name().unwrap_or(String::from("unknown channel"));
|
||||
let vol = audio.get_vol()
|
||||
.map(|s| format!("{}", s.round()))
|
||||
.unwrap_or(String::from("unknown volume"));
|
||||
let mute_info = {
|
||||
@@ -126,11 +125,13 @@ impl TrayIcon {
|
||||
|
||||
|
||||
/// Update the whole tray icon state.
|
||||
pub fn update_all(&self,
|
||||
prefs: &Prefs,
|
||||
audio: &Audio,
|
||||
m_size: Option<i32>)
|
||||
-> Result<()> {
|
||||
pub fn update_all<T>(&self,
|
||||
prefs: &Prefs,
|
||||
audio: &T,
|
||||
m_size: Option<i32>)
|
||||
-> Result<()>
|
||||
where T: AudioFrontend
|
||||
{
|
||||
match m_size {
|
||||
Some(s) => {
|
||||
if s < ICON_MIN_SIZE {
|
||||
@@ -152,8 +153,8 @@ impl TrayIcon {
|
||||
*self.volmeter.borrow_mut() = Some(volmeter);
|
||||
}
|
||||
|
||||
self.update_tooltip(&audio);
|
||||
return self.update_vol_meter(audio.vol()?, audio.vol_level());
|
||||
self.update_tooltip(audio);
|
||||
return self.update_vol_meter(audio.get_vol()?, audio.vol_level());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -377,7 +378,9 @@ impl AudioPix {
|
||||
|
||||
|
||||
/// Initialize the tray icon subsystem.
|
||||
pub fn init_tray_icon(appstate: Rc<AppS>) {
|
||||
pub fn init_tray_icon<T>(appstate: Rc<AppS<T>>)
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
let tray_icon = &appstate.gui.tray_icon;
|
||||
|
||||
tray_icon.status_icon.set_visible(true);
|
||||
@@ -387,9 +390,9 @@ pub fn init_tray_icon(appstate: Rc<AppS>) {
|
||||
let apps = appstate.clone();
|
||||
appstate.audio.connect_handler(Box::new(move |s, u| match (s, u) {
|
||||
(_, _) => {
|
||||
apps.gui.tray_icon.update_tooltip(&apps.audio);
|
||||
apps.gui.tray_icon.update_tooltip(apps.audio.as_ref());
|
||||
try_w!(apps.gui.tray_icon.update_vol_meter(try_w!(apps.audio
|
||||
.vol()),
|
||||
.get_vol()),
|
||||
apps.audio.vol_level()));
|
||||
}
|
||||
}));
|
||||
@@ -400,7 +403,7 @@ pub fn init_tray_icon(appstate: Rc<AppS>) {
|
||||
let apps = appstate.clone();
|
||||
tray_icon.status_icon.connect_size_changed(move |_, size| {
|
||||
try_wr!(apps.gui.tray_icon.update_all(&apps.prefs.borrow_mut(),
|
||||
&apps.audio,
|
||||
apps.audio.as_ref(),
|
||||
Some(size)),
|
||||
false);
|
||||
return false;
|
||||
@@ -447,15 +450,17 @@ pub fn init_tray_icon(appstate: Rc<AppS>) {
|
||||
));
|
||||
default_theme.connect_changed(move |_| {
|
||||
let tray_icon = &apps.gui.tray_icon;
|
||||
let audio = &apps.audio;
|
||||
try_e!(tray_icon.update_all(&apps.prefs.borrow_mut(), &audio, None));
|
||||
try_e!(tray_icon.update_all(&apps.prefs.borrow_mut(),
|
||||
apps.audio.as_ref(), None));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// When the tray icon is activated.
|
||||
fn on_tray_icon_activate(appstate: &AppS) {
|
||||
fn on_tray_icon_activate<T>(appstate: &AppS<T>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let popup_window = &appstate.gui.popup_window.popup_window;
|
||||
|
||||
if popup_window.get_visible() {
|
||||
@@ -467,7 +472,9 @@ fn on_tray_icon_activate(appstate: &AppS) {
|
||||
|
||||
|
||||
/// When the popup menu is shown, hide the popup window, if any.
|
||||
fn on_tray_icon_popup_menu(appstate: &AppS) {
|
||||
fn on_tray_icon_popup_menu<T>(appstate: &AppS<T>)
|
||||
where T: AudioFrontend
|
||||
{
|
||||
let popup_window = &appstate.gui.popup_window.popup_window;
|
||||
let popup_menu = &appstate.gui.popup_menu.menu;
|
||||
|
||||
@@ -478,9 +485,11 @@ fn on_tray_icon_popup_menu(appstate: &AppS) {
|
||||
|
||||
/// When the mouse scroll event happens while the mouse pointer is
|
||||
/// on the tray icon.
|
||||
fn on_tray_icon_scroll_event(appstate: &AppS,
|
||||
event: &gdk::EventScroll)
|
||||
-> bool {
|
||||
fn on_tray_icon_scroll_event<T>(appstate: &AppS<T>,
|
||||
event: &gdk::EventScroll)
|
||||
-> bool
|
||||
where T: AudioFrontend
|
||||
{
|
||||
|
||||
let scroll_dir: gdk::ScrollDirection = event.get_direction();
|
||||
match scroll_dir {
|
||||
@@ -510,9 +519,11 @@ fn on_tray_icon_scroll_event(appstate: &AppS,
|
||||
/// Basically when the tray icon is clicked (although we connect to the `release`
|
||||
/// event). This decides whether it was a left, right or middle-click and
|
||||
/// takes appropriate actions.
|
||||
fn on_tray_button_release_event(appstate: &Rc<AppS>,
|
||||
event_button: &gdk::EventButton)
|
||||
-> bool {
|
||||
fn on_tray_button_release_event<T>(appstate: &Rc<AppS<T>>,
|
||||
event_button: &gdk::EventButton)
|
||||
-> bool
|
||||
where T: AudioFrontend + 'static
|
||||
{
|
||||
let button = event_button.get_button();
|
||||
|
||||
if button != 2 {
|
||||
@@ -528,18 +539,21 @@ fn on_tray_button_release_event(appstate: &Rc<AppS>,
|
||||
match middle_click_action {
|
||||
&MiddleClickAction::ToggleMute => {
|
||||
if audio.has_mute() {
|
||||
try_wr!(audio.toggle_mute(AudioUser::Popup), false);
|
||||
try_wr!(audio.toggle_mute(AudioUser::TrayIcon), false);
|
||||
}
|
||||
}
|
||||
// TODO
|
||||
&MiddleClickAction::ShowPreferences => show_prefs_dialog(&appstate),
|
||||
&MiddleClickAction::VolumeControl => {
|
||||
try_wr!(execute_vol_control_command(&appstate.prefs.borrow()),
|
||||
false);
|
||||
let _ = result_warn!(execute_vol_control_command(&appstate.prefs.borrow()),
|
||||
Some(&appstate.gui.popup_menu.menu_window));
|
||||
}
|
||||
&MiddleClickAction::CustomCommand => {
|
||||
match custom_command {
|
||||
&Some(ref cmd) => try_wr!(execute_command(cmd.as_str()), false),
|
||||
&Some(ref cmd) => {
|
||||
let _ = result_warn!(execute_command(cmd.as_str()),
|
||||
Some(&appstate.gui.popup_menu.menu_window));
|
||||
}
|
||||
&None => warn!("No custom command found"),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user