option for beep

3 files changed, 29 insertions, 21 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index 4c6ea2a..c220e11 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -288,96 +288,97 @@ TEWidget::TEWidget(QWidget *parent, const char *name) : QFrame(parent,name)
   cb = QApplication::clipboard();
   QObject::connect( (QObject*)cb, SIGNAL(dataChanged()),
                     this, SLOT(onClearSelection()) );
 #endif
 
   scrollbar = new QScrollBar(this);
   scrollbar->setCursor( arrowCursor );
   connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(scrollChanged(int)));
 
   hScrollbar = new QScrollBar(this);
   hScrollbar->setCursor( arrowCursor );
   hScrollbar->setOrientation(QScrollBar::Horizontal);
   hScrollbar->setMaximumHeight(16);
   
   connect( hScrollbar, SIGNAL(valueChanged(int)), this, SLOT( hScrollChanged(int)));
 
   Config cfg("Konsole");
   cfg.setGroup("ScrollBar");
   switch( cfg.readNumEntry("Position",2)){
   case 0:
       scrollLoc = SCRNONE;
       break;
   case 1:
       scrollLoc = SCRLEFT;
       break;
   case 2:
       scrollLoc = SCRRIGHT;
       break;
   };
 
   useHorzScroll=cfg.readBoolEntry("HorzScroll",0);
 
   blinkT   = new QTimer(this);
   connect(blinkT, SIGNAL(timeout()), this, SLOT(blinkEvent()));
   // blinking = FALSE;
   blinking = TRUE;
 
   resizing = FALSE;
   actSel   = 0;
   image    = 0;
   lines    = 1;
   columns  = 1;
   font_w   = 1;
   font_h   = 1;
   font_a   = 1;
   word_selection_mode = FALSE;
   hposition = 0;
 vcolumns = 0;
