/[emacs]/emacs/src/frame.c
ViewVC logotype

Diff of /emacs/src/frame.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.290 by jpw, Wed Oct 2 08:28:17 2002 UTC revision 1.291 by lektu, Tue Feb 4 14:03:12 2003 UTC
# Line 92  set_menu_bar_lines_1 (window, n) Line 92  set_menu_bar_lines_1 (window, n)
92    XSETFASTINT (w->last_modified, 0);    XSETFASTINT (w->last_modified, 0);
93    XSETFASTINT (w->top, XFASTINT (w->top) + n);    XSETFASTINT (w->top, XFASTINT (w->top) + n);
94    XSETFASTINT (w->height, XFASTINT (w->height) - n);    XSETFASTINT (w->height, XFASTINT (w->height) - n);
95      
96    if (INTEGERP (w->orig_top))    if (INTEGERP (w->orig_top))
97      XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n);      XSETFASTINT (w->orig_top, XFASTINT (w->orig_top) + n);
98    if (INTEGERP (w->orig_height))    if (INTEGERP (w->orig_height))
# Line 367  make_frame_without_minibuffer (mini_wind Line 367  make_frame_without_minibuffer (mini_wind
367              call1 (intern ("make-initial-minibuffer-frame"), display);              call1 (intern ("make-initial-minibuffer-frame"), display);
368            UNGCPRO;            UNGCPRO;
369          }          }
370      
371        mini_window = XFRAME (kb->Vdefault_minibuffer_frame)->minibuffer_window;        mini_window = XFRAME (kb->Vdefault_minibuffer_frame)->minibuffer_window;
372      }      }
373    
# Line 576  do_switch_frame (frame, track, for_delet Line 576  do_switch_frame (frame, track, for_delet
576       int track, for_deletion;       int track, for_deletion;
577  {  {
578    struct frame *sf = SELECTED_FRAME ();    struct frame *sf = SELECTED_FRAME ();
579      
580    /* If FRAME is a switch-frame event, extract the frame we should    /* If FRAME is a switch-frame event, extract the frame we should
581       switch to.  */       switch to.  */
582    if (CONSP (frame)    if (CONSP (frame)
# Line 774  If omitted, FRAME defaults to the curren Line 774  If omitted, FRAME defaults to the curren
774       Lisp_Object frame;       Lisp_Object frame;
775  {  {
776    Lisp_Object window;    Lisp_Object window;
777      
778    if (NILP (frame))    if (NILP (frame))
779      window = SELECTED_FRAME ()->root_window;      window = SELECTED_FRAME ()->root_window;
780    else    else
# Line 782  If omitted, FRAME defaults to the curren Line 782  If omitted, FRAME defaults to the curren
782        CHECK_LIVE_FRAME (frame);        CHECK_LIVE_FRAME (frame);
783        window = XFRAME (frame)->root_window;        window = XFRAME (frame)->root_window;
784      }      }
785      
786    return window;    return window;
787  }  }
788    
# Line 794  If omitted, FRAME defaults to the curren Line 794  If omitted, FRAME defaults to the curren
794       Lisp_Object frame;       Lisp_Object frame;
795  {  {
796    Lisp_Object window;    Lisp_Object window;
797      
798    if (NILP (frame))    if (NILP (frame))
799      window = SELECTED_FRAME ()->selected_window;      window = SELECTED_FRAME ()->selected_window;
800    else    else
# Line 816  If FRAME is the selected frame, this mak Line 816  If FRAME is the selected frame, this mak
816  {  {
817    if (NILP (frame))    if (NILP (frame))
818      frame = selected_frame;      frame = selected_frame;
819      
820    CHECK_LIVE_FRAME (frame);    CHECK_LIVE_FRAME (frame);
821    CHECK_LIVE_WINDOW (window);    CHECK_LIVE_WINDOW (window);
822    
# Line 1016  Otherwise, include all frames.  */) Line 1016  Otherwise, include all frames.  */)
1016  {  {
1017    if (NILP (frame))    if (NILP (frame))
1018      frame = selected_frame;      frame = selected_frame;
1019      
1020    CHECK_LIVE_FRAME (frame);    CHECK_LIVE_FRAME (frame);
1021    return next_frame (frame, miniframe);    return next_frame (frame, miniframe);
1022  }  }
# Line 1211  The functions are run with one arg, the Line 1211  The functions are run with one arg, the
1211      x_clear_frame_selections (f);      x_clear_frame_selections (f);
1212  #endif  #endif
1213    
1214    /* Free glyphs.    /* Free glyphs.
1215       This function must be called before the window tree of the       This function must be called before the window tree of the
1216       frame is deleted because windows contain dynamically allocated       frame is deleted because windows contain dynamically allocated
1217       memory. */       memory. */
1218    free_glyphs (f);    free_glyphs (f);
# Line 1592  If omitted, FRAME defaults to the curren Line 1592  If omitted, FRAME defaults to the curren
1592  {  {
1593    if (NILP (frame))    if (NILP (frame))
1594      frame = selected_frame;      frame = selected_frame;
1595      
1596    CHECK_LIVE_FRAME (frame);    CHECK_LIVE_FRAME (frame);
1597    
1598  #if 0 /* This isn't logically necessary, and it can do GC.  */  #if 0 /* This isn't logically necessary, and it can do GC.  */
# Line 1701  doesn't support multiple overlapping fra Line 1701  doesn't support multiple overlapping fra
1701      frame = selected_frame;      frame = selected_frame;
1702    
1703    CHECK_LIVE_FRAME (frame);    CHECK_LIVE_FRAME (frame);
1704      
1705    if (frame_raise_lower_hook)    if (frame_raise_lower_hook)
1706      (*frame_raise_lower_hook) (XFRAME (frame), 0);      (*frame_raise_lower_hook) (XFRAME (frame), 0);
1707    
# Line 1749  The redirection lasts until `redirect-fr Line 1749  The redirection lasts until `redirect-fr
1749    
1750    if (frame_rehighlight_hook)    if (frame_rehighlight_hook)
1751      (*frame_rehighlight_hook) (XFRAME (frame));      (*frame_rehighlight_hook) (XFRAME (frame));
1752      
1753    return Qnil;    return Qnil;
1754  }  }
1755    
# Line 1949  store_frame_param (f, prop, val) Line 1949  store_frame_param (f, prop, val)
1949    
1950    /* Update some other special parameters in their special places    /* Update some other special parameters in their special places
1951       in addition to the alist.  */       in addition to the alist.  */
1952      
1953    if (EQ (prop, Qbuffer_predicate))    if (EQ (prop, Qbuffer_predicate))
1954      f->buffer_predicate = val;      f->buffer_predicate = val;
1955    
# Line 1999  If FRAME is omitted, return information Line 1999  If FRAME is omitted, return information
1999    
2000    alist = Fcopy_alist (f->param_alist);    alist = Fcopy_alist (f->param_alist);
2001    GCPRO1 (alist);    GCPRO1 (alist);
2002      
2003    if (!FRAME_WINDOW_P (f))    if (!FRAME_WINDOW_P (f))
2004      {      {
2005        int fg = FRAME_FOREGROUND_PIXEL (f);        int fg = FRAME_FOREGROUND_PIXEL (f);
# Line 2088  If FRAME is nil, describe the currently Line 2088  If FRAME is nil, describe the currently
2088    else    else
2089      CHECK_FRAME (frame);      CHECK_FRAME (frame);
2090    CHECK_SYMBOL (parameter);    CHECK_SYMBOL (parameter);
2091      
2092    f = XFRAME (frame);    f = XFRAME (frame);
2093    value = Qnil;    value = Qnil;
2094      
2095    if (FRAME_LIVE_P (f))    if (FRAME_LIVE_P (f))
2096      {      {
2097        /* Avoid consing in frequent cases.  */        /* Avoid consing in frequent cases.  */
# Line 2146  If FRAME is nil, describe the currently Line 2146  If FRAME is nil, describe the currently
2146        else        else
2147          value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));          value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
2148      }      }
2149      
2150    return value;    return value;
2151  }  }
2152    
2153    
2154  DEFUN ("modify-frame-parameters", Fmodify_frame_parameters,  DEFUN ("modify-frame-parameters", Fmodify_frame_parameters,
2155         Smodify_frame_parameters, 2, 2, 0,         Smodify_frame_parameters, 2, 2, 0,
2156         doc: /* Modify the parameters of frame FRAME according to ALIST.         doc: /* Modify the parameters of frame FRAME according to ALIST.
2157  If FRAME is nil, it defaults to the selected frame.  If FRAME is nil, it defaults to the selected frame.
# Line 2278  For a terminal screen, the value is alwa Line 2278  For a terminal screen, the value is alwa
2278      return make_number (1);      return make_number (1);
2279  }  }
2280    
2281  DEFUN ("frame-pixel-height", Fframe_pixel_height,  DEFUN ("frame-pixel-height", Fframe_pixel_height,
2282         Sframe_pixel_height, 0, 1, 0,         Sframe_pixel_height, 0, 1, 0,
2283         doc: /* Return a FRAME's height in pixels.         doc: /* Return a FRAME's height in pixels.
2284  This counts only the height available for text lines,  This counts only the height available for text lines,
# Line 2303  If FRAME is omitted, the selected frame Line 2303  If FRAME is omitted, the selected frame
2303      return make_number (FRAME_HEIGHT (f));      return make_number (FRAME_HEIGHT (f));
2304  }  }
2305    
2306  DEFUN ("frame-pixel-width", Fframe_pixel_width,  DEFUN ("frame-pixel-width", Fframe_pixel_width,
2307         Sframe_pixel_width, 0, 1, 0,         Sframe_pixel_width, 0, 1, 0,
2308         doc: /* Return FRAME's width in pixels.         doc: /* Return FRAME's width in pixels.
2309  For a terminal frame, the result really gives the width in characters.  For a terminal frame, the result really gives the width in characters.
# Line 2411  DEFUN ("set-frame-size", Fset_frame_size Line 2411  DEFUN ("set-frame-size", Fset_frame_size
2411    return Qnil;    return Qnil;
2412  }  }
2413    
2414  DEFUN ("set-frame-position", Fset_frame_position,  DEFUN ("set-frame-position", Fset_frame_position,
2415         Sset_frame_position, 3, 3, 0,         Sset_frame_position, 3, 3, 0,
2416         doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET.         doc: /* Sets position of FRAME in pixels to XOFFSET by YOFFSET.
2417  This is actually the position of the upper left corner of the frame.  This is actually the position of the upper left corner of the frame.
# Line 2525  which need to do mouse handling at the L Line 2525  which need to do mouse handling at the L
2525    Vmouse_position_function = Qnil;    Vmouse_position_function = Qnil;
2526    
2527    DEFVAR_LISP ("mouse-highlight", &Vmouse_highlight,    DEFVAR_LISP ("mouse-highlight", &Vmouse_highlight,
2528                 doc: /* If non-nil, clickable text is highlighted when mouse is over it.                   doc: /* If non-nil, clickable text is highlighted when mouse is over it.
2529  If the value is an integer, highlighting is only shown after moving the  If the value is an integer, highlighting is only shown after moving the
2530  mouse, while keyboard input turns off the highlight even when the mouse  mouse, while keyboard input turns off the highlight even when the mouse
2531  is over the clickable text.  However, the mouse shape still indicates  is over the clickable text.  However, the mouse shape still indicates

Legend:
Removed from v.1.290  
changed lines
  Added in v.1.291

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26