mirrors/ipscan
2
0
Fork 0
mirror of https://github.com/angryip/ipscan.git synced 2025-10-26 11:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-terminal, XFCE Terminal and konsole are now supported in addition to xterm when opening IPs

Browse Source 
git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@374 375186e5-ef17-0410-b0b6-91563547dcda
This commit is contained in:
angryziber 2008-04-08 20:41:10 +00:00
parent 61dcc746ce
commit fbfcfae53f
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -1,6 +1,5 @@
Before 3.0:
* save default selection of pinger (Combined for non-root users)
* command-line scanning start
* fetcher-specific options
* multiple port support web-detect
@ -13,7 +12,6 @@ Before 3.0:
* public XSL for XMLExporter
* Exporter appending functionality exposed to the user
* make Display: status bar right-clickable
* support gnome-terminal in openers
* rename favorite option in the Manager dialog
* show percent in window title
* show number of IPs scanned so far in status bar

46
src/net/azib/ipscan/gui/actions/TerminalLauncher.java
View File

@ -23,6 +23,14 @@ public class TerminalLauncher {
static final Logger LOG = LoggerFactory.getLogger();
private static final int UNKNOWN = -1;
private static final int XTERM = 0;
private static final int GNOME = 1;
private static final int XFCE = 2;
private static final int KDE = 3;
/** caches last working terminal type */
private static int workingTerminal = UNKNOWN;
/**
* Launches the execString in the terminal.
* Supports Linux/Unix, MacOS, and Windows
@ -48,11 +56,45 @@ public class TerminalLauncher {
Runtime.getRuntime().exec(new String[] {"osascript", "-e", "tell application \"Terminal\" to do script \"" + execString + "\""}, null, workingDir);
}
else { // assume Linux or other Unix
// TODO: maybe gnome-terminal or konsole should be tried as well...
Runtime.getRuntime().exec(new String[] {"xterm", "-e", "bash", "-c", execString + ";bash"}, null, workingDir);
// detect environment
if (workingTerminal == UNKNOWN) {
if (Runtime.getRuntime().exec(new String[] {"pidof", "gnome-panel"}).waitFor() == 0) {
workingTerminal = GNOME;
}
else
if (Runtime.getRuntime().exec(new String[] {"pidof", "xfce4-session"}).waitFor() == 0) {
workingTerminal = XFCE;
}
else
if (Runtime.getRuntime().exec(new String[] {"pidof", "dcopserver"}).waitFor() == 0) {
workingTerminal = KDE;
}
else {
workingTerminal = XTERM;
}
}
// run detected terminal program
switch (workingTerminal) {
case GNOME:
Runtime.getRuntime().exec(new String[] {"gnome-terminal", "-x", "bash", "-c", execString + ";bash"}, null, workingDir);
break;
case XFCE:
Runtime.getRuntime().exec(new String[] {"Terminal", "--execute", "sh", "-c", execString + ";sh"}, null, workingDir);
break;
case KDE:
Runtime.getRuntime().exec(new String[] {"konsole", "-e", "bash", "-c", execString + ";bash"}, null, workingDir);
break;
default: // XTERM
Runtime.getRuntime().exec(new String[] {"xterm", "-e", "sh", "-c", execString + ";sh"}, null, workingDir);
}
}
}
catch (Exception e) {
// just try XTERM next time...
workingTerminal = XTERM;
// log and display the error
LOG.log(Level.WARNING, "openTerminal.failed", e);
throw new UserErrorException("openTerminal.failed", execString);
}