diff options
author | Po Lu <luangruo@yahoo.com> | 2023-01-08 15:42:37 +0800 |
---|---|---|
committer | Po Lu <luangruo@yahoo.com> | 2023-01-08 15:42:37 +0800 |
commit | 1584a58efd63d6806dbff51adcbfec054533b316 (patch) | |
tree | e0643f64d568fa2f8a6a0be757825fea08a80eda /src/androidgui.h | |
parent | 86fe89312893bbc8aa47605afbf8da8cd5a12faf (diff) | |
download | emacs-1584a58efd63d6806dbff51adcbfec054533b316.tar.gz |
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/androidgui.h')
-rw-r--r-- | src/androidgui.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/androidgui.h b/src/androidgui.h index b0ea820cfdf..d51b73a764d 100644 --- a/src/androidgui.h +++ b/src/androidgui.h @@ -204,6 +204,11 @@ enum android_event_type ANDROID_FOCUS_IN, ANDROID_FOCUS_OUT, ANDROID_WINDOW_ACTION, + ANDROID_ENTER_NOTIFY, + ANDROID_LEAVE_NOTIFY, + ANDROID_MOTION_NOTIFY, + ANDROID_BUTTON_PRESS, + ANDROID_BUTTON_RELEASE, }; struct android_any_event @@ -268,6 +273,32 @@ struct android_window_action_event unsigned int action; }; +struct android_crossing_event +{ + enum android_event_type type; + android_window window; + int x, y; + unsigned long time; +}; + +struct android_motion_event +{ + enum android_event_type type; + android_window window; + int x, y; + unsigned long time; +}; + +struct android_button_event +{ + enum android_event_type type; + android_window window; + int x, y; + unsigned long time; + unsigned int state; + unsigned int button; +}; + union android_event { enum android_event_type type; @@ -276,6 +307,9 @@ union android_event struct android_configure_event xconfigure; struct android_focus_event xfocus; struct android_window_action_event xaction; + struct android_crossing_event xcrossing; + struct android_motion_event xmotion; + struct android_button_event xbutton; }; extern int android_pending (void); |