[gsettings-desktop-schemas] schemas: Adopt peripherals' gschemas from gnome-settings-daemon



commit b5b48a823fae09a7cb749d0a67d235ef098b490a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Oct 29 16:43:33 2014 +0100

    schemas: Adopt peripherals' gschemas from gnome-settings-daemon
    
    Now that mutter is potentially looking for these settings, it makes sense
    to have this at a more generic place than gnome-settings-daemon.
    
    Together with the settings relocation, there has been a settings cleanup
    and schema/path changes, users are expected to catch up with these. The
    list of changes is:
    
    - keyboard bell settings have been removed
    - numlock state settings have been removed, deemed as not belonging to
      configuration
    - motion threshold/acceleration have been merged in a single "speed"
      setting
    - a natural scroll setting has been added to mice
    - double click/drag thresholds have been removed, not considered a
      peripheral setting
    - hotplug commands have been removed, not so useful and not much of a
      good idea security wise on wayland.
    - "middle-button-enabled" setting has been removed as it doesn't have
      libinput configuration equivalence yet.
    - the touchpad-enabled setting has been renamed to a more generic
      "send-events", although it's still in the touchpad schema. The enum is
      generic and might be used on other schemas in the future.
    - Unlike the settings-daemon schema, each touchscreen is expected to
      have its own path, the schema now contains a "display" setting to which
      the touchscreen will be mapped. The previous "orientation-lock" setting
      is actually a toggle for the accelerometer, and thus removed from the
      touchscreen schema.
    - There is a very basic schema for drawing tablets (wacom and the such),
      only containing display mapping. Other settings would move eventually
      when they can be honored on libinput.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739411

 headers/gdesktop-enums.h                           |   21 ++++
 schemas/Makefile.am                                |    3 +-
 ...org.gnome.desktop.peripherals.gschema.xml.in.in |   99 ++++++++++++++++++++
 3 files changed, 122 insertions(+), 1 deletions(-)
---
diff --git a/headers/gdesktop-enums.h b/headers/gdesktop-enums.h
index 2b0e181..399bb8c 100644
--- a/headers/gdesktop-enums.h
+++ b/headers/gdesktop-enums.h
@@ -162,4 +162,25 @@ typedef enum
     G_DESKTOP_LOCATION_ACCURACY_LEVEL_EXACT
 } GDesktopLocationAccuracyLevel;
 
+typedef enum
+{
+  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED,
+  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING,
+  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING
+} GDesktopTouchpadScrollMethod;
+
+typedef enum
+{
+  G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT,
+  G_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT,
+  G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE
+} GDesktopTouchpadHandedness;
+
+typedef enum
+{
+  G_DESKTOP_DEVICE_SEND_EVENTS_ENABLED,
+  G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED,
+  G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE
+} GDesktopDeviceSendEvents;
+
 #endif /* __gdesktop_enums_h__ */
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 942bbe7..763f348 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -24,7 +24,8 @@ desktop_gschemas_in_in =                                              \
        org.gnome.desktop.input-sources.gschema.xml.in.in               \
        org.gnome.desktop.privacy.gschema.xml.in.in                     \
        org.gnome.desktop.notifications.gschema.xml.in.in               \
