From 03e4639645519fba65b1413339f741705bb79078 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sat, 24 May 2003 22:06:40 +0000 Subject: [PATCH] (struct w32_output): Move members left_pos, top_pos, border_width, pixel_height, pixel_width, line_height, internal_border_width, vertical_scroll_bar_extra, left_fringe_width, right_fringe_width, fringe_cols, fringes_extra, win_gravity, size_hint_flags, want_fullscreen, x_pixels_diff, and y_pixels_diff to struct frame (frame.h). (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h. (FRAME_DEFAULT_FONT_WIDTH): Remove macro. (PIXEL_WIDTH, PIXEL_HEIGHT) (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH) (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Moved to frame.h and renamed [see frame.h changes]. (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH) (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h and renamed [see frame.h changes]. --- src/w32term.h | 119 -------------------------------------------------- 1 file changed, 119 deletions(-) diff --git a/src/w32term.h b/src/w32term.h index f8b194acd63..5bc94c832fc 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -286,27 +286,9 @@ struct w32_output /* Original palette (used to deselect real palette after drawing) */ HPALETTE old_palette; - /* Position of the W32 window (x and y offsets in root window). */ - int left_pos; - int top_pos; - - /* Border width of the W32 window as known by the window system. */ - int border_width; - - /* Size of the W32 window in pixels. */ - int pixel_height, pixel_width; - - /* Height of a line, in pixels. */ - int line_height; - /* Here are the Graphics Contexts for the default font. */ XGCValues *cursor_gc; /* cursor drawing */ - /* Width of the internal border. This is a line of background color - just inside the window's border. When the frame is selected, - a highlighting is displayed inside the internal border. */ - int internal_border_width; - /* The window used for this frame. May be zero while the frame object is being created and the window has not yet been created. */ @@ -364,22 +346,6 @@ struct w32_output DWORD dwStyle; - /* The size of the extra width currently allotted for vertical - scroll bars, in pixels. */ - int vertical_scroll_bar_extra; - - /* The extra width currently allotted for the areas in which - truncation marks, continuation marks, and overlay arrows are - displayed. */ - int left_fringe_width, right_fringe_width; - int fringe_cols, fringes_extra; - - /* This is the gravity value for the specified window position. */ - int win_gravity; - - /* The geometry flags for this window. */ - int size_hint_flags; - /* This is the Emacs structure for the display this frame is on. */ /* struct w32_display_info *display_info; */ @@ -412,17 +378,6 @@ struct w32_output /* The background for which the above relief GCs were set up. They are changed only when a different background is involved. */ unsigned long relief_background; - - /* See enum below */ - int want_fullscreen; - - /* This many pixels are the difference between the outer window (i.e. the - left of the window manager decoration) and FRAME_W32_WINDOW. */ - int x_pixels_diff; - - /* This many pixels are the difference between the outer window (i.e. the - top of the window manager titlebar) and FRAME_W32_WINDOW. */ - int y_pixels_diff; }; extern struct w32_output w32term_display; @@ -438,11 +393,6 @@ extern struct w32_output w32term_display; #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel) #define FRAME_FONT(f) ((f)->output_data.w32->font) #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset) -#define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.w32->internal_border_width) -#define FRAME_LINE_HEIGHT(f) ((f)->output_data.w32->line_height) -/* Width of the default font of frame F. Must be defined by each - terminal specific header. */ -#define FRAME_DEFAULT_FONT_WIDTH(F) FONT_WIDTH (FRAME_FONT (F)) #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset) /* This gives the w32_display_info structure for the display F is on. */ @@ -455,10 +405,6 @@ extern struct w32_output w32term_display; /* This is the 'font_info *' which frame F has. */ #define FRAME_W32_FONT_TABLE(f) (FRAME_W32_DISPLAY_INFO (f)->font_table) -/* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ -#define PIXEL_WIDTH(f) ((f)->output_data.w32->pixel_width) -#define PIXEL_HEIGHT(f) ((f)->output_data.w32->pixel_height) - /* Value is the smallest width of any character in any font on frame F. */ #define FRAME_SMALLEST_CHAR_WIDTH(F) \ @@ -473,25 +419,6 @@ extern struct w32_output w32term_display; #define FRAME_X_IMAGE_CACHE(F) FRAME_W32_DISPLAY_INFO ((F))->image_cache - -/* Total width of fringes reserved for drawing truncation bitmaps, - continuation bitmaps and alike. The width is in canonical char - units of the frame. This must currently be the case because window - sizes aren't pixel values. If it weren't the case, we wouldn't be - able to split windows horizontally nicely. */ - -#define FRAME_X_FRINGE_COLS(F) ((F)->output_data.w32->fringe_cols) - -/* Total width of fringes in pixels. */ - -#define FRAME_X_FRINGE_WIDTH(F) ((F)->output_data.w32->fringes_extra) - -/* Pixel-width of the left and right fringe. */ - -#define FRAME_X_LEFT_FRINGE_WIDTH(F) ((F)->output_data.w32->left_fringe_width) -#define FRAME_X_RIGHT_FRINGE_WIDTH(F) ((F)->output_data.w32->right_fringe_width) - - /* W32-specific scroll bar stuff. */ @@ -628,52 +555,6 @@ struct scroll_bar { text from glomming up against the scroll bar */ #define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0) - -/* Manipulating pixel sizes and character sizes. - Knowledge of which factors affect the overall size of the window should - be hidden in these macros, if that's possible. - - Return the upper/left pixel position of the character cell on frame F - at ROW/COL. */ -#define CHAR_TO_PIXEL_ROW(f, row) \ - ((f)->output_data.w32->internal_border_width \ - + (row) * (f)->output_data.w32->line_height) -#define CHAR_TO_PIXEL_COL(f, col) \ - ((f)->output_data.w32->internal_border_width \ - + (col) * FONT_WIDTH ((f)->output_data.w32->font)) - -/* Return the pixel width/height of frame F if it has - WIDTH columns/HEIGHT rows. */ -#define CHAR_TO_PIXEL_WIDTH(f, width) \ - (CHAR_TO_PIXEL_COL (f, width) \ - + (f)->output_data.w32->vertical_scroll_bar_extra \ - + (f)->output_data.w32->fringes_extra \ - + (f)->output_data.w32->internal_border_width) -#define CHAR_TO_PIXEL_HEIGHT(f, height) \ - (CHAR_TO_PIXEL_ROW (f, height) \ - + (f)->output_data.w32->internal_border_width) - - -/* Return the row/column (zero-based) of the character cell containing - the pixel on FRAME at ROW/COL. */ -#define PIXEL_TO_CHAR_ROW(f, row) \ - (((row) - (f)->output_data.w32->internal_border_width) \ - / (f)->output_data.w32->line_height) -#define PIXEL_TO_CHAR_COL(f, col) \ - (((col) - (f)->output_data.w32->internal_border_width) \ - / FONT_WIDTH ((f)->output_data.w32->font)) - -/* How many columns/rows of text can we fit in WIDTH/HEIGHT pixels on - frame F? */ -#define PIXEL_TO_CHAR_WIDTH(f, width) \ - (PIXEL_TO_CHAR_COL (f, ((width) \ - - (f)->output_data.w32->internal_border_width \ - - (f)->output_data.w32->fringes_extra \ - - (f)->output_data.w32->vertical_scroll_bar_extra))) -#define PIXEL_TO_CHAR_HEIGHT(f, height) \ - (PIXEL_TO_CHAR_ROW (f, ((height) \ - - (f)->output_data.w32->internal_border_width))) - extern void w32_fill_rect (); extern void w32_clear_window (); -- 2.39.2