+  useBeep = true;
  
   setMouseMarks(TRUE);
   setVTFont( QFont("fixed") );
   setColorTable(base_color_table); // init color table
 
   qApp->installEventFilter( this ); //FIXME: see below
 //  KCursor::setAutoHideCursor( this, true );
 
   // Init DnD ////////////////////////////////////////////////////////////////
   currentSession = NULL;
 //  setAcceptDrops(true); // attempt
 //  m_drop = new QPopupMenu(this);
 //  m_drop->insertItem( QString("Paste"), 0);
 //  m_drop->insertItem( QString("cd"),    1);
 //  connect(m_drop, SIGNAL(activated(int)), SLOT(drop_menu_activated(int)));
 
   // we need focus so that the auto-hide cursor feature works
   setFocus();
   setFocusPolicy( WheelFocus );
 }
 
 //FIXME: make proper destructor
 // Here's a start (David)
 TEWidget::~TEWidget()
 {
   qApp->removeEventFilter( this );
   if (image) free(image);
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                             Display Operations                            */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 /*!
     attributed string draw primitive
 */
 
 void TEWidget::drawAttrStr(QPainter &paint, QRect rect,
                            QString& str, ca attr, BOOL pm, BOOL clear)
 {
   if (pm && color_table[attr.b].transparent)
   {
     paint.setBackgroundMode( TransparentMode );
     if (clear) erase(rect);
   }
   else
@@ -1062,97 +1063,99 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
 
 //     qDebug("key pressed 2 is 0x%x", ke->key());
             emitText("\\"); // expose
         }
         else if( ke->state() == ControlButton && ke->key() == Key_V) {
           pasteClipboard();
         }
         else
             emit keyPressedSignal(ke); // expose
         ke->accept();
 #ifdef FAKE_CTRL_AND_ALT
         if ( dele ) delete e;
 #endif
         return true;               // stop the event
     }
     if ( e->type() == QEvent::Enter )  {
         QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()),
                              this, SLOT(onClearSelection()) );
     }
     if ( e->type() == QEvent::Leave )  {
         QObject::connect( (QObject*)cb, SIGNAL(dataChanged()),
                           this, SLOT(onClearSelection()) );
     }
     return QFrame::eventFilter( obj, e );
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                  Frame                                    */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 void TEWidget::frameChanged()
 {
   propagateSize();
   update();
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                   Sound                                   */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 void TEWidget::Bell()
 {
 //#ifdef QT_QWS_SHARP
 //# ifndef QT_NO_COP
+    if(useBeep) 
     QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
+    
 //# endif
 //#else
 //# ifndef QT_NO_SOUND
 //    QSound::play(Resource::findSound("alarm"));
 //# endif
 //#endif    
 
 //    QApplication::beep();
 }
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                                 Auxiluary                                 */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 void TEWidget::clearImage()
 // initialize the image
 // for internal use only
 {
   for (int y = 0; y < lines; y++)
   for (int x = 0; x < columns; x++)
   {
     image[loc(x,y)].c = 0xff; //' ';
     image[loc(x,y)].f = 0xff; //DEFAULT_FORE_COLOR;
     image[loc(x,y)].b = 0xff; //DEFAULT_BACK_COLOR;
     image[loc(x,y)].r = 0xff; //DEFAULT_RENDITION;
   }
 }
 
 // Create Image ///////////////////////////////////////////////////////
 
 void TEWidget::calcGeometry()
 {
     int showhscrollbar = 1;
     int hwidth = 0;
     int dcolumns;
     Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
     useHorzScroll=cfg.readBoolEntry("HorzScroll",0);
 
     if(vcolumns == 0) showhscrollbar = 0;
     if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width();
 
     scrollbar->resize(QApplication::style().scrollBarExtent().width(),
                       contentsRect().height() - hwidth);
 
     switch(scrollLoc)  {
diff --git a/core/apps/embeddedkonsole/TEWidget.h b/core/apps/embeddedkonsole/TEWidget.h
index a480d45..5597f27 100644
--- a/core/apps/embeddedkonsole/TEWidget.h
+++ b/core/apps/embeddedkonsole/TEWidget.h
@@ -8,124 +8,117 @@
 /*                                                                         */
 /* This file is part of Konsole - an X terminal for KDE                    */
 /*                                                                         */
 /* ----------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 #ifndef TE_WIDGET_H
 #define TE_WIDGET_H
 
 #include <qwidget.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qcolor.h>
 #include <qkeycode.h>
 #include <qscrollbar.h>
 
 #include <qpopupmenu.h>
 
 #include "TECommon.h"
 
 extern unsigned short vt100_graphics[32];
 
 class TESession;
 
 // class Konsole;
 
 class TEWidget : public QFrame
 // a widget representing attributed text
 { Q_OBJECT
 
 //  friend class Konsole;
 
 public:
 
     TEWidget(QWidget *parent=0, const char *name=0);
     virtual ~TEWidget();
 
 public:
 
     QColor getDefaultBackColor();
 
     const ColorEntry* getColorTable() const;
     const ColorEntry* getdefaultColorTable() const;
     void              setColorTable(const ColorEntry table[]);
-
     void setScrollbarLocation(int loc);
     enum { SCRNONE=0, SCRLEFT=1, SCRRIGHT=2 };
-
     void setScroll(int cursor, int lines);
     void doScroll(int lines);
-
     void doHScroll(int lines);
-
-    
     void emitSelection();
   void setWrapAt(int columns);
 
-public:
-
     void setImage(const ca* const newimg, int lines, int columns);
 
     int  Lines()   { return lines;   }
     int  Columns() { return columns; }
 
     void calcGeometry();
     void propagateSize();
     QSize calcSize(int cols, int lins) const;
 
     QSize sizeHint() const;
 
-public:
     bool useHorzScroll;
+    bool useBeep;
 
     void Bell();
     void emitText(QString text);
     void pasteClipboard();
 
 signals:
 
     void keyPressedSignal(QKeyEvent *e);
     void mouseSignal(int cb, int cx, int cy);
     void changedImageSizeSignal(int lines, int columns);
     void changedHistoryCursor(int value);
     void changedHorzCursor(int value);
     void configureRequest( TEWidget*, int state, int x, int y );
 
     void clearSelectionSignal();
     void beginSelectionSignal( const int x, const int y );
     void extendSelectionSignal( const int x, const int y );
     void endSelectionSignal(const BOOL preserve_line_breaks);
 
 
 protected:
     virtual void styleChange( QStyle& );
 
     bool eventFilter( QObject *, QEvent * );
 
     void drawAttrStr(QPainter &paint, QRect rect,
                      QString& str, ca attr, BOOL pm, BOOL clear);
     void paintEvent( QPaintEvent * );
 
     void resizeEvent(QResizeEvent*);
 
     void fontChange(const QFont &font);
     void frameChanged();
 
     void mouseDoubleClickEvent(QMouseEvent* ev);
     void mousePressEvent( QMouseEvent* );
     void mouseReleaseEvent( QMouseEvent* );
     void mouseMoveEvent( QMouseEvent* );
 
     void focusInEvent( QFocusEvent * );
     void focusOutEvent( QFocusEvent * );
     bool focusNextPrevChild( bool next );
 
 #ifndef QT_NO_DRAGANDDROP
     // Dnd
     void dragEnterEvent(QDragEnterEvent* event);
     void dropEvent(QDropEvent* event);
 #endif
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 5a68c81..ebff05e 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -326,96 +326,100 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
   a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
   a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); a->addTo( toolbar );
 /*
   a = new QAction( tr("Up"), Resource::loadPixmap( "up" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
   a = new QAction( tr("Down"), Resource::loadPixmap( "down" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
 */
 
   secondToolBar = new QPEToolBar( this );
   secondToolBar->setHorizontalStretchable( TRUE );
 
   commonCombo = new QComboBox( secondToolBar );
   commonCombo->setMaximumWidth(236);
 
   editCommandListMenu->insertItem( tr( "Quick Edit" ) );
   if( listHidden) {
       secondToolBar->hide();
       editCommandListMenu->setItemEnabled(-23 ,FALSE);
   }
   editCommandListMenu->insertItem(tr(  "Edit" ) );
 
   cfg.setGroup("Commands");
   commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
 
   initCommandList();
 //   for (int i = 0; commonCmds[i] != NULL; i++) {
 //        commonCombo->insertItem( commonCmds[i], i );
 //        tmp = cfg.readEntry( QString::number(i),"");
 //        if(tmp != "")
 //            commonCombo->changeItem( tmp,i );
 //    }
 
   connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) ));
 
   scrollMenu->insertItem(tr( "None" ));
   scrollMenu->insertItem(tr( "Left" ));
   scrollMenu->insertItem(tr( "Right" ));
 //   scrollMenu->insertSeparator(4);
 //   scrollMenu->insertItem(tr( "Horizontal" ));
  
   configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
 
   configMenu->insertItem(tr( "Wrap" ));
