view lisp/toolbar/paste.xpm @ 51209:880539128b51

Make (many) trivial substitutions for renamed and new macros in dispextern.h, frame.h and window.h. (window_box_width): Adapt to per-window fringes and scroll bars, and new fringe vs. display margin position. Note that returned value is no longer guaranteed to be a whole multiple of the frame column width, since per-window fringes may now be any width. (window_box_left_offset): New function like window_box_left, but value is relative to left border of window (rather than frame). (window_box_right_offset): New function like window_box_right, but value is relative to left border of window. (window_box_left): Adapt to per-window fringes and scroll bars, and new fringe vs. display margin position. Simplify by using WINDOW_LEFT_EDGE_X and window_box_left_offset. (window_box): Allow null args for unnecessary return values; change/simplify relevant callers. (x_y_to_hpos_vpos): Adapt to per-window fringes and scroll bars, and new fringe vs. display margin position. Use window_box_left_offset and window_box_right_offset (get_glyph_string_clip_rect): Adapt to per-window fringes and scroll bars, and new fringe vs. display margin position. Use WINDOW_LEFT_EDGE_X and WINDOW_TOTAL_WIDTH. (draw_fringe_bitmap): Rework to handle per-window fringes and new fringe vs. display margin position. (hscroll_window_tree): Use window_box_width instead of window_box. (redisplay_window): Adapt to per-window scroll bars. (draw_glyphs): Rework to handle per-window fringes and scroll bars, and new fringe vs. display margin position. Use WINDOW_LEFT_EDGE_X, WINDOW_TOTAL_WIDTH, and window_box_left. (x_clear_end_of_line): Adapt to per-window fringes and scroll bars, and new fringe vs. display margin position. Fix bug which increased total width of full_width rows by width of scroll bars although window's total width already includes that. (x_fix_overlapping_area): Simplify using window_box_left_offset. (expose_area): Simplify using window_box_left_offset. (x_draw_vertical_border): Handle per-window scroll bar settings, mixing windows with left, right and no scroll bars.

/* XPM */
static char *magick[] = {
/* columns rows colors chars-per-pixel */
"24 24 5 1",
"  c Gray0",
". c #62ee62ee62ee",
"X c Gray68",
"o c Gray82",
"O c None",
/* pixels */
"OOOOOOOOOOOOOOOOOOOOOOOO",
"OOOOOOOOOOOOOOOOOOOOOOOO",
"OOOOOOOOOOOOOOOOOOOOOOOO",
"OOOOOOOOO   OOOOOOOOOOOO",
"OOOOOOO  ooo OOOOOO OOOO",
"OOOOO  ooooo OOO     OOO",
"OOO  oo. .Xoo OO     OOO",
"OO ooo.oX..oo OOOOO OOOO",
"OO ooo.X..oooo OOOOOOOOO",
"OOO oo..Xooooo O  OOOOOO",
"OOO oooooooooo  oX OOOOO",
"OOOO ooooooo  XXoo OOOOO",
"OOOO ooooooo o.XooX OOOO",
"OOOOO oooooo o.Xooo OOOO",
"OOOOO oooooo .XooooX OOO",
"OOOOOO ooooX XooooooX OO",
"OOOOOO XXOXX Xooooooo OO",
"OOOOOOO XXXX  oooooooX O",
"OOOOOOO XX  O XooooX  OO",
"OOOOOOOO  OOOO ooX  OOOO",
"OOOOOOOOOOOOOO X  OOOOOO",
"OOOOOOOOOOOOOOO OOOOOOOO",
"OOOOOOOOOOOOOOOOOOOOOOOO",
"OOOOOOOOOOOOOOOOOOOOOOOO"
};