comparison src/xterm.c @ 22907:43e290c6fb19

(x_list_fonts): Call XFreeFont after the new call to XLoadQueryFont. (fast_find_position): Handle case where position is before an invisible character, thus not actually listed in charstarts. (x_make_frame_visible): Use XGetGeometry to see if position has been changed by the window manager. Use FRAME_OUTER_WINDOW.

22906:adfc04c48002

	  return 1;
	}
      else if (charstarts[left + i] > pos)
	break;
      else if (charstarts[left + i] > 0)
	lastcol = left + i;
    }

  /* If we're looking for the end of the buffer,
     and we didn't find it in the line we scanned,
     use the start of the following line.  */

    original_top = f->output_data.x->top_pos;

    /* This must come after we set COUNT.  */
    UNBLOCK_INPUT;

    /* Arriving X events are processed here.  */

    /* Now move the window back to where it was "supposed to be".
       But don't do it if the gravity is negative.
       When the gravity is negative, this uses a position
       that is 3 pixels too low.  Perhaps that's really the border width.

    if (! FRAME_VISIBLE_P (f) && ! FRAME_ICONIFIED_P (f)
	&& f->output_data.x->win_gravity == NorthWestGravity
	&& previously_visible)
      {
	BLOCK_INPUT;

#ifdef USE_X_TOOLKIT
	XMoveWindow (FRAME_X_DISPLAY (f), XtWindow (f->output_data.x->widget),
		     original_left, original_top);
#else /* not USE_X_TOOLKIT */
	XMoveWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
		     original_left, original_top);
#endif /* not USE_X_TOOLKIT */
	UNBLOCK_INPUT;
      }

    XSETFRAME (frame, f);

	      bcopy (name, names[0], len + 1);
	      XFree (name);
	    }
	  else
	    try_XLoadQueryFont = 0;
	}

      if (!try_XLoadQueryFont)
	names = XListFonts (dpy, XSTRING (pattern)->data, maxnames,
			    &num_fonts);

22907:43e290c6fb19

	  return 1;
	}
      else if (charstarts[left + i] > pos)
	break;
      else if (charstarts[left + i] > 0)
	lastcol = left + i + 1;
    }

  /* If we're looking for the end of the buffer,
     and we didn't find it in the line we scanned,
     use the start of the following line.  */

    original_top = f->output_data.x->top_pos;

    /* This must come after we set COUNT.  */
    UNBLOCK_INPUT;

    /* We unblock here so that arriving X events are processed.  */

    /* Now move the window back to where it was "supposed to be".
       But don't do it if the gravity is negative.
       When the gravity is negative, this uses a position
       that is 3 pixels too low.  Perhaps that's really the border width.

    if (! FRAME_VISIBLE_P (f) && ! FRAME_ICONIFIED_P (f)
	&& f->output_data.x->win_gravity == NorthWestGravity
	&& previously_visible)
      {
	Drawable rootw;
	int x, y;
	unsigned int width, height, border, depth;

	BLOCK_INPUT;

	/* On some window managers (Such as FVWM) moving an existing window,
	   even to the same place, causes the window manager to introduce
	   an offset.  This can cause the window to move to an unexpected
	   location.  Check the geometry (A little slow here) and then verify
	   that the window is in the right place.  If the window is not in
	   the right place, move it there, and take the potential window
	   manager hit. */

	XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
		      &rootw, &x, &y, &width, &height, &border, &depth);

	if (original_left != x || original_top != y)
	  XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
		       original_left, original_top);

	UNBLOCK_INPUT;
      }

    XSETFRAME (frame, f);

	      bcopy (name, names[0], len + 1);
	      XFree (name);
	    }
	  else
	    try_XLoadQueryFont = 0;
	  XFreeFont (font);
	}

      if (!try_XLoadQueryFont)
	names = XListFonts (dpy, XSTRING (pattern)->data, maxnames,
			    &num_fonts);