comparison src/frame.c @ 83342:9216636c02fc

Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly. * src/termhooks.h (struct device): Rename to `struct device'. Rename member `next_display' to `next_device'. Rename member `delete_display_hook' to `delete_device_hook'. (FRAME_DISPLAY): Rename to FRAME_DEVICE. (DISPLAY_ACTIVE_P): Rename to DEVICE_ACTIVE_P. (DISPLAY_TERMINAL_CODING): Rename to DEVICE_TERMINAL_CODING. (DISPLAY_KEYBOARD_CODING): Rename to DEVICE_KEYBOARD_CODING. * src/frame.h (stuct frame): Rename `display' member to `device'. * src/xterm.h (x_display_info): Rename member `frame_display' to `device'. * src/termchar.h (struct tty_display_info): Rename `display' member to `device'. * src/keyboard.c (push_display_kboard): Rename to push_device_kboard. * lisp/frame.el (make-frame): Rename frame parameter `display-id' to `device'. * src/frame.c (Fmake_terminal_frame): Ditto. * src/xfns.c (Fx_create_frame): Ditto. * src/term.c (display_list): Rename to device_list. * src/term.c (initial_display): Rename to initial_device. * src/term.c (next_display_id): Rename to next_device_id. * src/term.c (get_display): Rename to get_device. * src/term.c (get_tty_display): Rename to get_tty_device. * src/term.c (get_named_tty_display): Rename to get_named_tty. * src/term.c (init_initial_display): Rename to init_initial_device. * src/term.c (delete_initial_display): Rename to delete_initial_device. * src/term.c (create_display): Rename to create_device. * src/term.c (delete_display): Rename to delete_device. * src/xfns.c (check_x_display_info): Document that the function allows display ids as well. * src/xterm.c (x_delete_frame_display): Rename to x_delete_device. * src/xterm.c (x_create_frame_display): Rename to x_create_device. * src/coding.c: Update. * src/dispextern.h: Update. * src/data.c: Update. * src/dispnew.c: Update. * src/frame.c: Update. * src/frame.h: Update. * src/keyboard.c: Update. * src/keyboard.h: Update. * src/lisp.h: Update. * src/sysdep.c: Update. * src/term.c: Update. * src/xdisp.c: Update. * src/xselect.c: Update. * src/xterm.c: Update. * src/prefix-args.c: Include stdlib.h for exit. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-382

83341:76e51706154e

Lisp_Object Qbackground_mode;
Lisp_Object Qinhibit_default_face_x_resources;

Lisp_Object Qx_frame_parameter;
Lisp_Object Qx_resource_name;
Lisp_Object Qdisplay_id;
Lisp_Object Qdisplay_live_p;

/* Frame parameters (set or reported).  */

Lisp_Object Qauto_raise, Qauto_lower;

  if (!NILP (mini_window))
    CHECK_LIVE_WINDOW (mini_window);

#ifdef MULTI_KBOARD
  if (!NILP (mini_window)
      && XFRAME (XWINDOW (mini_window)->frame)->display->kboard != kb)
    error ("Frame and minibuffer must be on the same display");
#endif

  /* Make a frame containing just a root window.  */
  f = make_frame (0);

struct frame *
make_initial_frame (void)
{
  struct frame *f;
  struct display *display;
  Lisp_Object frame;

#ifdef MULTI_KBOARD
  /* Create the initial keyboard. */
  if (!initial_kboard)

  /* The first call must initialize Vframe_list.  */
  if (! (NILP (Vframe_list) || CONSP (Vframe_list)))
    Vframe_list = Qnil;

  display = init_initial_display ();

  f = make_frame (1);
  XSETFRAME (frame, f);

  Vframe_list = Fcons (frame, Vframe_list);

  f->name = build_string ("F1");

  f->visible = 1;
  f->async_visible = 1;

  f->output_method = display->type;
  f->display = display;
  f->display->reference_count++;
  f->output_data.nothing = 0;
  
  FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
  FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
    

  return f;
}


struct frame *
make_terminal_frame (struct display *display)
{
  register struct frame *f;
  Lisp_Object frame;
  char name[20];
  

#ifdef MAC_OS8
  make_mac_terminal_frame (f);
#else
  {
    f->output_method = output_termcap;
    f->display = display;
    f->display->reference_count++;
    create_tty_output (f);
    
    FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
    FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
    

affects all frames on the same terminal device.  */)
     (parms)
     Lisp_Object parms;
{
  struct frame *f;
  struct display *d = NULL;
  Lisp_Object frame, tem;
  struct frame *sf = SELECTED_FRAME ();

#ifdef MSDOS
  if (sf->output_method != output_msdos_raw

#endif /* not MSDOS */
  
  {
    Lisp_Object display_device;

    display_device = Fassq (Qdisplay_id, parms);
    if (!NILP (display_device))
      {
        display_device = XCDR (display_device);
        CHECK_NUMBER (display_device);
        d = get_display (XINT (display_device), 1);
      }
  }
  
  if (!d)
    { 

The display device is represented by its integer identifier.  */)
  (frame)
     Lisp_Object frame;
{
  struct display *d;

  if (NILP (frame))
    frame = selected_frame;

  CHECK_LIVE_FRAME (frame);

  d = get_display (frame, 0);

  if (!d)
    return Qnil;
  else
    return make_number (d->id);

     an event for f at any time; if we zero out the frame's display
     now, then we may trip up the event-handling code.  Instead, we'll
     promise that the display of the frame must be valid until we have
     called the window-system-dependent frame destruction routine.  */

  if (FRAME_DISPLAY (f)->delete_frame_hook)
    (*FRAME_DISPLAY (f)->delete_frame_hook) (f);

  {
    struct display *display = FRAME_DISPLAY (f);
    f->output_data.nothing = 0; 
    f->display = 0;             /* Now the frame is dead. */

    /* If needed, delete the device that this frame was on.
       (This must be done after the frame is killed.) */
    display->reference_count--;
    if (display->reference_count == 0)
      {
        kb = NULL;
        if (display->delete_display_hook)
          (*display->delete_display_hook) (display);
        else
          delete_display (display);
      }
    else
      kb = display->kboard;
  }

  /* If we've deleted the last_nonminibuf_frame, then try to find
     another one.  */
  if (f == last_nonminibuf_frame)

  f = SELECTED_FRAME ();
  x = y = Qnil;

#ifdef HAVE_MOUSE
  /* It's okay for the hook to refrain from storing anything.  */
  if (FRAME_DISPLAY (f)->mouse_position_hook)
    (*FRAME_DISPLAY (f)->mouse_position_hook) (&f, -1,
                                              &lispy_dummy, &party_dummy,
                                              &x, &y,
                                              &long_dummy);
  if (! NILP (x))
    {

  f = SELECTED_FRAME ();
  x = y = Qnil;

#ifdef HAVE_MOUSE
  /* It's okay for the hook to refrain from storing anything.  */
  if (FRAME_DISPLAY (f)->mouse_position_hook)
    (*FRAME_DISPLAY (f)->mouse_position_hook) (&f, -1,
                                              &lispy_dummy, &party_dummy,
                                              &x, &y,
                                              &long_dummy);
#endif
  XSETFRAME (lispy_dummy, f);

  f = XFRAME (frame);
  
  /* Do like the documentation says. */
  Fmake_frame_visible (frame);

  if (FRAME_DISPLAY (f)->frame_raise_lower_hook)
    (*FRAME_DISPLAY (f)->frame_raise_lower_hook) (f, 1);

  return Qnil;
}

/* Should we have a corresponding function called Flower_Power?  */

  CHECK_LIVE_FRAME (frame);

  f = XFRAME (frame);
  
  if (FRAME_DISPLAY (f)->frame_raise_lower_hook)
    (*FRAME_DISPLAY (f)->frame_raise_lower_hook) (f, 0);

  return Qnil;
}



  f = XFRAME (frame);
  
  f->focus_frame = focus_frame;

  if (FRAME_DISPLAY (f)->frame_rehighlight_hook)
    (*FRAME_DISPLAY (f)->frame_rehighlight_hook) (f);

  return Qnil;
}

  staticpro (&Qx_resource_name);

  Qx_frame_parameter = intern ("x-frame-parameter");
  staticpro (&Qx_frame_parameter);

  Qdisplay_id = intern ("display-id");
  staticpro (&Qdisplay_id);
  Qdisplay_live_p = intern ("display-live-p");
  staticpro (&Qdisplay_live_p);
  
  {
    int i;

83342:9216636c02fc

Lisp_Object Qbackground_mode;
Lisp_Object Qinhibit_default_face_x_resources;

Lisp_Object Qx_frame_parameter;
Lisp_Object Qx_resource_name;
Lisp_Object Qdevice;
Lisp_Object Qdisplay_live_p;

/* Frame parameters (set or reported).  */

Lisp_Object Qauto_raise, Qauto_lower;

  if (!NILP (mini_window))
    CHECK_LIVE_WINDOW (mini_window);

#ifdef MULTI_KBOARD
  if (!NILP (mini_window)
      && XFRAME (XWINDOW (mini_window)->frame)->device->kboard != kb)
    error ("Frame and minibuffer must be on the same display");
#endif

  /* Make a frame containing just a root window.  */
  f = make_frame (0);

struct frame *
make_initial_frame (void)
{
  struct frame *f;
  struct device *device;
  Lisp_Object frame;

#ifdef MULTI_KBOARD
  /* Create the initial keyboard. */
  if (!initial_kboard)

  /* The first call must initialize Vframe_list.  */
  if (! (NILP (Vframe_list) || CONSP (Vframe_list)))
    Vframe_list = Qnil;

  device = init_initial_device ();

  f = make_frame (1);
  XSETFRAME (frame, f);

  Vframe_list = Fcons (frame, Vframe_list);

  f->name = build_string ("F1");

  f->visible = 1;
  f->async_visible = 1;

  f->output_method = device->type;
  f->device = device;
  f->device->reference_count++;
  f->output_data.nothing = 0;
  
  FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
  FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
    

  return f;
}


struct frame *
make_terminal_frame (struct device *device)
{
  register struct frame *f;
  Lisp_Object frame;
  char name[20];
  

#ifdef MAC_OS8
  make_mac_terminal_frame (f);
#else
  {
    f->output_method = output_termcap;
    f->device = device;
    f->device->reference_count++;
    create_tty_output (f);
    
    FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
    FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
    

affects all frames on the same terminal device.  */)
     (parms)
     Lisp_Object parms;
{
  struct frame *f;
  struct device *d = NULL;
  Lisp_Object frame, tem;
  struct frame *sf = SELECTED_FRAME ();

#ifdef MSDOS
  if (sf->output_method != output_msdos_raw

#endif /* not MSDOS */
  
  {
    Lisp_Object display_device;

    display_device = Fassq (Qdevice, parms);
    if (!NILP (display_device))
      {
        display_device = XCDR (display_device);
        CHECK_NUMBER (display_device);
        d = get_device (XINT (display_device), 1);
      }
  }
  
  if (!d)
    { 

The display device is represented by its integer identifier.  */)
  (frame)
     Lisp_Object frame;
{
  struct device *d;

  if (NILP (frame))
    frame = selected_frame;

  CHECK_LIVE_FRAME (frame);

  d = get_device (frame, 0);

  if (!d)
    return Qnil;
  else
    return make_number (d->id);

     an event for f at any time; if we zero out the frame's display
     now, then we may trip up the event-handling code.  Instead, we'll
     promise that the display of the frame must be valid until we have
     called the window-system-dependent frame destruction routine.  */

  if (FRAME_DEVICE (f)->delete_frame_hook)
    (*FRAME_DEVICE (f)->delete_frame_hook) (f);

  {
    struct device *device = FRAME_DEVICE (f);
    f->output_data.nothing = 0; 
    f->device = 0;             /* Now the frame is dead. */

    /* If needed, delete the device that this frame was on.
       (This must be done after the frame is killed.) */
    device->reference_count--;
    if (device->reference_count == 0)
      {
        kb = NULL;
        if (device->delete_device_hook)
          (*device->delete_device_hook) (device);
        else
          delete_device (device);
      }
    else
      kb = device->kboard;
  }

  /* If we've deleted the last_nonminibuf_frame, then try to find
     another one.  */
  if (f == last_nonminibuf_frame)

  f = SELECTED_FRAME ();
  x = y = Qnil;

#ifdef HAVE_MOUSE
  /* It's okay for the hook to refrain from storing anything.  */
  if (FRAME_DEVICE (f)->mouse_position_hook)
    (*FRAME_DEVICE (f)->mouse_position_hook) (&f, -1,
                                              &lispy_dummy, &party_dummy,
                                              &x, &y,
                                              &long_dummy);
  if (! NILP (x))
    {

  f = SELECTED_FRAME ();
  x = y = Qnil;

#ifdef HAVE_MOUSE
  /* It's okay for the hook to refrain from storing anything.  */
  if (FRAME_DEVICE (f)->mouse_position_hook)
    (*FRAME_DEVICE (f)->mouse_position_hook) (&f, -1,
                                              &lispy_dummy, &party_dummy,
                                              &x, &y,
                                              &long_dummy);
#endif
  XSETFRAME (lispy_dummy, f);

  f = XFRAME (frame);
  
  /* Do like the documentation says. */
  Fmake_frame_visible (frame);

  if (FRAME_DEVICE (f)->frame_raise_lower_hook)
    (*FRAME_DEVICE (f)->frame_raise_lower_hook) (f, 1);

  return Qnil;
}

/* Should we have a corresponding function called Flower_Power?  */

  CHECK_LIVE_FRAME (frame);

  f = XFRAME (frame);
  
  if (FRAME_DEVICE (f)->frame_raise_lower_hook)
    (*FRAME_DEVICE (f)->frame_raise_lower_hook) (f, 0);

  return Qnil;
}



  f = XFRAME (frame);
  
  f->focus_frame = focus_frame;

  if (FRAME_DEVICE (f)->frame_rehighlight_hook)
    (*FRAME_DEVICE (f)->frame_rehighlight_hook) (f);

  return Qnil;
}

  staticpro (&Qx_resource_name);

  Qx_frame_parameter = intern ("x-frame-parameter");
  staticpro (&Qx_frame_parameter);

  Qdevice = intern ("device");
  staticpro (&Qdevice);
  Qdisplay_live_p = intern ("display-live-p");
  staticpro (&Qdisplay_live_p);
  
  {
    int i;