Changes in owl.h [62fdd29:88dc766]

File:

• owl.h (modified) (8 diffs)

owl.h

@@ -52 +52 @@
 #include <termios.h>
 #include <libfaim/aim.h>
-#include <wchar.h>
 #include "config.h"
-#include "glib.h"
 #ifdef HAVE_LIBZEPHYR
 #include <zephyr/zephyr.h>
@@ -67 +65 @@
 /* logout is defined in FreeBSD. */
 #define logout logout_
+/* aim.h defines bool */
+#define HAS_BOOL
 #include <perl.h>
 #undef logout
@@ -76 +76 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define STRINGIFY(x) _STRINGIFY(x)
+#define BARNOWL_STRINGIFY(x) _STRINGIFY(x)
 #define _STRINGIFY(x) #x
 
@@ -83 +83 @@
 #endif
 
-#define OWL_VERSION_STRING "r" STRINGIFY(OWL_SVN_REVNO)
+#define OWL_VERSION_STRING "r" BARNOWL_STRINGIFY(OWL_SVN_REVNO)
 
 
@@ -100 +100 @@
 #define OWL_FMTEXT_ATTR_REVERSE   2
 #define OWL_FMTEXT_ATTR_UNDERLINE 4
-
-#define OWL_FMTEXT_UC_BASE 0x100000 /* Unicode Plane 16 - Supplementary Private Use Area-B*/
-#define OWL_FMTEXT_UC_ATTR ( OWL_FMTEXT_UC_BASE | 0x800 )
-#define OWL_FMTEXT_UC_ATTR_MASK 0x7
-#define OWL_FMTEXT_UC_COLOR_BASE ( OWL_FMTEXT_UC_BASE | 0x400 )
-#define OWL_FMTEXT_UC_FGCOLOR OWL_FMTEXT_UC_COLOR_BASE
-#define OWL_FMTEXT_UC_BGCOLOR ( OWL_FMTEXT_UC_COLOR_BASE | 0x200 )
-#define OWL_FMTEXT_UC_DEFAULT_COLOR 0x100
-#define OWL_FMTEXT_UC_FGDEFAULT ( OWL_FMTEXT_UC_FGCOLOR | OWL_FMTEXT_UC_DEFAULT_COLOR )
-#define OWL_FMTEXT_UC_BGDEFAULT ( OWL_FMTEXT_UC_BGCOLOR | OWL_FMTEXT_UC_DEFAULT_COLOR )
-#define OWL_FMTEXT_UC_COLOR_MASK 0xFF
-#define OWL_FMTEXT_UC_ALLCOLOR_MASK ( OWL_FMTEXT_UC_COLOR_MASK | OWL_FMTEXT_UC_DEFAULT_COLOR | 0x200)
-#define OWL_FMTEXT_UC_STARTBYTE_UTF8 '\xf4'
-
-#define OWL_FMTEXT_UTF8_ATTR_NONE "\xf4\x80\xa0\x80"
-#define OWL_FMTEXT_UTF8_FGDEFAULT "\xf4\x80\x94\x80"
-#define OWL_FMTEXT_UTF8_BGDEFAULT "\xf4\x80\x96\x80"
-
-
-
 
 #define OWL_COLOR_BLACK     0
@@ -232 +212 @@
 #endif
 
-#define OWL_META(key) ((key)|010000)
+#define OWL_META(key) ((key)|0200)
 /* OWL_CTRL is definied in kepress.c */
 
@@ -272 +252 @@
 } owl_variable;
 
-typedef struct _owl_input {
-  int ch;
-  gunichar uch;
-} owl_input;
-
 typedef struct _owl_fmtext {
   int textlen;
   int bufflen;
   char *textbuff;
-  char default_attrs;
-  short default_fgcolor;
-  short default_bgcolor;
+  char *fmbuff;
+  short *fgcolorbuff;
+  short *bgcolorbuff;
 } owl_fmtext;
 
@@ -516 +491 @@
   owl_list  bindings;           /* key bindings */
   struct _owl_keymap *submap;   /* submap */
-  void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
-  void (*prealways_fn)(owl_input  j);   /* always called before a keypress is received */
-  void (*postalways_fn)(owl_input  j);  /* always called after keypress is processed */
+  void (*default_fn)(int j);    /* default action (takes a keypress) */
+  void (*prealways_fn)(int j);  /* always called before a keypress is received */
+  void (*postalways_fn)(int j); /* always called after keypress is processed */
 } owl_keymap;