summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoroda2019-05-08 12:31:20 +0900
committeroda2019-05-08 12:31:20 +0900
commit62339ad0739e729b5aa4beb6a46c584903b931a2 (patch)
tree96a6bb7ea64ad336b8e009449d137426d8420dc8
parent8823aace78d6e841fca93b1f6aad816ec1fbfa0f (diff)
downloadaur-62339ad0739e729b5aa4beb6a46c584903b931a2.tar.gz
update to v0.2.0
-rw-r--r--.SRCINFO8
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD6
-rw-r--r--config.def.h (renamed from config.h)36
4 files changed, 36 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 202bfce8b00..fd36273a764 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = bspwmbar
pkgdesc = A lightweight status bar for bspwm
- pkgver = 0.1.3
+ pkgver = 0.2.0
pkgrel = 1
url = https://github.com/odknt/bspwmbar
arch = x86_64
@@ -9,9 +9,9 @@ pkgbase = bspwmbar
depends = alsa-lib
depends = libxft
depends = fontconfig
- source = https://github.com/odknt/bspwmbar/archive/v0.1.3.tar.gz
- source = config.h
- sha256sums = 77911b0586fe002e2758032308f770fbc9e687b06fd8c2a25512a0b734b8f48e
+ source = https://github.com/odknt/bspwmbar/archive/v0.2.0.tar.gz
+ source = config.def.h
+ sha256sums = 0f81370e64ae2946dd585ae2e09150b174834a6238d0eb5365ec3ca40981cca2
sha256sums = SKIP
pkgname = bspwmbar
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..f54a95dc560
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+config.h
+v*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 1868bb8f2cb..70cc9a04154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# maintainer: odknt <oda.kenta.hj at gmail.com>
pkgname=bspwmbar
-pkgver=0.1.3
+pkgver=0.2.0
pkgrel=1
pkgdesc='A lightweight status bar for bspwm'
arch=(x86_64)
@@ -8,8 +8,8 @@ license=('ISC')
url='https://github.com/odknt/bspwmbar'
depends=(bspwm alsa-lib libxft fontconfig)
source=("https://github.com/odknt/bspwmbar/archive/v${pkgver}.tar.gz"
- 'config.h')
-sha256sums=('77911b0586fe002e2758032308f770fbc9e687b06fd8c2a25512a0b734b8f48e'
+ 'config.def.h')
+sha256sums=('0f81370e64ae2946dd585ae2e09150b174834a6238d0eb5365ec3ca40981cca2'
'SKIP')
prepare() {
diff --git a/config.h b/config.def.h
index 22acb04f45d..b90d62a4da2 100644
--- a/config.h
+++ b/config.def.h
@@ -3,20 +3,27 @@
#ifndef BSPWMBAR_CONFIG_H_
#define BSPWMBAR_CONFIG_H_
-#define THERMAL_PATH "/sys/class/hwmon/hwmon1/temp1_input"
+#include "bspwmbar.h"
+/* intel */
+#define THERMAL_PATH "/sys/class/thermal/thermal_zone0/temp"
+/* k10temp */
+/* #define THERMAL_PATH "/sys/class/hwmon/hwmon1/temp1_input" */
+
+#define FONT_MAXSZ 3
#define NAME_MAXSZ 32
#define TITLE_MAXSZ 50
#define WS_MAXSZ 5
#define BAR_HEIGHT 24
-
#define BGCOLOR 0
#define ALTFGCOLOR 1
#define ALTBGCOLOR 8
#define FGCOLOR 2
#define LOGOCOLOR 3
-static const char *colors[] = {
+const char *workspace_chars[] = { "", "" };
+
+const char *colors[] = {
"#222222", /* black */
"#7f7f7f", /* gray */
"#e5e5e5", /* white */
@@ -30,19 +37,30 @@ static const char *colors[] = {
"#555555", /* dark gray */
};
-static const char *fontname = "sans-serif:size=10";
+const char *fontname = "sans-serif:size=10";
+
+/* init, deinit, handler for polling fd */
+const Poller pollers[] = {
+ /* init deinit handler */
+ { alsa_connect, alsa_disconnect, alsa_update },
+};
/* for modules on the right (float: right;) */
-static Module modules[] = {
+const Module modules[] = {
/* function argument event handler */
+ /* float: left; */
+ { logo, "", NULL },
+ { workspace, NULL, NULL },
+ { windowtitle, "…", NULL },
+
+ /* float: right; */
+ { float_right, NULL, NULL },
{ datetime, "%H:%M", NULL },
{ thermal, THERMAL_PATH, NULL },
{ filesystem, "/", NULL },
{ volume, NULL, volume_ev },
- /*
- { memory, NULL, NULL },
- { loadavg, NULL, NULL },
- */
+ { memgraph, NULL, NULL },
+ { cpugraph, NULL, NULL },
};
#endif