From bd22a1cebdf9634464385f7f15bfe67932fa8553 Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <patrick@monnerat.net>
Date: Thu, 1 Sep 2022 13:47:29 +0200
Subject: [PATCH] mouse: feature pointer size control

---
 capplets/mouse/mate-mouse-properties.c  |  10 +
 capplets/mouse/mate-mouse-properties.ui | 341 ++++++++++++++++++++++--
 capplets/mouse/ui-a11y.suppr            |   6 +
 3 files changed, 339 insertions(+), 18 deletions(-)

diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c
index d6cea0b43..03395e218 100644
--- a/capplets/mouse/mate-mouse-properties.c
+++ b/capplets/mouse/mate-mouse-properties.c
@@ -310,6 +310,11 @@ setup_dialog (GtkBuilder *dialog)
 	gtk_combo_box_set_active (GTK_COMBO_BOX (gtk_builder_get_object (dialog, "mouse_accel_profile")),
 				  g_settings_get_enum (mouse_settings, "accel-profile"));
 
+	/* Pointer size */
+	g_settings_bind (mouse_settings, "cursor-size",
+			 gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (dialog, "pointer_size_scale"))),
+			 "value", G_SETTINGS_BIND_DEFAULT);
+
 	/* DnD threshold */
 	g_settings_bind (mouse_settings, "drag-threshold",
 	                 gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (dialog, "drag_threshold_scale"))), "value",
@@ -380,6 +385,11 @@ setup_dialog (GtkBuilder *dialog)
 		                 gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (dialog, "touchpad_sensitivity_scale"))), "value",
 		                 G_SETTINGS_BIND_DEFAULT);
 
+		/* Pointer size */
+		g_settings_bind (mouse_settings, "cursor-size",
+				 gtk_range_get_adjustment (GTK_RANGE (gtk_builder_get_object (dialog, "touchpad_pointer_size_scale"))),
+				 "value", G_SETTINGS_BIND_DEFAULT);
+
 		synaptics_check_capabilities (dialog);
 	}
 
diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui
index 875ee5010..5d7fafb6b 100644
--- a/capplets/mouse/mate-mouse-properties.ui
+++ b/capplets/mouse/mate-mouse-properties.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.1 
+<!-- Generated with glade 3.38.2 
 
 mate-mouse-properties - mouse properties dialog window
 Copyright (C) MATE Developers
@@ -74,15 +74,15 @@ Author: Wolfgang Ulbrich
     <property name="lower">0.5</property>
     <property name="upper">3</property>
     <property name="value">1.2</property>
-    <property name="step-increment">0.1</property>
-    <property name="page-increment">0.1</property>
+    <property name="step-increment">0.10</property>
+    <property name="page-increment">0.10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment6">
-    <property name="lower">0.2</property>
+    <property name="lower">0.20</property>
     <property name="upper">3</property>
     <property name="value">1.2</property>
-    <property name="step-increment">0.1</property>
-    <property name="page-increment">0.1</property>
+    <property name="step-increment">0.10</property>
+    <property name="page-increment">0.10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment7">
     <property name="upper">30</property>
@@ -90,6 +90,13 @@ Author: Wolfgang Ulbrich
     <property name="step-increment">1</property>
     <property name="page-increment">1</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment8">
+    <property name="lower">16</property>
+    <property name="upper">96</property>
+    <property name="value">24</property>
+    <property name="step-increment">4</property>
+    <property name="page-increment">10</property>
+  </object>
   <object class="GtkImage" id="help_button_img">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -610,6 +617,148 @@ Author: Wolfgang Ulbrich
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkBox" id="pointer_size_vbox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Pointer Size</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="top-padding">6</property>
+                        <property name="left-padding">12</property>
+                        <child>
+                          <object class="GtkBox" id="vbox1">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkBox" id="pointer_size_hbox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="pointer_size_label">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Si_ze:</property>
+                                    <property name="use-underline">True</property>
+                                    <property name="justify">center</property>
+                                    <property name="mnemonic-widget">pointer_size_scale</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hbox2">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkLabel" id="pointer_size_small_label">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="label" translatable="yes" comments="small threshold">Small</property>
+                                        <property name="justify">center</property>
+                                        <property name="xalign">1</property>
+                                        <attributes>
+                                          <attribute name="style" value="italic"/>
+                                          <attribute name="scale" value="0.82999999999999996"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale" id="pointer_size_scale">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">True</property>
+                                        <property name="adjustment">adjustment8</property>
+                                        <property name="digits">0</property>
+                                        <property name="draw-value">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="pointer_size_large_label">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="label" translatable="yes" comments="large threshold">Large</property>
+                                        <property name="xalign">0</property>
+                                        <attributes>
+                                          <attribute name="style" value="italic"/>
+                                          <attribute name="scale" value="0.82999999999999996"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</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="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</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">3</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkBox" id="dnd_vbox">
                     <property name="visible">True</property>
