[libcvd-members] gvars3 Makefile.in src/GUI.cc src/GUI_impl_head...

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    gvars3
Changes by:     Edward Rosten <edrosten>        08/03/20 02:09:15

Modified files:
        .              : Makefile.in 
        src            : GUI.cc 
Added files:
        src            : GUI_impl_headless.cc GUI_impl_noreadline.cc 
                         GUI_impl_readline.cc 

Log message:
        Unbreak headless GVars.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gvars3/Makefile.in?cvsroot=libcvd&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI.cc?cvsroot=libcvd&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_impl_headless.cc?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_impl_noreadline.cc?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gvars3/src/GUI_impl_readline.cc?cvsroot=libcvd&rev=1.1

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/gvars3/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Makefile.in 21 Feb 2008 19:29:21 -0000      1.24
+++ Makefile.in 20 Mar 2008 02:09:15 -0000      1.25
@@ -84,6 +84,7 @@
        src/GUI_language.o              \
        src/serialize.o                 \
        src/GUI_none.o                  \
+       src/GUI_impl_headless.o\
        src/inst.o                              \
 
 OBJS=\
@@ -99,7 +100,10 @@
 
 ifeq (@have_readline@,yes)
        OBJS+=src/GUI_readline.o
+       OBJS+=src/GUI_impl_readline.o
        CPPFLAGS+=-DGUI_HAVE_READLINE
+else
+       OBJS+=src/GUI_noreadline.o
 endif
 
        #src/@address@hidden     \

Index: src/GUI.cc
===================================================================
RCS file: /cvsroot/libcvd/gvars3/src/GUI.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/GUI.cc  21 Feb 2008 18:01:34 -0000      1.23
+++ src/GUI.cc  20 Mar 2008 02:09:15 -0000      1.24
@@ -23,12 +23,6 @@
 #include "src/GUI_impl.h"
 #include "gvars3/GStringUtil.h"
 
-#ifdef GUI_HAVE_READLINE
-#include <gvars3/GUI_readline.h>
-#else
-#include <gvars3/GUI_non_readline.h>
-#endif
-
 #include <pthread.h>
 
 #include <cctype>
@@ -804,77 +798,6 @@
 
   void* GUI_impl::mpParserThread = NULL;
   
-#ifdef GUI_HAVE_READLINE
-#include <readline/readline.h>
-#include <readline/history.h>
-  
-  void GUI_impl::SetupReadlineCompletion()
-  {
-    mpReadlineCompleterGUI = this;
-    rl_attempted_completion_function = ReadlineCompletionFunction;
-    rl_basic_word_break_characters = " \t\n\"\\'address@hidden><;|&{("; 
-  }
-  
-  char ** GUI_impl::ReadlineCompletionFunction (const char *text, int start, 
int end)
-  {
-    rl_completion_append_character=0;
-    char **matches;
-    matches = (char **)NULL;
-    matches = rl_completion_matches (text,   ReadlineCommandGeneratorCB);
-    return (matches);
-  }
-  
-  void print_history(ostream &ost)
-  {
-    HIST_ENTRY **apHistEntries = history_list();
-    if(apHistEntries)
-      while((*apHistEntries)!=NULL)
-       {
-         ost << (*apHistEntries)->line << endl;
-         apHistEntries++;
-       }
-  };
-#else
-  void GUI_impl::SetupReadlineCompletion()
-  {
-  }
-
-  char ** GUI_impl::ReadlineCompletionFunction (const char *text, int start, 
int end)
-  {
-    return NULL;
-  }
-
-
-  void print_history(ostream &ost)
-  {
-  }
-#endif
-
-
-  void GUI_impl::StartParserThread()
-  {
-    if(mpParserThread)  // Only makes sense to have one instance of the parser 
thread.
-      return;
-    
-#ifdef GUI_HAVE_READLINE
-    mpParserThread = new spawn_readline_thread("");
-#else
-    mpParserThread = new spawn_non_readline_thread("");
-#endif
-  }
-
-  void GUI_impl::StopParserThread()
-  {
-    if(!mpParserThread)
-      return;
-#ifdef GUI_HAVE_READLINE
-    delete( (spawn_readline_thread*) mpParserThread);
-#else
-    delete( (spawn_non_readline_thread*) mpParserThread);
-#endif    
-    mpParserThread = NULL;
-  }
-
 
 }
 

