Yzis - Freehackers'labs

cursorKpart.patch

Patch to update KPart ot take advantage of Cursor callbacks. - Donald Curtis, 06/28/2008 02:46 AM

     #include <QPainter>
     KYCursor::KYCursor( KYEditor* parent, shape type )
             : QWidget( parent )
     #include "debug.h"
     #define deepdbg() yzDeepDebug("KYCursor")
     #define dbg() yzDebug("KYCursor")
     #define err() yzError("KYCursor")
     KYCursor::KYCursor( KYEditor* editor, YViewIface::CursorShape shape )
             : QWidget( editor )
+    {
     	mEditor = editor;
         move( 0, 0 );
         setCursorType( type );
         setCursorShape( shape );
+    }
     KYCursor::~KYCursor()
     {}
     KYCursor::shape KYCursor::type() const
     YViewIface::CursorShape KYCursor::shape() const
+    {
         return mCursorType;
         return mCursorShape;
+    }
     void KYCursor::setCursorType( shape type )
     void KYCursor::setCursorShape( YViewIface::CursorShape shape )
+    {
         if ( type == mCursorType )
         if ( shape == mCursorShape )
             return ;
         mCursorType = type;
         mCursorShape = shape;
         int w = parentWidget()->fontMetrics().maxWidth();
         int h = parentWidget()->fontMetrics().lineSpacing();
         if ( mCursorType == VBAR )
         if ( mCursorShape == YViewIface::CursorVbar )
             w = 2;
         resize( w, h );
+    }
     void KYCursor::paintEvent( QPaintEvent* )
