diff options
| author | Po Lu | 2024-12-21 08:53:21 +0800 |
|---|---|---|
| committer | Po Lu | 2024-12-21 08:53:21 +0800 |
| commit | 2d173aa3d34e60206f4889eb0220aa2269b3ed4d (patch) | |
| tree | 42247132626e532522d70f64c53963dbdd466973 /src | |
| parent | b71ddaf6d3ac39487302fbc27614b9de28bf6cef (diff) | |
| download | emacs-2d173aa3d34e60206f4889eb0220aa2269b3ed4d.tar.gz emacs-2d173aa3d34e60206f4889eb0220aa2269b3ed4d.zip | |
Fix a number of Android compilation warnings
* src/dispnew.c (frame_rect_abs, frame_pos_abs, rect_intersect)
(copy_child_glyphs, abs_cursor_pos, is_in_matrix)
(is_cursor_obscured) [HAVE_ANDROID]: Delete functions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispnew.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index c252781b235..a3c02742082 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -3288,6 +3288,8 @@ struct rect | |||
| 3288 | int x, y, w, h; | 3288 | int x, y, w, h; |
| 3289 | }; | 3289 | }; |
| 3290 | 3290 | ||
| 3291 | #ifndef HAVE_ANDROID | ||
| 3292 | |||
| 3291 | /* Compute the intersection of R1 and R2 in R. Value is true if R1 and | 3293 | /* Compute the intersection of R1 and R2 in R. Value is true if R1 and |
| 3292 | R2 intersect, false otherwise. */ | 3294 | R2 intersect, false otherwise. */ |
| 3293 | 3295 | ||
| @@ -3330,6 +3332,8 @@ frame_rect_abs (struct frame *f) | |||
| 3330 | return (struct rect) { x, y, f->total_cols, f->total_lines }; | 3332 | return (struct rect) { x, y, f->total_cols, f->total_lines }; |
| 3331 | } | 3333 | } |
| 3332 | 3334 | ||
| 3335 | #endif /* !HAVE_ANDROID */ | ||
| 3336 | |||
| 3333 | /* Return the root frame of frame F. Follow the parent_frame chain | 3337 | /* Return the root frame of frame F. Follow the parent_frame chain |
| 3334 | until we reach a frame that has no parent. That is the root frame. | 3338 | until we reach a frame that has no parent. That is the root frame. |
| 3335 | Note that the root of a root frame is itself. */ | 3339 | Note that the root of a root frame is itself. */ |
| @@ -3512,6 +3516,8 @@ make_matrix_current (struct frame *f) | |||
| 3512 | make_current (f, NULL, i); | 3516 | make_current (f, NULL, i); |
| 3513 | } | 3517 | } |
| 3514 | 3518 | ||
| 3519 | #ifndef HAVE_ANDROID | ||
| 3520 | |||
| 3515 | /* Prepare ROOT's desired row at index Y for copying child frame | 3521 | /* Prepare ROOT's desired row at index Y for copying child frame |
| 3516 | contents to it. Value is the prepared desired row or NULL if we | 3522 | contents to it. Value is the prepared desired row or NULL if we |
| 3517 | don't have, and can't contruct a desired row. */ | 3523 | don't have, and can't contruct a desired row. */ |
| @@ -3745,6 +3751,8 @@ copy_child_glyphs (struct frame *root, struct frame *child) | |||
| 3745 | } | 3751 | } |
| 3746 | } | 3752 | } |
| 3747 | 3753 | ||
| 3754 | #endif /* !HAVE_ANDROID */ | ||
| 3755 | |||
| 3748 | /*********************************************************************** | 3756 | /*********************************************************************** |
| 3749 | Frame Update | 3757 | Frame Update |
| 3750 | ***********************************************************************/ | 3758 | ***********************************************************************/ |
| @@ -3837,6 +3845,8 @@ update_tty_frame (struct frame *f) | |||
| 3837 | build_frame_matrix (f); | 3845 | build_frame_matrix (f); |
| 3838 | } | 3846 | } |
| 3839 | 3847 | ||
| 3848 | #ifndef HAVE_ANDROID | ||
| 3849 | |||
| 3840 | /* Return the cursor position of the selected window of frame F, in | 3850 | /* Return the cursor position of the selected window of frame F, in |
| 3841 | absolute coordinates in *X and *Y. Note that if F is a child frame, | 3851 | absolute coordinates in *X and *Y. Note that if F is a child frame, |
| 3842 | its cursor may be clipped, i.e. outside of the bounds of the terminal | 3852 | its cursor may be clipped, i.e. outside of the bounds of the terminal |
| @@ -3903,8 +3913,6 @@ is_cursor_obscured (void) | |||
| 3903 | return cursor_glyph->frame != SELECTED_FRAME (); | 3913 | return cursor_glyph->frame != SELECTED_FRAME (); |
| 3904 | } | 3914 | } |
| 3905 | 3915 | ||
| 3906 | #ifndef HAVE_ANDROID | ||
| 3907 | |||
| 3908 | /* Decide where to show the cursor, and whether to hide it. | 3916 | /* Decide where to show the cursor, and whether to hide it. |
| 3909 | 3917 | ||
| 3910 | This works very well for Vertico-Posframe, Transient-Posframe and | 3918 | This works very well for Vertico-Posframe, Transient-Posframe and |