applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mouse: Mouse test area as a proper widget

Browse source 
To avoid using global variables.
This commit is contained in:
Ondrej Holy 2013-03-15 11:57:28 +01:00
parent 9e69b7e9d5
commit 1d7f7858b2
4 changed files with 189 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

35
panels/mouse/cc-mouse-panel.c
View file

@ -65,12 +65,6 @@ cc_mouse_panel_dispose (GObject *object)
priv->prefs_widget = NULL; priv->prefs_widget = NULL;
} }
if (priv->test_widget)
{
gnome_mouse_test_dispose (priv->test_widget);
priv->test_widget = NULL;
}
if (priv->builder) if (priv->builder)
{ {
g_object_unref (priv->builder); g_object_unref (priv->builder);
@ -92,19 +86,10 @@ shell_test_button_toggle_event (GtkToggleButton *button, CcMousePanel *panel)
{ {
GtkNotebook *notebook = GTK_NOTEBOOK (panel->priv->widget); GtkNotebook *notebook = GTK_NOTEBOOK (panel->priv->widget);
gint page_num; gint page_num;
gboolean active;
if (gtk_toggle_button_get_active (button)) { active = gtk_toggle_button_get_active (button);
GtkBuilder *dialog = panel->priv->builder; page_num = active ? CC_MOUSE_PAGE_TEST : CC_MOUSE_PAGE_PREFS;
GtkAdjustment *adjustment;
page_num = CC_MOUSE_PAGE_TEST;
adjustment = GTK_ADJUSTMENT (WID ("scrolled_window_adjustment"));
gtk_adjustment_set_value (adjustment,
gtk_adjustment_get_upper (adjustment));
} else {
page_num = CC_MOUSE_PAGE_PREFS;
}
gtk_notebook_set_current_page (notebook, page_num); gtk_notebook_set_current_page (notebook, page_num);
} }
@ -155,19 +140,10 @@ cc_mouse_panel_init (CcMousePanel *self)
return; return;
} }
gtk_builder_add_from_resource (priv->builder,
"/org/gnome/control-center/mouse/gnome-mouse-test.ui",
&error);
if (error != NULL)
{
g_warning ("Error loading UI file: %s", error->message);
return;
}
dialog = priv->builder; dialog = priv->builder;
priv->prefs_widget = gnome_mouse_properties_init (priv->builder); priv->prefs_widget = gnome_mouse_properties_init (priv->builder);
priv->test_widget = gnome_mouse_test_init (priv->builder); priv->test_widget = cc_mouse_test_new ();
priv->widget = gtk_notebook_new (); priv->widget = gtk_notebook_new ();
gtk_widget_set_margin_left (priv->widget, 6); gtk_widget_set_margin_left (priv->widget, 6);
@ -178,9 +154,10 @@ cc_mouse_panel_init (CcMousePanel *self)
gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->widget), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->widget), FALSE);
gtk_widget_reparent (WID ("prefs_widget"), priv->widget); gtk_widget_reparent (WID ("prefs_widget"), priv->widget);
gtk_widget_reparent (WID ("test_widget"), priv->widget); gtk_notebook_append_page (GTK_NOTEBOOK (priv->widget), priv->test_widget, NULL);
gtk_container_add (GTK_CONTAINER (self), priv->widget); gtk_container_add (GTK_CONTAINER (self), priv->widget);
gtk_widget_show (priv->test_widget);
gtk_widget_show (priv->widget); gtk_widget_show (priv->widget);
} }

276
panels/mouse/gnome-mouse-test.c
View file

