parent
aef4a5f5be
commit
7b057f1de9
@ -1 +1 @@
|
||||
# Calculate append=skip merge(x11-themes/calculate-icon-theme)!= merge=x11-themes/gnome-icon-theme,x11-themes/elementary-icon-theme,kde-frameworks/plasma,x11-themes/adwaita-icon-theme,x11-themes/hicolor-icon-theme,x11-themes/mate-icon-theme,xfce-base/xfce4-panel,kde-frameworks/oxygen-icons,xfce-extra/xfce4-xkb-plugin,kde-frameworks/breeze-icons
|
||||
# Calculate append=skip merge(x11-themes/calculate-icon-theme)!= merge=x11-themes/gnome-icon-theme,x11-themes/elementary-icon-theme,kde-plasma/libplasma,x11-themes/adwaita-icon-theme,x11-themes/hicolor-icon-theme,x11-themes/mate-icon-theme,xfce-base/xfce4-panel,kde-frameworks/oxygen-icons,xfce-extra/xfce4-xkb-plugin,kde-frameworks/breeze-icons
|
||||
|
||||
@ -1 +1 @@
|
||||
# Calculate append=skip merge(kde-frameworks/plasma)!= merge=x11-apps/xinit
|
||||
# Calculate append=skip merge(kde-plasma/libplasma)!= merge=x11-apps/xinit
|
||||
|
||||
@ -1 +1 @@
|
||||
# Calculate append=skip merge(xfce-base/xfce4-session)!= merge=x11-apps/xinit,kde-base/kdm,xfce-extra/xfce4-power-manager
|
||||
# Calculate append=skip merge(xfce-base/xfce4-session)!= merge=x11-apps/xinit,kde-base/kdm,xfce-base/xfce4-power-manager
|
||||
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6
|
||||
@ -0,0 +1 @@
|
||||
# Calculate path=/usr/share/plasma/desktoptheme/default/icons name=start.svgz append=remove
|
||||
@ -0,0 +1 @@
|
||||
# Calculate mergepkg()!= path=/etc/xdg name=autostart
|
||||
@ -0,0 +1,7 @@
|
||||
# Calculate format=kde
|
||||
[Desktop Entry]
|
||||
#?pkg(xfce-base/xfce4-session)<4.13#
|
||||
Exec=xfce4-power-manager --sm-client-disable
|
||||
#!pkg#
|
||||
Exec=xfce4-power-manager
|
||||
#pkg#
|
||||
@ -1 +1 @@
|
||||
# Calculate link=/var/calculate/remote/share/faces/#-ur_login-#.face mirror name=.face exists(/var/calculate/remote/share/faces/#-ur_login-#.face)!=&&pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=
|
||||
# Calculate link=/var/calculate/remote/share/faces/#-ur_login-#.face mirror name=.face exists(/var/calculate/remote/share/faces/#-ur_login-#.face)!=&&pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-plasma/libplasma)!=
|
||||
|
||||
@ -1 +1 @@
|
||||
# Calculate link=#-ur_home_path-#/.face symbolic name=.face.icon pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=
|
||||
# Calculate link=#-ur_home_path-#/.face symbolic name=.face.icon pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-plasma/libplasma)!=
|
||||
|
||||
@ -1 +1 @@
|
||||
# Calculate link=#-cl_desktop_hash_face-# mirror name=.face exists(~/.face.icon)==&&pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=&&cl_desktop_hash_face!=
|
||||
# Calculate link=#-cl_desktop_hash_face-# mirror name=.face exists(~/.face.icon)==&&pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-plasma/libplasma)!=&&cl_desktop_hash_face!=
|
||||
|
||||
@ -1 +1 @@
|
||||
# Calculate link=#-ur_home_path-#/.face symbolic name=.face.icon pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-frameworks/plasma)!=
|
||||
# Calculate link=#-ur_home_path-#/.face symbolic name=.face.icon pkg(kde-plasma/plasma-workspace)!=&&pkg(kde-plasma/libplasma)!=
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
# Calculate format=patch path=~/.kde4/share/config pkg(kde-base/plasma-workspace)!=
|
||||
# Calculate format=patch path=~/.kde4/share/config pkg(kde-plasma/plasma-workspace)!=
|
||||
<reg>start-here-kde</reg>
|
||||
<text>start-calculate</text>
|
||||
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip merge()!=
|
||||
@ -0,0 +1,30 @@
|
||||
# Calculate format=diff merge(xfce-base/xfce4-power-manager)<1.5.2
|
||||
diff --git src/xfpm-dpms.c src/xfpm-dpms.c
|
||||
index 53f3721..6fb0947 100644
|
||||
--- src/xfpm-dpms.c
|
||||
+++ src/xfpm-dpms.c
|
||||
@@ -46,6 +46,16 @@ static void xfpm_dpms_finalize (GObject *object);
|
||||
#define XFPM_DPMS_GET_PRIVATE(o) \
|
||||
(G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_DPMS, XfpmDpmsPrivate))
|
||||
|
||||
+static void
|
||||
+set_saver(Display *dpy, int value)
|
||||
+{
|
||||
+ int timeout, interval, prefer_blank, allow_exp;
|
||||
+
|
||||
+ XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
|
||||
+ timeout = value;
|
||||
+ XSetScreenSaver(dpy, timeout, timeout, prefer_blank, allow_exp);
|
||||
+}
|
||||
+
|
||||
struct XfpmDpmsPrivate
|
||||
{
|
||||
XfpmXfconf *conf;
|
||||
@@ -75,6 +85,7 @@ xfpm_dpms_set_timeouts (XfpmDpms *dpms, guint16 standby, guint16 suspend, guint
|
||||
DPMSSetTimeouts (GDK_DISPLAY(), standby,
|
||||
suspend,
|
||||
off );
|
||||
+ set_saver(GDK_DISPLAY(), standby);
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Calculate format=diff
|
||||
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
|
||||
index e9acaa0..a08f42c 100644
|
||||
--- a/src/xfpm-manager.c
|
||||
+++ b/src/xfpm-manager.c
|
||||
@@ -441,12 +441,9 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
|
||||
{
|
||||
XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
|
||||
|
||||
- if ( action == LID_TRIGGER_NOTHING )
|
||||
- {
|
||||
- if ( !xfpm_is_multihead_connected () )
|
||||
- xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
|
||||
- }
|
||||
- else if ( action == LID_TRIGGER_LOCK_SCREEN )
|
||||
+ if ( action != LID_TRIGGER_NOTHING && !xfpm_is_multihead_connected () )
|
||||
+ xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
|
||||
+ if ( action == LID_TRIGGER_LOCK_SCREEN )
|
||||
{
|
||||
if ( !xfpm_is_multihead_connected () )
|
||||
{
|
||||
@@ -472,7 +469,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
|
||||
else
|
||||
{
|
||||
XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID opened");
|
||||
-
|
||||
+ g_usleep (1000000);
|
||||
xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOn);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue