Changeset 5173 in orxonox.OLD

Timestamp:

Sep 8, 2005, 1:46:26 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added new Class ShellBuffer, that only handles the main shell's buffer

Location:

trunk/src/lib/shell

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)
• shell.cc (modified) (1 diff)
• shell.h (modified) (1 diff)
• shell_buffer.cc (copied) (copied from trunk/src/lib/shell/shell_completion.cc) (3 diffs)
• shell_buffer.h (copied) (copied from trunk/src/lib/shell/shell_completion.h) (1 diff)

trunk/src/lib/shell/Makefile.am

@@ -5 +5 @@
 
 libORXshell_a_SOURCES = shell.cc \
+                        shell_buffer.cc \
                         shell_command.cc \
                         shell_completion.cc
@@ -10 +11 @@
 
 noinst_HEADERS= shell.h \
+                shell_buffer.h \
                 shell_command.h \
                 shell_completion.h

trunk/src/lib/shell/Makefile.in

@@ -54 +54 @@
 libORXshell_a_AR = $(AR) $(ARFLAGS)
 libORXshell_a_LIBADD =
-am_libORXshell_a_OBJECTS = shell.$(OBJEXT) shell_command.$(OBJEXT) \
-        shell_completion.$(OBJEXT)
+am_libORXshell_a_OBJECTS = shell.$(OBJEXT) shell_buffer.$(OBJEXT) \
+        shell_command.$(OBJEXT) shell_completion.$(OBJEXT)
 libORXshell_a_OBJECTS = $(am_libORXshell_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -61 +61 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shell.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/shell_buffer.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/shell_command.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Po
@@ -185 +186 @@
 noinst_LIBRARIES = libORXshell.a
 libORXshell_a_SOURCES = shell.cc \
+                        shell_buffer.cc \
                         shell_command.cc \
                         shell_completion.cc
 
 noinst_HEADERS = shell.h \
+                shell_buffer.h \
                 shell_command.h \
                 shell_completion.h
@@ -240 +243 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_buffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_completion.Po@am__quote@

trunk/src/lib/shell/shell.cc

@@ -34 +34 @@
 SHELL_COMMAND(clear, Shell, clear)->describe("Clears the shell from unwanted lines (empties all buffers)");
 SHELL_COMMAND(deactivate, Shell, deactivate)->describe("Deactivates the Shell. (moves it into background)");
-
 
 /**

trunk/src/lib/shell/shell.h

@@ -9 +9 @@
 #include "element_2d.h"
 #include "event_listener.h"
+#include "shell_buffer.h"
 
 #include <stdarg.h>
-
-#define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)
 
 // FORWARD DECLARATION

trunk/src/lib/shell/shell_buffer.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "shell_completion.h"
+#include "shell_buffer.h"
 
 using namespace std;
@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-ShellCompletion::ShellCompletion ()
+ShellBuffer::ShellBuffer ()
 {
 // this->setClassID(CL_PROTO_ID, "ProtoClass");
@@ -45 +45 @@
  * standard deconstructor
 */
-ShellCompletion::~ShellCompletion ()
+ShellBuffer::~ShellBuffer ()
 {
   // delete what has to be deleted here

trunk/src/lib/shell/shell_buffer.h

@@ -1 +1 @@
 /*!
- * @file shell_completion.h
- * @brief The Shell Completion Tasks
+ * @file shell_buffer.h
+ * @brief The Shell buffer Tasks
 */
 
-#ifndef _SHELL_COMPLETION_H
-#define _SHELL_COMPLETION_H
+#ifndef _SHELL_BUFFER_H
+#define _SHELL_BUFFER_H
+
+#include <stdarg.h>
+
+#define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)
 
 // FORWARD DECLARATION
+template<class T> class tList;
+template<class T> class tIterator;
+class Text;
+
+//! A class for ...
+class ShellBuffer {
+
+ public:
+  ShellBuffer();
+  virtual ~ShellBuffer();
 
 
-//! A class for ...
-class ShellCompletion {
-
- public:
-  ShellCompletion();
-  virtual ~ShellCompletion();
+  // BUFFER //
+  /** @param bufferSize the new Buffer-Size */
+  void setBufferSize(unsigned int bufferSize) { this->bufferSize = bufferSize; };
+  void setBufferDisplaySize(unsigned int bufferDisplaySize);
+  void flushBuffers();
+  static bool addBufferLineStatic(const char* line, ...);
+  void addBufferLine(const char* line, va_list arg);
+  void printToDisplayBuffer(const char* text);
+  void moveBuffer(unsigned int lineCount);
+//    void moveBufferTo(unsigned int lineNumber);
+  const char* getBufferLine(unsigned int lineNumber);
 
 
  private:
+   unsigned int             bufferSize;             //!< The Size of the buffer
+   unsigned int             bufferDisplaySize;      //!< The Size of the Display-buffer, in lines (not in characters)
+   tList<char>*             buffer;                 //!< A list of stored char-arrays(strings) to store the history
+   tIterator<char>*         bufferIterator;         //!< An iterator for the Shells main buffer.
+
+   Text**                   bufferText;             //!< A list of stored bufferTexts for the display of the buffer
+   char                     bufferArray[SHELL_BUFFER_SIZE];     //!< a BUFFER for fast writing
+   char                     keepBufferArray[SHELL_BUFFER_SIZE]; //!< a BUFFER to have multi-non-newLine commands be copied into the shell.
+   bool                     keepBuffer;             //!< if the keepbuffer contains unfinished lines.
 
 };
 
-#endif /* _SHELL_COMPLETION_H */
+#endif /* _SHELL_BUFFER_H */