Changeset beb9336 in mainline for uspace/lib/c/include/io

Timestamp:

2012-08-24T14:07:52Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

Location:

uspace/lib/c/include/io

Files:

• charfield.h (moved) (moved from uspace/lib/fb/screenbuffer.h ) (7 diffs)
• chargrid.h (added)
• console.h (modified) (2 diffs)
• input.h (added)
• kbd_event.h (added)
• klog.h (modified) (1 diff)
• log.h (modified) (3 diffs)
• mode.h (added)
• output.h (added)
• pixel.h (added)
• pixelmap.h (added)
• verify.h (added)
• visualizer.h (added)
• window.h (added)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -33 +34 @@
  */
 
-#ifndef IMGMAP_SCREENBUFFER_H__
-#define IMGMAP_SCREENBUFFER_H__
+#ifndef LIBC_IO_CHARFIELD_H_
+#define LIBC_IO_CHARFIELD_H_
 
 #include <sys/types.h>
@@ -40 +41 @@
 #include <io/color.h>
 #include <io/style.h>
-#include "fb.h"
+#include <io/pixel.h>
 
 typedef enum {
-        SCREENBUFFER_FLAG_NONE = 0,
-        SCREENBUFFER_FLAG_SHARED = 1
-} screenbuffer_flag_t;
+        CHAR_FLAG_NONE = 0,
+        CHAR_FLAG_DIRTY = 1
+} char_flags_t;
 
 typedef enum {
@@ -52 +53 @@
         CHAR_ATTR_RGB
 } char_attr_type_t;
-
-typedef enum {
-        CHAR_FLAG_NONE = 0,
-        CHAR_FLAG_DIRTY = 1
-} char_flags_t;
 
 typedef struct {
@@ -65 +61 @@
 
 typedef struct {
-        pixel_t bgcolor;  /**< Background color */
-        pixel_t fgcolor;  /**< Foreground color */
+        pixel_t bgcolor;
+        pixel_t fgcolor;
 } char_attr_rgb_t;
 
@@ -80 +76 @@
 } char_attrs_t;
 
-/** One field on screen. It contain one character and its attributes. */
 typedef struct {
-        wchar_t ch;          /**< Character itself */
-        char_attrs_t attrs;  /**< Character attributes */
-        char_flags_t flags;  /**< Character flags */
+        wchar_t ch;
+        char_attrs_t attrs;
+        char_flags_t flags;
 } charfield_t;
 
-/** Compare two sets of attributes.
- *
- * @param a1 First attribute.
- * @param a2 Second attribute.
- *
- * @return True on equality
- *
- */
 static inline bool attrs_same(char_attrs_t a1, char_attrs_t a2)
 {
@@ -115 +102 @@
 }
 
-extern screenbuffer_t *screenbuffer_create(sysarg_t, sysarg_t,
-    screenbuffer_flag_t);
-
-extern charfield_t *screenbuffer_field_at(screenbuffer_t *, sysarg_t, sysarg_t);
-extern bool screenbuffer_cursor_at(screenbuffer_t *, sysarg_t, sysarg_t);
-
-extern sysarg_t screenbuffer_get_top_row(screenbuffer_t *);
-
-extern sysarg_t screenbuffer_putchar(screenbuffer_t *, wchar_t, bool);
-extern sysarg_t screenbuffer_newline(screenbuffer_t *);
-extern sysarg_t screenbuffer_tabstop(screenbuffer_t *, sysarg_t);
-extern sysarg_t screenbuffer_backspace(screenbuffer_t *);
-
-extern void screenbuffer_clear(screenbuffer_t *);
-extern void screenbuffer_clear_row(screenbuffer_t *, sysarg_t);
-
-extern void screenbuffer_set_cursor(screenbuffer_t *, sysarg_t, sysarg_t);
-extern void screenbuffer_set_cursor_visibility(screenbuffer_t *, bool);
-extern bool screenbuffer_get_cursor_visibility(screenbuffer_t *);
-
-extern void screenbuffer_get_cursor(screenbuffer_t *, sysarg_t *, sysarg_t *);
-
-extern void screenbuffer_set_style(screenbuffer_t *, console_style_t);
-extern void screenbuffer_set_color(screenbuffer_t *, console_color_t,
-    console_color_t, console_color_attr_t);
-extern void screenbuffer_set_rgb_color(screenbuffer_t *, pixel_t, pixel_t);
-
 #endif
 

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

@@ -37 +37 @@
 
 #include <sys/time.h>
+#include <io/kbd_event.h>
 #include <io/keycode.h>
 #include <async.h>
@@ -70 +71 @@
 } console_ctrl_t;
 
-typedef enum {
-        KEY_PRESS,
-        KEY_RELEASE
-} kbd_event_type_t;
-
-/** Console event structure. */
-typedef struct {
-        /** List handle */
-        link_t link;
-        
-        /** Press or release event. */
-        kbd_event_type_t type;
-        
-        /** Keycode of the key that was pressed or released. */
-        keycode_t key;
-        
-        /** Bitmask of modifiers held. */
-        keymod_t mods;
-        
-        /** The character that was generated or '\0' for none. */
-        wchar_t c;
-} kbd_event_t;
-
 extern console_ctrl_t *console_init(FILE *, FILE *);
 extern void console_done(console_ctrl_t *);

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

@@ -38 +38 @@
 #include <sys/types.h>
 #include <stdarg.h>
+#include <io/verify.h>
 
 extern size_t klog_write(const void *, size_t);
 extern void klog_update(void);
-extern int klog_printf(const char *, ...);
+extern int klog_printf(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
 extern int klog_vprintf(const char *, va_list);
 

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

@@ -36 +36 @@
 
 #include <stdarg.h>
+#include <io/verify.h>
 
 typedef enum {
@@ -44 +45 @@
         LVL_DEBUG,
         LVL_DEBUG2,
-
+        
         /** For checking range of values */
         LVL_LIMIT
@@ -50 +51 @@
 
 extern int log_init(const char *, log_level_t);
-extern void log_msg(log_level_t, const char *, ...);
+extern void log_msg(log_level_t, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 extern void log_msgv(log_level_t, const char *, va_list);