wifi: Add HotSpot QR code support

When wifi hotspots are created generate a QR code
so that supported devices can connect to the hotspot
by simply scanning the QR code image

panels/network/cc-qr-code.c

@@ -0,0 +1,197 @@
+/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*- */
+/* cc-qr-code.c
+ *
+ * Copyright 2019 Purism SPC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author(s):
+ *   Mohammed Sadiq <sadiq@sadiqpk.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "cc-qr-code"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "cc-qr-code.h"
+#include "qrcodegen.c"
+
+/**
+ * SECTION: cc-qr_code
+ * @title: CcQrCode
+ * @short_description: A Simple QR Code wrapper around libqrencode
+ * @include: "cc-qr-code.h"
+ *
+ * Generate a QR image from a given text.
+ */
+
+struct _CcQrCode
+{
+  GObject          parent_instance;
+
+  gchar           *text;
+  cairo_surface_t *surface;
+  gint             size;
+  gint             scale;
+};
+
+G_DEFINE_TYPE (CcQrCode, cc_qr_code, G_TYPE_OBJECT)
+
+
+static void
+cc_qr_code_finalize (GObject *object)
+{
+  CcQrCode *self = (CcQrCode *)object;
+
+  g_clear_pointer (&self->surface, cairo_surface_destroy);
+  g_clear_pointer (&self->text, g_free);
+
+  G_OBJECT_CLASS (cc_qr_code_parent_class)->finalize (object);
+}
+
+static void
+cc_qr_code_class_init (CcQrCodeClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = cc_qr_code_finalize;
+}
+
+static void
+cc_qr_code_init (CcQrCode *self)
+{
+}
+
+CcQrCode *
+cc_qr_code_new (void)
+{
+  return g_object_new (CC_TYPE_QR_CODE, NULL);
+}
+
+gboolean
+cc_qr_code_set_text (CcQrCode    *self,
+                     const gchar *text)
+{
+  g_return_val_if_fail (CC_IS_QR_CODE (self), FALSE);
+  g_return_val_if_fail (!text || *text, FALSE);
+
+  if (g_strcmp0 (text, self->text) == 0)
+    return FALSE;
+
+  /* Clear cairo surface that is cached */
+  g_clear_pointer (&self->surface, cairo_surface_destroy);
+  g_free (self->text);
+  self->text = g_strdup (text);
+
+  return TRUE;
+}
+
+static void
+cc_cairo_fill_pixel (cairo_t *cr,
+                     int      x,
+                     int      y,
+                     int      padding,
+                     int      scale)
+{
+  cairo_rectangle (cr,
+                   x * scale + padding,
+                   y * scale + padding,
+                   scale, scale);
+  cairo_fill (cr);
+}
+
+cairo_surface_t *
+cc_qr_code_get_surface (CcQrCode *self,
+                        gint      size,
+                        gint      scale)
+{
+  uint8_t qr_code[qrcodegen_BUFFER_LEN_FOR_VERSION (qrcodegen_VERSION_MAX)];
+  uint8_t temp_buf[qrcodegen_BUFFER_LEN_FOR_VERSION (qrcodegen_VERSION_MAX)];
+  cairo_t *cr;
+  gint pixel_size, padding, qr_size;
+  gboolean success = FALSE;
+
+  g_return_val_if_fail (CC_IS_QR_CODE (self), NULL);
+  g_return_val_if_fail (size > 0, NULL);
+  g_return_val_if_fail (scale > 0, NULL);
+
+  if (!self->text || !*self->text)
+    {
+      g_warn_if_reached ();
+      cc_qr_code_set_text (self, "invalid text");
+    }
+
+  if (self->surface &&
+      self->size == size &&
+      self->scale == scale)
+    return self->surface;
+
+  self->size  = size;
+  self->scale = scale;
+  g_clear_pointer (&self->surface, cairo_surface_destroy);
+
+  success = qrcodegen_encodeText (self->text,
+                                  temp_buf,
+                                  qr_code,
+                                  qrcodegen_Ecc_LOW,
+                                  qrcodegen_VERSION_MIN,
+                                  qrcodegen_VERSION_MAX,
+                                  qrcodegen_Mask_AUTO,
+                                  FALSE);
+
+  if (!success)
+    return NULL;
+
+  self->surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, size * scale, size * scale);
+  cairo_surface_set_device_scale (self->surface, scale, scale);
+  cr = cairo_create (self->surface);
+  cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+
+  /* Draw white background */
+  cairo_set_source_rgba (cr, 1, 1, 1, 1);
+  cairo_rectangle (cr, 0, 0, size * scale, size * scale);
+  cairo_fill (cr);
+
+  qr_size = qrcodegen_getSize(qr_code);
+  pixel_size = MAX (1, size / (qr_size));
+  padding = (size - qr_size * pixel_size) / 2;
+
+  /* If subpixel size is big and margin is pretty small,
+   * increase the margin */
+  if (pixel_size > 4 && padding < 12)
+    {
+      pixel_size--;
+      padding = (size - qr_size * pixel_size) / 2;
+    }
+
+  /* Now draw the black QR code pixels */
+  cairo_set_source_rgba (cr, 0, 0, 0, 1);
+  for (int row = 0; row < qr_size; row++)
+    {
+      for (int column = 0; column < qr_size; column++)
+        {
+          if (qrcodegen_getModule (qr_code, row, column))
+            cc_cairo_fill_pixel (cr, column, row, padding, pixel_size);
+        }
+    }
+
+  cairo_destroy (cr);
+
+  return self->surface;
+}

