Extracted from 14281

* frontends/WorkArea:
  - processKeySym(): new method that should be used by all frontends
    instead of buffer_view_->workAreaKeyPress().
* frontends/qt4/GuiWorkArea:
  - keyPressEvent(): call WorkArea::processKeySym() instead of
    buffer_view_->workAreaKeyPress().
* frontends/gtk/GWorkArea.C:
* frontends/qt3/QContentPane.C:
  - call WorkArea::processKeySym() instead of
    buffer_view_->workAreaKeyPress()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14383 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/WorkArea.C b/src/frontends/WorkArea.C
index debf0005d97e8cbdd532675f62ee18ae70893d1e..c372fc3f8959a22a4026ffccec3ec383aefc30bf 100644 (file)
--- a/src/frontends/WorkArea.C
+++ b/src/frontends/WorkArea.C
@@ -188,6 +188,12 @@ void WorkArea::redraw()
 }
 
 
+void WorkArea::processKeySym(LyXKeySymPtr key, key_modifier::state state)
+{
+       buffer_view_->workAreaKeyPress(key, state);
+}
+
+
 void WorkArea::greyOut()
 {
        greyed_out_ = true;

diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index 083bd600dfe3132c604f6935bbc162d7fe6eabc5..9ae7c497a8177cb8806fe579029f1f60cd0c6120 100644 (file)
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -66,6 +66,9 @@ public:
        /// redraw the screen, without using existing pixmap
        virtual void redraw();
 
+       ///
+       void processKeySym(LyXKeySymPtr key, key_modifier::state state);
+
        /// grey out (no buffer)
        void greyOut();
 

diff --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C
index 19cad5cecffc4dedeb638b78f1669a1388dabafb..3d035f777efbcd4db0e32031f85ff3972b2e8920 100644 (file)
--- a/src/frontends/gtk/GWorkArea.C
+++ b/src/frontends/gtk/GWorkArea.C
@@ -27,6 +27,7 @@
 #include "debug.h"
 #include "funcrequest.h"
 #include "LColor.h"
+#include "WorkArea.h"
 
 using boost::shared_ptr;
 
@@ -432,7 +433,7 @@ bool GWorkArea::onButtonPress(GdkEventButton * event)
 
 bool GWorkArea::onButtonRelease(GdkEventButton * event)
 {
-        view_.view()->workAreaDispatch(FuncRequest(LFUN_MOUSE_RELEASE,
+       view_.view()->workAreaDispatch(FuncRequest(LFUN_MOUSE_RELEASE,
                             static_cast<int>(event->x),
                             static_cast<int>(event->y),
                             gButtonToLyx(event->button)));
@@ -481,8 +482,8 @@ bool GWorkArea::onKeyPress(GdkEventKey * event)
            !inputGet) {
 #endif
                GLyXKeySym *glk = new GLyXKeySym(event->keyval);
-               view_.view()->workAreaKeyPress(LyXKeySymPtr(glk),
-                                gtkKeyState(event->state));
+               view_.workArea()->processKeySym(LyXKeySymPtr(glk),
+                                           gtkKeyState(event->state));
 #ifdef I18N
        } else if (!inputCache_.empty())
                workAreaCJK_IMprocess(inputCache_.size(), inputCache_.data());

diff --git a/src/frontends/qt3/QContentPane.C b/src/frontends/qt3/QContentPane.C
index a244db3734be27427b21e8e9b01b3320b4312921..de4d955cf0fcdce1d705e386d6c74913e104bead 100644 (file)
--- a/src/frontends/qt3/QContentPane.C
+++ b/src/frontends/qt3/QContentPane.C
@@ -161,7 +161,7 @@ void QContentPane::generateSyntheticMouseEvent()
                synthetic_mouse_event_.scrollbar_value_old = scrollbar_value;
 
                // ... and dispatch the event to the LyX core.
-                wa_->view().view()->workAreaDispatch(synthetic_mouse_event_.cmd);
+               wa_->view().view()->workAreaDispatch(synthetic_mouse_event_.cmd);
        }
 }
 
@@ -169,7 +169,7 @@ void QContentPane::generateSyntheticMouseEvent()
 void QContentPane::scrollBarChanged(int val)
 {
        if (track_scrollbar_)
-                wa_->view().view()->scrollDocView(val);
+               wa_->view().view()->scrollDocView(val);
 }
 
 
@@ -180,13 +180,13 @@ void QContentPane::mousePressEvent(QMouseEvent * e)
                FuncRequest cmd(LFUN_MOUSE_TRIPLE,
                        dc_event_.x, dc_event_.y,
                        q_button_state(dc_event_.state));
-                wa_->view().view()->workAreaDispatch(cmd);
+               wa_->view().view()->workAreaDispatch(cmd);
                return;
        }
 
        FuncRequest const cmd(LFUN_MOUSE_PRESS, e->x(), e->y(),
                              q_button_state(e->button()));
-        wa_->view().view()->workAreaDispatch(cmd);
+       wa_->view().view()->workAreaDispatch(cmd);
 }
 
 
@@ -197,7 +197,7 @@ void QContentPane::mouseReleaseEvent(QMouseEvent * e)
 
        FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
                              q_button_state(e->button()));
-        wa_->view().view()->workAreaDispatch(cmd);
+       wa_->view().view()->workAreaDispatch(cmd);
 }
 
 
@@ -257,7 +257,7 @@ void QContentPane::mouseMoveEvent(QMouseEvent * e)
                synthetic_mouse_event_.scrollbar_value_old = scrollbar_value;
 
                // ... and dispatch the event to the LyX core.
-                wa_->view().view()->workAreaDispatch(cmd);
+               wa_->view().view()->workAreaDispatch(cmd);
        }
 }
 
@@ -295,7 +295,7 @@ void QContentPane::keyeventTimeout()
        boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
                sym->set(ev.get());
 
-                wa_->view().view()->workAreaKeyPress(sym, q_key_state(ev->state()));
+               wa_->processKeySym(sym, q_key_state(ev->state()));
                keyeventQueue_.pop();
 
                handle_autos = false;
@@ -316,7 +316,7 @@ void QContentPane::doubleClickTimeout()
        FuncRequest cmd(LFUN_MOUSE_DOUBLE,
                dc_event_.x, dc_event_.y,
                q_button_state(dc_event_.state));
-        wa_->view().view()->workAreaDispatch(cmd);
+       wa_->view().view()->workAreaDispatch(cmd);
 }
 
 

diff --git a/src/frontends/qt4/GuiWorkArea.C b/src/frontends/qt4/GuiWorkArea.C
index 7c187cb9dcad67d091e2a446f3758372094af6af..bb7a4e72bf2e4b452b5ce071ca8105952c260d37 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.C
+++ b/src/frontends/qt4/GuiWorkArea.C
@@ -370,7 +370,7 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * e)
        else {
                boost::shared_ptr<QLyXKeySym> sym(new QLyXKeySym);
                sym->set(e);
-               buffer_view_->workAreaKeyPress(sym, q_key_state(e->state()));
+               processKeySym(sym, q_key_state(e->state()));
        }
 }
 
@@ -400,7 +400,7 @@ void GuiWorkArea::keyeventTimeout()
                                   << " key=" << ev->key()
                                   << endl;
 
-               buffer_view_->workAreaKeyPress(sym, q_key_state(ev->state()));
+               processKeySym(sym, q_key_state(ev->state()));
                keyeventQueue_.pop();
 
                handle_autos = false;