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

wacom: Fix insane Calibrator API

Browse source 
So that we don't have to run gtk_main() in it.
This commit is contained in:
Bastien Nocera 2012-01-12 18:57:20 +00:00
parent a227cd7ca9
commit 705287d5c7
3 changed files with 171 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
panels/wacom/calibrator/calibrator.h
View file

@ -25,6 +25,7 @@
#define _calibrator_h
#include <glib.h>
#include "gui_gtk.h"
/*
* Number of blocks. We partition the screen into 'num_blocks' x 'num_blocks'
@ -63,15 +64,6 @@ enum
LR = 3 /* Lower-right */
};
/* struct to hold min/max info of the X and Y axis */
typedef struct
{
int x_min;
int x_max;
int y_min;
int y_max;
} XYinfo;
struct Calib
{
/* original axis values */

172
panels/wacom/calibrator/gui_gtk.c
View file

@ -33,9 +33,9 @@
#include "calibrator.h"
#include "gui_gtk.h"
typedef struct
struct CalibArea
{
struct Calib* calibrator;
struct Calib calibrator;
double X[4], Y[4];
int display_width, display_height;
int time_elapsed;
@ -45,7 +45,10 @@ typedef struct
guint anim_id;
GtkWidget *window;
} CalibArea;
FinishCallback callback;
gpointer user_data;
};
/* Window parameters */
@ -95,7 +98,7 @@ set_display_size(CalibArea *calib_area,
calib_area->Y[LR] = calib_area->display_height - delta_y - 1;
/* reset calibration if already started */
reset(calib_area->calibrator);
reset(&calib_area->calibrator);
}
static void
@ -155,7 +158,7 @@ draw(GtkWidget *widget, cairo_t *cr, gpointer data)
/* Draw the points */
cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
i = calib_area->calibrator->num_clicks;
i = calib_area->calibrator.num_clicks;
cairo_set_line_width(cr, 1);
cairo_move_to(cr, calib_area->X[i] - CROSS_LINES, calib_area->Y[i] - 0.5);
@ -236,32 +239,48 @@ redraw(CalibArea *calib_area)
}
}
static gboolean
on_delete_event (GtkWidget *widget,
GdkEvent *event,
CalibArea *area)
{
if (area->anim_id > 0) {
g_source_remove (area->anim_id);
area->anim_id = 0;
}
gtk_widget_hide (area->window);
(*area->callback) (area, area->user_data);
return TRUE;
}
static gboolean
on_button_press_event(GtkWidget *widget,
GdkEventButton *event,
gpointer data)
CalibArea *area)
{
CalibArea *calib_area = (CalibArea*)data;
gboolean success;
/* Handle click */
calib_area->time_elapsed = 0;
success = add_click(calib_area->calibrator, (int)event->x_root, (int)event->y_root);
area->time_elapsed = 0;
success = add_click(&area->calibrator, (int)event->x_root, (int)event->y_root);
if (!success && calib_area->calibrator->num_clicks == 0)
draw_message(calib_area, N_("Mis-click detected, restarting..."));
if (!success && area->calibrator.num_clicks == 0)
draw_message(area, N_("Mis-click detected, restarting..."));
else
draw_message(calib_area, NULL);
draw_message(area, NULL);
/* Are we done yet? */
if (calib_area->calibrator->num_clicks >= 4)
if (area->calibrator.num_clicks >= 4)
{
gtk_widget_destroy (calib_area->window);
on_delete_event (widget, NULL, area);
return FALSE;
}
/* Force a redraw */
redraw(calib_area);
redraw(area);
return FALSE;
}
@ -269,38 +288,37 @@ on_button_press_event(GtkWidget *widget,
static gboolean
on_key_release_event(GtkWidget *widget,
GdkEventKey *event,
gpointer data)
CalibArea *area)
{
CalibArea *calib_area = (CalibArea*)data;
if (event->type != GDK_KEY_RELEASE)
return FALSE;
if (event->keyval != GDK_KEY_Escape)
return FALSE;
gtk_widget_destroy (calib_area->window);
on_delete_event (widget, NULL, area);
return FALSE;
}
static gboolean
on_timer_signal(CalibArea *calib_area)
on_timer_signal(CalibArea *area)
{
GdkWindow *win;
calib_area->time_elapsed += TIME_STEP;
if (calib_area->time_elapsed > MAX_TIME)
area->time_elapsed += TIME_STEP;
if (area->time_elapsed > MAX_TIME)
{
gtk_widget_destroy (calib_area->window);
on_delete_event (NULL, NULL, area);
return FALSE;
}
/* Update clock */
win = gtk_widget_get_window (calib_area->window);
win = gtk_widget_get_window (area->window);
if (win)
{
GdkRectangle rect;
rect.x = calib_area->display_width/2 - CLOCK_RADIUS - CLOCK_LINE_WIDTH;
rect.y = calib_area->display_height/2 - CLOCK_RADIUS - CLOCK_LINE_WIDTH;
rect.x = area->display_width/2 - CLOCK_RADIUS - CLOCK_LINE_WIDTH;
rect.y = area->display_height/2 - CLOCK_RADIUS - CLOCK_LINE_WIDTH;
rect.width = 2 * CLOCK_RADIUS + 1 + 2 * CLOCK_LINE_WIDTH;
rect.height = 2 * CLOCK_RADIUS + 1 + 2 * CLOCK_LINE_WIDTH;
gdk_window_invalidate_rect(win, &rect, FALSE);
@ -309,15 +327,44 @@ on_timer_signal(CalibArea *calib_area)
return TRUE;
}
static CalibArea*
calibration_area_new (struct Calib *c)
/**
* Creates the windows and other objects required to do calibration
* under GTK. When the window is closed (timed out, calibration finished
* or user cancellation), callback will be called, where you should call
* calib_area_finish().
*/
CalibArea *
calib_area_new (GdkScreen *screen,
int monitor,
FinishCallback callback,
gpointer user_data,
XYinfo *old_axis,
int threshold_doubleclick,
int threshold_misclick)
{
CalibArea *calib_area;
GdkRectangle rect;
GdkWindow *window;
GdkRGBA black;
g_return_val_if_fail (old_axis, NULL);
g_return_val_if_fail (callback, NULL);
g_debug ("Current calibration: %d, %d, %d, %d\n",
old_axis->x_min,
old_axis->y_min,
old_axis->x_max,
old_axis->y_max);
calib_area = g_new0 (CalibArea, 1);
calib_area->calibrator = c;
calib_area->callback = callback;
calib_area->user_data = user_data;
calib_area->calibrator.old_axis.x_min = old_axis->x_min;
calib_area->calibrator.old_axis.x_max = old_axis->x_max;
calib_area->calibrator.old_axis.y_min = old_axis->y_min;
calib_area->calibrator.old_axis.y_max = old_axis->y_max;
calib_area->calibrator.threshold_doubleclick = threshold_doubleclick;
calib_area->calibrator.threshold_misclick = threshold_misclick;
/* Set up the window */
calib_area->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@ -343,56 +390,36 @@ calibration_area_new (struct Calib *c)
G_CALLBACK(on_button_press_event), calib_area);
g_signal_connect (calib_area->window, "key-release-event",
G_CALLBACK(on_key_release_event), calib_area);
g_signal_connect (calib_area->window, "destroy",
G_CALLBACK (gtk_main_quit), NULL);
g_signal_connect (calib_area->window, "delete-event",
G_CALLBACK(on_delete_event), calib_area);
/* Setup timer for animation */
calib_area->anim_id = g_timeout_add(TIME_STEP, (GSourceFunc)on_timer_signal, calib_area);
return calib_area;
}
/**
* Creates the windows and other objects required to do calibration
* under GTK and then starts the main loop. When the main loop exits,
* the calibration will be calculated (if possible) and this function
* will then return ('TRUE' if successful, 'FALSE' otherwise).
*/
gboolean
run_gui(struct Calib *c,
XYinfo *new_axis,
gboolean *swap)
{
gboolean success;
CalibArea *calib_area;
GdkScreen *screen;
GdkRectangle rect;
g_debug ("Current calibration: %d, %d, %d, %d\n",
c->old_axis.x_min,
c->old_axis.y_min,
c->old_axis.x_max,
c->old_axis.y_max);
/* Which monitor are we on? */
/* Move to correct screen */
if (screen == NULL)
screen = gdk_screen_get_default ();
/*int num_monitors = screen->get_n_monitors(); TODO, multiple monitors?*/
gdk_screen_get_monitor_geometry(screen, 0, &rect);
calib_area = calibration_area_new (c);
gdk_screen_get_monitor_geometry (screen, monitor, &rect);
gtk_window_move (GTK_WINDOW (calib_area->window), rect.x, rect.y);
gtk_window_set_default_size (GTK_WINDOW (calib_area->window), rect.width, rect.height);
gtk_widget_show_all (calib_area->window);
gtk_main();
return calib_area;
}
g_source_remove (calib_area->anim_id);
/* Finishes the calibration. Note that CalibArea
* needs to be destroyed with calib_area_free() afterwards */
gboolean
calib_area_finish (CalibArea *area,
XYinfo *new_axis,
gboolean *swap_xy)
{
gboolean success;
success = finish(calib_area->calibrator, calib_area->display_width, calib_area->display_height, new_axis, swap);
g_return_val_if_fail (area != NULL, FALSE);
g_free (calib_area);
success = finish (&area->calibrator, area->display_width, area->display_height, new_axis, swap_xy);
if (success)
g_debug ("Final calibration: %d, %d, %d, %d\n",
@ -405,3 +432,16 @@ run_gui(struct Calib *c,
return success;
}
void
calib_area_free (CalibArea *area)
{
g_return_if_fail (area != NULL);
if (area->anim_id > 0) {
g_source_remove (area->anim_id);
area->anim_id = 0;
}
gtk_widget_destroy (area->window);
g_free (area);
}

26
panels/wacom/calibrator/gui_gtk.h
View file

@ -26,10 +26,30 @@
#include <gtk/gtk.h>
#include "calibrator.h"
/* struct to hold min/max info of the X and Y axis */
typedef struct
{
int x_min;
int x_max;
int y_min;
int y_max;
} XYinfo;
gboolean run_gui (struct Calib *c,
typedef struct CalibArea CalibArea;
typedef void (*FinishCallback) (CalibArea *area, gpointer user_data);
CalibArea * calib_area_new (GdkScreen *screen,
int monitor,
FinishCallback callback,
gpointer user_data,
XYinfo *old_axis,
int threshold_doubleclick,
int threshold_misclick);
gboolean calib_area_finish (CalibArea *area,
XYinfo *new_axis,
gboolean *swap);
gboolean *swap_xy);
void calib_area_free (CalibArea *area);
#endif /* _gui_gtk_h */