From 4cbc183b53c514dfa87690f2e4ffb596dbeb708f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 21 Jul 2005 23:52:06 +0000 Subject: [PATCH] Added option "-t" to specify the window title. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13797 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/apps/miniterminal/Arguments.cpp | 13 +++++++++++-- src/tests/apps/miniterminal/Arguments.h | 2 ++ src/tests/apps/miniterminal/MiniWin.cpp | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/tests/apps/miniterminal/Arguments.cpp b/src/tests/apps/miniterminal/Arguments.cpp index 375fa405dc..d7a562df26 100644 --- a/src/tests/apps/miniterminal/Arguments.cpp +++ b/src/tests/apps/miniterminal/Arguments.cpp @@ -21,7 +21,8 @@ static const char *kUsage = " -h, --help - print this info text\n" " -l - open the terminal window at location (, )\n" " -s - open the terminal window with width and\n" - " height )\n"; + " height )\n" + " -t - set the terminal window title to <title>\n"; // application name const char *kAppName = __progname; @@ -43,7 +44,8 @@ Arguments::Arguments() : fBounds(50, 50, 630, 435), fStandardShell(true), fShellArgumentCount(0), - fShellArguments(NULL) + fShellArguments(NULL), + fTitle("MiniTerminal") { const char *argv[] = { "/bin/sh", "--login" }; @@ -91,6 +93,13 @@ Arguments::Parse(int argc, const char *const *argv) fBounds.right = fBounds.left + width; fBounds.bottom = fBounds.top + height; + } else if (strcmp(arg, "-t") == 0) { + // title + if (argi >= argc) + print_usage_and_exit(true); + + fTitle = argv[argi++]; + } else { // illegal option fprintf(stderr, "Unrecognized option \"%s\"\n", arg); diff --git a/src/tests/apps/miniterminal/Arguments.h b/src/tests/apps/miniterminal/Arguments.h index 2c36ff1192..0e36551517 100644 --- a/src/tests/apps/miniterminal/Arguments.h +++ b/src/tests/apps/miniterminal/Arguments.h @@ -16,6 +16,7 @@ public: void Parse(int argc, const char *const *argv); BRect Bounds() const { return fBounds; } + const char *Title() const { return fTitle; } bool StandardShell() const { return fStandardShell; } void GetShellArguments(int &argc, const char *const *&argv) const; @@ -26,6 +27,7 @@ private: bool fStandardShell; int fShellArgumentCount; const char **fShellArguments; + const char *fTitle; }; diff --git a/src/tests/apps/miniterminal/MiniWin.cpp b/src/tests/apps/miniterminal/MiniWin.cpp index e66e59437f..7c574de592 100644 --- a/src/tests/apps/miniterminal/MiniWin.cpp +++ b/src/tests/apps/miniterminal/MiniWin.cpp @@ -10,7 +10,7 @@ #include "MiniWin.h" MiniWin::MiniWin(const Arguments &args) - : BWindow(args.Bounds(), "MiniTerminal", B_TITLED_WINDOW, + : BWindow(args.Bounds(), args.Title(), B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE) { fView = new MiniView(args);