all: Changes for muffin 5.3+

- bump to dev version
- Move some gschemas from cinnamon-settings-daemon, add new enums.
- Rework some keybindings, defaults.

Author: mtwebster

debian/changelog

@@ -1,3 +1,9 @@
+cinnamon-desktop (5.3.0) UNRELEASED; urgency=medium
+
+  * Version bump for muffin rebase.
+
+ -- Michael Webster <[email protected]>  Wed, 08 Jun 2022 12:00:00 -0500
+
 cinnamon-desktop (5.2.1) una; urgency=medium
 
   [ Michael Webster ]

libcinnamon-desktop/cdesktop-enums.h

@@ -76,6 +76,35 @@ typedef enum
   C_DESKTOP_MOUSE_DWELL_DIRECTION_DOWN
 } CDesktopMouseDwellDirection;
 
+typedef enum
+{
+  C_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT,
+  C_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT,
+  C_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE
+} CDesktopTouchpadHandedness;
+
+typedef enum
+{
+  C_DESKTOP_TOUCHPAD_CLICK_METHOD_DEFAULT,
+  C_DESKTOP_TOUCHPAD_CLICK_METHOD_NONE,
+  C_DESKTOP_TOUCHPAD_CLICK_METHOD_AREAS,
+  C_DESKTOP_TOUCHPAD_CLICK_METHOD_FINGERS
+} CDesktopTouchpadClickMethod;
+
+typedef enum
+{
+  C_DESKTOP_DEVICE_SEND_EVENTS_ENABLED,
+  C_DESKTOP_DEVICE_SEND_EVENTS_DISABLED,
+  C_DESKTOP_DEVICE_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE
+} CDesktopDeviceSendEvents;
+
+typedef enum
+{
+  C_DESKTOP_POINTER_ACCEL_PROFILE_DEFAULT,
+  C_DESKTOP_POINTER_ACCEL_PROFILE_FLAT,
+  C_DESKTOP_POINTER_ACCEL_PROFILE_ADAPTIVE
+} CDesktopPointerAccelProfile;
+
 typedef enum
 {
   C_DESKTOP_SCREENSAVER_MODE_BLANK_ONLY,
@@ -150,6 +179,29 @@ typedef enum
   C_DESKTOP_VISUAL_BELL_FRAME_FLASH
 } CDesktopVisualBellType;
 
