Applied patch by Vasilis Kaoutsis:
* removed directive #include <cstdlib> removed directive #include <cassert> Removed also the use of assert() as BAlert::Go() returns always 0, or 1, or 2. renamed cstring to string.h and cstdio to stdio.h since our coding style prefers C-style headers. * Merged the two classes to AlertApplication since i see no reason to have them both. * removed some getter functions and used the private data members instead, since this doesn't break the "hide the implementation details rule" (i think). * Modified Signature application from "application/x-vnd.OBOS.cmd-alert" to "application/x-vnd.Haiku.cmd-alert" * Make some defines const char* and int32 according to the corresponding types. * Changed AlertApplication::SetChoice(const int32 but) to AlertApplication::SetChoice(int32 buttonIndex). * The usual coding style clean-up (tabs, spaces, etc). * Added documentation for more readable code here and there; and doxygen style documentation for two functions: AlertApplication::ArgvReceived(int32 argc, char** argv) and AlertApplication::ReadyToRun() * Add myself to the authors' list, since that makes good to my psycology, and makes me more productive! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19655 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
+205
-197
@@ -1,228 +1,236 @@
|
|||||||
/*********************************************************************
|
/*
|
||||||
** Alert Applet
|
* Copyright 2002-2006, Haiku Inc. All Rights Reserved.
|
||||||
**********************************************************************
|
* Distributed under the terms of the MIT License.
|
||||||
** 2002-04-28 Mathew Hounsell Created.
|
*
|
||||||
*/
|
* Authors:
|
||||||
|
* Mathew Hounsell
|
||||||
|
* Vasilis Kaoutsis, [email protected]
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <Application.h>
|
|
||||||
#include <Alert.h>
|
#include <Alert.h>
|
||||||
|
#include <Application.h>
|
||||||
|
|
||||||
#include <cstdio>
|
#include <stdio.h>
|
||||||
#include <cstring>
|
#include <string.h>
|
||||||
#include <cstdlib>
|
|
||||||
#include <cassert>
|
|
||||||
|
|
||||||
/*********************************************************************
|
|
||||||
|
const char* kSignature = "application/x-vnd.Haiku.cmd-alert";
|
||||||
|
|
||||||
|
const char* kButtonDefault = "OK";
|
||||||
|
|
||||||
|
const int32 kErrorInitFail = 127;
|
||||||
|
const int32 kErrorArgumentsFail = 126;
|
||||||
|
|
||||||
|
|
||||||
|
class AlertApplication : public BApplication {
|
||||||
|
public:
|
||||||
|
AlertApplication();
|
||||||
|
virtual ~AlertApplication() { }
|
||||||
|
|
||||||
|
virtual void ReadyToRun();
|
||||||
|
virtual void ArgvReceived(int32 argc, char** argv);
|
||||||
|
|
||||||
|
bool GoodArguments() const { return fOk; }
|
||||||
|
int32 ChoiceNumber() const { return fChoiceNumber; }
|
||||||
|
char const* ChoiceText() const { return fChoiceText; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
void _SetChoice(int32 buttonIndex);
|
||||||
|
void _Usage() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool fOk;
|
||||||
|
bool fModal;
|
||||||
|
alert_type fIcon;
|
||||||
|
char* fArgumentText;
|
||||||
|
char* fArgumentButton0;
|
||||||
|
char* fArgumentButton1;
|
||||||
|
char* fArgumentButton2;
|
||||||
|
char* fChoiceText;
|
||||||
|
int32 fChoiceNumber;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
AlertApplication::AlertApplication()
|
||||||
|
: BApplication(kSignature),
|
||||||
|
fOk(false),
|
||||||
|
fModal(false),
|
||||||
|
fIcon(B_INFO_ALERT),
|
||||||
|
fArgumentText(NULL),
|
||||||
|
fArgumentButton0(NULL),
|
||||||
|
fArgumentButton1(NULL),
|
||||||
|
fArgumentButton2(NULL),
|
||||||
|
fChoiceText(NULL),
|
||||||
|
fChoiceNumber(0)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Invoked when the application receives a B_ARGV_RECEIVED message.
|
||||||
|
The message is sent when command line arguments are used in launching the
|
||||||
|
app from the shell. The function isn't called if there were no command
|
||||||
|
line arguments.
|
||||||
*/
|
*/
|
||||||
|
void
|
||||||
|
AlertApplication::ArgvReceived(int32 argc, char** argv)
|
||||||
|
{
|
||||||
|
// Now there is at least one
|
||||||
|
// command line argument option.
|
||||||
|
|
||||||
// #define SIGNATURE "application/x-vnd.Be-cmd-alert"
|
const uint32 kArgCount = argc - 1;
|
||||||
#define SIGNATURE "application/x-vnd.OBOS.cmd-alert"
|
uint32 index = 1;
|
||||||
#define APP_NAME "alert"
|
bool iconFlag = false;
|
||||||
|
|
||||||
#define BUTTON_DEFAULT "OK"
|
// Look for valid '--' options.
|
||||||
|
for (; index <= kArgCount; ++index) {
|
||||||
|
if (argv[index][0] == '-' && argv[index][1] == '-') {
|
||||||
|
const char* option = argv[index] + 2;
|
||||||
|
|
||||||
#define ERR_INIT_FAIL 127
|
if (!strcmp(option, "modal"))
|
||||||
#define ERR_ARGS_FAIL 126
|
fModal = true;
|
||||||
#define ERR_NONE 0
|
else if (!strcmp(option, "empty") && !iconFlag) {
|
||||||
|
fIcon = B_EMPTY_ALERT;
|
||||||
/*********************************************************************
|
iconFlag = true;
|
||||||
*/
|
} else if (!strcmp(option, "info") && !iconFlag) {
|
||||||
class Arguments {
|
fIcon = B_INFO_ALERT;
|
||||||
bool ok, recved, modal;
|
iconFlag = true;
|
||||||
alert_type icon;
|
} else if (!strcmp(option, "idea") && !iconFlag) {
|
||||||
char *arg_text, *arg_but0, *arg_but1, *arg_but2;
|
fIcon = B_IDEA_ALERT;
|
||||||
char *choice_text;
|
iconFlag = true;
|
||||||
int32 choice;
|
} else if (!strcmp(option, "warning") && !iconFlag) {
|
||||||
public:
|
fIcon = B_WARNING_ALERT;
|
||||||
Arguments( void ) {
|
iconFlag = true;
|
||||||
ok = recved = modal = false;
|
} else if (!strcmp(option, "stop") && !iconFlag) {
|
||||||
icon = B_INFO_ALERT;
|
fIcon = B_STOP_ALERT;
|
||||||
arg_text = arg_but0 = arg_but1 = arg_but2 = 0;
|
iconFlag = true;
|
||||||
choice = 0;
|
|
||||||
}
|
|
||||||
~Arguments( void ) {
|
|
||||||
std::free( arg_text );
|
|
||||||
std::free( arg_but0 );
|
|
||||||
std::free( arg_but1 );
|
|
||||||
std::free( arg_but2 );
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool Good( void ) const { return ok; }
|
|
||||||
inline bool Bad( void ) const { return ! ok; }
|
|
||||||
|
|
||||||
void ArgvReceived( int32 argc, char **argv )
|
|
||||||
{
|
|
||||||
recved = true;
|
|
||||||
|
|
||||||
if( argc < 2 ) return;
|
|
||||||
|
|
||||||
int32 start = 1;
|
|
||||||
bool flag_icon = false;
|
|
||||||
|
|
||||||
// Look for '--' options'
|
|
||||||
for( int32 i = 1; i < argc; ++i, ++start ) {
|
|
||||||
if( '-' == argv[i][0] && '-' == argv[i][1] ) {
|
|
||||||
if( 0 == strcmp( argv[i] + 2, "modal" ) ) {
|
|
||||||
modal = true;
|
|
||||||
// } else if( 0 == strcmp( argv[i] + 2, "empty" )
|
|
||||||
// || 0 == strcmp( argv[i] + 2, "none" ) ) {
|
|
||||||
} else if( 0 == strcmp( argv[i] + 2, "empty" ) ) {
|
|
||||||
if( flag_icon ) return;
|
|
||||||
icon = B_EMPTY_ALERT;
|
|
||||||
flag_icon = true;
|
|
||||||
} else if( 0 == strcmp( argv[i] + 2, "info" ) ) {
|
|
||||||
if( flag_icon ) return;
|
|
||||||
icon = B_INFO_ALERT;
|
|
||||||
flag_icon = true;
|
|
||||||
} else if( 0 == strcmp( argv[i] + 2, "idea" ) ) {
|
|
||||||
if( flag_icon ) return;
|
|
||||||
icon = B_IDEA_ALERT;
|
|
||||||
flag_icon = true;
|
|
||||||
// } else if( 0 == strcmp( argv[i] + 2, "warning" )
|
|
||||||
// || 0 == strcmp( argv[i] + 2, "warn" ) ) {
|
|
||||||
} else if( 0 == strcmp( argv[i] + 2, "warning" ) ) {
|
|
||||||
if( flag_icon ) return;
|
|
||||||
icon = B_WARNING_ALERT;
|
|
||||||
flag_icon = true;
|
|
||||||
} else if( 0 == strcmp( argv[i] + 2, "stop" ) ) {
|
|
||||||
if( flag_icon ) return;
|
|
||||||
icon = B_STOP_ALERT;
|
|
||||||
flag_icon = true;
|
|
||||||
} else {
|
} else {
|
||||||
|
// Unrecognized '--' opition.
|
||||||
|
fprintf(stdout, "Unrecognized option %s\n", argv[index]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else break;
|
} else {
|
||||||
|
// Option doesn't start with '--'
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( start >= argc ) { // Nothing but --modal
|
if (index == kArgCount) {
|
||||||
|
// User provides arguments that all begins with '--',
|
||||||
|
// so none can be considered as text argument.
|
||||||
|
fprintf(stdout, "Missing the text argument!\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fArgumentText = strdup(argv[index]);
|
||||||
|
// First argument that start without --,
|
||||||
|
// so grub it as the text argument.
|
||||||
|
|
||||||
|
if (index == kArgCount) {
|
||||||
|
// No more text argument. Give Button0
|
||||||
|
// the default label.
|
||||||
|
fArgumentButton0 = strdup(kButtonDefault);
|
||||||
|
fOk = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
arg_text = strdup( argv[start++] );
|
if (index < kArgCount) {
|
||||||
if( start < argc ) arg_but0 = strdup( argv[start++] );
|
// There is another argument,
|
||||||
else arg_but0 = strdup( BUTTON_DEFAULT );
|
// so let that be the Button0 label.
|
||||||
if( start < argc ) arg_but1 = strdup( argv[start++] );
|
fArgumentButton0 = strdup(argv[++index]);
|
||||||
if( start < argc ) arg_but2 = strdup( argv[start++] );
|
|
||||||
|
|
||||||
ok = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline char const * Title( void ) const { return APP_NAME; }
|
if (index < kArgCount) {
|
||||||
|
// There is another argument,
|
||||||
inline char const * Text( void ) const { return arg_text; }
|
// so let that be the Button1 label.
|
||||||
inline char const * ButtonZero( void ) const { return arg_but0; }
|
fArgumentButton1 = strdup(argv[++index]);
|
||||||
inline char const * ButtonOne( void ) const { return arg_but1; }
|
|
||||||
inline char const * ButtonTwo( void ) const { return arg_but2; }
|
|
||||||
|
|
||||||
inline alert_type Type( void ) const { return icon; }
|
|
||||||
|
|
||||||
inline bool IsModal( void ) const { return modal; }
|
|
||||||
|
|
||||||
inline bool Received( void ) const { return recved; }
|
|
||||||
|
|
||||||
inline int32 ChoiceNumber( void ) const { return choice; }
|
|
||||||
inline char const * ChoiceText( void ) const { return choice_text; }
|
|
||||||
|
|
||||||
void SetChoice( int32 but )
|
|
||||||
{
|
|
||||||
assert( but >= 0 && but <= 2 );
|
|
||||||
|
|
||||||
choice = but;
|
|
||||||
switch( choice ) {
|
|
||||||
case 0: choice_text = arg_but0; break;
|
|
||||||
case 1: choice_text = arg_but1; break;
|
|
||||||
case 2: choice_text = arg_but2; break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Usage( void )
|
if (index < kArgCount) {
|
||||||
{
|
// There is another argument,
|
||||||
fprintf(
|
// so let that be the Button2 label.
|
||||||
stderr,
|
fArgumentButton2 = strdup(argv[++index]);
|
||||||
"usage: " APP_NAME " <type> ] [ --modal ] [ --help ] text [ button1 [ button2 [ button3 ]]]\n"
|
}
|
||||||
|
|
||||||
|
// Ignore all other arguments if they exist,
|
||||||
|
// since they are useless.
|
||||||
|
|
||||||
|
fOk = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
AlertApplication::_SetChoice(int32 buttonIndex)
|
||||||
|
{
|
||||||
|
fChoiceNumber = buttonIndex;
|
||||||
|
switch (fChoiceNumber) {
|
||||||
|
case 0:
|
||||||
|
fChoiceText = fArgumentButton0;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
fChoiceText = fArgumentButton1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 2:
|
||||||
|
fChoiceText = fArgumentButton2;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
AlertApplication::_Usage() const
|
||||||
|
{
|
||||||
|
fprintf(stderr,
|
||||||
|
"usage: alert [ <type> ] [ --modal ] [ --help ] text [ button1 [ button2 [ button3 ]]]\n"
|
||||||
"<type> is --empty | --info | --idea | --warning | --stop\n"
|
"<type> is --empty | --info | --idea | --warning | --stop\n"
|
||||||
"--modal makes the alert system modal and shows it in all workspaces.\n"
|
"--modal makes the alert system modal and shows it in all workspaces.\n"
|
||||||
"If any button argument is given, exit status is button number (starting with 0)\n"
|
"If any button argument is given, exit status is button number (starting with 0)\n"
|
||||||
" and '" APP_NAME "' will print the title of the button pressed to stdout.\n"
|
"and 'alert' will print the title of the button pressed to stdout.\n");
|
||||||
);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
} arguments;
|
|
||||||
|
|
||||||
/*********************************************************************
|
/*!
|
||||||
|
Is called when the app receives a B_READY_TO_RUN message. The message
|
||||||
|
is sent automatically during the Run() function, and is sent after the
|
||||||
|
initial B_REFS_RECEIVED and B_ARGV_RECEIVED messages (if any) have been
|
||||||
|
handled.
|
||||||
*/
|
*/
|
||||||
class AlertApplication : public BApplication {
|
void
|
||||||
typedef BApplication super;
|
AlertApplication::ReadyToRun()
|
||||||
|
{
|
||||||
|
if (GoodArguments()) {
|
||||||
|
BAlert* alert = new BAlert("alert", fArgumentText,
|
||||||
|
fArgumentButton0, fArgumentButton1, fArgumentButton2,
|
||||||
|
B_WIDTH_AS_USUAL, fIcon);
|
||||||
|
|
||||||
public:
|
if (fModal)
|
||||||
AlertApplication( void ) : super( SIGNATURE ) { }
|
alert->SetFeel(B_MODAL_ALL_WINDOW_FEEL);
|
||||||
// No destructor as it crashes app.
|
|
||||||
|
|
||||||
virtual void ArgvReceived( int32 argc, char **argv )
|
_SetChoice(alert->Go());
|
||||||
{
|
} else
|
||||||
if( ! arguments.Received() ) {
|
_Usage();
|
||||||
arguments.ArgvReceived( argc, argv );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prepare to Run
|
|
||||||
virtual void ReadyToRun(void) {
|
|
||||||
|
|
||||||
if( arguments.Good() ) {
|
|
||||||
BAlert * alert_p
|
|
||||||
= new BAlert(
|
|
||||||
arguments.Title(),
|
|
||||||
arguments.Text(),
|
|
||||||
arguments.ButtonZero(),
|
|
||||||
arguments.ButtonOne(),
|
|
||||||
arguments.ButtonTwo(),
|
|
||||||
B_WIDTH_AS_USUAL,
|
|
||||||
arguments.Type()
|
|
||||||
);
|
|
||||||
|
|
||||||
if( arguments.IsModal() ) {
|
|
||||||
alert_p->SetFeel( B_MODAL_ALL_WINDOW_FEEL );
|
|
||||||
}
|
|
||||||
|
|
||||||
arguments.SetChoice( alert_p->Go() );
|
|
||||||
}
|
|
||||||
|
|
||||||
Quit();
|
Quit();
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
/*********************************************************************
|
// #pragma mark -
|
||||||
** Acording to the BeBook youm should use the message handling in
|
|
||||||
** BApplication for arguments. However that requires the app to
|
|
||||||
** be created.
|
int
|
||||||
*/
|
main(int argc, char** argv)
|
||||||
int main( int argc, char ** argv )
|
{
|
||||||
{
|
AlertApplication app;
|
||||||
arguments.ArgvReceived( int32(argc), argv );
|
if (app.InitCheck() != B_OK)
|
||||||
if( ! arguments.Good() ) {
|
return kErrorInitFail;
|
||||||
arguments.Usage();
|
|
||||||
return ERR_ARGS_FAIL;
|
app.Run();
|
||||||
}
|
if (!app.GoodArguments())
|
||||||
|
return kErrorArgumentsFail;
|
||||||
int errorlevel = ERR_NONE;
|
|
||||||
|
fprintf(stdout, "%s\n", app.ChoiceText());
|
||||||
// App is Automatically assigned to be_app
|
return app.ChoiceNumber();
|
||||||
new AlertApplication();
|
|
||||||
|
|
||||||
if( B_OK != be_app->InitCheck() ) {
|
|
||||||
// Cast for the right version.
|
|
||||||
errorlevel = ERR_INIT_FAIL;
|
|
||||||
} else {
|
|
||||||
// Run
|
|
||||||
be_app->Run();
|
|
||||||
if( ! arguments.Good() ) { // In case of Roster start.
|
|
||||||
arguments.Usage();
|
|
||||||
errorlevel = ERR_ARGS_FAIL;
|
|
||||||
} else {
|
|
||||||
fprintf( stdout, "%s\n", arguments.ChoiceText() );
|
|
||||||
errorlevel = arguments.ChoiceNumber();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return errorlevel;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user