summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 1c613a9..2c0001f 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -1,1204 +1,1202 @@
1 1
2/* ---------------------------------------------------------------------- */ 2/* ---------------------------------------------------------------------- */
3/* */ 3/* */
4/* [main.C] Konsole */ 4/* [main.C] Konsole */
5/* */ 5/* */
6/* ---------------------------------------------------------------------- */ 6/* ---------------------------------------------------------------------- */
7/* */ 7/* */
8/* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> */ 8/* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> */
9/* */ 9/* */
10/* This file is part of Konsole, an X terminal. */ 10/* This file is part of Konsole, an X terminal. */
11/* */ 11/* */
12/* The material contained in here more or less directly orginates from */ 12/* The material contained in here more or less directly orginates from */
13/* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */ 13/* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */
14/* */ 14/* */
15/* ---------------------------------------------------------------------- */ 15/* ---------------------------------------------------------------------- */
16/* */ 16/* */
17/* Ported Konsole to Qt/Embedded */ 17/* Ported Konsole to Qt/Embedded */
18/* */ 18/* */
19/* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ 19/* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */
20/* */ 20/* */
21/* -------------------------------------------------------------------------- */ 21/* -------------------------------------------------------------------------- */
22// enhancements added by L.J. Potter <ljp@llornkcor.com> 22// enhancements added by L.J. Potter <ljp@llornkcor.com>
23// enhancements added by Phillip Kuhn 23// enhancements added by Phillip Kuhn
24 24
25#include <stdlib.h> 25#include <stdlib.h>
26 26
27#ifdef QT_QWS_OPIE 27#ifdef QT_QWS_OPIE
28#include <opie2/ocolorpopupmenu.h> 28#include <opie2/ocolorpopupmenu.h>
29#endif 29#endif
30 30
31#include <qpe/resource.h> 31#include <qpe/resource.h>
32 32
33#include <qdir.h> 33#include <qdir.h>
34#include <qevent.h> 34#include <qevent.h>
35#include <qdragobject.h> 35#include <qdragobject.h>
36#include <qobjectlist.h> 36#include <qobjectlist.h>
37#include <qtoolbutton.h> 37#include <qtoolbutton.h>
38#include <qtoolbar.h> 38#include <qtoolbar.h>
39#include <qpushbutton.h> 39#include <qpushbutton.h>
40#include <qfontdialog.h> 40#include <qfontdialog.h>
41#include <qglobal.h> 41#include <qglobal.h>
42#include <qpainter.h> 42#include <qpainter.h>
43#include <qmenubar.h> 43#include <qmenubar.h>
44#include <qmessagebox.h> 44#include <qmessagebox.h>
45#include <qaction.h> 45#include <qaction.h>
46#include <qapplication.h> 46#include <qapplication.h>
47#include <qfontmetrics.h> 47#include <qfontmetrics.h>
48#include <qcombobox.h> 48#include <qcombobox.h>
49#include <qevent.h> 49#include <qevent.h>
50#include <qtabwidget.h> 50#include <qtabwidget.h>
51#include <qtabbar.h> 51#include <qtabbar.h>
52#include <qpe/config.h> 52#include <qpe/config.h>
53#include <qstringlist.h> 53#include <qstringlist.h>
54#include <qpalette.h> 54#include <qpalette.h>
55#include <qfontdatabase.h> 55#include <qfontdatabase.h>
56#include <qfile.h> 56#include <qfile.h>
57#include <qspinbox.h> 57#include <qspinbox.h>
58#include <qlayout.h> 58#include <qlayout.h>
59#include <qvbox.h> 59#include <qvbox.h>
60 60
61#include <sys/wait.h> 61#include <sys/wait.h>
62#include <stdio.h> 62#include <stdio.h>
63#include <stdlib.h> 63#include <stdlib.h>
64#include <assert.h> 64#include <assert.h>
65 65
66#include "konsole.h" 66#include "konsole.h"
67#include "keytrans.h" 67#include "keytrans.h"
68#include "commandeditdialog.h" 68#include "commandeditdialog.h"
69 69
70class EKNumTabBar : public QTabBar 70class EKNumTabBar : public QTabBar
71{ 71{
72public: 72public:
73 EKNumTabBar(QWidget *parent = 0, const char *name = 0) : 73 EKNumTabBar(QWidget *parent = 0, const char *name = 0) :
74 QTabBar(parent, name) 74 QTabBar(parent, name)
75 {} 75 {}
76 76
77 // QList<QTab> *getTabList() { return(tabList()); } 77 // QList<QTab> *getTabList() { return(tabList()); }
78 78
79 void numberTabs() 79 void numberTabs()
80 { 80 {
81 // Yes, it really is this messy. QTabWidget needs functions 81 // Yes, it really is this messy. QTabWidget needs functions
82 // that provide acces to tabs in a sequential way. 82 // that provide acces to tabs in a sequential way.
83 int m=INT_MIN; 83 int m=INT_MIN;
84 for (int i=0; i<count(); i++) 84 for (int i=0; i<count(); i++)
85 { 85 {
86 QTab* left=0; 86 QTab* left=0;
87 QListIterator<QTab> it(*tabList()); 87 QListIterator<QTab> it(*tabList());
88 int x=INT_MAX; 88 int x=INT_MAX;
89 for( QTab* t; (t=it.current()); ++it ) 89 for( QTab* t; (t=it.current()); ++it )
90 { 90 {
91 int tx = t->rect().x(); 91 int tx = t->rect().x();
92 if ( tx<x && tx>m ) 92 if ( tx<x && tx>m )
93 { 93 {
94 x = tx; 94 x = tx;
95 left = t; 95 left = t;
96 } 96 }
97 } 97 }
98 if ( left ) 98 if ( left )
99 { 99 {
100 left->setText(QString::number(i+1)); 100 left->setText(QString::number(i+1));
101 m = left->rect().x(); 101 m = left->rect().x();
102 } 102 }
103 } 103 }
104 } 104 }
105 105
106 virtual QSize sizeHint() const 106 virtual QSize sizeHint() const
107 { 107 {
108 if (isHidden()) 108 if (isHidden())
109 { 109 {
110 return(QSize(0,0)); 110 return(QSize(0,0));
111 } 111 }
112 else 112 else
113 { 113 {
114 QSize size = QTabBar::sizeHint(); 114 QSize size = QTabBar::sizeHint();
115 int shrink = 5; 115 int shrink = 5;
116 if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600) 116 if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600)
117 { 117 {
118 shrink = 10; 118 shrink = 10;
119 } 119 }
120 size.setHeight(size.height() - shrink); 120 size.setHeight(size.height() - shrink);
121 return(size); 121 return(size);
122 } 122 }
123 } 123 }
124 124
125}; 125};
126 126
127class EKNumTabWidget : public QTabWidget 127class EKNumTabWidget : public QTabWidget
128{ 128{
129public: 129public:
130 EKNumTabWidget(QWidget* parent) : QTabWidget(parent) 130 EKNumTabWidget(QWidget* parent) : QTabWidget(parent)
131 { 131 {
132 setTabBar(new EKNumTabBar(parent,"EKTabBar")); 132 setTabBar(new EKNumTabBar(parent,"EKTabBar"));
133 setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); 133 setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
134 } 134 }
135 135
136 EKNumTabBar *getTabBar() const 136 EKNumTabBar *getTabBar() const
137 { 137 {
138 return ((EKNumTabBar*)tabBar()); 138 return ((EKNumTabBar*)tabBar());
139 } 139 }
140 140
141 141
142 void addTab(QWidget* w) 142 void addTab(QWidget* w)
143 { 143 {
144 QTab* t = new QTab(QString::number(tabBar()->count()+1)); 144 QTab* t = new QTab(QString::number(tabBar()->count()+1));
145 QTabWidget::addTab(w,t); 145 QTabWidget::addTab(w,t);
146 } 146 }
147 147
148 void removeTab(QWidget* w) 148 void removeTab(QWidget* w)
149 { 149 {
150 removePage(w); 150 removePage(w);
151 ((EKNumTabBar*)tabBar())->numberTabs(); 151 ((EKNumTabBar*)tabBar())->numberTabs();
152 } 152 }
153}; 153};
154 154
155// This could be configurable or dynamicly generated from the bash history 155// This could be configurable or dynamicly generated from the bash history
156// file of the user 156// file of the user
157static const char *commonCmds[] = 157static const char *commonCmds[] =
158 { 158 {
159 "ls ", // I left this here, cause it looks better than the first alpha 159 "ls ", // I left this here, cause it looks better than the first alpha
160 "cardctl eject", 160 "cardctl eject",
161 "cat ", 161 "cat ",
162 "cd ", 162 "cd ",
163 "chmod ", 163 "chmod ",
164 "clear", 164 "clear",
165 "cp ", 165 "cp ",
166 "dc ", 166 "dc ",
167 "df ", 167 "df ",
168 "dmesg", 168 "dmesg",
169 "echo ", 169 "echo ",
170 "env", 170 "env",
171 "find ", 171 "find ",
172 "free", 172 "free",
173 "grep ", 173 "grep ",
174 "ifconfig ", 174 "ifconfig ",
175 "ipkg ", 175 "ipkg ",
176 "mkdir ", 176 "mkdir ",
177 "mv ", 177 "mv ",
178 "nc localhost 7776", 178 "nc localhost 7776",
179 "nc localhost 7777", 179 "nc localhost 7777",
180 "netstat ", 180 "netstat ",
181 "nslookup ", 181 "nslookup ",
182 "ping ", 182 "ping ",
183 "ps aux", 183 "ps aux",
184 "pwd ", 184 "pwd ",
185 "qcop QPE/System 'linkChanged(QString)' ''", 185 "qcop QPE/System 'linkChanged(QString)' ''",
186 "qcop QPE/System 'restart()'", 186 "qcop QPE/System 'restart()'",
187 "qcop QPE/System 'quit()'", 187 "qcop QPE/System 'quit()'",
188 "rm ", 188 "rm ",
189 "rmdir ", 189 "rmdir ",
190 "route ", 190 "route ",
191 "set ", 191 "set ",
192 "traceroute", 192 "traceroute",
193 193
194 /* 194 /*
195 "gzip", 195 "gzip",
196 "gunzip", 196 "gunzip",
197 "chgrp", 197 "chgrp",
198 "chown", 198 "chown",
199 "date", 199 "date",
200 "dd", 200 "dd",
201 "df", 201 "df",
202 "dmesg", 202 "dmesg",
203 "fuser", 203 "fuser",
204 "hostname", 204 "hostname",
205 "kill", 205 "kill",
206 "killall", 206 "killall",
207 "ln", 207 "ln",
208 "ping", 208 "ping",
209 "mount", 209 "mount",
210 "more", 210 "more",
211 "sort", 211 "sort",
212 "touch", 212 "touch",
213 "umount", 213 "umount",
214 "mknod", 214 "mknod",
215 "netstat", 215 "netstat",
216 */ 216 */
217 217
218 "exit", 218 "exit",
219 NULL 219 NULL
220 }; 220 };
221 221
222 222
223Konsole::Konsole(QWidget* parent, const char* name, WFlags fl) : 223Konsole::Konsole(QWidget* parent, const char* name, WFlags fl) :
224 QMainWindow(parent, name, fl) 224 QMainWindow(parent, name, fl)
225{ 225{
226 QStrList args; 226 QStrList args;
227 init("/bin/bash",args); 227 init("/bin/bash",args);
228} 228}
229 229
230Konsole::Konsole(const char* name, const char* _pgm, QStrList & _args, int) 230Konsole::Konsole(const char* name, const char* _pgm, QStrList & _args, int)
231 : QMainWindow(0, name) 231 : QMainWindow(0, name)
232{ 232{
233 init(_pgm,_args); 233 init(_pgm,_args);
234} 234}
235 235
236struct HistoryItem 236struct HistoryItem
237{ 237{
238 HistoryItem(int c, const QString &l) 238 HistoryItem(int c, const QString &l)
239 { 239 {
240 count = c; 240 count = c;
241 line = l; 241 line = l;
242 } 242 }
243 int count; 243 int count;
244 QString line; 244 QString line;
245}; 245};
246 246
247class HistoryList : public QList<HistoryItem> 247class HistoryList : public QList<HistoryItem>
248{ 248{
249 virtual int compareItems( QCollection::Item item1, QCollection::Item item2) 249 virtual int compareItems( QCollection::Item item1, QCollection::Item item2)
250 { 250 {
251 int c1 = ((HistoryItem*)item1)->count; 251 int c1 = ((HistoryItem*)item1)->count;
252 int c2 = ((HistoryItem*)item2)->count; 252 int c2 = ((HistoryItem*)item2)->count;
253 if (c1 > c2) 253 if (c1 > c2)
254 return(1); 254 return(1);
255 if (c1 < c2) 255 if (c1 < c2)
256 return(-1); 256 return(-1);
257 return(0); 257 return(0);
258 } 258 }
259}; 259};
260 260
261void Konsole::initCommandList() 261void Konsole::initCommandList()
262{ 262{
263 // qDebug("Konsole::initCommandList"); 263 // qDebug("Konsole::initCommandList");
264 Config cfg( "Konsole" ); 264 Config cfg( "Konsole" );
265 cfg.setGroup("Commands"); 265 cfg.setGroup("Commands");
266 // commonCombo->setInsertionPolicy(QComboBox::AtCurrent); 266 // commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
267 commonCombo->clear(); 267 commonCombo->clear();
268 268
269 if (cfg.readEntry("ShellHistory","TRUE") == "TRUE") 269 if (cfg.readEntry("ShellHistory","TRUE") == "TRUE")
270 { 270 {
271 QString histfilename = QString(getenv("HOME")) + "/.bash_history"; 271 QString histfilename = QString(getenv("HOME")) + "/.bash_history";
272 histfilename = cfg.readEntry("ShellHistoryPath",histfilename); 272 histfilename = cfg.readEntry("ShellHistoryPath",histfilename);
273 QFile histfile(histfilename); 273 QFile histfile(histfilename);
274 // note: compiler barfed on: 274 // note: compiler barfed on:
275 // QFile histfile(QString(getenv("HOME")) + "/.bash_history"); 275 // QFile histfile(QString(getenv("HOME")) + "/.bash_history");
276 if (histfile.open( IO_ReadOnly )) 276 if (histfile.open( IO_ReadOnly ))
277 { 277 {
278 QString line; 278 QString line;
279 uint i; 279 uint i;
280 HistoryList items; 280 HistoryList items;
281 281
282 int lineno = 0; 282 int lineno = 0;
283 while(!histfile.atEnd()) 283 while(!histfile.atEnd())
284 { 284 {
285 if (histfile.readLine(line, 200) < 0) 285 if (histfile.readLine(line, 200) < 0)
286 { 286 {
287 break; 287 break;
288 } 288 }
289 line = line.left(line.length()-1); 289 line = line.left(line.length()-1);
290 lineno++; 290 lineno++;
291 291
292 for(i=0; i<items.count(); i++) 292 for(i=0; i<items.count(); i++)
293 { 293 {
294 if (line == items.at(i)->line) 294 if (line == items.at(i)->line)
295 { 295 {
296 // weight recent commands & repeated commands more 296 // weight recent commands & repeated commands more
297 // by adding up the index of each command 297 // by adding up the index of each command
298 items.at(i)->count += lineno; 298 items.at(i)->count += lineno;
299 break; 299 break;
300 } 300 }
301 } 301 }
302 if (i >= items.count()) 302 if (i >= items.count())
303 { 303 {
304 items.append(new HistoryItem(lineno, line)); 304 items.append(new HistoryItem(lineno, line));
305 } 305 }
306 } 306 }
307 items.sort(); 307 items.sort();
308 int n = items.count(); 308 int n = items.count();
309 if (n > 40) 309 if (n > 40)
310 { 310 {
311 n = 40; 311 n = 40;
312 } 312 }
313 for(int i=0; i<n; i++) 313 for(int i=0; i<n; i++)
314 { 314 {
315 // should insert start of command, but keep whole thing 315 // should insert start of command, but keep whole thing
316 if (items.at(items.count()-i-1)->line.length() < 30) 316 if (items.at(items.count()-i-1)->line.length() < 30)
317 { 317 {
318 commonCombo->insertItem(items.at(items.count()-i-1)->line); 318 commonCombo->insertItem(items.at(items.count()-i-1)->line);
319 } 319 }
320 } 320 }
321 histfile.close(); 321 histfile.close();
322 } 322 }
323 } 323 }
324 if (cfg.readEntry("Commands Set","FALSE") == "FALSE") 324 if (cfg.readEntry("Commands Set","FALSE") == "FALSE")
325 { 325 {
326 for (int i = 0; commonCmds[i] != NULL; i++) 326 for (int i = 0; commonCmds[i] != NULL; i++)
327 { 327 {
328 commonCombo->insertItem(commonCmds[i]); 328 commonCombo->insertItem(commonCmds[i]);
329 } 329 }
330 } 330 }
331 else 331 else
332 { 332 {
333 for (int i = 0; i < 100; i++) 333 for (int i = 0; i < 100; i++)
334 { 334 {
335 if (!(cfg.readEntry( QString::number(i),"")).isEmpty()) 335 if (!(cfg.readEntry( QString::number(i),"")).isEmpty())
336 commonCombo->insertItem(cfg.readEntry( QString::number(i),"")); 336 commonCombo->insertItem(cfg.readEntry( QString::number(i),""));
337 } 337 }
338 } 338 }
339 339
340 340
341} 341}
342 342
343static void sig_handler(int x) 343static void sig_handler(int x)
344{ 344{
345 printf("got signal %d\n",x); 345 printf("got signal %d\n",x);
346} 346}
347 347
348void Konsole::init(const char* _pgm, QStrList & _args) 348void Konsole::init(const char* _pgm, QStrList & _args)
349{ 349{
350 350
351#if 0 351#if 0
352 for(int i=1; i<=31; i++) 352 for(int i=1; i<=31; i++)
353 { 353 {
354 if (i != SIGPIPE && i != SIGPROF && i != SIGSEGV 354 if (i != SIGPIPE && i != SIGPROF && i != SIGSEGV
355 && i != SIGINT && i != SIGILL && i != SIGTERM 355 && i != SIGINT && i != SIGILL && i != SIGTERM
356 && i != SIGBUS) 356 && i != SIGBUS)
357 signal(i,sig_handler); 357 signal(i,sig_handler);
358 } 358 }
359#endif 359#endif
360 signal(SIGSTOP, sig_handler); 360 signal(SIGSTOP, sig_handler);
361 signal(SIGCONT, sig_handler); 361 signal(SIGCONT, sig_handler);
362 signal(SIGTSTP, sig_handler); 362 signal(SIGTSTP, sig_handler);
363 363
364 b_scroll = TRUE; // histon; 364 b_scroll = TRUE; // histon;
365 n_keytab = 0; 365 n_keytab = 0;
366 n_render = 0; 366 n_render = 0;
367 startUp=0; 367 startUp=0;
368 fromMenu = FALSE; 368 fromMenu = FALSE;
369 fullscreen = false; 369 fullscreen = false;
370 370
371 setCaption( tr( "Konsole" ) ); 371 setCaption( tr( "Konsole" ) );
372 setIcon( Resource::loadPixmap( "konsole/Terminal" ) ); 372 setIcon( Resource::loadPixmap( "konsole/Terminal" ) );
373 373
374 Config cfg( "Konsole" ); 374 Config cfg( "Konsole" );
375 cfg.setGroup("Font"); 375 cfg.setGroup("Font");
376 QString tmp; 376 QString tmp;
377 377
378 // initialize the list of allowed fonts /////////////////////////////////// 378 // initialize the list of allowed fonts ///////////////////////////////////
379 379
380 QString cfgFontName = cfg.readEntry("FontName","Lcfont"); 380 QString cfgFontName = cfg.readEntry("FontName","Lcfont");
381 int cfgFontSize = cfg.readNumEntry("FontSize",18); 381 int cfgFontSize = cfg.readNumEntry("FontSize",18);
382 382
383 cfont = -1; 383 cfont = -1;
384 384
385 // this code causes repeated access to all the font files 385 // this code causes repeated access to all the font files
386 // which does slow down startup 386 // which does slow down startup
387 QFontDatabase fontDB; 387 QFontDatabase fontDB;
388 QStringList familyNames; 388 QStringList familyNames;
389 familyNames = fontDB.families( FALSE ); 389 familyNames = fontDB.families( FALSE );
390 QString s; 390 QString s;
391 int fontIndex = 0; 391 int fontIndex = 0;
392 int familyNum = 0; 392 int familyNum = 0;
393 fontList = new QPopupMenu( this ); 393 fontList = new QPopupMenu( this );
394 394
395 for(uint j = 0; j < (uint)familyNames.count(); j++) 395 for(uint j = 0; j < (uint)familyNames.count(); j++)
396 { 396 {
397 s = familyNames[j]; 397 s = familyNames[j];
398 if ( s.contains('-') ) 398 if ( s.contains('-') )
399 { 399 {
400 int i = s.find('-'); 400 int i = s.find('-');
401 s = s.right( s.length() - i - 1 ) + " [" + s.left( i ) + "]"; 401 s = s.right( s.length() - i - 1 ) + " [" + s.left( i ) + "]";
402 } 402 }
403 s[0] = s[0].upper(); 403 s[0] = s[0].upper();
404 404
405 QValueList<int> sizes = fontDB.pointSizes( familyNames[j] ); 405 QValueList<int> sizes = fontDB.pointSizes( familyNames[j] );
406 406
407 printf("family[%d] = %s with %d sizes\n", j, familyNames[j].latin1(), 407 printf("family[%d] = %s with %d sizes\n", j, familyNames[j].latin1(),
408 sizes.count()); 408 sizes.count());
409 409
410 if (sizes.count() > 0) 410 if (sizes.count() > 0)
411 { 411 {
412 QPopupMenu *sizeMenu; 412 QPopupMenu *sizeMenu;
413 QFont f; 413 QFont f;
414 int last_width = -1; 414 int last_width = -1;
415 sizeMenu = NULL; 415 sizeMenu = NULL;
416 416
417 for(uint i = 0; i < (uint)sizes.count() + 4; i++) 417 for(uint i = 0; i < (uint)sizes.count() + 4; i++)
418 { 418 {
419 // printf("family %s size %d ", familyNames[j].latin1(), sizes[i]); 419 // printf("family %s size %d ", familyNames[j].latin1(), sizes[i]);
420 // need to divide by 10 on the Z, but not otherwise 420 // need to divide by 10 on the Z, but not otherwise
421 int size; 421 int size;
422 422
423 if (i >= (uint)sizes.count()) 423 if (i >= (uint)sizes.count())
424 { 424 {
425 // try for expandable fonts 425 // try for expandable fonts
426 size = sizes[sizes.count()-1] + 2 * (i - sizes.count() + 1); 426 size = sizes[sizes.count()-1] + 2 * (i - sizes.count() + 1);
427 } 427 }
428 else 428 else
429 { 429 {
430 printf("sizes[%d] = %d\n", i, sizes[i]); 430 printf("sizes[%d] = %d\n", i, sizes[i]);
431 size = sizes[i]; 431 size = sizes[i];
432 } 432 }
433#ifndef __i386__
434 // a hack, sizes on Z seem to be points*10 433 // a hack, sizes on Z seem to be points*10
435 size /= 10; 434 size /= 10;
436#endif
437 435
438 f = QFont(familyNames[j], size); 436 f = QFont(familyNames[j], size);
439 f.setFixedPitch(true); 437 f.setFixedPitch(true);
440 QFontMetrics fm(f); 438 QFontMetrics fm(f);
441 // don't trust f.fixedPitch() or f.exactMatch(), they lie!! 439 // don't trust f.fixedPitch() or f.exactMatch(), they lie!!
442 if (fm.width("l") == fm.width("m") 440 if (fm.width("l") == fm.width("m")
443 && (i < (uint)sizes.count() 441 && (i < (uint)sizes.count()
444 || fm.width("m") > last_width)) 442 || fm.width("m") > last_width))
445 { 443 {
446 if (i < (uint)sizes.count()) 444 if (i < (uint)sizes.count())
447 { 445 {
448 last_width = fm.width("m"); 446 last_width = fm.width("m");
449 } 447 }
450 if (sizeMenu == NULL) 448 if (sizeMenu == NULL)
451 { 449 {
452 sizeMenu = new QPopupMenu(); 450 sizeMenu = new QPopupMenu();
453 } 451 }
454 int id = sizeMenu->insertItem(QString("%1").arg(size), fontIndex); 452 int id = sizeMenu->insertItem(QString("%1").arg(size), fontIndex);
455 sizeMenu->setItemParameter(id, fontIndex); 453 sizeMenu->setItemParameter(id, fontIndex);
456 sizeMenu->connectItem(id, this, SLOT(setFont(int))); 454 sizeMenu->connectItem(id, this, SLOT(setFont(int)));
457 QString name = s + " " + QString::number(size); 455 QString name = s + " " + QString::number(size);
458 fonts.append(new VTFont(name, f, familyNames[j], familyNum, size)); 456 fonts.append(new VTFont(name, f, familyNames[j], familyNum, size));
459 if (familyNames[j] == cfgFontName && size == cfgFontSize) 457 if (familyNames[j] == cfgFontName && size == cfgFontSize)
460 { 458 {
461 cfont = fontIndex; 459 cfont = fontIndex;
462 } 460 }
463 printf("FOUND: %s family %s size %d\n", name.latin1(), familyNames[j].latin1(), size); 461 printf("FOUND: %s family %s size %d\n", name.latin1(), familyNames[j].latin1(), size);
464 fontIndex++; 462 fontIndex++;
465 } 463 }
466 } 464 }
467 if (sizeMenu) 465 if (sizeMenu)
468 { 466 {
469 fontList->insertItem(s, sizeMenu, familyNum + 1000); 467 fontList->insertItem(s, sizeMenu, familyNum + 1000);
470 468
471 familyNum++; 469 familyNum++;
472 } 470 }
473 } 471 }
474 472
475 } 473 }
476 474
477 if (cfont < 0 || cfont >= (int)fonts.count()) 475 if (cfont < 0 || cfont >= (int)fonts.count())
478 { 476 {
479 cfont = 0; 477 cfont = 0;
480 } 478 }
481 479
482 // create terminal emulation framework //////////////////////////////////// 480 // create terminal emulation framework ////////////////////////////////////
483 nsessions = 0; 481 nsessions = 0;
484 482
485 tab = new EKNumTabWidget(this); 483 tab = new EKNumTabWidget(this);
486 // tab->setMargin(tab->margin()-5); 484 // tab->setMargin(tab->margin()-5);
487 connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*))); 485 connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*)));
488 486
489 // create terminal toolbar //////////////////////////////////////////////// 487 // create terminal toolbar ////////////////////////////////////////////////
490 setToolBarsMovable( FALSE ); 488 setToolBarsMovable( FALSE );
491 menuToolBar = new QToolBar( this ); 489 menuToolBar = new QToolBar( this );
492 menuToolBar->setHorizontalStretchable( TRUE ); 490 menuToolBar->setHorizontalStretchable( TRUE );
493 491
494 QMenuBar *menuBar = new QMenuBar( menuToolBar ); 492 QMenuBar *menuBar = new QMenuBar( menuToolBar );
495 493
496 bool c7xx = false; 494 bool c7xx = false;
497 if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600) 495 if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600)
498 { 496 {
499 c7xx = true; 497 c7xx = true;
500 } 498 }
501 QFont menuFont; 499 QFont menuFont;
502 menuFont.setPointSize(c7xx? 18 : 10); 500 menuFont.setPointSize(c7xx? 18 : 10);
503 qApp->setFont(menuFont, true); 501 qApp->setFont(menuFont, true);
504 502
505 setFont(cfont); 503 setFont(cfont);
506 504
507 configMenu = new QPopupMenu( this); 505 configMenu = new QPopupMenu( this);
508 colorMenu = new QPopupMenu( this); 506 colorMenu = new QPopupMenu( this);
509 scrollMenu = new QPopupMenu( this); 507 scrollMenu = new QPopupMenu( this);
510 editCommandListMenu = new QPopupMenu( this); 508 editCommandListMenu = new QPopupMenu( this);
511 509
512 configMenu->insertItem(tr("Command List"), editCommandListMenu); 510 configMenu->insertItem(tr("Command List"), editCommandListMenu);
513 511
514 bool listHidden; 512 bool listHidden;
515 cfg.setGroup("Menubar"); 513 cfg.setGroup("Menubar");
516 if( cfg.readEntry("Hidden","FALSE") == "TRUE") 514 if( cfg.readEntry("Hidden","FALSE") == "TRUE")
517 { 515 {
518 ec_cmdlist = editCommandListMenu->insertItem( tr( "Show command list" )); 516 ec_cmdlist = editCommandListMenu->insertItem( tr( "Show command list" ));
519 listHidden=TRUE; 517 listHidden=TRUE;
520 } 518 }
521 else 519 else
522 { 520 {
523 ec_cmdlist = editCommandListMenu->insertItem( tr( "Hide command list" )); 521 ec_cmdlist = editCommandListMenu->insertItem( tr( "Hide command list" ));
524 listHidden=FALSE; 522 listHidden=FALSE;
525 } 523 }
526 524
527 cfg.setGroup("Tabs"); 525 cfg.setGroup("Tabs");
528 526
529 tabMenu = new QPopupMenu(this); 527 tabMenu = new QPopupMenu(this);
530 tm_bottom = tabMenu->insertItem(tr("Bottom" )); 528 tm_bottom = tabMenu->insertItem(tr("Bottom" ));
531 tm_top = tabMenu->insertItem(tr("Top")); 529 tm_top = tabMenu->insertItem(tr("Top"));
532 tm_hidden = tabMenu->insertItem(tr("Hidden")); 530 tm_hidden = tabMenu->insertItem(tr("Hidden"));
533 531
534 configMenu->insertItem(tr("Tabs"), tabMenu); 532 configMenu->insertItem(tr("Tabs"), tabMenu);
535 533
536 tmp=cfg.readEntry("Position","Top"); 534 tmp=cfg.readEntry("Position","Top");
537 if(tmp=="Top") 535 if(tmp=="Top")
538 { 536 {
539 tab->setTabPosition(QTabWidget::Top); 537 tab->setTabPosition(QTabWidget::Top);
540 tab->getTabBar()->show(); 538 tab->getTabBar()->show();
541 tabPos = tm_top; 539 tabPos = tm_top;
542 } 540 }
543 else if (tmp=="Bottom") 541 else if (tmp=="Bottom")
544 { 542 {
545 tab->setTabPosition(QTabWidget::Bottom); 543 tab->setTabPosition(QTabWidget::Bottom);
546 tab->getTabBar()->show(); 544 tab->getTabBar()->show();
547 tabPos = tm_bottom; 545 tabPos = tm_bottom;
548 } 546 }
549 else 547 else
550 { 548 {
551 tab->getTabBar()->hide(); 549 tab->getTabBar()->hide();
552 tab->setMargin(tab->margin()); 550 tab->setMargin(tab->margin());
553 tabPos = tm_hidden; 551 tabPos = tm_hidden;
554 } 552 }
555 553
556 cm_bw = colorMenu->insertItem(tr( "Black on White")); 554 cm_bw = colorMenu->insertItem(tr( "Black on White"));
557 cm_wb = colorMenu->insertItem(tr( "White on Black")); 555 cm_wb = colorMenu->insertItem(tr( "White on Black"));
558 cm_gb = colorMenu->insertItem(tr( "Green on Black")); 556 cm_gb = colorMenu->insertItem(tr( "Green on Black"));
559 // cm_bt = colorMenu->insertItem(tr( "Black on Transparent")); 557 // cm_bt = colorMenu->insertItem(tr( "Black on Transparent"));
560 cm_br = colorMenu->insertItem(tr( "Black on Pink")); 558 cm_br = colorMenu->insertItem(tr( "Black on Pink"));
561 cm_rb = colorMenu->insertItem(tr( "Pink on Black")); 559 cm_rb = colorMenu->insertItem(tr( "Pink on Black"));
562 cm_gy = colorMenu->insertItem(tr( "Green on Yellow")); 560 cm_gy = colorMenu->insertItem(tr( "Green on Yellow"));
563 cm_bm = colorMenu->insertItem(tr( "Blue on Magenta")); 561 cm_bm = colorMenu->insertItem(tr( "Blue on Magenta"));
564 cm_mb = colorMenu->insertItem(tr( "Magenta on Blue")); 562 cm_mb = colorMenu->insertItem(tr( "Magenta on Blue"));
565 cm_cw = colorMenu->insertItem(tr( "Cyan on White")); 563 cm_cw = colorMenu->insertItem(tr( "Cyan on White"));
566 cm_wc = colorMenu->insertItem(tr( "White on Cyan")); 564 cm_wc = colorMenu->insertItem(tr( "White on Cyan"));
567 cm_bb = colorMenu->insertItem(tr( "Blue on Black")); 565 cm_bb = colorMenu->insertItem(tr( "Blue on Black"));
568 cm_ab = colorMenu->insertItem(tr( "Amber on Black")); 566 cm_ab = colorMenu->insertItem(tr( "Amber on Black"));
569 cm_default = colorMenu->insertItem(tr("default")); 567 cm_default = colorMenu->insertItem(tr("default"));
570 568
571#ifdef QT_QWS_OPIE 569#ifdef QT_QWS_OPIE
572 570
573 colorMenu->insertItem(tr( "Custom")); 571 colorMenu->insertItem(tr( "Custom"));
574#endif 572#endif
575 573
576 configMenu->insertItem(tr( "Colors") ,colorMenu); 574 configMenu->insertItem(tr( "Colors") ,colorMenu);
577 575
578 sessionList = new QPopupMenu(this); 576 sessionList = new QPopupMenu(this);
579 sessionList-> insertItem ( Resource::loadPixmap ( "konsole/Terminal" ), tr( "new session" ), this, 577 sessionList-> insertItem ( Resource::loadPixmap ( "konsole/Terminal" ), tr( "new session" ), this,
580 SLOT(newSession()) ); 578 SLOT(newSession()) );
581 579
582 // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) )); 580 // connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) ));
583 connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) )); 581 connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) ));
584 connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) )); 582 connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) ));
585 connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) )); 583 connect( tabMenu, SIGNAL( activated(int) ), this, SLOT( tabMenuSelected(int) ));
586 connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int))); 584 connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int)));
587 connect( editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int))); 585 connect( editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int)));
588 connect( sessionList, SIGNAL(activated(int)), this, SLOT( sessionListSelected(int) ) ); 586 connect( sessionList, SIGNAL(activated(int)), this, SLOT( sessionListSelected(int) ) );
589 587
590 menuBar->insertItem( tr("View"), configMenu ); 588 menuBar->insertItem( tr("View"), configMenu );
591 menuBar->insertItem( tr("Fonts"), fontList ); 589 menuBar->insertItem( tr("Fonts"), fontList );
592 menuBar->insertItem( tr("Sessions"), sessionList ); 590 menuBar->insertItem( tr("Sessions"), sessionList );
593 591
594 toolBar = new QToolBar( this ); 592 toolBar = new QToolBar( this );
595 593
596 QAction *a; 594 QAction *a;
597 595
598 // Button Commands 596 // Button Commands
599 a = new QAction( tr("New"), Resource::loadPixmap( "konsole/Terminal" ), QString::null, 0, this, 0 ); 597 a = new QAction( tr("New"), Resource::loadPixmap( "konsole/Terminal" ), QString::null, 0, this, 0 );
600 connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); 598 connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) );
601 a->addTo( toolBar ); 599 a->addTo( toolBar );
602 600
603 a = new QAction( tr("Full Screen"), Resource::loadPixmap( "fullscreen" ), QString::null, 0, this, 0 ); 601 a = new QAction( tr("Full Screen"), Resource::loadPixmap( "fullscreen" ), QString::null, 0, this, 0 );
604 connect( a, SIGNAL( activated() ), this, SLOT( toggleFullScreen() ) ); 602 connect( a, SIGNAL( activated() ), this, SLOT( toggleFullScreen() ) );
605 a->addTo( toolBar ); 603 a->addTo( toolBar );
606 604
607 a = new QAction( tr("Zoom"), Resource::loadPixmap( "zoom" ), QString::null, 0, this, 0 ); 605 a = new QAction( tr("Zoom"), Resource::loadPixmap( "zoom" ), QString::null, 0, this, 0 );
608 connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) ); 606 connect( a, SIGNAL( activated() ), this, SLOT( cycleZoom() ) );
609 a->addTo( toolBar ); 607 a->addTo( toolBar );
610 608
611 609
612 /* 610 /*
613 a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 ); 611 a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 );
614 connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolBar ); 612 connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolBar );
615 a = new QAction( tr("Space"), Resource::loadPixmap( "konsole/space" ), QString::null, 0, this, 0 ); 613 a = new QAction( tr("Space"), Resource::loadPixmap( "konsole/space" ), QString::null, 0, this, 0 );
616 connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolBar ); 614 connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolBar );
617 a = new QAction( tr("Tab"), Resource::loadPixmap( "konsole/tab" ), QString::null, 0, this, 0 ); 615 a = new QAction( tr("Tab"), Resource::loadPixmap( "konsole/tab" ), QString::null, 0, this, 0 );
618 connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolBar ); 616 connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolBar );
619 */ 617 */
620 /* 618 /*
621 a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 ); 619 a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 );
622 connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar ); 620 connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolBar );
623 a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 ); 621 a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 );
624 connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar ); 622 connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolBar );
625 */ 623 */
626 a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); 624 a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
627 connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); 625 connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) );
628 a->addTo( toolBar ); 626 a->addTo( toolBar );
629 627
630 secondToolBar = new QToolBar( this ); 628 secondToolBar = new QToolBar( this );
631 secondToolBar->setHorizontalStretchable( TRUE ); 629 secondToolBar->setHorizontalStretchable( TRUE );
632 630
633 commonCombo = new QComboBox( secondToolBar ); 631 commonCombo = new QComboBox( secondToolBar );
634 // commonCombo->setMaximumWidth(236); 632 // commonCombo->setMaximumWidth(236);
635 633
636 ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) ); 634 ec_quick = editCommandListMenu->insertItem( tr( "Quick Edit" ) );
637 if( listHidden) 635 if( listHidden)
638 { 636 {
639 secondToolBar->hide(); 637 secondToolBar->hide();
640 editCommandListMenu->setItemEnabled(ec_quick ,FALSE); 638 editCommandListMenu->setItemEnabled(ec_quick ,FALSE);
641 } 639 }
642 ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) ); 640 ec_edit = editCommandListMenu->insertItem(tr( "Edit..." ) );
643 641
644 cfg.setGroup("Commands"); 642 cfg.setGroup("Commands");
645 commonCombo->setInsertionPolicy(QComboBox::AtCurrent); 643 commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
646 644
647 initCommandList(); 645 initCommandList();
648 // for (int i = 0; commonCmds[i] != NULL; i++) { 646 // for (int i = 0; commonCmds[i] != NULL; i++) {
649 // commonCombo->insertItem( commonCmds[i], i ); 647 // commonCombo->insertItem( commonCmds[i], i );
650 // tmp = cfg.readEntry( QString::number(i),""); 648 // tmp = cfg.readEntry( QString::number(i),"");
651 // if(tmp != "") 649 // if(tmp != "")
652 // commonCombo->changeItem( tmp,i ); 650 // commonCombo->changeItem( tmp,i );
653 // } 651 // }
654 652
655 connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) )); 653 connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) ));
656 654
657 sm_none = scrollMenu->insertItem(tr( "None" )); 655 sm_none = scrollMenu->insertItem(tr( "None" ));
658 sm_left = scrollMenu->insertItem(tr( "Left" )); 656 sm_left = scrollMenu->insertItem(tr( "Left" ));
659 sm_right = scrollMenu->insertItem(tr( "Right" )); 657 sm_right = scrollMenu->insertItem(tr( "Right" ));
660 // scrollMenu->insertSeparator(4); 658 // scrollMenu->insertSeparator(4);
661 // scrollMenu->insertItem(tr( "Horizontal" )); 659 // scrollMenu->insertItem(tr( "Horizontal" ));
662 660
663 configMenu->insertItem(tr( "ScrollBar" ),scrollMenu); 661 configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
664 662
665 configMenu->insertItem(tr( "History..." ), this, SLOT(historyDialog())); 663 configMenu->insertItem(tr( "History..." ), this, SLOT(historyDialog()));
666 664
667 cm_wrap = configMenu->insertItem(tr( "Wrap" )); 665 cm_wrap = configMenu->insertItem(tr( "Wrap" ));
668 cfg.setGroup("ScrollBar"); 666 cfg.setGroup("ScrollBar");
669 configMenu->setItemChecked(cm_wrap, cfg.readBoolEntry("HorzScroll",0)); 667 configMenu->setItemChecked(cm_wrap, cfg.readBoolEntry("HorzScroll",0));
670 668
671 cm_beep = configMenu->insertItem(tr( "Use Beep" )); 669 cm_beep = configMenu->insertItem(tr( "Use Beep" ));
672 cfg.setGroup("Menubar"); 670 cfg.setGroup("Menubar");
673 configMenu->setItemChecked(cm_beep, cfg.readBoolEntry("useBeep",0)); 671 configMenu->setItemChecked(cm_beep, cfg.readBoolEntry("useBeep",0));
674 672
675 fullscreen_msg = new QLabel(this); 673 fullscreen_msg = new QLabel(this);
676 fullscreen_msg-> setAlignment ( AlignCenter | SingleLine ); 674 fullscreen_msg-> setAlignment ( AlignCenter | SingleLine );
677 fullscreen_msg-> hide(); 675 fullscreen_msg-> hide();
678 fullscreen_msg-> setSizePolicy ( QSizePolicy ( QSizePolicy::Expanding, QSizePolicy::Expanding )); 676 fullscreen_msg-> setSizePolicy ( QSizePolicy ( QSizePolicy::Expanding, QSizePolicy::Expanding ));
679 fullscreen_msg-> setAutoResize(true); 677 fullscreen_msg-> setAutoResize(true);
680 fullscreen_msg-> setFrameStyle(QFrame::PopupPanel | QFrame::Raised); 678 fullscreen_msg-> setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
681 fullscreen_msg-> setText(tr("To exit fullscreen, tap here.")); 679 fullscreen_msg-> setText(tr("To exit fullscreen, tap here."));
682 680
683 fullscreen_timer = new QTimer(this); 681 fullscreen_timer = new QTimer(this);
684 connect(fullscreen_timer, SIGNAL(timeout()), 682 connect(fullscreen_timer, SIGNAL(timeout()),
685 this, SLOT(fullscreenTimeout())); 683 this, SLOT(fullscreenTimeout()));
686 show_fullscreen_msg = true; 684 show_fullscreen_msg = true;
687 685
688 //scrollMenuSelected(-29); 686 //scrollMenuSelected(-29);
689 // cfg.setGroup("ScrollBar"); 687 // cfg.setGroup("ScrollBar");
690 // if(cfg.readBoolEntry("HorzScroll",0)) { 688 // if(cfg.readBoolEntry("HorzScroll",0)) {
691 // if(cfg.readNumEntry("Position",2) == 0) 689 // if(cfg.readNumEntry("Position",2) == 0)
692 // te->setScrollbarLocation(1); 690 // te->setScrollbarLocation(1);
693 // else 691 // else
694 // te->setScrollbarLocation(0); 692 // te->setScrollbarLocation(0);
695 // te->setScrollbarLocation( cfg.readNumEntry("Position",2)); 693 // te->setScrollbarLocation( cfg.readNumEntry("Position",2));
696 // te->setWrapAt(120); 694 // te->setWrapAt(120);
697 // } 695 // }
698 // create applications ///////////////////////////////////////////////////// 696 // create applications /////////////////////////////////////////////////////
699 setCentralWidget(tab); 697 setCentralWidget(tab);
700 698
701 // load keymaps //////////////////////////////////////////////////////////// 699 // load keymaps ////////////////////////////////////////////////////////////
702 KeyTrans::loadAll(); 700 KeyTrans::loadAll();
703 for (int i = 0; i < KeyTrans::count(); i++) 701 for (int i = 0; i < KeyTrans::count(); i++)
704 { 702 {
705 KeyTrans* s = KeyTrans::find(i); 703 KeyTrans* s = KeyTrans::find(i);
706 assert( s ); 704 assert( s );
707 } 705 }
708 706
709 se_pgm = _pgm; 707 se_pgm = _pgm;
710 se_args = _args; 708 se_args = _args;
711 709
712 cfg.setGroup("CommandLine"); 710 cfg.setGroup("CommandLine");
713 711
714 if (cfg.hasKey("shell_args")) 712 if (cfg.hasKey("shell_args"))
715 { 713 {
716 QStringList se_args_list = cfg.readListEntry("shell_args",'|'); 714 QStringList se_args_list = cfg.readListEntry("shell_args",'|');
717 for(uint i = 0; i < se_args_list.count(); i++) 715 for(uint i = 0; i < se_args_list.count(); i++)
718 { 716 {
719 se_args.prepend(se_args_list[se_args_list.count() - i - 1].latin1()); 717 se_args.prepend(se_args_list[se_args_list.count() - i - 1].latin1());
720 } 718 }
721 } 719 }
722 else 720 else
723 { 721 {
724 se_args.prepend("--login"); 722 se_args.prepend("--login");
725 } 723 }
726 724
727 se_pgm = cfg.readEntry("shell_bin", QString(se_pgm)); 725 se_pgm = cfg.readEntry("shell_bin", QString(se_pgm));
728 726
729 // this is the "documentation" for those who know to look 727 // this is the "documentation" for those who know to look
730 if (! cfg.hasKey("shell_args")) 728 if (! cfg.hasKey("shell_args"))
731 { 729 {
732 cfg.writeEntry("shell_args",QStringList::fromStrList(se_args),'|'); 730 cfg.writeEntry("shell_args",QStringList::fromStrList(se_args),'|');
733 } 731 }
734 if (! cfg.hasKey("shell_bin")) 732 if (! cfg.hasKey("shell_bin"))
735 { 733 {
736 cfg.writeEntry("shell_bin",QString(se_pgm)); 734 cfg.writeEntry("shell_bin",QString(se_pgm));
737 } 735 }
738 736
739 parseCommandLine(); 737 parseCommandLine();
740 738
741 // read and apply default values /////////////////////////////////////////// 739 // read and apply default values ///////////////////////////////////////////
742 resize(321, 321); // Dummy. 740 resize(321, 321); // Dummy.
743 QSize currentSize = size(); 741 QSize currentSize = size();
744 if (currentSize != size()) 742 if (currentSize != size())
745 defaultSize = size(); 743 defaultSize = size();
746 744
747 745
748 /* allows us to catch cancel/escape */ 746 /* allows us to catch cancel/escape */
749 reparent ( 0, WStyle_Customize | WStyle_NoBorder, 747 reparent ( 0, WStyle_Customize | WStyle_NoBorder,
750 QPoint ( 0, 0 )); 748 QPoint ( 0, 0 ));
751} 749}
752 750
753void Konsole::show() 751void Konsole::show()
754{ 752{
755 if ( !nsessions ) 753 if ( !nsessions )
756 { 754 {
757 newSession(); 755 newSession();
758 } 756 }
759 QMainWindow::show(); 757 QMainWindow::show();
760 758
761} 759}
762 760
763void Konsole::initSession(const char*, QStrList &) 761void Konsole::initSession(const char*, QStrList &)
764{ 762{
765 QMainWindow::show(); 763 QMainWindow::show();
766} 764}
767 765
768Konsole::~Konsole() 766Konsole::~Konsole()
769{ 767{
770 while (nsessions > 0) 768 while (nsessions > 0)
771 { 769 {
772 doneSession(getTe(), 0); 770 doneSession(getTe(), 0);
773 } 771 }
774} 772}
775 773
776void 774void
777Konsole::historyDialog() 775Konsole::historyDialog()
778{ 776{
779 QDialog *d = new QDialog ( this, "histdlg", true ); 777 QDialog *d = new QDialog ( this, "histdlg", true );
780 // d-> setCaption ( tr( "History" )); 778 // d-> setCaption ( tr( "History" ));
781 779
782 QBoxLayout *lay = new QVBoxLayout ( d, 4, 4 ); 780 QBoxLayout *lay = new QVBoxLayout ( d, 4, 4 );
783 781
784 QLabel *l = new QLabel ( tr( "History Lines:" ), d ); 782 QLabel *l = new QLabel ( tr( "History Lines:" ), d );
785 lay-> addWidget ( l ); 783 lay-> addWidget ( l );
786 784
787 Config cfg( "Konsole" ); 785 Config cfg( "Konsole" );
788 cfg.setGroup("History"); 786 cfg.setGroup("History");
789 int hist = cfg.readNumEntry("history_lines",300); 787 int hist = cfg.readNumEntry("history_lines",300);
790 int avg_line = cfg.readNumEntry("avg_line_length",60); 788 int avg_line = cfg.readNumEntry("avg_line_length",60);
791 789
792 QSpinBox *spin = new QSpinBox ( 1, 100000, 20, d ); 790 QSpinBox *spin = new QSpinBox ( 1, 100000, 20, d );
793 spin-> setValue ( hist ); 791 spin-> setValue ( hist );
794 spin-> setWrapping ( true ); 792 spin-> setWrapping ( true );
795 spin-> setButtonSymbols ( QSpinBox::PlusMinus ); 793 spin-> setButtonSymbols ( QSpinBox::PlusMinus );
796 lay-> addWidget ( spin ); 794 lay-> addWidget ( spin );
797 795
798 if ( d-> exec ( ) == QDialog::Accepted ) 796 if ( d-> exec ( ) == QDialog::Accepted )
799 { 797 {
800 cfg.writeEntry("history_lines", spin->value()); 798 cfg.writeEntry("history_lines", spin->value());
801 cfg.writeEntry("avg_line_length", avg_line); 799 cfg.writeEntry("avg_line_length", avg_line);
802 if (getTe() != NULL) 800 if (getTe() != NULL)
803 { 801 {
804 getTe()->currentSession->setHistory(true); 802 getTe()->currentSession->setHistory(true);
805 } 803 }
806 } 804 }
807 805
808 delete d; 806 delete d;
809} 807}
810 808
811 809
812void Konsole::cycleZoom() 810void Konsole::cycleZoom()
813{ 811{
814 TEWidget* te = getTe(); 812 TEWidget* te = getTe();
815 QFont font = te->getVTFont(); 813 QFont font = te->getVTFont();
816 int size = font.pointSize(); 814 int size = font.pointSize();
817 changeFontSize(1); 815 changeFontSize(1);
818 font = te->getVTFont(); 816 font = te->getVTFont();
819 if (font.pointSize() <= size) 817 if (font.pointSize() <= size)
820 { 818 {
821 do 819 do
822 { 820 {
823 font = te->getVTFont(); 821 font = te->getVTFont();
824 size = font.pointSize(); 822 size = font.pointSize();
825 changeFontSize(-1); 823 changeFontSize(-1);
826 font = te->getVTFont(); 824 font = te->getVTFont();
827 } 825 }
828 while (font.pointSize() < size); 826 while (font.pointSize() < size);
829 } 827 }
830} 828}
831 829
832void Konsole::changeFontSize(int delta) 830void Konsole::changeFontSize(int delta)
833{ 831{
834 // printf("delta font size %d\n", delta); 832 // printf("delta font size %d\n", delta);
835 TEWidget* te = getTe(); 833 TEWidget* te = getTe();
836 QFont font = te->getVTFont(); 834 QFont font = te->getVTFont();
837 int size = font.pointSize(); 835 int size = font.pointSize();
838 int closest = delta > 0? 10000 : -10000; 836 int closest = delta > 0? 10000 : -10000;
839 int closest_font = -1; 837 int closest_font = -1;
840 for(uint i = 0; i < fonts.count(); i++) 838 for(uint i = 0; i < fonts.count(); i++)
841 { 839 {
842 if (fonts.at(i)->getFont() == font) 840 if (fonts.at(i)->getFont() == font)
843 { 841 {
844 if (delta > 0) 842 if (delta > 0)
845 { 843 {
846 if (i+1 < fonts.count() 844 if (i+1 < fonts.count()
847 && fonts.at(i+1)->getFamilyNum() == fonts.at(i)->getFamilyNum()) 845 && fonts.at(i+1)->getFamilyNum() == fonts.at(i)->getFamilyNum())
848 { 846 {
849 setFont(i+1); 847 setFont(i+1);
850 printf("font %d\n", i+1); 848 printf("font %d\n", i+1);
851 return; 849 return;
852 } 850 }
853 } 851 }
854 else if (delta < 0) 852 else if (delta < 0)
855 { 853 {
856 if (i > 0 854 if (i > 0
857 && fonts.at(i-1)->getFamilyNum() == fonts.at(i)->getFamilyNum()) 855 && fonts.at(i-1)->getFamilyNum() == fonts.at(i)->getFamilyNum())
858 { 856 {
859 setFont(i-1); 857 setFont(i-1);
860 printf("font %d\n", i-1); 858 printf("font %d\n", i-1);
861 return; 859 return;
862 } 860 }
863 } 861 }
864 } 862 }
865 int fsize = fonts.at(i)->getSize(); 863 int fsize = fonts.at(i)->getSize();
866 printf("%d size=%d fsize=%d closest=%d\n", i, size, fsize, closest); 864 printf("%d size=%d fsize=%d closest=%d\n", i, size, fsize, closest);
867 if ((delta > 0 && fsize > size && fsize < closest) 865 if ((delta > 0 && fsize > size && fsize < closest)
868 || (delta < 0 && fsize < size && fsize > closest)) 866 || (delta < 0 && fsize < size && fsize > closest))
869 { 867 {
870 closest = fsize; 868 closest = fsize;
871 closest_font = i; 869 closest_font = i;
872 } 870 }
873 } 871 }
874 if (closest_font >= 0) 872 if (closest_font >= 0)
875 { 873 {
876 printf("font closest %d (%d)\n", closest_font, closest); 874 printf("font closest %d (%d)\n", closest_font, closest);
877 setFont(closest_font); 875 setFont(closest_font);
878 } 876 }
879} 877}
880 878
881int Konsole::findFont(const QString& name, int size, bool exactMatch) 879int Konsole::findFont(const QString& name, int size, bool exactMatch)
882{ 880{
883 for(uint i = 0; i < fonts.count(); i++) 881 for(uint i = 0; i < fonts.count(); i++)
884 { 882 {
885 if (fonts.at(i)->getName() == name 883 if (fonts.at(i)->getName() == name
886 && fonts.at(i)->getSize() == size) 884 && fonts.at(i)->getSize() == size)
887 { 885 {
888 return(i); 886 return(i);
889 } 887 }
890 } 888 }
891 if (exactMatch) 889 if (exactMatch)
892 { 890 {
893 return(-1); 891 return(-1);
894 } 892 }
895 for(uint i = 0; i < fonts.count(); i++) 893 for(uint i = 0; i < fonts.count(); i++)
896 { 894 {
897 if (fonts.at(i)->getSize() == size) 895 if (fonts.at(i)->getSize() == size)
898 { 896 {
899 return(i); 897 return(i);
900 } 898 }
901 } 899 }
902 return(-1); 900 return(-1);
903} 901}
904 902
905void Konsole::setFont(int f) 903void Konsole::setFont(int f)
906{ 904{
907 VTFont* font = fonts.at(f); 905 VTFont* font = fonts.at(f);
908 if (font) 906 if (font)
909 { 907 {
910 TEWidget* te = getTe(); 908 TEWidget* te = getTe();
911 if (te != 0) 909 if (te != 0)
912 { 910 {
913 te->setVTFont(font->getFont()); 911 te->setVTFont(font->getFont());
914 } 912 }
915 cfont = f; 913 cfont = f;
916 914
917 int familyNum = font->getFamilyNum(); 915 int familyNum = font->getFamilyNum();
918 int size = font->getSize(); 916 int size = font->getSize();
919 printf("familyNum = %d size = %d count=%d\n", familyNum, size, 917 printf("familyNum = %d size = %d count=%d\n", familyNum, size,
920 fontList->count()); 918 fontList->count());
921 for(int i = 0; i < (int)fontList->count(); i++) 919 for(int i = 0; i < (int)fontList->count(); i++)
922 { 920 {
923 fontList->setItemChecked(i + 1000, i == familyNum); 921 fontList->setItemChecked(i + 1000, i == familyNum);
924 } 922 }
925 for(int i = 0; i < (int)fonts.count(); i++) 923 for(int i = 0; i < (int)fonts.count(); i++)
926 { 924 {
927 fontList->setItemChecked(i, fonts.at(i)->getFamilyNum() == familyNum 925 fontList->setItemChecked(i, fonts.at(i)->getFamilyNum() == familyNum
928 && fonts.at(i)->getSize() == size); 926 && fonts.at(i)->getSize() == size);
929 } 927 }
930 Config cfg( "Konsole" ); 928 Config cfg( "Konsole" );
931 cfg.setGroup("Font"); 929 cfg.setGroup("Font");
932 QString ss = "Session"+ QString::number(tab->currentPageIndex()+1); 930 QString ss = "Session"+ QString::number(tab->currentPageIndex()+1);
933 if (tab->currentPageIndex() == 0) 931 if (tab->currentPageIndex() == 0)
934 { 932 {
935 cfg.writeEntry("FontName", fonts.at(cfont)->getFamily()); 933 cfg.writeEntry("FontName", fonts.at(cfont)->getFamily());
936 cfg.writeEntry("FontSize", fonts.at(cfont)->getSize()); 934 cfg.writeEntry("FontSize", fonts.at(cfont)->getSize());
937 } 935 }
938 cfg.writeEntry("FontName"+ss, fonts.at(cfont)->getFamily()); 936 cfg.writeEntry("FontName"+ss, fonts.at(cfont)->getFamily());
939 cfg.writeEntry("FontSize"+ss, fonts.at(cfont)->getSize()); 937 cfg.writeEntry("FontSize"+ss, fonts.at(cfont)->getSize());
940 } 938 }
941} 939}
942 940
943#if 0 941#if 0
944void Konsole::fontChanged(int f) 942void Konsole::fontChanged(int f)
945{ 943{
946 VTFont* font = fonts.at(f); 944 VTFont* font = fonts.at(f);
947 if (font != 0) 945 if (font != 0)
948 { 946 {
949 for(uint i = 0; i < fonts.count(); i++) 947 for(uint i = 0; i < fonts.count(); i++)
950 { 948 {
951 fontList->setItemChecked(i, (i == (uint) f) ? TRUE : FALSE); 949 fontList->setItemChecked(i, (i == (uint) f) ? TRUE : FALSE);
952 } 950 }
953 951
954 cfont = f; 952 cfont = f;
955 953
956 TEWidget* te = getTe(); 954 TEWidget* te = getTe();
957 if (te != 0) 955 if (te != 0)
958 { 956 {
959 te->setVTFont(font->getFont()); 957 te->setVTFont(font->getFont());
960 } 958 }
961 } 959 }
962} 960}
963#endif 961#endif
964 962
965 963
966void Konsole::enterCommand(int c) 964void Konsole::enterCommand(int c)
967{ 965{
968 TEWidget* te = getTe(); 966 TEWidget* te = getTe();
969 if (te != 0) 967 if (te != 0)
970 { 968 {
971 if(!commonCombo->editable()) 969 if(!commonCombo->editable())
972 { 970 {
973 QString text = commonCombo->text(c); //commonCmds[c]; 971 QString text = commonCombo->text(c); //commonCmds[c];
974 te->emitText(text); 972 te->emitText(text);
975 } 973 }
976 else 974 else
977 { 975 {
978 changeCommand( commonCombo->text(c), c); 976 changeCommand( commonCombo->text(c), c);
979 } 977 }
980 } 978 }
981} 979}
982 980
983void Konsole::hitEnter() 981void Konsole::hitEnter()
984{ 982{
985 TEWidget* te = getTe(); 983 TEWidget* te = getTe();
986 if (te != 0) 984 if (te != 0)
987 { 985 {
988 te->emitText(QString("\r")); 986 te->emitText(QString("\r"));
989 } 987 }
990} 988}
991 989
992void Konsole::hitSpace() 990void Konsole::hitSpace()
993{ 991{
994 TEWidget* te = getTe(); 992 TEWidget* te = getTe();
995 if (te != 0) 993 if (te != 0)
996 { 994 {
997 te->emitText(QString(" ")); 995 te->emitText(QString(" "));
998 } 996 }
999} 997}
1000 998
1001void Konsole::hitTab() 999void Konsole::hitTab()
1002{ 1000{
1003 TEWidget* te = getTe(); 1001 TEWidget* te = getTe();
1004 if (te != 0) 1002 if (te != 0)
1005 { 1003 {
1006 te->emitText(QString("\t")); 1004 te->emitText(QString("\t"));
1007 } 1005 }
1008} 1006}
1009 1007
1010void Konsole::hitPaste() 1008void Konsole::hitPaste()
1011{ 1009{
1012 TEWidget* te = getTe(); 1010 TEWidget* te = getTe();
1013 if (te != 0) 1011 if (te != 0)
1014 { 1012 {
1015 te->pasteClipboard(); 1013 te->pasteClipboard();
1016 } 1014 }
1017} 1015}
1018 1016
1019void Konsole::hitUp() 1017void Konsole::hitUp()
1020{ 1018{
1021 TEWidget* te = getTe(); 1019 TEWidget* te = getTe();
1022 if (te != 0) 1020 if (te != 0)
1023 { 1021 {
1024 QKeyEvent ke( QKeyEvent::KeyPress, Qt::Key_Up, 0, 0); 1022 QKeyEvent ke( QKeyEvent::KeyPress, Qt::Key_Up, 0, 0);
1025 QApplication::sendEvent( te, &ke ); 1023 QApplication::sendEvent( te, &ke );
1026 } 1024 }
1027} 1025}
1028 1026
1029void Konsole::hitDown() 1027void Konsole::hitDown()
1030{ 1028{
1031 TEWidget* te = getTe(); 1029 TEWidget* te = getTe();
1032 if (te != 0) 1030 if (te != 0)
1033 { 1031 {
1034 QKeyEvent ke( QKeyEvent::KeyPress, Qt::Key_Down, 0, 0); 1032 QKeyEvent ke( QKeyEvent::KeyPress, Qt::Key_Down, 0, 0);
1035 QApplication::sendEvent( te, &ke ); 1033 QApplication::sendEvent( te, &ke );
1036 } 1034 }
1037} 1035}
1038 1036
1039/** 1037/**
1040 This function calculates the size of the external widget 1038 This function calculates the size of the external widget
1041 needed for the internal widget to be 1039 needed for the internal widget to be
1042 */ 1040 */
1043QSize Konsole::calcSize(int columns, int lines) 1041QSize Konsole::calcSize(int columns, int lines)
1044{ 1042{
1045 TEWidget* te = getTe(); 1043 TEWidget* te = getTe();
1046 if (te != 0) 1044 if (te != 0)
1047 { 1045 {
1048 QSize size = te->calcSize(columns, lines); 1046 QSize size = te->calcSize(columns, lines);
1049 return size; 1047 return size;
1050 } 1048 }
1051 else 1049 else
1052 { 1050 {
1053 QSize size; 1051 QSize size;
1054 return size; 1052 return size;
1055 } 1053 }
1056} 1054}
1057 1055
1058/** 1056/**
1059 sets application window to a size based on columns X lines of the te 1057 sets application window to a size based on columns X lines of the te
1060 guest widget. Call with (0,0) for setting default size. 1058 guest widget. Call with (0,0) for setting default size.
1061*/ 1059*/
1062 1060
1063void Konsole::setColLin(int columns, int lines) 1061void Konsole::setColLin(int columns, int lines)
1064{ 1062{
1065 qDebug("konsole::setColLin:: Columns %d", columns); 1063 qDebug("konsole::setColLin:: Columns %d", columns);
1066 1064
1067 if ((columns==0) || (lines==0)) 1065 if ((columns==0) || (lines==0))
1068 { 1066 {
1069 if (defaultSize.isEmpty()) // not in config file : set default value 1067 if (defaultSize.isEmpty()) // not in config file : set default value
1070 { 1068 {
1071 defaultSize = calcSize(80,24); 1069 defaultSize = calcSize(80,24);
1072 // notifySize(24,80); // set menu items (strange arg order !) 1070 // notifySize(24,80); // set menu items (strange arg order !)
1073 } 1071 }
1074 resize(defaultSize); 1072 resize(defaultSize);
1075 } 1073 }
1076 else 1074 else
1077 { 1075 {
1078 resize(calcSize(columns, lines)); 1076 resize(calcSize(columns, lines));
1079 // notifySize(lines,columns); // set menu items (strange arg order !) 1077 // notifySize(lines,columns); // set menu items (strange arg order !)
1080 } 1078 }
1081} 1079}
1082 1080
1083/* 1081/*
1084void Konsole::setFont(int fontno) 1082void Konsole::setFont(int fontno)
1085{ 1083{
1086 QFont f; 1084 QFont f;
1087 if (fontno == 0) 1085 if (fontno == 0)
1088 f = defaultFont = QFont( "Helvetica", 12 ); 1086 f = defaultFont = QFont( "Helvetica", 12 );
1089 else 1087 else
1090 if (fonts[fontno][0] == '-') 1088 if (fonts[fontno][0] == '-')
1091 f.setRawName( fonts[fontno] ); 1089 f.setRawName( fonts[fontno] );
1092 else 1090 else
1093 { 1091 {
1094 f.setFamily(fonts[fontno]); 1092 f.setFamily(fonts[fontno]);
1095 f.setRawMode( TRUE ); 1093 f.setRawMode( TRUE );
1096 } 1094 }
1097 if ( !f.exactMatch() && fontno != 0) 1095 if ( !f.exactMatch() && fontno != 0)
1098 { 1096 {
1099 QString msg = i18n("Font `%1' not found.\nCheck README.linux.console for help.").arg(fonts[fontno]); 1097 QString msg = i18n("Font `%1' not found.\nCheck README.linux.console for help.").arg(fonts[fontno]);
1100 QMessageBox(this, msg); 1098 QMessageBox(this, msg);
1101 return; 1099 return;
1102 } 1100 }
1103 if (se) se->setFontNo(fontno); 1101 if (se) se->setFontNo(fontno);
1104 te->setVTFont(f); 1102 te->setVTFont(f);
1105 n_font = fontno; 1103 n_font = fontno;
1106} 1104}
1107*/ 1105*/
1108 1106
1109// --| color selection |------------------------------------------------------- 1107// --| color selection |-------------------------------------------------------
1110 1108
1111void Konsole::changeColumns(int /*columns*/) 1109void Konsole::changeColumns(int /*columns*/)
1112{ //FIXME this seems to cause silliness when reset command is executed 1110{ //FIXME this seems to cause silliness when reset command is executed
1113 // qDebug("change columns"); 1111 // qDebug("change columns");
1114 // TEWidget* te = getTe(); 1112 // TEWidget* te = getTe();
1115 // if (te != 0) { 1113 // if (te != 0) {
1116 // setColLin(columns,te->Lines()); 1114 // setColLin(columns,te->Lines());
1117 // te->update(); 1115 // te->update();
1118 // } 1116 // }
1119} 1117}
1120 1118
1121//FIXME: If a child dies during session swap, 1119//FIXME: If a child dies during session swap,
1122// this routine might be called before 1120// this routine might be called before
1123// session swap is completed. 1121// session swap is completed.
1124 1122
1125void Konsole::doneSession(TEWidget* te, int ) 1123void Konsole::doneSession(TEWidget* te, int )
1126{ 1124{
1127 // TEWidget *te = NULL; 1125 // TEWidget *te = NULL;
1128 // if (sess->currentSession == tab->currentPage()) { 1126 // if (sess->currentSession == tab->currentPage()) {
1129 // printf("done current session\n"); 1127 // printf("done current session\n");
1130 // te = getTe(); 1128 // te = getTe();
1131 // } else { 1129 // } else {
1132 // int currentPage = tab->currentPageIndex(); 1130 // int currentPage = tab->currentPageIndex();
1133 // printf("done not current session\n"); 1131 // printf("done not current session\n");
1134 // for(int i = 0; i < nsessions; i++) { 1132 // for(int i = 0; i < nsessions; i++) {
1135 // tab->setCurrentPage(i); 1133 // tab->setCurrentPage(i);
1136 // printf("find session %d tab page %x session %x\n", 1134 // printf("find session %d tab page %x session %x\n",
1137 // i, tab->currentPage(), sess->currentSession); 1135 // i, tab->currentPage(), sess->currentSession);
1138 // if (tab->currentPage() == sess->currentSession) { 1136 // if (tab->currentPage() == sess->currentSession) {
1139 // printf("found session %d\n", i); 1137 // printf("found session %d\n", i);
1140 // te = tab->currentPage(); 1138 // te = tab->currentPage();
1141 // break; 1139 // break;
1142 // } 1140 // }
1143 // } 1141 // }
1144 // tab->setCurrentPage(currentPage); 1142 // tab->setCurrentPage(currentPage);
1145 // } 1143 // }
1146 if (te != 0) 1144 if (te != 0)
1147 { 1145 {
1148 te->currentSession->setConnect(FALSE); 1146 te->currentSession->setConnect(FALSE);
1149 tab->removeTab(te); 1147 tab->removeTab(te);
1150 delete te->currentSession; 1148 delete te->currentSession;
1151 delete te; 1149 delete te;
1152 sessionList->removeItem(nsessions); 1150 sessionList->removeItem(nsessions);
1153 nsessions--; 1151 nsessions--;
1154 } 1152 }
1155 if (nsessions == 0) 1153 if (nsessions == 0)
1156 { 1154 {
1157 close(); 1155 close();
1158 } 1156 }
1159} 1157}
1160 1158
1161void Konsole::changeTitle(TEWidget* te, const QString& newTitle ) 1159void Konsole::changeTitle(TEWidget* te, const QString& newTitle )
1162{ 1160{
1163 if (te == getTe()) 1161 if (te == getTe())
1164 { 1162 {
1165 setCaption( newTitle + " - " + tr( "Konsole " ) ); 1163 setCaption( newTitle + " - " + tr( "Konsole " ) );
1166 } 1164 }
1167} 1165}
1168 1166
1169 1167
1170void Konsole::newSession() 1168void Konsole::newSession()
1171{ 1169{
1172 if(nsessions < 15) 1170 if(nsessions < 15)
1173 { // seems to be something weird about 16 tabs on the Zaurus.... memory? 1171 { // seems to be something weird about 16 tabs on the Zaurus.... memory?
1174 TEWidget* te = new TEWidget(tab); 1172 TEWidget* te = new TEWidget(tab);
1175 Config cfg( "Konsole" ); 1173 Config cfg( "Konsole" );
1176 cfg.setGroup("Menubar"); 1174 cfg.setGroup("Menubar");
1177 1175
1178 // FIXME use more defaults from config file 1176 // FIXME use more defaults from config file
1179 te->useBeep=cfg.readBoolEntry("useBeep",0); 1177 te->useBeep=cfg.readBoolEntry("useBeep",0);
1180 1178
1181 // te->setBackgroundMode(PaletteBase); //we want transparent!! 1179 // te->setBackgroundMode(PaletteBase); //we want transparent!!
1182 1180
1183 cfg.setGroup("Font"); 1181 cfg.setGroup("Font");
1184 QString sn = "Session" + QString::number(nsessions+1); 1182 QString sn = "Session" + QString::number(nsessions+1);
1185 printf("read font session %s\n", sn.latin1()); 1183 printf("read font session %s\n", sn.latin1());
1186 QString fontName = cfg.readEntry("FontName"+sn, 1184 QString fontName = cfg.readEntry("FontName"+sn,
1187 cfg.readEntry("FontName", 1185 cfg.readEntry("FontName",
1188 fonts.at(cfont)->getFamily())); 1186 fonts.at(cfont)->getFamily()));
1189 int fontSize = cfg.readNumEntry("FontSize"+sn, 1187 int fontSize = cfg.readNumEntry("FontSize"+sn,
1190 cfg.readNumEntry("FontSize", 1188 cfg.readNumEntry("FontSize",
1191 fonts.at(cfont)->getSize())); 1189 fonts.at(cfont)->getSize()));
1192 cfont = findFont(fontName, fontSize, false); 1190 cfont = findFont(fontName, fontSize, false);
1193 printf("lookup font %s size %d got %d\n", fontName.latin1(), fontSize, cfont); 1191 printf("lookup font %s size %d got %d\n", fontName.latin1(), fontSize, cfont);
1194 if (cfont < 0) 1192 if (cfont < 0)
1195 cfont = 0; 1193 cfont = 0;
1196 te->setVTFont(fonts.at(cfont)->getFont()); 1194 te->setVTFont(fonts.at(cfont)->getFont());
1197 1195
1198 tab->addTab(te); 1196 tab->addTab(te);
1199 TESession* se = new TESession(this, te, se_pgm, se_args, "xterm"); 1197 TESession* se = new TESession(this, te, se_pgm, se_args, "xterm");
1200 te->currentSession = se; 1198 te->currentSession = se;
1201 connect( se, SIGNAL(done(TEWidget*,int)), this, SLOT(doneSession(TEWidget*,int)) ); 1199 connect( se, SIGNAL(done(TEWidget*,int)), this, SLOT(doneSession(TEWidget*,int)) );
1202 connect( se, SIGNAL(changeTitle(TEWidget*,const QString&)), this, 1200 connect( se, SIGNAL(changeTitle(TEWidget*,const QString&)), this,
1203 SLOT(changeTitle(TEWidget*,const QString&)) ); 1201 SLOT(changeTitle(TEWidget*,const QString&)) );
1204 connect(te, SIGNAL(changeFontSize(int)), this, SLOT(changeFontSize(int))); 1202 connect(te, SIGNAL(changeFontSize(int)), this, SLOT(changeFontSize(int)));