Mercurial > emacs
comparison src/xterm.h @ 41720:b4898b480ab0
struct x_output): Add left_fringe_width, right_fringe_width,
and fringe_cols fields.
(FRAME_FRINGE_BITMAP_WIDTH, FRAME_FRINGE_BITMAP_HEIGHT): Remove macros.
(FRAME_X_FRINGE_COLS): Use fringe_cols field.
(FRAME_X_FRINGE_WIDTH): Use fringes_extra field.
(FRAME_X_LEFT_FRINGE_WIDTH): Use left_fringe_width field.
(FRAME_X_RIGHT_FRINGE_WIDTH): Use right_fringe_width field.
(x_compute_fringe_widths): Add prototype.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 01 Dec 2001 01:16:32 +0000 |
parents | 387f7c5a7814 |
children | 6d3fb8c8283b |
comparison
equal
deleted
inserted
replaced
41719:3734871037bb | 41720:b4898b480ab0 |
---|---|
535 int vertical_scroll_bar_extra; | 535 int vertical_scroll_bar_extra; |
536 | 536 |
537 /* The extra width currently allotted for the areas in which | 537 /* The extra width currently allotted for the areas in which |
538 truncation marks, continuation marks, and overlay arrows are | 538 truncation marks, continuation marks, and overlay arrows are |
539 displayed. */ | 539 displayed. */ |
540 int fringes_extra; | 540 int left_fringe_width, right_fringe_width; |
541 int fringe_cols, fringes_extra; | |
541 | 542 |
542 /* This is the gravity value for the specified window position. */ | 543 /* This is the gravity value for the specified window position. */ |
543 int win_gravity; | 544 int win_gravity; |
544 | 545 |
545 /* The geometry flags for this window. */ | 546 /* The geometry flags for this window. */ |
659 /* Return a pointer to the image cache of frame F. */ | 660 /* Return a pointer to the image cache of frame F. */ |
660 | 661 |
661 #define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache | 662 #define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache |
662 | 663 |
663 | 664 |
664 /* Pixel width of the fringe bitmaps drawn to indicate truncation, | |
665 continuation etc. */ | |
666 | |
667 #define FRAME_FRINGE_BITMAP_WIDTH(f) 8 | |
668 #define FRAME_FRINGE_BITMAP_HEIGHT(f) 8 | |
669 | |
670 /* Total width of fringes reserved for drawing truncation bitmaps, | 665 /* Total width of fringes reserved for drawing truncation bitmaps, |
671 continuation bitmaps and alike. The width is in canonical char | 666 continuation bitmaps and alike. The width is in canonical char |
672 units of the frame. This must currently be the case because window | 667 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 | 668 sizes aren't pixel values. If it weren't the case, we wouldn't be |
674 able to split windows horizontally nicely. */ | 669 able to split windows horizontally nicely. */ |
675 | 670 |
676 #define FRAME_X_FRINGE_COLS(F) \ | 671 #define FRAME_X_FRINGE_COLS(F) ((F)->output_data.x->fringe_cols) |
677 ((2 * FRAME_FRINGE_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1) \ | |
678 / CANON_X_UNIT ((F))) | |
679 | 672 |
680 /* Total width of fringes in pixels. */ | 673 /* Total width of fringes in pixels. */ |
681 | 674 |
682 #define FRAME_X_FRINGE_WIDTH(F) \ | 675 #define FRAME_X_FRINGE_WIDTH(F) ((F)->output_data.x->fringes_extra) |
683 (FRAME_X_FRINGE_COLS ((F)) * CANON_X_UNIT ((F))) | 676 |
684 | 677 /* Pixel-width of the left and right fringe. */ |
685 /* Pixel-width of the left fringe. */ | 678 |
686 | 679 #define FRAME_X_LEFT_FRINGE_WIDTH(F) ((F)->output_data.x->left_fringe_width) |
687 #define FRAME_X_LEFT_FRINGE_WIDTH(F) \ | 680 #define FRAME_X_RIGHT_FRINGE_WIDTH(F) ((F)->output_data.x->right_fringe_width) |
688 (FRAME_X_FRINGE_WIDTH (F) / 2) | |
689 | |
690 /* Pixel-width of the right fringe. Note that we are doing | |
691 integer arithmetic here, so don't loose a pixel if the total | |
692 width is an odd number. */ | |
693 | |
694 #define FRAME_X_RIGHT_FRINGE_WIDTH(F) \ | |
695 (FRAME_X_FRINGE_WIDTH (F) - FRAME_X_FRINGE_WIDTH (F) / 2) | |
696 | 681 |
697 | 682 |
698 | 683 |
699 /* X-specific scroll bar stuff. */ | 684 /* X-specific scroll bar stuff. */ |
700 | 685 |
979 extern void x_check_errors P_ ((Display *, char *)); | 964 extern void x_check_errors P_ ((Display *, char *)); |
980 extern int x_had_errors_p P_ ((Display *)); | 965 extern int x_had_errors_p P_ ((Display *)); |
981 extern void x_uncatch_errors P_ ((Display *, int)); | 966 extern void x_uncatch_errors P_ ((Display *, int)); |
982 extern Lisp_Object x_new_font P_ ((struct frame *, char *)); | 967 extern Lisp_Object x_new_font P_ ((struct frame *, char *)); |
983 extern Lisp_Object x_new_fontset P_ ((struct frame *, char *)); | 968 extern Lisp_Object x_new_fontset P_ ((struct frame *, char *)); |
969 extern void x_compute_fringe_widths P_ ((struct frame *, int)); | |
984 extern void x_set_offset P_ ((struct frame *, int, int, int)); | 970 extern void x_set_offset P_ ((struct frame *, int, int, int)); |
985 extern void x_set_window_size P_ ((struct frame *, int, int, int)); | 971 extern void x_set_window_size P_ ((struct frame *, int, int, int)); |
986 extern void x_set_mouse_position P_ ((struct frame *, int, int)); | 972 extern void x_set_mouse_position P_ ((struct frame *, int, int)); |
987 extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); | 973 extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); |
988 extern void x_raise_frame P_ ((struct frame *)); | 974 extern void x_raise_frame P_ ((struct frame *)); |