backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-08 12:53:53 +08:00
Code Issues Projects Releases Wiki Activity

fixes, mainly for windows. first, had to add a notification from

Browse Source 
CServer to the primary screen when the configuration changes so it
can make necessary adjustments (the win32 primary screen must tell
the hook dll about the new jump zones).

changed includes of some std c++ library files to go through
our own include files.  these wrap the include with stuff to
keep vc++ quiet when compiling at warning level 4, which is
what it does now.  it also works around missing <istream> and
<ostream> on g++2.96.

added missing std:: where necessary.  g++ doesn't really support
namespaces so it lets references without the namespace slip
through.

added workaround or fix.  not sure if istringstream::str(string)
should reset eofbit.  it does on g++ but does not on vc++.
added clear() after str() so it works either way.

added low-level keyboard hook to win32.  if available (it's only
available on NT SP3 and up) it allows us to catch and handle
alt+tab, alt+esc, ctrl+esc, and windows key hot keys.  i think
that leaves only ctrl+alt+del and accessibility functions
uncaught on those systems.
This commit is contained in:
crs
2002-06-01 19:26:11 +00:00
parent 1ac62a9533
commit d2135af0d9
46 changed files with 576 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
server/CConfig.cpp
View File

@@ -1,12 +1,7 @@
#include "CConfig.h"
#include "stdistream.h"
#include "stdostream.h"
#include <assert.h>
// FIXME -- fix this with automake and config.h
#if !defined(CONFIG_PLATFORM_LINUX)
#include <istream>
#include <ostream>
#else
#include <iostream>
#endif
//
// CConfig
@@ -160,10 +155,10 @@ const char* CConfig::dirName(EDirection dir)
return s_name[dir - kFirstDirection];
}
bool CConfig::readLine(istream& s, CString& line)
bool CConfig::readLine(std::istream& s, CString& line)
{
s >> std::ws;
while (getline(s, line)) {
while (std::getline(s, line)) {
// strip comments and then trailing whitespace
CString::size_type i = line.rfind('#');
if (i != CString::npos) {
@@ -183,7 +178,7 @@ bool CConfig::readLine(istream& s, CString& line)
return false;
}
void CConfig::readSection(istream& s)
void CConfig::readSection(std::istream& s)
{
static const char s_section[] = "section:";
static const char s_screens[] = "screens";
@@ -223,7 +218,7 @@ void CConfig::readSection(istream& s)
}
}
void CConfig::readSectionScreens(istream& s)
void CConfig::readSectionScreens(std::istream& s)
{
CString line;
CString name;
@@ -256,7 +251,7 @@ void CConfig::readSectionScreens(istream& s)
throw XConfigRead("unexpected end of screens section");
}
void CConfig::readSectionLinks(istream& s)
void CConfig::readSectionLinks(std::istream& s)
{
CString line;
CString screen;
@@ -338,7 +333,7 @@ void CConfig::readSectionLinks(istream& s)
// CConfig I/O
//
istream& operator>>(istream& s, CConfig& config)
std::istream& operator>>(std::istream& s, CConfig& config)
{
// FIXME -- should track line and column to improve error reporting
@@ -350,44 +345,44 @@ istream& operator>>(istream& s, CConfig& config)
return s;
}
ostream& operator<<(ostream& s, const CConfig& config)
std::ostream& operator<<(std::ostream& s, const CConfig& config)
{
// screens section
s << "section: screens" << endl;
s << "section: screens" << std::endl;
for (CConfig::const_iterator screen = config.begin();
screen != config.end(); ++screen) {
s << "\t" << screen->c_str() << ":" << endl;
s << "\t" << screen->c_str() << ":" << std::endl;
}
s << "end" << endl;
s << "end" << std::endl;
// links section
CString neighbor;
s << "section: links" << endl;
s << "section: links" << std::endl;
for (CConfig::const_iterator screen = config.begin();
screen != config.end(); ++screen) {
s << "\t" << screen->c_str() << ":" << endl;
s << "\t" << screen->c_str() << ":" << std::endl;
neighbor = config.getNeighbor(*screen, CConfig::kLeft);
if (!neighbor.empty()) {
s << "\t\tleft=" << neighbor.c_str() << endl;
s << "\t\tleft=" << neighbor.c_str() << std::endl;
}
neighbor = config.getNeighbor(*screen, CConfig::kRight);
if (!neighbor.empty()) {
s << "\t\tright=" << neighbor.c_str() << endl;
s << "\t\tright=" << neighbor.c_str() << std::endl;
}
neighbor = config.getNeighbor(*screen, CConfig::kTop);
if (!neighbor.empty()) {
s << "\t\tup=" << neighbor.c_str() << endl;
s << "\t\tup=" << neighbor.c_str() << std::endl;
}
neighbor = config.getNeighbor(*screen, CConfig::kBottom);
if (!neighbor.empty()) {
s << "\t\tdown=" << neighbor.c_str() << endl;
s << "\t\tdown=" << neighbor.c_str() << std::endl;
}
}
s << "end" << endl;
s << "end" << std::endl;
return s;
}