Compare commits
12 Commits
| Author | SHA1 | Date |
|---|---|---|
raveit65
|
211bc9f984 | |
|
raveit65
|
d0e3cfeaed | |
|
raveit65
|
e409da3587 | |
|
raveit65
|
34f60318ea | |
|
raveit65
|
f0f0e10fe3 | |
|
raveit65
|
f8fec3c7fd | |
|
raveit65
|
bc805ca4e7 | |
|
raveit65
|
ad2d00ae79 | |
|
raveit65
|
0ad4cb31e8 | |
|
raveit65
|
6888162a47 | |
|
raveit65
|
2ce4079652 | |
Peter Robinson
|
0d72bfa79b |
|
|
@ -13,3 +13,8 @@
|
|||
/mate-settings-daemon-1.7.90.tar.xz
|
||||
/mate-settings-daemon-1.8.0.tar.xz
|
||||
/mate-settings-daemon-1.8.1.tar.xz
|
||||
/mate-settings-daemon-1.8.2.tar.xz
|
||||
/mate-settings-daemon-1.8.3.tar.xz
|
||||
/mate-settings-daemon-1.10.0.tar.xz
|
||||
/mate-settings-daemon-1.10.1.tar.xz
|
||||
/mate-settings-daemon-1.10.2.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,21 +1,48 @@
|
|||
# Conditional for release and snapshot builds. Uncomment for release-builds.
|
||||
%global rel_build 1
|
||||
|
||||
# This is needed, because src-url contains branched part of versioning-scheme.
|
||||
%global branch 1.10
|
||||
|
||||
# Settings used for build from snapshots.
|
||||
%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
|
||||
%{!?rel_build:%global commit_date 20141215}
|
||||
%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
|
||||
%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}}
|
||||
%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}}
|
||||
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
|
||||
|
||||
Name: mate-settings-daemon
|
||||
Version: 1.8.1
|
||||
Release: 2%{?dist}
|
||||
Version: %{branch}.2
|
||||
%if 0%{?rel_build}
|
||||
Release: 1%{?dist}
|
||||
%else
|
||||
Release: 0.1%{?git_rel}%{?dist}
|
||||
%endif
|
||||
Summary: MATE Desktop settings daemon
|
||||
License: GPLv2+
|
||||
URL: http://mate-desktop.org
|
||||
|
||||
Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
|
||||
# for downloading the tarball use 'spectool -g -R mate-settings-daemon.spec'
|
||||
# Source for release-builds.
|
||||
%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}
|
||||
# Source for snapshot-builds.
|
||||
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
|
||||
|
||||
# To generate tarball
|
||||
# wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
|
||||
#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
|
||||
# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=ed55854
|
||||
# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=33cb903
|
||||
Patch0: mate-settings-daemon_touchpad.patch
|
||||
|
||||
BuildRequires: dbus-glib-devel
|
||||
BuildRequires: dconf-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: libmatemixer-devel
|
||||
BuildRequires: libcanberra-devel
|
||||
# needed for f23
|
||||
%if 0%{?fedora} > 22
|
||||
BuildRequires: libcanberra-gtk2
|
||||
%endif
|
||||
BuildRequires: libmatekbd-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libSM-devel
|
||||
|
|
@ -45,7 +72,17 @@ various parameters of a MATE session and the applications that run
|
|||
under it.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q%{!?rel_build:n %{name}-%{commit}}
|
||||
|
||||
%patch0 -p1 -b .touchpad
|
||||
|
||||
%if 0%{?rel_build}
|
||||
#NOCONFIGURE=1 ./autogen.sh
|
||||
%else # 0%{?rel_build}
|
||||
# for snapshots
|
||||
# needed for git snapshots
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
%endif # 0%{?rel_build}
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
|
@ -53,9 +90,9 @@ under it.
|
|||
--disable-static \
|
||||
--disable-schemas-compile \
|
||||
--enable-polkit \
|
||||
--disable-gstreamer \
|
||||
--with-x \
|
||||
--with-nssdb
|
||||
--with-nssdb \
|
||||
--with-gtk=2.0
|
||||
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
|
|
@ -94,23 +131,51 @@ fi
|
|||
%dir %{_sysconfdir}/mate-settings-daemon/xrandr
|
||||
%config %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
|
||||
%{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
|
||||
%{_sysconfdir}/xrdb/
|
||||
%{_libdir}/mate-settings-daemon
|
||||
%{_libexecdir}/mate-settings-daemon
|
||||
%{_libexecdir}/msd-datetime-mechanism
|
||||
%{_libexecdir}/msd-locate-pointer
|
||||
%{_datadir}/mate-control-center/keybindings/50-accessibility.xml
|
||||
%{_datadir}/dbus-1/services/org.mate.SettingsDaemon.service
|
||||
%{_datadir}/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
|
||||
%{_datadir}/icons/mate/*/*/*
|
||||
%{_datadir}/mate-settings-daemon
|
||||
%{_datadir}/glib-2.0/schemas/org.mate.*.xml
|
||||
%{_datadir}/polkit-1/actions/org.mate.settingsdaemon.datetimemechanism.policy
|
||||
%{_mandir}/man1/mate-settings-daemon.1.*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/mate-settings-daemon
|
||||
%{_libdir}/pkgconfig/mate-settings-daemon.pc
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 31 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2-1
|
||||
- update to 1.10.2 release
|
||||
- remove upstreamed patches
|
||||
- add upstream touchpad improvement
|
||||
|
||||
* Tue Jul 14 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1.1
|
||||
- update to 1.10.1 release
|
||||
|
||||
* Mon Jun 29 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-1
|
||||
- update to 1.10.0 release
|
||||
|
||||
* Wed Mar 11 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.3.1
|
||||
- update to 1.8.3 release
|
||||
- fix rhbz (#1157698)
|
||||
- add mate-settings-daemon_a11y-keyboard-crash.patch
|
||||
|
||||
* Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-3
|
||||
- fix rhbz (1102581)
|
||||
|
||||
* Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-2
|
||||
- update to 1.8.2 release
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,85 @@
|
|||
diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in.in b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
|
||||
index 8a30d1f..a7f5d05 100644
|
||||
--- a/data/org.mate.peripherals-touchpad.gschema.xml.in.in
|
||||
+++ b/data/org.mate.peripherals-touchpad.gschema.xml.in.in
|
||||
@@ -25,5 +25,20 @@
|
||||
<_summary>Enable touchpad</_summary>
|
||||
<_description>Set this to TRUE to enable all touchpads.</_description>
|
||||
</key>
|
||||
+ <key name="tap-button-one-finger" type="i">
|
||||
+ <default>1</default>
|
||||
+ <_summary>One finger tap button</_summary>
|
||||
+ <_description>Select the button mapping for one-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
|
||||
+ </key>
|
||||
+ <key name="tap-button-two-finger" type="i">
|
||||
+ <default>2</default>
|
||||
+ <_summary>Two finger tap button</_summary>
|
||||
+ <_description>Select the button mapping for two-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
|
||||
+ </key>
|
||||
+ <key name="tap-button-three-finger" type="i">
|
||||
+ <default>3</default>
|
||||
+ <_summary>Three finger tap button</_summary>
|
||||
+ <_description>Select the button mapping for three-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button</_description>
|
||||
+ </key>
|
||||
</schema>
|
||||
</schemalist>
|
||||
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
|
||||
index 426697f..6133d2d 100644
|
||||
--- a/plugins/mouse/msd-mouse-manager.c
|
||||
+++ b/plugins/mouse/msd-mouse-manager.c
|
||||
@@ -62,6 +62,9 @@
|
||||
#define KEY_TOUCHPAD_DISABLE_W_TYPING "disable-while-typing"
|
||||
#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
|
||||
#define KEY_TOUCHPAD_TAP_TO_CLICK "tap-to-click"
|
||||
+#define KEY_TOUCHPAD_ONE_FINGER_TAP "tap-button-one-finger"
|
||||
+#define KEY_TOUCHPAD_TWO_FINGER_TAP "tap-button-two-finger"
|
||||
+#define KEY_TOUCHPAD_THREE_FINGER_TAP "tap-button-three-finger"
|
||||
#define KEY_TOUCHPAD_SCROLL_METHOD "scroll-method"
|
||||
#define KEY_TOUCHPAD_PAD_HORIZ_SCROLL "horiz-scroll-enabled"
|
||||
#define KEY_TOUCHPAD_ENABLED "touchpad-enabled"
|
||||
@@ -673,13 +676,25 @@ set_tap_to_click (gboolean state, gboolean left_handed)
|
||||
rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device, prop, 0, 2,
|
||||
False, XA_INTEGER, &type, &format, &nitems,
|
||||
&bytes_after, &data);
|
||||
+
|
||||
+ GSettings *settings = g_settings_new (MATE_TOUCHPAD_SCHEMA);
|
||||
+ gint one_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_ONE_FINGER_TAP);
|
||||
+ gint two_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_TWO_FINGER_TAP);
|
||||
+ gint three_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_THREE_FINGER_TAP);
|
||||
+ if (one_finger_tap > 3 || one_finger_tap < 1)
|
||||
+ one_finger_tap = 1;
|
||||
+ if (two_finger_tap > 3 || two_finger_tap < 1)
|
||||
+ two_finger_tap = 2;
|
||||
+ if (three_finger_tap > 3 || three_finger_tap < 1)
|
||||
+ three_finger_tap = 3;
|
||||
+ g_object_unref (settings);
|
||||
|
||||
if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7)
|
||||
{
|
||||
/* Set RLM mapping for 1/2/3 fingers*/
|
||||
- data[4] = (state) ? ((left_handed) ? 3 : 1) : 0;
|
||||
- data[5] = (state) ? ((left_handed) ? 1 : 3) : 0;
|
||||
- data[6] = (state) ? 2 : 0;
|
||||
+ data[4] = (state) ? ((left_handed) ? (4-one_finger_tap) : one_finger_tap) : 0;
|
||||
+ data[5] = (state) ? ((left_handed) ? (4-two_finger_tap) : two_finger_tap) : 0;
|
||||
+ data[6] = (state) ? three_finger_tap : 0;
|
||||
XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device, prop, XA_INTEGER, 8,
|
||||
PropModeReplace, data, nitems);
|
||||
}
|
||||
@@ -1000,6 +1015,15 @@ mouse_callback (GSettings *settings,
|
||||
} else if (g_strcmp0 (key, KEY_TOUCHPAD_TAP_TO_CLICK) == 0) {
|
||||
set_tap_to_click (g_settings_get_boolean (settings, key),
|
||||
g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
|
||||
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_ONE_FINGER_TAP) == 0) {
|
||||
+ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK),
|
||||
+ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
|
||||
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_TAP) == 0) {
|
||||
+ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK),
|
||||
+ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
|
||||
+ } else if (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_TAP) == 0) {
|
||||
+ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK),
|
||||
+ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED));
|
||||
} else if (g_strcmp0 (key, KEY_TOUCHPAD_SCROLL_METHOD) == 0) {
|
||||
set_edge_scroll (g_settings_get_int (settings, key));
|
||||
set_horiz_scroll (g_settings_get_boolean (settings, KEY_TOUCHPAD_PAD_HORIZ_SCROLL));
|
||||
|
||||
Loading…
Reference in New Issue