[Freeciv-Dev] Re: (PR#11468) client-xaw segfaulting

["Egor Vyscrebentsov" <evyscr@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=11468 >

On Sat, 11 Dec 2004 15:17:51 -0800
Egor Vyscrebentsov <evyscr@xxxxxxxxx> wrote:

EV> On Sat, 11 Dec 2004 12:11:08 -0800
EV> Christian Knoke <chrisk@xxxxxxxxx> wrote:
EV> 
EV> > On Sat, Dec 11, 2004 at 02:33:27AM -0800, Vijay Kiran Kamuju wrote:
EV> > > the civ client segfaults after i click connect to localhost.
EV> > (gdb) bt
EV> > #0  0x402d5ffd in free () from /lib/libc.so.6
EV> > #1  0x400ec4b3 in XtFree () from /usr/X11R6/lib/libXt.so.6
EV> > #2  0x400a7ce9 in _XawMultiSaveAsFile () from /usr/X11R6/lib/libXaw3d.so.6
EV> > #3  0x400a7388 in LayYYerror () from /usr/X11R6/lib/libXaw3d.so.6
EV> > #4  0x40111473 in XtSetSensitive () from /usr/X11R6/lib/libXt.so.6
EV> > #5  0x401119ad in XtSetValues () from /usr/X11R6/lib/libXt.so.6
EV> > #6  0x40096098 in _XawTextExecuteUpdate () from 
/usr/X11R6/lib/libXaw3d.so.6
EV> > #7  0x40111473 in XtSetSensitive () from /usr/X11R6/lib/libXt.so.6
EV> > #8  0x4011142f in XtSetSensitive () from /usr/X11R6/lib/libXt.so.6
EV> > #9  0x401119ad in XtSetValues () from /usr/X11R6/lib/libXt.so.6
EV> > #10 0x4012495c in XtVaSetValues () from /usr/X11R6/lib/libXt.so.6
EV> > #11 0x080f4246 in xaw_intl_string_width (w=0x8310160) at gui_stuff.c:402
EV> > #12 0x080f3017 in setup_widgets () at gui_main.c:681
EV> > #13 0x080f2545 in ui_main (argc=1, argv=0x0) at gui_main.c:432
EV> > #14 0x0804f7ff in main (argc=1, argv=0xbffff914) at civclient.c:330
EV>
EV> Well, Xaw3d client segfaults even before drawing something.
EV> It was broken at 01.12.2004 by i18n patch.
EV> However, Xaw client has no problems.
EV>
EV> I will play with text widgets today, hope to find the problem
EV> (Now, if i change asciiTextWidgetClass to textWidgetClass,
EV> i get same crash on Xaw client. Maybe, problem with text length 
functions...)

Ok, seems, xaw3d doesn't work with `international: True' attribute.
Attached patch fixes the problem on my machine.

I'm going to commit it ASAP.

Thanks, evyscr.

Index: client/gui-xaw/resources.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/resources.c,v
retrieving revision 1.5
diff -u -r1.5 resources.c
--- client/gui-xaw/resources.c  14 Nov 2002 09:15:01 -0000      1.5
+++ client/gui-xaw/resources.c  14 Dec 2004 23:25:40 -0000
@@ -25,6 +25,12 @@
 **************************************************************************/
 String fallback_resources[] = {
 #include <Freeciv.h>
+#if defined(HAVE_LIBXAW3D)
+"Freeciv*international: False",
+#else
+"Freeciv*international: True",
+"Freeciv*fontSet: -*-*-*-*-*--14-*",
+#endif
   /* Deliberate use of angle-brackets instead of double quotes, to
      support compilation from another dir.  Then we "-I." (see Makefile.am)
      to include the locally generated Freeciv.h in the compilation dir,
Index: data/Freeciv.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/Freeciv.in,v
retrieving revision 1.4
diff -u -r1.4 Freeciv.in
--- data/Freeciv.in     1 Dec 2004 18:56:53 -0000       1.4
+++ data/Freeciv.in     14 Dec 2004 23:25:41 -0000
@@ -14,8 +14,8 @@
 !Freeciv*server:                              localhost
 !Freeciv*metaserver:                          
http://meta.freeciv.org/metaserver/
 
-Freeciv*international: True
-Freeciv*fontSet: -*-*-*-*-*--14-*
+!Freeciv*international: True
+!Freeciv*fontSet: -*-*-*-*-*-*-14-*
 
 !
 ! Default colors, by widget type