+    {
         //const YDrawCell cell( mView->m_drawBuffer.at( mEdit->translateRealToPosition(pos()) ) );
     	const YDrawCell cell( mEditor->view()->getCursorDrawCell() );
         QColor cbg, cfg;
         deepdbg().SPrintf( "paintEvent(): cell string='%s'", qp(cell.c) );
         if (cell.bg.isValid()) {
             deepdbg() << "paintEvent(): valid cell bg" << endl;
             cbg = QColor(cell.bg.rgb());
             //cbg = QColor( Qt::red );
         } else {
             deepdbg() << "paintEvent(): invalid cell bg" << endl;
             cbg = parentWidget()->palette().color(QPalette::Window);
             //cbg = QColor(Qt::magenta);
+        }
         deepdbg() << "paintEvent(): cell background=" << cbg.name() << endl;
         if ( cell.fg.isValid() ) {
             deepdbg() << "paintEvent(): valid cell fg" << endl;
             cfg = QColor(cell.fg.rgb());
             //cfg = QColor(Qt::blue);
         } else {
             deepdbg() << "paintEvent(): invalid cell fg" << endl;
             cfg = parentWidget()->palette().color(QPalette::WindowText);
             //cfg = QColor(Qt::cyan);
+        }
         deepdbg() << "paintEvent(): cell foreground=" << cfg.name() << endl;
         QPainter p( this );
         QRect r = rect();
     	YViewIface::CursorShape s = shape();
         deepdbg() << "paintEvent(): shape=" << s << endl;
         switch ( s ) {
     		case YViewIface::CursorFilledRect :
             p.setPen( cbg );
             p.setBackground( cfg );
             // erase with cell foreground
             p.eraseRect( rect() );
             // paint character with cell background
             p.drawText( rect(), cell.c );
             break;
     #define GET_cell \
         KYView* yzview = static_cast<KYView*>( parentWidget()->parentWidget() ); \
         YDrawCell cell = yzview->getCursorDrawCell( )
     #define SET_pen \
         p.setPen( cell.bg.isValid() ? QColor( cell.bg.rgb() ) : parentWidget()->palette().window().color() );
     		case YViewIface::CursorFrameRect :
             p.setPen( cfg );
             p.setBackground( cbg );
             // erase with cell background
             p.eraseRect( r );
             // paint character with cell foreground
             p.drawText( r, cell.c );
         switch ( type() ) {
         case SQUARE : {
                 GET_cell;
                 SET_pen;
                 p.setBackground( cell.fg.isValid() ? QBrush( cell.fg.rgb() ) : parentWidget()->palette().windowText() );
                 p.eraseRect( rect() );
                 p.drawText( rect(), cell.c );
+            }
             // paint rect with cell foreground
             r.adjust(0, 0, -1, -1);
             p.drawRect( r );
             break;
         case RECT : {
                 GET_cell;
                 SET_pen;
                 p.drawRect( rect() );
+            }
     		case YViewIface::CursorVbar :
             r.setWidth( 2 );
             p.fillRect( r, QBrush(cfg) );
             break;
         case VBAR :
             p.fillRect( rect(), parentWidget()->palette().text() );
     		case YViewIface::CursorHbar:
             // erase with cell background
             p.eraseRect( r );
             // paint character with cell foreground
             p.drawText( r, cell.c );
             r.setTop( r.bottom() - 2 );
             p.fillRect( r, QBrush(cfg) );
             break;
         case HBAR :
             p.fillRect( rect(), parentWidget()->palette().text() );
             break;
     		case YViewIface::CursorHidden:
             // erase with cell background
             p.eraseRect( r );
             // paint character with cell foreground
             p.drawText( r, cell.c );
             return ;
+        }
+    }

     #ifndef _KY_CURSOR_H_
     #define _KY_CURSOR_H_
     #include "viewiface.h"
     #include <QPixmap>
     #include <QWidget>
-...
+    {
         Q_OBJECT
     public :
         enum shape {
             SQUARE,
             VBAR,
             HBAR,
             RECT,
         };
         KYCursor( KYEditor* parent, shape type );
         KYCursor( KYEditor* editor, YViewIface::CursorShape shape );
         virtual ~KYCursor();
         void setCursorType( shape type );
         shape type() const;
         void setCursorShape( YViewIface::CursorShape shape );
         YViewIface::CursorShape shape() const;
     protected :
         virtual void paintEvent( QPaintEvent* event );
     private :
         shape mCursorType;
         YViewIface::CursorShape mCursorShape;
         KYEditor *mEditor;
     };
     #endif

     #include <libyzis/buffer.h>
     #include <libyzis/action.h>
     KYEditor::KYEditor(KYView* parent)
             : QWidget(parent)
     KYEditor::KYEditor(KYView* view)
             : QWidget(view)
+    {
         mParent = parent;
         mView = view;
         setFocusPolicy( Qt::StrongFocus );
         mUseArea.setCoords( 0, 0, 0, 0 );
-...
         // for Input Method
         setAttribute( Qt::WA_InputMethodEnabled, true );
         mCursor = new KYCursor( this, KYCursor::SQUARE );
         mCursor = new KYCursor( this, YViewIface::CursorFilledRect );
         QTimer::singleShot(0, static_cast<KYSession*>(YSession::self()), SLOT(frontendGuiReady()) );
+    }
-...
         p.setColor( QPalette::Window, bg );
         QWidget::setPalette( p );
         setWindowOpacity( opacity );
+    }
     KYCursor::shape KYEditor::cursorShape()
+    {
         KYCursor::shape s;
         QString shape;
         YMode::ModeType m = mParent->modePool()->current()->modeType();
         switch ( m ) {
         case YMode::ModeInsert :
             shape = mParent->getLocalStringOption("cursorinsert");
             break;
         case YMode::ModeReplace :
             shape = mParent->getLocalStringOption("cursorreplace");
             break;
         case YMode::ModeCompletion :
             shape = "keep";
             break;
         default :
             shape = mParent->getLocalStringOption("cursor");
             break;
+        }
         if ( shape == "hbar" ) {
             s = KYCursor::HBAR;
         } else if ( shape == "vbar" ) {
             s = KYCursor::VBAR;
         } else if ( shape == "keep" ) {
             s = mCursor->type();
         } else {
             if ( hasFocus() )
                 s = KYCursor::SQUARE;
             else
                 s = KYCursor::RECT;
+        }
         return s;
+    }
     QPoint KYEditor::translatePositionToReal( const YCursor& c ) const
-...
     YCursor KYEditor::translateRealToAbsolutePosition( const QPoint& p, bool ceil ) const
+    {
         return translateRealToPosition( p, ceil ) + mParent->getScreenPosition();
+    }
     void KYEditor::updateCursor()
+    {
         mCursor->setCursorType( cursorShape() );
         mCursor->update();
         return translateRealToPosition( p, ceil ) + mView->getScreenPosition();
+    }
     void KYEditor::updateArea( )
