aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorPo Lu2022-12-31 18:04:18 +0800
committerPo Lu2022-12-31 18:04:18 +0800
commitcfbc8a5dbcd362b69b37b4e6832ae4a31834364c (patch)
treece003d03c4ae98f4e1d02186d78e5ae6e0d36e55 /src/image.c
parent785095c416f9bae43d2947849282b814e2c7942e (diff)
downloademacs-cfbc8a5dbcd362b69b37b4e6832ae4a31834364c.tar.gz
emacs-cfbc8a5dbcd362b69b37b4e6832ae4a31834364c.zip
Bring up the Android operating system and its window system
* .dir-locals.el (c-mode): Add ANDROID_EXPORT noise macro. * .gitignore: Add new files to ignore. * Makefile.in: Adjust for Android. * admin/merge-gnulib: Add new warning. * configure.ac: Detect Android. Run cross-configuration for Android when appropriate. * etc/DEBUG: Document how to debug Emacs on Android. * java/AndroidManifest.xml: * java/Makefile.in: * java/README: * java/debug.sh: * java/org/gnu/emacs/EmacsActivity.java (EmacsActivity): * java/org/gnu/emacs/EmacsApplication.java (EmacsApplication): * java/org/gnu/emacs/EmacsCopyArea.java (EmacsCopyArea): * java/org/gnu/emacs/EmacsDrawLine.java (EmacsDrawLine): * java/org/gnu/emacs/EmacsDrawPoint.java (EmacsDrawPoint): * java/org/gnu/emacs/EmacsDrawRectangle.java (EmacsDrawRectangle): * java/org/gnu/emacs/EmacsDrawable.java (EmacsDrawable): * java/org/gnu/emacs/EmacsFillPolygon.java (EmacsFillPolygon): * java/org/gnu/emacs/EmacsFillRectangle.java (EmacsFillRectangle): * java/org/gnu/emacs/EmacsFontDriver.java (EmacsFontDriver): * java/org/gnu/emacs/EmacsGC.java (EmacsGC): * java/org/gnu/emacs/EmacsHandleObject.java (EmacsHandleObject): * java/org/gnu/emacs/EmacsNative.java (EmacsNative): * java/org/gnu/emacs/EmacsPaintQueue.java (EmacsPaintQueue): * java/org/gnu/emacs/EmacsPaintReq.java (EmacsPaintReq): * java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap): * java/org/gnu/emacs/EmacsSdk7FontDriver.java (EmacsSdk7FontDriver): * java/org/gnu/emacs/EmacsService.java (class Holder<T>) (EmacsService): * java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView): * java/org/gnu/emacs/EmacsThread.java (EmacsThread): * java/org/gnu/emacs/EmacsView.java (EmacsView): * java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): New files and classes. * lib-src/Makefile.in (srcdir): * lib/Makefile.in (VPATH): (HAVE_NATIVE_COMP): (libgnu_a_SOURCES): (DEPFLAGS): Configure correctly for cross-compiling. * lib/faccessat.c: * lib/fpending.c (__fpending): * lib/open.c: * lib/unistd.c (_GL_UNISTD_INLINE): Temporary adjustments to gnulib. * lisp/frame.el (display-graphic-p): (display-screens): (display-pixel-height): (display-pixel-width): (display-mm-height): (display-mm-width): (display-backing-store): (display-save-under): (display-planes): (display-color-cells): (display-visual-class): Adjust for new window system `android'. * lisp/image/wallpaper.el (x-open-connection): Add declaration. * lisp/loadup.el (featurep): Load up files for Android. * lisp/net/eww.el (eww-form-submit, eww-form-file) (eww-form-checkbox, eww-form-select): Adjust faces for android. * lisp/term/android-win.el: New file. * src/Makefile.in: Add new targets emacs.so and android-emacs, then adjust for cross compilation. * src/alloc.c (cleanup_vector): Clean up Android font entities as well. (garbage_collect): Mark androidterm. * src/android-emacs.c (main): * src/android.c (ANDROID_THROW, enum android_fd_table_entry_flags) (struct android_emacs_service, struct android_emacs_pixmap) (struct android_graphics_point, struct android_event_container) (struct android_event_queue, android_run_select_thread) (android_handle_sigusr1, android_init_events, android_pending) (android_next_event, android_write_event, android_select) (android_run_debug_thread, android_user_full_name) (android_get_asset_name, android_fstat, android_fstatat) (android_file_access_p, android_hack_asset_fd, android_open) (android_close, JNICALL, android_init_emacs_service) (android_init_emacs_pixmap, android_init_graphics_point) (MAX_HANDLE, struct android_handle_entry, android_alloc_id) (android_destroy_handle, android_resolve_handle) (android_resolve_handle2, android_change_window_attributes) (android_create_window, android_set_window_background) (android_destroy_window, android_init_android_rect_class) (android_init_emacs_gc_class, android_create_gc, android_free_gc) (android_change_gc, android_set_clip_rectangles) (android_reparent_window, android_lookup_method) (android_clear_window, android_map_window, android_unmap_window) (android_resize_window, android_move_window, android_swap_buffers) (android_get_gc_values, android_set_foreground) (android_fill_rectangle, android_create_pixmap_from_bitmap_data) (android_set_clip_mask, android_set_fill_style, android_copy_area) (android_free_pixmap, android_set_background, android_fill_polygon) (android_draw_rectangle, android_draw_point, android_draw_line) (android_create_pixmap, android_set_ts_origin, android_clear_area): * src/android.h (ANDROID_EXPORT): * src/androidfns.c (android_display_info_for_name) (check_android_display_info, check_x_display_info, gamma_correct) (android_defined_color, android_decode_color) (android_implicitly_set_name, android_explicitly_set_name) (android_set_tool_bar_lines, android_change_tool_bar_height) (android_set_tab_bar_lines, android_change_tab_bar_height) (android_set_scroll_bar_default_height) (android_set_scroll_bar_default_width, android_icon_verify) (android_icon, android_make_gc, android_free_gcs) (unwind_create_frame, do_unwind_create_frame) (android_default_font_parameter, android_create_frame_window) (Fx_create_frame, Fxw_color_defined_p, Fxw_color_values) (Fxw_display_color_p, Fx_display_grayscale_p) (Fx_display_pixel_width, Fx_display_pixel_height) (Fx_display_planes, Fx_display_color_cells, Fx_display_screens) (Fx_display_mm_width, Fx_display_mm_height) (Fx_display_backing_store, Fx_display_visual_class) (Fx_display_monitor_attributes_list, Fx_frame_geometry) (Fx_frame_list_z_order, Fx_frame_restack) (Fx_mouse_absolute_pixel_position) (Fx_set_mouse_absolute_pixel_position, Fandroid_get_connection) (Fx_display_list, Fx_show_tip, Fx_hide_tip) (android_set_background_color, android_set_border_color) (android_set_cursor_color, android_set_cursor_type) (android_set_foreground_color) (android_set_child_frame_border_width) (android_set_internal_border_width, android_set_menu_bar_lines) (android_set_mouse_color, android_set_title, android_set_alpha) (android_frame_parm_handlers, syms_of_androidfns): * src/androidfont.c (struct android_emacs_font_driver) (struct android_emacs_font_spec, struct android_emacs_font_metrics) (struct android_emacs_font_object, struct android_integer) (struct androidfont_info, struct androidfont_entity) (android_init_font_driver, android_init_font_spec) (android_init_font_metrics, android_init_integer) (android_init_font_object, androidfont_get_cache) (androidfont_from_lisp, androidfont_from_java, androidfont_list) (androidfont_match, androidfont_draw, androidfont_open_font) (androidfont_close_font, androidfont_has_char) (androidfont_encode_char, androidfont_text_extents) (androidfont_list_family, androidfont_driver) (syms_of_androidfont_for_pdumper, syms_of_androidfont) (init_androidfont, android_finalize_font_entity): * src/androidgui.h (_ANDROID_GUI_H_, struct android_rectangle) (struct android_point, enum android_gc_function) (enum android_gc_value_mask, enum android_fill_style) (enum android_window_value_mask) (struct android_set_window_attributes, struct android_gc_values) (struct android_gc, enum android_swap_action, enum android_shape) (enum android_coord_mode, struct android_swap_info) (NativeRectangle, struct android_any_event) (struct android_key_event, struct android_configure_event) (union android_event): * src/androidterm.c (android_window_to_frame, android_clear_frame) (android_ring_bell, android_toggle_invisible_pointer) (android_update_begin, android_update_end, show_back_buffer) (android_flush_dirty_back_buffer_on, handle_one_android_event) (android_read_socket, android_frame_up_to_date) (android_buffer_flipping_unblocked_hook) (android_query_frame_background_color, android_parse_color) (android_alloc_nearest_color, android_query_colors) (android_mouse_position, android_get_focus_frame) (android_focus_frame, android_frame_rehighlight) (android_frame_raise_lower, android_make_frame_visible) (android_make_frame_invisible) (android_make_frame_visible_invisible, android_fullscreen_hook) (android_iconify_frame, android_set_window_size_1) (android_set_window_size, android_set_offset, android_set_alpha) (android_new_font, android_bitmap_icon, android_free_pixmap_hook) (android_free_frame_resources, android_delete_frame) (android_delete_terminal, android_scroll_run) (android_after_update_window_line, android_flip_and_flush) (android_clear_rectangle, android_reset_clip_rectangles) (android_clip_to_row, android_draw_fringe_bitmap) (android_set_cursor_gc, android_set_mouse_face_gc) (android_set_mode_line_face_gc, android_set_glyph_string_gc) (android_set_glyph_string_clipping) (android_set_glyph_string_clipping_exactly) (android_compute_glyph_string_overhangs) (android_clear_glyph_string_rect) (android_draw_glyph_string_background, android_fill_triangle) (android_make_point, android_inside_rect_p, android_clear_point) (android_draw_relief_rect, android_draw_box_rect) (HIGHLIGHT_COLOR_DARK_BOOST_LIMIT, android_setup_relief_color) (android_setup_relief_colors, android_draw_glyph_string_box) (android_draw_glyph_string_bg_rect, android_draw_image_relief) (android_draw_image_foreground, android_draw_image_foreground_1) (android_draw_image_glyph_string) (android_draw_stretch_glyph_string, android_draw_underwave) (android_draw_glyph_string_foreground) (android_draw_composite_glyph_string_foreground) (android_draw_glyphless_glyph_string_foreground) (android_draw_glyph_string, android_define_frame_cursor) (android_clear_frame_area, android_clear_under_internal_border) (android_draw_hollow_cursor, android_draw_bar_cursor) (android_draw_window_cursor, android_draw_vertical_window_border) (android_draw_window_divider, android_redisplay_interface) (frame_set_mouse_pixel_position, get_keysym_name) (android_create_terminal, android_term_init, syms_of_androidterm) (mark_androidterm): * src/androidterm.h (_ANDROID_TERM_H_, struct android_display_info) (struct android_output, FRAME_ANDROID_OUTPUT, XSCROLL_BAR): New files. * src/dired.c (file_attributes): Do not use openat on Android. * src/dispextern.h (No_Cursor): Define appropriately on Android. (struct glyph_string, struct face): Make gc field of type struct android_gc on Android. * src/dispnew.c (clear_current_matrices, clear_desired_matrices) (adjust_frame_glyphs_for_window_redisplay, free_glyphs) (update_frame, scrolling, char_ins_del_cost, update_frame_line) (init_display_interactive): Disable text terminal support completely on Android. Fix non-toolkit menus for non-X systems. * src/editfns.c (Fuser_full_name): Call android_user_full_name. * src/emacs.c (android_emacs_init): Make main this on Android. Prohibit argv sorting from exceeding end of argv. * src/epaths.in: Add path definitions for Android. * src/fileio.c (file_access_p): Call android_file_access_p. (file_name_directory): Avoid using openat on Android. (Fcopy_file): Adjust to call sys_fstat instead. (file_directory_p): (Finsert_file_contents): (write_region): Likewise. * src/filelock.c: * src/fns.c (Flocale_info): Pacify warning on Android. * src/font.c (font_make_entity_android): New function. * src/font.h: * src/frame.c (Fframep): (Fwindow_system): Handle new window system `android'. Update doc strings. (Fmake_terminal_frame): Disable on Android. (gui_display_get_resource): Disable get_string_resource_hook on Android. (syms_of_frame): New defsym `android'. * src/frame.h (GCALIGNED_STRUCT): Add new output data for Android. (ENUM_BF): Expand enumerator size. (FRAME_ANDROID_P, FRAME_WINDOW_P, MOUSE_HL_INFO): Add definitions for Android. * src/image.c (GET_PIXEL): (image_create_bitmap_from_file): (image_create_x_image_and_pixmap_1): (image_get_x_image): (slurp_file): (lookup_rgb_color): (image_to_emacs_colors): (image_from_emacs_colors): (image_pixmap_draw_cross): (image_disable_image): (MaskForeground): (gif_load): Add stubs for Android. * src/lisp.h: * src/lread.c (safe_to_load_version, maybe_swap_for_eln1, openp): * src/pdumper.c (pdumper_load): Call sys_fstat instead of fstat. * src/process.c (wait_reading_process_output): Use android_select instead of pselect. * src/scroll.c: Disable on Android. * src/sysdep.c (widen_foreground_group, reset_sys_modes) (init_signals, emacs_fstatat, sys_fstat): New function. (emacs_open, emacs_open_noquit, emacs_close): Implement differently on Android. (close_output_streams): Disable what is not required on Android. * src/term.c (OUTPUT1_IF, encode_terminal_code, string_cost) (string_cost_one_line, per_line_cost, calculate_costs) (struct fkey_table, tty_append_glyph, produce_glyphs) (tty_capable_p, Fsuspend_tty, Fresume_tty, device, init_tty) (maybe_fatal, syms_of_term): Disable text terminal support on Android. * src/termhooks.h (enum output_method): Add android output method. (GCALIGNED_STRUCT, TERMINAL_FONT_CACHE): Define for Android. * src/terminal.c (Fterminal_live_p): Implement for Android. * src/verbose.mk.in (AM_V_GLOBALS): Add JAVAC and DX. * src/xdisp.c (redisplay_internal): Disable text terminals on Android. (display_menu_bar): (display_tty_menu_item): (draw_row_with_mouse_face): (expose_frame): Make the non toolkit menu bar work on Android. * src/xfaces.c (GCGraphicsExposures): (x_create_gc): (x_free_gc): (Fx_load_color_file): Define for Android. * xcompile/Makefile.in (top_srcdir): (top_builddir): * xcompile/README: * xcompile/langinfo.h (nl_langinfo): New files.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c88
1 files changed, 79 insertions, 9 deletions
diff --git a/src/image.c b/src/image.c
index b881e43e951..986dd7aada4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -175,6 +175,28 @@ typedef struct haiku_bitmap_record Bitmap_Record;
175 175
176#endif 176#endif
177 177
178#ifdef HAVE_ANDROID
179#include "androidterm.h"
180typedef struct android_bitmap_record Bitmap_Record;
181
182/* TODO: implement images on Android. */
183#define GET_PIXEL(ximg, x, y) 0
184#define PUT_PIXEL(ximg, x, y, pixel) ((void) (pixel))
185#define NO_PIXMAP 0
186
187#define PIX_MASK_RETAIN 0
188#define PIX_MASK_DRAW 1
189
190#define RGB_TO_ULONG(r, g, b) (((r) << 16) | ((g) << 8) | (b))
191#define RED_FROM_ULONG(color) (((color) >> 16) & 0xff)
192#define GREEN_FROM_ULONG(color) (((color) >> 8) & 0xff)
193#define BLUE_FROM_ULONG(color) ((color) & 0xff)
194#define RED16_FROM_ULONG(color) (RED_FROM_ULONG (color) * 0x101)
195#define GREEN16_FROM_ULONG(color) (GREEN_FROM_ULONG (color) * 0x101)
196#define BLUE16_FROM_ULONG(color) (BLUE_FROM_ULONG (color) * 0x101)
197
198#endif
199
178static void image_disable_image (struct frame *, struct image *); 200static void image_disable_image (struct frame *, struct image *);
179static void image_edge_detection (struct frame *, struct image *, Lisp_Object, 201static void image_edge_detection (struct frame *, struct image *, Lisp_Object,
180 Lisp_Object); 202 Lisp_Object);
@@ -831,6 +853,18 @@ image_create_bitmap_from_file (struct frame *f, Lisp_Object file)
831 xfree (contents); 853 xfree (contents);
832 return id; 854 return id;
833#endif 855#endif
856
857#ifdef HAVE_ANDROID
858#ifdef ANDROID_STUBIFY
859 ((void) dpyinfo);
860
861 /* This function should never be called when building stubs. */
862 emacs_abort ();
863#else
864 /* you lose, not yet implemented TODO */
865 return 0;
866#endif
867#endif
834} 868}
835 869
836/* Free bitmap B. */ 870/* Free bitmap B. */
@@ -3338,6 +3372,16 @@ image_create_x_image_and_pixmap_1 (struct frame *f, int width, int height, int d
3338 Emacs_Pix_Container *pimg, 3372 Emacs_Pix_Container *pimg,
3339 Emacs_Pixmap *pixmap, Picture *picture) 3373 Emacs_Pixmap *pixmap, Picture *picture)
3340{ 3374{
3375#ifdef HAVE_ANDROID
3376#ifdef ANDROID_STUBIFY
3377 /* This function should never be called when building stubs. */
3378 emacs_abort ();
3379#else
3380 /* you lose, not yet implemented TODO */
3381 return false;
3382#endif
3383#endif
3384
3341#ifdef USE_CAIRO 3385#ifdef USE_CAIRO
3342 eassert (input_blocked_p ()); 3386 eassert (input_blocked_p ());
3343 3387
@@ -3646,6 +3690,16 @@ image_unget_x_image_or_dc (struct image *img, bool mask_p,
3646static Emacs_Pix_Container 3690static Emacs_Pix_Container
3647image_get_x_image (struct frame *f, struct image *img, bool mask_p) 3691image_get_x_image (struct frame *f, struct image *img, bool mask_p)
3648{ 3692{
3693#ifdef HAVE_ANDROID
3694#ifdef ANDROID_STUBIFY
3695 /* This function should never be called when building stubs. */
3696 emacs_abort ();
3697#else
3698 /* you lose, not yet implemented TODO */
3699 return 0;
3700#endif
3701#endif
3702
3649#if defined USE_CAIRO || defined (HAVE_HAIKU) 3703#if defined USE_CAIRO || defined (HAVE_HAIKU)
3650 return !mask_p ? img->pixmap : img->mask; 3704 return !mask_p ? img->pixmap : img->mask;
3651#elif defined HAVE_X_WINDOWS 3705#elif defined HAVE_X_WINDOWS
@@ -3756,7 +3810,7 @@ slurp_file (int fd, ptrdiff_t *size)
3756 specpdl_ref count = SPECPDL_INDEX (); 3810 specpdl_ref count = SPECPDL_INDEX ();
3757 record_unwind_protect_ptr (fclose_unwind, fp); 3811 record_unwind_protect_ptr (fclose_unwind, fp);
3758 3812
3759 if (fstat (fileno (fp), &st) == 0 3813 if (sys_fstat (fileno (fp), &st) == 0
3760 && 0 <= st.st_size && st.st_size < min (PTRDIFF_MAX, SIZE_MAX)) 3814 && 0 <= st.st_size && st.st_size < min (PTRDIFF_MAX, SIZE_MAX))
3761 { 3815 {
3762 /* Report an error if we read past the purported EOF. 3816 /* Report an error if we read past the purported EOF.
@@ -6074,7 +6128,8 @@ lookup_rgb_color (struct frame *f, int r, int g, int b)
6074{ 6128{
6075#ifdef HAVE_NTGUI 6129#ifdef HAVE_NTGUI
6076 return PALETTERGB (r >> 8, g >> 8, b >> 8); 6130 return PALETTERGB (r >> 8, g >> 8, b >> 8);
6077#elif defined USE_CAIRO || defined HAVE_NS || defined HAVE_HAIKU 6131#elif defined USE_CAIRO || defined HAVE_NS || defined HAVE_HAIKU \
6132 || defined HAVE_ANDROID
6078 return RGB_TO_ULONG (r >> 8, g >> 8, b >> 8); 6133 return RGB_TO_ULONG (r >> 8, g >> 8, b >> 8);
6079#else 6134#else
6080 xsignal1 (Qfile_error, 6135 xsignal1 (Qfile_error,
@@ -6147,7 +6202,8 @@ image_to_emacs_colors (struct frame *f, struct image *img, bool rgb_p)
6147 p = colors; 6202 p = colors;
6148 for (y = 0; y < img->height; ++y) 6203 for (y = 0; y < img->height; ++y)
6149 { 6204 {
6150#if !defined USE_CAIRO && !defined HAVE_NS && !defined HAVE_HAIKU 6205#if !defined USE_CAIRO && !defined HAVE_NS && !defined HAVE_HAIKU \
6206 && !defined HAVE_ANDROID
6151 Emacs_Color *row = p; 6207 Emacs_Color *row = p;
6152 for (x = 0; x < img->width; ++x, ++p) 6208 for (x = 0; x < img->width; ++x, ++p)
6153 p->pixel = GET_PIXEL (ximg, x, y); 6209 p->pixel = GET_PIXEL (ximg, x, y);
@@ -6155,7 +6211,7 @@ image_to_emacs_colors (struct frame *f, struct image *img, bool rgb_p)
6155 { 6211 {
6156 FRAME_TERMINAL (f)->query_colors (f, row, img->width); 6212 FRAME_TERMINAL (f)->query_colors (f, row, img->width);
6157 } 6213 }
6158#else /* USE_CAIRO || HAVE_NS || HAVE_HAIKU */ 6214#else /* USE_CAIRO || HAVE_NS || HAVE_HAIKU || HAVE_ANDROID */
6159 for (x = 0; x < img->width; ++x, ++p) 6215 for (x = 0; x < img->width; ++x, ++p)
6160 { 6216 {
6161 p->pixel = GET_PIXEL (ximg, x, y); 6217 p->pixel = GET_PIXEL (ximg, x, y);
@@ -6166,7 +6222,7 @@ image_to_emacs_colors (struct frame *f, struct image *img, bool rgb_p)
6166 p->blue = BLUE16_FROM_ULONG (p->pixel); 6222 p->blue = BLUE16_FROM_ULONG (p->pixel);
6167 } 6223 }
6168 } 6224 }
6169#endif /* USE_CAIRO || HAVE_NS */ 6225#endif /* USE_CAIRO || HAVE_NS || HAVE_ANDROID */
6170 } 6226 }
6171 6227
6172 image_unget_x_image_or_dc (img, 0, ximg, prev); 6228 image_unget_x_image_or_dc (img, 0, ximg, prev);
@@ -6231,7 +6287,11 @@ image_from_emacs_colors (struct frame *f, struct image *img, Emacs_Color *colors
6231 Emacs_Pix_Container ximage; 6287 Emacs_Pix_Container ximage;
6232 Emacs_Color *p; 6288 Emacs_Color *p;
6233 6289
6290#ifndef HAVE_ANDROID
6234 ximage = NULL; 6291 ximage = NULL;
6292#else
6293 ximage = 0;
6294#endif
6235 6295
6236 init_color_table (); 6296 init_color_table ();
6237 6297
@@ -6393,7 +6453,9 @@ image_edge_detection (struct frame *f, struct image *img,
6393} 6453}
6394 6454
6395 6455
6396#if defined HAVE_X_WINDOWS || defined USE_CAIRO || defined HAVE_HAIKU 6456#if defined HAVE_X_WINDOWS || defined USE_CAIRO || defined HAVE_HAIKU \
6457 || defined HAVE_ANDROID
6458
6397static void 6459static void
6398image_pixmap_draw_cross (struct frame *f, Emacs_Pixmap pixmap, 6460image_pixmap_draw_cross (struct frame *f, Emacs_Pixmap pixmap,
6399 int x, int y, unsigned int width, unsigned int height, 6461 int x, int y, unsigned int width, unsigned int height,
@@ -6429,8 +6491,16 @@ image_pixmap_draw_cross (struct frame *f, Emacs_Pixmap pixmap,
6429 XFreeGC (dpy, gc); 6491 XFreeGC (dpy, gc);
6430#elif HAVE_HAIKU 6492#elif HAVE_HAIKU
6431 be_draw_cross_on_pixmap (pixmap, x, y, width, height, color); 6493 be_draw_cross_on_pixmap (pixmap, x, y, width, height, color);
6494#elif HAVE_ANDROID
6495#ifdef ANDROID_STUBIFY
6496 /* This function should never be called when building stubs. */
6497 emacs_abort ();
6498#else
6499 /* you lose, not yet implemented TODO */
6500#endif
6432#endif 6501#endif
6433} 6502}
6503
6434#endif /* HAVE_X_WINDOWS || USE_CAIRO || HAVE_HAIKU */ 6504#endif /* HAVE_X_WINDOWS || USE_CAIRO || HAVE_HAIKU */
6435 6505
6436/* Transform image IMG on frame F so that it looks disabled. */ 6506/* Transform image IMG on frame F so that it looks disabled. */
@@ -6474,7 +6544,7 @@ image_disable_image (struct frame *f, struct image *img)
6474#ifndef HAVE_NTGUI 6544#ifndef HAVE_NTGUI
6475#ifndef HAVE_NS /* TODO: NS support, however this not needed for toolbars */ 6545#ifndef HAVE_NS /* TODO: NS support, however this not needed for toolbars */
6476 6546
6477#if !defined USE_CAIRO && !defined HAVE_HAIKU 6547#if !defined USE_CAIRO && !defined HAVE_HAIKU && !defined HAVE_ANDROID
6478#define CrossForeground(f) BLACK_PIX_DEFAULT (f) 6548#define CrossForeground(f) BLACK_PIX_DEFAULT (f)
6479#define MaskForeground(f) WHITE_PIX_DEFAULT (f) 6549#define MaskForeground(f) WHITE_PIX_DEFAULT (f)
6480#else /* USE_CAIRO || HAVE_HAIKU */ 6550#else /* USE_CAIRO || HAVE_HAIKU */
@@ -6482,7 +6552,7 @@ image_disable_image (struct frame *f, struct image *img)
6482#define MaskForeground(f) PIX_MASK_DRAW 6552#define MaskForeground(f) PIX_MASK_DRAW
6483#endif /* USE_CAIRO || HAVE_HAIKU */ 6553#endif /* USE_CAIRO || HAVE_HAIKU */
6484 6554
6485#if !defined USE_CAIRO && !defined HAVE_HAIKU 6555#if !defined USE_CAIRO && !defined HAVE_HAIKU && !defined HAVE_ANDROID
6486 image_sync_to_pixmaps (f, img); 6556 image_sync_to_pixmaps (f, img);
6487#endif /* !USE_CAIRO && !HAVE_HAIKU */ 6557#endif /* !USE_CAIRO && !HAVE_HAIKU */
6488 image_pixmap_draw_cross (f, img->pixmap, 0, 0, img->width, img->height, 6558 image_pixmap_draw_cross (f, img->pixmap, 0, 0, img->width, img->height,
@@ -9099,7 +9169,7 @@ gif_load (struct frame *f, struct image *img)
9099 `image-cache-size'. */ 9169 `image-cache-size'. */
9100 struct stat st; 9170 struct stat st;
9101 FILE *fp = fopen (SSDATA (encoded_file), "rb"); 9171 FILE *fp = fopen (SSDATA (encoded_file), "rb");
9102 if (fstat (fileno (fp), &st) == 0) 9172 if (sys_fstat (fileno (fp), &st) == 0)
9103 byte_size = st.st_size; 9173 byte_size = st.st_size;
9104 fclose (fp); 9174 fclose (fp);
9105 } 9175 }