Mercurial > emacs

comparison src/ChangeLog @ 54150:6c8849d06ab3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Inserting Yamomotosan's changes for MacOSX image support, better support of Asian fonts, and some long awaited header cleanup and centralization.
author Steven Tamm <steventamm@mac.com>
date Thu, 26 Feb 2004 17:46:48 +0000
parents 6065441e9610
children faae5056606e
comparison
equal deleted inserted replaced
54149:6065441e9610 54150:6c8849d06ab3
1 2004-02-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add `-framework
4 QuickTime'.
5
6 * dispextern.h [MAC_OSX]: Do not include Carbon/Carbon.h (now in
7 macgui.h).
8
9 * emacs.c (main) [HAVE_CARBON]: Call init_xfns.
10
11 * macgui.h [MAC_OSX]: Include Carbon/Carbon.h.
12 (mktime, DEBUG, Z, free, malloc, realloc, max, min)
13 (init_process) [MAC_OSX] : Avoid conflicts with Carbon/Carbon.h.
14 [!MAC_OSX]: Include QDOffscreen.h and Controls.h.
15 (INFINITY) [MAC_OSX]: Avoid conflict with definition in math.h.
16 (Bitmap): Remove typedef.
17 (Pixmap): Change int to GWorldPtr.
18
19 * macmenu.c [MAC_OSX]: Do not include Carbon/Carbon.h (now in
20 macgui.h).
21
22 * macterm.h [MAC_OSX]: Do not include Carbon/Carbon.h (now in
23 macgui.h).
24 (RED16_FROM_ULONG, GREEN16_FROM_ULONG, BLUE16_FROM_ULONG): New
25 #define to extract 16-bit depth color components from unsigned
26 long representation.
27 (PIX_MASK_DRAW, PIX_MASK_RETAIN): New #define to represent pixel
28 colors used for masks.
29 (struct mac_display_info): Add color_p. Remove n_cbits.
30
31 * macfns.c: Include sys/types.h and sys/stat.h.
32 [MAC_OSX]: Do not include Carbon/Carbon.h (now in macgui.h).
33 Include QuickTime/QuickTime.h.
34 (XCreatePixmap, XCreatePixmapFromBitmapData, XFreePixmap)
35 (XSetForeground, mac_draw_line_to_pixmap): Add externs for
36 functions defined in macterm.c.
37 (XImagePtr): New typedef. Corresponds to XImage * in xfns.c.
38 (ZPixmap): New #define for compatibility with xfns.c.
39 (XGetImage, XPutPixel, XGetPixel, XDestroyImage)
40 (x_create_x_image_and_pixmap, x_destroy_x_image, x_put_x_image)
41 (find_image_fsspec, image_load_qt_1, image_load_quicktime): New
42 functions.
43 (four_corners_best, x_create_x_image_and_pixmap)
44 (x_destroy_x_image, unwind_create_frame, x_disable_image,
45 (x_edge_detection, init_color_table, colors_in_color_table,
46 (lookup_rgb_color, lookup_pixel_color, postprocess_image)
47 (x_put_x_image, slurp_file, xbm_scan, xbm_load, xbm_load_image)
48 (xbm_image_p, xbm_read_bitmap_data, xbm_file_p, x_to_xcolors)
49 (x_from_xcolors, x_detect_edges): New declarations (from xfns.c).
50 (mac_color_map_lookup, x_to_mac_color): Fix Lisp_Object/unsigned
51 long mixup.
52 (mac_defined_color, x_to_x_colors): Use RED16_FROM_ULONG etc.
53 (x_decode_color): Don't use n_cbits (in struct mac_display_info).
54 (x_set_foreground_color, x_set_cursor_color): Sync with w32fns.c.
55 (x_set_cursor_type, Fxw_color_values, valid_image_p)
56 (image_value_type, parse_image_spec, image_ascent, x_clear_image)
57 (x_alloc_image_color, clear_image_cache, lookup_image)
58 (x_find_image_file, xbm_read_bitmap_file_data)
59 (enum xbm_keyword_index, xbm_format, xbm_image_p, xbm_scan)
60 (xbm_read_bitmap_data, xbm_load, pbm_image_p, pbm_scan_number)
61 (enum pbm_keyword_index, pbm_format, enum png_keyword_index)
62 (png_format, png_image_p, enum jpeg_keyword_index, jpeg_format)
63 (jpeg_image_p, enum tiff_keyword_index, tiff_format, tiff_image_p)
64 (enum gif_keyword_index, gif_format, gif_image_p): Sync with
65 xfns.c.
66 (x_make_gc): Sync with xfns.c. Enclose unused `border_tile' with
67 #if 0.
68 (x_free_gcs): Sync with xfns.c. Enclose unused `border_tile' with
69 #if 0. Free white_relief.gc and black_relief.gc.
70 (unwind_create_frame, x_emboss, x_laplace, x_edge_detection): New
71 functions (from xfns.c).
72 (Fx_create_frame): Record unwind_create_frame.
73 (Fxw_display_color_p): Use dpyinfo->color_p.
74 (Fx_display_grayscale_p, Fx_display_planes): Don't use
75 dpyinfo->n_cbits.
76 (Fx_display_color_cells): Use dpyinfo->n_planes;
77 (QCmatrix, QCcolor_adjustment, QCmask, Qemboss, Qedge_detection)
78 (Qheuristic, cross_disabled_images, emboss_matrix)
79 (laplace_matrix): New variables (from xfns.c).
80 (Fimage_size, Fimage_mask_p, four_corners_best, image_background)
81 (x_clear_image_1, postprocess_image, slurp_file, xbm_load_image)
82 (xbm_file_p, x_to_xcolors, x_from_xcolors, x_detect_edges)
83 (image_background_transparent): New function (from xfns.c). Use
84 PIX_MASK_DRAW/PIX_MASK_RETAIN.
85 (image_load_quicktime): Add declaration.
86 [MAC_OSX] (image_load_quartz2d): Likewise.
87 [MAC_OSX] (CGImageCreateWithPNGDataProviderProcType): New typedef.
88 [MAC_OSX] (MyCGImageCreateWithPNGDataProvider): New variable.
89 [MAC_OSX] (init_image_func_pointer, image_load_quartz2d): New
90 functions.
91 (xbm_load_image_from_file, x_laplace_read_row)
92 (x_laplace_write_row, pbm_read_file): Remove functions.
93 [HAVE_XPM] (enum xpm_keyword_index, xpm_format, xpm_image_p)
94 (xpm_load): Sync with xfns.c (although XPM is not supported yet).
95 (colors_in_color_table): Sync with xfns.c (although not used).
96 (lookup_rgb_color): Don't lookup color table. Just do gamma
97 correction.
98 (COLOR_INTENSITY): New #define (from xfns.c).
99 (x_disable_image): New function (from xfns.c). Use
100 PIX_MASK_DRAW/PIX_MASK_RETAIN.
101 (x_build_heuristic_mask): Sync with xfns.c. Use
102 PIX_MASK_DRAW/PIX_MASK_RETAIN.
103 (HAVE_PBM): Remove #ifdef.
104 (pbm_load): Sync with xfns.c. Set img->width and img->height
105 before IMAGE_BACKGROUND.
106 (png_image_p, png_load): Don't enclose declarations with #if
107 HAVE_PNG.
108 (Qpng, enum png_keyword_index, png_format, png_type, png_image_p):
109 Don't enclose with #if HAVE_PNG.
110 [!HAVE_PNG] (png_load) [MAC_OSX]: Use image_load_quartz2d if a
111 symbol _CGImageCreateWithPNGDataProvider is defined. Otherwise
112 use image_load_quicktime.
113 [!HAVE_PNG] (png_load) [!MAC_OSX]: Use image_load_quicktime.
114 [HAVE_PNG] (png_load): Sync with xfns.c. Use
115 PIX_MASK_DRAW/PIX_MASK_RETAIN.
116 (jpeg_image_p, jpeg_load): Don't enclose declarations with #if
117 HAVE_JPEG.
118 (Qjpeg, enum jpeg_keyword_index, jpeg_format, jpeg_type)
119 (jpeg_image_p): Don't enclose with #if HAVE_JPEG.
120 [!HAVE_JPEG] (jpeg_load) [MAC_OSX]: Use image_load_quartz2d.
121 [!HAVE_JPEG] (jpeg_load) [!MAC_OSX]: Use image_load_quicktime.
122 [HAVE_JPEG] (jpeg_load): Sync with xfns.c.
123 (tiff_image_p, tiff_load): Don't enclose declarations with #if
124 HAVE_TIFF.
125 (Qtiff, enum tiff_keyword_index, tiff_format, tiff_type)
126 (tiff_image_p): Don't enclose with #if HAVE_TIFF.
127 [!HAVE_TIFF] (tiff_load): Use image_load_quicktime.
128 [HAVE_TIFF] (tiff_error_handler, tiff_warning_handler): New
129 functions (from xfns.c).
130 [HAVE_TIFF] (tiff_load): Sync with xfns.c.
131 (gif_image_p, gif_load): Don't enclose declarations with #if
132 HAVE_GIF.
133 (Qgif, enum gif_keyword_index, gif_format, gif_type, gif_image_p):
134 Don't enclose with #if HAVE_GIF.
135 [!HAVE_GIF] (gif_load): Use Quicktime Movie Toolbox if it is
136 animated gif. Otherwise use image_load_quicktime.
137 [HAVE_GIF] (gif_lib.h): Temporarily define DrawText as
138 gif_DrawText to avoid conflict with QuickdrawText.h.
139 [HAVE_GIF] (gif_load): Sync with xfns.c.
140 (enum gs_keyword_index, gs_format, gs_image_p, gs_load)
141 [HAVE_GHOSTSCRIPT] (x_kill_gs_process): Sync with xfns.c (although
142 Ghostscript is not supported yet).
143 (syms_of_macfns): Initialize Qemboss, Qedge_detection, Qheuristic,
144 QCmatrix, QCcolor_adjustment, and QCmask. Add DEFVAR_BOOL
145 cross_disabled_images (from xfns.c). Remove #if 0 for supported
146 image types. Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
147 HAVE_PNG. Add defsubr for Simage_size and Simage_mask_p.
148 (init_xfns): Remove #if HAVE_JPEG, HAVE_TIFF, HAVE_GIF, and
149 HAVE_PNG. Call EnterMovies to support animated gifs. Call
150 init_image_func_pointer to bind a symbol
151 _CGImageCreateWithPNGDataProvider if it is defined.
152
153 * macterm.c [MAC_OSX]: Do not include Carbon/Carbon.h (now in
154 macgui.h).
155 (x_draw_bar_cursor): Sync declaration with xterm.c.
156 (XFreePixmap, mac_draw_rectangle_to_pixmap, mac_copy_area)
157 (mac_copy_area_to_pixmap): Implementation with GWorld (offscreen
158 graphics).
159 (mac_set_forecolor, mac_set_backcolor): Use RED16_FROM_ULONG etc.
160 (mac_draw_line_to_pixmap, XCreatePixmap)
161 (XCreatePixmapFromBitmapData, mac_fill_rectangle_to_pixmap)
162 (mac_copy_area_with_mask, mac_copy_area_with_mask_to_pixmap): New
163 functions.
164 (mac_draw_bitmap) [TARGET_API_MAC_CARBON]: Use
165 GetPortBitMapForCopyBits instead of the cast to Bitmap *. Cast
166 bits to char *.
167 (reflect_byte): New function (from w32fns.c).
168 (mac_create_bitmap_from_bitmap_data): Use it and don't stuff bits
169 due to byte alignment.
170 (mac_scroll_area) [TARGET_API_MAC_CARBON]: Use
171 GetPortBitMapForCopyBits instead of the cast to Bitmap *.
172 (XSetForeground): Remove static (now used in macfns.c).
173 (HIGHLIGHT_COLOR_DARK_BOOST_LIMIT): New #define (from w32term.c).
174 (mac_alloc_lighter_color, x_destroy_window): Sync with w32term.c.
175 (x_setup_relief_color, x_setup_relief_colors, x_draw_box_rect)
176 (x_draw_glyph_string_box, x_draw_image_foreground)
177 (x_draw_image_foreground_1, x_draw_image_glyph_string)
178 (x_draw_stretch_glyph_string, x_draw_glyph_string)
179 (x_draw_hollow_cursor, x_draw_bar_cursor, mac_draw_window_cursor):
180 Sync with xterm.c.
181 (x_draw_relief_rect): Sync with xterm.c. Make 1 pixel shorter
182 than the xterm.c version when a strictly horizontal or vertical
183 line is drawn.
184 (XTset_terminal_window): Add static.
185 (x_make_frame_visible): Add UNBLOCK_INPUT.
186 (x_free_frame_resources): New funcion (from xterm.c).
187 (XTread_socket): Call handle_tool_bar_click if mouse up/down event
188 occurs in tool bar area.
189 (mac_initialize_display_info): Remove dpyinfo->n_cbits. Set
190 dpyinfo->color_p. Determine dpyinfo->n_planes using HasDepth.
191 Initialize image cache.
192 (stricmp, wildstrieq, mac_font_pattern_match, mac_font_match):
193 Enclose unused functions with #if 0.
194 (Qbig5, Qcn_gb, Qsjis, Qeuc_kr): New variables.
195 (decode_mac_font_name): New function to apply code conversions
196 from a mac font name to an XLFD font name according to its script
197 code.
198 (x_font_name_to_mac_font_name): Apply code conversion from an XLFD
199 font name to a mac font name according to REGISTRY and ENCODING
200 fields.
201 (init_font_name_table) [TARGET_API_MAC_CARBON]: Don't use a font
202 whose name starts with `.'.
203 (init_font_name_table): Use decode_mac_font_name. Add both
204 jisx0208.1983-sjis and jisx0201.1976-0 entries if the script code
205 of a font is smJapanese.
206 (mac_do_list_fonts): New function to list fonts that match a given
207 pattern.
208 (x_list_fonts, XLoadQueryFont): Use it.
209 (XLoadQueryFont): Set rbearing field for each variable width
210 character to avoid needless redraw.
211 (syms_of_macterm): Initialize Qbig5, Qcn_gb, Qsjis, and Qeuc_kr.
212
1 2004-02-26 Kim F. Storm <storm@cua.dk> 213 2004-02-26 Kim F. Storm <storm@cua.dk>
2 214
3 * keyboard.c (NREAD_INPUT_EVENTS): Temporarily increase to 512 215 * keyboard.c (NREAD_INPUT_EVENTS): Temporarily increase to 512
4 as read_socket_hook handler on X aborts if buffer is too small 216 as read_socket_hook handler on X aborts if buffer is too small
5 and W32 handler doesn't always check buffer limit. 217 and W32 handler doesn't always check buffer limit.