Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / WorkArea.C

diff --git a/src/WorkArea.C b/src/WorkArea.C
index 85268e6d23e0aae9716e19bfc38615b03cd47323..33be3fd150aa0d667c1025a6721a849cab62aa18 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -18,11 +18,10 @@
 #include "WorkArea.h"
 #include "debug.h"
 #include "support/lstrings.h"
-#include "BufferView.h"
 #include "LyXView.h"
 #include "lyxfunc.h"
 
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 
@@ -34,12 +33,16 @@ FL_OBJECT * figinset_canvas;
 // This is at least true for g++.
 //using std::abs;
 
-static inline
+namespace {
+
+inline
 void waitForX()
 {
        XSync(fl_get_display(), 0);
 }
 
+} // anon namespace
+
 
 extern "C" {
 // Just a bunch of C wrappers around static members of WorkArea
@@ -58,9 +61,8 @@ extern "C" {
 }
 
 
-
-WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
-       : owner_(o), workareapixmap(0), painter_(*this)
+WorkArea::WorkArea(int xpos, int ypos, int width, int height)
+       : workareapixmap(0), painter_(*this)
 {
        fl_freeze_all_forms();
 
@@ -72,7 +74,7 @@ WorkArea::WorkArea(BufferView * o, int xpos, int ypos, int width, int height)
                       << width << 'x' << height << endl;
        //
        FL_OBJECT * obj;
-       const int bw = int(std::abs(float(fl_get_border_width())));
+       int const bw = int(std::abs(float(fl_get_border_width())));
 
        // We really want to get rid of figinset_canvas.
        ::figinset_canvas = figinset_canvas = obj =
@@ -169,7 +171,7 @@ void WorkArea::resize(int xpos, int ypos, int width, int height)
 {
        fl_freeze_all_forms();
        
-       const int bw = int(std::abs(float(fl_get_border_width())));
+       int const bw = int(std::abs(float(fl_get_border_width())));
 
        // a box
        fl_set_object_geometry(backgroundbox, xpos, ypos, width - 15, height);
@@ -261,7 +263,7 @@ void WorkArea::scroll_cb(FL_OBJECT * ob, long)
        // If we really want the accellerating scroll we can do that
        // from here. IMHO that is a waste of effort since we already
        // have other ways to move fast around in the document. (Lgb)
-       area->owner_->scrollCB(fl_get_scrollbar_value(ob));
+       area->scrollCB(fl_get_scrollbar_value(ob));
        waitForX();
 }
 
@@ -293,7 +295,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                Lgb_bug_find_hack = false;
                break;
        case FL_PUSH:
-               if (!ev) break;
+               if (!ev || ev->xbutton.button == 0) break;
                // Should really have used xbutton.state
                lyxerr[Debug::GUI] << "Workarea event: PUSH" << endl;
                area->workAreaButtonPress(ev->xbutton.x - ob->x,
@@ -302,7 +304,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                //area->workAreaKeyPress(XK_Pointer_Button1, ev->xbutton.state);
                break; 
        case FL_RELEASE:
-               if (!ev) break;
+               if (!ev || ev->xbutton.button == 0) break;
                // Should really have used xbutton.state
                lyxerr[Debug::GUI] << "Workarea event: RELEASE" << endl;
                area->workAreaButtonRelease(ev->xbutton.x - ob->x,
@@ -336,8 +338,8 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                KeySym keysym = 0;
                char dummy[1];
                XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
-#if FL_REVISION < 89
-               // XForms < 0.89 does not have compose support
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+               // XForms < 0.89.5 does not have compose support
                // so we are using our own compose support
                LyXLookupString(ev, dummy, 1, &keysym);
 #else
@@ -346,8 +348,8 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                if (lyxerr.debugging(Debug::KEY)) {
                        char const * tmp = XKeysymToString(key);
                        char const * tmp2 = XKeysymToString(keysym);
-                       string stm = (tmp ? tmp : "");
-                       string stm2 = (tmp2 ? tmp2 : "");
+                       string const stm = (tmp ? tmp : "");
+                       string const stm2 = (tmp2 ? tmp2 : "");
                        
                        lyxerr << "WorkArea: Key is `" << stm << "' ["
                               << key << "]" << endl;
@@ -372,22 +374,31 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                if (!key) {
                        // We migth have to add more keysyms here also,
                        // we will do that as the issues arise. (Lgb)
-                       if (keysym == XK_space)
+                       if (keysym == XK_space) {
                                ret_key = keysym;
-                       else
+                               lyxerr[Debug::KEY] << "Using keysym [A]"
+                                                  << endl;
+                       } else
                                break;
                } else {
                        // It seems that this was a bit optimistic...
                        // With this hacking things seems to be better (Lgb)
-                       if (static_cast<unsigned char>(key) == key
-                               && !iscntrl(key))
-                               ret_key = key;
-                       else
+                       //if (!iscntrl(key)) {
+                       //      ret_key = key;
+                       //      lyxerr[Debug::KEY]
+                       //              << "Using key [B]\n"
+                       //              << "Uchar["
+                       //              << static_cast<unsigned char>(key)
+                       //              << endl;
+                       //} else {
                                ret_key = (keysym ? keysym : key);
+                               lyxerr[Debug::KEY] << "Using keysym [B]"
+                                                  << endl;
+                               //}
                }
                
 #endif 
-               unsigned int ret_state = xke->state;
+               unsigned int const ret_state = xke->state;
 
                // If you have a better way to handle "wild-output" of
                // characters after the key has been released than the one
@@ -398,8 +409,8 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                lyxerr[Debug::KEY] << "Workarea Diff: "
                                   << xke->time - last_time_pressed
                                   << endl;
-               if (xke->time - last_time_pressed < 35 // should perhaps be tunable
-                   && xke->state == last_state_pressed
+               if (xke->time - last_time_pressed < 25 // should perhaps be tunable
+                   && ret_state == last_state_pressed
                    && xke->keycode == last_key_pressed) {
                        lyxerr[Debug::KEY]
                                << "Workarea: Purging X events." << endl;
@@ -417,7 +428,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
                }
                last_time_pressed = xke->time;
                last_key_pressed = xke->keycode;
-               last_state_pressed = xke->state;
+               last_state_pressed = ret_state;
                
                area->workAreaKeyPress(ret_key, ret_state);
        }
@@ -470,11 +481,12 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event,
 }
 
 
-static string clipboard_selection;
-static bool clipboard_read = false;
+namespace {
 
-extern "C" {
-       static
+string clipboard_selection;
+bool clipboard_read = false;
+
+extern "C"
 int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
                        void const * data, long size) 
 {
@@ -487,8 +499,8 @@ int request_clipboard_cb(FL_OBJECT * /*ob*/, long /*type*/,
        clipboard_read = true;
        return 0;
 }
-} // extern "C"
 
+} // namespace anon
 
 string const WorkArea::getClipboard() const 
 {