Changes in uspace/app/tetris/screen.c [79ae36dd:96b02eb9] in mainline

File:

• uspace/app/tetris/screen.c (modified) (12 diffs)

uspace/app/tetris/screen.c

@@ -1 @@
-/*
- * Copyright (c) 2011 Martin Decky
- * All rights reserved.
+/*      $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.
  *
  * 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.
  *
- * - 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 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.
  *
- * 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.
- *
+ *      @(#)screen.c    8.1 (Berkeley) 5/31/93
  */
 
@@ -77 +69 @@
 static const struct shape *lastshape;
 
-static suseconds_t timeleft = 0;
-
-console_ctrl_t *console;
-
 
 /*
@@ -94 +82 @@
 static void start_standout(uint32_t color)
 {
-        console_flush(console);
-        console_set_rgb_color(console, 0xffffff,
+        fflush(stdout);
+        console_set_rgb_color(fphone(stdout), 0xffffff,
             use_color ? color : 0x000000);
 }
@@ -101 +89 @@
 static void resume_normal(void)
 {
-        console_flush(console);
-        console_set_style(console, STYLE_NORMAL);
+        fflush(stdout);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
 }
 
 void clear_screen(void)
 {
-        console_clear(console);
+        console_clear(fphone(stdout));
         moveto(0, 0);
 }
@@ -117 +105 @@
 {
         resume_normal();
-        console_clear(console);
+        console_clear(fphone(stdout));
         curscore = -1;
         memset(curscreen, 0, sizeof(curscreen));
@@ -127 +115 @@
 void scr_init(void)
 {
-        console_cursor_visibility(console, 0);
+        console_cursor_visibility(fphone(stdout), 0);
         resume_normal();
         scr_clear();
@@ -134 +122 @@
 void moveto(sysarg_t r, sysarg_t c)
 {
-        console_flush(console);
-        console_set_pos(console, c, r);
+        fflush(stdout);
+        console_set_pos(fphone(stdout), c, r);
 }
 
@@ -142 +130 @@
 static int get_display_size(winsize_t *ws)
 {
-        return console_get_size(console, &ws->ws_col, &ws->ws_row);
+        return console_get_size(fphone(stdout), &ws->ws_col, &ws->ws_row);
 }
 
@@ -148 +136 @@
 {
         sysarg_t ccap;
-        int rc = console_get_color_cap(console, &ccap);
+        int rc = console_get_color_cap(fphone(stdout), &ccap);
         
         if (rc != 0)
@@ -191 +179 @@
 void scr_end(void)
 {
-        console_cursor_visibility(console, 1);
+        console_cursor_visibility(fphone(stdout), 1);
 }
 
@@ -314 +302 @@
                 resume_normal();
         
-        console_flush(console);
+        fflush(stdout);
 }
 
@@ -334 +322 @@
 }
 
-/** 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;
-}
-
 /** @}
  */