xemacs-beta: src/objects-x.c comparison

comparison src/objects-x.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	b2472a1930f2
children	182f72e8cd0d

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 #include "buffer.h"
 #include "device.h"
 #include "insdel.h"
-int handle_nonfull_spec_fonts;
+int x_handle_non_fully_specified_fonts;
 /************************************************************************/
 /*                          color instances                             */
 /************************************************************************/
 	     color matching with StaticColor visuals. */
 	  XColor *cells;
 	  /* JH: I can't believe there's no way to go backwards from a
 	     colormap ID and get its visual and number of entries, but X
 	     apparently isn't built that way... */
 	  int no_cells = visual->map_entries;
 	  int nearest;
 	  long nearest_delta, trial_delta;
 	  int x;
 	  cells = alloca_array (XColor, no_cells);
 	  for (x = 0; x < no_cells; x++)
 	    cells[x].pixel = x;
 	  /* read the current colormap */
 	  XQueryColors (display, colormap, cells, no_cells);
 	  nearest = 0;
 	  /* I'm assuming CSE so I'm not going to condense this. */
 	  nearest_delta = ((((color_def->red >> 8) - (cells[0].red >> 8))
 dpy = DEVICE_X_DISPLAY (d);
 xs = DefaultScreenOfDisplay (dpy);
 cmap = DEVICE_X_COLORMAP(d);
 visual = DEVICE_X_VISUAL (d);
-memset (color, 0, sizeof (*color));
+xzero (*color);
 {
 CONST Extbyte *extname;
 Extcount extnamelen;
 GET_CHARPTR_EXT_BINARY_DATA_ALLOCA (name, len, extname, extnamelen);
 return 0;
 /* Don't allocate the data until we're sure that we will succeed,
 or the finalize method may get fucked. */
 c->data = xnew (struct x_color_instance_data);
 if (result == 3)
 COLOR_INSTANCE_X_DEALLOC (c) = 0;
 else
 COLOR_INSTANCE_X_DEALLOC (c) = 1;
 COLOR_INSTANCE_X_COLOR (c) = color;
 return 1;
 {
 if (c->data)
 {
 if (DEVICE_LIVE_P (XDEVICE (c->device)))
 	{
 	  if (COLOR_INSTANCE_X_DEALLOC (c))
 	    {
 	      XFreeColors (DEVICE_X_DISPLAY (XDEVICE (c->device)), DEVICE_X_COLORMAP (XDEVICE (c->device)),
 			   &COLOR_INSTANCE_X_COLOR (c).pixel, 1, 0);
 	    }
 	}
 f->descent = xf->descent;
 f->height = xf->ascent + xf->descent;
 {
 /* following change suggested by Ted Phelps <phelps@dstc.edu.au> */
 unsigned int def_char = 'n'; /*xf->default_char;*/
-int byte1, byte2;
+unsigned int byte1, byte2;
 once_more:
 byte1 = def_char >> 8;
 byte2 = def_char & 0xFF;
 if (xf->per_char)
 {
 	/* Old versions of the R5 font server have garbage (>63k) as
 	   def_char. 'n' might not be a valid character. */
-	if (byte1 < xf->min_byte1 || byte1 > xf->max_byte1 ||
+	if (byte1 < xf->min_byte1         ||
-	    byte2 < xf->min_char_or_byte2 || byte2 > xf->max_char_or_byte2)
+	    byte1 > xf->max_byte1         ||
+	    byte2 < xf->min_char_or_byte2 ||
+	    byte2 > xf->max_char_or_byte2)
 	  f->width = 0;
 	else
 	  f->width = xf->per_char[(byte1 - xf->min_byte1) *
 				  (xf->max_char_or_byte2 -
 				   xf->min_char_or_byte2 + 1) +
 when using proportional width fonts if this flag is not set.
 Unfortunately so many of the fucking X fonts are not fully
 defined that we could almost just get rid of this damn flag and
 make it an assertion. */
 f->proportional_p = (xf->min_bounds.width != xf->max_bounds.width ||
-		       (handle_nonfull_spec_fonts &&
+		       (x_handle_non_fully_specified_fonts &&
 			!xf->all_chars_exist));
 return 1;
 }
 	FONT_INSTANCE_X_TRUENAME (f) =
 	  x_font_truename (dpy, name, FONT_INSTANCE_X_FONT (f));
 }
 if (NILP (FONT_INSTANCE_X_TRUENAME (f)))
 	{
-	  Lisp_Object font_instance = Qnil;
+	  Lisp_Object font_instance;
 	  XSETFONT_INSTANCE (font_instance, f);
 	  maybe_signal_simple_error ("couldn't determine font truename",
 				   font_instance, Qfont, errb);
 	  /* Ok, just this once, return the font name as the truename.
 }
 /* find a font spec that matches font spec FONT and also matches
 (the registry of) CHARSET. */
 static Lisp_Object
-x_find_charset_font (Lisp_Object device, Lisp_Object font,
+x_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset)
-		     Lisp_Object charset)
 {
 char **names;
 int count = 0;
 Lisp_Object result = Qnil;
 CONST char *patternext;
 GET_C_STRING_BINARY_DATA_ALLOCA (font, patternext);
 names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
 		      patternext, MAX_FONT_COUNT, &count);
+/* ### This code seems awfully bogus -- mrb */
 for (i = 0; i < count; i ++)
 {
-CONST char *intname;
+CONST Bufbyte *intname;
 GET_C_CHARPTR_INT_BINARY_DATA_ALLOCA (names[i], intname);
 if (x_font_spec_matches_charset (XDEVICE (device), charset,
-				       (unsigned char *) intname,
+				       intname, Qnil, 0, -1))
-				       Qnil, 0, -1))
 	{
-	  result = build_string (intname);
+	  result = build_string ((char *) intname);
 	  break;
 	}
 }
 if (names)
 }
 void
 vars_of_objects_x (void)
 {
-DEFVAR_BOOL ("x-handle-non-fully-specified-fonts",&handle_nonfull_spec_fonts /*
+DEFVAR_BOOL ("x-handle-non-fully-specified-fonts",
+	       &x_handle_non_fully_specified_fonts /*
 If this is true then fonts which do not have all characters specified
 will be considered to be proportional width even if they are actually
 fixed-width.  If this is not done then characters which are supposed to
 have 0 width may appear to actually have some width.
 Note:  While setting this to t guarantees correct output in all
 circumstances, it also causes a noticeable performance hit when using
 fixed-width fonts.  Since most people don't use characters which could
 cause problems this is set to nil by default.
 */ );
-handle_nonfull_spec_fonts = 0;
+x_handle_non_fully_specified_fonts = 0;
 }
 void
 Xatoms_of_objects_x (struct device *d)
 {

Mercurial > hg > xemacs-beta

comparison src/objects-x.c @ 272:c5d627a313b1 r21-0b34