[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/vimpart/src
From:       Mickael Marchand <marchand () kde ! org>
Date:       2003-06-14 16:02:10
[Download RAW message or body]

CVS commit by marchand: 

bug fixes :
- click focus in konqui
- titlestring in vimrc should hopefully no longer disturb the embedding


vimwidget.cpp vimwidget.h CVS:
----------------------------------------------------------------------


  M +1 -1      vimview.cpp   1.15
  M +8 -0      vimview.h   1.12
  M +2 -1      vimwidget.cpp   1.20
  M +6 -0      vimwidget.h   1.16


--- kdeextragear-1/vimpart/src/vimview.cpp  #1.14:1.15
@@ -45,5 +45,5 @@ namespace Vim 
                 setInstance ( VimPartFactory::instance() );
                 m_doc=doc;
-                setFocusPolicy(NoFocus);        
+                setFocusPolicy(StrongFocus);    
                 QVBoxLayout *v = new QVBoxLayout(this);
                 v->add(_vimWidget);

--- kdeextragear-1/vimpart/src/vimview.h  #1.11:1.12
@@ -28,4 +28,5 @@ Boston, MA 02111-1307, USA.
 #include <ktexteditor/dynwordwrapinterface.h>
 #include <vimwidget.h>
+#include <kdebug.h>
 
 class VimWidget;
@@ -50,4 +51,11 @@ namespace Vim {
         
   protected:    
+
+                void focusInEvent( QFocusEvent *e ) { kdDebug() << "View : FocusIN" \
<<endl; +                _vimWidget->setFocus(); }
+
+                void focusOutEvent( QFocusEvent *e ) { kdDebug()<< "View : FocusOUT" \
<< endl; +                _vimWidget->setFocus(); }
+
     void vimRealised();                 
 //              void keyPressEvent(QKeyEvent *e);

--- kdeextragear-1/vimpart/src/vimwidget.cpp  #1.19:1.20
@@ -42,4 +42,5 @@ VimWidget::VimWidget( QWidget * parent, 
   : QXEmbed( parent, name, f )
 {
+        setFocusPolicy(StrongFocus);    
         dcopcmd.setAutoDelete(true);
         _dying = false;
@@ -65,5 +66,5 @@ VimWidget::VimWidget( QWidget * parent, 
     kdDebug() << "kvimscript = " << kvimscript << endl;
 
-    _vimProcess << _vimExecutable << "-g" << "--cmd" << n << "--servername" << \
_serverName << "--cmd" << "source " + kvimscript; +    _vimProcess << _vimExecutable \
<< "-g" /*<< "-geometry" << "1000x1000" */<< "--cmd" << n << "-c" << n << \
"--servername" << _serverName << "--cmd" << "source " + kvimscript;  if (hideMenu)
       _vimProcess << "--cmd" << ":set guioptions-=m" << "-c" << ":set \
guioptions-=m";

--- kdeextragear-1/vimpart/src/vimwidget.h  #1.15:1.16
@@ -28,4 +28,5 @@
 #include <kwinmodule.h>
 #include "xvim.h"
+#include <kdebug.h>
 
 enum VDcop {
@@ -127,4 +128,9 @@ class VimWidget: public QXEmbed
 
         protected:
+                void focusInEvent( QFocusEvent *e ) { kdDebug() << "FocusIN" <<endl;
+                QXEmbed::focusInEvent( e ); }
+
+                void focusOutEvent( QFocusEvent *e ) { kdDebug()<< "FocusOUT" << \
endl; +                QXEmbed::focusOutEvent( e );}
 
                 //this is the real eval expr


[prev in list] [next in list] [prev in thread] [next in thread]