slackware-current/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff
Patrick J Volkerding 646a5c1cbf Mon May 28 19:12:29 UTC 2018
a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.
2018-05-31 23:39:35 +02:00

51 lines
1.9 KiB
Diff

--- ./panel-plugin/systemload.c.orig 2017-02-09 13:22:46.000000000 -0600
+++ ./panel-plugin/systemload.c 2018-04-15 14:28:15.729304272 -0500
@@ -55,6 +55,8 @@
static gchar *DEFAULT_COLOR[] = { "#0000c0", "#00c000", "#f0f000" };
static gchar *DEFAULT_COMMAND_TEXT = "xfce4-taskmanager";
+/* HOVER_TIMEOUT is a fixed constant in gtk+-3; this must match - Aargh */
+#define HOVER_TIMEOUT 500
#define UPDATE_TIMEOUT 250
#define UPDATE_TIMEOUT_SECONDS 1
@@ -107,6 +109,7 @@
guint timeout, timeout_seconds;
gboolean use_timeout_seconds;
guint timeout_id;
+ guint tooltip_timeout;
t_command command;
t_monitor *monitor[3];
t_uptime_monitor *uptime;
@@ -174,6 +177,9 @@
global->monitor[count]->value_read / 100.0);
}
}
+/* don't write tooltip too often */
+ if((global->tooltip_timeout += global->timeout) <= HOVER_TIMEOUT) return TRUE;
+ global->tooltip_timeout = 0;
if (global->monitor[0]->options.enabled)
{
g_snprintf(caption, sizeof(caption), _("System Load: %ld%%"),
@@ -338,6 +344,7 @@
#endif
global->plugin = plugin;
global->timeout = UPDATE_TIMEOUT;
+ global->tooltip_timeout = 0;
global->timeout_seconds = UPDATE_TIMEOUT_SECONDS;
global->use_timeout_seconds = TRUE;
global->timeout_id = 0;
@@ -435,13 +442,6 @@
}
#endif
global->timeout_id = g_timeout_add(global->timeout, (GSourceFunc)update_monitors, global);
- /* reduce the default tooltip timeout to be smaller than the update interval otherwise
- * we won't see tooltips on GTK 2.16 or newer */
- settings = gtk_settings_get_default();
- if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
- g_object_set(settings, "gtk-tooltip-timeout",
- global->timeout - 10, NULL);
-
}
static void