+  int jut = configMenu->insertItem(tr( "Use Beep" ));
+  cfg.setGroup("Menubar");
+  configMenu->setItemChecked(jut, cfg.readBoolEntry("useBeep",0));
+
   
 //scrollMenuSelected(-29);
 //   cfg.setGroup("ScrollBar");
 //   if(cfg.readBoolEntry("HorzScroll",0)) {
 //       if(cfg.readNumEntry("Position",2) == 0)
 //           te->setScrollbarLocation(1);
 //       else
 //           te->setScrollbarLocation(0);
 //       te->setScrollbarLocation( cfg.readNumEntry("Position",2));
 //       te->setWrapAt(120);
 //   }
       // create applications /////////////////////////////////////////////////////
   setCentralWidget(tab);
 
   // load keymaps ////////////////////////////////////////////////////////////
   KeyTrans::loadAll();
   for (int i = 0; i < KeyTrans::count(); i++)
   { KeyTrans* s = KeyTrans::find(i);
     assert( s );
   }
 
   se_pgm = _pgm;
   se_args = _args;
   se_args.prepend("--login");
 parseCommandLine();
   // read and apply default values ///////////////////////////////////////////
   resize(321, 321); // Dummy.
   QSize currentSize = size();
   if (currentSize != size())
      defaultSize = size();
 }
 
 void Konsole::show()
 {
   if ( !nsessions ) {
     newSession();
   }
   QMainWindow::show();
   
 }
 
 void Konsole::initSession(const char*, QStrList &)
 {
   QMainWindow::show();
 }
 
 Konsole::~Konsole()
 {
@@ -747,131 +751,140 @@ void Konsole::colorMenuSelected(int iD)
             background.setRgb(0x00,0x00,0x00);
             foreground.setRgb(255,215,0);
             cfg.writeEntry("Schema","18");
             colorMenu->setItemChecked(-18,TRUE);
         }
 #ifdef QWS_QT_OPIE        
         if(iD==-19) {
 // Custom
             qDebug("do custom");
             if(fromMenu) {
             ColorPopupMenu* penColorPopupMenu = new ColorPopupMenu(Qt::black, this, "foreground color");
             connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
                     SLOT(changeForegroundColor(const QColor&)));
             penColorPopupMenu->exec();
             }
             cfg.writeEntry("Schema","19");
             if(!fromMenu) {
                 foreground.setNamedColor(cfg.readEntry("foreground",""));
                 background.setNamedColor(cfg.readEntry("background",""));
             }
             fromMenu=FALSE;
             colorMenu->setItemChecked(-19,TRUE);
         }
 #endif
         for (i = 0; i < TABLE_COLORS; i++)  {
             if(i==0 || i == 10) {
                 m_table[i].color = foreground;
             }
             else if(i==1 || i == 11) {
                 m_table[i].color = background; m_table[i].transparent=0;
             }
             else
                 m_table[i].color = defaultCt[i].color;
         }
     }
     lastSelectedMenu = iD;
     te->setColorTable(m_table);
     update();
 
 }
 
 void Konsole::configMenuSelected(int iD)
 {
 //         QString temp;
 //         qDebug( temp.sprintf("configmenu %d",iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
+    int i,j;
+#ifdef QWS_QT_OPIE
+    i=-29;j=-30;
+#else
+    i=-28;j=-29;
+#endif
+
     if( iD  == -4) {
         cfg.setGroup("Tabs");
         QString tmp=cfg.readEntry("Position","Bottom");
 
         if(tmp=="Top") {
             tab->setTabPosition(QTabWidget::Bottom);
             configMenu->changeItem( iD,"Tabs on Top");
             cfg.writeEntry("Position","Bottom");
         } else {
             tab->setTabPosition(QTabWidget::Top);
             configMenu->changeItem( iD,"Tabs on Bottom");
             cfg.writeEntry("Position","Top");
         }
     }
-    int i;
-#ifdef QWS_QT_OPIE
-i=-29;
-#else
-i=-28;
-#endif
-
     if( iD  == i) {
     cfg.setGroup("ScrollBar");
           bool b=cfg.readBoolEntry("HorzScroll",0);
           b=!b;
           cfg.writeEntry("HorzScroll", b );
           cfg.write();
           doWrap();
           if(cfg.readNumEntry("Position",2) == 0) {
               te->setScrollbarLocation(1);
           } else {
               te->setScrollbarLocation(0);
           }
           te->setScrollbarLocation( cfg.readNumEntry("Position",2));
     }   
+      if(iD ==  j) {
+          cfg.setGroup("Menubar");
+          bool b=cfg.readBoolEntry("useBeep",0);
+          b=!b;
+          cfg.writeEntry("useBeep", b );
+          cfg.write();
+          configMenu->setItemChecked(j,b);
+          te->useBeep=b;
+      }
 }
 
 void Konsole::changeCommand(const QString &text, int c)
 {
     Config cfg("Konsole");
     cfg.setGroup("Commands");
     if(commonCmds[c] != text) {
         cfg.writeEntry(QString::number(c),text);
         commonCombo->clearEdit();
         commonCombo->setCurrentItem(c);
     }
 }
 
 void Konsole::setColor()
 {
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int scheme = cfg.readNumEntry("Schema",1);
     if(scheme != 1) colorMenuSelected( -scheme);
 }
 
 void Konsole::scrollMenuSelected(int index)
 {
     qDebug( "scrollbar menu %d",index);
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
     switch( index){
     case -25:
         te->setScrollbarLocation(0);
         cfg.writeEntry("Position",0);
         break;
     case -26:
         te->setScrollbarLocation(1);
         cfg.writeEntry("Position",1);
         break;
     case -27:
         te->setScrollbarLocation(2);
         cfg.writeEntry("Position",2);
         break;
 //       case -29: {
 //           bool b=cfg.readBoolEntry("HorzScroll",0);
 //           cfg.writeEntry("HorzScroll", !b );
 //           cfg.write();
 //           if(cfg.readNumEntry("Position",2) == 0) {
 //               te->setScrollbarLocation(1);
 //           te->setWrapAt(0);
 //           } else {
@@ -936,97 +949,96 @@ void Konsole::editCommandListMenuSelected(int iD)
     }
 
 }
 
 // $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V'
 void Konsole::setDocument( const QString &cmd) {
     newSession();
     TEWidget* te = getTe();
     if(cmd.find("-e", 0, TRUE) != -1) {
         QString cmd2;
         cmd2=cmd.right(cmd.length()-3)+" &";
         system(cmd2.latin1());
         if(startUp <= 1 && nsessions < 2) {
             doneSession(getTe()->currentSession, 0);
             exit(0);
         } else
             doneSession(getTe()->currentSession, 0);
     } else {
         if (te != 0) {
             te->emitText(cmd+"\r");
         }
     }
     startUp++;
 }
 
 void Konsole::parseCommandLine() {
     QString cmd;
       //    newSession();
     for (int i=1;i< qApp->argc();i++) {
         if( QString(qApp->argv()[i]) == "-e") {
             i++;
             for ( int j=i;j< qApp->argc();j++) {
                 cmd+=QString(qApp->argv()[j])+" ";
             }
             cmd.stripWhiteSpace();
             system(cmd.latin1());
             exit(0);//close();
         } // end -e switch
     }
     startUp++;
 }
 
 void Konsole::changeForegroundColor(const QColor &color) {
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     foreground.setRgb(r,g,b);
-//     QString colors;
-//     colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
+
     cfg.writeEntry("foreground",color.name());
+    qDebug("foreground "+color.name());
     cfg.write();
 
 qDebug("do other dialog");
 #ifdef QWS_QT_OPIE
 
  ColorPopupMenu* penColorPopupMenu2 = new ColorPopupMenu(Qt::black, this,"background color");
     connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
             SLOT(changeBackgroundColor(const QColor&)));
    penColorPopupMenu2->exec();
 #endif
 }
 
 void Konsole::changeBackgroundColor(const QColor &color) {
 
     qDebug("Change background");
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     background.setRgb(r,g,b);
-//     QString colors;
-//     colors.sprintf("%d,%d,%d"color.red,color.green,color.blue);
     cfg.writeEntry("background",color.name());
+    qDebug("background "+color.name());
     cfg.write();
 }
 
 void Konsole::doWrap() {
 int i;
 #ifdef QWS_QT_OPIE
 i=-29;
 #else
 i=-28;
 #endif
     
  Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
     TEWidget* te = getTe();
     if( !cfg.readBoolEntry("HorzScroll",0)) {
         te->setWrapAt(0);
         configMenu->setItemChecked( i,TRUE);
     } else {
-        te->setWrapAt(90);
-//        te->setWrapAt(120);
+//        te->setWrapAt(90);
+        te->setWrapAt(120);
         configMenu->setItemChecked( i,FALSE);
     }       
 }