mouse: Merge CcMouseProperties into CcMousePanel
This commit is contained in:
Robert Ancell
parent
20614e98ac
commit
ef6c7c03ca
8 changed files with 1083 additions and 1235 deletions
|
|
@ -21,28 +21,344 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <gdesktop-enums.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "cc-mouse-caps-helper.h"
|
||||
#include "cc-mouse-panel.h"
|
||||
#include "cc-mouse-resources.h"
|
||||
#include "cc-mouse-test.h"
|
||||
#include "gnome-mouse-properties.h"
|
||||
#include "gsd-device-manager.h"
|
||||
#include "gsd-input-helper.h"
|
||||
#include "list-box-helper.h"
|
||||
|
||||
struct _CcMousePanel
|
||||
{
|
||||
CcPanel parent_instance;
|
||||
|
||||
CcMouseProperties *mouse_properties;
|
||||
GtkWidget *edge_scrolling_row;
|
||||
GtkWidget *edge_scrolling_switch;
|
||||
GtkWidget *general_listbox;
|
||||
GtkWidget *mouse_frame;
|
||||
GtkWidget *mouse_listbox;
|
||||
GtkWidget *mouse_natural_scrolling_switch;
|
||||
GtkWidget *mouse_speed_scale;
|
||||
CcMouseTest *mouse_test;
|
||||
GtkWidget *primary_button_left;
|
||||
GtkWidget *primary_button_right;
|
||||
GtkWidget *scrolled_window;
|
||||
GtkStack *stack;
|
||||
GtkWidget *tap_to_click_row;
|
||||
GtkWidget *tap_to_click_switch;
|
||||
GtkButton *test_button;
|
||||
GtkWidget *touchpad_frame;
|
||||
GtkWidget *touchpad_listbox;
|
||||
GtkWidget *touchpad_natural_scrolling_row;
|
||||
GtkWidget *touchpad_natural_scrolling_switch;
|
||||
GtkWidget *touchpad_speed_row;
|
||||
GtkWidget *touchpad_speed_scale;
|
||||
GtkWidget *touchpad_toggle_switch;
|
||||
GtkWidget *two_finger_scrolling_row;
|
||||
GtkWidget *two_finger_scrolling_switch;
|
||||
|
||||
GSettings *mouse_settings;
|
||||
GSettings *gsd_mouse_settings;
|
||||
GSettings *touchpad_settings;
|
||||
|
||||
GsdDeviceManager *device_manager;
|
||||
guint device_added_id;
|
||||
guint device_removed_id;
|
||||
|
||||
gboolean have_mouse;
|
||||
gboolean have_touchpad;
|
||||
gboolean have_touchscreen;
|
||||
gboolean have_synaptics;
|
||||
|
||||
gboolean left_handed;
|
||||
GtkGesture *left_gesture;
|
||||
GtkGesture *right_gesture;
|
||||
};
|
||||
|
||||
CC_PANEL_REGISTER (CcMousePanel, cc_mouse_panel)
|
||||
|
||||
static void
|
||||
setup_touchpad_options (CcMousePanel *self)
|
||||
{
|
||||
gboolean edge_scroll_enabled;
|
||||
gboolean two_finger_scroll_enabled;
|
||||
gboolean have_two_finger_scrolling;
|
||||
gboolean have_edge_scrolling;
|
||||
gboolean have_tap_to_click;
|
||||
|
||||
if (self->have_synaptics || !self->have_touchpad) {
|
||||
gtk_widget_hide (self->touchpad_frame);
|
||||
return;
|
||||
}
|
||||
|
||||
cc_touchpad_check_capabilities (&have_two_finger_scrolling, &have_edge_scrolling, &have_tap_to_click);
|
||||
|
||||
gtk_widget_show (self->touchpad_frame);
|
||||
|
||||
gtk_widget_set_visible (self->two_finger_scrolling_row, have_two_finger_scrolling);
|
||||
gtk_widget_set_visible (self->edge_scrolling_row, have_edge_scrolling);
|
||||
gtk_widget_set_visible (self->tap_to_click_row, have_tap_to_click);
|
||||
|
||||
edge_scroll_enabled = g_settings_get_boolean (self->touchpad_settings, "edge-scrolling-enabled");
|
||||
two_finger_scroll_enabled = g_settings_get_boolean (self->touchpad_settings, "two-finger-scrolling-enabled");
|
||||
if (edge_scroll_enabled && two_finger_scroll_enabled)
|
||||
{
|
||||
/* You cunning user set both, but you can only have one set in that UI */
|
||||
gtk_switch_set_active (GTK_SWITCH (self->edge_scrolling_switch), FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
two_finger_scrolling_changed_event (CcMousePanel *self,
|
||||
gboolean state)
|
||||
{
|
||||
/* Updating the setting will cause the "state" of the switch to be updated. */
|
||||
g_settings_set_boolean (self->touchpad_settings, "two-finger-scrolling-enabled", state);
|
||||
|
||||
/* Disable edge scrolling if two-finger scrolling is enabled */
|
||||
if (state && gtk_widget_get_visible (self->edge_scrolling_row))
|
||||
gtk_switch_set_active (GTK_SWITCH (self->edge_scrolling_switch), FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
edge_scrolling_changed_event (CcMousePanel *self,
|
||||
gboolean state)
|
||||
{
|
||||
/* Updating the setting will cause the "state" of the switch to be updated. */
|
||||
g_settings_set_boolean (self->touchpad_settings, "edge-scrolling-enabled", state);
|
||||
|
||||
/* Disable two-finger scrolling if edge scrolling is enabled */
|
||||
if (state && gtk_widget_get_visible (self->two_finger_scrolling_row))
|
||||
gtk_switch_set_active (GTK_SWITCH (self->two_finger_scrolling_switch), FALSE);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
get_touchpad_enabled (GSettings *settings)
|
||||
{
|
||||
GDesktopDeviceSendEvents send_events;
|
||||
|
||||
send_events = g_settings_get_enum (settings, "send-events");
|
||||
|
||||
return send_events == G_DESKTOP_DEVICE_SEND_EVENTS_ENABLED;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
show_touchpad_enabling_switch (CcMousePanel *self)
|
||||
{
|
||||
if (!self->have_touchpad)
|
||||
return FALSE;
|
||||
|
||||
g_debug ("Should we show the touchpad disable switch: have_mouse: %s have_touchscreen: %s\n",
|
||||
self->have_mouse ? "true" : "false",
|
||||
self->have_touchscreen ? "true" : "false");
|
||||
|
||||
/* Let's show the button when a mouse or touchscreen is present */
|
||||
if (self->have_mouse || self->have_touchscreen)
|
||||
return TRUE;
|
||||
|
||||
/* Let's also show when the touchpad is disabled. */
|
||||
if (!get_touchpad_enabled (self->touchpad_settings))
|
||||
return TRUE;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
touchpad_enabled_get_mapping (GValue *value,
|
||||
GVariant *variant,
|
||||
gpointer user_data)
|
||||
{
|
||||
gboolean enabled;
|
||||
|
||||
enabled = g_strcmp0 (g_variant_get_string (variant, NULL), "enabled") == 0;
|
||||
g_value_set_boolean (value, enabled);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static GVariant *
|
||||
touchpad_enabled_set_mapping (const GValue *value,
|
||||
const GVariantType *type,
|
||||
gpointer user_data)
|
||||
{
|
||||
gboolean enabled;
|
||||
|
||||
enabled = g_value_get_boolean (value);
|
||||
|
||||
return g_variant_new_string (enabled ? "enabled" : "disabled");
|
||||
}
|
||||
|
||||
static void
|
||||
handle_secondary_button (CcMousePanel *self,
|
||||
GtkWidget *button,
|
||||
GtkGesture *gesture)
|
||||
{
|
||||
gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
|
||||
gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (gesture), TRUE);
|
||||
gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
|
||||
g_signal_connect_swapped (gesture, "pressed", G_CALLBACK (gtk_button_clicked), button);
|
||||
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture), GTK_PHASE_BUBBLE);
|
||||
}
|
||||
|
||||
/* Set up the property editors in the dialog. */
|
||||
static void
|
||||
setup_dialog (CcMousePanel *self)
|
||||
{
|
||||
GtkWidget *button;
|
||||
|
||||
self->left_handed = g_settings_get_boolean (self->mouse_settings, "left-handed");
|
||||
button = self->left_handed ? self->primary_button_right : self->primary_button_left;
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
|
||||
|
||||
g_settings_bind (self->mouse_settings, "left-handed",
|
||||
self->primary_button_left, "active",
|
||||
G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
|
||||
g_settings_bind (self->mouse_settings, "left-handed",
|
||||
self->primary_button_right, "active",
|
||||
G_SETTINGS_BIND_DEFAULT);
|
||||
|
||||
/* Allow changing orientation with either button */
|
||||
button = self->primary_button_right;
|
||||
self->right_gesture = gtk_gesture_multi_press_new (button);
|
||||
handle_secondary_button (self, button, self->right_gesture);
|
||||
button = self->primary_button_left;
|
||||
self->left_gesture = gtk_gesture_multi_press_new (button);
|
||||
handle_secondary_button (self, button, self->left_gesture);
|
||||
|
||||
g_settings_bind (self->mouse_settings, "natural-scroll",
|
||||
self->mouse_natural_scrolling_switch, "active",
|
||||
G_SETTINGS_BIND_DEFAULT);
|
||||
|
||||
gtk_list_box_set_header_func (GTK_LIST_BOX (self->general_listbox), cc_list_box_update_header_func, NULL, NULL);
|
||||
gtk_list_box_set_header_func (GTK_LIST_BOX (self->touchpad_listbox), cc_list_box_update_header_func, NULL, NULL);
|
||||
|
||||
/* Mouse section */
|
||||
gtk_widget_set_visible (self->mouse_frame, self->have_mouse);
|
||||
|
||||
g_settings_bind (self->mouse_settings, "speed",
|
||||
gtk_range_get_adjustment (GTK_RANGE (self->mouse_speed_scale)), "value",
|
||||
G_SETTINGS_BIND_DEFAULT);
|
||||
|
||||
gtk_list_box_set_header_func (GTK_LIST_BOX (self->mouse_listbox), cc_list_box_update_header_func, NULL, NULL);
|
||||
|
||||
/* Touchpad section */
|
||||
gtk_widget_set_visible (self->touchpad_toggle_switch, show_touchpad_enabling_switch (self));
|
||||
|
||||
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
|
||||
self->touchpad_toggle_switch, "active",
|
||||
G_SETTINGS_BIND_DEFAULT,
|
||||
touchpad_enabled_get_mapping,
|
||||
touchpad_enabled_set_mapping,
|
||||
NULL, NULL);
|
||||
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
|
||||
self->touchpad_natural_scrolling_row, "sensitive",
|
||||
G_SETTINGS_BIND_GET,
|
||||
touchpad_enabled_get_mapping,
|
||||
touchpad_enabled_set_mapping,
|
||||
NULL, NULL);
|
||||
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
|
||||
self->touchpad_speed_row, "sensitive",
|
||||
G_SETTINGS_BIND_GET,
|
||||
touchpad_enabled_get_mapping,
|
||||
touchpad_enabled_set_mapping,
|
||||
NULL, NULL);
|
||||
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
|
||||
self->tap_to_click_row, "sensitive",
|
||||
G_SETTINGS_BIND_GET,
|
||||
touchpad_enabled_get_mapping,
|
||||
touchpad_enabled_set_mapping,
|
||||
NULL, NULL);
|
||||
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
|
||||
self->two_finger_scrolling_row, "sensitive",
|
||||
G_SETTINGS_BIND_GET,
|
||||
touchpad_enabled_get_mapping,
|
||||
touchpad_enabled_set_mapping,
|
||||
NULL, NULL);
|
||||
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
|
||||
self->edge_scrolling_row, "sensitive",
|
||||
G_SETTINGS_BIND_GET,
|
||||
touchpad_enabled_get_mapping,
|
||||
touchpad_enabled_set_mapping,
|
||||
NULL, NULL);
|
||||
|
||||
g_settings_bind (self->touchpad_settings, "natural-scroll",
|
||||
self->touchpad_natural_scrolling_switch, "active",
|
||||
G_SETTINGS_BIND_DEFAULT);
|
||||
|
||||
g_settings_bind (self->touchpad_settings, "speed",
|
||||
gtk_range_get_adjustment (GTK_RANGE (self->touchpad_speed_scale)), "value",
|
||||
G_SETTINGS_BIND_DEFAULT);
|
||||
|
||||
g_settings_bind (self->touchpad_settings, "tap-to-click",
|
||||
self->tap_to_click_switch, "active",
|
||||
G_SETTINGS_BIND_DEFAULT);
|
||||
|
||||
g_settings_bind (self->touchpad_settings, "two-finger-scrolling-enabled",
|
||||
self->two_finger_scrolling_switch, "state",
|
||||
G_SETTINGS_BIND_GET);
|
||||
|
||||
g_settings_bind (self->touchpad_settings, "edge-scrolling-enabled",
|
||||
self->edge_scrolling_switch, "state",
|
||||
G_SETTINGS_BIND_GET);
|
||||
|
||||
setup_touchpad_options (self);
|
||||
}
|
||||
|
||||
/* Callback issued when a button is clicked on the dialog */
|
||||
static void
|
||||
device_changed (GsdDeviceManager *device_manager,
|
||||
GsdDevice *device,
|
||||
CcMousePanel *self)
|
||||
{
|
||||
self->have_touchpad = touchpad_is_present ();
|
||||
|
||||
setup_touchpad_options (self);
|
||||
|
||||
self->have_mouse = mouse_is_present ();
|
||||
gtk_widget_set_visible (self->mouse_frame, self->have_mouse);
|
||||
gtk_widget_set_visible (self->touchpad_toggle_switch, show_touchpad_enabling_switch (self));
|
||||
}
|
||||
|
||||
static void
|
||||
on_content_size_changed (CcMousePanel *self,
|
||||
GtkAllocation *allocation)
|
||||
{
|
||||
if (allocation->height < 490)
|
||||
{
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->scrolled_window),
|
||||
GTK_POLICY_NEVER, GTK_POLICY_NEVER);
|
||||
}
|
||||
else
|
||||
{
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->scrolled_window),
|
||||
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
|
||||
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->scrolled_window), 490);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
cc_mouse_panel_dispose (GObject *object)
|
||||
{
|
||||
CcMousePanel *self = CC_MOUSE_PANEL (object);
|
||||
|
||||
g_clear_object (&self->mouse_settings);
|
||||
g_clear_object (&self->gsd_mouse_settings);
|
||||
g_clear_object (&self->touchpad_settings);
|
||||
g_clear_object (&self->right_gesture);
|
||||
g_clear_object (&self->left_gesture);
|
||||
|
||||
if (self->device_manager != NULL) {
|
||||
g_signal_handler_disconnect (self->device_manager, self->device_added_id);
|
||||
self->device_added_id = 0;
|
||||
g_signal_handler_disconnect (self->device_manager, self->device_removed_id);
|
||||
self->device_removed_id = 0;
|
||||
self->device_manager = NULL;
|
||||
}
|
||||
|
||||
G_OBJECT_CLASS (cc_mouse_panel_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
|
|
@ -58,7 +374,7 @@ test_button_toggled_cb (CcMousePanel *self)
|
|||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->test_button)))
|
||||
gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->mouse_test));
|
||||
else
|
||||
gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->mouse_properties));
|
||||
gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->scrolled_window));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -79,9 +395,27 @@ cc_mouse_panel_init (CcMousePanel *self)
|
|||
{
|
||||
g_resources_register (cc_mouse_get_resource ());
|
||||
|
||||
cc_mouse_properties_get_type ();
|
||||
cc_mouse_test_get_type ();
|
||||
gtk_widget_init_template (GTK_WIDGET (self));
|
||||
|
||||
self->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
|
||||
self->gsd_mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
|
||||
self->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
|
||||
|
||||
self->device_manager = gsd_device_manager_get ();
|
||||
self->device_added_id = g_signal_connect (self->device_manager, "device-added",
|
||||
G_CALLBACK (device_changed), self);
|
||||
self->device_removed_id = g_signal_connect (self->device_manager, "device-removed",
|
||||
G_CALLBACK (device_changed), self);
|
||||
|
||||
self->have_mouse = mouse_is_present ();
|
||||
self->have_touchpad = touchpad_is_present ();
|
||||
self->have_touchscreen = touchscreen_is_present ();
|
||||
self->have_synaptics = cc_synaptics_check ();
|
||||
if (self->have_synaptics)
|
||||
g_warning ("Detected synaptics X driver, please migrate to libinput");
|
||||
|
||||
setup_dialog (self);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -98,10 +432,33 @@ cc_mouse_panel_class_init (CcMousePanelClass *klass)
|
|||
|
||||
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/mouse/cc-mouse-panel.ui");
|
||||
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, mouse_properties);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, edge_scrolling_row);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, edge_scrolling_switch);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, general_listbox);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, mouse_frame);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, mouse_listbox);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, mouse_natural_scrolling_switch);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, mouse_speed_scale);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, mouse_test);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, primary_button_left);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, primary_button_right);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, scrolled_window);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, stack);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, tap_to_click_row);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, tap_to_click_switch);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, test_button);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, touchpad_frame);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, touchpad_listbox);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, touchpad_natural_scrolling_row);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, touchpad_natural_scrolling_switch);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, touchpad_speed_row);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, touchpad_speed_scale);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, touchpad_toggle_switch);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, two_finger_scrolling_row);
|
||||
gtk_widget_class_bind_template_child (widget_class, CcMousePanel, two_finger_scrolling_switch);
|
||||
|
||||
gtk_widget_class_bind_template_callback (widget_class, edge_scrolling_changed_event);
|
||||
gtk_widget_class_bind_template_callback (widget_class, on_content_size_changed);
|
||||
gtk_widget_class_bind_template_callback (widget_class, test_button_toggled_cb);
|
||||
gtk_widget_class_bind_template_callback (widget_class, two_finger_scrolling_changed_event);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue