d6
/
uxn11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Began moving some devices to a ram page

This commit is contained in:
neauoire 2022-04-05 11:01:23 -07:00
parent 121f61e459
commit dba7b1f486
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/uxn11.c
View File

@ -63,6 +63,8 @@ uxn11_dei(struct Uxn *u, Uint8 addr)
Device *d = &u->dev[addr >> 4]; Device *d = &u->dev[addr >> 4];
switch(addr & 0xf0) { switch(addr & 0xf0) {
case 0x20: return screen_dei(d->dat, p); break; case 0x20: return screen_dei(d->dat, p); break;
case 0x80: return u->dpg[0x80 + p]; break;
case 0x90: return u->dpg[0x90 + p]; break;
case 0xa0: return file_dei(0, d->dat, p); break; case 0xa0: return file_dei(0, d->dat, p); break;
case 0xb0: return file_dei(1, d->dat, p); break; case 0xb0: return file_dei(1, d->dat, p); break;
case 0xc0: return datetime_dei(d->dat, p); break; case 0xc0: return datetime_dei(d->dat, p); break;
@ -80,6 +82,8 @@ uxn11_deo(Uxn *u, Uint8 addr, Uint8 v)
case 0x00: system_deo(u, d->dat, p); break; case 0x00: system_deo(u, d->dat, p); break;
case 0x10: console_deo(d->dat, p); break; case 0x10: console_deo(d->dat, p); break;
case 0x20: screen_deo(u->ram, d->dat, p); break; case 0x20: screen_deo(u->ram, d->dat, p); break;
case 0x80: u->dpg[0x80 + p] = v; break;
case 0x90: u->dpg[0x90 + p] = v; break;
case 0xa0: file_deo(0, u->ram, d, p); break; case 0xa0: file_deo(0, u->ram, d, p); break;
case 0xb0: file_deo(1, u->ram, d, p); break; case 0xb0: file_deo(1, u->ram, d, p); break;
} }
@ -142,26 +146,26 @@ processEvent(Uxn *u)
KeySym sym; KeySym sym;
char buf[7]; char buf[7];
XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0); XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0);
controller_down(u, u->dev[0x8].dat, get_button(sym)); controller_down(u, &u->dpg[0x80], get_button(sym));
controller_key(u, u->dev[0x8].dat, sym < 0x80 ? sym : buf[0]); controller_key(u, &u->dpg[0x80], sym < 0x80 ? sym : buf[0]);
} break; } break;
case KeyRelease: { case KeyRelease: {
KeySym sym; KeySym sym;
char buf[7]; char buf[7];
XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0); XLookupString((XKeyPressedEvent *)&ev, buf, 7, &sym, 0);
controller_up(u, u->dev[0x8].dat, get_button(sym)); controller_up(u, &u->dpg[0x80], get_button(sym));
} break; } break;
case ButtonPress: { case ButtonPress: {
XButtonPressedEvent *e = (XButtonPressedEvent *)&ev; XButtonPressedEvent *e = (XButtonPressedEvent *)&ev;
mouse_down(u, u->dev[0x9].dat, 0x1 << (e->button - 1)); mouse_down(u, &u->dpg[0x90], 0x1 << (e->button - 1));
} break; } break;
case ButtonRelease: { case ButtonRelease: {
XButtonPressedEvent *e = (XButtonPressedEvent *)&ev; XButtonPressedEvent *e = (XButtonPressedEvent *)&ev;
mouse_up(u, u->dev[0x9].dat, 0x1 << (e->button - 1)); mouse_up(u, &u->dpg[0x90], 0x1 << (e->button - 1));
} break; } break;
case MotionNotify: { case MotionNotify: {
XMotionEvent *e = (XMotionEvent *)&ev; XMotionEvent *e = (XMotionEvent *)&ev;
mouse_pos(u, u->dev[0x9].dat, e->x, e->y); mouse_pos(u, &u->dpg[0x90], e->x, e->y);
} break; } break;
} }
} }