- removed slk references

- corrected minor algo errors in primitives
- added doxygen @file header

diff --git a/src/hci/mucurses/core.c b/src/hci/mucurses/core.c
index a29f79fa4c4e5576da0b57af90d53b2259b164a6..7805f4283a51f7d0f76da4d619c92e00ebac0836 100644 (file)
--- a/src/hci/mucurses/core.c
+++ b/src/hci/mucurses/core.c
@@ -1,6 +1,12 @@
 #include <curses.h>
 #include "core.h"
 
+/** @file
+ *
+ * MuCurses core functions
+ *
+ */
+
 WINDOW _stdscr = {
        .attrs = A_DEFAULT,
        .ori_y = 0,
@@ -10,8 +16,6 @@ WINDOW _stdscr = {
        .scr = curscr,
 };
 
-struct _softlabelkeys *slks;
-
 /*
  *  Primitives
  */
@@ -29,14 +33,14 @@ void _wputch ( WINDOW *win, chtype ch, int wrap ) {
        win->scr->movetoyx( win->scr, win->ori_y + win->curs_y,
                                      win->ori_x + win->curs_x );
        win->scr->putc(win->scr, ch);
-       if ( ++(win->curs_x) == win->width ) {
+       if ( ++(win->curs_x) - win->width == 0 ) {
                if ( wrap == WRAP ) {
                        win->curs_x = 0;
                        /* specification says we should really scroll,
                           but we have no buffer to scroll with, so we
                           can only overwrite back at the beginning of
                           the window */
-                       if ( ++(win->curs_y) == win->height )
+                       if ( ++(win->curs_y) - win->height == 0 )
                                win->curs_y = 0;
                } else {
                        (win->curs_x)--;
@@ -82,8 +86,8 @@ void _wputstr ( WINDOW *win, const char *str, int wrap, int n ) {
  */
 int wmove ( WINDOW *win, int y, int x ) {
        /* chech for out-of-bounds errors */
-       if ( ( ( (unsigned)x - win->ori_x ) > win->width ) ||
-            ( ( (unsigned)y - win->ori_y ) > win->height ) ) {
+       if ( ( (unsigned)y >= win->height ) ||
+            ( (unsigned)x >= win->width ) ) {
                return ERR;
        }
 

diff --git a/src/hci/mucurses/core.h b/src/hci/mucurses/core.h
index 37351dc34f0a378868534d31f675778140f9ede3..08df8f8d02665ed14f33dc372624fb751a4a4acb 100644 (file)
--- a/src/hci/mucurses/core.h
+++ b/src/hci/mucurses/core.h
@@ -1,6 +1,12 @@
 #ifndef CORE_H
 #define CORE_H
 
+/** @file
+ *
+ * MuCurses core implementation specific header file
+ *
+ */
+
 #define WRAP 0
 #define NOWRAP 1
 
@@ -13,24 +19,6 @@ unsigned int *_COLOUR_PAIRS; /* basically this is an array, but as its
                               pointer and malloc the array into being
                               ... */
 
-struct _softlabel {
-       // label string
-       char *label;
-       /* Format of soft label 
-          0: left justify
-          1: centre justify
-          2: right justify
-        */
-       unsigned short fmt;
-};
-
-struct _softlabelkeys {
-       struct _softlabel fkeys[12];
-       attr_t attrs;
-       unsigned short fmt;
-       unsigned short maxlablen;
-};
-
 void _wputch ( WINDOW *win, chtype ch, int wrap );
 void _wputchstr ( WINDOW *win, const chtype *chstr, int wrap, int n );
 void _wputstr ( WINDOW *win, const char *str, int wrap, int n );