mirror of
https://git.freebsd.org/ports.git
synced 2025-06-01 02:46:27 -04:00
Convert the patch into PATCHFILES: ports tree is not the best place for
storing code. Discussed with: eadler
This commit is contained in:
Alexey Dokuchaev
parent
6f8f7e3c5c
commit
d56c334b31
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=313858
3 changed files with 5 additions and 283 deletions
|
|
@ -23,7 +23,9 @@ TEMPERATURE_DESC= Build with temperature widget (for CPU, etc.)
|
|||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${PORT_OPTIONS:MTEMPERATURE}
|
||||
EXTRA_PATCHES= ${FILESDIR}/extra-patch-temperature-widget
|
||||
PATCH_SITES= ${MASTER_SITE_LOCAL}
|
||||
PATCH_SITE_SUBDIR= danfe
|
||||
PATCHFILES= ${PORTNAME}-temperature-widget.diff
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
|
|
|
|||
|
|
@ -1,2 +1,4 @@
|
|||
SHA256 (bmpanel2-2.1pre1.tar.gz) = 56c316ea3cd35ae033610d073b7d532c6a12070f9c349ec3c09e85c60591564c
|
||||
SIZE (bmpanel2-2.1pre1.tar.gz) = 386297
|
||||
SHA256 (bmpanel2-temperature-widget.diff) = 47d980108a7385c0f1e2b221fafa0e53c3384ec74cb921779580cb8aa6988972
|
||||
SIZE (bmpanel2-temperature-widget.diff) = 7636
|
||||
|
|
|
|||
|
|
@ -1,282 +0,0 @@
|
|||
--- CMakeLists.txt.orig 2013-03-08 16:05:26.000000000 +0800
|
||||
+++ CMakeLists.txt 2013-02-26 15:42:05.000000000 +0800
|
||||
@@ -30,6 +30,7 @@
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/widget-systray.c
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/widget-launchbar.c
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/widget-empty.c
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/widget-temperature.c
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/render-normal.c
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/render-pseudo.c
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/args.c
|
||||
--- bmpanel.c.orig 2009-11-01 13:50:26.000000000 +0800
|
||||
+++ bmpanel.c 2013-03-08 11:58:46.000000000 +0800
|
||||
@@ -290,6 +290,7 @@
|
||||
register_widget_interface(&desktops_interface);
|
||||
register_widget_interface(&taskbar_interface);
|
||||
register_widget_interface(&clock_interface);
|
||||
+ register_widget_interface(&temperature_interface);
|
||||
register_widget_interface(&decor_interface);
|
||||
register_widget_interface(&systray_interface);
|
||||
register_widget_interface(&launchbar_interface);
|
||||
--- builtin-widgets.h.orig 2009-11-01 13:50:26.000000000 +0800
|
||||
+++ builtin-widgets.h 2013-03-08 12:10:45.000000000 +0800
|
||||
@@ -92,6 +92,18 @@
|
||||
extern struct widget_interface clock_interface;
|
||||
|
||||
/**************************************************************************
|
||||
+ Temperature (for CPU, etc.)
|
||||
+**************************************************************************/
|
||||
+
|
||||
+struct temperature_widget {
|
||||
+ struct triple_image background;
|
||||
+ struct text_info font;
|
||||
+ char *sysctl_oid;
|
||||
+};
|
||||
+
|
||||
+extern struct widget_interface temperature_interface;
|
||||
+
|
||||
+/**************************************************************************
|
||||
Desktop Switcher
|
||||
**************************************************************************/
|
||||
|
||||
--- widget-temperature.c.orig 1970-01-01 08:00:00.000000000 +0800
|
||||
+++ widget-temperature.c 2013-03-08 15:55:36.000000000 +0800
|
||||
@@ -0,0 +1,218 @@
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+#include <math.h>
|
||||
+
|
||||
+#include "settings.h"
|
||||
+#include "builtin-widgets.h"
|
||||
+
|
||||
+static int create_widget_private(struct widget *w,
|
||||
+ struct config_format_entry *e, struct config_format_tree *tree);
|
||||
+static void destroy_widget_private(struct widget *w);
|
||||
+static void draw(struct widget *w);
|
||||
+static void clock_tick(struct widget *w);
|
||||
+static int get_temperature(const char *sysctl_oid);
|
||||
+static void hsv2rgb(float h, float s, float v, float *r, float *g, float *b);
|
||||
+
|
||||
+struct widget_interface temperature_interface = {
|
||||
+ .theme_name = "temperature",
|
||||
+ .size_type = WIDGET_SIZE_CONSTANT,
|
||||
+ .create_widget_private = create_widget_private,
|
||||
+ .destroy_widget_private = destroy_widget_private,
|
||||
+ .draw = draw,
|
||||
+ .clock_tick = clock_tick,
|
||||
+};
|
||||
+
|
||||
+/* current temperature */
|
||||
+int curtemp;
|
||||
+
|
||||
+/**************************************************************************
|
||||
+ Temperature "theme" (widget, really)
|
||||
+**************************************************************************/
|
||||
+
|
||||
+static int parse_temperature_theme(struct temperature_widget *tw,
|
||||
+ struct config_format_entry *e, struct config_format_tree *tree)
|
||||
+{
|
||||
+ if (parse_text_info_named(&tw->font, "font", e, 1))
|
||||
+ return -1;
|
||||
+
|
||||
+ parse_triple_image_named(&tw->background, "background", e, tree, 0);
|
||||
+ tw->sysctl_oid = parse_string("sysctl_oid", e,
|
||||
+ "hw.acpi.thermal.tz0.temperature");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/**************************************************************************
|
||||
+ Temperature interface
|
||||
+**************************************************************************/
|
||||
+
|
||||
+static int create_widget_private(struct widget *w,
|
||||
+ struct config_format_entry *e, struct config_format_tree *tree)
|
||||
+{
|
||||
+ struct temperature_widget *tw = xmallocz(sizeof(struct temperature_widget));
|
||||
+ if (parse_temperature_theme(tw, e, tree)) {
|
||||
+ xfree(tw);
|
||||
+ XWARNING("Failed to parse temperature theme");
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ /* get widget width */
|
||||
+ int text_width = 0;
|
||||
+ int pics_width = 0;
|
||||
+
|
||||
+ /* this should give us enough width for any real temperature */
|
||||
+ char buftemp[8] = "999°";
|
||||
+
|
||||
+ text_extents(w->panel->layout, tw->font.pfd, buftemp, &text_width, 0);
|
||||
+
|
||||
+ /* background is drawn only if the center is here */
|
||||
+ if (tw->background.center) {
|
||||
+ pics_width += image_width(tw->background.left);
|
||||
+ pics_width += image_width(tw->background.right);
|
||||
+ }
|
||||
+
|
||||
+ w->width = text_width + pics_width;
|
||||
+ w->private = tw;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void destroy_widget_private(struct widget *w)
|
||||
+{
|
||||
+ struct temperature_widget *tw = (struct temperature_widget *)w->private;
|
||||
+
|
||||
+ free_triple_image(&tw->background);
|
||||
+ free_text_info(&tw->font);
|
||||
+ xfree(tw->sysctl_oid);
|
||||
+ xfree(tw);
|
||||
+}
|
||||
+
|
||||
+static void draw(struct widget *w)
|
||||
+{
|
||||
+ struct temperature_widget *tw = (struct temperature_widget *)w->private;
|
||||
+ char buftemp[8];
|
||||
+ int temp;
|
||||
+ static int blink;
|
||||
+ float r, g, b;
|
||||
+
|
||||
+ temp = get_temperature(tw->sysctl_oid);
|
||||
+ blink = temp > 95 ? !blink : 0;
|
||||
+
|
||||
+ if (blink)
|
||||
+ *buftemp = '\0';
|
||||
+ else
|
||||
+ snprintf(buftemp, sizeof(buftemp), "%d°", temp);
|
||||
+
|
||||
+ /* drawing */
|
||||
+ cairo_t *cr = w->panel->cr;
|
||||
+ int x = w->x;
|
||||
+
|
||||
+ /* calcs */
|
||||
+ int leftw = 0;
|
||||
+ int rightw = 0;
|
||||
+ int centerw = w->width;
|
||||
+
|
||||
+ /* draw background only if the center image is here */
|
||||
+ if (tw->background.center) {
|
||||
+ leftw += image_width(tw->background.left);
|
||||
+ rightw += image_width(tw->background.right);
|
||||
+ centerw -= leftw + rightw;
|
||||
+
|
||||
+ /* left part */
|
||||
+ if (leftw)
|
||||
+ blit_image(tw->background.left, cr, x, 0);
|
||||
+ x += leftw;
|
||||
+
|
||||
+ /* center part */
|
||||
+ pattern_image(tw->background.center, cr, x, 0, centerw, 1);
|
||||
+ x += centerw;
|
||||
+
|
||||
+ /* right part */
|
||||
+ if (rightw)
|
||||
+ blit_image(tw->background.right, cr, x, 0);
|
||||
+ x -= centerw;
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * map temperature (30C~100C) to the text color: from nice blueish
|
||||
+ * 0%R, 60%G, 100%B (HSV: 200, 100%, 100%) to reddish 100%R, 0%G,
|
||||
+ * 0%B (HSV: 0, 100%, 100%) through the hue shift (think rainbow).
|
||||
+ */
|
||||
+ hsv2rgb(.56 * (1 - (temp - 30) / 70.0), 1, 1, &r, &g, &b);
|
||||
+ tw->font.color[0] = 255 * r;
|
||||
+ tw->font.color[1] = 255 * g;
|
||||
+ tw->font.color[2] = 255 * b;
|
||||
+
|
||||
+ /* text */
|
||||
+ draw_text(cr, w->panel->layout, &tw->font, buftemp, x, 0,
|
||||
+ centerw, w->panel->height, 0);
|
||||
+}
|
||||
+
|
||||
+static void clock_tick(struct widget *w)
|
||||
+{
|
||||
+ struct temperature_widget *tw = (struct temperature_widget *)w->private;
|
||||
+ int temp;
|
||||
+
|
||||
+ if ((temp = get_temperature(tw->sysctl_oid)) < 0)
|
||||
+ return;
|
||||
+
|
||||
+ if (temp > 95)
|
||||
+ w->needs_expose = 1;
|
||||
+
|
||||
+ if (curtemp == temp)
|
||||
+ return;
|
||||
+
|
||||
+ curtemp = temp;
|
||||
+ w->needs_expose = 1;
|
||||
+}
|
||||
+
|
||||
+static int get_temperature(const char *sysctl_oid)
|
||||
+{
|
||||
+ int temp;
|
||||
+ size_t len = sizeof(temp);
|
||||
+
|
||||
+ if (sysctlbyname(sysctl_oid, &temp, &len, NULL, 0))
|
||||
+ return -1;
|
||||
+ return (temp - 2732) / 10;
|
||||
+}
|
||||
+
|
||||
+static void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
|
||||
+{
|
||||
+ float f, p, q, t;
|
||||
+ int i;
|
||||
+
|
||||
+ /* achromatic case, set level of gray */
|
||||
+ if (s <= 0) {
|
||||
+ *r = *g = *b = v;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ h = 6.0 * (h - floorf(h));
|
||||
+
|
||||
+ i = (int)truncf(h); /* should be in the range 0..5 */
|
||||
+ f = h - i; /* fractional part */
|
||||
+ p = v * (1 - s);
|
||||
+ q = v * (1 - s * f);
|
||||
+ t = v * (1 - s * (1 - f));
|
||||
+
|
||||
+ switch (i) {
|
||||
+ case 0:
|
||||
+ *r = v; *g = t; *b = p;
|
||||
+ return;
|
||||
+ case 1:
|
||||
+ *r = q; *g = v; *b = p;
|
||||
+ return;
|
||||
+ case 2:
|
||||
+ *r = p; *g = v; *b = t;
|
||||
+ return;
|
||||
+ case 3:
|
||||
+ *r = p; *g = q; *b = v;
|
||||
+ return;
|
||||
+ case 4:
|
||||
+ *r = t; *g = p; *b = v;
|
||||
+ return;
|
||||
+ case 5:
|
||||
+ default: /* to silence compiler warning */
|
||||
+ *r = v; *g = p; *b = q;
|
||||
+ return;
|
||||
+ }
|
||||
+}
|
||||
--- themes/striped/theme.orig 2009-11-01 13:50:26.000000000 +0800
|
||||
+++ themes/striped/theme 2013-03-08 16:17:55.000000000 +0800
|
||||
@@ -96,6 +96,17 @@
|
||||
|
||||
empty 3
|
||||
|
||||
+temperature
|
||||
+ font DejaVu Sans condensed bold 9
|
||||
+ offset 0 0
|
||||
+ shadow_offset 1 1
|
||||
+ shadow_color 0 0 0
|
||||
+ align right
|
||||
+
|
||||
+ #sysctl_oid dev.cpu.0.temperature
|
||||
+
|
||||
+empty 3
|
||||
+
|
||||
clock
|
||||
font DejaVu Sans condensed bold 9
|
||||
color 247 247 247
|
||||
Loading…
Add table
Reference in a new issue