-2015-04-26 Jan Djärv <jan.h.d@swipnet.se>
-
- * image.c (xcolor_to_argb32): New function.
- (get_spec_bg_or_alpha_as_argb): Call xcolor_to_argb32.
- (pbm_load, png_load_body, jpeg_load_body, gif_load): Only use
- XImagePtr if ! USE_CAIRO.
- (pbm_load): Add cairo support.
-
-2015-04-12 Jan Djärv <jan.h.d@swipnet.se>
-
- * xterm.c (x_draw_image_glyph_string): Added missing USE_CAIRO.
- (x_free_cr_resources): Renamed from x_prepare_for_xlibdraw.
- (x_cr_draw_frame, x_cr_export_frames, x_shift_glyphs_for_insert)
- (x_free_frame_resources): Rename x_prepare_for_xlibdraw to
- x_free_cr_resources.
-
- * image.c (get_spec_bg_or_alpha_as_argb)
- (create_cairo_image_surface): New functions when USE_CAIRO.
- (xpm_load): Call the above functions. Handle XPM without mask
- when USE_CAIRO.
- (png_load_body): Handle USE_CAIRO case.
- (png_load): Remove USE_CAIRO specific fuction, modify png_load_body
- instead.
- (jpeg_load_body): Call create_cairo_image_surface.
- (gif_load, svg_load_image): Handle specified background, call
- create_cairo_image_surface.
-
-2015-04-11 Jan Djärv <jan.h.d@swipnet.se>
-
- * image.c (jpeg_load_body): Create cairo image surface if USE_CAIRO.
- (tiff_load): Create cairo image surface if USE_CAIRO.
- (gif_load): Ditto.
-
2015-04-06 Koichi Arakawa <arakawa@pp.iij4u.or.jp> (tiny change)
* w32proc.c (w32_executable_type): Look for the DLL name in the
correct section. This avoids segfaults with some executables.
(Bug#20264)
-2015-04-05 Jan Djärv <jan.h.d@swipnet.se>
-
- * image.c: #undef COLOR_TABLE_SUPPORT when USE_CAIRO.
- (x_clear_image): Free cr_data and cr_data2 if set.
- (xpm_load): Assign data to cr_data2.
- (svg_load_image): Convert from GdkPixbuf to CAIRO_FORMAT_ARGB32.
-
- * dispextern.h (struct image): add cr_data2 if cairo.
-
2015-04-04 Jan Djärv <jan.h.d@swipnet.se>
* xselect.c (x_reply_selection_request)
2015-04-03 Jan Djärv <jan.h.d@swipnet.se>
- * image.c (prepare_image_for_display): Don't load if USE_CAIRO.
- (x_clear_image): If USE_CAIRO, also free possible img->ximg->obdata and
- don't return early.
- (ALLOC_XPM_COLORS): Don't define when USE_CAIRO.
- (xpm_load): Convert simple Xpms (32 bit ZPixmap) to CAIRO_FORMAT_ARGB32
- and create a surface.
-
* xterm.c (handle_one_xevent): Always redraw tool tips on
MapNotify. Update tool tip frame sizes on ConfigureNotify.
- (x_update_begin): Don't create any surface for non-visible
- tip frames, the geometry may be wrong.
2015-03-31 Eli Zaretskii <eliz@gnu.org>
DEFINE_LISP_SYMBOL_BEGIN / DEFINE_LISP_SYMBOL_END. All uses changed.
(DEFINE_NONNIL_Q_SYMBOL_MACROS): New macro, defaulting to true.
-2015-02-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * ftcrfont.c (ftcrfont_draw): Don't flush when drawing to screen.
-
-2015-02-17 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * xterm.c [USE_CAIRO]: Include math.h.
- (enum corners) [USE_CAIRO]: New enum.
- (x_erase_corners_for_relief) [USE_CAIRO]: New function.
- (x_draw_relief_rect) [USE_CAIRO]: Use it. If box width is larger
- than 1, draw the outermost line using the black relief.
-
-2015-02-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * gtkutil.c (xg_page_setup_dialog, xg_get_page_setup, draw_page)
- (xg_print_frames_dialog): Modernize k&r declarations.
-
- * xfns.c (Fx_export_frames, Fx_page_setup_dialog, Fx_get_page_setup)
- (Fx_print_frames_dialog): Modernize k&r declarations.
-
- * xterm.c (x_draw_window_divider): Use x_fill_rectangle instead of
- XFillRectangle.
- (x_draw_horizontal_wave) [USE_CAIRO]: New function.
- (x_draw_underwave) [USE_CAIRO]: Use it.
- (x_gc_get_ext_data, x_extension_initialize, x_begin_cr_clip)
- (x_end_cr_clip, x_set_cr_source_with_gc_foreground)
- (x_set_cr_source_with_gc_background, x_cr_define_fringe_bitmap)
- (x_cr_destroy_fringe_bitmap, x_cr_draw_frame, x_cr_accumulate_data)
- (x_cr_destroy, x_cr_export_frames, x_prepare_for_xlibdraw)
- (x_set_clip_rectangles, x_reset_clip_rectangles, x_fill_rectangle)
- (x_draw_rectangle, x_clear_window, x_fill_trapezoid_for_relief)
- (x_clear_area): Modernize k&r declarations.
- (x_cr_draw_image, x_fill_rectangle, x_draw_rectangle)
- (x_fill_trapezoid_for_relief): Use int instead of unsigned int for
- width and height args.
- (x_draw_stretch_glyph_string): Call x_reset_clip_rectangles instead
- of XSetClipMask.
- (x_draw_relief_rect) [USE_CAIRO]: Reset clipping.
- (x_fill_trapezoid_for_relief): Remove unnecessary cairo_close_path.
-
-2015-02-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
-
- * fringe.c (init_fringe_bitmap) [USE_CAIRO]: Adjust bitmap data for
- cairo image surface.
-
- * xterm.c (x_cr_define_fringe_bitmap): Call cairo_surface_mark_dirty.
-
-2015-02-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
- Jan Djärv <jan.h.d@swipnet.se>
-
- * xterm.h: Add include of cairo header files.
- (x_bitmap_record): Add img if cairo.
- (x_gc_ext_data): New struct for cairo.
- (x_display_info): Add ext_codes for cairo.
- (x_output): Add cr_context and cr_surface for cairo.
- (x_clear_area): Change arguments from Display*/Window to frame pointer.
- (x_query_color, x_begin_cr_clip, x_end_cr_clip)
- (x_set_cr_source_with_gc_foreground, x_set_cr_source_with_gc_background)
- (x_cr_draw_frame, x_cr_export_frames): Declare.
-
- * xterm.c (x_clear_area1, x_prepare_for_xlibdraw)
- (x_set_clip_rectangles, x_reset_clip_rectangles, x_fill_rectangle)
- (x_draw_rectangle, x_fill_trapezoid_for_relief, x_clear_window)
- (x_gc_get_ext_data, x_extension_initialize, x_cr_accumulate_data):
- Declare.
- (FRAME_CR_CONTEXT, FRAME_CR_SURFACE): New macros.
- (max_fringe_bmp, fringe_bmp): New variables.
- (x_gc_get_ext_data, x_extension_initialize)
- (x_cr_destroy_surface, x_begin_cr_clip, x_end_cr_clip)
- (x_set_cr_source_with_gc_foreground)
- (x_set_cr_source_with_gc_background, x_cr_define_fringe_bitmap)
- (x_cr_destroy_fringe_bitmap, x_cr_draw_image, x_cr_draw_frame)
- (x_cr_accumulate_data, x_cr_destroy, x_cr_export_frames)
- (x_prepare_for_xlibdraw, x_set_clip_rectangles)
- (x_reset_clip_rectangles, x_fill_rectangle, x_draw_rectangle)
- (x_clear_window, x_fill_trapezoid_for_relief): New functions.
- (x_update_begin): Create cairo surface if needed.
- (x_draw_vertical_window_border): Call x_fill_rectangle for cairo.
- (x_update_end): Paint cairo drawing surface to xlib surface.
- (x_clear_under_internal_border, x_after_update_window_line): Adjust
- arguments to x_clear_area.
- (x_draw_fringe_bitmap): Call x_fill_rectangle. Get GC values and
- call x_cr_draw_image for cairo. Call x_reset_clip_rectangles instead
- of XSetClipMask.
- (x_set_glyph_string_clipping)
- (x_set_glyph_string_clipping_exactly): Use x_set_clip_rectangles
- instead of XSetClipRectangles.
- (x_clear_glyph_string_rect, x_draw_glyph_string_background): Use
- x_fill_rectangle instead of XFillRectangle.
- (x_draw_glyph_string_foreground)
- (x_draw_composite_glyph_string_foreground)
- (x_draw_glyphless_glyph_string_foreground): Use x_draw_rectangle instead
- of XDrawRectangle.
- (x_draw_relief_rect): Add code for USE_CAIRO.
- Call x_reset_clip_rectangles instead of XSetClipMask.
- (x_draw_box_rect): x_set_clip_rectangles instead of XSetClipRectangles,
- x_fill_rectangle instead of XFillRectangle, x_reset_clip_rectangles
- instead of XSetClipMask.
- (x_draw_image_foreground, x_draw_image_foreground_1):
- x_draw_rectangle instead of XDrawRectangle.
- (x_draw_glyph_string_bg_rect): x_fill_rectangle instead of
- XFillRectangle.
- (x_draw_image_glyph_string): If img has cr_data, use it as
- a cairo surface.
- (x_draw_stretch_glyph_string): x_set_clip_rectangles instead of
- XSetClipRectangles, x_fill_rectangle instead of XFillRectangle.
- (x_draw_glyph_string): x_fill_rectangle instead of XFillRectangle.,
- x_reset_clip_rectangles instead of XSetClipMask.
- (x_shift_glyphs_for_insert): Call x_prepare_for_xlibdraw.
- (x_clear_area1): New function that calls XClearArea.
- (x_clear_area): Takes frame as parameter, calls x_clear_area1 for
- non-cairo.
- (x_clear_frame): x_clear_window instead of XClearWindow.
- (x_scroll_run): Set frame garbaged if cairo.
- (XTmouse_position): Initialize *part to 0.
- (x_scroll_bar_create): Adjust arguments to x_clear_area.
- (x_scroll_bar_set_handle): x_clear_area1 instead of x_clear_area,
- x_fill_rectangle instead of XFillRectangle.
- (XTset_vertical_scroll_bar, XTset_horizontal_scroll_bar): Adjust
- arguments to x_clear_area.
- (x_scroll_bar_expose): x_draw_rectangle instead of XDrawRectangle.
- (handle_one_xevent): Adjust arguments to x_clear_area.
- Destroy cairo surface for frame if ConfigureNotify.
- (x_clip_to_row): x_set_clip_rectangles instead of XSetClipRectangles.
- (x_draw_hollow_cursor): x_draw_rectangle instead of XDrawRectangle,
- x_reset_clip_rectangles instead of XSetClipMask.
- (x_draw_bar_cursor): x_fill_rectangle instead of XFillRectangle,
- x_reset_clip_rectangles instead of XSetClipMask.
- (x_clear_frame_area): Adjust arguments to x_clear_area.
- (x_free_frame_resources): Call x_prepare_for_xlibdraw.
- (x_term_init): Call x_extension_initialize if cairo.
- (x_redisplay_interface): Add x_cr_define_fringe_bitmap,
- x_cr_destroy_fringe_bitmap for cairo.
- (x_initialize): Call x_cr_init_fringe for cairo.
-
- * xfns.c: New section Printing.
- (x-export-frames, x-page-setup-dialog, x-get-page-setup)
- (x-print-frames-dialog): New printing functions.
- (Fx_create_frame, x_create_tip_frame): Register ftcrfont if
- cairo.
- (syms_of_xfns): Defsym Qorientation, Qtop_margin, Qbottom_margin,
- Qportrait, Qlandscape, Qreverse_portrait, Qreverse_landscape).
- (syms_of_xfns): Provide cairo and defvar cairo-version-string.
- defsubr Sx_page_setup_dialog, Sx_get_page_setup, Sx_print_frames_dialog.
-
- * image.c: Add defined (USE_CAIRO) for PNG.
- Add !defined USE_CAIRO for W32 PNG code.
- (x_clear_image): If cairo, destroy the surface in cr_data.
- (png_load): Add new cairo compatible implementation.
- (lookup_image_type): Add defined (USE_CAIRO) for define png_type.
-
- * gtkutil.h (xg_page_setup_dialog, xg_get_page_setup)
- (xg_print_frames_dialog): Declare.
-
- * gtkutil.c (xg_clear_under_internal_border)
- (xg_update_scrollbar_pos, xg_update_horizontal_scrollbar_pos): Only
- queue_draw if not cairo. Change args to x_clear_area.
- (xg_get_font): Use Qftcr when using cairo, Qxft otherwise.
- (xg_page_setup_dialog, xg_get_page_setup, draw_page)
- (xg_print_frames_dialog): New functions for printing.
-
- * ftfont.h (ftfont_open2, ftfont_info_size): Declare.
-
- * ftfont.c (ftfont_info_size); New global variable.
- (ftfont_open2): New extern function almost the same as old ftfont_open,
- but takes the font_object as argument.
- (ftfont_open): Build font object and call ftfont_open2.
-
- * ftcrfont.c: New font driver for cairo, based on the ftfont driver.
-
- * fringe.c (x_cr_init_fringe): New function name that shares code
- with w32_init_fringe.
-
- * font.h (ftcrfont_driver, syms_of_ftcrfont): Declare
-
- * font.c (syms_of_font): Call syms_of_ftcrfont for cairo.
-
- * dispextern.h (struct image): Add cr_data for cairo.
- (x_cr_init_fringe): Declare.
-
- * Makefile.in (CAIRO_CFLAGS, CAIRO_LIBS): New variables.
- (FONT_OBJ): Add comment about ftcrfont.
- (ALL_CFLAGS): Add CAIRO_CFLAGS.
- (LIBES): Add CAIRO_LIBS.
-
2015-02-11 Martin Rudalics <rudalics@gmx.at>
* w32term.c (w32_read_socket): In SIZE_MAXIMIZED and
(xg_set_toolkit_horizontal_scroll_bar_thumb)
(xg_get_default_scrollbar_height)
(xg_clear_under_internal_border): Extern.
- * gtkutil.c (xg_frame_resized): Don't call
- do_pending_window_change.
+ * gtkutil.c (xg_frame_resized): Call do_pending_window_change.
(xg_frame_set_char_size): Use adjust_frame_size.
(style_changed_cb): Call update_theme_scrollbar_height and
x_set_scroll_bar_default_height.
build without toolkit. Always clear under internal border.
(x_set_window_size): Don't check frame size or recompute
fringes. Reset fullscreen status before applying sizes.
- Always resize as requested by pixelwise argument. Don't call
+ Always resize as requested by pixelwise argument. Call
do_pending_window_change.
(x_wm_set_size_hint): Add call for FRAME_SCROLL_BAR_AREA_HEIGHT.
(w32_initialize_display_info): Initialize dpyinfo's
Call x_net_wm_state.
(x_set_window_size_1, x_wm_set_size_hint): Don't call
check_frame_size.
- (x_set_window_size): Don't call check_frame_size and
+ (x_set_window_size): Don't call check_frame_size. Call
do_pending_window_change.
(x_term_init): Init horizontal_scroll_bar_cursor display info.
(x_create_terminal): Add set_horizontal_scroll_bar_hook.
* emacs.c (main): Initialize daemon_pipe[1] here ...
(syms_of_emacs): ... instead of here.
-2014-02-16 Anders Lindg
ern <andlind@gmail.com>
+2014-02-16 Anders Lindg
ren <andlind@gmail.com>
* nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask
is set (Bug#16505).
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros.
(FRAME_TOTAL_COLS_ARG): Remove macro.
- * fringe.c (draw_fringe_bitmap_1): Handle right divder.
+ * fringe.c (draw_fringe_bitmap_1): Handle right divider.
* gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
(x_wm_set_size_hint): Handle frame pixel sizes.
* indent.c (compute_motion, Fcompute_motion):
(ns_draw_fringe_bitmap): Remove unused rowY.
Change #if to COCOA && >= 10_6.
(ns_draw_window_cursor): Remove unused overspill.
- (ns_draw_underwave): width and x are EamcsCGFloat.
+ (ns_draw_underwave): width and x are EmacsCGFloat.
(ns_draw_box): thickness is CGFloat.
(ns_dumpglyphs_image): Change #if to COCOA && >= 10_6.
(ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread
;; coding: utf-8
;; End:
- Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ Copyright (C) 2011-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.