+    {
         updateCursor();
         mCursor->update();
         int lines = height() / fontMetrics().lineSpacing();
         int columns = width() / fontMetrics().maxWidth();
         mUseArea.setBottomRight( QPoint( columns * fontMetrics().maxWidth(), lines * fontMetrics().lineSpacing()) );
         mParent->setVisibleArea( columns, lines );
         mView->setVisibleArea( columns, lines );
+    }
     /**
-...
             modifiers |= YKey::Mod_Ctrl;
         YKey key( YKey::Key_Invalid, modifiers );
         if ( !mParent->containsKey( e->key() ) ) {
         if ( !mView->containsKey( e->key() ) ) {
             if ( e->key() >= Qt::Key_A && e->key() <= Qt::Key_Z && modifiers & YKey::Mod_Ctrl )
                  key.setKey( QChar(e->key()).toLower() );
             else
                  key.setKey( e->text()[0] );
         } else {
             key.setKey( mParent->getKey( e->key() ) );
             key.setKey( mView->getKey( e->key() ) );
+        }
         KYSession::self()->sendKey(mParent, key );
         KYSession::self()->sendKey(mView, key );
         e->accept();
+    }
-...
         /*
         FIXME: How to handle mouse events commented out now so kyzis will compile
         if ( mParent->myBuffer()->introShown() ) {
          mParent->myBuffer()->clearIntro();
          mParent->gotodxdy( 0, 0 );
         if ( mView->myBuffer()->introShown() ) {
          mView->myBuffer()->clearIntro();
          mView->gotodxdy( 0, 0 );
          return;
+        }
         */
-...
         // leave visual mode if the user clicks somewhere
         // TODO: this should only be done if the left button is used. Right button
         // should extend visual selection, like in vim.
         if ( mParent->modePool()->current()->isSelMode() )
             mParent->modePool()->pop();
         if ( mView->modePool()->current()->isSelMode() )
             mView->modePool()->pop();
         if (( e->button() == Qt::LeftButton ) || ( e->button() == Qt::RightButton )) {
             if (mParent->modePool()->currentType() != YMode::ModeEx) {
                 mParent->gotodxdy( e->x() / ( fontMetrics().maxWidth() ) + mParent->getDrawCurrentLeft( ),
                                     e->y() / fontMetrics().lineSpacing() + mParent->getDrawCurrentTop( ) );
                 mParent->updateStickyCol();
             if (mView->modePool()->currentType() != YMode::ModeEx) {
                 mView->gotodxdy( e->x() / ( fontMetrics().maxWidth() ) + mView->getDrawCurrentLeft( ),
                                     e->y() / fontMetrics().lineSpacing() + mView->getDrawCurrentTop( ) );
                 mView->updateStickyCol();
+            }
         } else if ( e->button() == Qt::MidButton ) {
             QString text = KApplication::clipboard()->text( QClipboard::Selection );
-...
             if ( text.isNull() )
                 text = QApplication::clipboard()->text( QClipboard::Clipboard );
             if ( ! text.isNull() ) {
                 if ( mParent->modePool()->current()->isEditMode() ) {
                 if ( mView->modePool()->current()->isEditMode() ) {
                     QChar reg = '\"';
                     KYSession::self()->setRegister( reg, text.split( "\n" ) );
                     mParent->myBuffer()->action()->pasteContent( mParent, reg, false );
                     mParent->moveRight();
                     mView->myBuffer()->action()->pasteContent( mView, reg, false );
                     mView->moveRight();
+                }
+            }
+        }
-...
     void KYEditor::mouseMoveEvent( QMouseEvent *e )
+    {
         if (e->button() == Qt::LeftButton) {
             if (mParent->modePool()->currentType() == YMode::ModeCommand) {
             if (mView->modePool()->currentType() == YMode::ModeCommand) {
                 // start visual mode when user makes a selection with the left mouse button
                 mParent->modePool()->push( YMode::ModeVisual );
             } else if (mParent->modePool()->current()->isSelMode() ) {
                 mView->modePool()->push( YMode::ModeVisual );
             } else if (mView->modePool()->current()->isSelMode() ) {
                 // already in visual mode - move cursor if the mouse pointer has moved over a new char
                 int newX = e->x() / fontMetrics().maxWidth()
                            + mParent->getDrawCurrentLeft();
                            + mView->getDrawCurrentLeft();
                 int newY = e->y() / fontMetrics().lineSpacing()
                            + mParent->getDrawCurrentTop();
                            + mView->getDrawCurrentTop();
                 if (newX != mParent->getCursor().x() || newY != mParent->getCursor().y()) {
                     mParent->gotodxdy( newX, newY );
                 if (newX != mView->getCursor().x() || newY != mView->getCursor().y()) {
                     mView->gotodxdy( newX, newY );
+                }
+            }
+        }
-...
     void KYEditor::focusInEvent ( QFocusEvent * )
+    {
         KYSession::self()->setCurrentView( mParent );
         updateCursor();
         KYSession::self()->setCurrentView( mView );
         mCursor->update();
+    }
     void KYEditor::focusOutEvent ( QFocusEvent * )
+    {
         updateCursor();
         mCursor->update();
+    }
-...
     void KYEditor::paintEvent( QPaintEvent* pe )
+    {
         updateCursor();
         mCursor->update();
         // convert QPaintEvent rect to yzis coordinate
         QRect r = pe->rect();
-...
         //dbg() << "QYisEdit::paintEvent : " << pe->rect().topLeft() << "," << pe->rect().bottomRight() <<
         //                              " => " << r.topLeft() << "," << r.bottomRight() << endl;
         // paint it
         mParent->guiPaintEvent( mParent->clipSelection( YSelection( r ) ) );
         mView->guiPaintEvent( mView->clipSelection( YSelection( r ) ) );
+    }
     void KYEditor::setCursor( int c, int l )
+    {
         // yzDebug() << "setCursor" << endl;
         c = c - mParent->getDrawCurrentLeft();
         l -= mParent->getDrawCurrentTop();
         c = c - mView->getDrawCurrentLeft();
         l -= mView->getDrawCurrentTop();
         unsigned int x = c * fontMetrics().maxWidth();
         if ( mParent->getLocalBooleanOption( "rightleft" ) ) {
         if ( mView->getLocalBooleanOption( "rightleft" ) ) {
             x = width() - x - mCursor->width();
+        }
         mCursor->move( x, l * fontMetrics().lineSpacing() );
-...
         // need for InputMethod (OverTheSpot)
         // setMicroFocusHint( mCursor->x(), mCursor->y(), mCursor->width(), mCursor->height() );
+    }
     void KYEditor::setCursorShape( YViewIface::CursorShape cs )
+    {
     	mCursor->setCursorShape(cs);
+    }
     QPoint KYEditor::cursorCoordinates( )
-...
         cursorRect.moveTo( mCursor->pos() );
         update( cursorRect );
         QWidget::scroll( rx, ry, mUseArea );
+    }
     KYView * KYEditor::view() const
+    {
     	return mView;
+    }
     void KYEditor::guiDrawCell( QPoint pos, const YDrawCell& cell, QPainter* p )
-...
             r.setTopLeft( translatePositionToReal( YCursor(pos) ) );
             r.setRight( width() );
             r.setHeight( fontMetrics().lineSpacing() );
             int nb_char = mParent->getColumnsVisible() - pos.x();
             int nb_char = mView->getColumnsVisible() - pos.x();
             p->drawText( r, QString( nb_char, clearChar ) );
+        }
+    }
-...
     /*
     void KYEditor::imStartEvent( QIMEvent *e )
+    {
      if ( mParent->mParent->modePool()->current()->supportsInputMethod() ) {
       mParent->mParent->modePool()->current()->imBegin( mParent );
      if ( mView->mView->modePool()->current()->supportsInputMethod() ) {
       mView->mView->modePool()->current()->imBegin( mView );
+     }
      e->accept();
     }*/
-...
     /*
     void KYEditor::imComposeEvent( QIMEvent *e ) {
      //yzDebug() << "KYEditor::imComposeEvent text=" << e->text() << " len=" << e->selectionLength() << " pos=" << e->cursorPos() << endl;
      if ( mParent->mParent->modePool()->current()->supportsInputMethod() ) {
       mParent->mParent->modePool()->current()->imCompose( mParent, e->text() );
      if ( mView->mView->modePool()->current()->supportsInputMethod() ) {
       mView->mView->modePool()->current()->imCompose( mView, e->text() );
       e->accept();
      } else {
       e->ignore();
-...
     /*
     void KYEditor::imEndEvent( QIMEvent *e ) {
     // yzDebug() << "KYEditor::imEndEvent text=" << e->text() << " len=" << e->selectionLength() << " pos=" << e->cursorPos() << endl;
      if ( mParent->mParent->modePool()->current()->supportsInputMethod() ) {
       mParent->mParent->modePool()->current()->imEnd( mParent, e->text() );
      if ( mView->mView->modePool()->current()->supportsInputMethod() ) {
       mView->mView->modePool()->current()->imEnd( mView, e->text() );
      } else {
       mParent->sendKey( e->text() );
       mView->sendKey( e->text() );
+     }
      e->accept();
     }*/

         //append text
         void append ( const QString& );
         /**
          * move the cursor to the specificed column and line
+         *
          * @param c column number
          * @param l line number
          */
         void setCursor(int c, int l);
         /**
          * set the cursor shape
+         *
          * @param cs the new cursor shape
          */
         void setCursorShape( YViewIface::CursorShape cs );
         void scroll(int x, int y);
         /**
          * @return the view associated with this editor
          */
         KYView * view() const;
         KYCursor::shape cursorShape();
         void updateCursor();
         // update text area
         void updateArea( );
-...
     private :
         KYCursor* mCursor;
         KYView* mParent;
         KYView* mView;
         QRect mUseArea;
     };

b/kpart_yzis/kyview.cpp Fri Jun 27 16:47:07 2008 -0500
116	116	m_editor->setCursor( viewCursor().screenX(), viewCursor().screenY() );
117	117	}
118	118
	119	void KYView::guiCursorChanged( YViewIface::CursorShape cs )
	120	{
	121	m_editor->setCursorShape( cs );
	122	}
	123
119	124	void KYView::guiUpdateMode()
120	125	{
121		m_editor->updateCursor();
122	126	}
123	127
124	128	bool KYView::guiPopupFileSaveAs()

b/kpart_yzis/kyview.h Fri Jun 27 16:47:07 2008 -0500
54	54	virtual YStatusBarIface* guiStatusBar();
55	55	virtual void guiUpdateFileName();
56	56	virtual void guiUpdateCursor();
	57	virtual void guiCursorChanged( YViewIface::CursorShape cs );
57	58	virtual void guiUpdateMode();
58	59	virtual void guiHighlightingChanged();
59	60	virtual void guiNotifyContentChanged(const YSelection&);

b/qyzis/qyedit.cpp Fri Jun 27 16:47:07 2008 -0500
115	115	mCursor->setCursorShape( cs );
116	116	}
117	117
118		void QYEdit::updateCursor()
	118	void QYEdit::modeChanged()
