demo: Add ability to cancel capture operation

demo/gtk-libfprint-test.c

@@ -39,10 +39,13 @@ typedef struct {
 	GtkWidget *header_bar;
 	GtkWidget *mode_stack;
 	GtkWidget *capture_button;
+	GtkWidget *cancel_button;
 	GtkWidget *capture_image;
 	GtkWidget *spinner;
 	GtkWidget *instructions;
 
+	GCancellable *cancellable;
+
 	gboolean opened;
 	FpDevice *dev;
 
@@ -219,10 +222,13 @@ dev_capture_start_cb (FpDevice *dev,
 	LibfprintDemoWindow *win = user_data;
 	FpImage *image = NULL;
 
+	g_clear_object (&win->cancellable);
+
 	image = fp_device_capture_finish (dev, res, &error);
 	if (!image) {
 		g_warning ("Error capturing data: %s", error->message);
-		if (error->domain == FP_DEVICE_RETRY)
+		if (error->domain == FP_DEVICE_RETRY ||
+		    g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
 			libfprint_demo_set_mode (win, RETRY_MODE);
 		else
 			libfprint_demo_set_mode (win, ERROR_MODE);
@@ -241,7 +247,7 @@ dev_start_capture (LibfprintDemoWindow *win)
 {
 	libfprint_demo_set_capture_label (win);
 
-	fp_device_capture (win->dev, TRUE, NULL, (GAsyncReadyCallback) dev_capture_start_cb, win);
+	fp_device_capture (win->dev, TRUE, win->cancellable, (GAsyncReadyCallback) dev_capture_start_cb, win);
 }
 
 static void
@@ -269,6 +275,9 @@ activate_capture (GSimpleAction *action,
 	libfprint_demo_set_mode (win, SPINNER_MODE);
 	g_clear_pointer (&win->img, g_object_unref);
 
+	g_clear_object (&win->cancellable);
+	win->cancellable = g_cancellable_new ();
+
 	if (win->opened) {
 		dev_start_capture (win);
 		return;
@@ -277,7 +286,20 @@ activate_capture (GSimpleAction *action,
 	libfprint_demo_set_spinner_label (win, "Opening fingerprint reader");
 
 	win->opened = TRUE;
-	fp_device_open (win->dev, NULL, (GAsyncReadyCallback) dev_open_cb, user_data);
+	fp_device_open (win->dev, win->cancellable, (GAsyncReadyCallback) dev_open_cb, user_data);
+}
+
+static void
+cancel_capture (GSimpleAction *action,
+		GVariant      *parameter,
+		gpointer       user_data)
+{
+	LibfprintDemoWindow *win = user_data;
+
+	g_debug ("cancelling %p", win->cancellable);
+
+	if (win->cancellable)
+		g_cancellable_cancel (win->cancellable);
 }
 
 static void
@@ -368,7 +390,8 @@ static GActionEntry app_entries[] = {
 static GActionEntry win_entries[] = {
 	{ "show-minutiae", activate_show_minutiae, NULL, "false", change_show_minutiae_state },
 	{ "show-binary", activate_show_binary, NULL, "false", change_show_binary_state },
-	{ "capture", activate_capture, NULL, NULL, NULL }
+	{ "capture", activate_capture, NULL, NULL, NULL },
+	{ "cancel", cancel_capture, NULL, NULL, NULL }
 };
 
 static void
@@ -392,16 +415,19 @@ libfprint_demo_set_mode (LibfprintDemoWindow *win,
 	case EMPTY_MODE:
 		gtk_stack_set_visible_child_name (GTK_STACK (win->mode_stack), "empty-mode");
 		gtk_widget_set_sensitive (win->capture_button, FALSE);
+		gtk_widget_set_sensitive (win->cancel_button, FALSE);
 		gtk_spinner_stop (GTK_SPINNER (win->spinner));
 		break;
 	case NOIMAGING_MODE:
 		gtk_stack_set_visible_child_name (GTK_STACK (win->mode_stack), "noimaging-mode");
 		gtk_widget_set_sensitive (win->capture_button, FALSE);
+		gtk_widget_set_sensitive (win->cancel_button, FALSE);
 		gtk_spinner_stop (GTK_SPINNER (win->spinner));
 		break;
 	case CAPTURE_MODE:
 		gtk_stack_set_visible_child_name (GTK_STACK (win->mode_stack), "capture-mode");
 		gtk_widget_set_sensitive (win->capture_button, TRUE);
+		gtk_widget_set_sensitive (win->cancel_button, FALSE);
 
 		title = g_strdup_printf ("%s Test", fp_device_get_name (win->dev));
 		gtk_header_bar_set_title (GTK_HEADER_BAR (win->header_bar), title);
@@ -412,16 +438,19 @@ libfprint_demo_set_mode (LibfprintDemoWindow *win,
 	case SPINNER_MODE:
 		gtk_stack_set_visible_child_name (GTK_STACK (win->mode_stack), "spinner-mode");
 		gtk_widget_set_sensitive (win->capture_button, FALSE);
+		gtk_widget_set_sensitive (win->cancel_button, TRUE);
 		gtk_spinner_start (GTK_SPINNER (win->spinner));
 		break;
 	case ERROR_MODE:
 		gtk_stack_set_visible_child_name (GTK_STACK (win->mode_stack), "error-mode");
 		gtk_widget_set_sensitive (win->capture_button, FALSE);
+		gtk_widget_set_sensitive (win->cancel_button, FALSE);
 		gtk_spinner_stop (GTK_SPINNER (win->spinner));
 		break;
 	case RETRY_MODE:
 		gtk_stack_set_visible_child_name (GTK_STACK (win->mode_stack), "retry-mode");
 		gtk_widget_set_sensitive (win->capture_button, TRUE);
+		gtk_widget_set_sensitive (win->cancel_button, FALSE);
 		gtk_spinner_stop (GTK_SPINNER (win->spinner));
 		break;
 	default:
@@ -490,6 +519,7 @@ libfprint_demo_window_class_init (LibfprintDemoWindowClass *class)
 	gtk_widget_class_bind_template_child (widget_class, LibfprintDemoWindow, header_bar);
 	gtk_widget_class_bind_template_child (widget_class, LibfprintDemoWindow, mode_stack);
 	gtk_widget_class_bind_template_child (widget_class, LibfprintDemoWindow, capture_button);
+	gtk_widget_class_bind_template_child (widget_class, LibfprintDemoWindow, cancel_button);
 	gtk_widget_class_bind_template_child (widget_class, LibfprintDemoWindow, capture_image);
 	gtk_widget_class_bind_template_child (widget_class, LibfprintDemoWindow, spinner);
 	gtk_widget_class_bind_template_child (widget_class, LibfprintDemoWindow, instructions);

demo/gtk-libfprint-test.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <template class="LibfprintDemoWindow" parent="GtkApplicationWindow">
@@ -7,59 +7,6 @@
     <property name="default_width">500</property>
     <property name="default_height">400</property>
     <property name="show_menubar">False</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header_bar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="title">Fingerprint Reader Test</property>
-        <property name="subtitle">Capture test</property>
-        <property name="show_close_button">True</property>
-        <child>
-          <object class="GtkMenuButton" id="option-menu-button">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="valign">center</property>
-            <property name="menu-model">options-menu</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">open-menu-symbolic</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="capture_button">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="valign">center</property>
-            <property name="action_name">win.capture</property>
-            <child>
-              <object class="GtkLabel" id="capture_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Capture</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-            <style>
-              <class name="text-button"/>
-            </style>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
     <child>
       <object class="GtkStack" id="mode_stack">
         <property name="visible">True</property>
@@ -104,9 +51,6 @@
             <child>
               <placeholder/>
             </child>
-            <child>
-              <placeholder/>
-            </child>
             <style>
               <class name="dim-label"/>
             </style>
@@ -116,70 +60,6 @@
             <property name="title">spinner-mode</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkGrid" id="empty-mode">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="orientation">vertical</property>
-            <property name="row_spacing">12</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">9</property>
-                <property name="pixel_size">192</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">9</property>
-                <property name="label" translatable="yes">&lt;b&gt;&lt;span size="large"&gt;No fingerprint readers found&lt;/span&gt;&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Please connect a supported fingerprint reader and start the application again</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="name">empty-mode</property>
-            <property name="title">empty-mode</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkAspectFrame" id="capture-mode">
             <property name="visible">True</property>
@@ -200,72 +80,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkGrid" id="error-mode">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="orientation">vertical</property>
-            <property name="row_spacing">12</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">9</property>
-                <property name="pixel_size">192</property>
-                <property name="icon_name">dialog-warning-symbolic</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">9</property>
-                <property name="label" translatable="yes">&lt;b&gt;&lt;span size="large"&gt;An error occurred trying to access the fingerprint reader&lt;/span&gt;&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Please consult the debugging output before restarting the application</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="name">error-mode</property>
-            <property name="title">error-mode</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkGrid" id="retry-mode">
             <property name="visible">True</property>
@@ -302,6 +116,12 @@
                 <property name="top_attach">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
             <style>
               <class name="dim-label"/>
             </style>
@@ -378,6 +198,216 @@
             <property name="position">3</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkGrid" id="error-mode">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <property name="row_spacing">12</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_bottom">9</property>
+                <property name="pixel_size">192</property>
+                <property name="icon_name">dialog-warning-symbolic</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">9</property>
+                <property name="label" translatable="yes">&lt;b&gt;&lt;span size="large"&gt;An error occurred trying to access the fingerprint reader&lt;/span&gt;&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Please consult the debugging output before restarting the application</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <style>
+              <class name="dim-label"/>
+            </style>
+          </object>
+          <packing>
+            <property name="name">error-mode</property>
+            <property name="title">error-mode</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="empty-mode">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <property name="row_spacing">12</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_bottom">9</property>
+                <property name="pixel_size">192</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">9</property>
+                <property name="label" translatable="yes">&lt;b&gt;&lt;span size="large"&gt;No fingerprint readers found&lt;/span&gt;&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Please connect a supported fingerprint reader and start the application again</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <style>
+              <class name="dim-label"/>
+            </style>
+          </object>
+          <packing>
+            <property name="name">empty-mode</property>
+            <property name="title">empty-mode</property>
+            <property name="position">5</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header_bar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title">Fingerprint Reader Test</property>
+        <property name="subtitle">Capture test</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkMenuButton" id="option-menu-button">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="valign">center</property>
+            <property name="menu-model">options-menu</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">open-menu-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="cancel_button">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="valign">center</property>
+            <property name="action_name">win.cancel</property>
+            <child>
+              <object class="GtkLabel" id="cancel_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <style>
+              <class name="text-button"/>
+            </style>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="capture_button">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="valign">center</property>
+            <property name="action_name">win.capture</property>
+            <child>
+              <object class="GtkLabel" id="capture_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Capture</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <style>
+              <class name="text-button"/>
+            </style>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
   </template>