Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1517 → Rev 1518

/uspace/trunk/console/console.c
41,7 → 41,6
#include <screenbuffer.h>
#include <sys/mman.h>
 
#define CONSOLE_COUNT 12
#define MAX_KEYREQUESTS_BUFFERED 32
 
#define NAME "CONSOLE"
118,7 → 117,7
scr->position_x--;
 
if (console == active_console) {
ipc_call_async_3(fb_info.phone, FB_PUTCHAR, ' ', scr->position_y, scr->position_x, NULL, NULL);
nsend_call_3(fb_info.phone, FB_PUTCHAR, ' ', scr->position_y, scr->position_x);
}
screenbuffer_putchar(scr, ' ');
126,7 → 125,7
break;
default:
if (console == active_console) {
ipc_call_async_3(fb_info.phone, FB_PUTCHAR, key, scr->position_y, scr->position_x, NULL, NULL);
nsend_call_3(fb_info.phone, FB_PUTCHAR, key, scr->position_y, scr->position_x);
}
screenbuffer_putchar(scr, key);
138,13 → 137,14
if (scr->position_y >= scr->size_y) {
scr->position_y = scr->size_y - 1;
screenbuffer_clear_line(scr, scr->top_line++);
ipc_call_async(fb_info.phone, FB_SCROLL, 1, NULL, NULL);
if (console == active_console)
nsend_call(fb_info.phone, FB_SCROLL, 1);
}
scr->position_x = scr->position_x % scr->size_x;
if (console == active_console)
ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x, NULL, NULL);
send_call_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x);
}
 
192,7 → 192,7
conn = &connections[active_console];
 
ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 0, NULL, NULL);
nsend_call(fb_info.phone, FB_CURSOR_VISIBILITY, 0);
if (interbuffer) {
for (i = 0; i < conn->screenbuffer.size_x; i++)
201,8 → 201,7
sync_send_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);
} else {
 
ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL);
nsend_call(fb_info.phone, FB_CLEAR, 0);
for (i = 0; i < conn->screenbuffer.size_x; i++)
209,14 → 208,14
for (j = 0; j < conn->screenbuffer.size_y; j++) {
d = get_field_at(&(conn->screenbuffer),i, j)->character;
if (d && d != ' ')
ipc_call_async_3(fb_info.phone, FB_PUTCHAR, d, j, i, NULL, NULL);
nsend_call_3(fb_info.phone, FB_PUTCHAR, d, j, i);
}
 
}
ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x, NULL, NULL);
ipc_call_async_2(fb_info.phone, FB_SET_STYLE, conn->screenbuffer.style.fg_color, \
conn->screenbuffer.style.bg_color, NULL, NULL);
ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL, NULL);
nsend_call_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x);
nsend_call_2(fb_info.phone, FB_SET_STYLE, conn->screenbuffer.style.fg_color, \
conn->screenbuffer.style.bg_color);
send_call(fb_info.phone, FB_CURSOR_VISIBILITY, 1);
 
break;
}
240,7 → 239,7
}
 
/** Default thread for new connections */
void client_connection(ipc_callid_t iid, ipc_call_t *icall)
static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
{
ipc_callid_t callid;
ipc_call_t call;
272,7 → 271,7
case CONSOLE_CLEAR:
/* Send message to fb */
if (consnum == active_console) {
ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL);
send_call(fb_info.phone, FB_CLEAR, 0);
}
screenbuffer_clear(&(connections[consnum].screenbuffer));
330,8 → 329,8
}
ipc_call_sync_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols));
ipc_call_async_2(fb_info.phone, FB_SET_STYLE, DEFAULT_FOREGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, NULL, NULL);
ipc_call_sync(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL);
nsend_call_2(fb_info.phone, FB_SET_STYLE, DEFAULT_FOREGROUND_COLOR, DEFAULT_BACKGROUND_COLOR);
nsend_call(fb_info.phone, FB_CURSOR_VISIBILITY, 1);
/* Init virtual consoles */
for (i = 0; i < CONSOLE_COUNT; i++) {
361,8 → 360,9
async_new_connection(phonehash, 0, NULL, keyboard_events);
ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0, NULL, NULL);
nsend_call_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0);
 
/* Register at NS */
if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {
return -1;
};
/uspace/trunk/console/console.h
29,6 → 29,8
#ifndef __CONSOLE_H__
#define __CONSOLE_H__
 
#define CONSOLE_COUNT 12
 
#define CONSOLE_GETCHAR 1026
#define CONSOLE_PUTCHAR 1027
#define CONSOLE_CLEAR 1028
/uspace/trunk/console/gcons.c
0,0 → 1,131
/*
* Copyright (C) 2006 Ondrej Palkovsky
* 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.
*/
 
#include <ipc/fb.h>
#include <ipc/ipc.h>
 
#include "console.h"
 
#define CONSOLE_TOP 50
#define CONSOLE_MARGIN 10
 
#define STATUS_SPACE 20
#define STATUS_WIDTH 40
#define STATUS_HEIGHT 30
 
static int use_gcons = 0;
static ipcarg_t xres,yres;
 
static int console_vp;
static int cstatus_vp[CONSOLE_COUNT];
 
static int fbphone;
 
static void vp_switch(int vp)
{
ipc_call_sync_2(fbphone,FB_VIEWPORT_SWITCH, vp, 0, NULL, NULL);
}
 
static int vp_create(unsigned int x, unsigned int y,
unsigned int width, unsgined int height)
{
return ipc_call_sync_2(fbphone, (x << 16) | y, (width << 16) | height,
NULL, NULL);
}
 
static void fb_clear(void)
{
ipc_call_sync_2(fbphone, FB_CLEAR, 0, 0, NULL, NULL);
}
 
static void fb_set_style(int fgcolor, int bgcolor)
{
ipc_call_sync_2(fbphone, );
}
 
void gcons_change_console(int consnum)
{
if (!use_gcons)
return;
 
vp_switch(console_vp);
}
 
void gcons_notify_char(int consnum)
{
if (!use_gcons)
return;
 
vp_switch(console_vp);
}
 
void gcons_redraw_console(int phone)
{
if (!use_gcons)
return;
vp_switch(0);
/* Set style...*/
fb_clear();
vp_switch(console_vp);
}
 
/** Initialize nice graphical console environment */
void gcons_init(int phone)
{
int rc;
int i;
 
fbphone = phone;
 
rc = ipc_call_sync_2(phone, FB_GET_RESOLUTION, 0, 0, &xres, &yres);
if (rc)
return;
if (xres < 800 || yres < 600)
return;
 
/* create console viewport */
console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, xres-2*CONSOLE_MARGIN,
yres-(CONSOLE_TOP+CONSOLE_MARGIN));
if (console_vp < 0)
return;
/* Create status buttons */
for (i=0; i < CONSOLE_COUNT; i++) {
cstatus_vp[i] = vp_create(phone, CONSOLE_MARGIN+i*(STATUS_WIDTH+STATUS_SPACE),
CONSOLE_MARGIN, STATUS_WIDTH, STATUS_HEIGHT);
if (cstatus_vp[i] < 0)
return;
}
use_gcons = 1;
gcons_draw_console();
}