/[emacs]/emacs/src/xterm.h
ViewVC logotype

Diff of /emacs/src/xterm.h

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

revision 1.121 by miles, Fri Oct 5 16:33:06 2001 UTC revision 1.122 by kfstorm, Fri Nov 16 13:12:51 2001 UTC
# Line 537  struct x_output Line 537  struct x_output
537    /* The extra width currently allotted for the areas in which    /* The extra width currently allotted for the areas in which
538       truncation marks, continuation marks, and overlay arrows are       truncation marks, continuation marks, and overlay arrows are
539       displayed.  */       displayed.  */
540    int flags_areas_extra;    int fringes_extra;
541    
542    /* This is the gravity value for the specified window position.  */    /* This is the gravity value for the specified window position.  */
543    int win_gravity;    int win_gravity;
# Line 661  struct x_output Line 661  struct x_output
661  #define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache  #define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache
662    
663    
664  /* Pixel width of the bitmaps drawn to indicate truncation,  /* Pixel width of the fringe bitmaps drawn to indicate truncation,
665     continuation etc.  */     continuation etc.  */
666    
667  #define FRAME_FLAGS_BITMAP_WIDTH(f)     8  #define FRAME_FRINGE_BITMAP_WIDTH(f)    8
668  #define FRAME_FLAGS_BITMAP_HEIGHT(f)    8  #define FRAME_FRINGE_BITMAP_HEIGHT(f)   8
669    
670  /* Total width of a areas reserved for drawing truncation bitmaps,  /* Total width of fringes reserved for drawing truncation bitmaps,
671     continuation bitmaps and alike.  The width is in canonical char     continuation bitmaps and alike.  The width is in canonical char
672     units of the frame.  This must currently be the case because window     units of the frame.  This must currently be the case because window
673     sizes aren't pixel values.  If it weren't the case, we wouldn't be     sizes aren't pixel values.  If it weren't the case, we wouldn't be
674     able to split windows horizontally nicely.  */     able to split windows horizontally nicely.  */
675    
676  #define FRAME_X_FLAGS_AREA_COLS(F)                                      \  #define FRAME_X_FRINGE_COLS(F)                                  \
677       ((2 * FRAME_FLAGS_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)     \       ((2 * FRAME_FRINGE_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)    \
678        / CANON_X_UNIT ((F)))        / CANON_X_UNIT ((F)))
679    
680  /* Total width of flags areas in pixels.  */  /* Total width of fringes in pixels.  */
681    
682  #define FRAME_X_FLAGS_AREA_WIDTH(F) \  #define FRAME_X_FRINGE_WIDTH(F) \
683       (FRAME_X_FLAGS_AREA_COLS ((F)) * CANON_X_UNIT ((F)))       (FRAME_X_FRINGE_COLS ((F)) * CANON_X_UNIT ((F)))
684    
685  /* Pixel-width of the left flags area.  */  /* Pixel-width of the left fringe.  */
686    
687  #define FRAME_X_LEFT_FLAGS_AREA_WIDTH(F) \  #define FRAME_X_LEFT_FRINGE_WIDTH(F) \
688       (FRAME_X_FLAGS_AREA_WIDTH (F) / 2)       (FRAME_X_FRINGE_WIDTH (F) / 2)
689    
690  /* Pixel-width of the right flags area.  Note that we are doing  /* Pixel-width of the right fringe.  Note that we are doing
691     integer arithmetic here, so don't loose a pixel if the total     integer arithmetic here, so don't loose a pixel if the total
692     width is an odd number.  */     width is an odd number.  */
693    
694  #define FRAME_X_RIGHT_FLAGS_AREA_WIDTH(F)       \  #define FRAME_X_RIGHT_FRINGE_WIDTH(F)   \
695       (FRAME_X_FLAGS_AREA_WIDTH (F) - FRAME_X_FLAGS_AREA_WIDTH (F) / 2)       (FRAME_X_FRINGE_WIDTH (F) - FRAME_X_FRINGE_WIDTH (F) / 2)
696    
697    
698    
# Line 855  struct scroll_bar Line 855  struct scroll_bar
855  #define CHAR_TO_PIXEL_WIDTH(f, width) \  #define CHAR_TO_PIXEL_WIDTH(f, width) \
856    (CHAR_TO_PIXEL_COL (f, width) \    (CHAR_TO_PIXEL_COL (f, width) \
857     + (f)->output_data.x->vertical_scroll_bar_extra \     + (f)->output_data.x->vertical_scroll_bar_extra \
858     + (f)->output_data.x->flags_areas_extra \     + (f)->output_data.x->fringes_extra \
859     + (f)->output_data.x->internal_border_width)     + (f)->output_data.x->internal_border_width)
860  #define CHAR_TO_PIXEL_HEIGHT(f, height) \  #define CHAR_TO_PIXEL_HEIGHT(f, height) \
861    (CHAR_TO_PIXEL_ROW (f, height) \    (CHAR_TO_PIXEL_ROW (f, height) \
# Line 876  struct scroll_bar Line 876  struct scroll_bar
876  #define PIXEL_TO_CHAR_WIDTH(f, width) \  #define PIXEL_TO_CHAR_WIDTH(f, width) \
877    (PIXEL_TO_CHAR_COL (f, ((width) \    (PIXEL_TO_CHAR_COL (f, ((width) \
878                            - (f)->output_data.x->internal_border_width \                            - (f)->output_data.x->internal_border_width \
879                            - (f)->output_data.x->flags_areas_extra \                            - (f)->output_data.x->fringes_extra \
880                            - (f)->output_data.x->vertical_scroll_bar_extra)))                            - (f)->output_data.x->vertical_scroll_bar_extra)))
881  #define PIXEL_TO_CHAR_HEIGHT(f, height) \  #define PIXEL_TO_CHAR_HEIGHT(f, height) \
882    (PIXEL_TO_CHAR_ROW (f, ((height) \    (PIXEL_TO_CHAR_ROW (f, ((height) \

Legend:
Removed from v.1.121  
changed lines
  Added in v.1.122

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