panels/network/cc-qr-code.h

@@ -0,0 +1,43 @@
+/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*- */
+/* cc-qr-code.h
+ *
+ * Copyright 2019 Purism SPC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author(s):
+ *   Mohammed Sadiq <sadiq@sadiqpk.org>
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#pragma once
+
+#include <glib-object.h>
+#include <cairo.h>
+
+G_BEGIN_DECLS
+
+#define CC_TYPE_QR_CODE (cc_qr_code_get_type ())
+
+G_DECLARE_FINAL_TYPE (CcQrCode, cc_qr_code, CC, QR_CODE, GObject)
+
+CcQrCode        *cc_qr_code_new         (void);
+gboolean         cc_qr_code_set_text    (CcQrCode    *self,
+                                         const gchar *text);
+cairo_surface_t *cc_qr_code_get_surface (CcQrCode    *self,
+                                         gint         size,
+                                         gint         scale);
+
+G_END_DECLS

panels/network/cc-wifi-panel.c

@@ -19,8 +19,10 @@
 
 #include "cc-network-resources.h"
 #include "cc-wifi-panel.h"
+#include "cc-qr-code.h"
 #include "net-device-wifi.h"
 #include "network-dialogs.h"
+#include "panel-common.h"
 
 #include "shell/cc-application.h"
 #include "shell/cc-debug.h"
@@ -29,6 +31,8 @@
 #include <glib/gi18n.h>
 #include <NetworkManager.h>
 
+#define QR_IMAGE_SIZE 180
+
 typedef enum
 {
   OPERATION_NULL,
@@ -50,9 +54,13 @@ struct _CcWifiPanel
   /* Main widgets */
   GtkStack           *center_stack;
   GtkStack           *header_stack;
+  GtkBox             *hotspot_box;
+  GtkLabel           *list_label;
   GtkStack           *main_stack;
   GtkWidget          *spinner;
   GtkStack           *stack;
+  GtkImage           *wifi_qr_image;
+  CcQrCode           *qr_code;
 
   NMClient           *client;
 
@@ -141,6 +149,225 @@ cc_wifi_panel_static_init_func (void)
 
 /* Auxiliary methods */
 
