mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 19:10:37 -08:00
Code Issues Projects Releases Wiki Activity

Update Android port

Browse source 
* java/org/gnu/emacs/EmacsContextMenu.java (display): Use
`EmacsHolder' instead of `Holder'.
* java/org/gnu/emacs/EmacsDialog.java (toAlertDialog): Use
`EmacsDialogButtonLayout' to ensure that buttons are wrapped
properly.
(display): Adjust for new holder class.
* java/org/gnu/emacs/EmacsDialogButtonLayout.java
(EmacsDialogButtonLayout, onMeasure, onLayout): New functions.

* java/org/gnu/emacs/EmacsDrawLine.java:
* java/org/gnu/emacs/EmacsFillPolygon.java: Remove redundant
imports.
* java/org/gnu/emacs/EmacsHolder.java (EmacsHolder<T>):
* java/org/gnu/emacs/EmacsService.java (class Holder<T>)
(getEmacsView, EmacsService): Rename `Holder' to `EmacsHolder'
and make it public.
This commit is contained in:
Po Lu 2023-06-06 14:35:19 +08:00
parent 5f09df3d6a
commit 5b4dea0fc7
7 changed files with 195 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
java/org/gnu/emacs/EmacsContextMenu.java
View file

@ -331,9 +331,9 @@ public final class EmacsContextMenu
final int yPosition, final int serial)
{
Runnable runnable;
final Holder<Boolean> rc;
final EmacsHolder<Boolean> rc;
rc = new Holder<Boolean> ();
rc = new EmacsHolder<Boolean> ();
runnable = new Runnable () {
@Override

17
java/org/gnu/emacs/EmacsDialog.java
View file

@ -150,7 +150,7 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
AlertDialog dialog;
int size;
EmacsButton button;
LinearLayout layout;
EmacsDialogButtonLayout layout;
Button buttonView;
ViewGroup.LayoutParams layoutParams;
@ -192,19 +192,16 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
}
else
{
/* There are more than 4 buttons. Add them all to a
LinearLayout. */
layout = new LinearLayout (context);
layoutParams
= new LinearLayout.LayoutParams (ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
/* There are more than 3 buttons. Add them all to a special
container widget that handles wrapping. */
layout = new EmacsDialogButtonLayout (context);
for (EmacsButton emacsButton : buttons)
{
buttonView = new Button (context);
buttonView.setText (emacsButton.name);
buttonView.setOnClickListener (emacsButton);
buttonView.setLayoutParams (layoutParams);
buttonView.setEnabled (emacsButton.enabled);
layout.addView (buttonView);
}
@ -336,9 +333,9 @@ public final class EmacsDialog implements DialogInterface.OnDismissListener
display ()
{
Runnable runnable;
final Holder<Boolean> rc;
final EmacsHolder<Boolean> rc;
rc = new Holder<Boolean> ();
rc = new EmacsHolder<Boolean> ();
runnable = new Runnable () {
@Override
public void

152
java/org/gnu/emacs/EmacsDialogButtonLayout.java Normal file
View file

@ -0,0 +1,152 @@
/* Communication module for Android terminals. -*- c-file-style: "GNU" -*-
Copyright (C) 2023 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or (at
your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
package org.gnu.emacs;
import android.content.Context;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.ViewGroup;
/* This ``view group'' implements a container widget for multiple
buttons of the type found in pop-up dialogs. It is used when
displaying a dialog box that contains more than three buttons, as
the default dialog box widget is not capable of holding more than
that many. */
public class EmacsDialogButtonLayout extends ViewGroup
{
public
EmacsDialogButtonLayout (Context context)
{
super (context);
}
@Override
protected void
onMeasure (int widthMeasureSpec, int heightMeasureSpec)
{
int width, count, i, x, y, height, spec, tempSpec;
View view;
/* Obtain the width of this widget and create the measure
specification used to measure children. */
width = MeasureSpec.getSize (widthMeasureSpec);
spec = MeasureSpec.makeMeasureSpec (0, MeasureSpec.UNSPECIFIED);
tempSpec
= MeasureSpec.makeMeasureSpec (width, MeasureSpec.AT_MOST);
x = y = height = 0;
/* Run through each widget. */
count = getChildCount ();
for (i = 0; i < count; ++i)
{
view = getChildAt (i);
/* Measure this view. */
view.measure (spec, spec);
if (width - x < view.getMeasuredWidth ())
{
/* Move onto the next line, unless this line is empty. */
if (x != 0)
{
y += height;
height = x = 0;
}
if (view.getMeasuredWidth () > width)
/* Measure the view again, this time forcing it to be at
most width wide, if it is not already. */
view.measure (tempSpec, spec);
}
height = Math.max (height, view.getMeasuredHeight ());
x += view.getMeasuredWidth ();
}
/* Now set the measured size of this widget. */
setMeasuredDimension (width, y + height);
}
@Override
protected void
onLayout (boolean changed, int left, int top, int right,
int bottom)
{
int width, count, i, x, y, height, spec, tempSpec;
View view;
/* Obtain the width of this widget and create the measure
specification used to measure children. */
width = getMeasuredWidth ();
spec = MeasureSpec.makeMeasureSpec (0, MeasureSpec.UNSPECIFIED);
tempSpec
= MeasureSpec.makeMeasureSpec (width, MeasureSpec.AT_MOST);
x = y = height = 0;
/* Run through each widget. */
count = getChildCount ();
for (i = 0; i < count; ++i)
{
view = getChildAt (i);
/* Measure this view. */
view.measure (spec, spec);
if (width - x < view.getMeasuredWidth ())
{
/* Move onto the next line, unless this line is empty. */
if (x != 0)
{
y += height;
height = x = 0;
}
if (view.getMeasuredWidth () > width)
/* Measure the view again, this time forcing it to be at
most width wide, if it is not already. */
view.measure (tempSpec, spec);
}
/* Now assign this view its position. */
view.layout (x, y, x + view.getMeasuredWidth (),
y + view.getMeasuredHeight ());
/* And move on to the next widget. */
height = Math.max (height, view.getMeasuredHeight ());
x += view.getMeasuredWidth ();
}
}
};

2
java/org/gnu/emacs/EmacsDrawLine.java
View file

@ -19,8 +19,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
package org.gnu.emacs;
import java.lang.Math;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;

2
java/org/gnu/emacs/EmacsFillPolygon.java
View file

@ -19,8 +19,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
package org.gnu.emacs;
import java.lang.Math;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Path;

30
java/org/gnu/emacs/EmacsHolder.java Normal file
View file

@ -0,0 +1,30 @@
/* Communication module for Android terminals. -*- c-file-style: "GNU" -*-
Copyright (C) 2023 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or (at
your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
package org.gnu.emacs;
/* This class serves as a simple reference to an object of type T.
Nothing could be found inside the standard library. */
public class EmacsHolder<T>
{
T thing;
};

13
java/org/gnu/emacs/EmacsService.java
View file

@ -71,11 +71,6 @@ import android.util.DisplayMetrics;
import android.widget.Toast;
class Holder<T>
{
T thing;
};
/* EmacsService is the service that starts the thread running Emacs
and handles requests by that Emacs instance. */
@ -282,9 +277,9 @@ public final class EmacsService extends Service
final boolean isFocusedByDefault)
{
Runnable runnable;
final Holder<EmacsView> view;
final EmacsHolder<EmacsView> view;
view = new Holder<EmacsView> ();
view = new EmacsHolder<EmacsView> ();
runnable = new Runnable () {
public void
@ -604,10 +599,10 @@ public final class EmacsService extends Service
public ClipboardManager
getClipboardManager ()
{
final Holder<ClipboardManager> manager;
final EmacsHolder<ClipboardManager> manager;
Runnable runnable;
manager = new Holder<ClipboardManager> ();
manager = new EmacsHolder<ClipboardManager> ();
runnable = new Runnable () {
public void