// $Id$
//
-// Copyright (C) 2009
+// Copyright (C) 2009
// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-// Stefan Bund <g0dil@berlios.de>
//
-// 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.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// 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.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Stefan Bund <g0dil@berlios.de>
/** \file
\brief Terminfo non-inline non-template implementation */
//#include "Terminfo.mpp"
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
char const * const senf::term::Terminfo::properties::BooleanNames [] = {
"AutoLeftMargin", "AutoRightMargin", "NoEscCtlc", "CeolStandoutGlitch", "EatNewlineGlitch",
"AcsUlcorner", "AcsLlcorner", "AcsUrcorner", "AcsLrcorner", "AcsLtee", "AcsRtee", "AcsBtee",
"AcsTtee", "AcsHline", "AcsVline", "AcsPlus", "MemoryLock", "MemoryUnlock", "BoxChars1" };
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::term::Terminfo
+prefix_ senf::term::Terminfo::InvalidTerminfoException::InvalidTerminfoException(std::string const & term)
+ : senf::Exception("Unreadable terminfo file")
+{
+ if (!term.empty())
+ append( ": " + term);
+}
+
prefix_ senf::term::Terminfo::Terminfo()
{}
prefix_ void senf::term::Terminfo::load(std::string const & term)
{
std::string filename (findTerminfo(term));
- if (filename.empty()) throw InvalidTerminfoException();
+ if (filename.empty()) throw InvalidTerminfoException(term);
std::ifstream is (filename.c_str());
- if (!is) throw InvalidTerminfoException();
- load(is);
+ if (!is) throw InvalidTerminfoException(filename);
+ try {
+ load(is);
+ } catch (InvalidTerminfoException & ex) {
+ ex << ": " << filename;
+ throw ex;
+ }
}
prefix_ bool senf::term::Terminfo::getFlag(properties::Boolean p)
{
std::vector<senf::term::Terminfo::number_t> stack;
- void push(senf::term::Terminfo::number_t v)
+ void push(senf::term::Terminfo::number_t v)
{
stack.push_back(v);
}
- senf::term::Terminfo::number_t pop()
- {
+ senf::term::Terminfo::number_t pop()
+ {
if (stack.empty())
return 0;
else {
case '~': stack.push(~stack.pop()); break;
case 't': bCondValue = stack.pop();
case 'e': if ((bCondValue = !bCondValue)) // this also supports elsif
- --(i = prgstr.begin() + std::min (prgstr.find ("%e", i-prgstr.begin()),
+ --(i = prgstr.begin() + std::min (prgstr.find ("%e", i-prgstr.begin()),
prgstr.find ("%;", i-prgstr.begin())));
case '?':
case ';': break;
- case 'p':
+ case 'p':
switch (*++i) {
case '1': stack.push(arg1); break;
case '2': stack.push(arg2); break;
NumberVec::const_iterator i (numbers_.begin());
NumberVec::const_iterator const i_end (numbers_.end());
for (; i != i_end; ++i, ++n)
- if (*i != NoValue
+ if (*i != NoValue
&& n < sizeof(properties::NumericNames)/sizeof(properties::NumericNames[0]))
os << " " << properties::NumericNames[n] << " = " << *i << "\n";
}
char const * tivar (::getenv("TERMINFO"));
if (tivar) {
tientry = boost::filesystem::path(tivar) / subdir;
- if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+ if (boost::filesystem::exists(tientry)) return tientry.string();
}
}
tientry = boost::filesystem::path("/etc/terminfo") / subdir;
- if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+ if (boost::filesystem::exists(tientry)) return tientry.string();
tientry = boost::filesystem::path("/lib/terminfo") / subdir;
- if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+ if (boost::filesystem::exists(tientry)) return tientry.string();
tientry = boost::filesystem::path("/usr/share/terminfo") / subdir;
- if (boost::filesystem::exists(tientry)) return tientry.native_file_string();
+ if (boost::filesystem::exists(tientry)) return tientry.string();
return "";
}
boost::uint16_t nNumbers;
boost::uint16_t nStrings;
boost::uint16_t stringPoolSz;
+
+ void letoh() {
+ magic = le16toh(magic);
+ namesSz = le16toh(namesSz);
+ nBooleans = le16toh(nBooleans);
+ nNumbers = le16toh(nNumbers);
+ nStrings = le16toh(nStrings);
+ stringPoolSz = le16toh(stringPoolSz);
+ }
};
}
{
TerminfoHeader h;
is.read(static_cast<char*>(static_cast<void*>(&h)), sizeof(h));
- if (!is || h.magic != TerminfoMagic) throw InvalidTerminfoException();
+ h.letoh();
+ if (!is || h.magic != TerminfoMagic) throw InvalidTerminfoException(
+ "invalid magic number (") << h.magic << "!=" << TerminfoMagic << ")";
name_.resize(h.namesSz);
is.read(&(name_[0]), name_.size());
}
if (booleans_.size() & 1)
is.ignore(1u);
-
+
numbers_.resize(h.nNumbers);
for (NumberVec::iterator i (numbers_.begin()); i != numbers_.end(); ++i) {
number_t v;
number_t v;
is.read(static_cast<char*>(static_cast<void*>(&v)), sizeof(v));
if (!is) throw InvalidTerminfoException();
- *i = v;
+ *i = le16toh(v);
}
-
+
stringPool_.resize(h.stringPoolSz);
is.read(&(stringPool_[0]), stringPool_.size());
if (!is) throw InvalidTerminfoException();
*j = 0;
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::term::KeyParser
char const * const senf::term::KeyParser::KeyNames[] = {
if (key.empty())
return std::make_pair(KeyCode(0), 0);
- // There are several cases:
+ // There are several cases:
// a) 'key' is an incomplete key sequence. In this case, 'key' will precede all completions in
// the key table. The first possible completion is found by 'upper_bound'
// b) 'key' is a complete key sequence. This is the key sequence *preceding* the 'upper_bound'
}
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
//#include "Terminfo.mpp"
projects / senf.git / blobdiff