Dekels tabular/textinset patches

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index 100eb409d634ad0b1a9275c8ee8fff3d8459d6fb..c4fdd8c98929dae302c1640774ef300e6b614549 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -19,7 +19,9 @@
 
 #include "LyXView.h"
 #include "lyx_main.h"
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
+#endif
 #include "minibuffer.h"
 #include "lyxfunc.h"
 #include "debug.h"
@@ -35,7 +37,7 @@
 #include "frontends/Menubar.h"
 #include "MenuBackend.h"
 #include "ToolbarDefaults.h"
-#include "lyx_gui_misc.h"      // [update,Close]AllBufferRelatedDialogs
+#include "lyx_gui_misc.h"      // [update,Close,Redraw]AllBufferRelatedDialogs
 #include "bufferview_funcs.h" // CurrentState()
 
 using std::endl;
@@ -72,6 +74,8 @@ LyXView::LyXView(int width, int height)
                .connect(slot(&updateAllVisibleBufferRelatedDialogs));
        dialogs_->hideBufferDependent
                .connect(slot(&CloseAllBufferRelatedDialogs));
+       Dialogs::redrawGUI.connect(slot(this, &LyXView::redraw));
+       Dialogs::redrawGUI.connect(slot(&RedrawAllBufferRelatedDialogs));
 }
 
 
@@ -210,7 +214,9 @@ void LyXView::show(int place, int border, string const & title)
 {
        fl_show_form(form_, place, border, title.c_str());
        minibuffer->Init();
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
        InitLyXLookup(fl_get_display(), form_->window);
+#endif
 }
 
 
@@ -298,12 +304,6 @@ void LyXView::create_form_form_main(int width, int height)
 }
 
 
-#if 0
-extern "C"
-int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev);
-#endif
-
-
 void LyXView::init()
 {
        // Set the textclass choice
@@ -317,12 +317,6 @@ void LyXView::init()
                autosave_timeout.start();
        }
 
-#if 0
-       // Install the raw callback for keyboard events 
-       fl_register_raw_callback(form_,
-                                KeyPressMask,
-                                C_LyXView_KeyPressMask_raw_callback);
-#endif
         intl->InitKeyMapper(lyxrc.use_kbmap);
 }
 
@@ -362,71 +356,6 @@ void LyXView::updateLayoutChoice()
 }
 
 
-#if 0
-// This is necessary, since FL_FREE-Objects doesn't get all keypress events
-// as FL_KEYBOARD events :-(   Matthias 280596
-int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
-{
-       LyXView * view = static_cast<LyXView*>(fl->u_vdata);
-       int retval = 0;  // 0 means XForms should have a look at this event
-
-       XKeyEvent * xke = static_cast<XKeyEvent*>(xev);
-       static Time last_time_pressed = 0;
-       static Time last_time_released = 0;
-       static unsigned int last_key_pressed = 0;
-       static unsigned int last_key_released = 0;
-       static unsigned int last_state_pressed = 0;
-       static unsigned int last_state_released = 0;
-
-       // funny. Even though the raw_callback is registered with KeyPressMask,
-       // also KeyRelease-events are passed through:-(
-       // [It seems that XForms puts them in pairs... (JMarc)]
-       if (static_cast<XEvent*>(xev)->type == KeyPress
-           && view->bufferview->focus()
-           && view->bufferview->active())
-               {
-               last_time_pressed = xke->time;
-               last_key_pressed = xke->keycode;
-               last_state_pressed = xke->state;
-               retval = view->getLyXFunc()
-                       ->processKeyEvent(static_cast<XEvent*>(xev));
-       }
-       else if (static_cast<XEvent*>(xev)->type == KeyRelease
-                && view->bufferview->focus()
-                && view->bufferview->active())
-{
-               last_time_released = xke->time;
-               last_key_released = xke->keycode;
-               last_state_released = xke->state;
-       }
-
-       if (last_key_released == last_key_pressed
-           && last_state_released == last_state_pressed
-           && last_time_released == last_time_pressed) {
-               // When the diff between last_time_released and
-               // last_time_pressed is 0, that sinifies an autoreapeat
-               // at least on my system. It like some feedback from
-               // others, especially from user running LyX remote.
-               lyxerr[Debug::KEY] << "Syncing - purging X events." << endl;
-               XSync(fl_get_display(), 1);
-               // This purge make f.ex. scrolling stop imidiatly when
-               // releaseing the PageDown button. The question is if this
-               // purging of XEvents can cause any harm...after some testing
-               // I can see no problems, but I'd like other reports too.
-       }
-       return retval;
-}
-
-
-// wrapper for the above
-extern "C"
-int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
-{
-       return LyXView::KeyPressMask_raw_callback(fl, xev);
-}
-#endif
-
-
 // Updates the title of the window with the filename of the current document
 void LyXView::updateWindowTitle()
 {