X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwx-console%2Fwxbutils.cpp;h=ce9f9baea0abad8910bbe8a750bce6798e77ae33;hb=3227fb78cccb8cf93511f0ee55a21aff8f372ab9;hp=7e93bb6cf9d27389d90e0193045098d1a6013ea1;hpb=ef254f04b27d5f17c6f22025fb8a228124a8f52e;p=bacula%2Fbacula

diff --git a/bacula/src/wx-console/wxbutils.cpp b/bacula/src/wx-console/wxbutils.cpp
index 7e93bb6cf9..ce9f9baea0 100644
--- a/bacula/src/wx-console/wxbutils.cpp
+++ b/bacula/src/wx-console/wxbutils.cpp
@@ -1,34 +1,50 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 /*
  *
  *   wxbDataParser, class that receives and analyses data
  *
  *    Nicolas Boichat, April-July 2004
  *
+ *    Version $Id$
  */
-/*
-   Copyright (C) 2004 Kern Sibbald and John Walker
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
+/*  Windows debug builds set _DEBUG which is used by wxWidgets to select their
+ *  debug memory allocator.  Unfortunately it conflicts with Bacula's SmartAlloc.
+ * So we turn _DEBUG off since we aren't interested in things it enables.
+ */
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+#undef _DEBUG
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
+#include "bacula.h"
 #include "wxbutils.h"
-
 #include "wxbmainframe.h"
-
 #include "csprint.h"
-
 #include "wxbtableparser.h"
 
 /* A macro named Yield is defined under MinGW */
@@ -36,6 +52,32 @@
 
 bool wxbUtils::inited = false;
 
