aboutsummaryrefslogtreecommitdiff
path: root/util/fbrun
diff options
context:
space:
mode:
Diffstat (limited to 'util/fbrun')
-rw-r--r--util/fbrun/main.cc32
1 files changed, 11 insertions, 21 deletions
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc
index 574dd76..718c552 100644
--- a/util/fbrun/main.cc
+++ b/util/fbrun/main.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: main.cc,v 1.3 2002/11/12 19:16:26 fluxgen Exp $ 22// $Id: main.cc,v 1.4 2002/11/13 22:25:59 fluxgen Exp $
23 23
24#include "FbRun.hh" 24#include "FbRun.hh"
25#include "BaseDisplay.hh" 25#include "BaseDisplay.hh"
@@ -79,36 +79,26 @@ int main(int argc, char **argv) {
79 // parse arguments 79 // parse arguments
80 for (int i=1; i<argc; i++) { 80 for (int i=1; i<argc; i++) {
81 if (strcmp(argv[i], "-font") == 0 && i+1 < argc) { 81 if (strcmp(argv[i], "-font") == 0 && i+1 < argc) {
82 ++i; 82 fontname = argv[++i];
83 fontname = argv[i];
84 } else if (strcmp(argv[i], "-title") == 0 && i+1 < argc) { 83 } else if (strcmp(argv[i], "-title") == 0 && i+1 < argc) {
85 ++i; 84 title = argv[++i];
86 title = argv[i];
87 } else if (strcmp(argv[i], "-text") == 0 && i+1 < argc) { 85 } else if (strcmp(argv[i], "-text") == 0 && i+1 < argc) {
88 ++i; 86 text = argv[++i];
89 text = argv[i];
90 } else if (strcmp(argv[i], "-w") == 0 && i+1 < argc) { 87 } else if (strcmp(argv[i], "-w") == 0 && i+1 < argc) {
91 ++i; 88 width = atoi(argv[++i]);
92 width = atoi(argv[i]);
93 } else if (strcmp(argv[i], "-h") == 0 && i+1 < argc) { 89 } else if (strcmp(argv[i], "-h") == 0 && i+1 < argc) {
94 ++i; 90 height = atoi(argv[++i]);
95 height = atoi(argv[i]);
96 set_height = true; // mark true else the height of font will be used 91 set_height = true; // mark true else the height of font will be used
97 } else if (strcmp(argv[i], "-display") == 0 && i+1 < argc) { 92 } else if (strcmp(argv[i], "-display") == 0 && i+1 < argc) {
98 ++i; 93 display_name = argv[++i];
99 display_name = argv[i];
100 } else if (strcmp(argv[i], "-pos") == 0 && i+2 < argc) { 94 } else if (strcmp(argv[i], "-pos") == 0 && i+2 < argc) {
101 ++i; 95 x = atoi(argv[++i]);
102 x = atoi(argv[i]); 96 y = atoi(argv[++i]);
103 ++i;
104 y = atoi(argv[i]);
105 set_pos = true; 97 set_pos = true;
106 } else if (strcmp(argv[i], "-fg") == 0 && i+1 < argc) { 98 } else if (strcmp(argv[i], "-fg") == 0 && i+1 < argc) {
107 ++i; 99 foreground = argv[++i];
108 foreground = argv[i];
109 } else if (strcmp(argv[i], "-bg") == 0 && i+1 < argc) { 100 } else if (strcmp(argv[i], "-bg") == 0 && i+1 < argc) {
110 ++i; 101 background = argv[++i];
111 background = argv[i];
112 } else if (strcmp(argv[i], "-a") == 0) { 102 } else if (strcmp(argv[i], "-a") == 0) {
113 antialias = true; 103 antialias = true;
114 } else if (strcmp(argv[i], "-hf") == 0 && i+1 < argc) { 104 } else if (strcmp(argv[i], "-hf") == 0 && i+1 < argc) {