+static gchar *
+escape_string (const gchar *str,
+               gboolean     quote)
+{
+  GString *string;
+  const char *next;
+
+  if (!str)
+    return NULL;
+
+  string = g_string_new ("");
+  if (quote)
+    g_string_append_c (string, '"');
+
+  while ((next = strpbrk (str, "\\;,:\"")))
+    {
+      g_string_append_len (string, str, next - str);
+      g_string_append_c (string, '\\');
+      g_string_append_c (string, *next);
+      str = next + 1;
+    }
+
+  g_string_append (string, str);
+  if (quote)
+    g_string_append_c (string, '"');
+
+  return g_string_free (string, FALSE);
+}
+
+static const gchar *
+get_connection_security_type (NMConnection *c)
+{
+  NMSettingWirelessSecurity *setting;
+  const char *key_mgmt;
+
+  g_return_val_if_fail (c, "nopass");
+
+  setting = nm_connection_get_setting_wireless_security (c);
+
+  if (!setting)
+    return "nopass";
+
+  key_mgmt = nm_setting_wireless_security_get_key_mgmt (setting);
+
+  /* No IEEE 802.1x */
+  if (g_strcmp0 (key_mgmt, "none") == 0)
+    return "WEP";
+
+  if (g_strcmp0 (key_mgmt, "wpa-none") == 0 ||
+      g_strcmp0 (key_mgmt, "wpa-psk") == 0)
+    return "WPA";
+
+  return "nopass";
+}
+
+static gchar *
+get_wifi_password (NMConnection *c)
+{
+  NMSettingWirelessSecurity *setting;
+  g_autoptr(GVariant) secrets = NULL;
+  g_autoptr(GError) error = NULL;
+  const gchar *sec_type, *password;
+  gint wep_index;
+
+  g_assert (NM_IS_REMOTE_CONNECTION (c));
+
+  sec_type = get_connection_security_type (c);
+  setting  = nm_connection_get_setting_wireless_security (c);
+
+  if (g_str_equal (sec_type, "nopass"))
+    return NULL;
+
+  secrets = nm_remote_connection_get_secrets (NM_REMOTE_CONNECTION (c),
+                                              NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+                                              NULL, &error);
+  if (!error)
+    nm_connection_update_secrets (c,
+                                  NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+                                  secrets, &error);
+  if (error)
+    {
+      g_warning ("Error: %s", error->message);
+      return NULL;
+    }
+
+  if (g_str_equal (sec_type, "WEP"))
+    {
+      wep_index = nm_setting_wireless_security_get_wep_tx_keyidx (setting);
+      password = nm_setting_wireless_security_get_wep_key (setting, wep_index);
+    }
+  else
+    {
+      password = nm_setting_wireless_security_get_psk (setting);
+    }
+
+  return escape_string (password, FALSE);
+}
+
+/* Generate a string representing the hotspot @connection
+ * An example generated text:
+ *     WIFI:S:hotspot;T:WPA;P:my-valid-pass;H:true;
+ * Where,
+ *   S = ssid, T = security, P = password, H = hidden (Optional)
+ *
+ * See https://github.com/zxing/zxing/wiki/Barcode-Contents#wi-fi-network-config-android-ios-11
+ */
+static gchar *
+get_qr_string_for_hotspot (NMClient     *nm_client,
+                           NMConnection *c)
+{
+  NMSettingWireless *setting;
+  g_autofree char *ssid_text = NULL;
+  g_autofree char *escaped_ssid = NULL;
+  g_autofree char *password_str = NULL;
+  GString *string;
+  GBytes *ssid;
+  gboolean hidden;
+
+  g_assert (NM_IS_CLIENT (nm_client));
+  g_assert (NM_IS_REMOTE_CONNECTION (c));
+
+  setting = nm_connection_get_setting_wireless (c);
+  ssid = nm_setting_wireless_get_ssid (setting);
+
+  if (!ssid)
+    return NULL;
+
+  string = g_string_new ("WIFI:S:");
+
+  /* SSID */
+  ssid_text = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
+                                     g_bytes_get_size (ssid));
+  escaped_ssid = escape_string (ssid_text, FALSE);
+  g_string_append (string, escaped_ssid);
+  g_string_append_c (string, ';');
+
+  /* Security type */
+  g_string_append (string, "T:");
+  g_string_append (string, get_connection_security_type (c));
+  g_string_append_c (string, ';');
+
+  /* Password */
+  g_string_append (string, "P:");
+  password_str = get_wifi_password (c);
+  if (password_str)
+    g_string_append (string, password_str);
+  g_string_append_c (string, ';');
+
+  /* WiFi Hidden */
+  hidden = nm_setting_wireless_get_hidden (setting);
+  if (hidden)
+    g_string_append (string, "H:true");
+  g_string_append_c (string, ';');
+
+  return g_string_free (string, FALSE);
+}
+
+static NMConnection *
+wifi_device_get_hotspot (CcWifiPanel *self,
+                         NMDevice    *device)
+{
+  NMSettingIPConfig *ip4_setting;
+  NMConnection *c;
+
+  g_assert (CC_IS_WIFI_PANEL (self));
+  g_assert (NM_IS_DEVICE (device));
+
+  if (nm_device_get_active_connection (device) == NULL)
+    return NULL;
+
+  c = net_device_get_find_connection (self->client, device);
+  if (c == NULL)
+    return NULL;
+
+  ip4_setting = nm_connection_get_setting_ip4_config (c);
+  if (g_strcmp0 (nm_setting_ip_config_get_method (ip4_setting),
+                 NM_SETTING_IP4_CONFIG_METHOD_SHARED) != 0)
+    return NULL;
+
+  return c;
+}
+
+static void
+wifi_panel_update_qr_image_cb (CcWifiPanel *self)
+{
+  NetDeviceWifi *child;
+  NMConnection *hotspot;
+  NMDevice *device;
+
+  g_assert (CC_IS_WIFI_PANEL (self));
+
+  child  = NET_DEVICE_WIFI (gtk_stack_get_visible_child (self->stack));
+  device = net_device_wifi_get_device (child);
+  hotspot = wifi_device_get_hotspot (self, device);
+
+  if (hotspot)
+    {
+      g_autofree gchar *str = NULL;
+
+      if (!self->qr_code)
+        self->qr_code = cc_qr_code_new ();
+
+      str = get_qr_string_for_hotspot (self->client, hotspot);
+      if (cc_qr_code_set_text (self->qr_code, str))
+        {
+          cairo_surface_t *surface;
+          gint scale;
+
+          scale = gtk_widget_get_scale_factor (GTK_WIDGET (self->wifi_qr_image));
+          surface = cc_qr_code_get_surface (self->qr_code, QR_IMAGE_SIZE, scale);
+          gtk_image_set_from_surface (self->wifi_qr_image, surface);
+        }
+    }
+
+  gtk_widget_set_visible (GTK_WIDGET (self->hotspot_box), hotspot != NULL);
+  gtk_widget_set_opacity (GTK_WIDGET (self->list_label), hotspot == NULL);
+  gtk_widget_set_opacity (GTK_WIDGET (self->spinner), hotspot == NULL);
+}
+
 static void
 add_wifi_device (CcWifiPanel *self,
                  NMDevice    *device)
