summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
Diffstat (limited to 'addons')
-rw-r--r--addons/fake/fake.c28
-rw-r--r--addons/fake/fake.out11
2 files changed, 16 insertions, 23 deletions
diff --git a/addons/fake/fake.c b/addons/fake/fake.c
index ad0f83ee..818c8ea3 100644
--- a/addons/fake/fake.c
+++ b/addons/fake/fake.c
@@ -30,7 +30,7 @@ typedef struct {
static int init(const pa_api *a) {
api = a;
- return 0;
+ return PA_OK;
}
static void *open(const char *path, const uint8_t *bytes, uint64_t len) {
@@ -45,8 +45,9 @@ static void *open(const char *path, const uint8_t *bytes, uint64_t len) {
static void close(void *st) { (void)st; }
-static uint64_t tick(void *st, uint64_t now) {
+static uint64_t tick(void *st, uint64_t now, uint32_t flags) {
fake *f = st;
+ (void)flags;
f->ticks++;
return f->ticks < 3 ? now + 100000000u : 0; /* ten a second, three times */
}
@@ -63,13 +64,13 @@ static void paint(void *st, const pa_window *w, pa_paint *out) {
fake *f = st;
char line[48] = "count ";
num(line + 6, f ? f->count : 0);
- pa_put(w, 0, 0, line, PA_INDEX(2), PA_DEFAULT);
- if (f && f->last[0]) pa_put(w, 1, 0, f->last, PA_DEFAULT, PA_DEFAULT);
+ pa_put(w, 0, 0, line, PA_INDEX(2), PA_DEFAULT, 0);
+ if (f && f->last[0]) pa_put(w, 1, 0, f->last, PA_DEFAULT, PA_DEFAULT, 0);
const char *p = "fake";
for (out->prefix_len = 0; p[out->prefix_len]; out->prefix_len++) out->prefix[out->prefix_len] = p[out->prefix_len];
if (f && out->cap > 0 && w->rows > 2) {
pa_placement *pl = &out->placements[out->n++];
- *pl = (pa_placement){.rgba = f->pixels, .w = 2, .h = 2, .stride = 8, .src = {0, 0, 2, 2}, .dst = {0, 2, 2, 1}, .key = f->count};
+ *pl = (pa_placement){.rgba = f->pixels, .w = 2, .h = 2, .src = {0, 0, 2, 2}, .dst = {0, 2, 2, 1}, .key = f->count};
}
}
@@ -96,10 +97,7 @@ static uint64_t body_len(void *st) { (void)st; return 6; }
static uint32_t body(void *st, uint64_t off, char *buf, uint32_t n) {
(void)st;
- const char *text = "fake\n\n";
- uint32_t k = 0;
- while (off + k < 6 && k < n) { buf[k] = text[off + k]; k++; }
- return k;
+ return pa_copy("fake\n\n", 6, off, buf, n);
}
static int address(void *st, const char *text, uint32_t n) {
@@ -131,9 +129,9 @@ static int ctl(void *st, const char *line, uint32_t n, char *reply, uint32_t cap
unsigned by = 0;
for (uint32_t i = 9; i < n && line[i] >= '0' && line[i] <= '9'; i++) by = by * 10 + (unsigned)(line[i] - '0');
f->count += by ? by : 1;
- return 0;
+ return PA_OK;
}
- if (n >= 7 && line[4] == 'J') return api->job("abc", 3) ? 0 : 1;
+ if (n >= 7 && line[4] == 'J') return api->job("abc", 3) ? PA_OK : 1;
const char *no = "no such fake word";
uint32_t k = 0;
while (no[k] && k + 1 < cap) { reply[k] = no[k]; k++; }
@@ -174,14 +172,14 @@ static int load(void *st, const uint8_t *buf, uint32_t n, uint32_t version) {
fake *f = st;
if (n != 4 || version > 1) return 1;
f->count = (unsigned)buf[0] | (unsigned)buf[1] << 8 | (unsigned)buf[2] << 16 | (unsigned)buf[3] << 24;
- return 0;
+ return PA_OK;
}
#endif
static const pa_word words[] = {
- {.size = sizeof(pa_word), .name = FAKE_WORD, .leader = "zf", .opens = 1, .doc = "a fake pane, counting"},
- {.size = sizeof(pa_word), .name = "FakeBump", .arg = PA_ARG_OPTIONAL, .doc = "add to the count"},
- {.size = sizeof(pa_word), .name = "FakeJob", .doc = "count a job's answer"},
+ PA_WORD(FAKE_WORD, "zf", PA_ARG_NONE, 1, "a fake pane, counting"),
+ PA_WORD("FakeBump", 0, PA_ARG_OPTIONAL, 0, "add to the count"),
+ PA_WORD("FakeJob", 0, PA_ARG_NONE, 0, "count a job's answer"),
};
const pa_ops pardes_addon = {
diff --git a/addons/fake/fake.out b/addons/fake/fake.out
index 40b958f8..7a09e97a 100644
--- a/addons/fake/fake.out
+++ b/addons/fake/fake.out
@@ -1,5 +1,6 @@
> seed 7
> size 60 20
+window 58x8
tag fake
|count 0
|
@@ -19,7 +20,6 @@ tag fake
|
|
|
-|
placement 2x2 src 0,0 2x2 over 0,2 2x1 key fdcaab9076ad067e
> click 3 1
tag fake
@@ -30,7 +30,6 @@ tag fake
|
|
|
-|
placement 2x2 src 0,0 2x2 over 0,2 2x1 key 71e39225f0cec2a5
> FakeBump 10
tag fake
@@ -41,19 +40,17 @@ tag fake
|
|
|
-|
placement 2x2 src 0,0 2x2 over 0,2 2x1 key 54740e23065232cf
> FakeJob
tag fake
-|count 13
+|count 19
|m3
|
|
|
|
|
-|
-placement 2x2 src 0,0 2x2 over 0,2 2x1 key 54740e23065232cf
+placement 2x2 src 0,0 2x2 over 0,2 2x1 key 540d6c1b4eee5716
> tick 100
tag fake
|count 19
@@ -63,7 +60,6 @@ tag fake
|
|
|
-|
placement 2x2 src 0,0 2x2 over 0,2 2x1 key 540d6c1b4eee5716
> settle
tag fake
@@ -74,5 +70,4 @@ tag fake
|
|
|
-|
placement 2x2 src 0,0 2x2 over 0,2 2x1 key 540d6c1b4eee5716