Re: 1.1.2 and compose key

[Jean-Marc Lasgouttes]

>>>>> "Peter" == Peter Suetterlin <[EMAIL PROTECTED]> writes:

Peter>   Hi Jean-Marc, Jean-Marc Lasgouttes wrote:

>> Yes, but I do not learn from past errors :) Add a #define
>> HAVE_XOPENIM 1 in lyxlookup.C and recompile. This should fix the
>> problem. The source in cvs is correct now.

Peter> As Garst also found out: It does not compile: 

This has been fixed in cvs a few days ago by Lars. Since the code was
never used earlier, nobody noticed how broken it was... You can try to
apply the following patch (from cvs).

JMarc

Index: lyxlookup.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxlookup.C,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -r1.3 -r1.5
--- lyxlookup.C 1999/10/07 18:44:14     1.3
+++ lyxlookup.C 1999/11/15 12:01:37     1.5
@@ -1,12 +1,12 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich 
  *           Copyright 1995-1999 The LyX team.
  *
- * ======================================================*/
+ * ====================================================== */
 
 #include <config.h>
 
@@ -25,7 +25,7 @@
 
 static XIM xim;
 static XIC xic;
-XComposeStatus compose_status={0,0};
+XComposeStatus compose_status= {0, 0};
 
 // This is called after the main LyX window has been created
 void InitLyXLookup(Display* display, Window window) 
@@ -33,14 +33,14 @@
        xic = 0;
 
        // This part could be done before opening display
-       setlocale(LC_CTYPE,"");
+       setlocale(LC_CTYPE, "");
                if (!XSupportsLocale()) {
-               lyxerr.debug("InitLyXLookup: X does not support this locale.");
+               lyxerr.debug() << "InitLyXLookup: X does not support this locale." << 
+endl;
                return;
        } 
        if (!XSetLocaleModifiers("")) {
-               lyxerr.debug("InitLyXLookup: Could not set modifiers "
-                            "for this locale.");
+               lyxerr.debug() << "InitLyXLookup: Could not set modifiers "
+                       "for this locale." << endl;
                return;
        }
 
@@ -54,15 +54,15 @@
                            0);
                
                if (!xic) {
-                       lyxerr.debug("InitLyXLookup: could not create "
-                                    "an input context");
+                       lyxerr.debug() << "InitLyXLookup: could not create "
+                               "an input context" << endl;
                        XCloseIM (xim);
                        xim = 0;
                } 
        }
        else 
-               lyxerr.debug("InitLyXLookup: could not open "
-                            "an input method.");
+               lyxerr.debug() << "InitLyXLookup: could not open "
+                       "an input method." << endl;
 
 }
 
@@ -152,8 +152,8 @@
                         return 0;
                }
                if (event->type != KeyPress)
-                       lyxerr <<"LyXLookupString: wrong event type" 
-                                     +string(event->type));
+                       lyxerr << "LyXLookupString: wrong event type" 
+                              <<  event->type << endl;
                Status status_return;
                
                result =  XmbLookupString(xic, &event->xkey, buffer_return,
@@ -189,7 +189,8 @@
 void CloseLyXLookup() 
 {
        if (xic) {
-               lyxerr.debug("CloseLyXLookup: destroying input context");
+               lyxerr.debug() << "CloseLyXLookup: destroying input context"
+                              << endl;
                XDestroyIC(xic);
                XCloseIM(xim);
        }
@@ -201,7 +202,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-XComposeStatus compose_status={0,0};
+XComposeStatus compose_status= {0, 0};
 
 // This is called after the main LyX window has been created
 void InitLyXLookup(Display* , Window )