renames, small improvements in the private struct.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/madtty/Makefile.in b/madtty/Makefile.in
index b2d445f..19662ea 100644 (file)
--- a/madtty/Makefile.in
+++ b/madtty/Makefile.in
@@ -7,7 +7,7 @@ DISTCLEANFILES = madtty.pc
 include_HEADERS = madtty.h
 lib_LIBRARIES = libmadtty
 
-libmadtty_SOURCES  = madtty.h roteprivate.h \
+libmadtty_SOURCES  = madtty.h madtty_priv.h \
                     madtty.c inject.c
 libmadtty_CPPFLAGS = -Wno-error
 libmadtty_VERSION  = @PACKAGE_VERSION@

diff --git a/madtty/inject.c b/madtty/inject.c
index f1f2e21..14bde65 100644 (file)
--- a/madtty/inject.c
+++ b/madtty/inject.c
@@ -24,7 +24,7 @@
 #include <ctype.h>
 
 #include "madtty.h"
-#include "roteprivate.h"
+#include "madtty_priv.h"
 
 #define MAX_CSI_ES_PARAMS 32
 

diff --git a/madtty/madtty.c b/madtty/madtty.c
index af959ce..959204d 100644 (file)
--- a/madtty/madtty.c
+++ b/madtty/madtty.c
@@ -27,7 +27,7 @@
 #include <sys/ioctl.h>
 
 #include "madtty.h"
-#include "roteprivate.h"
+#include "madtty_priv.h"
 
 RoteTerm *rote_vt_create(int rows, int cols)
 {

diff --git a/madtty/madtty.h b/madtty/madtty.h
index 1017bc0..2ad212e 100644 (file)
--- a/madtty/madtty.h
+++ b/madtty/madtty.h
@@ -125,6 +125,7 @@ typedef struct RoteTerm_ {
     RoteTermPrivate *pd;         /* private state data */
 
     bool insert;                 /* insert or replace mode */
+
     /* --- dirtiness flags: the following flags will be raised when the
      * corresponding items are modified. They can only be unset by YOU
      * (when, for example, you redraw the term or something) --- */

diff --git a/madtty/roteprivate.h b/madtty/madtty_priv.h
similarity index 88%
rename from madtty/roteprivate.h
rename to madtty/madtty_priv.h
index 628a993..e33902b 100644 (file)
--- a/madtty/roteprivate.h
+++ b/madtty/madtty_priv.h
@@ -19,18 +19,17 @@
     Copyright © 2006 Pierre Habouzit
  */
 
-#ifndef btco_ROTE_vtstate_h
-#define btco_ROTE_vtstate_h
+#ifndef MADTTY_MADTTY_PRIV_H
+#define MADTTY_MADTTY_PRIV_H
 
 #define ESEQ_BUF_SIZE 128  /* size of escape sequence buffer */
-#define MAX_CUSTOM_ES_HANDLERS 32
 
 /* Terminal private data */
 struct RoteTermPrivate_ {
-    bool escaped;              /* whether we are currently reading an
+    unsigned escaped : 1;      /* whether we are currently reading an
                                 * escape sequence */
 
-    bool graphmode;            /* whether terminal is in graphical 
+    unsigned graphmode : 1;    /* whether terminal is in graphical 
                                 * character mode or not */
 
     int scrolltop, scrollbottom;  /* current scrolling region of terminal */
@@ -48,4 +47,4 @@ struct RoteTermPrivate_ {
  * related fields in it */
 void rote_es_interpret_csi(RoteTerm *rt);
 
-#endif
+#endif /* MADTTY_MADTTY_PRIV_H */