Style fixes to TermWindow.cpp
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:
+574
-613
File diff suppressed because it is too large
Load Diff
@@ -1512,7 +1512,10 @@ TermView::MessageReceived(BMessage *msg)
|
|||||||
DoFileDrop(ref);
|
DoFileDrop(ref);
|
||||||
|
|
||||||
while(msg->FindRef("refs", i++, &ref) == B_OK)
|
while(msg->FindRef("refs", i++, &ref) == B_OK)
|
||||||
|
{
|
||||||
|
WritePTY((const uchar*)" ",1);
|
||||||
DoFileDrop(ref);
|
DoFileDrop(ref);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1608,7 +1611,6 @@ TermView::DoFileDrop(entry_ref &ref)
|
|||||||
BString string(path.Path());
|
BString string(path.Path());
|
||||||
|
|
||||||
string.CharacterEscape(" ~`#$&*()\\|[]{};'\"<>?!",'\\');
|
string.CharacterEscape(" ~`#$&*()\\|[]{};'\"<>?!",'\\');
|
||||||
string+=" ";
|
|
||||||
WritePTY((const uchar *)string.String(), string.Length());
|
WritePTY((const uchar *)string.String(), string.Length());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,34 +1,10 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-4 Kian Duffy <[email protected]>
|
* Copyright (c) 2003-2004 Kian Duffy <[email protected]>
|
||||||
|
* Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
|
||||||
* Copyright (c) 2004 Daniel Furrer <[email protected]>
|
* Copyright (c) 2004 Daniel Furrer <[email protected]>
|
||||||
* 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 <app/Application.h>
|
||||||
#include <Menu.h>
|
#include <Menu.h>
|
||||||
#include <MenuBar.h>
|
#include <MenuBar.h>
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ extern PrefHandler *gTermPref;
|
|||||||
#define SHELL_COMMAND "/bin/sh -login"
|
#define SHELL_COMMAND "/bin/sh -login"
|
||||||
extern char **environ;
|
extern char **environ;
|
||||||
|
|
||||||
|
// TODO: This is *definitely* not a helpful error message
|
||||||
char spawn_alert_msg [] = \
|
char spawn_alert_msg [] = \
|
||||||
"alert --stop " \
|
"alert --stop " \
|
||||||
"'Haiku Terminal Error!!\n\
|
"'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.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user