comparison src/frame.c @ 94933:75fb6b489ec6

Throughout the file, delete all USE_FONT_BACKEND conditionals. Don't check enable_font_backend. Delete all codes used only when USE_FONT_BACKEND is not defined. (x_set_font): Call x_new_font, not x_new_fontset2. (x_set_font_backend): Use FRAME_FONT macro to check if a font is already set for the frame.

94932:4ac20761f264

#include "buffer.h"
/* These help us bind and responding to switch-frame events.  */
#include "commands.h"
#include "keyboard.h"
#include "frame.h"
#ifdef HAVE_WINDOW_SYSTEM
#include "fontset.h"
#endif
#include "blockinput.h"
#include "termchar.h"
#include "termhooks.h"
#include "dispextern.h"
#include "window.h"
#ifdef MSDOS
#include "msdos.h"
#include "dosfns.h"
#endif


#ifdef HAVE_WINDOW_SYSTEM

#ifdef USE_FONT_BACKEND
#include "font.h"
#endif	/* USE_FONT_BACKEND */

/* The name we're using in resource queries.  Most often "emacs".  */

Lisp_Object Vx_resource_name;

Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list;
Lisp_Object Qtty_color_mode;
Lisp_Object Qtty, Qtty_type;

Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
#ifdef USE_FONT_BACKEND
Lisp_Object Qfont_backend;
#endif	/* USE_FONT_BACKEND */

Lisp_Object Qinhibit_face_set_after_frame_default;
Lisp_Object Qface_set_after_frame_default;

Lisp_Object Vterminal_frame;

#ifdef HAVE_WINDOW_SYSTEM
  f->want_fullscreen = FULLSCREEN_NONE;
#endif
  f->size_hint_flags = 0;
  f->win_gravity = 0;
#ifdef USE_FONT_BACKEND
  f->font_driver_list = NULL;
  f->font_data_list = NULL;
#endif	/* USE_FONT_BACKEND */

  root_window = make_window ();
  if (mini_p)
    {
      mini_window = make_window ();

     This function must be called before the window tree of the
     frame is deleted because windows contain dynamically allocated
     memory. */
  free_glyphs (f);

#ifdef USE_FONT_BACKEND
  /* Give chance to each font driver to free a frame specific data.  */
  font_update_drivers (f, Qnil);
#endif	/* USE_FONT_BACKEND */

  /* Mark all the windows that used to be on FRAME as deleted, and then
     remove the reference to them.  */
  delete_all_subwindows (XWINDOW (f->root_window));
  f->root_window = Qnil;

  {"line-spacing",		&Qline_spacing},
  {"left-fringe",		&Qleft_fringe},
  {"right-fringe",		&Qright_fringe},
  {"wait-for-wm",		&Qwait_for_wm},
  {"fullscreen",                &Qfullscreen},
#ifdef USE_FONT_BACKEND
  {"font-backend",		&Qfont_backend}
#endif	/* USE_FONT_BACKEND */
};

#ifdef HAVE_WINDOW_SYSTEM

extern Lisp_Object Qbox;

void
x_set_font (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
{
  Lisp_Object result;
  Lisp_Object fontset_name;
  Lisp_Object frame;
  int old_fontset = FRAME_FONTSET(f);

#ifdef USE_FONT_BACKEND
  if (enable_font_backend)
    {
      int fontset = -1;
      Lisp_Object font_object;

      /* ARG is a fontset name, a font name, or a font object.
	 In the last case, this function never fail.  */
      if (STRINGP (arg))
	{
	  fontset = fs_query_fontset (arg, 0);
	  if (fontset < 0)
	    font_object = font_open_by_name (f, SDATA (arg));
	  else if (fontset > 0)
	    {
	      Lisp_Object ascii_font = fontset_ascii (fontset);

	      font_object = font_open_by_name (f, SDATA (ascii_font));
	    }
	}
      else
	font_object = arg;

      if (fontset < 0 && ! NILP (font_object))
	fontset = new_fontset_from_font (font_object);

      if (fontset == 0)
	/* Refuse the default fontset.  */
	result = Qt;
      else if (NILP (font_object))
	result = Qnil;
      else
	result = x_new_fontset2 (f, fontset, font_object);
    }
  else
    {
#endif	/* USE_FONT_BACKEND */
  CHECK_STRING (arg);

  fontset_name = Fquery_fontset (arg, Qnil);

  BLOCK_INPUT;
  result = (STRINGP (fontset_name)
            ? x_new_fontset (f, fontset_name)
            : x_new_fontset (f, arg));
  UNBLOCK_INPUT;
#ifdef USE_FONT_BACKEND
    }
#endif

  if (EQ (result, Qnil))
    error ("Font `%s' is not defined", SDATA (arg));
  else if (EQ (result, Qt))
    error ("The default fontset can't be used for a frame font");
  else if (STRINGP (result))
    {
      set_default_ascii_font (result);
      if (STRINGP (fontset_name))
	{
	  /* Fontset names are built from ASCII font names, so the
	     names may be equal despite there was a change.  */
	  if (old_fontset == FRAME_FONTSET (f))
	    return;
	}
      store_frame_param (f, Qfont, result);

      if (!NILP (Fequal (result, oldval)))
        return;

      /* Recalculate toolbar height.  */
      f->n_tool_bar_rows = 0;
      /* Ensure we redraw it.  */
      clear_current_matrices (f);

      recompute_basic_faces (f);
    }
  else
    abort ();

  do_pending_window_change (0);

  /* Don't call `face-set-after-frame-default' when faces haven't been
     initialized yet.  This is the case when called from

      call1 (Qface_set_after_frame_default, frame);
    }
}


#ifdef USE_FONT_BACKEND
void
x_set_font_backend (f, new_value, old_value)
     struct frame *f;
     Lisp_Object new_value, old_value;
{

    }

  if (! NILP (old_value) && ! NILP (Fequal (old_value, new_value)))
    return;

  if (FRAME_FONT_OBJECT (f))
    free_all_realized_faces (Qnil);

  new_value = font_update_drivers (f, NILP (new_value) ? Qt : new_value);
  if (NILP (new_value))
    {

      font_update_drivers (f, old_value);
      error ("None of specified font backends are available");
    }
  store_frame_param (f, Qfont_backend, new_value);

  if (FRAME_FONT_OBJECT (f))
    {
      Lisp_Object frame;

      XSETFRAME (frame, f);
      x_set_font (f, Fframe_parameter (frame, Qfont), Qnil);
      ++face_change_count;
      ++windows_or_buffers_changed;
    }
}
#endif	/* USE_FONT_BACKEND */


void
x_set_fringe_width (f, new_value, old_value)
     struct frame *f;

94933:75fb6b489ec6

#include "buffer.h"
/* These help us bind and responding to switch-frame events.  */
#include "commands.h"
#include "keyboard.h"
#include "frame.h"
#include "blockinput.h"
#include "termchar.h"
#include "termhooks.h"
#include "dispextern.h"
#include "window.h"
#ifdef HAVE_WINDOW_SYSTEM
#include "font.h"
#include "fontset.h"
#endif
#ifdef MSDOS
#include "msdos.h"
#include "dosfns.h"
#endif


#ifdef HAVE_WINDOW_SYSTEM

/* The name we're using in resource queries.  Most often "emacs".  */

Lisp_Object Vx_resource_name;

Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list;
Lisp_Object Qtty_color_mode;
Lisp_Object Qtty, Qtty_type;

Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
Lisp_Object Qfont_backend;

Lisp_Object Qinhibit_face_set_after_frame_default;
Lisp_Object Qface_set_after_frame_default;

Lisp_Object Vterminal_frame;

#ifdef HAVE_WINDOW_SYSTEM
  f->want_fullscreen = FULLSCREEN_NONE;
#endif
  f->size_hint_flags = 0;
  f->win_gravity = 0;
  f->font_driver_list = NULL;
  f->font_data_list = NULL;

  root_window = make_window ();
  if (mini_p)
    {
      mini_window = make_window ();

     This function must be called before the window tree of the
     frame is deleted because windows contain dynamically allocated
     memory. */
  free_glyphs (f);

  /* Give chance to each font driver to free a frame specific data.  */
  font_update_drivers (f, Qnil);

  /* Mark all the windows that used to be on FRAME as deleted, and then
     remove the reference to them.  */
  delete_all_subwindows (XWINDOW (f->root_window));
  f->root_window = Qnil;

  {"line-spacing",		&Qline_spacing},
  {"left-fringe",		&Qleft_fringe},
  {"right-fringe",		&Qright_fringe},
  {"wait-for-wm",		&Qwait_for_wm},
  {"fullscreen",                &Qfullscreen},
  {"font-backend",		&Qfont_backend}
};

#ifdef HAVE_WINDOW_SYSTEM

extern Lisp_Object Qbox;

void
x_set_font (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
{
  Lisp_Object frame;
  int fontset = -1;
  Lisp_Object font_object;

  /* Set the frame parameter back to the old value because we mail
     fail to use ARG as the new parameter value.  */
  store_frame_param (f, Qfont, oldval);

  /* ARG is a fontset name, a font name, or a font object.
     In the last case, this function never fail.  */
  if (STRINGP (arg))
    {
      fontset = fs_query_fontset (arg, 0);
      if (fontset < 0)
	{
	  font_object = font_open_by_name (f, SDATA (arg));
	  if (NILP (font_object))
	    error ("Font `%s' is not defined", SDATA (arg));
	  arg = AREF (font_object, FONT_NAME_INDEX);
	}
      else if (fontset > 0)
	{
	  Lisp_Object ascii_font = fontset_ascii (fontset);

	  font_object = font_open_by_name (f, SDATA (ascii_font));
	  if (NILP (font_object))
	    error ("Font `%s' is not defined", SDATA (arg));
	  arg = fontset_name (fontset);
	}
      else
	error ("The default fontset can't be used for a frame font");
    }
  else if (FONT_OBJECT_P (arg))
    {
      font_object = arg;
      /* This is store the XLFD font name in the frame parameter for
	 backward compatiblity.  We should store the font-object
	 itself in the future.  */
      arg = AREF (font_object, FONT_NAME_INDEX);
    }
  else
    signal_error ("Invalid font", arg);

  if (! NILP (Fequal (font_object, oldval)))
    return;
  x_new_font (f, font_object, fontset);
  store_frame_param (f, Qfont, arg);
  /* Recalculate toolbar height.  */
  f->n_tool_bar_rows = 0;
  /* Ensure we redraw it.  */
  clear_current_matrices (f);

  recompute_basic_faces (f);

  do_pending_window_change (0);

  /* Don't call `face-set-after-frame-default' when faces haven't been
     initialized yet.  This is the case when called from

      call1 (Qface_set_after_frame_default, frame);
    }
}


void
x_set_font_backend (f, new_value, old_value)
     struct frame *f;
     Lisp_Object new_value, old_value;
{

    }

  if (! NILP (old_value) && ! NILP (Fequal (old_value, new_value)))
    return;

  if (FRAME_FONT (f))
    free_all_realized_faces (Qnil);

  new_value = font_update_drivers (f, NILP (new_value) ? Qt : new_value);
  if (NILP (new_value))
    {

      font_update_drivers (f, old_value);
      error ("None of specified font backends are available");
    }
  store_frame_param (f, Qfont_backend, new_value);

  if (FRAME_FONT (f))
    {
      Lisp_Object frame;

      XSETFRAME (frame, f);
      x_set_font (f, Fframe_parameter (frame, Qfont), Qnil);
      ++face_change_count;
      ++windows_or_buffers_changed;
    }
}


void
x_set_fringe_width (f, new_value, old_value)
     struct frame *f;