| /branches/network/uspace/app/tetris/input.c |
|---|
| 57,7 → 57,8 |
| #include "tetris.h" |
| #include <async.h> |
| #include "../../srv/console/console.h" |
| #include <ipc/console.h> |
| #include <kbd/kbd.h> |
| /* return true iff the given timeval is positive */ |
| #define TV_POS(tv) \ |
| 111,10 → 112,11 |
| s = NULL; |
| if (!lastchar) { |
| again: |
| if (!getchar_inprog) { |
| cons_phone = get_cons_phone(); |
| cons_phone = get_console_phone(); |
| getchar_inprog = async_send_2(cons_phone, |
| CONSOLE_GETCHAR, 0, 0, &charcall); |
| CONSOLE_GETKEY, 0, 0, &charcall); |
| } |
| if (!s) |
| async_wait_for(getchar_inprog, &rc); |
| 127,7 → 129,10 |
| if (rc) { |
| stop("end of file, help"); |
| } |
| lastchar = IPC_GET_ARG1(charcall); |
| if (IPC_GET_ARG1(charcall) == KE_RELEASE) |
| goto again; |
| lastchar = IPC_GET_ARG4(charcall); |
| } |
| if (tvp) { |
| /* since there is input, we may not have timed out */ |
| /branches/network/uspace/app/tetris/screen.c |
|---|
| 50,13 → 50,12 |
| #include <stdlib.h> |
| #include <string.h> |
| #include <unistd.h> |
| #include <io/stream.h> |
| #include <console.h> |
| #include <async.h> |
| #include "screen.h" |
| #include "tetris.h" |
| #include "../../srv/console/console.h" |
| #include <ipc/console.h> |
| static cell curscreen[B_SIZE]; /* 1 => standout (or otherwise marked) */ |
| static int curscore; |
| 73,29 → 72,19 |
| putchar(*(s++)); |
| } |
| static int con_phone; |
| static void set_style(int fgcolor, int bgcolor) |
| { |
| async_msg_2(con_phone, CONSOLE_SET_STYLE, fgcolor, bgcolor); |
| } |
| static void start_standout(void) |
| { |
| set_style(0xf0f0f0, 0); |
| console_set_rgb_color(0xf0f0f0, 0); |
| } |
| static void resume_normal(void) |
| { |
| set_style(0, 0xf0f0f0); |
| console_set_rgb_color(0, 0xf0f0f0); |
| } |
| void clear_screen(void) |
| { |
| async_msg_0(con_phone, CONSOLE_CLEAR); |
| console_clear(); |
| moveto(0, 0); |
| } |
| 107,7 → 96,7 |
| { |
| resume_normal(); |
| async_msg_0(con_phone, CONSOLE_CLEAR); |
| console_clear(); |
| curscore = -1; |
| memset((char *)curscreen, 0, sizeof(curscreen)); |
| } |
| 118,8 → 107,7 |
| void |
| scr_init(void) |
| { |
| con_phone = get_cons_phone(); |
| async_msg_1(con_phone, CONSOLE_CURSOR_VISIBILITY, 0); |
| console_cursor_visibility(0); |
| resume_normal(); |
| scr_clear(); |
| } |
| 126,12 → 114,12 |
| void moveto(int r, int c) |
| { |
| async_msg_2(con_phone, CONSOLE_GOTO, r, c); |
| console_goto(r, c); |
| } |
| static void fflush(void) |
| { |
| async_msg_0(con_phone, CONSOLE_FLUSH); |
| console_flush(); |
| } |
| winsize_t winsize; |
| 138,8 → 126,7 |
| static int get_display_size(winsize_t *ws) |
| { |
| return async_req_0_2(con_phone, CONSOLE_GETSIZE, &ws->ws_row, |
| &ws->ws_col); |
| return console_get_size(&ws->ws_row, &ws->ws_col); |
| } |
| /* |
| /branches/network/uspace/app/tetris/screen.h |
|---|
| 49,8 → 49,8 |
| #include <async.h> |
| typedef struct { |
| ipcarg_t ws_row; |
| ipcarg_t ws_col; |
| int ws_row; |
| int ws_col; |
| } winsize_t; |
| extern winsize_t winsize; |
| /branches/network/uspace/app/tetris/Makefile |
|---|
| 1,5 → 1,6 |
| LIBC_PREFIX = ../../lib/libc |
| SOFTINT_PREFIX = ../../lib/softint |
| include $(LIBC_PREFIX)/Makefile.toolchain |
| LIBS = $(LIBC_PREFIX)/libc.a |
| 18,7 → 19,7 |
| $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend |
| $(OUTPUT): $(OBJECTS) $(LIBS) |
| $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map |
| $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map |
| clean: |
| -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o |