@@ -168,6 +395,10 @@ add_wifi_device (CcWifiPanel *self,
   gtk_stack_add_titled (self->stack, GTK_WIDGET (net_device),
                         nm_device_get_udi (device),
                         nm_device_get_description (device));
+  g_signal_connect_object (device, "state-changed",
+                           G_CALLBACK (wifi_panel_update_qr_image_cb),
+                           self,
+                           G_CONNECT_SWAPPED);
 }
 
 static void
@@ -593,6 +824,8 @@ on_stack_visible_child_changed_cb (GtkStack    *stack,
   const gchar *visible_device_id = NULL;
   guint i;
 
+  wifi_panel_update_qr_image_cb (self);
+
   /* Remove previous bindings */
   g_clear_pointer (&self->spinner_binding, g_binding_unbind);
 
@@ -613,6 +846,39 @@ on_stack_visible_child_changed_cb (GtkStack    *stack,
     }
 }
 
+static void
+hotspot_stop_clicked_cb (CcWifiPanel *self)
+{
+  GtkWidget *dialog;
+  GtkWidget *window;
+  int response;
+
+  g_assert (CC_IS_WIFI_PANEL (self));
+
+  window = gtk_widget_get_toplevel (GTK_WIDGET (self));
+  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_OTHER,
+                                   GTK_BUTTONS_NONE,
+                                   _("Stop hotspot and disconnect any users?"));
+  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                          _("_Cancel"), GTK_RESPONSE_CANCEL,
+                          _("_Stop Hotspot"), GTK_RESPONSE_OK,
+                          NULL);
+
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+  if (response == GTK_RESPONSE_OK)
+    {
+      NetDeviceWifi *child;
+
+      child = NET_DEVICE_WIFI (gtk_stack_get_visible_child (self->stack));
+      net_device_wifi_turn_off_hotspot (child);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
 /* Overrides */
 
 static const gchar *
@@ -744,14 +1010,18 @@ cc_wifi_panel_class_init (CcWifiPanelClass *klass)
 
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, center_stack);
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, header_stack);
+  gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, hotspot_box);
+  gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, list_label);
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, main_stack);
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, rfkill_switch);
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, rfkill_widget);
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, spinner);
   gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, stack);
+  gtk_widget_class_bind_template_child (widget_class, CcWifiPanel, wifi_qr_image);
 
   gtk_widget_class_bind_template_callback (widget_class, rfkill_switch_notify_activate_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_stack_visible_child_changed_cb);
+  gtk_widget_class_bind_template_callback (widget_class, hotspot_stop_clicked_cb);
 
   g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters");
 }

panels/network/cc-wifi-panel.ui

@@ -211,6 +211,60 @@
                         <property name="can-focus">False</property>
                         <property name="orientation">vertical</property>
 
+                        <child>
+                          <object class="GtkBox" id="hotspot_box">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+
+                            <!-- Hotspot QR code -->
+                            <child>
+                              <object class="GtkImage" id="wifi_qr_image">
+                                <property name="visible">True</property>
+                                <property name="halign">center</property>
+                                <property name="width-request">180</property>
+                                <property name="height-request">180</property>
+                                <style>
+                                  <class name="frame"/>
+                                </style>
+                              </object>
+                            </child>
+
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="margin-top">12</property>
+                                <property name="label" translatable="yes">Wi-Fi Hotspot Active</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold" />
+                                  <attribute name="scale" value="1.8" />
+                                </attributes>
+                              </object>
+                            </child>
+
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Mobile devices can scan the QR code to connect.</property>
+                              </object>
+                            </child>
+
+                            <child>
+                              <object class="GtkButton">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="halign">center</property>
+                                <property name="margin-top">12</property>
+                                <property name="label" translatable="yes">Turn Off Hotspot…</property>
+                                <signal name="clicked" handler="hotspot_stop_clicked_cb" swapped="yes"/>
+                                <style>
+                                  <class name="destructive-action"/>
+                                </style>
+                              </object>
+                            </child>
+
+                          </object>
+                        </child>
+
                         <!-- Visible Networks label & spinner -->
                         <child>
                           <object class="GtkBox">
@@ -220,7 +274,7 @@
                             <property name="spacing">6</property>
                             <property name="margin_bottom">12</property>
                             <child>
-                              <object class="GtkLabel">
+                              <object class="GtkLabel" id="list_label">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Visible Networks</property>
                                 <property name="xalign">0.0</property>
@@ -257,6 +311,7 @@
                             </child>
                           </object>
                         </child>
+
                       </object>
                       <packing>
                         <property name="name">wifi-connections</property>

panels/network/meson.build

