xutf8 files code conformance:

    o C files containing C++ "//" comments -> C style "/* */" comments
    o Converted unintended doxygen style comments to regular C comments
    o FLTK brace/indent coding standard conformance
    o Tested linux + sgi
    o Avoided mods to xutf8/lcUniConv [libiconv/FSF code]
      to avoid unwanted diffs with future updates of that lib
      as per Fabien's fltk.dev request 03/14/09.
      (Those files already compliant anyway)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6698 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 138 insertions, 147 deletions

diff --git a/src/xutf8/test2.c b/src/xutf8/test2.c
index 8f0407ffa..2d985b64e 100644
--- a/src/xutf8/test2.c
+++ b/src/xutf8/test2.c
@@ -26,7 +26,9 @@
 /*
  *   UTF-8 X test program
  *
-To test it do :
+ *****************
+ * To test it do :
+ *****************
 
 kinput2 -canna
 XMODIFIERS="@im=kinput2"; export XMODIFIERS
@@ -68,9 +70,9 @@ export LD_PRELOAD="/usr/src/x11/xc/exports/lib/libX11.so /usr/src/x11/xc/exports
 #include <X11/Xmd.h>
 
 char *jp_txt = "é  UTF-8 e\xCC\x82=\xC3\xAA"
-		"  \357\274\270\357\274\254\357\274\246\357\274"
-		"\244\345\220\215\343\201\247\346\214\207    \345\256\232"
-		"\343\201\231\343\202\213";
+	       "  \357\274\270\357\274\254\357\274\246\357\274"
+	       "\244\345\220\215\343\201\247\346\214\207    \345\256\232"
+	       "\343\201\231\343\202\213";
 
 char *rtl_txt = "->e\xCC\x82=\xC3\xAA";
 
@@ -82,149 +84,138 @@ GC gc;
 int x = 2;
 int y = 40;
 
-int main(int argc, char**argv)
-{
-	char **missing_charset_list;
-	int missing_charset_count;
-	XGCValues xgcv;
-	unsigned long mask;
-	Display* dpy;
-	int scr;
-	Window w, root;
-	XSetWindowAttributes set_attr;
-	int i;
-	XIMStyle *style;
-        static char buf[128];
-        KeySym keysym = 0;
-        Status status;
-	XWMHints wm_hints;
-    	XClassHint class_hints;
-	XIMStyle input_style = 0;
-	char **font_name_list;
-	char *def_string;
-	XFontStruct **font_struct_list;
-	char **font_encoding_list;
-	int nb_font;
-	int len = 0;
-	int no_xim = 0;
-	char **missing_charset_list_return;
-	int missing_charset_count_return;
-	char *def_string_return;
-    	
-	if (!setlocale(LC_ALL, ""))
-        	puts("locale not supported by C library, locale unchanged");
-
-    	if (!XSetLocaleModifiers(""))
-        	puts("X locale modifiers not supported, using default");
-	
-	dpy = XOpenDisplay(0);
-	scr = DefaultScreen(dpy);
-	root = RootWindow(dpy, scr);
-	set_attr.event_mask = KeyPressMask|FocusChangeMask;
-	set_attr.background_pixel = WhitePixel(dpy, DefaultScreen(dpy));
-	set_attr.border_pixel = BlackPixel(dpy, DefaultScreen(dpy));
-	w = XCreateWindow(dpy, root, 10,10,200,100,0, 
-		DefaultDepth(dpy, DefaultScreen(dpy)),
-		InputOutput, DefaultVisual(dpy, DefaultScreen(dpy)),
-		CWEventMask | CWBackPixel | CWBorderPixel, &set_attr);
-
-	class_hints.res_name = "test";
-    	class_hints.res_class = "Test";
-	wm_hints.input = True;
-    	wm_hints.flags = InputHint;
-
-    	XmbSetWMProperties(dpy, w, "test", "test", NULL, 0,
-                       NULL, &wm_hints, &class_hints);
-
-	XMapWindow(dpy, w);
-	xim_im = XOpenIM(dpy, NULL, "test", "Test");
-	XGetIMValues (xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL);
-    	for (i = 0, style = xim_styles->supported_styles;
-         	i < xim_styles->count_styles; i++, style++)
-	{
-		if (*style == (XIMStatusNone|XIMPreeditNone)) {
-			printf("this is not a XIM server !!!\n");
-			no_xim = 1;
-		}
-        	printf("input style : 0x%X\n", *style);
-	}
-    	XFree(xim_styles);
-
-	xim_ic = XCreateIC(xim_im,
-                        XNInputStyle, (XIMPreeditNothing | XIMStatusNothing),
-                        XNClientWindow, w,
-			XNFocusWindow, w,
-                        NULL);
-	XSetICFocus(xim_ic);
-
-	/***************************************************************/
-	/** I don't recommand to use a font base name list similar 
-	 *  to the following one in a real application ;-) */
-	/***************************************************************/
-        fontset = XCreateFontSet(dpy, 
-		"-*-*-*-*-*-*-*-*-*-*-*-*-iso8858-3," /* not valid */
-		"-*-*-medium-r-*-*-*-*-*-*-*-*-iso8859-1,"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-6,"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-8,"
-		"-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific," 
-		"-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-2,"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1,"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-jisx0208.1983-0,"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-jisx0212.1990-0,"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-big5-0,"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-jisx0201.1976-0,"
-		"-*-unifont-*-*-*-*-*-*-*-*-*-*-iso10646-1[0x300 0x400_0x500],"
-		"-*-*-*-*-*-*-*-*-*-*-*-*-*-*",
-		&missing_charset_list_return,
-		&missing_charset_count_return,
-		&def_string_return); 
-	mask = (GCForeground | GCBackground);
-	xgcv.foreground = BlackPixel(dpy, DefaultScreen(dpy));
-    	xgcv.background = WhitePixel(dpy, DefaultScreen(dpy));
-
-        gc = XCreateGC(dpy, w, mask, &xgcv);
-
-
-	/***************************************************************/
-	while (1) {
-		int filtered;
-	 	static XEvent xevent;
-		static XVaNestedList list1 = 0;
-		int r;
-
-                XNextEvent(dpy, &xevent);
-		if (xevent.type == KeyPress) {
-			XKeyEvent *e = (XKeyEvent*) &xevent;
-			printf ("0x%X %d\n", e->state, e->keycode);
-		}
-		filtered = XFilterEvent(&xevent, w);
-		if (xevent.type == FocusOut) XUnsetICFocus(xim_ic);
-		if (xevent.type == FocusIn) XSetICFocus(xim_ic);
-	
-                if (xevent.type == KeyPress && !filtered) {
- 			len = Xutf8LookupString(xim_ic, &xevent.xkey, 
-					buf, 127, &keysym, &status);
-
-			Xutf8DrawImageString(dpy, w, fontset, gc, 
-					x, y, buf, len);
-
-
-			Xutf8DrawString(dpy, w, fontset, gc, 0, 20, 
-				jp_txt, strlen(jp_txt));
-	
-			Xutf8DrawString(dpy, w, fontset, gc, 50, 90,
-				rtl_txt, strlen(rtl_txt));
-			buf[len] = 0;
-			printf("'%s' %d\n", buf, keysym);
-			buf[0] = 0;
-			XCloseIM(xim_im);
-                }
-		if (filtered) {
-			printf("Dead key\n");
-		}
-	}
-	XFreeFontSet(dpy, fontset);
-	return 0;
+int main(int argc, char**argv) {
+  char **missing_charset_list;
+  int missing_charset_count;
+  XGCValues xgcv;
+  unsigned long mask;
+  Display* dpy;
+  int scr;
+  Window w, root;
+  XSetWindowAttributes set_attr;
+  int i;
+  XIMStyle *style;
+  static char buf[128];
+  KeySym keysym = 0;
+  Status status;
+  XWMHints wm_hints;
+  XClassHint class_hints;
+  XIMStyle input_style = 0;
+  char **font_name_list;
+  char *def_string;
+  XFontStruct **font_struct_list;
+  char **font_encoding_list;
+  int nb_font;
+  int len = 0;
+  int no_xim = 0;
+  char **missing_charset_list_return;
+  int missing_charset_count_return;
+  char *def_string_return;
+  
+  if (!setlocale(LC_ALL, ""))
+    puts("locale not supported by C library, locale unchanged");
+
+  if (!XSetLocaleModifiers(""))
+    puts("X locale modifiers not supported, using default");
+  
+  dpy = XOpenDisplay(0);
+  scr = DefaultScreen(dpy);
+  root = RootWindow(dpy, scr);
+  set_attr.event_mask = KeyPressMask|FocusChangeMask;
+  set_attr.background_pixel = WhitePixel(dpy, DefaultScreen(dpy));
+  set_attr.border_pixel = BlackPixel(dpy, DefaultScreen(dpy));
+  w = XCreateWindow(dpy, root, 10,10,200,100,0, 
+		    DefaultDepth(dpy, DefaultScreen(dpy)),
+		    InputOutput, DefaultVisual(dpy, DefaultScreen(dpy)),
+		    CWEventMask | CWBackPixel | CWBorderPixel, &set_attr);
+
+  class_hints.res_name = "test";
+  class_hints.res_class = "Test";
+  wm_hints.input = True;
+  wm_hints.flags = InputHint;
+
+  XmbSetWMProperties(dpy, w, "test", "test", NULL, 0,
+		     NULL, &wm_hints, &class_hints);
+
+  XMapWindow(dpy, w);
+  xim_im = XOpenIM(dpy, NULL, "test", "Test");
+  XGetIMValues(xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL);
+  for (i = 0, style = xim_styles->supported_styles;
+       i < xim_styles->count_styles; i++, style++) {
+    if (*style == (XIMStatusNone|XIMPreeditNone)) {
+      printf("this is not a XIM server !!!\n");
+      no_xim = 1;
+    }
+    printf("input style : 0x%X\n", *style);
+  }
+  XFree(xim_styles);
+
+  xim_ic = XCreateIC(xim_im,
+		     XNInputStyle, (XIMPreeditNothing | XIMStatusNothing),
+		     XNClientWindow, w,
+		     XNFocusWindow, w,
+		     NULL);
+  XSetICFocus(xim_ic);
+
+  /***************************************************************
+   *  I don't recommend to use a font base name list similar 
+   *  to the following one in a real application ;-)
+   ***************************************************************/
+  fontset = XCreateFontSet(dpy, 
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-iso8858-3," /* not valid */
+	  "-*-*-medium-r-*-*-*-*-*-*-*-*-iso8859-1,"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-6,"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-8,"
+	  "-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific," 
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-2,"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1,"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-jisx0208.1983-0,"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-jisx0212.1990-0,"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-big5-0,"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-jisx0201.1976-0,"
+	  "-*-unifont-*-*-*-*-*-*-*-*-*-*-iso10646-1[0x300 0x400_0x500],"
+	  "-*-*-*-*-*-*-*-*-*-*-*-*-*-*",
+	  &missing_charset_list_return,
+	  &missing_charset_count_return,
+	  &def_string_return); 
+  mask = (GCForeground | GCBackground);
+  xgcv.foreground = BlackPixel(dpy, DefaultScreen(dpy));
+  xgcv.background = WhitePixel(dpy, DefaultScreen(dpy));
+
+  gc = XCreateGC(dpy, w, mask, &xgcv);
+
+  /***************************************************************/
+  while (1) {
+    int filtered;
+    static XEvent xevent;
+    static XVaNestedList list1 = 0;
+    int r;
+
+    XNextEvent(dpy, &xevent);
+    if (xevent.type == KeyPress) {
+      XKeyEvent *e = (XKeyEvent*) &xevent;
+      printf ("0x%X %d\n", e->state, e->keycode);
+    }
+    filtered = XFilterEvent(&xevent, w);
+    if (xevent.type == FocusOut) XUnsetICFocus(xim_ic);
+    if (xevent.type == FocusIn) XSetICFocus(xim_ic);
+
+    if (xevent.type == KeyPress && !filtered) {
+      len = Xutf8LookupString(xim_ic, &xevent.xkey, buf, 127, &keysym, &status); 
+      Xutf8DrawImageString(dpy, w, fontset, gc, x, y, buf, len);
+      Xutf8DrawString(dpy, w, fontset, gc, 0, 20, jp_txt, strlen(jp_txt));
+      Xutf8DrawString(dpy, w, fontset, gc, 50, 90, rtl_txt, strlen(rtl_txt));
+      buf[len] = 0;
+      printf("'%s' %d\n", buf, keysym);
+      buf[0] = 0;
+      XCloseIM(xim_im);
+    }
+    if (filtered) {
+      printf("Dead key\n");
+    }
+  }
+  XFreeFontSet(dpy, fontset);
+  return 0;
 }
 
 /*