WebSVN – HelenOS – Diff – /branches/tracing/uspace/srv/console/screenbuffer.c

  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup console
  * @{
  */
 /** @file
  */
 #include <screenbuffer.h>
-#include <console/style.h>
+#include <io/style.h>
 #include <malloc.h>
 #include <unistd.h>
-/** Store one character to screenbuffer. Its position is determined by
+/** Store one character to screenbuffer.
+ *
- * scr->position_x and scr->position_y.
+ * Its position is determined by scr->position_x
+ * and scr->position_y.
+ *
+ * @param scr Screenbuffer
+ * @param c   Stored character
+ *
- * @param scr   screenbuffer
- * @param c stored character
  */
 void screenbuffer_putchar(screenbuffer_t *scr, wchar_t ch)
+{
-    keyfield_t *field;
+    keyfield_t *field =
-    field = get_field_at(scr, scr->position_x, scr->position_y);
+        get_field_at(scr, scr->position_x, scr->position_y);
     field->character = ch;
     field->attrs = scr->attrs;
+}
+/** Initilize screenbuffer.
+ *
-/** Initilize screenbuffer. Allocate space for screen content in accordance to given size.
+ * Allocate space for screen content in accordance to given size.
+ *
- * @param scr       initialized screenbuffer
+ * @param scr    Initialized screenbuffer
- * @param size_x    width in characters
+ * @param size_x Width in characters
- * @param size_y    height in characters
+ * @param size_y Height in characters
+ *
- * @return pointer to screenbuffer (same as scr parameter) or NULL
+ * @return Pointer to screenbuffer (same as scr parameter) or NULL
+ *
  */
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y)
+screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, size_t size_x, size_t size_y)
+{
     scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y);
-    if (!scr->buffer) {
+    if (!scr->buffer)
         return NULL;
-    }
     scr->size_x = size_x;
     scr->size_y = size_y;
     scr->attrs.t = at_style;
     scr->attrs.a.s.style = STYLE_NORMAL;
     screenbuffer_clear(scr);
     return scr;
+}
 /** Clear screenbuffer.
+ *
- * @param scr screenbuffer
+ * @param scr Screenbuffer
+ *
  */
 void screenbuffer_clear(screenbuffer_t *scr)
+{
-    unsigned int i;
+    size_t i;
     for (i = 0; i < (scr->size_x * scr->size_y); i++) {
         scr->buffer[i].character = ' ';
         scr->buffer[i].attrs = scr->attrs;
+    }
     scr->top_line = 0;
-    scr->position_y = 0;
     scr->position_x = 0;
+    scr->position_y = 0;
+}
 /** Clear one buffer line.
+ *
  * @param scr
  * @param line One buffer line (not a screen line!)
+ *
  */
-void screenbuffer_clear_line(screenbuffer_t *scr, unsigned int line)
+void screenbuffer_clear_line(screenbuffer_t *scr, size_t line)
+{
-    unsigned int i;
+    size_t x;
-    for (i = 0; i < scr->size_x; i++) {
+    for (x = 0; x < scr->size_x; x++) {
-        scr->buffer[i + line * scr->size_x].character = ' ';
+        scr->buffer[x + line * scr->size_x].character = ' ';
-        scr->buffer[i + line * scr->size_x].attrs = scr->attrs;
+        scr->buffer[x + line * scr->size_x].attrs = scr->attrs;
+    }
+}
 /** Copy content buffer from screenbuffer to given memory.
+ *
- * @param scr   source screenbuffer
+ * @param scr  Source screenbuffer
- * @param dest  destination
+ * @param dest Destination
+ *
  */
 void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest)
+{
-    unsigned int i;
+    size_t i;
-    for (i = 0; i < scr->size_x * scr->size_y; i++) {
+    for (i = 0; i < (scr->size_x * scr->size_y); i++)
         dest[i] = scr->buffer[i];
-    }
+}
 /** Set new cursor position in screenbuffer.
+ *
  * @param scr
  * @param x
  * @param y
+ *
  */
-void screenbuffer_goto(screenbuffer_t *scr, unsigned int x, unsigned int y)
+void screenbuffer_goto(screenbuffer_t *scr, size_t x, size_t y)
+{
     scr->position_x = x % scr->size_x;
     scr->position_y = y % scr->size_y;
+}
 /** Set new style.
+ *
  * @param scr
  * @param fg_color
  * @param bg_color
+ *
  */
-void screenbuffer_set_style(screenbuffer_t *scr, int style)
+void screenbuffer_set_style(screenbuffer_t *scr, uint8_t style)
+{
     scr->attrs.t = at_style;
     scr->attrs.a.s.style = style;
+}
 /** Set new color.
+ *
  * @param scr
  * @param fg_color
  * @param bg_color
+ *
  */
-void screenbuffer_set_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color, unsigned int flags)
+void screenbuffer_set_color(screenbuffer_t *scr, uint8_t fg_color, uint8_t bg_color, uint8_t flags)
+{
     scr->attrs.t = at_idx;
     scr->attrs.a.i.fg_color = fg_color;
     scr->attrs.a.i.bg_color = bg_color;
     scr->attrs.a.i.flags = flags;
+}
 /** Set new RGB color.
+ *
  * @param scr
  * @param fg_color
  * @param bg_color
+ *
  */
-void screenbuffer_set_rgb_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
+void screenbuffer_set_rgb_color(screenbuffer_t *scr, uint32_t fg_color, uint32_t bg_color)
+{
     scr->attrs.t = at_rgb;
     scr->attrs.a.r.fg_color = fg_color;
     scr->attrs.a.r.bg_color = bg_color;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/uspace/srv/console/screenbuffer.c – Rev 4377 → 4692