ref: 0153ac73e77b59baacb2b6b4220a0e45d784ed22
parent: 515a0d5fafddf8abecfd01e130619841584ef28b
author: halfwit <michaelmisch1985@gmail.com>
date: Sat Oct 10 07:20:07 PDT 2020
Move back to pointers
--- a/keyboard.c
+++ b/keyboard.c
@@ -57,7 +57,7 @@
{
wchar_t rune;
- if (c9read(x9di.ctx, &x9di.keybd->tag, x9di.keybd->fid, x9di.keybd->wroff, 1) != 1)
+ if (c9read(x9di.ctx, &x9di->keybd->tag, x9di->keybd->fid, x9di->keybd->wroff, 1) != 1)
return 0;
rune = x9di.keybd->rdbuf[0];
--- a/mouse.c
+++ b/mouse.c
@@ -53,7 +53,7 @@
int n;
/* Magic numbers here are the size of a message from /dev/mouse and its offsets */
- if((n = c9read(x9di.ctx, &x9di.mouse->tag, x9di.mouse.f, x9di.mouse->wroff, 1 + 4 * 12)) <= 0)
+ if((n = c9read(x9di.ctx, &x9di->mouse->tag, x9di->mouse.f, x9di->mouse->wroff, 1 + 4 * 12)) <= 0)
return 0;
if (n != 1 + 4 * 12)
--- a/x9dev.c
+++ b/x9dev.c
@@ -182,12 +182,12 @@
x9di.fb = malloc(x9di.bpl * x9di.height);
sprintf(path, "%s/mouse", _display->devdir);
- c9walk(x9di.ctx, &x9di.mouse->tag, 1, x9di.mouse.f, &path);
- c9open(x9di.ctx, &x9di.mouse->tag, x9di.mouse.f, O_RDWR|O_NONBLOCK);
+ c9walk(x9di.ctx, &x9di->mouse->tag, 1, x9di->mouse.f, &path);
+ c9open(x9di.ctx, &x9di->mouse->tag, x9di->mouse.f, O_RDWR|O_NONBLOCK);
sprintf(path, "%s/cons", _display->devdir);
- c9walk(x9di.ctx, &x9di.mouse->tag, 1, x9di.keybd.f, &path);
- c9open(x9di.ctx, &x9di.keybd->tag, x9di.keybd.f, O_RDONLY|O_NONBLOCK);
+ c9walk(x9di.ctx, &x9di->keybd->tag, 1, x9di->keybd.f, &path);
+ c9open(x9di.ctx, &x9di->keybd->tag, x9di->keybd.f, O_RDONLY|O_NONBLOCK);
sprintf(path, "%s/consctl", _display->devdir);
c9walk(x9di.ctx, &cons, 1, cfd, &path);