[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#67708: help evaluating this patch?



Included is the patch the submitter sent (so we don't lose it since
there was only a url to it.)

Does someone who knows more about how fonts work have thoughts as to
whether or not this will break things for non-russians?  It looks ok
to me :

 - a similar change has already been made to icon/coolicon.c
 - I've applied it and played some with cooledit and I didn't notice
   anything funny.

I'd like to apply it and close the bug, but fonts are  rather voodo to
me.

Thanks,

David


diff -ur cooledit-3.14.0.orig/editor/cooledit.c cooledit-3.14.0/editor/cooledit.c
--- cooledit-3.14.0.orig/editor/cooledit.c	Thu May 25 03:22:51 2000
+++ cooledit-3.14.0/editor/cooledit.c	Thu May 25 03:26:02 2000
@@ -1901,7 +1901,7 @@
     char *example_fonts[] =
     {
 	"-misc-fixed-bold-r-normal--13-120-75-75-c-80",
-	"-adobe-courier-medium-r-normal--13-120-75-75-m-60",
+	"-*-courier-medium-r-normal--13-120-75-75-m-60",
 	"-*-times-medium-r-*--14-*-*-*-p-*",
 	"-*-helvetica-bold-r-*--14-*-*-*-p-*",
 	"-*-charter-bold-r-*--14-*-*-*-p-*",
diff -ur cooledit-3.14.0.orig/icon/coolbrowse.c cooledit-3.14.0/icon/coolbrowse.c
--- cooledit-3.14.0.orig/icon/coolbrowse.c	Thu May 25 03:22:51 2000
+++ cooledit-3.14.0/icon/coolbrowse.c	Thu May 25 03:26:30 2000
@@ -43,7 +43,7 @@
 char *option_display = 0;
 
 /* font from the command line */
-char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-iso8859-1";
+char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-*-*";
 
 static int get_help = 0;
 static int get_file = 0;
diff -ur cooledit-3.14.0.orig/icon/coolicon.c cooledit-3.14.0/icon/coolicon.c
--- cooledit-3.14.0.orig/icon/coolicon.c	Thu May 25 03:22:51 2000
+++ cooledit-3.14.0/icon/coolicon.c	Thu May 25 03:26:39 2000
@@ -86,7 +86,7 @@
 char *option_display = 0;
 
 /* font from the command line */
-char *option_font = "-*-helvetica-bold-r-*--12-*-*-*-p-*-iso8859-1";
+char *option_font = "-*-helvetica-bold-r-*--12-*-*-*-p-*-*-*";
 
 /* config file */
 char *current_config_file = 0;
diff -ur cooledit-3.14.0.orig/icon/coolinput.c cooledit-3.14.0/icon/coolinput.c
--- cooledit-3.14.0.orig/icon/coolinput.c	Thu May 25 03:22:51 2000
+++ cooledit-3.14.0/icon/coolinput.c	Thu May 25 03:26:48 2000
@@ -46,7 +46,7 @@
 char *option_display = 0;
 
 /* font from the command line */
-char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-iso8859-1";
+char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-*-*";
 
 static int get_help = 0;
 static int get_version = 0;
diff -ur cooledit-3.14.0.orig/icon/coollistbox.c cooledit-3.14.0/icon/coollistbox.c
--- cooledit-3.14.0.orig/icon/coollistbox.c	Thu May 25 03:22:51 2000
+++ cooledit-3.14.0/icon/coollistbox.c	Thu May 25 03:26:57 2000
@@ -52,7 +52,7 @@
 char *option_display = 0;
 
 /* font from the command line */
-char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-iso8859-1";
+char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-*-*";
 
 static int get_help = 0;
 static int print_error = 0;
diff -ur cooledit-3.14.0.orig/icon/coolmessage.c cooledit-3.14.0/icon/coolmessage.c
--- cooledit-3.14.0.orig/icon/coolmessage.c	Thu May 25 03:22:51 2000
+++ cooledit-3.14.0/icon/coolmessage.c	Thu May 25 03:27:06 2000
@@ -44,7 +44,7 @@
 char *option_display = 0;
 
 /* font from the command line */
-char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-iso8859-1";
+char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-*-*";
 
 static int get_help = 0;
 static int print_error = 0;
diff -ur cooledit-3.14.0.orig/icon/coolquery.c cooledit-3.14.0/icon/coolquery.c
--- cooledit-3.14.0.orig/icon/coolquery.c	Thu May 25 03:22:51 2000
+++ cooledit-3.14.0/icon/coolquery.c	Thu May 25 03:27:13 2000
@@ -44,7 +44,7 @@
 char *option_display = 0;
 
 /* font from the command line */
-char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-iso8859-1";
+char *option_font = "-*-helvetica-bold-r-*--14-*-*-*-p-*-*-*";
 
 static int get_help = 0;
 static int get_version = 0;
diff -ur cooledit-3.14.0.orig/widget/xim.c cooledit-3.14.0/widget/xim.c
--- cooledit-3.14.0.orig/widget/xim.c	Thu May 25 03:22:52 2000
+++ cooledit-3.14.0/widget/xim.c	Thu May 25 03:23:43 2000
@@ -238,7 +238,7 @@
 	    x_lat[len] = '\0';
 	}
     }
-    return valid_keysym ? keysym : 0;
+    return ((keysym >= 0x0100) && (keysym < 0x0800)) ? (valid_keysym ? kbuf[0] : 0) : (valid_keysym ? keysym : 0);
 }
 
 



Reply to: