Changeset 357b5f5 in mainline for uspace/lib/c/include/io/screenbuffer.h

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/include/io/screenbuffer.h (modified) (3 diffs)

uspace/lib/c/include/io/screenbuffer.h

@@ -84 +84 @@
         keyfield_t *buffer;      /**< Screen content - characters and
                                       their attributes (used as a circular buffer) */
-        ipcarg_t size_x;         /**< Number of columns  */
-        ipcarg_t size_y;         /**< Number of rows */
+        sysarg_t size_x;         /**< Number of columns  */
+        sysarg_t size_y;         /**< Number of rows */
         
         /** Coordinates of last printed character for determining cursor position */
-        ipcarg_t position_x;
-        ipcarg_t position_y;
+        sysarg_t position_x;
+        sysarg_t position_y;
         
         attrs_t attrs;           /**< Current attributes. */
@@ -109 +109 @@
  *
  */
-static inline keyfield_t *get_field_at(screenbuffer_t *scr, ipcarg_t x, ipcarg_t y)
+static inline keyfield_t *get_field_at(screenbuffer_t *scr, sysarg_t x, sysarg_t y)
 {
         return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
@@ -143 +143 @@
 
 extern void screenbuffer_putchar(screenbuffer_t *, wchar_t);
-extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, ipcarg_t, ipcarg_t);
+extern screenbuffer_t *screenbuffer_init(screenbuffer_t *, sysarg_t, sysarg_t);
 
 extern void screenbuffer_clear(screenbuffer_t *);
-extern void screenbuffer_clear_line(screenbuffer_t *, ipcarg_t);
+extern void screenbuffer_clear_line(screenbuffer_t *, sysarg_t);
 extern void screenbuffer_copy_buffer(screenbuffer_t *, keyfield_t *);
-extern void screenbuffer_goto(screenbuffer_t *, ipcarg_t, ipcarg_t);
+extern void screenbuffer_goto(screenbuffer_t *, sysarg_t, sysarg_t);
 extern void screenbuffer_set_style(screenbuffer_t *, uint8_t);
 extern void screenbuffer_set_color(screenbuffer_t *, uint8_t, uint8_t, uint8_t);