summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Theme.cc41
1 files changed, 14 insertions, 27 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index c72631a..8996b5a 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -41,7 +41,7 @@
41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
42// DEALINGS IN THE SOFTWARE. 42// DEALINGS IN THE SOFTWARE.
43 43
44// $Id: Theme.cc,v 1.15 2002/01/18 01:28:34 fluxgen Exp $ 44// $Id: Theme.cc,v 1.16 2002/01/21 02:02:38 fluxgen Exp $
45 45
46#ifndef _GNU_SOURCE 46#ifndef _GNU_SOURCE
47#define _GNU_SOURCE 47#define _GNU_SOURCE
@@ -651,10 +651,6 @@ void Theme::loadToolbarStyle() {
651void Theme::loadRootCommand() { 651void Theme::loadRootCommand() {
652 XrmValue value; 652 XrmValue value;
653 char *value_type; 653 char *value_type;
654 #ifdef DEBUG
655 cerr<<"rootcommand.size()="<<m_rootcommand.size()<<endl;
656 cerr<<"rootcommand="<<m_rootcommand<<endl;
657 #endif
658 654
659 if (m_rootcommand.size()) { 655 if (m_rootcommand.size()) {
660 #ifndef __EMX__ 656 #ifndef __EMX__
@@ -664,44 +660,35 @@ void Theme::loadRootCommand() {
664 string displaystring("DISPLAY="); 660 string displaystring("DISPLAY=");
665 displaystring.append(DisplayString(m_display)); 661 displaystring.append(DisplayString(m_display));
666 displaystring.append(tmpstring); // append m_screennum 662 displaystring.append(tmpstring); // append m_screennum
667 #ifdef DEBUG
668 cerr<<__FILE__<<"("<<__LINE__<<"): displaystring="<<displaystring.c_str()<<endl;
669 #endif
670 663
671 bexec(m_rootcommand.c_str(), const_cast<char *>(displaystring.c_str())); 664 bexec(m_rootcommand.c_str(), const_cast<char *>(displaystring.c_str()));
672 665
673 #else // __EMX__ 666 #else // __EMX__
674 spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_rootcommand.c_str(), NULL); 667 spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_rootcommand.c_str(), NULL);
675 #endif // !__EMX__ 668 #endif // !__EMX__
676 669
677 #ifdef DEBUG 670 } else if (XrmGetResource(m_database, "rootCommand", "RootCommand",
678 cerr<<__FILE__<<"("<<__LINE__<<"): Rootcommand: "<<m_rootcommand<<endl; 671 &value_type, &value)) {
679 #endif //!DEBUG 672 #ifndef __EMX__
680
681 } else if (XrmGetResource(m_database, "rootCommand",
682 "RootCommand", &value_type, &value)) {
683 #ifndef __EMX__
684 char tmpstring[256]; //to hold m_screennum 673 char tmpstring[256]; //to hold m_screennum
685 tmpstring[0]=0; 674 tmpstring[0]=0;
686 sprintf(tmpstring, "%d", m_screennum); 675 sprintf(tmpstring, "%d", m_screennum);
687 string displaystring("DISPLAY="); 676 string displaystring("DISPLAY=");
688 displaystring.append(DisplayString(m_display)); 677 displaystring.append(DisplayString(m_display));
689 displaystring.append(tmpstring); // append m_screennum 678 displaystring.append(tmpstring); // append m_screennum
690 cerr<<__FILE__<<"("<<__LINE__<<"): displaystring="<<displaystring.c_str()<<endl; 679
691
692 bexec(value.addr, const_cast<char *>(displaystring.c_str())); 680 bexec(value.addr, const_cast<char *>(displaystring.c_str()));
693 #else // __EMX__ 681 #else // __EMX__
682
694 spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", value.addr, NULL); 683 spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", value.addr, NULL);
695 #endif // !__EMX__ 684
696 685 #endif // !__EMX__
697 #ifdef DEBUG 686
698 fprintf(stderr, "rootcommand:%s\n", value.addr);
699 #endif
700 } 687 }
701#ifdef DEBUG 688 #ifdef DEBUG
702 else 689 else
703 fprintf(stderr, "%s(%d) Didnt find rootCommand!\n", __FILE__, __LINE__); 690 cerr<<__FILE__<<"("<<__LINE__<<"): Didn't find rootCommand."<<endl;
704#endif 691 #endif
705 692
706} 693}
707 694