@@ -36,6 +36,7 @@ foreach name: panel_names
 endforeach
 
 sources = files(
+  'cc-qr-code.c',
   'cc-network-panel.c',
   'cc-wifi-connection-row.c',
   'cc-wifi-connection-list.c',

panels/network/net-device-wifi.c

@@ -34,6 +34,7 @@
 #include "hostname-helper.h"
 #include "network-dialogs.h"
 #include "panel-common.h"
+#include "cc-list-row.h"
 
 #include "connection-editor/net-connection-editor.h"
 #include "net-device-wifi.h"
@@ -59,13 +60,9 @@ struct _NetDeviceWifi
         GtkSwitch               *device_off_switch;
         GtkBox                  *header_box;
         GtkBox                  *hotspot_box;
-        GtkLabel                *hotspot_network_name_heading_label;
+        CcListRow               *hotspot_name_row;
-        GtkLabel                *hotspot_network_name_label;
+        CcListRow               *hotspot_security_row;
-        GtkSwitch               *hotspot_off_switch;
+        CcListRow               *hotspot_password_row;
-        GtkLabel                *hotspot_security_heading_label;
-        GtkLabel                *hotspot_security_key_heading_label;
-        GtkLabel                *hotspot_security_key_label;
-        GtkLabel                *hotspot_security_label;
         GtkBox                  *listbox_box;
         GtkButton               *start_hotspot_button;
         GtkLabel                *status_label;
@@ -277,17 +274,14 @@ nm_device_wifi_refresh_hotspot (NetDeviceWifi *self)
         g_debug ("Refreshing hotspot labels to name: '%s', security key: '%s', security: '%s'",
                  hotspot_ssid, hotspot_secret, hotspot_security);
 
-        gtk_label_set_label (self->hotspot_network_name_label, hotspot_ssid);
+        cc_list_row_set_secondary_label (self->hotspot_name_row, hotspot_ssid);
-        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_network_name_heading_label), hotspot_ssid != NULL);
+        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_name_row), hotspot_ssid != NULL);
-        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_network_name_label), hotspot_ssid != NULL);
 
-        gtk_label_set_label (self->hotspot_security_key_label, hotspot_secret);
+        cc_list_row_set_secondary_label (self->hotspot_password_row, hotspot_secret);
-        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_security_key_heading_label), hotspot_secret != NULL);
+        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_password_row), hotspot_secret != NULL);
-        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_security_key_label), hotspot_secret != NULL);
 
-        gtk_label_set_label (self->hotspot_security_label, hotspot_security);
+        cc_list_row_set_secondary_label (self->hotspot_security_row, hotspot_security);
-        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_security_heading_label), hotspot_security != NULL);
+        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_security_row), hotspot_security != NULL);
-        gtk_widget_set_visible (GTK_WIDGET (self->hotspot_security_label), hotspot_security != NULL);
 }
 
 static void
@@ -589,11 +583,6 @@ show_hotspot_ui (NetDeviceWifi *self)
 {
         /* show hotspot tab */
         gtk_stack_set_visible_child (GTK_STACK (self), GTK_WIDGET (self->hotspot_box));
-
-        /* force switch to on as this succeeded */
-        self->updating_device = TRUE;
-        gtk_switch_set_active (self->hotspot_off_switch, TRUE);
-        self->updating_device = FALSE;
 }
 
 static void
@@ -756,52 +745,12 @@ stop_shared_connection (NetDeviceWifi *self)
 
         if (!found) {
                 g_warning ("Could not stop hotspot connection as no connection attached to the device could be found.");
-                self->updating_device = TRUE;
-                gtk_switch_set_active (self->hotspot_off_switch, TRUE);
-                self->updating_device = FALSE;
                 return;
         }
 
         nm_device_wifi_refresh_ui (self);
 }
 
-static void
-stop_hotspot_response_cb (NetDeviceWifi *self, gint response, GtkWidget *dialog)
-{
-        if (response == GTK_RESPONSE_OK) {
-                stop_shared_connection (self);
-        } else {
-                self->updating_device = TRUE;
-                gtk_switch_set_active (self->hotspot_off_switch, TRUE);
-                self->updating_device = FALSE;
-        }
-        gtk_widget_destroy (dialog);
-}
-
-static void
-hotspot_off_switch_changed_cb (NetDeviceWifi *self)
-{
-        GtkWidget *dialog;
-        GtkWidget *window;
-
-        if (self->updating_device)
-                return;
-
-        window = gtk_widget_get_toplevel (GTK_WIDGET (self));
-        dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_MESSAGE_OTHER,
-                                         GTK_BUTTONS_NONE,
-                                         _("Stop hotspot and disconnect any users?"));
-        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                                _("_Cancel"), GTK_RESPONSE_CANCEL,
-                                _("_Stop Hotspot"), GTK_RESPONSE_OK,
-                                NULL);
-        g_signal_connect_object (dialog, "response",
-                                 G_CALLBACK (stop_hotspot_response_cb), self, G_CONNECT_SWAPPED);
-        gtk_window_present (GTK_WINDOW (dialog));
-}
-
 static void
 show_wifi_list (NetDeviceWifi *self)
 {
@@ -1203,13 +1152,9 @@ net_device_wifi_class_init (NetDeviceWifiClass *klass)
         gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, device_off_switch);
         gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, header_box);
         gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_box);
