aboutsummaryrefslogtreecommitdiff
path: root/src/main.cc
diff options
context:
space:
mode:
authorunknown <unknown>2002-01-11 11:59:54 (GMT)
committerunknown <unknown>2002-01-11 11:59:54 (GMT)
commit61661d638e34b3ce6c986d5a53b8c08c1051d422 (patch)
treef0b87676e95070afee163f76902efd0c4d5b5fe6 /src/main.cc
parentf98c3c9045397bd9497621deb55b310366f8a5de (diff)
parenta3d2a1cf0a5ab724e19a91915fe97842f52260d5 (diff)
downloadfluxbox-61661d638e34b3ce6c986d5a53b8c08c1051d422.zip
fluxbox-61661d638e34b3ce6c986d5a53b8c08c1051d422.tar.bz2
This commit was manufactured by cvs2svn to create tagRelease-0_1_6
'Release-0_1_6'.
Diffstat (limited to 'src/main.cc')
-rw-r--r--src/main.cc23
1 files changed, 21 insertions, 2 deletions
diff --git a/src/main.cc b/src/main.cc
index 19ed631..266db84 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,3 +1,6 @@
1// main.cc for Fluxbox Window manager
2// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3//
1// main.cc for Blackbox - an X11 Window manager 4// main.cc for Blackbox - an X11 Window manager
2// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
3// 6//
@@ -19,6 +22,8 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
21 24
25// $Id: main.cc,v 1.3 2002/01/11 09:31:10 fluxgen Exp $
26
22// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
23// library 28// library
24#ifndef _GNU_SOURCE 29#ifndef _GNU_SOURCE
@@ -58,7 +63,21 @@
58#include <iostream> 63#include <iostream>
59using namespace std; 64using namespace std;
60 65
66#ifdef DEBUG_UDS
67
68#include <uds/init.hh>
69#include <uds/uds.hh>
70
71// configure UDS
72uds::uds_flags_t uds::flags = uds::leak_check;
73
74#endif //!DEBUG_UDS
75
61int main(int argc, char **argv) { 76int main(int argc, char **argv) {
77 #ifdef DEBUG_UDS
78 uds::Init uds_init;
79 #endif //!DEBUG_UDS
80
62 char *session_display = (char *) 0; 81 char *session_display = (char *) 0;
63 char *rc_file = (char *) 0; 82 char *rc_file = (char *) 0;
64 83
@@ -119,7 +138,7 @@ int main(int argc, char **argv) {
119 } 138 }
120 } else if (! strcmp(argv[i], "-version")) { 139 } else if (! strcmp(argv[i], "-version")) {
121 // print current version string 140 // print current version string
122 printf("Fluxbox %s : (c) 2001 Henrik Kinnunen \n\n", 141 printf("Fluxbox %s : (c) 2001 - 2002 Henrik Kinnunen \n\n",
123 __fluxbox_version); 142 __fluxbox_version);
124 143
125 ::exit(0); 144 ::exit(0);
@@ -132,7 +151,7 @@ int main(int argc, char **argv) {
132#else // !NLS 151#else // !NLS
133 0, 0, 152 0, 0,
134#endif // NLS 153#endif // NLS
135 "Fluxbox %s : (c) 2001 Henrik Kinnunen\n\n" 154 "Fluxbox %s : (c) 2001 - 2002 Henrik Kinnunen\n\n"
136 " -display <string>\t\tuse display connection.\n" 155 " -display <string>\t\tuse display connection.\n"
137 " -rc <string>\t\t\tuse alternate resource file.\n" 156 " -rc <string>\t\t\tuse alternate resource file.\n"
138 " -version\t\t\tdisplay version and exit.\n" 157 " -version\t\t\tdisplay version and exit.\n"