@@ -698,11 +847,6 @@ Author: Wolfgang Ulbrich
                                         <property name="adjustment">adjustment3</property>
                                         <property name="digits">0</property>
                                         <property name="draw-value">False</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject" id="drag_threshold_scale-atkobject">
-                                            <property name="AtkObject::accessible-description" translatable="yes">Cursor blinks speed</property>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -754,7 +898,7 @@ Author: Wolfgang Ulbrich
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
                 <child>
@@ -843,11 +987,6 @@ Author: Wolfgang Ulbrich
                                         <property name="can-focus">True</property>
                                         <property name="adjustment">adjustment4</property>
                                         <property name="draw-value">False</property>
-                                        <child internal-child="accessible">
-                                          <object class="AtkObject" id="delay_scale-atkobject">
-                                            <property name="AtkObject::accessible-description" translatable="yes">Cursor blinks speed</property>
-                                          </object>
-                                        </child>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -952,7 +1091,7 @@ Author: Wolfgang Ulbrich
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">4</property>
+                    <property name="position">5</property>
                   </packing>
                 </child>
               </object>
@@ -1572,6 +1711,148 @@ Author: Wolfgang Ulbrich
                     <property name="position">3</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkBox" id="touchpad_pointer_size_vbox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Pointer Size</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment3">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="top-padding">6</property>
+                        <property name="left-padding">12</property>
+                        <child>
+                          <object class="GtkBox" id="vbox2">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkBox" id="touchpad_pointer_size_hbox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <object class="GtkLabel" id="touchpad_pointer_size_label">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Si_ze:</property>
+                                    <property name="use-underline">True</property>
+                                    <property name="justify">center</property>
+                                    <property name="mnemonic-widget">touchpad_pointer_size_scale</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hbox4">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <object class="GtkLabel" id="touchpad_pointer_size_small_label">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="label" translatable="yes" comments="small threshold">Small</property>
+                                        <property name="justify">center</property>
+                                        <property name="xalign">1</property>
+                                        <attributes>
+                                          <attribute name="style" value="italic"/>
+                                          <attribute name="scale" value="0.82999999999999996"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale" id="touchpad_pointer_size_scale">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">True</property>
+                                        <property name="adjustment">adjustment8</property>
+                                        <property name="digits">0</property>
+                                        <property name="draw-value">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="touchpad_pointer_size_large_label">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="label" translatable="yes" comments="large threshold">Large</property>
+                                        <property name="xalign">0</property>
+                                        <attributes>
+                                          <attribute name="style" value="italic"/>
+                                          <attribute name="scale" value="0.82999999999999996"/>
+                                        </attributes>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</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="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</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">4</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -1608,6 +1889,7 @@ Author: Wolfgang Ulbrich
       <widget name="acceleration_label"/>
       <widget name="sensitivity_label"/>
       <widget name="mouse_accel_profile_label"/>
+      <widget name="pointer_size_label"/>
       <widget name="threshold_label"/>
       <widget name="timeout_label"/>
     </widgets>
@@ -1616,6 +1898,7 @@ Author: Wolfgang Ulbrich
     <widgets>
       <widget name="acceleration_fast_label"/>
       <widget name="sensitivity_high_label"/>
+      <widget name="pointer_size_large_label"/>
       <widget name="threshold_large_label"/>
       <widget name="timeout_long_label"/>
     </widgets>
@@ -1624,8 +1907,30 @@ Author: Wolfgang Ulbrich
     <widgets>
       <widget name="acceleration_slow_label"/>
       <widget name="sensitivity_low_label"/>
+      <widget name="pointer_size_small_label"/>
       <widget name="threshold_small_label"/>
       <widget name="timeout_short_label"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="touchpad_acceleration_label"/>
+      <widget name="touchpad_sensitivity_label"/>
+      <widget name="touchpad_pointer_size_label"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="touchpad_acceleration_slow_label"/>
+      <widget name="touchpad_sensitivity_low_label"/>
+      <widget name="touchpad_pointer_size_small_label"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="touchpad_acceleration_fast_label"/>
+      <widget name="touchpad_sensitivity_high_label"/>
+      <widget name="touchpad_pointer_size_large_label"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/capplets/mouse/ui-a11y.suppr b/capplets/mouse/ui-a11y.suppr
index cf5150540..ee71af655 100644
--- a/capplets/mouse/ui-a11y.suppr
+++ b/capplets/mouse/ui-a11y.suppr
@@ -23,3 +23,9 @@ mate-mouse-properties.ui://GtkLabel[@id='touchpad_acceleration_slow_label'] orph
 mate-mouse-properties.ui://GtkLabel[@id='touchpad_acceleration_fast_label'] orphan-label
 mate-mouse-properties.ui://GtkLabel[@id='touchpad_sensitivity_low_label'] orphan-label
 mate-mouse-properties.ui://GtkLabel[@id='touchpad_sensitivity_high_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label2'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='pointer_size_small_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='pointer_size_large_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='label3'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='touchpad_pointer_size_small_label'] orphan-label
+mate-mouse-properties.ui://GtkLabel[@id='touchpad_pointer_size_large_label'] orphan-label