-       org.gnome.desktop.app-folders.gschema.xml.in.in
+       org.gnome.desktop.app-folders.gschema.xml.in.in                 \
+       org.gnome.desktop.peripherals.gschema.xml.in.in
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
diff --git a/schemas/org.gnome.desktop.peripherals.gschema.xml.in.in 
b/schemas/org.gnome.desktop.peripherals.gschema.xml.in.in
new file mode 100644
index 0000000..af38977
--- /dev/null
+++ b/schemas/org.gnome.desktop.peripherals.gschema.xml.in.in
@@ -0,0 +1,99 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals" 
path="/org/gnome/desktop/peripherals/">
+    <child name="touchpad" schema="org.gnome.desktop.peripherals.touchpad"/>
+    <child name="keyboard" schema="org.gnome.desktop.peripherals.keyboard"/>
+    <child name="mouse" schema="org.gnome.desktop.peripherals.mouse"/>
+    <child name="trackball" schema="org.gnome.desktop.peripherals.trackball"/>
+    <child name="tablet" schema="org.gnome.desktop.peripherals.tablet"/>
+    <child name="touchscreen" schema="org.gnome.desktop.peripherals.touchscreen"/>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchpad" 
path="/org/gnome/desktop/peripherals/touchpad/">
+    <key name="scroll-method" enum="org.gnome.desktop.GDesktopTouchpadScrollMethod">
+      <default>'two-finger-scrolling'</default>
+      <_summary>Select the touchpad scroll method</_summary>
+      <_description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", 
"two-finger-scrolling".</_description>
+    </key>
+    <key name="tap-to-click" type="b">
+      <default>false</default>
+      <_summary>Enable mouse clicks with touchpad</_summary>
+      <_description>Set this to TRUE to be able to send mouse clicks by tapping on the 
touchpad.</_description>
+    </key>
+    <key name="send-events" enum="org.gnome.desktop.GDesktopDeviceSendEvents">
+      <default>'enabled'</default>
+      <_summary>Touchpad enabled</_summary>
+      <_description>Defines the situations in which the touchpad is enabled.</_description>
+    </key>
+    <key name="left-handed" enum="org.gnome.desktop.GDesktopTouchpadHandedness">
+      <default>'mouse'</default>
+      <summary>Touchpad button orientation</summary>
+      <description>Swap left and right mouse buttons for left-handed mice with 'left', 'right' for 
right-handed, 'mouse' to follow the mouse setting.</description>
+    </key>
+    <key name="speed" type="d">
+      <default>0</default>
+      <summary>Pointer speed</summary>
+      <description>Pointer speed for the touchpad. Accepted values are in the [-1..1] range (from 
"unaccelerated" to "fast"). A value of 0 is the system default.</description>
+      <range min="-1" max="1"/>
+    </key>
+    <key name="natural-scroll" type="b">
+      <default>false</default>
+      <summary>Natural scrolling</summary>
+      <description>Set this to TRUE to enable natural (reverse) scrolling for touchpads.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.keyboard" 
path="/org/gnome/desktop/peripherals/keyboard/">
+    <key name="repeat" type="b">
+      <default>true</default>
+      <summary>Keyboard repeat</summary>
+      <description>Set this to TRUE to enable keyboard repeat.</description>
+    </key>
+    <key name="repeat-interval" type="u">
+      <default>30</default>
+      <summary>Key Repeat Interval</summary>
+      <description>Delay between repeats in milliseconds.</description>
+    </key>
+    <key name="delay" type="u">
+      <default>500</default>
+      <summary>Initial Key Repeat Delay</summary>
+      <description>Initial key repeat delay in milliseconds.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.mouse" 
path="/org/gnome/desktop/peripherals/mouse/">
+    <key name="left-handed" type="b">
+      <default>false</default>
+      <summary>Mouse button orientation</summary>
+      <description>Swap left and right mouse buttons for left-handed mice.</description>
+    </key>
+    <key name="speed" type="d">
+      <default>0</default>
+      <summary>Pointer speed</summary>
+      <description>Pointer speed for mice. Accepted values are in the [-1..1] range (from "unaccelerated" to 
"fast"). A value of 0 is the system default.</description>
+      <range min="-1" max="1"/>
+    </key>
+    <key name="natural-scroll" type="b">
+      <default>false</default>
+      <summary>Natural scrolling</summary>
+      <description>Set this to TRUE to enable natural (reverse) scrolling for mice.</description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.tablet">
+    <key name="display" type="as">
+      <default>["", "", ""]</default>
+      <_summary>Drawing tablet mapping</_summary>
+      <_description>EDID information of the monitor the tablet is mapped to. Must be in the format [vendor, 
product, serial]. ["","",""] disables mapping.</_description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.touchscreen">
+    <key name="display" type="as">
+      <default>["", "", ""]</default>
+      <_summary>Touchscreen display mapping</_summary>
+      <_description>EDID information of the monitor the touchscreen is mapped to. Must be in the format 
[vendor, product, serial]. ["","",""] disables mapping.</_description>
+    </key>
+  </schema>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.desktop.peripherals.trackball" 
path="/org/gnome/desktop/peripherals/trackball/">
+    <key name="scroll-wheel-emulation-button" type="i">
+      <default>0</default>
+      <range min="0" max="24"/>
+      <_summary>Mouse wheel emulation button. 0 to disable the feature.</_summary>
+    </key>
+  </schema>
+</schemalist>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]