Compare commits
4 Commits
master
...
382b13b5b9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
382b13b5b9 | ||
|
|
a9e5901f10 | ||
|
|
a59ec1b47b | ||
|
|
af6516789d |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -48,6 +48,3 @@ cool-retro-term
|
|||||||
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*.app
|
*.app
|
||||||
|
|
||||||
# IntelliJ
|
|
||||||
.idea
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ macx:ICON = icons/crt.icns
|
|||||||
RESOURCES += qml/resources.qrc
|
RESOURCES += qml/resources.qrc
|
||||||
|
|
||||||
#########################################
|
#########################################
|
||||||
## INSTALLS
|
## INTALLS
|
||||||
#########################################
|
#########################################
|
||||||
|
|
||||||
target.path += /usr/bin/
|
target.path += /usr/bin/
|
||||||
|
|||||||
21
app/main.cpp
21
app/main.cpp
@@ -49,16 +49,15 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
|
if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
|
||||||
QTextStream cout(stdout, QIODevice::WriteOnly);
|
QTextStream cout(stdout, QIODevice::WriteOnly);
|
||||||
cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << '\n';
|
cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << endl;
|
||||||
cout << " --default-settings Run cool-retro-term with the default settings" << '\n';
|
cout << " --default-settings Run cool-retro-term with the default settings" << endl;
|
||||||
cout << " --workdir <dir> Change working directory to 'dir'" << '\n';
|
cout << " --workdir <dir> Change working directory to 'dir'" << endl;
|
||||||
cout << " -e <cmd> Command to execute. This option will catch all following arguments, so use it as the last option." << '\n';
|
cout << " -e <cmd> Command to execute. This option will catch all following arguments, so use it as the last option." << endl;
|
||||||
cout << " -T <title> Set window title to 'title'." << '\n';
|
cout << " -T <title> Set window title to 'title'." << endl;
|
||||||
cout << " --fullscreen Run cool-retro-term in fullscreen." << '\n';
|
cout << " --fullscreen Run cool-retro-term in fullscreen." << endl;
|
||||||
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
|
cout << " -p|--profile <prof> Run cool-retro-term with the given profile." << endl;
|
||||||
cout << " -h|--help Print this help." << '\n';
|
cout << " -h|--help Print this help." << endl;
|
||||||
cout << " --verbose Print additional information such as profiles and settings." << '\n';
|
cout << " --verbose Print additional information such as profiles and settings." << endl;
|
||||||
cout << " -v|--version Print the program name and version." << '\n';
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,7 +65,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
if (argc>1 && (!strcmp(argv[1],"-v") || !strcmp(argv[1],"--version"))) {
|
if (argc>1 && (!strcmp(argv[1],"-v") || !strcmp(argv[1],"--version"))) {
|
||||||
QTextStream cout(stdout, QIODevice::WriteOnly);
|
QTextStream cout(stdout, QIODevice::WriteOnly);
|
||||||
cout << "cool-retro-term " << appVersion << '\n';
|
cout << "cool-retro-term " << appVersion << endl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -632,7 +632,7 @@ QtObject {
|
|||||||
builtin: true
|
builtin: true
|
||||||
}
|
}
|
||||||
ListElement {
|
ListElement {
|
||||||
text: "IBM DOS"
|
text: "IBM Dos"
|
||||||
obj_string: '{
|
obj_string: '{
|
||||||
"ambientLight": 0.151,
|
"ambientLight": 0.151,
|
||||||
"backgroundColor": "#000000",
|
"backgroundColor": "#000000",
|
||||||
|
|||||||
@@ -58,13 +58,6 @@ Item{
|
|||||||
kterminal.pasteClipboard()
|
kterminal.pasteClipboard()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Connections {
|
|
||||||
target: pasteActionAlt
|
|
||||||
|
|
||||||
onTriggered: {
|
|
||||||
kterminal.pasteSelection()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//When settings are updated sources need to be redrawn.
|
//When settings are updated sources need to be redrawn.
|
||||||
Connections {
|
Connections {
|
||||||
|
|||||||
@@ -247,17 +247,6 @@ Item {
|
|||||||
" return outColor;
|
" return outColor;
|
||||||
}" +
|
}" +
|
||||||
|
|
||||||
//pseudo-random vector
|
|
||||||
//https://stackoverflow.com/a/10625698
|
|
||||||
"float random( vec2 p )
|
|
||||||
{
|
|
||||||
vec2 K1 = vec2(
|
|
||||||
23.14069263277926, // e^pi (Gelfond's constant)
|
|
||||||
2.665144142690225 // 2^sqrt(2) (Gelfond-Schneider constant)
|
|
||||||
);
|
|
||||||
return fract( cos( dot(p,K1) ) * 12345.6789 );
|
|
||||||
}" +
|
|
||||||
|
|
||||||
"void main() {" +
|
"void main() {" +
|
||||||
"vec2 cc = vec2(0.5) - qt_TexCoord0;" +
|
"vec2 cc = vec2(0.5) - qt_TexCoord0;" +
|
||||||
"float distance = length(cc);" +
|
"float distance = length(cc);" +
|
||||||
@@ -296,11 +285,7 @@ Item {
|
|||||||
: "") +
|
: "") +
|
||||||
|
|
||||||
(jitter !== 0 || staticNoise !== 0 ?
|
(jitter !== 0 || staticNoise !== 0 ?
|
||||||
"vec4 noiseTexel = texture2D(
|
"vec4 noiseTexel = texture2D(noiseSource, scaleNoiseSize * coords + vec2(fract(time / 51.0), fract(time / 237.0)));"
|
||||||
noiseSource, scaleNoiseSize * coords
|
|
||||||
+ vec2(0.0, random(vec2(fract(time / 237.0), 822.9582)))
|
|
||||||
+ vec2(fract(time / 31.0), fract(time / 177.0))
|
|
||||||
);"
|
|
||||||
: "") +
|
: "") +
|
||||||
|
|
||||||
(jitter !== 0 ? "
|
(jitter !== 0 ? "
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ ShaderEffect {
|
|||||||
float alpha = 0.0;
|
float alpha = 0.0;
|
||||||
|
|
||||||
float frameShadow = max2(positiveLog(-coords * frameShadowCoeff + vec2(1.0)) + positiveLog(coords * frameShadowCoeff - (vec2(frameShadowCoeff) - vec2(1.0))));
|
float frameShadow = max2(positiveLog(-coords * frameShadowCoeff + vec2(1.0)) + positiveLog(coords * frameShadowCoeff - (vec2(frameShadowCoeff) - vec2(1.0))));
|
||||||
frameShadow = clamp(sqrt(frameShadow), 0.0, 1.0);
|
frameShadow = max(sqrt(frameShadow), 0.0);
|
||||||
color *= frameShadow;
|
color *= frameShadow;
|
||||||
alpha = sum2(1.0 - step(vec2(0.0), coords) + step(vec2(1.0), coords));
|
alpha = sum2(1.0 - step(vec2(0.0), coords) + step(vec2(1.0), coords));
|
||||||
alpha = clamp(alpha, 0.0, 1.0);
|
alpha = clamp(alpha, 0.0, 1.0);
|
||||||
|
|||||||
@@ -116,11 +116,6 @@ ApplicationWindow {
|
|||||||
text: qsTr("Paste")
|
text: qsTr("Paste")
|
||||||
shortcut: "Ctrl+Shift+V"
|
shortcut: "Ctrl+Shift+V"
|
||||||
}
|
}
|
||||||
Action {
|
|
||||||
id: pasteActionAlt
|
|
||||||
text: qsTr("Paste selection")
|
|
||||||
shortcut: "Shift+Insert"
|
|
||||||
}
|
|
||||||
Action {
|
Action {
|
||||||
id: zoomIn
|
id: zoomIn
|
||||||
text: qsTr("Zoom In")
|
text: qsTr("Zoom In")
|
||||||
|
|||||||
Reference in New Issue
Block a user