Index: uspace/app/tetris/Makefile =================================================================== --- uspace/app/tetris/Makefile (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/Makefile (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -34,5 +34,4 @@ shapes.c \ scores.c \ - input.c \ tetris.c \ screen.c Index: uspace/app/tetris/input.c =================================================================== --- uspace/app/tetris/input.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ (revision ) @@ -1,197 +1,0 @@ -/* $OpenBSD: input.c,v 1.12 2005/04/13 02:33:08 deraadt Exp $ */ -/* $NetBSD: input.c,v 1.3 1996/02/06 22:47:33 jtc Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)input.c 8.1 (Berkeley) 5/31/93 - */ - -/** @addtogroup tetris - * @{ - */ -/** @file - */ - -/* - * Tetris input. - */ - -#include -#include -#include - -#include -#include -#include - -#include "input.h" -#include "tetris.h" - -#include -#include -#include -#include - -/* return true iff the given timeval is positive */ -#define TV_POS(tv) \ - ((tv)->tv_sec > 0 || ((tv)->tv_sec == 0 && (tv)->tv_usec > 0)) - -/* subtract timeval `sub' from `res' */ -#define TV_SUB(res, sub) \ - (res)->tv_sec -= (sub)->tv_sec; \ - (res)->tv_usec -= (sub)->tv_usec; \ - if ((res)->tv_usec < 0) { \ - (res)->tv_usec += 1000000; \ - (res)->tv_sec--; \ - } - -/* We will use a hack here - if lastchar is non-zero, it is - * the last character read. We will somehow simulate the select - * semantics. - */ -static aid_t getchar_inprog = 0; -static char lastchar = '\0'; - -/* - * Do a `read wait': select for reading from stdin, with timeout *tvp. - * On return, modify *tvp to reflect the amount of time spent waiting. - * It will be positive only if input appeared before the time ran out; - * otherwise it will be zero or perhaps negative. - * - * If tvp is nil, wait forever, but return if select is interrupted. - * - * Return 0 => no input, 1 => can read() from stdin - * - */ -int rwait(struct timeval *tvp) -{ - struct timeval starttv, endtv, *s; - static ipc_call_t charcall; - sysarg_t rc; - - /* - * Someday, select() will do this for us. - * Just in case that day is now, and no one has - * changed this, we use a temporary. - */ - if (tvp) { - (void) gettimeofday(&starttv, NULL); - endtv = *tvp; - s = &endtv; - } else - s = NULL; - - if (!lastchar) { -again: - if (!getchar_inprog) { - getchar_inprog = async_send_0(fphone(stdin), - CONSOLE_GET_EVENT, &charcall); - } - - if (!s) - async_wait_for(getchar_inprog, &rc); - else if (async_wait_timeout(getchar_inprog, &rc, s->tv_usec) == ETIMEOUT) { - tvp->tv_sec = 0; - tvp->tv_usec = 0; - return (0); - } - - getchar_inprog = 0; - if (rc) - stop("end of file, help"); - - if (IPC_GET_ARG1(charcall) == KEY_RELEASE) - goto again; - - lastchar = IPC_GET_ARG4(charcall); - } - - if (tvp) { - /* since there is input, we may not have timed out */ - (void) gettimeofday(&endtv, NULL); - TV_SUB(&endtv, &starttv); - TV_SUB(tvp, &endtv); /* adjust *tvp by elapsed time */ - } - - return 1; -} - -/* - * `sleep' for the current turn time (using select). - * Eat any input that might be available. - */ -void tsleep(void) -{ - struct timeval tv; - - tv.tv_sec = 0; - tv.tv_usec = fallrate; - while (TV_POS(&tv)) - if (rwait(&tv)) { - lastchar = '\0'; - } else - break; -} - -/* - * getchar with timeout. - */ -int tgetchar(void) -{ - static struct timeval timeleft; - char c; - - /* - * Reset timeleft to fallrate whenever it is not positive. - * In any case, wait to see if there is any input. If so, - * take it, and update timeleft so that the next call to - * tgetchar() will not wait as long. If there is no input, - * make timeleft zero or negative, and return -1. - * - * Most of the hard work is done by rwait(). - */ - if (!TV_POS(&timeleft)) { - faster(); /* go faster */ - timeleft.tv_sec = 0; - timeleft.tv_usec = fallrate; - } - - if (!rwait(&timeleft)) - return -1; - - c = lastchar; - lastchar = '\0'; - return ((int) (unsigned char) c); -} - -/** @} - */ Index: uspace/app/tetris/input.h =================================================================== --- uspace/app/tetris/input.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ (revision ) @@ -1,49 +1,0 @@ -/* $OpenBSD: input.h,v 1.5 2003/06/03 03:01:41 millert Exp $ */ -/* $NetBSD: input.h,v 1.2 1995/04/22 07:42:36 cgd Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)input.h 8.1 (Berkeley) 5/31/93 - */ - -/** @addtogroup tetris - * @{ - */ -/** @file - */ - -extern int rwait(struct timeval *); -extern int tgetchar(void); -extern void tsleep(void); - -/** @} - */ Index: uspace/app/tetris/scores.c =================================================================== --- uspace/app/tetris/scores.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/scores.c (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -1,37 +1,45 @@ -/* $OpenBSD: scores.c,v 1.11 2006/04/20 03:25:36 ray Exp $ */ -/* $NetBSD: scores.c,v 1.2 1995/04/22 07:42:38 cgd Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)scores.c 8.1 (Berkeley) 5/31/93 + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** Attributations + * + * scores.c 8.1 (Berkeley) 5/31/93 + * NetBSD: scores.c,v 1.2 1995/04/22 07:42:38 cgd + * OpenBSD: scores.c,v 1.11 2006/04/20 03:25:36 ray + * + * Based upon BSD Tetris + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. + * Distributed under BSD license. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * */ @@ -60,5 +68,4 @@ #include #include - #include "screen.h" #include "tetris.h" @@ -118,5 +125,5 @@ int j; size_t off; - console_event_t ev; + kbd_event_t ev; clear_screen(); @@ -133,6 +140,6 @@ while (1) { - fflush(stdout); - if (!console_get_event(fphone(stdin), &ev)) + console_flush(console); + if (!console_get_kbd_event(console, &ev)) exit(1); Index: uspace/app/tetris/scores.h =================================================================== --- uspace/app/tetris/scores.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/scores.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -1,37 +1,45 @@ -/* $OpenBSD: scores.h,v 1.5 2003/06/03 03:01:41 millert Exp $ */ -/* $NetBSD: scores.h,v 1.2 1995/04/22 07:42:40 cgd Exp $ */ +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ -/*- +/** Attributations + * + * scores.h 8.1 (Berkeley) 5/31/93 + * NetBSD: scores.h,v 1.2 1995/04/22 07:42:40 cgd + * OpenBSD: scores.h,v 1.5 2003/06/03 03:01:41 millert + * + * Based upon BSD Tetris + * * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. + * Distributed under BSD license. * * This code is derived from software contributed to Berkeley by * Chris Torek and Darren F. Provine. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)scores.h 8.1 (Berkeley) 5/31/93 */ @@ -41,5 +49,4 @@ /** @file */ - /* Index: uspace/app/tetris/screen.c =================================================================== --- uspace/app/tetris/screen.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/screen.c (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -1,37 +1,45 @@ -/* $OpenBSD: screen.c,v 1.13 2006/04/20 03:25:36 ray Exp $ */ -/* $NetBSD: screen.c,v 1.4 1995/04/29 01:11:36 mycroft Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)screen.c 8.1 (Berkeley) 5/31/93 + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** Attributations + * + * screen.c 8.1 (Berkeley) 5/31/93 + * NetBSD: screen.c,v 1.4 1995/04/29 01:11:36 mycroft + * OpenBSD: screen.c,v 1.13 2006/04/20 03:25:36 ray + * + * Based upon BSD Tetris + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. + * Distributed under BSD license. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * */ @@ -69,4 +77,8 @@ static const struct shape *lastshape; +static suseconds_t timeleft = 0; + +console_ctrl_t *console; + /* @@ -82,6 +94,6 @@ static void start_standout(uint32_t color) { - fflush(stdout); - console_set_rgb_color(fphone(stdout), 0xffffff, + console_flush(console); + console_set_rgb_color(console, 0xffffff, use_color ? color : 0x000000); } @@ -89,11 +101,11 @@ static void resume_normal(void) { - fflush(stdout); - console_set_style(fphone(stdout), STYLE_NORMAL); + console_flush(console); + console_set_style(console, STYLE_NORMAL); } void clear_screen(void) { - console_clear(fphone(stdout)); + console_clear(console); moveto(0, 0); } @@ -105,5 +117,5 @@ { resume_normal(); - console_clear(fphone(stdout)); + console_clear(console); curscore = -1; memset(curscreen, 0, sizeof(curscreen)); @@ -115,5 +127,5 @@ void scr_init(void) { - console_cursor_visibility(fphone(stdout), 0); + console_cursor_visibility(console, 0); resume_normal(); scr_clear(); @@ -122,6 +134,6 @@ void moveto(sysarg_t r, sysarg_t c) { - fflush(stdout); - console_set_pos(fphone(stdout), c, r); + console_flush(console); + console_set_pos(console, c, r); } @@ -130,5 +142,5 @@ static int get_display_size(winsize_t *ws) { - return console_get_size(fphone(stdout), &ws->ws_col, &ws->ws_row); + return console_get_size(console, &ws->ws_col, &ws->ws_row); } @@ -136,5 +148,5 @@ { sysarg_t ccap; - int rc = console_get_color_cap(fphone(stdout), &ccap); + int rc = console_get_color_cap(console, &ccap); if (rc != 0) @@ -179,5 +191,5 @@ void scr_end(void) { - console_cursor_visibility(fphone(stdout), 1); + console_cursor_visibility(console, 1); } @@ -302,5 +314,5 @@ resume_normal(); - fflush(stdout); + console_flush(console); } @@ -322,4 +334,80 @@ } +/** Sleep for the current turn time + * + * Eat any input that might be available. + * + */ +void tsleep(void) +{ + suseconds_t timeout = fallrate; + + while (timeout > 0) { + kbd_event_t event; + + if (!console_get_kbd_event_timeout(console, &event, &timeout)) + break; + } +} + +/** Get char with timeout + * + */ +int tgetchar(void) +{ + /* + * Reset timeleft to fallrate whenever it is not positive + * and increase speed. + */ + + if (timeleft <= 0) { + faster(); + timeleft = fallrate; + } + + /* + * Wait to see if there is any input. If so, take it and + * update timeleft so that the next call to tgetchar() + * will not wait as long. If there is no input, + * make timeleft zero and return -1. + */ + + wchar_t c = 0; + + while (c == 0) { + kbd_event_t event; + + if (!console_get_kbd_event_timeout(console, &event, &timeleft)) { + timeleft = 0; + return -1; + } + + if (event.type == KEY_PRESS) + c = event.c; + } + + return (int) c; +} + +/** Get char without timeout + * + */ +int twait(void) +{ + wchar_t c = 0; + + while (c == 0) { + kbd_event_t event; + + if (!console_get_kbd_event(console, &event)) + return -1; + + if (event.type == KEY_PRESS) + c = event.c; + } + + return (int) c; +} + /** @} */ Index: uspace/app/tetris/screen.h =================================================================== --- uspace/app/tetris/screen.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/screen.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -1,37 +1,45 @@ -/* $OpenBSD: screen.h,v 1.5 2003/06/03 03:01:41 millert Exp $ */ -/* $NetBSD: screen.h,v 1.2 1995/04/22 07:42:42 cgd Exp $ */ +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ -/*- +/** Attributations + * + * screen.h 8.1 (Berkeley) 5/31/93 + * NetBSD: screen.h,v 1.2 1995/04/22 07:42:42 cgd + * OpenBSD: screen.h,v 1.5 2003/06/03 03:01:41 millert + * + * Based upon BSD Tetris + * * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. + * Distributed under BSD license. * * This code is derived from software contributed to Berkeley by * Chris Torek and Darren F. Provine. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)screen.h 8.1 (Berkeley) 5/31/93 */ @@ -48,4 +56,5 @@ #include +#include #include #include @@ -56,4 +65,5 @@ } winsize_t; +extern console_ctrl_t *console; extern winsize_t winsize; @@ -61,5 +71,4 @@ extern void clear_screen(void); -/* just calls putchar; for tputs */ extern int put(int); extern void scr_clear(void); @@ -70,4 +79,8 @@ extern void scr_update(void); +extern void tsleep(void); +extern int tgetchar(void); +extern int twait(void); + /** @} */ Index: uspace/app/tetris/shapes.c =================================================================== --- uspace/app/tetris/shapes.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/shapes.c (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -1,37 +1,45 @@ -/* $OpenBSD: shapes.c,v 1.8 2004/07/10 07:26:24 deraadt Exp $ */ -/* $NetBSD: shapes.c,v 1.2 1995/04/22 07:42:44 cgd Exp $ */ +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ -/*- +/** Attributations + * + * shapes.c 8.1 (Berkeley) 5/31/93 + * NetBSD: shapes.c,v 1.2 1995/04/22 07:42:44 cgd + * OpenBSD: shapes.c,v 1.8 2004/07/10 07:26:24 deraadt + * + * Based upon BSD Tetris + * * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. + * Distributed under BSD license. * * This code is derived from software contributed to Berkeley by * Chris Torek and Darren F. Provine. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)shapes.c 8.1 (Berkeley) 5/31/93 */ Index: uspace/app/tetris/tetris.c =================================================================== --- uspace/app/tetris/tetris.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/tetris.c (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -1,37 +1,45 @@ -/* $OpenBSD: tetris.c,v 1.21 2006/04/20 03:24:12 ray Exp $ */ -/* $NetBSD: tetris.c,v 1.2 1995/04/22 07:42:47 cgd Exp $ */ - -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek and Darren F. Provine. +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tetris.c 8.1 (Berkeley) 5/31/93 + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** Attributations + * + * tetris.c 8.1 (Berkeley) 5/31/93 + * NetBSD: tetris.c,v 1.2 1995/04/22 07:42:47 cgd + * OpenBSD: tetris.c,v 1.21 2006/04/20 03:24:12 ray + * + * Based upon BSD Tetris + * + * Copyright (c) 1992, 1993 + * The Regents of the University of California. + * Distributed under BSD license. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek and Darren F. Provine. + * */ @@ -56,6 +64,4 @@ #include #include - -#include "input.h" #include "scores.h" #include "screen.h" @@ -245,8 +251,10 @@ int ch; + console = console_init(stdin, stdout); + keys = "jkl pq"; classic = 0; - showpreview = 1; + showpreview = 1; while ((ch = getopt(argc, argv, "ck:ps")) != -1) @@ -371,6 +379,6 @@ scr_msg(key_msg, 0); scr_msg(msg, 1); - (void) fflush(stdout); - } while (rwait((struct timeval *) NULL) == -1); + console_flush(console); + } while (!twait()); scr_msg(msg, 0); Index: uspace/app/tetris/tetris.h =================================================================== --- uspace/app/tetris/tetris.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tetris/tetris.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -1,37 +1,45 @@ -/* $OpenBSD: tetris.h,v 1.9 2003/06/03 03:01:41 millert Exp $ */ -/* $NetBSD: tetris.h,v 1.2 1995/04/22 07:42:48 cgd Exp $ */ +/* + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ -/*- +/** Attributations + * + * tetris.h 8.1 (Berkeley) 5/31/93 + * NetBSD: tetris.h,v 1.2 1995/04/22 07:42:48 cgd + * OpenBSD: tetris.h,v 1.9 2003/06/03 03:01:41 millert + * + * Based upon BSD Tetris + * * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. + * Distributed under BSD license. * * This code is derived from software contributed to Berkeley by * Chris Torek and Darren F. Provine. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tetris.h 8.1 (Berkeley) 5/31/93 */