Index: src/GUI_impl_headless.cc
===================================================================
RCS file: src/GUI_impl_headless.cc
diff -N src/GUI_impl_headless.cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/GUI_impl_headless.cc    20 Mar 2008 02:09:15 -0000      1.1
@@ -0,0 +1,39 @@
+#include "gvars3/GUI.h"
+#include "src/GUI_impl.h"
+#include "gvars3/GStringUtil.h"
+
+#include <cctype>
+#include <sstream>
+#include <fstream>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <algorithm>
+
+using namespace std;
+
+namespace GVars3
+{
+ void GUI_impl::SetupReadlineCompletion()
+  {
+  }
+
+  char ** GUI_impl::ReadlineCompletionFunction (const char *text, int start, 
int end)
+  {
+    return NULL;
+  }
+
+ void GUI_impl::StartParserThread()
+  {
+  }
+
+
+  void print_history(ostream &ost)
+  {
+  }
+
+  void GUI_impl::StopParserThread()
+  {
+  }
+
+ }

Index: src/GUI_impl_noreadline.cc
===================================================================
RCS file: src/GUI_impl_noreadline.cc
diff -N src/GUI_impl_noreadline.cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/GUI_impl_noreadline.cc  20 Mar 2008 02:09:15 -0000      1.1
@@ -0,0 +1,52 @@
+#include "gvars3/GUI.h"
+#include "src/GUI_impl.h"
+#include "gvars3/GStringUtil.h"
+
+
+#include <gvars3/GUI_non_readline.h>
+#include <pthread.h>
+
+#include <cctype>
+#include <sstream>
+#include <fstream>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <algorithm>
+
+using namespace std;
+
+namespace GVars3
+{
+ void GUI_impl::SetupReadlineCompletion()
+  {
+  }
+
+  char ** GUI_impl::ReadlineCompletionFunction (const char *text, int start, 
int end)
+  {
+    return NULL;
+  }
+
+ void GUI_impl::StartParserThread()
+  {
+    if(mpParserThread)  // Only makes sense to have one instance of the parser 
thread.
+      return;
+    
+    mpParserThread = new spawn_non_readline_thread("");
+  }
+
+
+  void print_history(ostream &ost)
+  {
+  }
+
+  void GUI_impl::StopParserThread()
+  {
+    if(!mpParserThread)
+      return;
+
+    delete( (spawn_non_readline_thread*) mpParserThread);
+    mpParserThread = NULL;
+  }
+
+ }

Index: src/GUI_impl_readline.cc
===================================================================
RCS file: src/GUI_impl_readline.cc
diff -N src/GUI_impl_readline.cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/GUI_impl_readline.cc    20 Mar 2008 02:09:15 -0000      1.1
@@ -0,0 +1,71 @@
+#include "gvars3/GUI.h"
+#include "src/GUI_impl.h"
+#include "gvars3/GStringUtil.h"
+
+#include <gvars3/GUI_readline.h>
+
+#include <pthread.h>
+
+#include <cctype>
+#include <sstream>
+#include <fstream>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <algorithm>
+
+#include <readline/readline.h>
+#include <readline/history.h>
+
+using namespace std;
+
+namespace GVars3
+{
+ 
+  void GUI_impl::SetupReadlineCompletion()
+  {
+    mpReadlineCompleterGUI = this;
+    rl_attempted_completion_function = ReadlineCompletionFunction;
+    rl_basic_word_break_characters = " \t\n\"\\'address@hidden><;|&{("; 
+  }
+  
+  char ** GUI_impl::ReadlineCompletionFunction (const char *text, int start, 
int end)
+  {
+    rl_completion_append_character=0;
+    char **matches;
+    matches = (char **)NULL;
+    matches = rl_completion_matches (text,   ReadlineCommandGeneratorCB);
+    return (matches);
+  }
+  
+  void print_history(ostream &ost)
+  {
+    HIST_ENTRY **apHistEntries = history_list();
+    if(apHistEntries)
+      while((*apHistEntries)!=NULL)
+       {
+         ost << (*apHistEntries)->line << endl;
+         apHistEntries++;
+       }
+  };
+
+
+  void GUI_impl::StartParserThread()
+  {
+    if(mpParserThread)  // Only makes sense to have one instance of the parser 
thread.
+      return;
+    
+    mpParserThread = new spawn_readline_thread("");
+  }
+
+void GUI_impl::StopParserThread()
+  {
+    if(!mpParserThread)
+      return;
+
+    delete( (spawn_readline_thread*) mpParserThread);
+    mpParserThread = NULL;
+  }
+
+
+}