119	119	{
120	120	mCursor->update();
121		}
122
123		void QYEdit::modeChanged()
124		{
125		updateCursor();
126	121	}
127	122
128	123	void QYEdit::updateArea( )
129	124	{
130	125	dbg() << "updatearea()" << endl;
131		updateCursor();
	126	mCursor->update();
132	127
133	128	dbg() << "updateArea(): fixedPitch = " << fontInfo().fixedPitch() << endl;
134	129	dbg() << "updateArea(): lineheight = " << fontMetrics().lineSpacing() << endl;
...	...
256	251	dbg() << "focusInEvent() for " << mView->myBuffer()->fileNameShort() << endl;
257	252	mView->setCursorShape( mPreviousCursorShape );
258	253	YSession::self()->setCurrentView( mView );
259		updateCursor();
	254	mCursor->update();
260	255	}
261	256	void QYEdit::focusOutEvent ( QFocusEvent * )
262	257	{
...	...
265	260	if(mPreviousCursorShape != YViewIface::CursorHidden) {
266	261	mView->setCursorShape( YViewIface::CursorFrameRect );
267	262	}
268		updateCursor();
	263	mCursor->update();
269	264	}
270	265
271	266	void QYEdit::resizeEvent(QResizeEvent* e)
...	...
276	271
277	272	void QYEdit::paintEvent( QPaintEvent* pe )
278	273	{
279		updateCursor();
	274	mCursor->update();
280	275	// convert QPaintEvent rect to yzis coordinate
281	276	QRect r = pe->rect();
282	277	r.setTopLeft( translateRealToAbsolutePosition( r.topLeft() ) );