-        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_network_name_heading_label);
+        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_name_row);
-        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_network_name_label);
+        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_security_row);
-        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_off_switch);
+        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_password_row);
-        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_security_heading_label);
-        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_security_key_heading_label);
-        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_security_key_label);
-        gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, hotspot_security_label);
         gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, listbox_box);
         gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, start_hotspot_button);
         gtk_widget_class_bind_template_child (widget_class, NetDeviceWifi, status_label);
@@ -1218,7 +1163,6 @@ net_device_wifi_class_init (NetDeviceWifiClass *klass)
         gtk_widget_class_bind_template_callback (widget_class, connect_hidden_button_clicked_cb);
         gtk_widget_class_bind_template_callback (widget_class, device_off_switch_changed_cb);
         gtk_widget_class_bind_template_callback (widget_class, history_button_clicked_cb);
-        gtk_widget_class_bind_template_callback (widget_class, hotspot_off_switch_changed_cb);
         gtk_widget_class_bind_template_callback (widget_class, start_hotspot_button_clicked_cb);
 }
 
@@ -1305,3 +1249,11 @@ net_device_wifi_get_title_widget (NetDeviceWifi *self)
         g_return_val_if_fail (NET_IS_DEVICE_WIFI (self), NULL);
         return GTK_WIDGET (self->center_box);
 }
+
+void
+net_device_wifi_turn_off_hotspot (NetDeviceWifi *self)
+{
+        g_return_if_fail (NET_IS_DEVICE_WIFI (self));
+
+        stop_shared_connection (self);
+}

panels/network/net-device-wifi.h

@@ -42,5 +42,7 @@ GtkWidget     *net_device_wifi_get_header_widget (NetDeviceWifi *device);
 
 GtkWidget     *net_device_wifi_get_title_widget  (NetDeviceWifi *device);
 
+void           net_device_wifi_turn_off_hotspot  (NetDeviceWifi *self);
+
 G_END_DECLS
 

panels/network/network-wifi.ui

@@ -7,216 +7,36 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="height-request">140</property>
       </object>
     </child>
+
+    <!-- Wi-Fi Hotspot deails -->
     <child>
-      <object class="GtkBox" id="hotspot_box">
+      <object class="GtkListBox" id="hotspot_box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="selection-mode">none</property>
-        <property name="border_width">12</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">9</property>
         <child>
-          <object class="GtkBox">
+          <object class="CcListRow" id="hotspot_name_row">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="title" context="Wi-Fi Hotspot" translatable="yes">Network Name</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Wi-Fi Hotspot</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="scale" value="1.2"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="wrap">True</property>
-                    <property name="label" translatable="yes">Switch off to connect to a Wi-Fi network</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</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="GtkSwitch" id="hotspot_off_switch">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="halign">end</property>
-                <property name="valign">center</property>
-                <signal name="notify::active" handler="hotspot_off_switch_changed_cb" object="NetDeviceWifi" swapped="yes"/>
-              </object>
-              <packing>
-                <property name="expand">False</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="GtkGrid">
+          <object class="CcListRow" id="hotspot_security_row">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="title" context="Wi-Fi Hotspot" translatable="yes">Security type</property>
-            <property name="halign">center</property>
+          </object>
-            <property name="valign">start</property>
+        </child>
-            <property name="row_spacing">10</property>
+        <child>
-            <property name="column_spacing">6</property>
+          <object class="CcListRow" id="hotspot_password_row">
-            <property name="column-homogeneous">True</property>
+            <property name="visible">True</property>
-            <child>
+            <property name="title" context="Wi-Fi Hotspot" translatable="yes">Password</property>
-              <object class="GtkLabel" id="hotspot_network_name_heading_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Network Name</property>
-                <property name="mnemonic_widget">hotspot_network_name_label</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hotspot_security_heading_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Security type</property>
-                <property name="mnemonic_widget">hotspot_security_label</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hotspot_network_name_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label"></property>
-                <property name="selectable">True</property>
-                <property name="max-width-chars">50</property>
-                <property name="ellipsize">end</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hotspot_security_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label"></property>
-                <property name="selectable">True</property>
-                <property name="max-width-chars">50</property>
-                <property name="ellipsize">end</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hotspot_security_key_heading_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" context="Wi-Fi passkey" translatable="yes">Password</property>
-                <property name="mnemonic_widget">hotspot_security_key_label</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="hotspot_security_key_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label"></property>
-                <property name="selectable">True</property>
-                <property name="max-width-chars">50</property>
-                <property name="ellipsize">end</property>
-                <attributes>
-                  <attribute name="font-desc" value="Monospace"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">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="position">1</property>
-      </packing>
     </child>
