More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / lyxlookup.C

diff --git a/src/lyxlookup.C b/src/lyxlookup.C
index aecd62b01980971efc86ef599d7d7c0e9d4decf0..16007c65522ce87cd8da2a757916408ec42ffc58 100644 (file)
--- a/src/lyxlookup.C
+++ b/src/lyxlookup.C
@@ -17,11 +17,9 @@
 #ifdef HAVE_XOPENIM
 // This part is the full blown Input Method manager for X11R5 and up.
 // For the plain-and-old-X11R4 version, see later.
-#include FORMS_H_LOCATION
-//#include <X11/Xlib.h>
-//#include <X11/Xutil.h>
-//#include <X11/keysym.h>
-#if FL_REVISION < 89
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
@@ -41,7 +39,11 @@ XComposeStatus compose_status= {0, 0};
 void InitLyXLookup(Display * display, Window window) 
 {
        xic = 0;
-       
+
+       lyxerr[Debug::KEY]
+                       << "InitLyXLookup: creating an input context."
+                       << endl;
+
        // This part could be done before opening display
        setlocale(LC_CTYPE, "");
                if (!XSupportsLocale()) {
@@ -180,12 +182,12 @@ int LyXLookupString(XEvent * event,
                result =  XmbLookupString(xic, &event->xkey, buffer_return,
                                       bytes_buffer, keysym_return,
                                       &status_return);
-               switch(status_return) {
+               switch (status_return) {
                case XBufferOverflow:
                        lyxerr[Debug::KEY] << "XBufferOverflow" << endl;
                        break;
                case XLookupBoth:
-                       lyxerr[Debug::KEY] << "XLookupBoth"
+                       lyxerr[Debug::KEY] << "XLookupBoth "
                                           << string(buffer_return, result)
                                           << endl;
                        break;
@@ -264,4 +266,3 @@ void CloseLyXLookup()
 
 #endif // HAVE_XOPENIM
 
-#endif