Changeset 9394 in orxonox.OLD for branches

Timestamp:

Jul 23, 2006, 4:07:41 PM (18 years ago)

Author:

bensch

Message:

netlink quite nice

Location:

branches/proxy/src/lib/util

Files:

• Makefile.am (modified) (2 diffs)
• filesys/net_link.cc (modified) (4 diffs)
• filesys/net_link.h (modified) (2 diffs)

branches/proxy/src/lib/util/Makefile.am

@@ -23 +23 @@
                 filesys/file.cc \
                 filesys/directory.cc \
+                filesys/net_link.cc \
                 \
                 preferences.cc \
@@ -42 +43 @@
                 filesys/file.h \
                 filesys/directory.h \
+                filesys/net_link.h \
                 \
                 preferences.h \

branches/proxy/src/lib/util/filesys/net_link.cc

@@ +1 @@
+/*
+   orxonox - the future of 3D-vertical-scrollers
 
+   Copyright (C) 2004 orx
+
+   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, or (at your option)
+   any later version.
+
+### File Specific:
+   main-programmer: Benjamin Grauer
+   co-programmer: ...
+*/
 
 #include "net_link.h"
+#include "debug.h"
 
-
-#include "threading.h"
-void SimpleGameMenu::execURL() const
-{
-  std::string URL = "http://www.orxonox.net";
-  SDL_CreateThread(startURL, (void*)&URL);
-}
 
 #ifdef __OSX__
@@ -17 +24 @@
 #endif
 
-int SimpleGameMenu::startURL(void* url)
+
+NetLink::NetLink(const std::string& linkName)
 {
+  this->_link = linkName;
+}
+
+
+void NetLink::openInBrowser() const
+{
+  SDL_CreateThread(NetLink::openupInBrowser, (void*)&this->_link);
+}
+
+OrxThread::Mutex NetLink::_mutex;
+std::string NetLink::_browser = "firefox";
+std::list<std::string> NetLink::_browserList = NetLink::buildBrowserList();
+
+
+
+
+int NetLink::openupInBrowser(void* url)
+{
+  OrxThread::MutexLock lock(&NetLink::_mutex);
+
   std::string URL = *(std::string*)url;
 #ifdef __linux__
-  system ((std::string("firefox ") + URL).c_str());
+  system ((std::string(NetLink::defaultBrowser()) + " " + URL).c_str());
+
 #elif defined __OSX__
   CFURLRef url_handle = CFURLCreateWithBytes (NULL, (UInt8 *)URL.c_str(), URL.size(),
@@ -27 +56 @@
   LSOpenCFURLRef (url_handle, NULL);
   CFRelease (url_handle);
+
 #elif defined __WIN32__
   /*  ShellExecute(GetActiveWindow(),
@@ -33 +63 @@
 #endif
   PRINTF(3)("loaded external webpage %s\n", URL.c_str());
+
+  return 0;
 }
 
+void NetLink::setDefaultBrowser(const std::string& browserName)
+{
+  OrxThread::MutexLock lock(&NetLink::_mutex);
+  NetLink::_browser = browserName;
+}
+
+std::list<std::string> NetLink::buildBrowserList()
+{
+  std::list<std::string> browserList;
+  browserList.push_back("firefox");
+  browserList.push_back("mozilla");
+  browserList.push_back("konqueror");
+
+  return  browserList;
+}

branches/proxy/src/lib/util/filesys/net_link.h

@@ +1 @@
+/*!
+ * @file net_link.h
+ * @brief Definition of a NetLink class
+ * NetLink is a File link to a page of file link to the Internet,
+ * or the local file-system
+ *
+ * Opening a link should be made easy through this class
+ *
+ * !! DANGER IT IS POSSIBLE TO EXECUTE ALL PROGRAMMS WITH USER'S RIGHTS
+ * !! ON THE DESIGNATED MACHINE
+ * !! THIS CLASS SHOULD BE USED WITH CAUTION WHEN USING OVER IN NETWORK
+ * !! MODE
+ */
 
 #ifndef __NET_LINK_H__
@@ -6 +19 @@
 #include <list>
 
+#include "threading.h"
+
+//! NetLink is a File and Link executer for Internet Links
+/**
+ * @example: NetLink("http://www.orxonox.net").openInBrowser();
+ */
 class NetLink
 {
 public:
-  NetLink(const std::string& );
+  NetLink(const std::string& linkName);
 
-  void execURL() const;
-  int startURL(void* url);
-
+  void openInBrowser() const;
 
   static void setDefaultBrowser(const std::string& browserName);
-  static const std::string& defaultBrowser();
+  static const std::string& defaultBrowser() {  return NetLink::_browser; };
 
 private:
-  static void buildBrowserList();
+  static int openupInBrowser(void* url);
+
+  static std::list<std::string> buildBrowserList();
 
 
 private:
-  std::string                    _link;
+  std::string                     _link;             //!< Linkname
+
 
   // static lists.
+  static OrxThread::Mutex         _mutex;            //!< One mutex to lock them all.
   static std::string              _browser;
   static std::list<std::string>   _browserList;