diff options
| author | Po Lu | 2023-01-08 15:42:37 +0800 |
|---|---|---|
| committer | Po Lu | 2023-01-08 15:42:37 +0800 |
| commit | 1584a58efd63d6806dbff51adcbfec054533b316 (patch) | |
| tree | e0643f64d568fa2f8a6a0be757825fea08a80eda /src/androidterm.h | |
| parent | 86fe89312893bbc8aa47605afbf8da8cd5a12faf (diff) | |
| download | emacs-1584a58efd63d6806dbff51adcbfec054533b316.tar.gz emacs-1584a58efd63d6806dbff51adcbfec054533b316.zip | |
Update Android port
Note that the port currently does not work as of this check-in.
* src/android.c (android_change_gc): Fix situations where clip
rects are cleared.
(android_create_pixmap_from_bitmap_data): Fix bitmap data
iteration.
* src/androidfns.c (Fx_show_tip, Fx_hide_tip): Remove annoying
errors.
* src/androidgui.h (enum android_event_type):
(struct android_crossing_event):
(struct android_motion_event):
(struct android_button_event):
(union android_event): New crossing, motion and button events.
* src/androidterm.c (android_note_mouse_movement)
(mouse_or_wdesc_frame, android_construct_mouse_click)
(handle_one_android_event, android_mouse_position)
(android_wait_for_event, android_set_window_size_1)
(android_bitmap_icon, android_free_frame_resources)
(syms_of_androidterm): New functions. Handle crossing, motion
and button events.
* src/androidterm.h (struct android_display_info): New field
`last_mouse_movement_time'.
(struct android_output): Remove unused `need_buffer_flip' field.
* src/emacs.c (android_emacs_init): Initialize sfntfont.
* src/frame.c (syms_of_frame): Set frame_inhibit_implied_resize
to some reasonable value.
* src/frame.h (GCALIGNED_STRUCT): Set wait_event_type on
Android.
* src/sfnt.c (eassert):
(TEST_STATIC):
(available):
(enum sfnt_table):
(sfnt_table_names):
(SFNT_ENDOF):
(struct sfnt_table_directory):
(enum sfnt_scaler_type):
(sfnt_coerce_fixed):
(struct sfnt_hhea_table):
(struct sfnt_cmap_table):
(enum sfnt_platform_id):
(enum sfnt_unicode_platform_specific_id):
(enum sfnt_macintosh_platform_specific_id):
(enum sfnt_microsoft_platform_specific_id):
(struct sfnt_cmap_encoding_subtable):
(struct sfnt_cmap_encoding_subtable_data):
(struct sfnt_cmap_format_0):
(struct sfnt_cmap_format_2_subheader):
(struct sfnt_cmap_format_2):
(struct sfnt_cmap_format_4):
(struct sfnt_cmap_format_6):
(struct sfnt_cmap_format_8_or_12_group):
(struct sfnt_cmap_format_8):
(struct sfnt_cmap_format_12):
(struct sfnt_maxp_table):
(struct sfnt_loca_table_short):
(struct sfnt_loca_table_long):
(struct sfnt_glyf_table):
(struct sfnt_simple_glyph):
(struct sfnt_compound_glyph_component):
(struct sfnt_compound_glyph):
(struct sfnt_glyph):
(sfnt_read_table_directory):
(file):
(sfnt_read_cmap_table):
(sfnt_read_head_table):
(success):
(sfnt_read_hhea_table):
(sfnt_read_loca_table_short):
(sfnt_read_loca_table_long):
(sfnt_read_maxp_table):
(sfnt_read_glyf_table):
(sfnt_read_compound_glyph):
(sfnt_read_glyph):
(struct sfnt_point):
(sfnt_expand_compound_glyph_context):
(sfnt_decompose_compound_glyph):
(struct sfnt_glyph_outline):
(enum sfnt_glyph_outline_flags):
(struct sfnt_build_glyph_outline_context):
(sfnt_build_append):
(sfnt_build_glyph_outline):
(struct sfnt_raster):
(struct sfnt_edge):
(sfnt_prepare_raster):
(sfnt_build_outline_edges):
(sfnt_raster_glyph_outline): Move structures to sfnt.h.
(struct sfnt_long_hor_metric):
(struct sfnt_hmtx_table):
(struct sfnt_glyph_metrics):
(sfnt_read_hmtx_table):
(sfnt_lookup_glyph_metrics):
(sfnt_read_name_table):
(sfnt_find_name):
(sfnt_read_meta_table):
(sfnt_find_metadata):
(sfnt_test_edge_ignore): New functions.
(main): Add new tests.
* src/xdisp.c (redisplay_tool_bar):
Diffstat (limited to 'src/androidterm.h')
| -rw-r--r-- | src/androidterm.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/androidterm.h b/src/androidterm.h index c834ffb70e5..562dcdead17 100644 --- a/src/androidterm.h +++ b/src/androidterm.h | |||
| @@ -129,6 +129,9 @@ struct android_display_info | |||
| 129 | 129 | ||
| 130 | /* Where the mouse was the last time the mouse moved. */ | 130 | /* Where the mouse was the last time the mouse moved. */ |
| 131 | Emacs_Rectangle last_mouse_glyph; | 131 | Emacs_Rectangle last_mouse_glyph; |
| 132 | |||
| 133 | /* The time of the last mouse movement. */ | ||
| 134 | Time last_mouse_movement_time; | ||
| 132 | }; | 135 | }; |
| 133 | 136 | ||
| 134 | struct android_output | 137 | struct android_output |
| @@ -193,11 +196,6 @@ struct android_output | |||
| 193 | and inactive states. */ | 196 | and inactive states. */ |
| 194 | bool_bf alpha_identical_p : 1; | 197 | bool_bf alpha_identical_p : 1; |
| 195 | 198 | ||
| 196 | /* Flag that indicates whether we've modified the back buffer and | ||
| 197 | need to publish our modifications to the front buffer at a | ||
| 198 | convenient time. */ | ||
| 199 | bool_bf need_buffer_flip : 1; | ||
| 200 | |||
| 201 | /* Flag that indicates whether or not the frame contents are | 199 | /* Flag that indicates whether or not the frame contents are |
| 202 | complete and can be safely flushed while handling async | 200 | complete and can be safely flushed while handling async |
| 203 | input. */ | 201 | input. */ |
| @@ -376,6 +374,11 @@ extern void syms_of_androidfont (void); | |||
| 376 | 374 | ||
| 377 | extern void android_finalize_font_entity (struct font_entity *); | 375 | extern void android_finalize_font_entity (struct font_entity *); |
| 378 | 376 | ||
| 377 | /* Defined in sfntfont-android.c. */ | ||
| 378 | |||
| 379 | extern void init_sfntfont_android (void); | ||
| 380 | extern void syms_of_sfntfont_android (void); | ||
| 381 | |||
| 379 | 382 | ||
| 380 | 383 | ||
| 381 | #define RGB_TO_ULONG(r, g, b) (((r) << 16) | ((g) << 8) | (b)) | 384 | #define RGB_TO_ULONG(r, g, b) (((r) << 16) | ((g) << 8) | (b)) |