@ -34,7 +34,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#define WID(x) (GtkWidget*) gtk_builder_get_object (dialog, x) #define WID(x) (GtkWidget *) gtk_builder_get_object (d->builder, x)
/* Click test button sizes. */ /* Click test button sizes. */
#define SHADOW_SIZE (10.0 / 180 * size) #define SHADOW_SIZE (10.0 / 180 * size)
@ -44,8 +44,10 @@
#define ANNULUS_SIZE (6.0 / 180 * size) #define ANNULUS_SIZE (6.0 / 180 * size)
#define INNER_CIRCLE_SIZE (52.0 / 180 * size) #define INNER_CIRCLE_SIZE (52.0 / 180 * size)
static void setup_information_label (GtkWidget *widget); #define CC_MOUSE_TEST_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CC_TYPE_MOUSE_TEST, CcMouseTestPrivate))
static void setup_scroll_image (GtkWidget *widget);
static void setup_information_label (CcMouseTestPrivate *d);
static void setup_scroll_image (CcMouseTestPrivate *d);
enum enum
{ {
@ -57,36 +59,33 @@ enum
DOUBLE_CLICK_TEST_GEGL DOUBLE_CLICK_TEST_GEGL
}; };
/* State in testing the double-click speed. Global for a great deal of struct _CcMouseTestPrivate
* convenience
*/
static gint double_click_state = DOUBLE_CLICK_TEST_OFF;
static gint button_state = 0;
static GSettings *mouse_settings = NULL;
static gint information_label_timeout_id = 0;
static gint button_drawing_area_timeout_id = 0;
static gint scroll_image_timeout_id = 0;
/* Double Click handling */
struct test_data_t
{ {
gint *timeout_id; GtkBuilder *builder;
GtkWidget *widget;
guint32 double_click_timestamp;
gint double_click_state;
gint button_state;
GSettings *mouse_settings;
gint information_label_timeout_id;
gint button_drawing_area_timeout_id;
gint scroll_image_timeout_id;
}; };
G_DEFINE_TYPE (CcMouseTest, cc_mouse_test, GTK_TYPE_ALIGNMENT);
/* Timeout for the double click test */ /* Timeout for the double click test */
static gboolean static gboolean
test_maybe_timeout (struct test_data_t *data) test_maybe_timeout (CcMouseTestPrivate *d)
{ {
double_click_state = DOUBLE_CLICK_TEST_OFF; d->double_click_state = DOUBLE_CLICK_TEST_OFF;
gtk_widget_queue_draw (data->widget); gtk_widget_queue_draw (WID ("button_drawing_area"));
*data->timeout_id = 0; d->button_drawing_area_timeout_id = 0;
return FALSE; return FALSE;
} }
@ -94,11 +93,11 @@ test_maybe_timeout (struct test_data_t *data)
/* Timeout for the information label */ /* Timeout for the information label */
static gboolean static gboolean
information_label_timeout (struct test_data_t *data) information_label_timeout (CcMouseTestPrivate *d)
{ {
setup_information_label (data->widget); setup_information_label (d);
*data->timeout_id = 0; d->information_label_timeout_id = 0;
return FALSE; return FALSE;
} }
@ -106,40 +105,39 @@ information_label_timeout (struct test_data_t *data)
/* Timeout for the scroll image */ /* Timeout for the scroll image */
static gboolean static gboolean
scroll_image_timeout (struct test_data_t *data) scroll_image_timeout (CcMouseTestPrivate *d)
{ {
setup_scroll_image (data->widget); setup_scroll_image (d);
*data->timeout_id = 0; d->scroll_image_timeout_id = 0;
return FALSE; return FALSE;
} }
/* Set information label according global state variables. */ /* Set information label */
static void static void
setup_information_label (GtkWidget *widget) setup_information_label (CcMouseTestPrivate *d)
{ {
static struct test_data_t data;
gchar *message = NULL; gchar *message = NULL;
gchar *label_text = NULL; gchar *label_text = NULL;
gboolean double_click; gboolean double_click;
if (information_label_timeout_id != 0) { if (d->information_label_timeout_id != 0) {
g_source_remove (information_label_timeout_id); g_source_remove (d->information_label_timeout_id);
information_label_timeout_id = 0; d->information_label_timeout_id = 0;
} }
if (double_click_state == DOUBLE_CLICK_TEST_OFF) { if (d->double_click_state == DOUBLE_CLICK_TEST_OFF) {
gtk_label_set_label (GTK_LABEL (widget), _("Try clicking, double clicking, scrolling")); gtk_label_set_label (GTK_LABEL (WID ("information_label")), _("Try clicking, double clicking, scrolling"));
return; return;
} }
if (double_click_state == DOUBLE_CLICK_TEST_GEGL) { if (d->double_click_state == DOUBLE_CLICK_TEST_GEGL) {
message = _("Five clicks, GEGL time!"), "</b>"; message = _("Five clicks, GEGL time!"), "</b>";
} else { } else {
double_click = (double_click_state >= DOUBLE_CLICK_TEST_ON); double_click = (d->double_click_state >= DOUBLE_CLICK_TEST_ON);
switch (button_state) { switch (d->button_state) {
case 1: case 1:
message = (double_click) ? _("Double click, primary button") : _("Single click, primary button"); message = (double_click) ? _("Double click, primary button") : _("Single click, primary button");
break; break;
@ -153,111 +151,95 @@ setup_information_label (GtkWidget *widget)
} }
label_text = g_strconcat ("<b>", message, "</b>", NULL); label_text = g_strconcat ("<b>", message, "</b>", NULL);
gtk_label_set_markup (GTK_LABEL (widget), label_text); gtk_label_set_markup (GTK_LABEL (WID ("information_label")), label_text);
g_free (label_text); g_free (label_text);
data.widget = widget; d->information_label_timeout_id = g_timeout_add (2500, (GSourceFunc) information_label_timeout, d);
data.timeout_id = &information_label_timeout_id;
information_label_timeout_id = g_timeout_add (2500,
(GSourceFunc) information_label_timeout,
&data);
} }
/* Update scroll image according to the global state variables */ /* Update scroll image */
static void static void
setup_scroll_image (GtkWidget *widget) setup_scroll_image (CcMouseTestPrivate *d)
{ {
static struct test_data_t data;
const char *resource; const char *resource;
if (scroll_image_timeout_id != 0) { if (d->scroll_image_timeout_id != 0) {
g_source_remove (scroll_image_timeout_id); g_source_remove (d->scroll_image_timeout_id);
scroll_image_timeout_id = 0; d->scroll_image_timeout_id = 0;
} }
if (double_click_state == DOUBLE_CLICK_TEST_GEGL) if (d->double_click_state == DOUBLE_CLICK_TEST_GEGL)
resource = "/org/gnome/control-center/mouse/scroll-test-gegl.svg"; resource = "/org/gnome/control-center/mouse/scroll-test-gegl.svg";
else else
resource = "/org/gnome/control-center/mouse/scroll-test.svg"; resource = "/org/gnome/control-center/mouse/scroll-test.svg";
gtk_image_set_from_resource (GTK_IMAGE (widget), resource); gtk_image_set_from_resource (GTK_IMAGE (WID ("image")), resource);
if (double_click_state != DOUBLE_CLICK_TEST_GEGL) if (d->double_click_state != DOUBLE_CLICK_TEST_GEGL)
return; return;
data.widget = widget; d->scroll_image_timeout_id = g_timeout_add (5000, (GSourceFunc) scroll_image_timeout, d);
data.timeout_id = &scroll_image_timeout_id;
scroll_image_timeout_id = g_timeout_add (5000,
(GSourceFunc) scroll_image_timeout,
&data);
} }
/* Callback issued when the user clicks the double click testing area. */ /* Callback issued when the user clicks the double click testing area. */
static gboolean static gboolean
button_drawing_area_button_press_event (GtkWidget *widget, button_drawing_area_button_press_event (GtkWidget *widget,
GdkEventButton *event, GdkEventButton *event,
GtkBuilder *dialog) CcMouseTestPrivate *d)
{ {
gint double_click_time; gint double_click_time;
static struct test_data_t data;
static guint32 double_click_timestamp = 0;
if (event->type != GDK_BUTTON_PRESS || event->button > 3) if (event->type != GDK_BUTTON_PRESS || event->button > 3)
return FALSE; return FALSE;
double_click_time = g_settings_get_int (mouse_settings, "double-click"); double_click_time = g_settings_get_int (d->mouse_settings, "double-click");
if (button_drawing_area_timeout_id != 0) { if (d->button_drawing_area_timeout_id != 0) {
g_source_remove (button_drawing_area_timeout_id); g_source_remove (d->button_drawing_area_timeout_id);
button_drawing_area_timeout_id = 0; d->button_drawing_area_timeout_id = 0;
} }
/* Ignore fake double click using different buttons. */ /* Ignore fake double click using different buttons. */
if (double_click_state != DOUBLE_CLICK_TEST_OFF && button_state != event->button) if (d->double_click_state != DOUBLE_CLICK_TEST_OFF && d->button_state != event->button)
double_click_state = DOUBLE_CLICK_TEST_OFF; d->double_click_state = DOUBLE_CLICK_TEST_OFF;
switch (double_click_state) { switch (d->double_click_state) {
case DOUBLE_CLICK_TEST_OFF: case DOUBLE_CLICK_TEST_OFF:
double_click_state = DOUBLE_CLICK_TEST_MAYBE; d->double_click_state = DOUBLE_CLICK_TEST_MAYBE;
data.widget = widget; d->button_drawing_area_timeout_id = g_timeout_add (double_click_time, (GSourceFunc) test_maybe_timeout, d);
data.timeout_id = &button_drawing_area_timeout_id;
button_drawing_area_timeout_id = g_timeout_add (double_click_time, (GSourceFunc) test_maybe_timeout, &data);
break; break;
case DOUBLE_CLICK_TEST_MAYBE: case DOUBLE_CLICK_TEST_MAYBE:
case DOUBLE_CLICK_TEST_ON: case DOUBLE_CLICK_TEST_ON:
case DOUBLE_CLICK_TEST_STILL_ON: case DOUBLE_CLICK_TEST_STILL_ON:
case DOUBLE_CLICK_TEST_ALMOST_THERE: case DOUBLE_CLICK_TEST_ALMOST_THERE:
if (event->time - double_click_timestamp < double_click_time) { if (event->time - d->double_click_timestamp < double_click_time) {
double_click_state++; d->double_click_state++;
data.widget = widget; d->button_drawing_area_timeout_id = g_timeout_add (2500, (GSourceFunc) test_maybe_timeout, d);
data.timeout_id = &button_drawing_area_timeout_id;
button_drawing_area_timeout_id = g_timeout_add (2500, (GSourceFunc) test_maybe_timeout, &data);
} else { } else {
test_maybe_timeout (&data); test_maybe_timeout (d);
} }
break; break;
case DOUBLE_CLICK_TEST_GEGL: case DOUBLE_CLICK_TEST_GEGL:
double_click_state = DOUBLE_CLICK_TEST_OFF; d->double_click_state = DOUBLE_CLICK_TEST_OFF;
break; break;
} }
double_click_timestamp = event->time; d->double_click_timestamp = event->time;
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (WID ("button_drawing_area"));
button_state = event->button; d->button_state = event->button;
setup_information_label (WID ("information_label")); setup_information_label (d);
setup_scroll_image (WID ("image")); setup_scroll_image (d);
return TRUE; return TRUE;
} }
static gboolean static gboolean
button_drawing_area_draw_event (GtkWidget *widget, button_drawing_area_draw_event (GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
GtkBuilder *dialog) CcMouseTestPrivate *d)
{ {
gdouble center_x, center_y, size; gdouble center_x, center_y, size;
GdkRGBA inner_color, outer_color; GdkRGBA inner_color, outer_color;
@ -267,7 +249,7 @@ button_drawing_area_draw_event (GtkWidget *widget,
center_x = gtk_widget_get_allocated_width (widget) / 2.0; center_x = gtk_widget_get_allocated_width (widget) / 2.0;
center_y = gtk_widget_get_allocated_height (widget) / 2.0; center_y = gtk_widget_get_allocated_height (widget) / 2.0;
switch (double_click_state) { switch (d->double_click_state) {
case DOUBLE_CLICK_TEST_ON: case DOUBLE_CLICK_TEST_ON:
case DOUBLE_CLICK_TEST_STILL_ON: case DOUBLE_CLICK_TEST_STILL_ON:
case DOUBLE_CLICK_TEST_ALMOST_THERE: case DOUBLE_CLICK_TEST_ALMOST_THERE:
@ -312,19 +294,18 @@ button_drawing_area_draw_event (GtkWidget *widget,
return FALSE; return FALSE;
} }
/* Set up the property editors in the dialog. */
static void static void
setup_dialog (GtkBuilder *dialog) setup_dialog (CcMouseTestPrivate *d)
{ {
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
GdkRGBA color; GdkRGBA color;
g_signal_connect (WID ("button_drawing_area"), "button_press_event", g_signal_connect (WID ("button_drawing_area"), "button_press_event",
G_CALLBACK (button_drawing_area_button_press_event), G_CALLBACK (button_drawing_area_button_press_event),
dialog); d);
g_signal_connect (WID ("button_drawing_area"), "draw", g_signal_connect (WID ("button_drawing_area"), "draw",
G_CALLBACK (button_drawing_area_draw_event), G_CALLBACK (button_drawing_area_draw_event),
dialog); d);
adjustment = GTK_ADJUSTMENT (WID ("scrolled_window_adjustment")); adjustment = GTK_ADJUSTMENT (WID ("scrolled_window_adjustment"));
gtk_adjustment_set_value (adjustment, gtk_adjustment_set_value (adjustment,
@ -335,40 +316,71 @@ setup_dialog (GtkBuilder *dialog)
gtk_widget_override_background_color (WID ("button_drawing_area"), GTK_STATE_FLAG_NORMAL, &color); gtk_widget_override_background_color (WID ("button_drawing_area"), GTK_STATE_FLAG_NORMAL, &color);
} }
static void
cc_mouse_test_finalize (GObject *object)
{
CcMouseTestPrivate *d = CC_MOUSE_TEST (object)->priv;
g_clear_object (&d->mouse_settings);
g_clear_object (&d->builder);
if (d->information_label_timeout_id != 0) {
g_source_remove (d->information_label_timeout_id);
d->information_label_timeout_id = 0;
}
if (d->scroll_image_timeout_id != 0) {
g_source_remove (d->scroll_image_timeout_id);
d->scroll_image_timeout_id = 0;
}
if (d->button_drawing_area_timeout_id != 0) {
g_source_remove (d->button_drawing_area_timeout_id);
d->button_drawing_area_timeout_id = 0;
}
G_OBJECT_CLASS (cc_mouse_test_parent_class)->finalize (object);
}
static void
cc_mouse_test_class_init (CcMouseTestClass *class)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (class);
object_class->finalize = cc_mouse_test_finalize;
g_type_class_add_private (class, sizeof (CcMouseTestPrivate));
}
static void
cc_mouse_test_init (CcMouseTest *object)
{
CcMouseTestPrivate *d = object->priv = CC_MOUSE_TEST_GET_PRIVATE (object);
GError *error = NULL;
d->builder = gtk_builder_new ();
gtk_builder_add_from_resource (d->builder,
"/org/gnome/control-center/mouse/gnome-mouse-test.ui",
&error);
d->double_click_timestamp = 0;
d->double_click_state = DOUBLE_CLICK_TEST_OFF;
d->button_state = 0;
d->mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
d->information_label_timeout_id = 0;
d->button_drawing_area_timeout_id = 0;
d->scroll_image_timeout_id = 0;
gtk_widget_reparent (WID ("test_widget"), GTK_WIDGET (object));
setup_dialog (d);
}
GtkWidget * GtkWidget *
gnome_mouse_test_init (GtkBuilder *dialog) cc_mouse_test_new (void)
{ {
mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse"); return (GtkWidget *) g_object_new (CC_TYPE_MOUSE_TEST, NULL);
double_click_state = DOUBLE_CLICK_TEST_OFF;
button_state = 0;
setup_dialog (dialog);
return WID ("mouse_test_window");
} }
void
gnome_mouse_test_dispose (GtkWidget *widget)
{
if (mouse_settings != NULL) {
g_object_unref (mouse_settings);
mouse_settings = NULL;
}
if (information_label_timeout_id != 0) {
g_source_remove (information_label_timeout_id);
information_label_timeout_id = 0;
}
if (scroll_image_timeout_id != 0) {
g_source_remove (scroll_image_timeout_id);
scroll_image_timeout_id = 0;
}
if (button_drawing_area_timeout_id != 0) {
g_source_remove (button_drawing_area_timeout_id);
button_drawing_area_timeout_id = 0;
}
}

36
panels/mouse/gnome-mouse-test.h
View file

@ -20,8 +20,40 @@
* 02111-1307, USA. * 02111-1307, USA.
*/ */
#ifndef _CC_MOUSE_TEST_H
#define _CC_MOUSE_TEST_H
#include <gtk/gtk.h> #include <gtk/gtk.h>
GtkWidget *gnome_mouse_test_init (GtkBuilder *dialog); G_BEGIN_DECLS
void gnome_mouse_test_dispose (GtkWidget *widget);
#define CC_TYPE_MOUSE_TEST cc_mouse_test_get_type ()
#define CC_MOUSE_TEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CC_TYPE_MOUSE_TEST, CcMouseTest))
#define CC_MOUSE_TEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CC_TYPE_MOUSE_TEST, CcMouseTestClass))
#define CC_IS_MOUSE_TEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CC_TYPE_MOUSE_TEST))
#define CC_IS_MOUSE_TEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CC_TYPE_MOUSE_TEST))
#define CC_MOUSE_TEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CC_TYPE_MOUSE_TEST, CcMouseTestClass))
typedef struct _CcMouseTest CcMouseTest;
typedef struct _CcMouseTestClass CcMouseTestClass;
typedef struct _CcMouseTestPrivate CcMouseTestPrivate;
struct _CcMouseTest
{
GtkAlignment parent;
CcMouseTestPrivate *priv;
};
struct _CcMouseTestClass
{
GtkAlignmentClass parent_class;
};
GType cc_mouse_test_get_type (void) G_GNUC_CONST;
GtkWidget *cc_mouse_test_new (void);
G_END_DECLS
#endif /* _CC_MOUSE_TEST_H */

24
panels/mouse/test-gnome-mouse-test.c
View file

@ -7,10 +7,6 @@
static gboolean static gboolean
delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{ {
GtkWidget *window = user_data;
gnome_mouse_test_dispose (window);
gtk_main_quit (); gtk_main_quit ();
return FALSE; return FALSE;
@ -18,27 +14,17 @@ delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data)
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
GtkBuilder *builder; GtkWidget *widget;
GtkWidget *window; GtkWidget *window;
GError *error = NULL;
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
g_resources_register (cc_mouse_get_resource ());
builder = gtk_builder_new (); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
widget = cc_mouse_test_new ();
gtk_builder_add_from_resource (builder, "/org/gnome/control-center/mouse/gnome-mouse-test.ui", &error); gtk_container_add (GTK_CONTAINER (window), widget);
if (error != NULL)
{
g_warning ("Error loading UI file: %s", error->message);
return 1;
}
window = gnome_mouse_test_init (builder);
gtk_widget_show_all (window); gtk_widget_show_all (window);
g_signal_connect (G_OBJECT (window), "delete-event", g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (delete_event_cb), NULL);
G_CALLBACK (delete_event_cb), window);
gtk_main (); gtk_main ();