i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style fixes to TermWindow.cpp

Browse Source 
Removed trailing spaces after text generated by file drops
Added a few TODOs


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13940 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2005-08-12 18:59:17 +00:00
parent 401fdf8278
commit 8002431bb4
4 changed files with 582 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/TermApp.cpp
+248 -287
View File
@@ -4,8 +4,6 @@
*
* Distributed unter the terms of the MIT license.
*/
#include <stdio.h>
#include <signal.h>
#include <sys/wait.h>
@@ -27,32 +25,26 @@
#include "PrefHandler.h"
#include "CodeConv.h"
extern PrefHandler *gTermPref; /* Preference temporary */
// Preference temporary
extern PrefHandler *gTermPref;
extern char gWindowName[];
bool usage_requested = false;
bool geometry_requested = false;
bool color_requested = false;
/* function prototype. */
int argmatch (char **, int, char *, char *, int, char **, int *);
void sort_args (int, char **);
int text_to_rgb (char *, rgb_color *, char *);
int argmatch(char **, int, char *, char *, int, char **, int *);
void sort_args(int, char **);
int text_to_rgb(char *, rgb_color *, char *);
// message
const ulong MSG_ACTIVATE_TERM = 'msat';
const ulong MSG_TERM_IS_MINIMIZE = 'mtim';
////////////////////////////////////////////////////////////////////////////
//
//
////////////////////////////////////////////////////////////////////////////
TermApp::TermApp (void)
TermApp::TermApp(void)
:BApplication( TERM_SIGNATURE )
{
BList teams;
be_roster->GetAppList(TERM_SIGNATURE, &teams);
@@ -67,79 +59,78 @@ TermApp::TermApp (void)
int i = fWindowNumber / 16;
int j = fWindowNumber % 16;
int k = (j * 16) + (i * 64) + 50;
int l = (j * 16) + 50;
int k =(j * 16) + (i * 64) + 50;
int l =(j * 16) + 50;
fTermWindow = NULL;
fAboutPanel = NULL;
fTermFrame.Set(k, l, k + 50, k + 50);
gTermPref = new PrefHandler();
}
TermApp::~TermApp (void)
TermApp::~TermApp(void)
{
/* delete (gTermPref); */
// delete gTermPref;
}
void
TermApp::ReadyToRun (void)
TermApp::ReadyToRun(void)
{
//Prevent opeing window when option -h is given.
if (usage_requested) return;
// Prevent opeing window when option -h is given.
if(usage_requested)
return;
const char *command = NULL;
const char *encoding;
int rows, cols;
encoding = gTermPref->getString (PREF_TEXT_ENCODING);
encoding = gTermPref->getString(PREF_TEXT_ENCODING);
/* Get encoding name (setenv TTYPE in spawn_shell functions). */
// Get encoding name (setenv TTYPE in spawn_shell functions)
const etable *p = encoding_table;
while (p->name) {
if (!strcmp (p->name, encoding)) {
while(p->name) {
if(!strcmp(p->name, encoding)) {
encoding = p->shortname;
break;
}
p++;
}
if (CommandLine.Length() > 0){
if(CommandLine.Length() > 0)
command = CommandLine.String();
}else{
command = gTermPref->getString (PREF_SHELL);
else
command = gTermPref->getString(PREF_SHELL);
rows = gTermPref->getInt32(PREF_ROWS);
cols = gTermPref->getInt32(PREF_COLS);
pfd = spawn_shell(rows, cols, command, encoding);
// failed spawn, print stdout and open alert panel
if(pfd == -1 ) {
(new BAlert("alert", "Terminal couldn't start the shell. Sorry.",
"ok", NULL, NULL,B_WIDTH_FROM_LABEL,
B_INFO_ALERT))->Go(NULL);
PostMessage(B_QUIT_REQUESTED);
}
rows = gTermPref->getInt32 (PREF_ROWS);
cols = gTermPref->getInt32 (PREF_COLS);
pfd = spawn_shell (rows, cols, command, encoding);
/* failed spawn, print stdout and open alert panel. */
if (pfd == -1 ) {
(new BAlert ("alert",
"Terminal Error!!\nCan't execute shell.",
"Abort", NULL, NULL,
B_WIDTH_FROM_LABEL, B_INFO_ALERT))->Go(NULL);
this->PostMessage(B_QUIT_REQUESTED);
}
MakeTermWindow (fTermFrame);
MakeTermWindow(fTermFrame);
}
void
TermApp::Quit (void)
TermApp::Quit(void)
{
if(!usage_requested){
int status;
kill (-sh_pid, SIGHUP);
wait (&status);
kill(-sh_pid, SIGHUP);
wait(&status);
}
delete gTermPref;
@@ -172,19 +163,23 @@ TermApp::AboutRequested()
void
TermApp::MessageReceived(BMessage* msg)
{
switch(msg->what) {
switch(msg->what)
{
case MENU_NEW_TREM:
this->RunNewTerm();
{
RunNewTerm();
break;
}
case MENU_SWITCH_TERM:
this->SwitchTerm();
{
SwitchTerm();
break;
}
case MSG_ACTIVATE_TERM:
{
fTermWindow->TermWinActivate();
break;
}
case MSG_TERM_IS_MINIMIZE:
{
BMessage reply(B_REPLY);
@@ -193,9 +188,11 @@ TermApp::MessageReceived(BMessage* msg)
break;
}
default:
{
BApplication::MessageReceived(msg);
break;
}
}
}
struct standard_args
@@ -224,11 +221,6 @@ struct standard_args standard_args[] =
{ "-imsel", "--im-select-color", 0, 1, PREF_IM_SELECT_COLOR },
};
////////////////////////////////////////////////////////////////////////////
// ArgvReceived
// terminal option '--help' view help screen */
// checking args
////////////////////////////////////////////////////////////////////////////
void
TermApp::ArgvReceived(int32 argc, char **argv)
{
@@ -236,78 +228,78 @@ TermApp::ArgvReceived(int32 argc, char **argv)
char *value = 0;
rgb_color color;
if (argc > 1) {
if(argc < 2)
return;
sort_args (argc, argv);
sort_args(argc, argv);
argc = 0;
while (argv[argc]) argc++;
while(argv[argc])
argc++;
/* Print usage. */
if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args)) {
this->Usage (argv[0]);
// Print usage
if(argmatch(argv, argc, "-help", "--help", 3, NULL, &skip_args)) {
Usage(argv[0]);
usage_requested = true;
this->PostMessage (B_QUIT_REQUESTED);
PostMessage(B_QUIT_REQUESTED);
}
/* Load preference file. */
if (argmatch (argv, argc, "-p", "--preference", 4, &value, &skip_args)) {
// Load preference file
if(argmatch(argv, argc, "-p", "--preference", 4, &value, &skip_args))
gTermPref->Open(value);
}
// Set window title
if(argmatch(argv ,argc, "-t", "--title", 3, &value, &skip_args))
strcpy(gWindowName, value);
/* Set window title. */
if (argmatch (argv ,argc, "-t", "--title", 3, &value, &skip_args)) {
strcpy (gWindowName, value);
// Set window geometry
if(argmatch(argv, argc, "-geom", "--geometry", 4, &value, &skip_args)) {
}
/* Set window geometry. */
if (argmatch (argv, argc, "-geom", "--geometry", 4, &value, &skip_args)) {
int width, height, xpos, ypos;
sscanf (value, "%dx%d+%d+%d", &width, &height, &xpos, &ypos);
if (width < 0 || height < 0 || xpos < 0 || ypos < 0 ||
width >= 256 || height >= 256 || xpos >= 2048 || ypos >= 2048) {
fprintf (stderr, "%s: invalid geometry format or value.\n", argv[0]);
fprintf (stderr, "Try `%s --help' for more information.\n", argv[0]);
sscanf(value, "%dx%d+%d+%d", &width, &height, &xpos, &ypos);
if(width < 0 || height < 0 || xpos < 0 || ypos < 0
|| width >= 256 || height >= 256 || xpos >= 2048 || ypos >= 2048) {
fprintf(stderr, "%s: invalid geometry format or value.\n", argv[0]);
fprintf(stderr, "Try `%s --help' for more information.\n", argv[0]);
usage_requested = true;
this->PostMessage (B_QUIT_REQUESTED);
PostMessage(B_QUIT_REQUESTED);
}
gTermPref->setInt32 (PREF_COLS, width);
gTermPref->setInt32 (PREF_ROWS, height);
gTermPref->setInt32(PREF_COLS, width);
gTermPref->setInt32(PREF_ROWS, height);
fTermFrame.Set(xpos, ypos, xpos + 50, ypos + 50);
geometry_requested = true;
}
/* Open '/etc/rgb.txt' file. */
// Open '/etc/rgb.txt' file
BFile inFile;
status_t sts;
off_t size = 0;
sts = inFile.SetTo("/etc/rgb.txt", B_READ_ONLY);
if (sts != B_OK) {
fprintf (stderr, "%s: Can't open /etc/rgb.txt file.\n", argv[0]);
if(sts != B_OK) {
fprintf(stderr, "%s: Can't open /etc/rgb.txt file.\n", argv[0]);
usage_requested = true;
this->PostMessage (B_QUIT_REQUESTED);
PostMessage(B_QUIT_REQUESTED);
}
inFile.GetSize (&size);
inFile.GetSize(&size);
char *buffer = new char [size];
inFile.Read (buffer, size);
inFile.Read(buffer, size);
/* Set window, cursor, area and IM color. */
for (int i = 4; i < 13; i++) {
if (argmatch (argv, argc,
standard_args[i].name,
standard_args[i].longname,
// Set window, cursor, area and IM color
for(int i = 4; i < 13; i++) {
if(argmatch(argv, argc, standard_args[i].name, standard_args[i].longname,
9, &value, &skip_args)) {
if (text_to_rgb (value, &color, buffer)) {
gTermPref->setRGB (standard_args[i].prefname, color);
} else {
fprintf (stderr, "%s: invalid color string -- %s\n", argv[0], value);
}
if(text_to_rgb(value, &color, buffer))
gTermPref->setRGB(standard_args[i].prefname, color);
else
fprintf(stderr, "%s: invalid color string -- %s\n", argv[0], value);
}
}
@@ -315,62 +307,54 @@ TermApp::ArgvReceived(int32 argc, char **argv)
skip_args++;
if (skip_args < argc) {
/* Check invalid options */
if (*argv[skip_args] == '-') {
fprintf (stderr, "%s: invalid option `%s'\n", argv[0], argv[skip_args]);
fprintf (stderr, "Try `%s --help' for more information.\n", argv[0]);
if(skip_args < argc) {
// Check invalid options
if(*argv[skip_args] == '-') {
fprintf(stderr, "%s: invalid option `%s'\n", argv[0], argv[skip_args]);
fprintf(stderr, "Try `%s --help' for more information.\n", argv[0]);
usage_requested = true;
this->PostMessage (B_QUIT_REQUESTED);
PostMessage(B_QUIT_REQUESTED);
}
CommandLine += argv[skip_args++];
while (skip_args < argc) {
while(skip_args < argc) {
CommandLine += ' ';
CommandLine += argv[skip_args++];
}
}
}
}
////////////////////////////////////////////////////////////////////////////
//
//
////////////////////////////////////////////////////////////////////////////
//void
//TermApp::AboutRequested (void)
//TermApp::AboutRequested(void)
//{
// if (fAboutPanel) {
// fAboutPanel->Activate ();
// if(fAboutPanel) {
// fAboutPanel->Activate();
// }
// else {
// BRect rect(0, 0, 350 - 1, 170 - 1);
// rect.OffsetTo (fTermWindow->Frame().LeftTop());
// rect.OffsetBy (100, 100);
// rect.OffsetTo(fTermWindow->Frame().LeftTop());
// rect.OffsetBy(100, 100);
// fAboutPanel = new AboutDlg (rect, this);
// fAboutPanel = new AboutDlg(rect, this);
// fAboutPanel->Show();
// }
//}
////////////////////////////////////////////////////////////////////////////
//
//
////////////////////////////////////////////////////////////////////////////
void
TermApp::RefsReceived(BMessage *message)
{
// Works Only Launced by Double-Click file, or Drags file to App.
if (!(this->IsLaunching())){
if(!(IsLaunching()))
return;
}
entry_ref ref;
if ( message->FindRef("refs", 0, &ref) != B_OK )
if( message->FindRef("refs", 0, &ref) != B_OK )
return;
BFile file;
if ( file.SetTo(&ref, B_READ_WRITE) != B_OK )
if( file.SetTo(&ref, B_READ_WRITE) != B_OK )
return;
BNodeInfo info(&file);
@@ -378,63 +362,47 @@ TermApp::RefsReceived(BMessage *message)
info.GetType(mimetype);
// if App opened by Pref file
if (!strcmp(mimetype, PREFFILE_MIMETYPE)){
if(!strcmp(mimetype, PREFFILE_MIMETYPE)){
BEntry ent(&ref);
BPath path(&ent);
gTermPref->OpenText(path.Path());
return;
}
// if App opened by Shell Script
if (!strcmp(mimetype, "text/x-haiku-shscript")){
if(!strcmp(mimetype, "text/x-haiku-shscript")){
// Not implemented.
// beep();
return;
}
}
////////////////////////////////////////////////////////////////////////////
//
//
////////////////////////////////////////////////////////////////////////////
void
TermApp::MakeTermWindow (BRect &frame)
TermApp::MakeTermWindow(BRect &frame)
{
/* Create Window Object. */
fTermWindow = new TermWindow (frame, fWindowNumber);
fTermWindow->Show ();
fTermWindow = new TermWindow(frame, fWindowNumber);
fTermWindow->Show();
}
////////////////////////////////////////////////////////////////////////////
// RunNewTerm
// Launch New Terminal.
////////////////////////////////////////////////////////////////////////////
void
TermApp::RunNewTerm (void)
TermApp::RunNewTerm(void)
{
be_roster->Launch (TERM_SIGNATURE);
be_roster->Launch(TERM_SIGNATURE);
}
////////////////////////////////////////////////////////////////////////////
// ActivateTermWindow
// Activate TermWindow (not Pref...)
////////////////////////////////////////////////////////////////////////////
void
TermApp::ActivateTermWindow(team_id id)
{
BMessenger app(TERM_SIGNATURE, id);
if (app.IsTargetLocal()){
if(app.IsTargetLocal())
fTermWindow->Activate();
}else{
else
app.SendMessage(MSG_ACTIVATE_TERM);
}
}
////////////////////////////////////////////////////////////////////////////
// SwitchTerm
// Switch to other running terminal
////////////////////////////////////////////////////////////////////////////
void
TermApp::SwitchTerm()
{
@@ -442,49 +410,45 @@ TermApp::SwitchTerm()
BList teams;
be_roster->GetAppList(TERM_SIGNATURE, &teams);
int32 numTerms = teams.CountItems();
if (numTerms <= 1 ) return; //Can't Switch !!
if(numTerms <= 1 )
return; //Can't Switch !!
// Find position of mine in app teams.
int32 i;
for(i = 0; i < numTerms; i++){
if(myId == reinterpret_cast<team_id>(teams.ItemAt(i))) break;
for(i = 0; i < numTerms; i++) {
if(myId == reinterpret_cast<team_id>(teams.ItemAt(i)))
break;
}
do{
if(--i < 0) i = numTerms - 1;
}while(IsMinimize(reinterpret_cast<team_id>(teams.ItemAt(i))));
if(--i < 0)
i = numTerms - 1;
} while(IsMinimize(reinterpret_cast<team_id>(teams.ItemAt(i))));
// Activate switched terminal.
ActivateTermWindow(reinterpret_cast<team_id>(teams.ItemAt(i)));
}
////////////////////////////////////////////////////////////////////////////
// IsMinimize
// Check Specified Terminal Window is Minimized or not.
////////////////////////////////////////////////////////////////////////////
bool
TermApp::IsMinimize(team_id id)
{
BMessenger app(TERM_SIGNATURE, id);
if (app.IsTargetLocal()){
if(app.IsTargetLocal())
return fTermWindow->IsMinimized();
}
BMessage reply;
bool hidden;
if (app.SendMessage(MSG_TERM_IS_MINIMIZE, &reply) != B_OK)
if(app.SendMessage(MSG_TERM_IS_MINIMIZE, &reply) != B_OK)
return true;
reply.FindBool("result", &hidden);
return hidden;
}
////////////////////////////////////////////////////////////////////////////
// ShowHTML(const char *url)
// show specified url by Netpositive.
////////////////////////////////////////////////////////////////////////////
//#ifndef B_NETPOSITIVE_APP_SIGNATURE
//#define B_NETPOSITIVE_APP_SIGNATURE "application/x-vnd.Be-NPOS"
@@ -508,21 +472,18 @@ TermApp::IsMinimize(team_id id)
// be_roster->ActivateApp(be_roster->TeamFor(B_NETPOSITIVE_APP_SIGNATURE));
//}
////////////////////////////////////////////////////////////////////////////
// Usage
// Display usage to stderr
////////////////////////////////////////////////////////////////////////////
#define PR(a) fprintf(stderr, a)
// Display usage to stderr
void
TermApp::Usage (char *name)
TermApp::Usage(char *name)
{
fprintf (stderr, "\n");
fprintf (stderr, "Haiku Terminal\n");
fprintf (stderr, "Copyright 2004 Haiku, Inc.\n");
fprintf (stderr, "Parts Copyrigth (C) 1999 Kazuho Okui and Takashi Murai.\n");
fprintf (stderr, "\n");
fprintf (stderr, "Usage: %s [OPTION] [SHELL]\n", name);
fprintf(stderr, "\n");
fprintf(stderr, "Haiku Terminal\n");
fprintf(stderr, "Copyright 2004 Haiku, Inc.\n");
fprintf(stderr, "Parts Copyright(C) 1999 Kazuho Okui and Takashi Murai.\n");
fprintf(stderr, "\n");
fprintf(stderr, "Usage: %s [OPTION] [SHELL]\n", name);
PR(" -p, --preference load preference file\n");
PR(" -t, --title set window title\n");
@@ -536,76 +497,71 @@ TermApp::Usage (char *name)
PR(" -selbg, --select-back-color set selection area background color\n");
PR(" Examples of color are \"#FF00FF\" and \"purple\"\n");
PR("\n");
}
////////////////////////////////////////////////////////////////////////////
// text_to_rgb
// Convert string to rgb_color structure.
////////////////////////////////////////////////////////////////////////////
int
text_to_rgb (char *name, rgb_color *color, char *buffer)
text_to_rgb(char *name, rgb_color *color, char *buffer)
{
if (name[0] != '#') {
/* Convert from /etc/rgb.txt. */
BString inStr (buffer);
if(name[0] != '#') {
// Convert from /etc/rgb.txt.
BString inStr(buffer);
int32 point, offset = 0;
/* Search color name */
// Search color name
do {
point = inStr.FindFirst (name, offset);
if (point < 0)
point = inStr.FindFirst(name, offset);
if(point < 0)
return false;
offset = point + 1;
} while (*(buffer + point -1) != '\t');
} while(*(buffer + point -1) != '\t');
char *p = buffer + point;
while (*p != '\n') p--;
while(*p != '\n')
p--;
p++;
if (sscanf (p, "%d %d %d",
(int *)&color->red,
(int *)&color->green,
if(sscanf(p, "%d %d %d", (int *)&color->red, (int *)&color->green,
(int *)&color->blue) == EOF)
return false;
color->alpha = 0;
}
else if (name[0] == '#') {
/* Convert from #RRGGBB format */
sscanf (name, "#%2x%2x%2x",
(int *)&color->red,
(int *)&color->green,
else
if(name[0] == '#') {
// Convert from #RRGGBB format
sscanf(name, "#%2x%2x%2x", (int *)&color->red, (int *)&color->green,
(int *)&color->blue);
color->alpha = 0;
}
else
return false;
return true;
}
////////////////////////////////////////////////////////////////////////////
// argmatch
// This routine copy from GNU Emacs.
////////////////////////////////////////////////////////////////////////////
// TODO: This might be a GPL licensing issue here. Investigate.
int
argmatch (char **argv, int argc, char *sstr, char *lstr,
argmatch(char **argv, int argc, char *sstr, char *lstr,
int minlen, char **valptr, int *skipptr)
{
char *p = 0;
int arglen;
char *arg;
/* Don't access argv[argc]; give up in advance. */
if (argc <= *skipptr + 1)
// Don't access argv[argc]; give up in advance
if(argc <= *skipptr + 1)
return 0;
arg = argv[*skipptr+1];
if (arg == NULL)
if(arg == NULL)
return 0;
if (strcmp (arg, sstr) == 0)
if(strcmp(arg, sstr) == 0)
{
if (valptr != NULL)
if(valptr != NULL)
{
*valptr = argv[*skipptr+2];
*skipptr += 2;
@@ -614,22 +570,27 @@ argmatch (char **argv, int argc, char *sstr, char *lstr,
*skipptr += 1;
return 1;
}
arglen = (valptr != NULL && (p = strchr(arg, '=')) != NULL
? p - arg : strlen (arg));
if (lstr == 0 || arglen < minlen || strncmp (arg, lstr, arglen) != 0)
arglen =(valptr != NULL &&(p = strchr(arg, '=')) != NULL
? p - arg : strlen(arg));
if(lstr == 0 || arglen < minlen || strncmp(arg, lstr, arglen) != 0)
return 0;
else if (valptr == NULL)
else
if(valptr == NULL)
{
*skipptr += 1;
return 1;
}
else if (p != NULL)
else
if(p != NULL)
{
*valptr = p+1;
*skipptr += 1;
return 1;
}
else if (argv[*skipptr+2] != NULL)
else
if(argv[*skipptr+2] != NULL)
{
*valptr = argv[*skipptr+2];
*skipptr += 2;
@@ -640,44 +601,46 @@ argmatch (char **argv, int argc, char *sstr, char *lstr,
return 0;
}
}
////////////////////////////////////////////////////////////////////////////
// sort_args
// This routine copy from GNU Emacs.
////////////////////////////////////////////////////////////////////////////
// TODO: This might be a GPL licensing issue here. Investigate.
void
sort_args (int argc, char **argv)
sort_args(int argc, char **argv)
{
char **newargv = (char **) malloc (sizeof (char *) * argc);
/* For each element of argv,
/*
For each element of argv,
the corresponding element of options is:
0 for an option that takes no arguments,
1 for an option that takes one argument, etc.
-1 for an ordinary non-option argument. */
int *options = (int *) malloc (sizeof (int) * argc);
int *priority = (int *) malloc (sizeof (int) * argc);
-1 for an ordinary non-option argument.
*/
char **newargv =(char **) malloc(sizeof(char *) * argc);
int *options =(int *) malloc(sizeof(int) * argc);
int *priority =(int *) malloc(sizeof(int) * argc);
int to = 1;
int incoming_used = 1;
int from;
int i;
//int end_of_options = argc;
/* Categorize all the options,
and figure out which argv elts are option arguments. */
for (from = 1; from < argc; from++)
// Categorize all the options,
// and figure out which argv elts are option arguments
for(from = 1; from < argc; from++)
{
options[from] = -1;
priority[from] = 0;
if (argv[from][0] == '-')
if(argv[from][0] == '-')
{
int match, thislen;
char *equals;
/* If we have found "--", don't consider
any more arguments as options. */
if (argv[from][1] == '-' && argv[from][2] == 0)
// If we have found "--", don't consider any more arguments as options
if(argv[from][1] == '-' && argv[from][2] == 0)
{
/* Leave the "--", and everything following it, at the end. */
for (; from < argc; from++)
// Leave the "--", and everything following it, at the end.
for(; from < argc; from++)
{
priority[from] = -100;
options[from] = -1;
@@ -685,55 +648,53 @@ sort_args (int argc, char **argv)
break;
}
/* Look for a match with a known old-fashioned option. */
for (i = 0;
i < (int)(sizeof (standard_args) / sizeof (standard_args[0]));
i++)
if (!strcmp (argv[from], standard_args[i].name))
// Look for a match with a known old-fashioned option.
for(i = 0; i <(int)(sizeof(standard_args) / sizeof(standard_args[0])); i++)
if(!strcmp(argv[from], standard_args[i].name))
{
options[from] = standard_args[i].nargs;
priority[from] = standard_args[i].priority;
if (from + standard_args[i].nargs >= argc)
fprintf (stderr, "Option `%s' requires an argument\n", argv[from]);
if(from + standard_args[i].nargs >= argc)
fprintf(stderr, "Option `%s' requires an argument\n", argv[from]);
from += standard_args[i].nargs;
goto done;
}
/* Look for a match with a known long option.
/*
Look for a match with a known long option.
MATCH is -1 if no match so far, -2 if two or more matches so far,
>= 0 (the table index of the match) if just one match so far. */
if (argv[from][1] == '-')
>= 0(the table index of the match) if just one match so far.
*/
if(argv[from][1] == '-')
{
match = -1;
thislen = strlen(argv[from]);
equals = strchr(argv[from], '=');
if (equals != 0)
if(equals != 0)
thislen = equals - argv[from];
for (i = 0;
i < (int )(sizeof (standard_args) / sizeof (standard_args[0]));
i++)
if (standard_args[i].longname
&& !strncmp (argv[from], standard_args[i].longname,
thislen))
for(i = 0;i <(int )(sizeof(standard_args) / sizeof(standard_args[0])); i++)
if(standard_args[i].longname
&& !strncmp(argv[from], standard_args[i].longname, thislen))
{
if (match == -1)
if(match == -1)
match = i;
else
match = -2;
}
/* If we found exactly one match, use that. */
if (match >= 0)
// If we found exactly one match, use that
if(match >= 0)
{
options[from] = standard_args[match].nargs;
priority[from] = standard_args[match].priority;
/* If --OPTION=VALUE syntax is used,
this option uses just one argv element. */
if (equals != 0)
// If --OPTION=VALUE syntax is used,
// this option uses just one argv element
if(equals != 0)
options[from] = 0;
if (from + options[from] >= argc)
fprintf (stderr, "Option `%s' requires an argument\n", argv[from]);
if(from + options[from] >= argc)
fprintf(stderr, "Option `%s' requires an argument\n", argv[from]);
from += options[from];
}
}
@@ -741,53 +702,53 @@ sort_args (int argc, char **argv)
}
}
/* Copy the arguments, in order of decreasing priority, to NEW. */
// Copy the arguments, in order of decreasing priority, to NEW
newargv[0] = argv[0];
while (incoming_used < argc)
while(incoming_used < argc)
{
int best = -1;
int best_priority = -9999;
/* Find the highest priority remaining option.
If several have equal priority, take the first of them. */
for (from = 1; from < argc; from++)
// Find the highest priority remaining option.
// If several have equal priority, take the first of them.
for(from = 1; from < argc; from++)
{
if (argv[from] != 0 && priority[from] > best_priority)
if(argv[from] != 0 && priority[from] > best_priority)
{
best_priority = priority[from];
best = from;
}
/* Skip option arguments--they are tied to the options. */
if (options[from] > 0)
// Skip option arguments--they are tied to the options.
if(options[from] > 0)
from += options[from];
}
if (best < 0)
abort ();
if(best < 0)
abort();
/* Copy the highest priority remaining option, with its args, to NEW.
Unless it is a duplicate of the previous one. */
if (! (options[best] == 0
&& ! strcmp (newargv[to - 1], argv[best])))
// Copy the highest priority remaining option, with its args, to NEW.
// Unless it is a duplicate of the previous one
if(!(options[best] == 0 && ! strcmp(newargv[to - 1], argv[best])))
{
newargv[to++] = argv[best];
for (i = 0; i < options[best]; i++)
for(i = 0; i < options[best]; i++)
newargv[to++] = argv[best + i + 1];
}
incoming_used += 1 + (options[best] > 0 ? options[best] : 0);
incoming_used += 1 +(options[best] > 0 ? options[best] : 0);
/* Clear out this option in ARGV. */
// Clear out this option in ARGV
argv[best] = 0;
for (i = 0; i < options[best]; i++)
for(i = 0; i < options[best]; i++)
argv[best + i + 1] = 0;
}
/* If duplicate options were deleted, fill up extra space with null ptrs. */
while (to < argc)
// If duplicate options were deleted, fill up extra space with null ptrs
while(to < argc)
newargv[to++] = 0;
memcpy(argv, newargv, sizeof (char *) * argc);
memcpy(argv, newargv, sizeof(char *) * argc);
free(options);
free(newargv);
src/apps/terminal/TermView.cpp
+3 -1
View File
@@ -1512,8 +1512,11 @@ TermView::MessageReceived(BMessage *msg)
DoFileDrop(ref);
while(msg->FindRef("refs", i++, &ref) == B_OK)
{
WritePTY((const uchar*)" ",1);
DoFileDrop(ref);
}
}
else
{
BView::MessageReceived(msg);
@@ -1608,7 +1611,6 @@ TermView::DoFileDrop(entry_ref &ref)
BString string(path.Path());
string.CharacterEscape(" ~`#$&*()\\|[]{};'\"<>?!",'\\');
string+=" ";
WritePTY((const uchar *)string.String(), string.Length());
}
src/apps/terminal/TermWindow.cpp
+3 -27
View File
@@ -1,34 +1,10 @@
/*
* Copyright (c) 2003-4 Kian Duffy <myob@users.sourceforge.net>
* Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
* Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
* Copyright (c) 2004 Daniel Furrer <assimil8or@users.sourceforge.net>
* Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files or portions
* thereof (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so, subject
* to the following conditions:
*
* * Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice
* in the binary, as well as this list of conditions and the following
* disclaimer in the documentation and/or other materials provided with
* the distribution.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* 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.
*
* Distributed unter the terms of the MIT license.
*/
#include <app/Application.h>
#include <Menu.h>
#include <MenuBar.h>
src/apps/terminal/spawn.cpp
+2 -1
View File
@@ -56,6 +56,7 @@ extern PrefHandler *gTermPref;
#define SHELL_COMMAND "/bin/sh -login"
extern char **environ;
// TODO: This is *definitely* not a helpful error message
char spawn_alert_msg [] = \
"alert --stop " \
"'Haiku Terminal Error!!\n\
@@ -96,7 +97,7 @@ setenv(const char *var, const char *value, bool overwrite)
/*
* reapchild. Child process is out there, let's catch its terminaltion.
* reapchild. Child process is out there, let's catch its termination.
*/