Changeset 7284260 in mainline

Timestamp:

2006-06-06T23:28:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bba6b09

Parents:

0f09bd45

Message:

Small change in colors.
Added scrolling to sysio output.

Files:

• console/console.c (modified) (2 diffs)
• console/screenbuffer.h (modified) (1 diff)
• fb/fb.c (modified) (1 diff)
• fb/sysio.c (modified) (7 diffs)

console/console.c

@@ -244 +244 @@
 
         set_style(&conn->screenbuffer.style);
-        curs_goto(conn->screenbuffer.position_y, conn->screenbuffer.position_x);
         curs_visibility(0);
         if (interbuffer) {
@@ -272 +271 @@
         }
         
+        curs_goto(conn->screenbuffer.position_y, conn->screenbuffer.position_x);
         curs_visibility(conn->screenbuffer.is_cursor_visible);
 }

console/screenbuffer.h

@@ -31 +31 @@
 
 
-#define DEFAULT_FOREGROUND 0xffff00     /**< default console foreground color */
-#define DEFAULT_BACKGROUND 0x000080     /**< default console background color */
+#define DEFAULT_FOREGROUND 0x0  /**< default console foreground color */
+#define DEFAULT_BACKGROUND 0xf0f0f0     /**< default console background color */
 
 typedef struct {

fb/fb.c

@@ -48 +48 @@
 #include "ppm.h"
 
-#define DEFAULT_BGCOLOR                0x000080
-#define DEFAULT_FGCOLOR                0xffff00
+#define DEFAULT_BGCOLOR                0xf0f0f0
+#define DEFAULT_FGCOLOR                0x0
 
 /***************************************************************/

fb/sysio.c

@@ -37 +37 @@
 
 #include "sysio.h"
+
+#define WIDTH 80
+#define HEIGHT 25
 
 /* Allow only 1 connection */
@@ -80 +83 @@
 }
 
+static void scroll(int i)
+{
+        if (i > 0) {
+                curs_goto(HEIGHT-1, 0);
+                while (i--)
+                        sysputs("\033D");
+        } else if (i < 0) {
+                curs_goto(0,0);
+                while (i++)
+                        sysputs("\033M");
+        }
+}
+
 /** ANSI terminal emulation main thread */
 static void sysio_client_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -91 +107 @@
         int newcol,newrow;
         int fgcolor,bgcolor;
+        int i;
 
         if (client_connected) {
@@ -120 +137 @@
                         newcol = IPC_GET_ARG2(call);
                         curs_goto(newrow, newcol);
+                        lastrow = newrow;
+                        lastcol = newcol;
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_fast(callid, 0, 25, 80);
+                        ipc_answer_fast(callid, 0, HEIGHT, WIDTH);
                         continue;
                 case FB_CLEAR:
@@ -131 +150 @@
                         fgcolor = IPC_GET_ARG1(call);
                         bgcolor = IPC_GET_ARG2(call);
-                        if (fgcolor > bgcolor)
+                        if (bgcolor == 0xf0f0f0)
+                                set_style(0);
+                        else if (fgcolor > bgcolor)
                                 set_style(0);
                         else
@@ -137 +158 @@
                         retval = 0;
                         break;
+                case FB_SCROLL:
+                        i = IPC_GET_ARG1(call);
+                        if (i > HEIGHT || i < -HEIGHT) {
+                                retval = EINVAL;
+                                break;
+                        }
+                        scroll(i);
+                        curs_goto(lastrow, lastcol);
+                        retval = 0;
+                        break;
+
                 default:
                         retval = ENOENT;
@@ -150 +182 @@
         clrscr();
         curs_goto(0,0);
+        /* Set scrolling region to 0-25 lines */
+        sysputs("\033[0;25r");
 }