all repos — fluxbox @ 72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3

custom fork of the fluxbox windowmanager

move compiled-in option reporting into -info
Also explicitly say which ones aren't in.
rathnor rathnor
commit

72e4f1eeb3e4ac1c92a58e814a626469c5a7c9f3

parent

1b9a07dcbc4ffa650ad824cbf0db27cb67fb3cc9

1 files changed, 42 insertions(+), 27 deletions(-)

jump to
M src/main.ccsrc/main.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: main.cc,v 1.15 2003/05/07 22:19:59 fluxgen Exp $ +// $Id: main.cc,v 1.16 2003/05/07 23:17:24 rathnor Exp $

@@ -118,46 +118,61 @@ "Fluxbox %s : (c) 2001-2003 Henrik Kinnunen\n\n"

" -display <string>\t\tuse display connection.\n" " -rc <string>\t\t\tuse alternate resource file.\n" " -version\t\t\tdisplay version and exit.\n" + " -info\t\t\tdisplay some useful information.\n" " -help\t\t\t\tdisplay this help text and exit.\n\n"), __fluxbox_version); - - cout<<"Compiled with: "<<endl<< -#ifdef DEBUG + ::exit(0); + } else if (strcmp(argv[i], "-info") == 0 || strcmp(argv[i], "-i") == 0) { +#define NOT "-" + cout<<"Compiled options ("<<NOT<<" => disabled): "<<endl<< +#ifndef DEBUG + NOT<< +#endif // DEBUG "DEBUG"<<endl<< -#endif // DEBUG -#ifdef SLIT - "SLIT"<<endl<< +#ifndef SLIT + NOT<< #endif // SLIT -#ifdef HAVE_XPM + "SLIT"<<endl<< +#ifndef HAVE_XPM + NOT<< +#endif // HAVE_XPM "XPM"<<endl<< -#endif // HAVE_XPM -#ifdef USE_GNOME +#ifndef USE_GNOME + NOT<< +#endif // USE_GNOME "GNOME"<<endl<< -#endif // USE_GNOME -#ifdef KDE +#ifndef KDE + NOT<< +#endif // KDE "KDE"<<endl<< -#endif // KDE -#ifdef USE_NEWWMSPEC +#ifndef USE_NEWWMSPEC + NOT<< +#endif // USE_NEWWMSPEC "EWMH"<<endl<< -#endif // USE_NEWWMSPEC -#ifdef REMEMBER +#ifndef REMEMBER + NOT<< +#endif // REMEMBER "REMEMBER"<<endl<< -#endif // REMEMBER -#ifdef SHAPE - "SHAPE"<<endl<< +#ifndef SHAPE + NOT<< #endif // SHAPE -#ifdef USE_XFT + "SHAPE"<<endl<< +#ifndef USE_XFT + NOT<< +#endif // USE_XFT "XFT"<<endl<< -#endif // USE_XFT -#ifdef USE_XMB - "XMB"<<endl<< +#ifndef USE_XMB + NOT<< #endif // USE_XMB -#ifdef XINERAMA - "XINERAMA"<<endl<< + "XMB"<<endl<< +#ifndef XINERAMA + NOT<< #endif // XINERAMA -#ifdef HAVE_XRENDER - "RENDER"<<endl<< + "XINERAMA"<<endl<< +#ifndef HAVE_XRENDER + NOT<< #endif // HAVE_XRENDER + "RENDER"<<endl<< endl; ::exit(0); }