(iswitchb-visit-buffer): Use `select-frame-set-input-focus'.

[gnu-emacs] / src / frame.h

diff --git a/src/frame.h b/src/frame.h
index 947f7a5f6b634bbfdf30affcf2b2cc5987273be1..4d40ad9c86533ae1031d1db686eb97654cc00289 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -22,8 +22,8 @@ Boston, MA 02111-1307, USA.  */
    includes frame.h some emacs source includes both dispextern.h and
    frame.h */
 
-#ifndef EMACS_FRAME_H_INCLUDED
-#define EMACS_FRAME_H_INCLUDED
+#ifndef EMACS_FRAME_H
+#define EMACS_FRAME_H
 
 \f
 /* Miscellanea.  */
@@ -354,9 +354,6 @@ struct frame
   int scroll_bar_pixel_width;
   int scroll_bar_cols;
 
-  /* Width of area for drawing truncation marks and overlay arrow.  */
-  int trunc_area_pixel_width, trunc_area_cols;
-
   /* The baud rate that was used to calculate costs for this frame.  */
   int cost_calculation_baud_rate;
 
@@ -371,6 +368,10 @@ struct frame
 
   /* Additional space to put between text lines on this frame.  */
   int extra_line_spacing;
+
+  /* Set to non-zero in change_frame_size when size of frame changed
+     Clear the frame in clear_garbaged_frames if set.  */
+  unsigned resized_p : 1;
 };
 
 #ifdef MULTI_KBOARD
@@ -557,7 +558,7 @@ typedef struct frame *FRAME_PTR;
 #define FRAME_WINDOW_WIDTH_ARG(f, width)       \
      ((width)                                  \
       + FRAME_SCROLL_BAR_WIDTH (f)             \
-      + FRAME_FLAGS_AREA_COLS (f))
+      + FRAME_FRINGE_COLS (f))
 
 /* Maximum + 1 legitimate value for FRAME_CURSOR_X.  */
 #define FRAME_CURSOR_X_LIMIT(f) \
@@ -610,13 +611,13 @@ typedef struct frame *FRAME_PTR;
    (f)->visible = (f)->async_visible, \
    (f)->iconified = (f)->async_iconified)
 
-#define CHECK_FRAME(x, i)                              \
+#define CHECK_FRAME(x)                                 \
      do {                                              \
        if (! FRAMEP (x))                               \
          x = wrong_type_argument (Qframep, (x));       \
      } while (0)
 
-#define CHECK_LIVE_FRAME(x, i)                         \
+#define CHECK_LIVE_FRAME(x)                            \
      do {                                              \
        if (! FRAMEP (x)                                        \
           || ! FRAME_LIVE_P (XFRAME (x)))              \
@@ -642,6 +643,7 @@ typedef struct frame *FRAME_PTR;
 
 
 extern Lisp_Object Qframep, Qframe_live_p, Qicon;
+extern Lisp_Object Qleft_fringe, Qright_fringe;
 
 extern struct frame *last_nonminibuf_frame;
 
@@ -719,18 +721,21 @@ extern Lisp_Object selected_frame;
 
 #ifdef HAVE_WINDOW_SYSTEM
 
-#define FRAME_FLAGS_AREA_COLS(F) \
-     (FRAME_WINDOW_P (F) ? FRAME_X_FLAGS_AREA_COLS (F) : 0)
-#define FRAME_FLAGS_AREA_WIDTH(F) \
-     (FRAME_WINDOW_P (F) ? FRAME_X_FLAGS_AREA_WIDTH (F) : 0)
-#define FRAME_LEFT_FLAGS_AREA_WIDTH(F) \
-     (FRAME_WINDOW_P (F) ? FRAME_X_LEFT_FLAGS_AREA_WIDTH (F) : 0)
+#define FRAME_FRINGE_COLS(F) \
+     (FRAME_WINDOW_P (F) ? FRAME_X_FRINGE_COLS (F) : 0)
+#define FRAME_FRINGE_WIDTH(F) \
+     (FRAME_WINDOW_P (F) ? FRAME_X_FRINGE_WIDTH (F) : 0)
+#define FRAME_LEFT_FRINGE_WIDTH(F) \
+     (FRAME_WINDOW_P (F) ? FRAME_X_LEFT_FRINGE_WIDTH (F) : 0)
+#define FRAME_RIGHT_FRINGE_WIDTH(F) \
+     (FRAME_WINDOW_P (F) ? FRAME_X_RIGHT_FRINGE_WIDTH (F) : 0)
      
 #else /* not HAVE_WINDOW_SYSTEM */
 
-#define FRAME_FLAGS_AREA_WIDTH(F)      0
-#define FRAME_FLAGS_AREA_COLS(F)       0
-#define FRAME_LEFT_FLAGS_AREA_WIDTH(F)  0
+#define FRAME_FRINGE_WIDTH(F)  0
+#define FRAME_FRINGE_COLS(F)   0
+#define FRAME_LEFT_FRINGE_WIDTH(F)  0
+#define FRAME_RIGHT_FRINGE_WIDTH(F) 0
 
 #endif /* not HAVE_WINDOW_SYSTEM */
      
@@ -783,4 +788,4 @@ extern Lisp_Object selected_frame;
       ? make_float ((double) (Y) / CANON_Y_UNIT (F))   \
       : make_number ((Y) / CANON_Y_UNIT (F)))  
                             
-#endif /* not EMACS_FRAME_H_INCLUDED */
+#endif /* not EMACS_FRAME_H */