chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename xacpi-simple
[chiark-utils.git]
/
cprogs
/
xbatmon-simple.c
diff --git
a/cprogs/xacpi-simple.c
b/cprogs/xbatmon-simple.c
similarity index 98%
rename from
cprogs/xacpi-simple.c
rename to
cprogs/xbatmon-simple.c
index 7324080353fb518ac1330b83d14e54133edb4f24..62a7f258fbb6590ba7318eb786cb7c0cb7bfd7eb 100644
(file)
--- a/
cprogs/xacpi-simple.c
+++ b/
cprogs/xbatmon-simple.c
@@
-61,7
+61,7
@@
#define TIMEOUT 5000 /* milliseconds */
#define TIMEOUT_ONERROR 3333 /* milliseconds */
#define TIMEOUT 5000 /* milliseconds */
#define TIMEOUT_ONERROR 3333 /* milliseconds */
-static const char program_name[]= "x
acpi
-simple";
+static const char program_name[]= "x
batmon
-simple";
static int debug=-1, alarmlevel;
/*---------- general utility stuff and declarations ----------*/
static int debug=-1, alarmlevel;
/*---------- general utility stuff and declarations ----------*/
@@
-521,13
+521,20
@@
static const char *getresource(const char *want) {
int r;
assert(strlen(want) < 128);
int r;
assert(strlen(want) < 128);
+
+ sprintf(name_buf,"xbatmon-simple.%s",want);
+ sprintf(class_buf,"Xbatmon-Simple.%s",want);
+
+ r= XrmGetResource(xrm, name_buf,class_buf, &rep_type_dummy, &val);
+ if (r) return val.addr;
+
sprintf(name_buf,"xacpi-simple.%s",want);
sprintf(class_buf,"Xacpi-Simple.%s",want);
r= XrmGetResource(xrm, name_buf,class_buf, &rep_type_dummy, &val);
sprintf(name_buf,"xacpi-simple.%s",want);
sprintf(class_buf,"Xacpi-Simple.%s",want);
r= XrmGetResource(xrm, name_buf,class_buf, &rep_type_dummy, &val);
- if (!r) return
0
;
+ if (!r) return
val.addr
;
- return
val.addr
;
+ return
0
;
}
static int getresource_bool(const char *want, int def, int *cache) {
}
static int getresource_bool(const char *want, int def, int *cache) {