+typedef enum
+{
+  C_DESKTOP_TABLET_MAPPING_ABSOLUTE,
+  C_DESKTOP_TABLET_MAPPING_RELATIVE
+} CDesktopTabletMapping;
+
+typedef enum
+{
+  C_DESKTOP_PAD_BUTTON_ACTION_NONE,
+  C_DESKTOP_PAD_BUTTON_ACTION_HELP,
+  C_DESKTOP_PAD_BUTTON_ACTION_SWITCH_MONITOR,
+  C_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING
+} CDesktopPadButtonAction;
+
+typedef enum
+{
+  C_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT,
+  C_DESKTOP_STYLUS_BUTTON_ACTION_MIDDLE,
+  C_DESKTOP_STYLUS_BUTTON_ACTION_RIGHT,
+  C_DESKTOP_STYLUS_BUTTON_ACTION_BACK,
+  C_DESKTOP_STYLUS_BUTTON_ACTION_FORWARD
+} CDesktopStylusButtonAction;
+
 typedef enum
 {
 /* All bindings before _SEPARATOR are treated as
@@ -198,8 +250,8 @@ typedef enum
         C_DESKTOP_MEDIA_KEY_HELP,
         C_DESKTOP_MEDIA_KEY_TERMINAL,
         C_DESKTOP_MEDIA_KEY_WWW,
-        C_DESKTOP_MEDIA_KEY_VIDEO_OUT,
-        C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO,
+        C_DESKTOP_MEDIA_KEY_VIDEO_OUT, // obsolete - handled in muffin now. Skipped in keybindings.js
+        C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO, // obsolete ^^
         C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO_LOCK,
         C_DESKTOP_MEDIA_KEY_SCREENREADER,
         C_DESKTOP_MEDIA_KEY_ON_SCREEN_KEYBOARD,
@@ -259,8 +311,8 @@ __attribute__((unused)) static const char *media_keys[] = {
         [C_DESKTOP_MEDIA_KEY_HELP] = "help",
         [C_DESKTOP_MEDIA_KEY_TERMINAL] = "terminal",
         [C_DESKTOP_MEDIA_KEY_WWW] = "www",
-        [C_DESKTOP_MEDIA_KEY_VIDEO_OUT] = "video-outputs",
-        [C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO] = "video-rotation",
+        [C_DESKTOP_MEDIA_KEY_VIDEO_OUT] = "video-outputs", // obsolete
+        [C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO] = "video-rotation", // obsolete
         [C_DESKTOP_MEDIA_KEY_ROTATE_VIDEO_LOCK] = "video-rotation-lock",
         [C_DESKTOP_MEDIA_KEY_SCREENREADER] = "screenreader",
         [C_DESKTOP_MEDIA_KEY_ON_SCREEN_KEYBOARD] = "on-screen-keyboard",

meson.build

@@ -1,7 +1,7 @@
 # Meson build file
 
 # https://github.com/linuxmint/cinnamon-desktop
-project('cinnamon-desktop', 'c', version: '5.2.1',
+project('cinnamon-desktop', 'c', version: '5.3.0', ### 5.3 is a dev version, not for release
   meson_version: '>=0.50.0'
 )
 

schemas/meson.build

@@ -13,6 +13,7 @@ desktop_gschemas = [
   'lockdown',
   'media-handling',
   'notifications',
+  'peripherals',
   'privacy',
   'screensaver',
   'session',

schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml.in

@@ -182,7 +182,7 @@
       <description>Turn the touchpad off</description>
     </key>
     <key name="mute-quiet" type="as">
-      <default>['XF86AudioMute']</default>
+      <default>['&lt;Alt&gt;XF86AudioMute']</default>
       <summary>Mute the audio quietly</summary>
       <description>Mute the audio quietly</description>
     </key>
@@ -217,13 +217,12 @@
       <description>Choose an audio track at random</description>
     </key>
     <key name="video-outputs" type="as">
-      <default>['&lt;Super&gt;p', 'XF86Display']</default>
-      <summary>Re-detect display devices</summary>
-      <description>Re-detect display devices</description>
+      <default>[]</default>
+      <summary>obsolete - see switch-monitor in org.cinnamon.desktop.keybindings.wm</summary>
     </key>
     <key name="video-rotation" type="as">
-      <default>['XF86RotateWindows']</default>
-      <summary>Rotate display</summary>
+      <default>[]</default>
+      <summary>obsolete - see rotate-monitor in org.cinnamon.desktop.keybindings.wm</summary>
       <description>Rotate display</description>
     </key>
     <key name="video-rotation-lock" type="as">

schemas/org.cinnamon.desktop.keybindings.wm.gschema.xml.in

@@ -22,19 +22,23 @@
     </key>
 
     <key type="as" name="push-snap-left">
-      <default><![CDATA[['<Control><Super>Left']]]></default>
+      <default>[]</default>
+      <summary>obsolete</summary>
     </key>
 
     <key type="as" name="push-snap-right">
-      <default><![CDATA[['<Control><Super>Right']]]></default>
+      <default>[]</default>
+      <summary>obsolete</summary>
     </key>
 
     <key type="as" name="push-snap-up">
-      <default><![CDATA[['<Control><Super>Up']]]></default>
+      <default>[]</default>
+      <summary>obsolete</summary>
     </key>
 
     <key type="as" name="push-snap-down">
-      <default><![CDATA[['<Control><Super>Down']]]></default>
+      <default>[]</default>
+      <summary>obsolete</summary>
     </key>
 
     <key type="as" name="tab-popup-select">
@@ -116,15 +120,15 @@
       <summary>Switch windows of an application</summary>
     </key>
     <key type="as" name="switch-group-backward">
-      <default>[]</default>
+      <default><![CDATA[['<Shift><Alt>Above_Tab']]]></default>
       <summary>Reverse switch windows of an application</summary>
     </key>
     <key type="as" name="switch-windows">
       <default><![CDATA[['<Alt>Tab']]]></default>
       <summary>Switch applications</summary>
     </key>
     <key type="as" name="switch-windows-backward">
-      <default>[]</default>
+      <default><![CDATA[['<Shift><Alt>Tab']]]></default>
       <summary>Reverse switch applications</summary>
     </key>
     <key type="as" name="switch-panels">
@@ -343,5 +347,14 @@
       <default>[]</default>
       <summary>Decrease the opacity of the current window</summary>
     </key>
+    <key name="switch-monitor" type="as">
+      <default><![CDATA[['<Super>p','XF86Display']]]></default>
+      <summary>Switch monitor configurations</summary>
+    </key>
+    <key name="rotate-monitor" type="as">
+      <default><![CDATA[['XF86RotateWindows']]]></default>
+      <summary>Rotates the built-in monitor configuration</summary>
+    </key>
+
   </schema>
 </schemalist>