+wxString wxbUtils::ConvertToPrintable(wxString& str) {
+   /* FIXME : Unicode support should be added to fix this problem */
+#if (wxUSE_UNICODE == 0) && __WXGTK20__
+   wxString strnew(str);
+   /* Convert the string to something printable without unicode */
+   for (unsigned int i = 0; i < strnew.Length(); i++) {
+      /* If the character is not ASCII, print a ? */
+      if (((unsigned char)strnew[i] > (unsigned char)127)) {
+         strnew[i] = '?';
+      }
+   }
+   return strnew;
+#else
+   return str;
+#endif   
+}
+
+/* Sleeps during milliseconds (wrapper for wxUsleep (2.4) or wxMilliSleep (2.6)) */
+void wxbUtils::MilliSleep(unsigned long milliseconds) {
+#if wxCHECK_VERSION(2, 6, 0)
+   ::wxMilliSleep(milliseconds);
+#else
+   ::wxUsleep(milliseconds);
+#endif
+}
+
 /* Initialization */
 void wxbUtils::Init() {
    inited = true;
@@ -56,7 +98,7 @@ wxbTableParser* wxbUtils::CreateAndWaitForParser(wxString cmd) {
    while (!tableParser->hasFinished()) {
       //innerThread->Yield();
       wxTheApp->Yield(true);
-      ::wxUsleep(100);
+      wxbUtils::MilliSleep(100);
       //if (base+15 < wxDateTime::Now().GetTicks()) break;
    }
    return tableParser;
@@ -74,7 +116,7 @@ wxbPromptParser* wxbUtils::WaitForPrompt(wxString cmd, bool keepresults) {
    while (!promptParser->hasFinished()) {
       //innerThread->Yield();
       wxTheApp->Yield(true);
-      ::wxUsleep(100);
+      wxbUtils::MilliSleep(100);
       //if (base+15 < wxDateTime::Now().GetTicks()) break;
    }
      
@@ -99,7 +141,7 @@ wxbDataTokenizer* wxbUtils::WaitForEnd(wxString cmd, bool keepresults, bool line
    while (!datatokenizer->hasFinished()) {
       //innerThread->Yield();
       wxTheApp->Yield(true);
-      ::wxUsleep(100);
+      wxbUtils::MilliSleep(100);
       //if (base+15 < wxDateTime::Now().GetTicks()) break;
    }
    
@@ -141,14 +183,14 @@ bool wxbDataParser::Print(wxString str, int status) {
       }
    
       if (allnewline) {
-         ret = Analyse(buffer << "\n", CS_DATA);
-         buffer = "";
+         ret = Analyse(buffer << wxT("\n"), CS_DATA);
+         buffer = wxT("");
          for (unsigned int i = 1; i < str.Length(); i++) {
-            ret = Analyse("\n", status);
+            ret = Analyse(wxT("\n"), status);
          }
       }
       else {
-         wxStringTokenizer tkz(str, "\n", 
+         wxStringTokenizer tkz(str, wxT("\n"), 
             (wxStringTokenizerMode)(wxTOKEN_RET_DELIMS | wxTOKEN_RET_EMPTY | wxTOKEN_RET_EMPTY_ALL));
    
          while ( tkz.HasMoreTokens() ) {
@@ -157,23 +199,23 @@ bool wxbDataParser::Print(wxString str, int status) {
                if ((buffer.GetChar(buffer.Length()-1) == '\n') ||
                   (buffer.GetChar(buffer.Length()-1) == '\r')) {
                   ret = Analyse(buffer, status);
-                  buffer = "";
+                  buffer = wxT("");
                }
             }
          }
       }
    
-      if (buffer == "$ ") { // Restore console
+      if (buffer == wxT("$ ")) { // Restore console
          ret = Analyse(buffer, status);
-         buffer = "";
+         buffer = wxT("");
       }
    
       if (status != CS_DATA) {
          if (buffer.Length() != 0) {
             ret = Analyse(buffer, CS_DATA);
          }
-         buffer = "";
-         ret = Analyse("", status);
+         buffer = wxT("");
+         ret = Analyse(wxT(""), status);
       }
    }
    else {
@@ -198,7 +240,7 @@ wxbDataTokenizer::~wxbDataTokenizer() {
 bool wxbDataTokenizer::Analyse(wxString str, int status) {
    finished = ((status == CS_END) || (status == CS_PROMPT) || (status == CS_DISCONNECTED));
 
-   if (str != "") {
+   if (str != wxT("")) {
       Add(str);
    }
    return false;
@@ -214,10 +256,10 @@ bool wxbDataTokenizer::hasFinished() {
 wxbPromptParser::wxbPromptParser(): wxbDataParser(false) {
    finished = false;
    prompt = false;
-   introStr = "";
+   introStr = wxT("");
    choices = NULL;
    numerical = false;
-   questionStr = "";
+   questionStr = wxT("");
 }
 
 /* Destroy a wxbDataTokenizer */
@@ -240,23 +282,23 @@ bool wxbPromptParser::Analyse(wxString str, int status) {
             choices = NULL;
             numerical = false;
          }
-         questionStr = "";
-         introStr = "";
+         questionStr = wxT("");
+         introStr = wxT("");
       }
       int i;
       long num;
       
-      if (((i = str.Find(": ")) > 0) && (str.Mid(0, i).Trim(false).ToLong(&num))) { /* List element */
+      if (((i = str.Find(wxT(": "))) > 0) && (str.Mid(0, i).Trim(false).ToLong(&num))) { /* List element */
          if (!choices) {
             choices = new wxArrayString();
-            choices->Add(""); /* index 0 is never used by multiple choice questions */
+            choices->Add(wxT("")); /* index 0 is never used by multiple choice questions */
             numerical = true;
          }
          
          if ((long)choices->GetCount() != num) { /* new choice has begun */
             delete choices;
             choices = new wxArrayString();
-            choices->Add("", num); /* fill until this number */
+            choices->Add(wxT(""), num); /* fill until this number */
             numerical = true;
          }
          
@@ -273,23 +315,22 @@ bool wxbPromptParser::Analyse(wxString str, int status) {
    }
    else {
       finished = ((status == CS_PROMPT) || (status == CS_END) || (status == CS_DISCONNECTED));
-      if (prompt = ((status == CS_PROMPT) && (questionStr != "$ "))) { // && (str.Find(": ") == str.Length())
+      if (prompt = ((status == CS_PROMPT) && (questionStr != wxT("$ ")))) { // && (str.Find(": ") == str.Length())
          if (introStr.Last() == '\n') {
             introStr.RemoveLast();
          }
-         if ((introStr != "") && (questionStr == "")) {
+         if ((introStr != wxT("")) && (questionStr == wxT(""))) {
             questionStr = introStr;
-            introStr = "";
+            introStr = wxT("");
          }
          
-         if ((!choices) && (questionStr.Find("(yes/mod/no)") > -1)) {
+         if ((!choices) && (questionStr.Find(wxT("(yes/mod/no)")) > -1)) {
             choices = new wxArrayString();
-            choices->Add("yes");
-            choices->Add("mod");
-            choices->Add("no");
+            choices->Add(wxT("yes"));
+            choices->Add(wxT("mod"));
+            choices->Add(wxT("no"));
             numerical = false;
          }
-         
          return true;
       }
       else { /* ended or (dis)connected */
@@ -298,8 +339,8 @@ bool wxbPromptParser::Analyse(wxString str, int status) {
             choices = NULL;
             numerical = false;
          }
-         questionStr = "";
-         introStr = "";
+         questionStr = wxT("");
+         introStr = wxT("");
       }
    }
    return false;
@@ -338,4 +379,3 @@ wxArrayString* wxbPromptParser::getChoices() {
 bool wxbPromptParser::isNumericalChoice() {
    return numerical;
 }
-