+
   </template>
 
   <!-- Center widget -->

panels/network/qrcodegen.h

@@ -0,0 +1,311 @@
+/*
+ * QR Code generator library (C)
+ *
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * This library creates QR Code symbols, which is a type of two-dimension barcode.
+ * Invented by Denso Wave and described in the ISO/IEC 18004 standard.
+ * A QR Code structure is an immutable square grid of black and white cells.
+ * The library provides functions to create a QR Code from text or binary data.
+ * The library covers the QR Code Model 2 specification, supporting all versions (sizes)
+ * from 1 to 40, all 4 error correction levels, and 4 character encoding modes.
+ *
+ * Ways to create a QR Code object:
+ * - High level: Take the payload data and call qrcodegen_encodeText() or qrcodegen_encodeBinary().
+ * - Low level: Custom-make the list of segments and call
+ *   qrcodegen_encodeSegments() or qrcodegen_encodeSegmentsAdvanced().
+ * (Note that all ways require supplying the desired error correction level and various byte buffers.)
+ */
+
+
+/*---- Enum and struct types----*/
+
+/*
+ * The error correction level in a QR Code symbol.
+ */
+enum qrcodegen_Ecc {
+	// Must be declared in ascending order of error protection
+	// so that an internal qrcodegen function works properly
+	qrcodegen_Ecc_LOW = 0 ,  // The QR Code can tolerate about  7% erroneous codewords
+	qrcodegen_Ecc_MEDIUM  ,  // The QR Code can tolerate about 15% erroneous codewords
+	qrcodegen_Ecc_QUARTILE,  // The QR Code can tolerate about 25% erroneous codewords
+	qrcodegen_Ecc_HIGH    ,  // The QR Code can tolerate about 30% erroneous codewords
+};
+
+
+/*
+ * The mask pattern used in a QR Code symbol.
+ */
+enum qrcodegen_Mask {
+	// A special value to tell the QR Code encoder to
+	// automatically select an appropriate mask pattern
+	qrcodegen_Mask_AUTO = -1,
+	// The eight actual mask patterns
+	qrcodegen_Mask_0 = 0,
+	qrcodegen_Mask_1,
+	qrcodegen_Mask_2,
+	qrcodegen_Mask_3,
+	qrcodegen_Mask_4,
+	qrcodegen_Mask_5,
+	qrcodegen_Mask_6,
+	qrcodegen_Mask_7,
+};
+
+
+/*
+ * Describes how a segment's data bits are interpreted.
+ */
+enum qrcodegen_Mode {
+	qrcodegen_Mode_NUMERIC      = 0x1,
+	qrcodegen_Mode_ALPHANUMERIC = 0x2,
+	qrcodegen_Mode_BYTE         = 0x4,
+	qrcodegen_Mode_KANJI        = 0x8,
+	qrcodegen_Mode_ECI          = 0x7,
+};
+
+
+/*
+ * A segment of character/binary/control data in a QR Code symbol.
+ * The mid-level way to create a segment is to take the payload data
+ * and call a factory function such as qrcodegen_makeNumeric().
+ * The low-level way to create a segment is to custom-make the bit buffer
+ * and initialize a qrcodegen_Segment struct with appropriate values.
+ * Even in the most favorable conditions, a QR Code can only hold 7089 characters of data.
+ * Any segment longer than this is meaningless for the purpose of generating QR Codes.
+ * Moreover, the maximum allowed bit length is 32767 because
+ * the largest QR Code (version 40) has 31329 modules.
+ */
+struct qrcodegen_Segment {
+	// The mode indicator of this segment.
+	enum qrcodegen_Mode mode;
+
+	// The length of this segment's unencoded data. Measured in characters for
+	// numeric/alphanumeric/kanji mode, bytes for byte mode, and 0 for ECI mode.
+	// Always zero or positive. Not the same as the data's bit length.
+	int numChars;
+
+	// The data bits of this segment, packed in bitwise big endian.
+	// Can be null if the bit length is zero.
+	uint8_t *data;
+
+	// The number of valid data bits used in the buffer. Requires
+	// 0 <= bitLength <= 32767, and bitLength <= (capacity of data array) * 8.
+	// The character count (numChars) must agree with the mode and the bit buffer length.
+	int bitLength;
+};
+
+
+
+/*---- Macro constants and functions ----*/
+
+#define qrcodegen_VERSION_MIN   1  // The minimum version number supported in the QR Code Model 2 standard
+#define qrcodegen_VERSION_MAX  40  // The maximum version number supported in the QR Code Model 2 standard
+
+// Calculates the number of bytes needed to store any QR Code up to and including the given version number,
+// as a compile-time constant. For example, 'uint8_t buffer[qrcodegen_BUFFER_LEN_FOR_VERSION(25)];'
+// can store any single QR Code from version 1 to 25 (inclusive). The result fits in an int (or int16).
+// Requires qrcodegen_VERSION_MIN <= n <= qrcodegen_VERSION_MAX.
+#define qrcodegen_BUFFER_LEN_FOR_VERSION(n)  ((((n) * 4 + 17) * ((n) * 4 + 17) + 7) / 8 + 1)
+
+// The worst-case number of bytes needed to store one QR Code, up to and including
+// version 40. This value equals 3918, which is just under 4 kilobytes.
+// Use this more convenient value to avoid calculating tighter memory bounds for buffers.
+#define qrcodegen_BUFFER_LEN_MAX  qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)
+
+
+
+/*---- Functions (high level) to generate QR Codes ----*/
+
+/*
+ * Encodes the given text string to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input text must be encoded in UTF-8 and contain no NULs.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays tempBuffer and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, tempBuffer contains no useful data.
+ * - If successful, the resulting QR Code may use numeric,
+ *   alphanumeric, or byte mode to encode the text.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC
+ *   can hold any UTF-8 string up to 2953 bytes, or any alphanumeric string
+ *   up to 4296 characters, or any digit string up to 7089 characters.
+ *   These numbers represent the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*
+ * Encodes the given binary data to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input array range dataAndTemp[0 : dataLen] should normally be
+ *   valid UTF-8 text, but is not required by the QR Code standard.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays dataAndTemp and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, the contents of dataAndTemp may have changed,
+ *   and does not represent useful data anymore.
+ * - If successful, the resulting QR Code will use byte mode to encode the data.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC can hold any byte
+ *   sequence up to length 2953. This is the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*---- Functions (low level) to generate QR Codes ----*/
+
+/*
+ * Renders a QR Code representing the given segments at the given error correction level.
+ * The smallest possible QR Code version is automatically chosen for the output. Returns true if
+ * QR Code creation succeeded, or false if the data is too long to fit in any version. The ECC level
+ * of the result may be higher than the ecl argument if it can be done without increasing the version.
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+	enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Renders a QR Code representing the given segments with the given encoding parameters.
+ * Returns true if QR Code creation succeeded, or false if the data is too long to fit in the range of versions.
+ * The smallest possible QR Code version within the given range is automatically
+ * chosen for the output. Iff boostEcl is true, then the ECC level of the result
+ * may be higher than the ecl argument if it can be done without increasing the
+ * version. The mask number is either between 0 to 7 (inclusive) to force that
+ * mask, or -1 to automatically choose an appropriate mask (which may be slow).
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
+	int minVersion, int maxVersion, int mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in alphanumeric mode.
+ * A string is encodable iff each character is in the following set: 0 to 9, A to Z
+ * (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+bool qrcodegen_isAlphanumeric(const char *text);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in numeric mode.
+ * A string is encodable iff each character is in the range 0 to 9.
+ */
+bool qrcodegen_isNumeric(const char *text);
+
+
+/*
+ * Returns the number of bytes (uint8_t) needed for the data buffer of a segment
+ * containing the given number of characters using the given mode. Notes:
+ * - Returns SIZE_MAX on failure, i.e. numChars > INT16_MAX or
+ *   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+ * - Otherwise, all valid results are in the range [0, ceil(INT16_MAX / 8)], i.e. at most 4096.
+ * - It is okay for the user to allocate more bytes for the buffer than needed.
+ * - For byte mode, numChars measures the number of bytes, not Unicode code points.
+ * - For ECI mode, numChars must be 0, and the worst-case number of bytes is returned.
+ *   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+ */
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars);
+
+
+/*
+ * Returns a segment representing the given binary data encoded in
+ * byte mode. All input byte arrays are acceptable. Any text string
+ * can be converted to UTF-8 bytes and encoded as a byte mode segment.
+ */
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given string of decimal digits encoded in numeric mode.
+ */
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given text string encoded in alphanumeric mode.
+ * The characters allowed are: 0 to 9, A to Z (uppercase only), space,
+ * dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing an Extended Channel Interpretation
+ * (ECI) designator with the given assignment value.
+ */
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]);
+
+
+/*---- Functions to extract raw data from QR Codes ----*/
+
+/*
+ * Returns the side length of the given QR Code, assuming that encoding succeeded.
+ * The result is in the range [21, 177]. Note that the length of the array buffer
+ * is related to the side length - every 'uint8_t qrcode[]' must have length at least
+ * qrcodegen_BUFFER_LEN_FOR_VERSION(version), which equals ceil(size^2 / 8 + 1).
+ */
+int qrcodegen_getSize(const uint8_t qrcode[]);
+
+
+/*
+ * Returns the color of the module (pixel) at the given coordinates, which is false
+ * for white or true for black. The top left corner has the coordinates (x=0, y=0).
+ * If the given coordinates are out of bounds, then false (white) is returned.
+ */
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y);
+
+
+#ifdef __cplusplus
+}
+#endif