From e80534391a9709372f18bcd84789bfa2c7c45d2d Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 3 Feb 2009 19:43:43 +0000 Subject: [PATCH] added new directory and .pro file for retrpshare-nogui git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@990 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/rsiface/notifytxt.cc | 165 ------------------------ libretroshare/src/rsiface/notifytxt.h | 57 -------- libretroshare/src/rsiface/retroshare.cc | 112 ---------------- libretroshare/src/rsiface/rsforums.h | 3 + 4 files changed, 3 insertions(+), 334 deletions(-) delete mode 100644 libretroshare/src/rsiface/notifytxt.cc delete mode 100644 libretroshare/src/rsiface/notifytxt.h delete mode 100644 libretroshare/src/rsiface/retroshare.cc diff --git a/libretroshare/src/rsiface/notifytxt.cc b/libretroshare/src/rsiface/notifytxt.cc deleted file mode 100644 index 35c0a6125..000000000 --- a/libretroshare/src/rsiface/notifytxt.cc +++ /dev/null @@ -1,165 +0,0 @@ -/* - * "$Id: notifytxt.cc,v 1.1 2007-02-19 20:08:30 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -#include "rsiface/notifytxt.h" -#include "rsiface/rspeers.h" - -#include -#include - -void NotifyTxt::notifyErrorMsg(int list, int type, std::string msg) -{ - return; -} - -void NotifyTxt::notifyChat() -{ - return; -} - -void NotifyTxt::notifyListChange(int list, int type) -{ - std::cerr << "NotifyTxt::notifyListChange()" << std::endl; - switch(list) - { - case NOTIFY_LIST_NEIGHBOURS: - displayNeighbours(); - break; - case NOTIFY_LIST_FRIENDS: - displayFriends(); - break; - case NOTIFY_LIST_DIRLIST: - displayDirectories(); - break; - case NOTIFY_LIST_SEARCHLIST: - displaySearch(); - break; - case NOTIFY_LIST_MESSAGELIST: - displayMessages(); - break; - case NOTIFY_LIST_CHANNELLIST: - displayChannels(); - break; - case NOTIFY_LIST_TRANSFERLIST: - displayTransfers(); - break; - default: - break; - } - return; -} - - - -void NotifyTxt::displayNeighbours() -{ - std::list ids; - std::list::iterator it; - - rsPeers->getOthersList(ids); - - std::ostringstream out; - for(it = ids.begin(); it != ids.end(); it++) - { - RsPeerDetails detail; - rsPeers->getPeerDetails(*it, detail); - - out << "Neighbour: "; - out << detail; - out << std::endl; - } - std::cerr << out.str(); -} - -void NotifyTxt::displayFriends() -{ - std::list ids; - std::list::iterator it; - - rsPeers->getFriendList(ids); - - std::ostringstream out; - for(it = ids.begin(); it != ids.end(); it++) - { - RsPeerDetails detail; - rsPeers->getPeerDetails(*it, detail); - - out << "Neighbour: "; - out << detail; - out << std::endl; - } - std::cerr << out.str(); -} - -void NotifyTxt::displayDirectories() -{ - iface->lockData(); /* Lock Interface */ - - std::ostringstream out; - std::cerr << out.str(); - - iface->unlockData(); /* UnLock Interface */ -} - - -void NotifyTxt::displaySearch() -{ - iface->lockData(); /* Lock Interface */ - - std::ostringstream out; - std::cerr << out.str(); - - iface->unlockData(); /* UnLock Interface */ -} - - -void NotifyTxt::displayMessages() -{ - iface->lockData(); /* Lock Interface */ - iface->unlockData(); /* UnLock Interface */ -} - -void NotifyTxt::displayChannels() -{ - iface->lockData(); /* Lock Interface */ - - std::ostringstream out; - std::cerr << out.str(); - - iface->unlockData(); /* UnLock Interface */ -} - - -void NotifyTxt::displayTransfers() -{ - iface->lockData(); /* Lock Interface */ - - std::ostringstream out; - std::cerr << out.str(); - - iface->unlockData(); /* UnLock Interface */ -} - diff --git a/libretroshare/src/rsiface/notifytxt.h b/libretroshare/src/rsiface/notifytxt.h deleted file mode 100644 index 13bd7f1b6..000000000 --- a/libretroshare/src/rsiface/notifytxt.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef RSIFACE_NOTIFY_TXT_H -#define RSIFACE_NOTIFY_TXT_H -/* - * "$Id: notifytxt.h,v 1.1 2007-02-19 20:08:30 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -#include "rsiface/rsiface.h" - -#include - -class NotifyTxt: public NotifyBase -{ - public: - NotifyTxt() { return; } - virtual ~NotifyTxt() { return; } - void setRsIface(RsIface *i) { iface = i; } - -virtual void notifyListChange(int list, int type); -virtual void notifyErrorMsg(int list, int sev, std::string msg); -virtual void notifyChat(); - - private: - - void displayNeighbours(); - void displayFriends(); - void displayDirectories(); - void displaySearch(); - void displayMessages(); - void displayChannels(); - void displayTransfers(); - - RsIface *iface; /* so we can get the data */ -}; - -#endif diff --git a/libretroshare/src/rsiface/retroshare.cc b/libretroshare/src/rsiface/retroshare.cc deleted file mode 100644 index 55a1d125f..000000000 --- a/libretroshare/src/rsiface/retroshare.cc +++ /dev/null @@ -1,112 +0,0 @@ - -/* - * "$Id: retroshare.cc,v 1.4 2007-04-21 19:08:51 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -#include "rsiface/rsiface.h" /* definition of iface */ - -#include "rsiface/notifytxt.h" - -#include -#ifdef WINDOWS_SYS -#include -#endif - - -/* Basic instructions for running libretroshare as background thread. - * ******************************************************************* * - * This allows your program to communicate with authenticated peers. - * - * libretroshare's interfaces are defined in libretroshare/src/rsiface. - * This should be the only headers that you need to include. - * - * The startup routine's are defined in rsiface.h - */ - -int main(int argc, char **argv) -{ - /* Retroshare startup is configured using an RsInit object. - * This is an opaque class, which the user cannot directly tweak - * If you want to peek at whats happening underneath look in - * libretroshare/src/rsserver/p3face-startup.cc - * - * You create it with InitRsConfig(), and delete with CleanupRsConfig() - * InitRetroshare(argv, argc, config) parses the command line options, - * and initialises the config paths. - * - * *** There are several functions that I should add to modify - * **** the config the moment these can only be set via the commandline - * - RsConfigDirectory(...) is probably the most useful. - * - RsConfigNetAddr(...) for setting port, etc. - * - RsConfigOutput(...) for logging and debugging. - * - * Next you need to worry about loading your certificate, or making - * a new one: - * - * RsGenerateCertificate(...) To create a new key, certificate - * LoadPassword(...) set password for existing certificate. - **/ - - RsInit *config = InitRsConfig(); - InitRetroShare(argc, argv, config); - - /* load password should be called at this point: LoadPassword() - * otherwise loaded from commandline. - */ - - /* Key + Certificate are loaded into libretroshare */ - LoadCertificates(config, false); - - /* Now setup the libretroshare interface objs - * You will need to create you own NotifyXXX class - * if you want to receive notifications of events */ - - NotifyTxt *notify = new NotifyTxt(); - RsIface *iface = createRsIface(*notify); - RsControl *rsServer = createRsControl(*iface, *notify); - - notify->setRsIface(iface); - - /* Start-up libretroshare server threads */ - - rsServer -> StartupRetroShare(config); - CleanupRsConfig(config); - - /* pass control to the GUI */ - while(1) - { - std::cerr << "GUI Tick()" << std::endl; -#ifndef WINDOWS_SYS - sleep(1); -#else - Sleep(1000); -#endif - } - return 1; -} - - - - diff --git a/libretroshare/src/rsiface/rsforums.h b/libretroshare/src/rsiface/rsforums.h index a5402f482..8504ab4e9 100644 --- a/libretroshare/src/rsiface/rsforums.h +++ b/libretroshare/src/rsiface/rsforums.h @@ -34,6 +34,9 @@ #include "rsiface/rstypes.h" #include "rsiface/rsdistrib.h" /* For FLAGS */ +#define RS_FORUMMSG_NEW 0x0010 + + class ForumInfo { public: