[Emacs-diffs] Changes to emacs/src/frame.c

[Juanma Barranquero]

Index: emacs/src/frame.c
diff -c emacs/src/frame.c:1.290 emacs/src/frame.c:1.291
*** emacs/src/frame.c:1.290     Wed Oct  2 04:28:17 2002
--- emacs/src/frame.c   Tue Feb  4 09:03:12 2003
***************
*** 92,98 ****
    XSETFASTINT (w->last_modified, 0);
    XSETFASTINT (w->top, XFASTINT (w->top) + n);
    XSETFASTINT (w->height, XFASTINT (w->height) - n);
!   
    if (INTEGERP (w->orig_top))
      XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n);
    if (INTEGERP (w->orig_height))
--- 92,98 ----
    XSETFASTINT (w->last_modified, 0);
    XSETFASTINT (w->top, XFASTINT (w->top) + n);
    XSETFASTINT (w->height, XFASTINT (w->height) - n);
! 
    if (INTEGERP (w->orig_top))
      XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n);
    if (INTEGERP (w->orig_height))
***************
*** 367,373 ****
            call1 (intern ("make-initial-minibuffer-frame"), display);
            UNGCPRO;
        }
!    
        mini_window = XFRAME (kb->Vdefault_minibuffer_frame)->minibuffer_window;
      }
  
--- 367,373 ----
            call1 (intern ("make-initial-minibuffer-frame"), display);
            UNGCPRO;
        }
! 
        mini_window = XFRAME (kb->Vdefault_minibuffer_frame)->minibuffer_window;
      }
  
***************
*** 576,582 ****
       int track, for_deletion;
  {
    struct frame *sf = SELECTED_FRAME ();
!   
    /* If FRAME is a switch-frame event, extract the frame we should
       switch to.  */
    if (CONSP (frame)
--- 576,582 ----
       int track, for_deletion;
  {
    struct frame *sf = SELECTED_FRAME ();
! 
    /* If FRAME is a switch-frame event, extract the frame we should
       switch to.  */
    if (CONSP (frame)
***************
*** 774,780 ****
       Lisp_Object frame;
  {
    Lisp_Object window;
!   
    if (NILP (frame))
      window = SELECTED_FRAME ()->root_window;
    else
--- 774,780 ----
       Lisp_Object frame;
  {
    Lisp_Object window;
! 
    if (NILP (frame))
      window = SELECTED_FRAME ()->root_window;
    else
***************
*** 782,788 ****
        CHECK_LIVE_FRAME (frame);
        window = XFRAME (frame)->root_window;
      }
!   
    return window;
  }
  
--- 782,788 ----
        CHECK_LIVE_FRAME (frame);
        window = XFRAME (frame)->root_window;
      }
! 
    return window;
  }
  
***************
*** 794,800 ****
       Lisp_Object frame;
  {
    Lisp_Object window;
!   
    if (NILP (frame))
      window = SELECTED_FRAME ()->selected_window;
    else
--- 794,800 ----
       Lisp_Object frame;
  {
    Lisp_Object window;
! 
    if (NILP (frame))
      window = SELECTED_FRAME ()->selected_window;
    else
***************
*** 816,822 ****
  {
    if (NILP (frame))
      frame = selected_frame;
!   
    CHECK_LIVE_FRAME (frame);
    CHECK_LIVE_WINDOW (window);
  
--- 816,822 ----
  {
    if (NILP (frame))
      frame = selected_frame;
! 
    CHECK_LIVE_FRAME (frame);
    CHECK_LIVE_WINDOW (window);
  
***************
*** 1016,1022 ****
  {
    if (NILP (frame))
      frame = selected_frame;
!   
    CHECK_LIVE_FRAME (frame);
    return next_frame (frame, miniframe);
  }
--- 1016,1022 ----
  {
    if (NILP (frame))
      frame = selected_frame;
! 
    CHECK_LIVE_FRAME (frame);
    return next_frame (frame, miniframe);
  }
***************
*** 1211,1218 ****
      x_clear_frame_selections (f);
  #endif
  
!   /* Free glyphs. 
!      This function must be called before the window tree of the 
       frame is deleted because windows contain dynamically allocated
       memory. */
    free_glyphs (f);
--- 1211,1218 ----
      x_clear_frame_selections (f);
  #endif
  
!   /* Free glyphs.
!      This function must be called before the window tree of the
       frame is deleted because windows contain dynamically allocated
       memory. */
    free_glyphs (f);
***************
*** 1592,1598 ****
  {
    if (NILP (frame))
      frame = selected_frame;
!   
    CHECK_LIVE_FRAME (frame);
  
  #if 0 /* This isn't logically necessary, and it can do GC.  */
--- 1592,1598 ----
  {
    if (NILP (frame))
      frame = selected_frame;
! 
    CHECK_LIVE_FRAME (frame);
  
  #if 0 /* This isn't logically necessary, and it can do GC.  */
***************
*** 1701,1707 ****
      frame = selected_frame;
  
    CHECK_LIVE_FRAME (frame);
!   
    if (frame_raise_lower_hook)
      (*frame_raise_lower_hook) (XFRAME (frame), 0);
  
--- 1701,1707 ----
      frame = selected_frame;
  
    CHECK_LIVE_FRAME (frame);
! 
    if (frame_raise_lower_hook)
      (*frame_raise_lower_hook) (XFRAME (frame), 0);
  
***************
*** 1749,1755 ****
  
    if (frame_rehighlight_hook)
      (*frame_rehighlight_hook) (XFRAME (frame));
!   
    return Qnil;
  }
  
--- 1749,1755 ----
  
    if (frame_rehighlight_hook)
      (*frame_rehighlight_hook) (XFRAME (frame));
! 
    return Qnil;
  }
  
***************
*** 1949,1955 ****
  
    /* Update some other special parameters in their special places
       in addition to the alist.  */
!   
    if (EQ (prop, Qbuffer_predicate))
      f->buffer_predicate = val;
  
--- 1949,1955 ----
  
    /* Update some other special parameters in their special places
       in addition to the alist.  */
! 
    if (EQ (prop, Qbuffer_predicate))
      f->buffer_predicate = val;
  
***************
*** 1999,2005 ****
  
    alist = Fcopy_alist (f->param_alist);
    GCPRO1 (alist);
!   
    if (!FRAME_WINDOW_P (f))
      {
        int fg = FRAME_FOREGROUND_PIXEL (f);
--- 1999,2005 ----
  
    alist = Fcopy_alist (f->param_alist);
    GCPRO1 (alist);
! 
    if (!FRAME_WINDOW_P (f))
      {
        int fg = FRAME_FOREGROUND_PIXEL (f);
***************
*** 2088,2097 ****
    else
      CHECK_FRAME (frame);
    CHECK_SYMBOL (parameter);
!   
    f = XFRAME (frame);
    value = Qnil;
!   
    if (FRAME_LIVE_P (f))
      {
        /* Avoid consing in frequent cases.  */
--- 2088,2097 ----
    else
      CHECK_FRAME (frame);
    CHECK_SYMBOL (parameter);
! 
    f = XFRAME (frame);
    value = Qnil;
! 
    if (FRAME_LIVE_P (f))
      {
        /* Avoid consing in frequent cases.  */
***************
*** 2146,2157 ****
        else
        value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
      }
!   
    return value;
  }
  
  
! DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, 
         Smodify_frame_parameters, 2, 2, 0,
         doc: /* Modify the parameters of frame FRAME according to ALIST.
  If FRAME is nil, it defaults to the selected frame.
--- 2146,2157 ----
        else
        value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
      }
! 
    return value;
  }
  
  
! DEFUN ("modify-frame-parameters", Fmodify_frame_parameters,
         Smodify_frame_parameters, 2, 2, 0,
         doc: /* Modify the parameters of frame FRAME according to ALIST.
  If FRAME is nil, it defaults to the selected frame.
***************
*** 2278,2284 ****
      return make_number (1);
  }
  
! DEFUN ("frame-pixel-height", Fframe_pixel_height, 
         Sframe_pixel_height, 0, 1, 0,
         doc: /* Return a FRAME's height in pixels.
  This counts only the height available for text lines,
--- 2278,2284 ----
      return make_number (1);
  }
  
! DEFUN ("frame-pixel-height", Fframe_pixel_height,
         Sframe_pixel_height, 0, 1, 0,
         doc: /* Return a FRAME's height in pixels.
  This counts only the height available for text lines,
***************
*** 2303,2309 ****
      return make_number (FRAME_HEIGHT (f));
  }
  
! DEFUN ("frame-pixel-width", Fframe_pixel_width, 
         Sframe_pixel_width, 0, 1, 0,
         doc: /* Return FRAME's width in pixels.
  For a terminal frame, the result really gives the width in characters.
--- 2303,2309 ----
      return make_number (FRAME_HEIGHT (f));
  }
  
! DEFUN ("frame-pixel-width", Fframe_pixel_width,
         Sframe_pixel_width, 0, 1, 0,
         doc: /* Return FRAME's width in pixels.
  For a terminal frame, the result really gives the width in characters.
***************
*** 2411,2417 ****
    return Qnil;
  }
  
! DEFUN ("set-frame-position", Fset_frame_position, 
         Sset_frame_position, 3, 3, 0,
         doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET.
  This is actually the position of the upper left corner of the frame.
--- 2411,2417 ----
    return Qnil;
  }
  
! DEFUN ("set-frame-position", Fset_frame_position,
         Sset_frame_position, 3, 3, 0,
         doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET.
  This is actually the position of the upper left corner of the frame.
***************
*** 2525,2531 ****
    Vmouse_position_function = Qnil;
  
    DEFVAR_LISP ("mouse-highlight", &Vmouse_highlight,
!              doc: /* If non-nil, clickable text is highlighted when mouse is 
over it.  
  If the value is an integer, highlighting is only shown after moving the
  mouse, while keyboard input turns off the highlight even when the mouse
  is over the clickable text.  However, the mouse shape still indicates
--- 2525,2531 ----
    Vmouse_position_function = Qnil;
  
    DEFVAR_LISP ("mouse-highlight", &Vmouse_highlight,
!              doc: /* If non-nil, clickable text is highlighted when mouse is 
over it.
  If the value is an integer, highlighting is only shown after moving the
  mouse, while keyboard input turns off the highlight even when the mouse
  is over the clickable text.  However, the mouse shape still indicates