widget: show software keyboard when a writable Editor is clicked

Extracted from https://github.com/gioui/gio/pull/138 by Inkeliz.

References: https://todo.sr.ht/~eliasnaur/gio/591
Signed-off-by: Elias Naur <mail@eliasnaur.com>

.builds/apple.yml

@@ -29,7 +29,7 @@ environment:
 tasks:
  - install_go: |
      mkdir -p /home/build/sdk
-     curl -s https://dl.google.com/go/go1.19.11.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
+     curl -s https://dl.google.com/go/go1.22.2.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
  - prepare_toolchain: |
      mkdir -p $APPLE_TOOLCHAIN_ROOT
      cd $APPLE_TOOLCHAIN_ROOT

.builds/freebsd.yml

@@ -16,7 +16,7 @@ environment:
 tasks:
  - install_go: |
      mkdir -p /home/build/sdk
-     curl https://dl.google.com/go/go1.19.11.freebsd-amd64.tar.gz | tar -C /home/build/sdk -xzf -
+     curl https://dl.google.com/go/go1.22.2.freebsd-amd64.tar.gz | tar -C /home/build/sdk -xzf -
  - test_gio: |
      cd gio
      go test ./...

.builds/linux.yml

@@ -40,7 +40,7 @@ secrets:
 tasks:
  - install_go: |
      mkdir -p /home/build/sdk
-     curl -s https://dl.google.com/go/go1.19.11.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
+     curl -s https://dl.google.com/go/go1.22.2.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
  - check_gofmt: |
      cd gio
      test -z "$(gofmt -s -l .)"

.builds/openbsd.yml

@@ -10,7 +10,7 @@ environment:
 tasks:
  - install_go: |
      mkdir -p /home/build/sdk
-     curl https://dl.google.com/go/go1.19.11.src.tar.gz | tar -C /home/build/sdk -xzf -
+     curl https://dl.google.com/go/go1.22.2.src.tar.gz | tar -C /home/build/sdk -xzf -
      cd /home/build/sdk/go/src
      ./make.bash
  - test_gio: |

app/app.go

@@ -120,6 +120,18 @@ func DataDir() (string, error) {
 	return dataDir()
 }
 
+// Main must be called last from the program main function.
+// On most platforms Main blocks forever, for Android and
+// iOS it returns immediately to give control of the main
+// thread back to the system.
+//
+// Calling Main is necessary because some operating systems
+// require control of the main thread of the program for
+// running windows.
+func Main() {
+	osMain()
+}
+
 func (FrameEvent) ImplementsEvent() {}
 
 func init() {

app/doc.go

@@ -33,12 +33,28 @@ For example:
 A program must keep receiving events from the event channel until
 [DestroyEvent] is received.
 
-# Main Thread
+# Main
 
-Some GUI platform need access to the main thread of the program. To avoid a
+The Main function must be called from a program's main function, to hand over
-deadlock on such platforms, at least one Window must have its Event method
+control of the main thread to operating systems that need it.
-called by the main goroutine. It doesn't have to be any particular Window;
+
-even a destroyed Window suffices.
+Because Main is also blocking on some platforms, the event loop of a Window must run in a goroutine.
+
+For example, to display a blank but otherwise functional window:
+
+	package main
+
+	import "gioui.org/app"
+
+	func main() {
+		go func() {
+			w := app.NewWindow()
+			for {
+				w.Event()
+			}
+		}()
+		app.Main()
+	}
 
 # Permissions
 

app/egl_android.go

@@ -17,9 +17,8 @@ import (
 )
 
 type androidContext struct {
-	win           *window
+	win     *window
-	eglSurf       egl.NativeWindowType
+	eglSurf egl.NativeWindowType
-	width, height int
 	*egl.Context
 }
 
@@ -45,9 +44,8 @@ func (c *androidContext) Refresh() error {
 	if err := c.win.setVisual(c.Context.VisualID()); err != nil {
 		return err
 	}
-	win, width, height := c.win.nativeWindow()
+	win, _, _ := c.win.nativeWindow()
 	c.eglSurf = egl.NativeWindowType(unsafe.Pointer(win))
-	c.width, c.height = width, height
 	return nil
 }
 
@@ -55,7 +53,7 @@ func (c *androidContext) Lock() error {
 	// The Android emulator creates a broken surface if it is not
 	// created on the same thread as the context is made current.
 	if c.eglSurf != nil {
-		if err := c.Context.CreateSurface(c.eglSurf, c.width, c.height); err != nil {
+		if err := c.Context.CreateSurface(c.eglSurf); err != nil {
 			return err
 		}
 		c.eglSurf = nil

app/egl_wayland.go

@@ -69,7 +69,7 @@ func (c *wlContext) Refresh() error {
 	}
 	c.eglWin = eglWin
 	eglSurf := egl.NativeWindowType(uintptr(unsafe.Pointer(eglWin)))
-	if err := c.Context.CreateSurface(eglSurf, width, height); err != nil {
+	if err := c.Context.CreateSurface(eglSurf); err != nil {
 		return err
 	}
 	if err := c.Context.MakeCurrent(); err != nil {

app/egl_windows.go

@@ -5,8 +5,6 @@
 package app
 
 import (
-	"golang.org/x/sys/windows"
-
 	"gioui.org/internal/egl"
 )
 
@@ -24,6 +22,18 @@ func init() {
 			if err != nil {
 				return nil, err
 			}
+			win, _, _ := w.HWND()
+			eglSurf := egl.NativeWindowType(win)
+			if err := ctx.CreateSurface(eglSurf); err != nil {
+				ctx.Release()
+				return nil, err
+			}
+			if err := ctx.MakeCurrent(); err != nil {
+				ctx.Release()
+				return nil, err
+			}
+			defer ctx.ReleaseCurrent()
+			ctx.EnableVSync(true)
 			return &glContext{win: w, Context: ctx}, nil
 		},
 	})
@@ -37,21 +47,6 @@ func (c *glContext) Release() {
 }
 
 func (c *glContext) Refresh() error {
-	c.Context.ReleaseSurface()
-	var (
-		win           windows.Handle
-		width, height int
-	)
-	win, width, height = c.win.HWND()
-	eglSurf := egl.NativeWindowType(win)
-	if err := c.Context.CreateSurface(eglSurf, width, height); err != nil {
-		return err
-	}
-	if err := c.Context.MakeCurrent(); err != nil {
-		return err
-	}
-	c.Context.EnableVSync(true)
-	c.Context.ReleaseCurrent()
 	return nil
 }
 

app/egl_x11.go

@@ -25,6 +25,18 @@ func init() {
 		if err != nil {
 			return nil, err
 		}
+		win, _, _ := w.window()
+		eglSurf := egl.NativeWindowType(uintptr(win))
+		if err := ctx.CreateSurface(eglSurf); err != nil {
+			ctx.Release()
+			return nil, err
+		}
+		if err := ctx.MakeCurrent(); err != nil {
+			ctx.Release()
+			return nil, err
+		}
+		defer ctx.ReleaseCurrent()
+		ctx.EnableVSync(true)
 		return &x11Context{win: w, Context: ctx}, nil
 	}
 }
@@ -37,17 +49,6 @@ func (c *x11Context) Release() {
 }
 
 func (c *x11Context) Refresh() error {
-	c.Context.ReleaseSurface()
-	win, width, height := c.win.window()
-	eglSurf := egl.NativeWindowType(uintptr(win))
-	if err := c.Context.CreateSurface(eglSurf, width, height); err != nil {
-		return err
-	}
-	if err := c.Context.MakeCurrent(); err != nil {
-		return err
-	}
-	defer c.Context.ReleaseCurrent()
-	c.Context.EnableVSync(true)
 	return nil
 }
 

app/os.go

@@ -176,7 +176,7 @@ type context interface {
 // basicDriver is the subset of [driver] that may be called even after
 // a window is destroyed.
 type basicDriver interface {
-	// Event blocks until an even is available and returns it.
+	// Event blocks until an event is available and returns it.
 	Event() event.Event
 	// Invalidate requests a FrameEvent.
 	Invalidate()

app/os_android.go

@@ -1317,6 +1317,9 @@ func findClass(env *C.JNIEnv, name string) C.jclass {
 	return C.jni_FindClass(env, cn)
 }
 
+func osMain() {
+}
+
 func newWindow(window *callbacks, options []Option) {
 	mainWindow.in <- windowAndConfig{window, options}
 	<-mainWindow.windows

app/os_darwin.go

@@ -15,8 +15,8 @@ __attribute__ ((visibility ("hidden"))) void gio_hideCursor();
 __attribute__ ((visibility ("hidden"))) void gio_showCursor();
 __attribute__ ((visibility ("hidden"))) void gio_setCursor(NSUInteger curID);
 
-static int isMainThread() {
+static bool isMainThread() {
-	return [NSThread isMainThread] ? 1 : 0;
+	return [NSThread isMainThread];
 }
 
 static NSUInteger nsstringLength(CFTypeRef cstr) {
@@ -75,6 +75,10 @@ var displayLinks sync.Map
 
 var mainFuncs = make(chan func(), 1)
 
+func isMainThread() bool {
+	return bool(C.isMainThread())
+}
+
 // runOnMain runs the function on the main thread.
 func runOnMain(f func()) {
 	if isMainThread() {
@@ -87,10 +91,6 @@ func runOnMain(f func()) {
 	}()
 }
 
-func isMainThread() bool {
-	return C.isMainThread() != 0
-}
-
 //export gio_dispatchMainFuncs
 func gio_dispatchMainFuncs() {
 	for {
@@ -263,3 +263,10 @@ func windowSetCursor(from, to pointer.Cursor) pointer.Cursor {
 	C.gio_setCursor(C.NSUInteger(macosCursorID[to]))
 	return to
 }
+
+func (w *window) wakeup() {
+	runOnMain(func() {
+		w.loop.Wakeup()
+		w.loop.FlushEvents()
+	})
+}

app/os_darwin.m

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Unlicense OR MIT
+
+#import <Foundation/Foundation.h>
+
+#include "_cgo_export.h"
+
+void gio_wakeupMainThread(void) {
+	dispatch_async(dispatch_get_main_queue(), ^{
+		gio_dispatchMainFuncs();
+	});
+}

app/os_ios.go

@@ -12,6 +12,7 @@ package app
 #include <UIKit/UIKit.h>
 #include <stdint.h>
 
+__attribute__ ((visibility ("hidden"))) int gio_applicationMain(int argc, char *argv[]);
 __attribute__ ((visibility ("hidden"))) void gio_viewSetHandle(CFTypeRef viewRef, uintptr_t handle);
 
 struct drawParams {
@@ -21,6 +22,7 @@ struct drawParams {
 };
 
 static void writeClipboard(unichar *chars, NSUInteger length) {
+#if !TARGET_OS_TV
 	@autoreleasepool {
 		NSString *s = [NSString string];
 		if (length > 0) {
@@ -29,13 +31,18 @@ static void writeClipboard(unichar *chars, NSUInteger length) {
 		UIPasteboard *p = UIPasteboard.generalPasteboard;
 		p.string = s;
 	}
+#endif
 }
 
 static CFTypeRef readClipboard(void) {
+#if !TARGET_OS_TV
 	@autoreleasepool {
 		UIPasteboard *p = UIPasteboard.generalPasteboard;
 		return (__bridge_retained CFTypeRef)p.string;
 	}
+#else
+	return nil;
+#endif
 }
 
 static void showTextInput(CFTypeRef viewRef) {
@@ -75,6 +82,7 @@ import "C"
 import (
 	"image"
 	"io"
+	"os"
 	"runtime"
 	"runtime/cgo"
 	"runtime/debug"
@@ -388,16 +396,47 @@ func newWindow(win *callbacks, options []Option) {
 	<-mainWindow.windows
 }
 
-//export gio_runMain
+var mainMode = mainModeUndefined
-func gio_runMain() {
+
-	runMain()
+const (
+	mainModeUndefined = iota
+	mainModeExe
+	mainModeLibrary
+)
+
+func osMain() {
+	if !isMainThread() {
+		panic("app.Main must be run on the main goroutine")
+	}
+	switch mainMode {
+	case mainModeUndefined:
+		mainMode = mainModeExe
+		var argv []*C.char
+		for _, arg := range os.Args {
+			a := C.CString(arg)
+			defer C.free(unsafe.Pointer(a))
+			argv = append(argv, a)
+		}
+		C.gio_applicationMain(C.int(len(argv)), unsafe.SliceData(argv))
+	case mainModeExe:
+		panic("app.Main may be called only once")
+	case mainModeLibrary:
+		// Do nothing, we're embedded as a library.
+	}
 }
 
-func (w *window) wakeup() {
+//export gio_runMain
-	runOnMain(func() {
+func gio_runMain() {
-		w.loop.Wakeup()
+	if !isMainThread() {
-		w.loop.FlushEvents()
+		panic("app.Main must be run on the main goroutine")
-	})
+	}
+	switch mainMode {
+	case mainModeUndefined:
+		mainMode = mainModeLibrary
+		runMain()
+	case mainModeExe:
+		// Do nothing, main has already been called.
+	}
 }
 
 func (UIKitViewEvent) implementsViewEvent() {}

app/os_ios.m

@@ -26,12 +26,13 @@ CGFloat _keyboardHeight;
 	self.view.layoutMargins = UIEdgeInsetsMake(0, 0, 0, 0);
 	UIView *drawView = [[GioView alloc] initWithFrame:zeroFrame];
 	[self.view addSubview: drawView];
-#ifndef TARGET_OS_TV
+#if !TARGET_OS_TV
 	drawView.multipleTouchEnabled = YES;
 #endif
 	drawView.preservesSuperviewLayoutMargins = YES;
 	drawView.layoutMargins = UIEdgeInsetsMake(0, 0, 0, 0);
 	onCreate((__bridge CFTypeRef)drawView, (__bridge CFTypeRef)self);
+#if !TARGET_OS_TV
 	[[NSNotificationCenter defaultCenter] addObserver:self
 											 selector:@selector(keyboardWillChange:)
 												 name:UIKeyboardWillShowNotification
@@ -44,6 +45,7 @@ CGFloat _keyboardHeight;
 											 selector:@selector(keyboardWillHide:)
 												 name:UIKeyboardWillHideNotification
 											   object:nil];
+#endif
 	[[NSNotificationCenter defaultCenter] addObserver: self
 											 selector: @selector(applicationDidEnterBackground:)
 												 name: UIApplicationDidEnterBackgroundNotification
@@ -89,6 +91,7 @@ CGFloat _keyboardHeight;
 	[super didReceiveMemoryWarning];
 }
 
+#if !TARGET_OS_TV
 - (void)keyboardWillChange:(NSNotification *)note {
 	NSDictionary *userInfo = note.userInfo;
 	CGRect f = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
@@ -100,6 +103,7 @@ CGFloat _keyboardHeight;
 	_keyboardHeight = 0.0;
 	[self.view setNeedsLayout];
 }
+#endif
 @end
 
 static void handleTouches(int last, GioView *view, NSSet<UITouch *> *touches, UIEvent *event) {
@@ -277,8 +281,22 @@ void gio_viewSetHandle(CFTypeRef viewRef, uintptr_t handle) {
 	v.handle = handle;
 }
 
-void gio_wakeupMainThread(void) {
+@interface _gioAppDelegate : UIResponder <UIApplicationDelegate>
-	dispatch_async(dispatch_get_main_queue(), ^{
+@property (strong, nonatomic) UIWindow *window;
-		gio_dispatchMainFuncs();
+@end
-	});
+
+@implementation _gioAppDelegate
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+	self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+	GioViewController *controller = [[GioViewController alloc] initWithNibName:nil bundle:nil];
+	self.window.rootViewController = controller;
+	[self.window makeKeyAndVisible];
+	return YES;
+}
+@end
+
+int gio_applicationMain(int argc, char *argv[]) {
+	@autoreleasepool {
+		return UIApplicationMain(argc, argv, nil, NSStringFromClass([_gioAppDelegate class]));
+	}
 }

app/os_js.go

@@ -741,6 +741,10 @@ func (w *window) navigationColor(c color.NRGBA) {
 	theme.Set("content", fmt.Sprintf("#%06X", []uint8{rgba.R, rgba.G, rgba.B}))
 }
 
+func osMain() {
+	select {}
+}
+
 func translateKey(k string) (key.Name, bool) {
 	var n key.Name
 

app/os_macos.go

@@ -39,7 +39,7 @@ import (
 #define MOUSE_DOWN 3
 #define MOUSE_SCROLL 4
 
-__attribute__ ((visibility ("hidden"))) void gio_initApp(void);
+__attribute__ ((visibility ("hidden"))) void gio_main(void);
 __attribute__ ((visibility ("hidden"))) CFTypeRef gio_createView(void);
 __attribute__ ((visibility ("hidden"))) CFTypeRef gio_createWindow(CFTypeRef viewRef, CGFloat width, CGFloat height, CGFloat minWidth, CGFloat minHeight, CGFloat maxWidth, CGFloat maxHeight);
 __attribute__ ((visibility ("hidden"))) void gio_viewSetHandle(CFTypeRef viewRef, uintptr_t handle);
@@ -195,6 +195,14 @@ static void setScreenFrame(CFTypeRef windowRef, CGFloat x, CGFloat y, CGFloat w,
 	}
 }
 
+static void resetLayerFrame(CFTypeRef viewRef) {
+	@autoreleasepool {
+		NSView* view = (__bridge NSView *)viewRef;
+		NSRect r = view.frame;
+		view.layer.frame = r;
+	}
+}
+
 static void hideWindow(CFTypeRef windowRef) {
 	@autoreleasepool {
 		NSWindow* window = (__bridge NSWindow *)windowRef;
@@ -289,16 +297,6 @@ static void invalidateCharacterCoordinates(CFTypeRef viewRef) {
 		}
 	}
 }
-
-static void dispatchEvent(void) {
-	@autoreleasepool {
-		NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny
-		                                        untilDate:[NSDate distantFuture]
-		                                           inMode:NSDefaultRunLoopMode
-		                                          dequeue:YES];
-		[NSApp sendEvent:event];
-	}
-}
 */
 import "C"
 
@@ -333,16 +331,13 @@ type window struct {
 	config Config
 }
 
-// launched is closed after gio_initApp returns.
+// launched is closed when applicationDidFinishLaunching is called.
 var launched = make(chan struct{})
 
 // nextTopLeft is the offset to use for the next window's call to
 // cascadeTopLeftFromPoint.
 var nextTopLeft C.NSPoint
 
-// mainThreadWindow is the window currently in control of the main thread.
-var mainThreadWindow *window
-
 func windowFor(h C.uintptr_t) *window {
 	return cgo.Handle(h).Value().(*window)
 }
@@ -469,6 +464,9 @@ func (w *window) Configure(options []Option) {
 		C.setWindowStandardButtonHidden(window, C.NSWindowCloseButton, barTrans)
 		C.setWindowStandardButtonHidden(window, C.NSWindowMiniaturizeButton, barTrans)
 		C.setWindowStandardButtonHidden(window, C.NSWindowZoomButton, barTrans)
+		// When toggling the titlebar, the layer doesn't update its frame
+		// until the next resize. Force it.
+		C.resetLayerFrame(w.view)
 	}
 	w.ProcessEvent(ConfigEvent{Config: w.config})
 }
@@ -835,51 +833,23 @@ func (w *window) draw() {
 
 func (w *window) ProcessEvent(e event.Event) {
 	w.w.ProcessEvent(e)
-	// The main thread window deliver events in Event.
+	w.loop.FlushEvents()
-	if w != mainThreadWindow {
-		w.loop.FlushEvents()
-	}
 }
 
 func (w *window) Event() event.Event {
-	if !isMainThread() {
+	return w.loop.Event()
-		return w.loop.Event()
-	}
-	mainThreadWindow = w
-	defer func() { mainThreadWindow = nil }()
-	for {
-		if evt, ok := w.loop.win.nextEvent(); ok {
-			return evt
-		}
-		C.dispatchEvent()
-		gio_dispatchMainFuncs()
-	}
 }
 
 func (w *window) Invalidate() {
-	if isMainThread() {
-		mainThreadWindow = w
-		defer func() { mainThreadWindow = nil }()
-	}
 	w.loop.Invalidate()
 }
 
 func (w *window) Run(f func()) {
-	if isMainThread() {
-		mainThreadWindow = w
-		defer func() { mainThreadWindow = nil }()
-	}
 	w.loop.Run(f)
 }
 
 func (w *window) Frame(frame *op.Ops) {
-	if !isMainThread() {
+	w.loop.Frame(frame)
-		w.loop.Frame(frame)
-		return
-	}
-	mainThreadWindow = w
-	defer func() { mainThreadWindow = nil }()
-	w.loop.win.ProcessFrame(frame, nil)
 }
 
 func configFor(scale float32) unit.Metric {
@@ -939,27 +909,20 @@ func gio_onWindowed(h C.uintptr_t) {
 	w.ProcessEvent(ConfigEvent{Config: w.config})
 }
 
+//export gio_onFinishLaunching
+func gio_onFinishLaunching() {
+	close(launched)
+}
+
 func newWindow(win *callbacks, options []Option) {
-	w := &window{
+	<-launched
-		redraw: make(chan struct{}, 1),
+	res := make(chan struct{})
-		w:      win,
-	}
-	w.loop = newEventLoop(w.w, w.wakeup)
-	if isMainThread() {
-		mainThreadWindow = w
-		defer func() { mainThreadWindow = nil }()
-		select {
-		case <-launched:
-		default:
-			// If we're the main thread, initialize the GUI.
-			C.gio_initApp()
-			close(launched)
-		}
-	} else {
-		<-launched
-	}
-	res := make(chan struct{}, 1)
 	runOnMain(func() {
+		w := &window{
+			redraw: make(chan struct{}, 1),
+			w:      win,
+		}
+		w.loop = newEventLoop(w.w, w.wakeup)
 		win.SetDriver(w)
 		res <- struct{}{}
 		if err := w.init(); err != nil {
@@ -1012,6 +975,13 @@ func (w *window) init() error {
 	return nil
 }
 
+func osMain() {
+	if !isMainThread() {
+		panic("app.Main must run on the main goroutine")
+	}
+	C.gio_main()
+}
+
 func convertKey(k rune) (key.Name, bool) {
 	var n key.Name
 	switch k {
@@ -1096,14 +1066,5 @@ func convertMods(mods C.NSUInteger) key.Modifiers {
 	return kmods
 }
 
-func (w *window) wakeup() {
-	runOnMain(func() {
-		w.loop.Wakeup()
-		if w != mainThreadWindow {
-			w.loop.FlushEvents()
-		}
-	})
-}
-
 func (AppKitViewEvent) implementsViewEvent() {}
 func (AppKitViewEvent) ImplementsEvent()     {}

app/os_macos.m

@@ -47,13 +47,17 @@ __attribute__ ((visibility ("hidden"))) CALayer *gio_layerFactory(void);
 }
 - (void)windowDidBecomeKey:(NSNotification *)notification {
 	NSWindow *window = (NSWindow *)[notification object];
-  GioView *view = (GioView *)window.contentView;
+	GioView *view = (GioView *)window.contentView;
-	gio_onFocus(view.handle, 1);
+	if ([window firstResponder] == view) {
+		gio_onFocus(view.handle, 1);
+	}
 }
 - (void)windowDidResignKey:(NSNotification *)notification {
 	NSWindow *window = (NSWindow *)[notification object];
-  GioView *view = (GioView *)window.contentView;
+	GioView *view = (GioView *)window.contentView;
-	gio_onFocus(view.handle, 0);
+	if ([window firstResponder] == view) {
+		gio_onFocus(view.handle, 0);
+	}
 }
 @end
 
@@ -69,212 +73,6 @@ static void handleMouse(GioView *view, NSEvent *event, int typ, CGFloat dx, CGFl
 	gio_onMouse(view.handle, (__bridge CFTypeRef)event, typ, event.buttonNumber, p.x, height - p.y, dx, dy, [event timestamp], [event modifierFlags]);
 }
 
-@interface GioApplication: NSApplication
-@end
-
-// Variables for tracking resizes.
-static struct {
-	NSPoint dir;
-	NSEvent *lastMouseDown;
-	NSPoint off;
-} resizeState = {};
-
-static NSBitmapImageRep *nsImageBitmap(NSImage *img) {
-	NSArray<NSImageRep *> *reps = img.representations;
-	if ([reps count] == 0) {
-		return nil;
-	}
-	NSImageRep *rep = reps[0];
-	if (![rep isKindOfClass:[NSBitmapImageRep class]]) {
-		return nil;
-	}
-	return (NSBitmapImageRep *)rep;
-}
-
-static NSCursor *lookupPrivateNSCursor(SEL name) {
-	if (![NSCursor respondsToSelector:name]) {
-		return nil;
-	}
-	id obj = [NSCursor performSelector:name];
-	if (![obj isKindOfClass:[NSCursor class]]) {
-		return nil;
-	}
-	return (NSCursor *)obj;
-}
-
-static BOOL isEqualNSCursor(NSCursor *c1, SEL name2) {
-	NSCursor *c2 = lookupPrivateNSCursor(name2);
-	if (c2 == nil || !NSEqualPoints(c1.hotSpot, c2.hotSpot)) {
-		return NO;
-	}
-	NSImage *img1 = c1.image;
-	NSImage *img2 = c2.image;
-	if (!NSEqualSizes(img1.size, img2.size)) {
-		return NO;
-	}
-	NSBitmapImageRep *bit1 = nsImageBitmap(img1);
-	NSBitmapImageRep *bit2 = nsImageBitmap(img2);
-	if (bit1 == nil || bit2 == nil) {
-		return NO;
-	}
-	NSInteger n1 = bit1.numberOfPlanes*bit1.bytesPerPlane;
-	NSInteger n2 = bit1.numberOfPlanes*bit1.bytesPerPlane;
-	if (n1 != n2) {
-		return NO;
-	}
-	if (memcmp(bit1.bitmapData, bit2.bitmapData, n1) != 0) {
-		return NO;
-	}
-	return YES;
-}
-
-@implementation GioApplication
-- (NSEvent *)nextEventMatchingMask:(NSEventMask)mask
-                         untilDate:(NSDate *)expiration
-                            inMode:(NSRunLoopMode)mode
-                           dequeue:(BOOL)deqFlag {
-	if ([mode isEqualToString:NSEventTrackingRunLoopMode]) {
-		NSEvent *l = resizeState.lastMouseDown;
-		if (l != nil) {
-			//lastMouseDown = nil;
-			NSCursor *cur = [NSCursor currentSystemCursor];
-			NSPoint dir = {};
-			NSPoint off = {};
-			NSSize wsz = [l window].frame.size;
-			NSPoint center = NSMakePoint(wsz.width/2, wsz.height/2);
-			NSPoint p = [l locationInWindow];
-			if (p.x >= center.x) {
-				dir.x = 1;
-				off.x = p.x - wsz.width;
-			} else {
-				dir.x = -1;
-				off.x = p.x;
-			}
-			if (p.y >= center.y) {
-				dir.y = 1;
-				off.y = p.y - wsz.height;
-			} else {
-				dir.y = -1;
-				off.y = p.y;
-			}
-			// The button down coordinate distinguish the four quadrants. Use the
-			// cursor image to determine the precise direction.
-			SEL nw = @selector(_windowResizeNorthWestCursor);
-			SEL n = @selector(_windowResizeNorthCursor);
-			SEL ne = @selector(_windowResizeNorthEastCursor);
-			SEL e = @selector(_windowResizeEastCursor);
-			SEL se = @selector(_windowResizeSouthEastCursor);
-			SEL s = @selector(_windowResizeSouthCursor);
-			SEL sw = @selector(_windowResizeSouthWestCursor);
-			SEL w = @selector(_windowResizeWestCursor);
-			SEL ns = @selector(_windowResizeNorthSouthCursor);
-			SEL ew = @selector(_windowResizeEastWestCursor);
-			SEL nwse = @selector(_windowResizeNorthWestSouthEastCursor);
-			SEL nesw = @selector(_windowResizeNorthEastSouthWestCursor);
-			BOOL match = YES;
-			if (dir.x != 0 && (isEqualNSCursor(cur, ew) || isEqualNSCursor(cur, w) || isEqualNSCursor(cur, e))) {
-				dir.y = 0;
-			}
-			if (dir.y != 0 && (isEqualNSCursor(cur, ns) || isEqualNSCursor(cur, s) || isEqualNSCursor(cur, n))) {
-					dir.x = 0;
-			}
-			// If none of the cursors matched, we may deduce that the resize
-			// direction is one of the corners. However, to ensure that at least
-			// one cursor matches, check the corner cursors.
-			if (dir.x == 1 && dir.y == 1) {
-				if (!isEqualNSCursor(cur, nesw) && !isEqualNSCursor(cur, sw)) {
-					dir = NSZeroPoint;
-				}
-			} else if (dir.x == 1 && dir.y == -1) {
-				if (!isEqualNSCursor(cur, nwse) && !isEqualNSCursor(cur, nw)) {
-					dir = NSZeroPoint;
-				}
-			} else if (dir.x == -1 && dir.y == 1) {
-				if (!isEqualNSCursor(cur, nwse) && !isEqualNSCursor(cur, se)) {
-					dir = NSZeroPoint;
-				}
-			} else if (dir.x == -1 && dir.y == -1) {
-				if (!isEqualNSCursor(cur, nesw) && !isEqualNSCursor(cur, ne)) {
-					dir = NSZeroPoint;
-				}
-			}
-			if (!NSEqualPoints(dir, NSZeroPoint)) {
-				NSEvent *cancel = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
-											                       location:l.locationInWindow
-											                  modifierFlags:l.modifierFlags
-											                      timestamp:l.timestamp
-											                   windowNumber:l.windowNumber
-											                        context:l.context
-											                    eventNumber:l.eventNumber
-											                     clickCount:l.clickCount
-											                       pressure:l.pressure];
-				resizeState.off = off;
-				resizeState.dir = dir;
-				return cancel;
-			}
-		}
-	}
-	return [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:deqFlag];
-}
-@end
-
-@interface GioWindow: NSWindow
-@end
-
-@implementation GioWindow
-- (void)sendEvent:(NSEvent *)evt {
-	if (evt.type == NSEventTypeLeftMouseDown) {
-		resizeState.lastMouseDown = evt;
-	}
-	NSPoint dir = resizeState.dir;
-	if (NSEqualPoints(dir, NSZeroPoint)) {
-		[super sendEvent:evt];
-		return;
-	}
-	switch (evt.type) {
-	default:
-		return;
-	case NSEventTypeLeftMouseUp:
-		resizeState.dir = NSZeroPoint;
-		resizeState.lastMouseDown = nil;
-		return;
-	case NSEventTypeLeftMouseDragged:
-		// Ok to proceed.
-		break;
-	}
-	NSPoint loc = evt.locationInWindow;
-	NSPoint off = resizeState.off;
-	loc.x -= off.x;
-	loc.y -= off.y;
-	NSRect frame = [self frame];
-	NSSize min = [self minSize];
-	NSSize max = [self maxSize];
-	CGFloat width = frame.size.width;
-	if (dir.x > 0) {
-		width = loc.x;
-	} else if (dir.x < 0) {
-		width -= loc.x;
-	}
-	width = MIN(max.width, MAX(min.width, width));
-	if (dir.x < 0) {
-		frame.origin.x += frame.size.width - width;
-	}
-	frame.size.width = width;
-	CGFloat height = frame.size.height;
-	if (dir.y > 0) {
-		height = loc.y;
-	} else if (dir.y < 0) {
-		height -= loc.y;
-	}
-	height = MIN(max.height, MAX(min.height, height));
-	if (dir.y < 0) {
-		frame.origin.y += frame.size.height - height;
-	}
-	frame.size.height = height;
-	[self setFrame:frame display:YES animate:NO];
-}
-@end
-
 @implementation GioView
 - (void)setFrameSize:(NSSize)newSize {
 	[super setFrameSize:newSize];
@@ -348,6 +146,7 @@ static BOOL isEqualNSCursor(NSCursor *c1, SEL name2) {
 	// Don't pass commands up the responder chain.
 	// They will end up in a beep.
 }
+
 - (BOOL)hasMarkedText {
 	int res = gio_hasMarkedText(self.handle);
 	return res ? YES : NO;
@@ -410,6 +209,14 @@ static BOOL isEqualNSCursor(NSCursor *c1, SEL name2) {
 - (void)dealloc {
 	gio_onDestroy(self.handle);
 }
+- (BOOL) becomeFirstResponder {
+	gio_onFocus(self.handle, 1);
+	return [super becomeFirstResponder];
+ }
+- (BOOL) resignFirstResponder {
+	gio_onFocus(self.handle, 0);
+	return [super resignFirstResponder];
+}
 @end
 
 // Delegates are weakly referenced from their peers. Nothing
@@ -460,11 +267,14 @@ void gio_showCursor() {
 // some cursors are not public, this tries to use a private cursor
 // and uses fallback when the use of private cursor fails.
 static void trySetPrivateCursor(SEL cursorName, NSCursor* fallback) {
-	NSCursor *cur = lookupPrivateNSCursor(cursorName);
+	if ([NSCursor respondsToSelector:cursorName]) {
-	if (cur == nil) {
+		id object = [NSCursor performSelector:cursorName];
-		cur = fallback;
+		if ([object isKindOfClass:[NSCursor class]]) {
+			[(NSCursor*)object set];
+			return;
+		}
 	}
-	[cur set];
+	[fallback set];
 }
 
 void gio_setCursor(NSUInteger curID) {
@@ -563,7 +373,7 @@ CFTypeRef gio_createWindow(CFTypeRef viewRef, CGFloat width, CGFloat height, CGF
 			NSMiniaturizableWindowMask |
 			NSClosableWindowMask;
 
-		GioWindow* window = [[GioWindow alloc] initWithContentRect:rect
+		NSWindow* window = [[NSWindow alloc] initWithContentRect:rect
 													   styleMask:styleMask
 														 backing:NSBackingStoreBuffered
 														   defer:NO];
@@ -612,24 +422,13 @@ void gio_viewSetHandle(CFTypeRef viewRef, uintptr_t handle) {
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 	[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
 	[NSApp activateIgnoringOtherApps:YES];
-	// Force the [NSApp run] call to return.
+	gio_onFinishLaunching();
-	[NSApp stop:nil];
-	NSEvent *dummy = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
-	              location:NSZeroPoint
-	         modifierFlags:0
-	             timestamp:0
-	          windowNumber:0
-	               context:nil
-	               subtype:0
-	                 data1:0
-	                 data2:0];
-	[NSApp postEvent:dummy atStart:YES];
 }
 @end
 
-void gio_initApp() {
+void gio_main() {
 	@autoreleasepool {
-		[GioApplication sharedApplication];
+		[NSApplication sharedApplication];
 		GioAppDelegate *del = [[GioAppDelegate alloc] init];
 		[NSApp setDelegate:del];
 
@@ -651,22 +450,6 @@ void gio_initApp() {
 
 		globalWindowDel = [[GioWindowDelegate alloc] init];
 
-		// Runs until stopped by applicationDidFinishLaunching.
 		[NSApp run];
 	}
 }
-
-void gio_wakeupMainThread(void) {
-	@autoreleasepool {
-		NSEvent *dummy = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
-		              location:NSZeroPoint
-		         modifierFlags:0
-		             timestamp:0
-		          windowNumber:0
-		               context:nil
-		               subtype:0
-		                 data1:0
-		                 data2:0];
-		[NSApp postEvent:dummy atStart:YES];
-	}
-}

app/os_unix.go

@@ -33,6 +33,10 @@ type WaylandViewEvent struct {
 func (WaylandViewEvent) implementsViewEvent() {}
 func (WaylandViewEvent) ImplementsEvent()     {}
 
+func osMain() {
+	select {}
+}
+
 type windowDriver func(*callbacks, []Option) error
 
 // Instead of creating files with build tags for each combination of wayland +/- x11

app/os_wayland.go

@@ -216,6 +216,8 @@ type window struct {
 
 	wakeups chan struct{}
 
+	closing bool
+
 	// invMu avoids the race between the destruction of disp and
 	// Invalidate waking it up.
 	invMu sync.Mutex
@@ -556,7 +558,7 @@ func gio_onXdgSurfaceConfigure(data unsafe.Pointer, wmSurf *C.struct_xdg_surface
 //export gio_onToplevelClose
 func gio_onToplevelClose(data unsafe.Pointer, topLvl *C.struct_xdg_toplevel) {
 	w := callbackLoad(data).(*window)
-	w.close(nil)
+	w.closing = true
 }
 
 //export gio_onToplevelConfigure
@@ -1139,7 +1141,7 @@ func (w *window) Perform(actions system.Action) {
 	walkActions(actions, func(action system.Action) {
 		switch action {
 		case system.ActionClose:
-			w.close(nil)
+			w.closing = true
 		}
 	})
 }
@@ -1366,6 +1368,11 @@ func gio_onFrameDone(data unsafe.Pointer, callback *C.struct_wl_callback, t C.ui
 func (w *window) close(err error) {
 	w.ProcessEvent(WaylandViewEvent{})
 	w.ProcessEvent(DestroyEvent{Err: err})
+	w.destroy()
+	w.invMu.Lock()
+	w.disp.destroy()
+	w.disp = nil
+	w.invMu.Unlock()
 }
 
 func (w *window) dispatch() {
@@ -1374,7 +1381,7 @@ func (w *window) dispatch() {
 		w.w.Invalidate()
 		return
 	}
-	if err := w.disp.dispatch(); err != nil {
+	if err := w.disp.dispatch(); err != nil || w.closing {
 		w.close(err)
 		return
 	}
@@ -1399,13 +1406,6 @@ func (w *window) Event() event.Event {
 			w.dispatch()
 			continue
 		}
-		if _, destroy := evt.(DestroyEvent); destroy {
-			w.destroy()
-			w.invMu.Lock()
-			w.disp.destroy()
-			w.disp = nil
-			w.invMu.Unlock()
-		}
 		return evt
 	}
 }
@@ -1515,6 +1515,10 @@ func (d *wlDisplay) wakeup() {
 }
 
 func (w *window) destroy() {
+	if w.lastFrameCallback != nil {
+		C.wl_callback_destroy(w.lastFrameCallback)
+		w.lastFrameCallback = nil
+	}
 	if w.cursor.surf != nil {
 		C.wl_surface_destroy(w.cursor.surf)
 	}

app/os_windows.go

@@ -85,6 +85,10 @@ var resources struct {
 	cursor syscall.Handle
 }
 
+func osMain() {
+	select {}
+}
+
 func newWindow(win *callbacks, options []Option) {
 	done := make(chan struct{})
 	go func() {

app/os_x11.go

@@ -389,6 +389,7 @@ func (w *x11Window) ProcessEvent(e event.Event) {
 func (w *x11Window) shutdown(err error) {
 	w.ProcessEvent(X11ViewEvent{})
 	w.ProcessEvent(DestroyEvent{Err: err})
+	w.destroy()
 }
 
 func (w *x11Window) Event() event.Event {
@@ -398,9 +399,6 @@ func (w *x11Window) Event() event.Event {
 			w.dispatch()
 			continue
 		}
-		if _, destroy := evt.(DestroyEvent); destroy {
-			w.destroy()
-		}
 		return evt
 	}
 }
@@ -464,7 +462,12 @@ func (w *x11Window) dispatch() {
 	// Check for pending draw events before checking animation or blocking.
 	// This fixes an issue on Xephyr where on startup XPending() > 0 but
 	// poll will still block. This also prevents no-op calls to poll.
-	if syn = w.handler.handleEvents(); !syn {
+	syn = w.handler.handleEvents()
+	if w.x == nil {
+		// handleEvents received a close request and destroyed the window.
+		return
+	}
+	if !syn {
 		anim = w.animating
 		if !anim {
 			// Clear poll events.
@@ -476,6 +479,9 @@ func (w *x11Window) dispatch() {
 			switch {
 			case *xEvents&syscall.POLLIN != 0:
 				syn = w.handler.handleEvents()
+				if w.x == nil {
+					return
+				}
 			case *xEvents&(syscall.POLLERR|syscall.POLLHUP) != 0:
 			}
 		}

app/runmain.go

@@ -25,6 +25,6 @@ func runMain() {
 		// Indirect call, since the linker does not know the address of main when
 		// laying down this package.
 		fn := mainMain
-		go fn()
+		fn()
 	})
 }

app/window.go

@@ -9,7 +9,6 @@ import (
 	"image/color"
 	"reflect"
 	"runtime"
-	"sync"
 	"time"
 	"unicode/utf8"
 
@@ -36,14 +35,14 @@ type Option func(unit.Metric, *Config)
 
 // Window represents an operating system window.
 //
-// The zero-value Window is useful, and calling any method on
+// The zero-value Window is useful; the GUI window is created and shown the first
-// it creates and shows a new GUI window. On iOS or Android,
+// time the [Event] method is called. On iOS or Android, the first Window represents
-// the first Window represents the the window previously
+// the window previously created by the platform.
-// created by the platform.
 //
-// More than one Window is not supported on iOS, Android,
+// More than one Window is not supported on iOS, Android, WebAssembly.
-// WebAssembly.
 type Window struct {
+	initialOpts []Option
+
 	ctx context
 	gpu gpu.GPU
 	// timer tracks the delayed invalidate goroutine.
@@ -91,11 +90,10 @@ type Window struct {
 	driver   driver
 	// basic is the driver interface that is needed even after the window is gone.
 	basic basicDriver
-	once  sync.Once
 	// coalesced tracks the most recent events waiting to be delivered
 	// to the client.
 	coalesced eventSummary
-	// frame tracks the most recently frame event.
+	// frame tracks the most recent frame event.
 	lastFrame struct {
 		sync bool
 		size image.Point
@@ -273,8 +271,9 @@ func (w *Window) updateState() {
 //
 // Invalidate is safe for concurrent use.
 func (w *Window) Invalidate() {
-	w.init()
+	if w.basic != nil {
-	w.basic.Invalidate()
+		w.basic.Invalidate()
+	}
 }
 
 // Option applies the options to the window. The options are hints; the platform is
@@ -283,7 +282,10 @@ func (w *Window) Option(opts ...Option) {
 	if len(opts) == 0 {
 		return
 	}
-	w.init(opts...)
+	if w.basic == nil {
+		w.initialOpts = append(w.initialOpts, opts...)
+		return
+	}
 	w.Run(func() {
 		cnf := Config{Decorated: w.decorations.enabled}
 		for _, opt := range opts {
@@ -302,16 +304,14 @@ func (w *Window) Option(opts ...Option) {
 }
 
 // Run f in the same thread as the native window event loop, and wait for f to
-// return or the window to close. Run is guaranteed not to deadlock if it is
+// return or the window to close. If the window has not yet been created,
-// invoked during the handling of a [ViewEvent], [FrameEvent],
+// Run calls f directly.
-// [StageEvent]; call Run in a separate goroutine to avoid deadlock in all
-// other cases.
 //
 // Note that most programs should not call Run; configuring a Window with
 // [CustomRenderer] is a notable exception.
 func (w *Window) Run(f func()) {
-	w.init()
 	if w.driver == nil {
+		f()
 		return
 	}
 	done := make(chan struct{})
@@ -683,55 +683,50 @@ func (w *Window) processEvent(e event.Event) bool {
 }
 
 // Event blocks until an event is received from the window, such as
-// [FrameEvent], or until [Invalidate] is called.
+// [FrameEvent], or until [Invalidate] is called. The window is created
-//
+// and shown the first time Event is called.
-// Note: if more than one Window is active, at least one must have
-// its Event called from the main goroutine that runs the main
-// function. This is necessary because some operating system GUI
-// implementations require control of the main thread.
-// For this reason, it is allowed to call Event even after a
-// DestroyEvent has been received.
 func (w *Window) Event() event.Event {
-	w.init()
+	if w.basic == nil {
+		w.init()
+	}
 	return w.basic.Event()
 }
 
-func (w *Window) init(initial ...Option) {
+func (w *Window) init() {
-	w.once.Do(func() {
+	debug.Parse()
-		debug.Parse()
+	// Measure decoration height.
-		// Measure decoration height.
+	deco := new(widget.Decorations)
-		deco := new(widget.Decorations)
+	theme := material.NewTheme()
-		theme := material.NewTheme()
+	theme.Shaper = text.NewShaper(text.NoSystemFonts(), text.WithCollection(gofont.Regular()))
-		theme.Shaper = text.NewShaper(text.NoSystemFonts(), text.WithCollection(gofont.Regular()))
+	decoStyle := material.Decorations(theme, deco, 0, "")
-		decoStyle := material.Decorations(theme, deco, 0, "")
+	gtx := layout.Context{
-		gtx := layout.Context{
+		Ops: new(op.Ops),
-			Ops: new(op.Ops),
+		// Measure in Dp.
-			// Measure in Dp.
+		Metric: unit.Metric{},
-			Metric: unit.Metric{},
+	}
-		}
+	// Allow plenty of space.
-		// Allow plenty of space.
+	gtx.Constraints.Max.Y = 200
-		gtx.Constraints.Max.Y = 200
+	dims := decoStyle.Layout(gtx)
-		dims := decoStyle.Layout(gtx)
+	decoHeight := unit.Dp(dims.Size.Y)
-		decoHeight := unit.Dp(dims.Size.Y)
+	defaultOptions := []Option{
-		defaultOptions := []Option{
+		Size(800, 600),
-			Size(800, 600),
+		Title("Gio"),
-			Title("Gio"),
+		Decorated(true),
-			Decorated(true),
+		decoHeightOpt(decoHeight),
-			decoHeightOpt(decoHeight),
+	}
-		}
+	options := append(defaultOptions, w.initialOpts...)
-		options := append(defaultOptions, initial...)
+	w.initialOpts = nil
-		var cnf Config
+	var cnf Config
-		cnf.apply(unit.Metric{}, options)
+	cnf.apply(unit.Metric{}, options)
 
-		w.nocontext = cnf.CustomRenderer
+	w.nocontext = cnf.CustomRenderer
-		w.decorations.Theme = theme
+	w.decorations.Theme = theme
-		w.decorations.Decorations = deco
+	w.decorations.Decorations = deco
-		w.decorations.enabled = cnf.Decorated
+	w.decorations.enabled = cnf.Decorated
-		w.decorations.height = decoHeight
+	w.decorations.height = decoHeight
-		w.imeState.compose = key.Range{Start: -1, End: -1}
+	w.imeState.compose = key.Range{Start: -1, End: -1}
-		w.semantic.ids = make(map[input.SemanticID]input.SemanticNode)
+	w.semantic.ids = make(map[input.SemanticID]input.SemanticNode)
-		newWindow(&callbacks{w}, options)
+	newWindow(&callbacks{w}, options)
-	})
 }
 
 func (w *Window) updateCursor() {
@@ -779,8 +774,12 @@ func (w *Window) decorate(e FrameEvent, o *op.Ops) image.Point {
 	}
 	// Update the window based on the actions on the decorations.
 	opts, acts := splitActions(deco.Update(gtx))
-	w.driver.Configure(opts)
+	if len(opts) > 0 {
-	w.driver.Perform(acts)
+		w.driver.Configure(opts)
+	}
+	if acts != 0 {
+		w.driver.Perform(acts)
+	}
 	style.Layout(gtx)
 	// Offset to place the frame content below the decorations.
 	decoHeight := gtx.Dp(w.decorations.Config.decoHeight)

gesture/gesture.go

@@ -271,12 +271,13 @@ func (s *Scroll) Stop() {
 }
 
 // Update state and report the scroll distance along axis.
-func (s *Scroll) Update(cfg unit.Metric, q input.Source, t time.Time, axis Axis, bounds image.Rectangle) int {
+func (s *Scroll) Update(cfg unit.Metric, q input.Source, t time.Time, axis Axis, scrollx, scrolly pointer.ScrollRange) int {
 	total := 0
 	f := pointer.Filter{
-		Target:       s,
+		Target:  s,
-		Kinds:        pointer.Press | pointer.Drag | pointer.Release | pointer.Scroll | pointer.Cancel,
+		Kinds:   pointer.Press | pointer.Drag | pointer.Release | pointer.Scroll | pointer.Cancel,
-		ScrollBounds: bounds,
+		ScrollX: scrollx,
+		ScrollY: scrolly,
 	}
 	for {
 		evt, ok := q.Event(f)

go.mod

@@ -1,16 +1,16 @@
 module gioui.org
 
-go 1.19
+go 1.21
 
 require (
 	eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d
 	gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2
 	gioui.org/shader v1.0.8
-	github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372
+	github.com/go-text/typesetting v0.1.1
 	golang.org/x/exp v0.0.0-20221012211006-4de253d81b95
 	golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91
 	golang.org/x/image v0.5.0
-	golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64
+	golang.org/x/sys v0.5.0
 )
 
-require golang.org/x/text v0.7.0
+require golang.org/x/text v0.9.0

go.sum

@@ -5,9 +5,10 @@ gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 h1:AGDDxsJE1RpcXTAxPG2B4jrwVUJG
 gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
 gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
 gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
-github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 h1:FQivqchis6bE2/9uF70M2gmmLpe82esEm2QadL0TEJo=
+github.com/go-text/typesetting v0.1.1 h1:bGAesCuo85nXnEN5LmFMVGAGpGkCPtHrZLi//qD7EJo=
-github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
+github.com/go-text/typesetting v0.1.1/go.mod h1:d22AnmeKq/on0HNv73UFriMKc4Ez6EqZAofLhAzpSzI=
-github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
+github.com/go-text/typesetting-utils v0.0.0-20231211103740-d9332ae51f04 h1:zBx+p/W2aQYtNuyZNcTfinWvXBQwYtDfme051PR/lAY=
+github.com/go-text/typesetting-utils v0.0.0-20231211103740-d9332ae51f04/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -28,15 +29,16 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 h1:UiNENfZ8gDvpiWw7IpOMQ27spWmThO1RwwdQVbJahJM=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

gpu/gpu.go

@@ -261,7 +261,7 @@ type texture struct {
 type blitter struct {
 	ctx                    driver.Device
 	viewport               image.Point
-	pipelines              [3]*pipeline
+	pipelines              [2][3]*pipeline
 	colUniforms            *blitColUniforms
 	texUniforms            *blitTexUniforms
 	linearGradientUniforms *blitLinearGradientUniforms
@@ -560,12 +560,24 @@ func newBlitter(ctx driver.Device) *blitter {
 func (b *blitter) release() {
 	b.quadVerts.Release()
 	for _, p := range b.pipelines {
-		p.Release()
+		for _, p := range p {
+			p.Release()
+		}
 	}
 }
 
-func createColorPrograms(b driver.Device, vsSrc shader.Sources, fsSrc [3]shader.Sources, uniforms [3]interface{}) ([3]*pipeline, error) {
+func createColorPrograms(b driver.Device, vsSrc shader.Sources, fsSrc [3]shader.Sources, uniforms [3]interface{}) (pipelines [2][3]*pipeline, err error) {
-	var pipelines [3]*pipeline
+	defer func() {
+		if err != nil {
+			for _, p := range pipelines {
+				for _, p := range p {
+					if p != nil {
+						p.Release()
+					}
+				}
+			}
+		}
+	}()
 	blend := driver.BlendDesc{
 		Enable:    true,
 		SrcFactor: driver.BlendFactorOne,
@@ -583,86 +595,76 @@ func createColorPrograms(b driver.Device, vsSrc shader.Sources, fsSrc [3]shader.
 		return pipelines, err
 	}
 	defer vsh.Release()
-	{
+	for i, format := range []driver.TextureFormat{driver.TextureFormatOutput, driver.TextureFormatSRGBA} {
-		fsh, err := b.NewFragmentShader(fsSrc[materialTexture])
+		{
-		if err != nil {
+			fsh, err := b.NewFragmentShader(fsSrc[materialTexture])
-			return pipelines, err
+			if err != nil {
+				return pipelines, err
+			}
+			defer fsh.Release()
+			pipe, err := b.NewPipeline(driver.PipelineDesc{
+				VertexShader:   vsh,
+				FragmentShader: fsh,
+				BlendDesc:      blend,
+				VertexLayout:   layout,
+				PixelFormat:    format,
+				Topology:       driver.TopologyTriangleStrip,
+			})
+			if err != nil {
+				return pipelines, err
+			}
+			var vertBuffer *uniformBuffer
+			if u := uniforms[materialTexture]; u != nil {
+				vertBuffer = newUniformBuffer(b, u)
+			}
+			pipelines[i][materialTexture] = &pipeline{pipe, vertBuffer}
 		}
-		defer fsh.Release()
+		{
-		pipe, err := b.NewPipeline(driver.PipelineDesc{
+			var vertBuffer *uniformBuffer
-			VertexShader:   vsh,
+			fsh, err := b.NewFragmentShader(fsSrc[materialColor])
-			FragmentShader: fsh,
+			if err != nil {
-			BlendDesc:      blend,
+				return pipelines, err
-			VertexLayout:   layout,
+			}
-			PixelFormat:    driver.TextureFormatOutput,
+			defer fsh.Release()
-			Topology:       driver.TopologyTriangleStrip,
+			pipe, err := b.NewPipeline(driver.PipelineDesc{
-		})
+				VertexShader:   vsh,
-		if err != nil {
+				FragmentShader: fsh,
-			return pipelines, err
+				BlendDesc:      blend,
+				VertexLayout:   layout,
+				PixelFormat:    format,
+				Topology:       driver.TopologyTriangleStrip,
+			})
+			if err != nil {
+				return pipelines, err
+			}
+			if u := uniforms[materialColor]; u != nil {
+				vertBuffer = newUniformBuffer(b, u)
+			}
+			pipelines[i][materialColor] = &pipeline{pipe, vertBuffer}
 		}
-		var vertBuffer *uniformBuffer
+		{
-		if u := uniforms[materialTexture]; u != nil {
+			var vertBuffer *uniformBuffer
-			vertBuffer = newUniformBuffer(b, u)
+			fsh, err := b.NewFragmentShader(fsSrc[materialLinearGradient])
+			if err != nil {
+				return pipelines, err
+			}
+			defer fsh.Release()
+			pipe, err := b.NewPipeline(driver.PipelineDesc{
+				VertexShader:   vsh,
+				FragmentShader: fsh,
+				BlendDesc:      blend,
+				VertexLayout:   layout,
+				PixelFormat:    format,
+				Topology:       driver.TopologyTriangleStrip,
+			})
+			if err != nil {
+				return pipelines, err
+			}
+			if u := uniforms[materialLinearGradient]; u != nil {
+				vertBuffer = newUniformBuffer(b, u)
+			}
+			pipelines[i][materialLinearGradient] = &pipeline{pipe, vertBuffer}
 		}
-		pipelines[materialTexture] = &pipeline{pipe, vertBuffer}
-	}
-	{
-		var vertBuffer *uniformBuffer
-		fsh, err := b.NewFragmentShader(fsSrc[materialColor])
-		if err != nil {
-			pipelines[materialTexture].Release()
-			return pipelines, err
-		}
-		defer fsh.Release()
-		pipe, err := b.NewPipeline(driver.PipelineDesc{
-			VertexShader:   vsh,
-			FragmentShader: fsh,
-			BlendDesc:      blend,
-			VertexLayout:   layout,
-			PixelFormat:    driver.TextureFormatOutput,
-			Topology:       driver.TopologyTriangleStrip,
-		})
-		if err != nil {
-			pipelines[materialTexture].Release()
-			return pipelines, err
-		}
-		if u := uniforms[materialColor]; u != nil {
-			vertBuffer = newUniformBuffer(b, u)
-		}
-		pipelines[materialColor] = &pipeline{pipe, vertBuffer}
-	}
-	{
-		var vertBuffer *uniformBuffer
-		fsh, err := b.NewFragmentShader(fsSrc[materialLinearGradient])
-		if err != nil {
-			pipelines[materialTexture].Release()
-			pipelines[materialColor].Release()
-			return pipelines, err
-		}
-		defer fsh.Release()
-		pipe, err := b.NewPipeline(driver.PipelineDesc{
-			VertexShader:   vsh,
-			FragmentShader: fsh,
-			BlendDesc:      blend,
-			VertexLayout:   layout,
-			PixelFormat:    driver.TextureFormatOutput,
-			Topology:       driver.TopologyTriangleStrip,
-		})
-		if err != nil {
-			pipelines[materialTexture].Release()
-			pipelines[materialColor].Release()
-			return pipelines, err
-		}
-		if u := uniforms[materialLinearGradient]; u != nil {
-			vertBuffer = newUniformBuffer(b, u)
-		}
-		pipelines[materialLinearGradient] = &pipeline{pipe, vertBuffer}
-	}
-	if err != nil {
-		for _, p := range pipelines {
-			p.Release()
-		}
-		return pipelines, err
 	}
 	return pipelines, nil
 }
@@ -865,7 +867,7 @@ func (r *renderer) drawLayers(layers []opacityLayer, ops []imageOp) {
 			Min: l.place.Pos,
 			Max: l.place.Pos.Add(l.clip.Size()),
 		}
-		r.ctx.Viewport(v.Min.X, v.Min.Y, v.Max.X, v.Max.Y)
+		r.ctx.Viewport(v.Min.X, v.Min.Y, v.Dx(), v.Dy())
 		f := r.layerFBOs.fbos[fbo]
 		r.drawOps(true, l.clip.Min.Mul(-1), l.clip.Size(), ops[l.opStart:l.opEnd])
 		sr := f32.FRect(v)
@@ -930,7 +932,7 @@ func (d *drawOps) newPathOp() *pathOp {
 	return &d.pathOpCache[len(d.pathOpCache)-1]
 }
 
-func (d *drawOps) addClipPath(state *drawState, aux []byte, auxKey opKey, bounds f32.Rectangle, off f32.Point, push bool) {
+func (d *drawOps) addClipPath(state *drawState, aux []byte, auxKey opKey, bounds f32.Rectangle, off f32.Point) {
 	npath := d.newPathOp()
 	*npath = pathOp{
 		parent:    state.cpath,
@@ -1055,7 +1057,7 @@ loop:
 				quads.aux, bounds, _ = d.boundsForTransformedRect(bounds, trans)
 				quads.key = opKey{Key: encOp.Key}
 			}
-			d.addClipPath(&state, quads.aux, quads.key, bounds, off, true)
+			d.addClipPath(&state, quads.aux, quads.key, bounds, off)
 			quads = quadsOp{}
 		case ops.TypePopClip:
 			state.cpath = state.cpath.parent
@@ -1100,7 +1102,7 @@ loop:
 				// this transformed rectangle.
 				k := opKey{Key: encOp.Key}
 				k.SetTransform(t) // TODO: This call has no effect.
-				d.addClipPath(&state, clipData, k, bnd, off, false)
+				d.addClipPath(&state, clipData, k, bnd, off)
 			}
 
 			bounds := cl.Round()
@@ -1230,7 +1232,7 @@ func (r *renderer) prepareDrawOps(ops []imageOp) {
 	}
 }
 
-func (r *renderer) drawOps(isFBO bool, opOff image.Point, viewport image.Point, ops []imageOp) {
+func (r *renderer) drawOps(isFBO bool, opOff, viewport image.Point, ops []imageOp) {
 	var coverTex driver.Texture
 	for i := 0; i < len(ops); i++ {
 		img := ops[i]
@@ -1244,9 +1246,13 @@ func (r *renderer) drawOps(isFBO bool, opOff image.Point, viewport image.Point,
 
 		scale, off := clipSpaceTransform(drc, viewport)
 		var fbo FBO
+		fboIdx := 0
+		if isFBO {
+			fboIdx = 1
+		}
 		switch img.clipType {
 		case clipTypeNone:
-			p := r.blitter.pipelines[m.material]
+			p := r.blitter.pipelines[fboIdx][m.material]
 			r.ctx.BindPipeline(p.pipeline)
 			r.ctx.BindVertexBuffer(r.blitter.quadVerts, 0)
 			r.blitter.blit(m.material, isFBO, m.color, m.color1, m.color2, scale, off, m.opacity, m.uvTrans)
@@ -1265,7 +1271,7 @@ func (r *renderer) drawOps(isFBO bool, opOff image.Point, viewport image.Point,
 			Max: img.place.Pos.Add(drc.Size()),
 		}
 		coverScale, coverOff := texSpaceTransform(f32.FRect(uv), fbo.size)
-		p := r.pather.coverer.pipelines[m.material]
+		p := r.pather.coverer.pipelines[fboIdx][m.material]
 		r.ctx.BindPipeline(p.pipeline)
 		r.ctx.BindVertexBuffer(r.blitter.quadVerts, 0)
 		r.pather.cover(m.material, isFBO, m.color, m.color1, m.color2, scale, off, m.uvTrans, coverScale, coverOff)
@@ -1273,7 +1279,11 @@ func (r *renderer) drawOps(isFBO bool, opOff image.Point, viewport image.Point,
 }
 
 func (b *blitter) blit(mat materialType, fbo bool, col f32color.RGBA, col1, col2 f32color.RGBA, scale, off f32.Point, opacity float32, uvTrans f32.Affine2D) {
-	p := b.pipelines[mat]
+	fboIdx := 0
+	if fbo {
+		fboIdx = 1
+	}
+	p := b.pipelines[fboIdx][mat]
 	b.ctx.BindPipeline(p.pipeline)
 	var uniforms *blitUniforms
 	switch mat {

gpu/internal/rendertest/render_test.go

@@ -483,14 +483,14 @@ func TestGapsInPath(t *testing.T) {
 func TestOpacity(t *testing.T) {
 	run(t, func(ops *op.Ops) {
 		opc1 := paint.PushOpacity(ops, .3)
-		// Fill screen to exercize the glClear optimization.
+		// Fill screen to exercise the glClear optimization.
 		paint.FillShape(ops, color.NRGBA{R: 255, A: 255}, clip.Rect{Max: image.Pt(1024, 1024)}.Op())
 		opc2 := paint.PushOpacity(ops, .6)
 		paint.FillShape(ops, color.NRGBA{G: 255, A: 255}, clip.Rect{Min: image.Pt(20, 10), Max: image.Pt(64, 128)}.Op())
 		opc2.Pop()
 		opc1.Pop()
 		opc3 := paint.PushOpacity(ops, .6)
-		paint.FillShape(ops, color.NRGBA{G: 255, A: 255}, clip.Rect{Min: image.Pt(50+20, 10), Max: image.Pt(50+64, 128)}.Op())
+		paint.FillShape(ops, color.NRGBA{B: 255, A: 255}, clip.Ellipse(image.Rectangle{Min: image.Pt(20+20, 10), Max: image.Pt(50+64, 128)}).Op(ops))
 		opc3.Pop()
 	}, func(r result) {
 	})

gpu/path.go

@@ -30,7 +30,7 @@ type pather struct {
 
 type coverer struct {
 	ctx                    driver.Device
-	pipelines              [3]*pipeline
+	pipelines              [2][3]*pipeline
 	texUniforms            *coverTexUniforms
 	colUniforms            *coverColUniforms
 	linearGradientUniforms *coverLinearGradientUniforms
@@ -309,7 +309,9 @@ func (p *pather) release() {
 
 func (c *coverer) release() {
 	for _, p := range c.pipelines {
-		p.Release()
+		for _, p := range p {
+			p.Release()
+		}
 	}
 }
 
@@ -405,7 +407,11 @@ func (c *coverer) cover(mat materialType, isFBO bool, col f32color.RGBA, col1, c
 	}
 	uniforms.transform = [4]float32{scale.X, scale.Y, off.X, off.Y}
 	uniforms.uvCoverTransform = [4]float32{coverScale.X, coverScale.Y, coverOff.X, coverOff.Y}
-	c.pipelines[mat].UploadUniforms(c.ctx)
+	fboIdx := 0
+	if isFBO {
+		fboIdx = 1
+	}
+	c.pipelines[fboIdx][mat].UploadUniforms(c.ctx)
 	c.ctx.DrawArrays(0, 4)
 }
 

internal/egl/egl.go

@@ -15,10 +15,9 @@ import (
 )
 
 type Context struct {
-	disp          _EGLDisplay
+	disp    _EGLDisplay
-	eglCtx        *eglContext
+	eglCtx  *eglContext
-	eglSurf       _EGLSurface
+	eglSurf _EGLSurface
-	width, height int
 }
 
 type eglContext struct {
@@ -121,11 +120,9 @@ func (c *Context) VisualID() int {
 	return c.eglCtx.visualID
 }
 
-func (c *Context) CreateSurface(win NativeWindowType, width, height int) error {
+func (c *Context) CreateSurface(win NativeWindowType) error {
 	eglSurf, err := createSurface(c.disp, c.eglCtx, win)
 	c.eglSurf = eglSurf
-	c.width = width
-	c.height = height
 	return err
 }
 

internal/gl/gl_windows.go

@@ -361,6 +361,9 @@ func (c *Functions) GetProgrami(p Program, pname Enum) int {
 }
 func (c *Functions) GetProgramInfoLog(p Program) string {
 	n := c.GetProgrami(p, INFO_LOG_LENGTH)
+	if n == 0 {
+		return ""
+	}
 	buf := make([]byte, n)
 	syscall.Syscall6(_glGetProgramInfoLog.Addr(), 4, uintptr(p.V), uintptr(len(buf)), 0, uintptr(unsafe.Pointer(&buf[0])), 0, 0)
 	return string(buf)

internal/stroke/stroke.go

@@ -327,6 +327,9 @@ func strokePathNorm(p0, p1, p2 f32.Point, t, d float32) f32.Point {
 func rot90CW(p f32.Point) f32.Point { return f32.Pt(+p.Y, -p.X) }
 
 func normPt(p f32.Point, l float32) f32.Point {
+	if (p.X == 0 && p.Y == l) || (p.Y == 0 && p.X == l) {
+		return f32.Point{X: p.X, Y: p.Y}
+	}
 	d := math.Hypot(float64(p.X), float64(p.Y))
 	l64 := float64(l)
 	if math.Abs(d-l64) < 1e-10 {

io/input/key_test.go

@@ -251,9 +251,10 @@ func TestFocusScroll(t *testing.T) {
 	filters := []event.Filter{
 		key.FocusFilter{Target: h},
 		pointer.Filter{
-			Target:       h,
+			Target:  h,
-			Kinds:        pointer.Scroll,
+			Kinds:   pointer.Scroll,
-			ScrollBounds: image.Rect(-100, -100, 100, 100),
+			ScrollX: pointer.ScrollRange{Min: -100, Max: +100},
+			ScrollY: pointer.ScrollRange{Min: -100, Max: +100},
 		},
 	}
 	events(r, -1, filters...)

io/input/pointer.go

@@ -72,7 +72,7 @@ type pointerHandler struct {
 type pointerFilter struct {
 	kinds pointer.Kind
 	// min and max horizontal/vertical scroll
-	scrollRange image.Rectangle
+	scrollX, scrollY pointer.ScrollRange
 
 	sourceMimes []string
 	targetMimes []string
@@ -297,7 +297,8 @@ func (p *pointerFilter) Add(f event.Filter) {
 		p.targetMimes = append(p.targetMimes, f.Type)
 	case pointer.Filter:
 		p.kinds = p.kinds | f.Kinds
-		p.scrollRange = p.scrollRange.Union(f.ScrollBounds)
+		p.scrollX = p.scrollX.Union(f.ScrollX)
+		p.scrollY = p.scrollY.Union(f.ScrollY)
 	}
 }
 
@@ -325,7 +326,8 @@ func (p *pointerFilter) Matches(e event.Event) bool {
 
 func (p *pointerFilter) Merge(p2 pointerFilter) {
 	p.kinds = p.kinds | p2.kinds
-	p.scrollRange = p.scrollRange.Union(p2.scrollRange)
+	p.scrollX = p.scrollX.Union(p2.scrollX)
+	p.scrollY = p.scrollY.Union(p2.scrollY)
 	p.sourceMimes = append(p.sourceMimes, p2.sourceMimes...)
 	p.targetMimes = append(p.targetMimes, p2.targetMimes...)
 }
@@ -333,8 +335,8 @@ func (p *pointerFilter) Merge(p2 pointerFilter) {
 // clampScroll splits a scroll distance in the remaining scroll and the
 // scroll accepted by the filter.
 func (p *pointerFilter) clampScroll(scroll f32.Point) (left, scrolled f32.Point) {
-	left.X, scrolled.X = clampSplit(scroll.X, p.scrollRange.Min.X, p.scrollRange.Max.X)
+	left.X, scrolled.X = clampSplit(scroll.X, p.scrollX.Min, p.scrollX.Max)
-	left.Y, scrolled.Y = clampSplit(scroll.Y, p.scrollRange.Min.Y, p.scrollRange.Max.Y)
+	left.Y, scrolled.Y = clampSplit(scroll.Y, p.scrollY.Min, p.scrollY.Max)
 	return
 }
 

io/input/pointer_test.go

@@ -300,9 +300,9 @@ func TestPointerPriority(t *testing.T) {
 	r1 := clip.Rect(image.Rect(0, 0, 100, 100)).Push(&ops)
 	f1 := func(t event.Tag) event.Filter {
 		return pointer.Filter{
-			Target:       t,
+			Target:  t,
-			Kinds:        pointer.Scroll,
+			Kinds:   pointer.Scroll,
-			ScrollBounds: image.Rectangle{Max: image.Point{X: 100}},
+			ScrollX: pointer.ScrollRange{Max: 100},
 		}
 	}
 	events(&r, -1, f1(handler1))
@@ -311,9 +311,9 @@ func TestPointerPriority(t *testing.T) {
 	r2 := clip.Rect(image.Rect(0, 0, 100, 50)).Push(&ops)
 	f2 := func(t event.Tag) event.Filter {
 		return pointer.Filter{
-			Target:       t,
+			Target:  t,
-			Kinds:        pointer.Scroll,
+			Kinds:   pointer.Scroll,
-			ScrollBounds: image.Rectangle{Max: image.Point{X: 20}},
+			ScrollX: pointer.ScrollRange{Max: 20},
 		}
 	}
 	events(&r, -1, f2(handler2))
@@ -324,9 +324,10 @@ func TestPointerPriority(t *testing.T) {
 	r3 := clip.Rect(image.Rect(0, 100, 100, 200)).Push(&ops)
 	f3 := func(t event.Tag) event.Filter {
 		return pointer.Filter{
-			Target:       t,
+			Target:  t,
-			Kinds:        pointer.Scroll,
+			Kinds:   pointer.Scroll,
-			ScrollBounds: image.Rectangle{Min: image.Point{X: -20, Y: -40}},
+			ScrollX: pointer.ScrollRange{Min: -20},
+			ScrollY: pointer.ScrollRange{Min: -40},
 		}
 	}
 	events(&r, -1, f3(handler3))

io/input/router.go

@@ -35,10 +35,9 @@ type Router struct {
 		queue keyQueue
 		// The following fields have the same purpose as the fields in
 		// type handler, but for key.Events.
-		filter          keyFilter
+		filter        keyFilter
-		nextFilter      keyFilter
+		nextFilter    keyFilter
-		processedFilter keyFilter
+		scratchFilter keyFilter
-		scratchFilter   keyFilter
 	}
 	cqueue clipboardQueue
 	// states is the list of pending state changes resulting from
@@ -304,7 +303,6 @@ func (q *Router) Event(filters ...event.Filter) (event.Event, bool) {
 		h := q.stateFor(tf.tag)
 		h.processedFilter.Merge(tf.filter)
 	}
-	q.key.processedFilter = append(q.key.processedFilter, q.key.scratchFilter...)
 	return nil, false
 }
 

io/pointer/doc.go

@@ -37,11 +37,11 @@ For example:
 	var h1, h2 *Handler
 
 	area := clip.Rect(...).Push(ops)
-	event.Op{Tag: h1}.Add(Ops)
+	event.Op(Ops, h1)
 	area.Pop()
 
 	area := clip.Rect(...).Push(ops)
-	event.Op{Tag: h2}.Add(ops)
+	event.Op(Ops, h2)
 	area.Pop()
 
 implies a tree of two inner nodes, each with one pointer handler attached.

io/pointer/pointer.go

@@ -3,7 +3,6 @@
 package pointer
 
 import (
-	"image"
 	"strings"
 	"time"
 
@@ -61,12 +60,19 @@ type Filter struct {
 	Target event.Tag
 	// Kinds is a bitwise-or of event types to match.
 	Kinds Kind
-	// ScrollBounds describe the maximum scrollable distances in both
+	// ScrollX and ScrollY constrain the range of scrolling events delivered
-	// axes. Specifically, any Event e delivered to Tag will satisfy
+	// to Target. Specifically, any Event e delivered to Tag will satisfy
 	//
-	// ScrollBounds.Min.X <= e.Scroll.X <= ScrollBounds.Max.X (horizontal axis)
+	// ScrollX.Min <= e.Scroll.X <= ScrollX.Max (horizontal axis)
-	// ScrollBounds.Min.Y <= e.Scroll.Y <= ScrollBounds.Max.Y (vertical axis)
+	// ScrollY.Min <= e.Scroll.Y <= ScrollY.Max (vertical axis)
-	ScrollBounds image.Rectangle
+	ScrollX ScrollRange
+	ScrollY ScrollRange
+}
+
+// ScrollRange describes the range of scrolling distances in an
+// axis.
+type ScrollRange struct {
+	Min, Max int
 }
 
 // GrabCmd requests a pointer grab on the pointer identified by ID.
@@ -219,6 +225,13 @@ const (
 	ButtonTertiary
 )
 
+func (s ScrollRange) Union(s2 ScrollRange) ScrollRange {
+	return ScrollRange{
+		Min: min(s.Min, s2.Min),
+		Max: max(s.Max, s2.Max),
+	}
+}
+
 // Push the current pass mode to the pass stack and set the pass mode.
 func (p PassOp) Push(o *op.Ops) PassStack {
 	id, mid := ops.PushOp(&o.Internal, ops.PassStack)

layout/list.go

@@ -7,6 +7,7 @@ import (
 	"math"
 
 	"gioui.org/gesture"
+	"gioui.org/io/pointer"
 	"gioui.org/op"
 	"gioui.org/op/clip"
 )
@@ -158,11 +159,12 @@ func (l *List) update(gtx Context) {
 			max = 0
 		}
 	}
-	scrollRange := image.Rectangle{
+	xrange := pointer.ScrollRange{Min: min, Max: max}
-		Min: l.Axis.Convert(image.Pt(min, 0)),
+	yrange := pointer.ScrollRange{}
-		Max: l.Axis.Convert(image.Pt(max, 0)),
+	if l.Axis == Vertical {
+		xrange, yrange = yrange, xrange
 	}
-	d := l.scroll.Update(gtx.Metric, gtx.Source, gtx.Now, gesture.Axis(l.Axis), scrollRange)
+	d := l.scroll.Update(gtx.Metric, gtx.Source, gtx.Now, gesture.Axis(l.Axis), xrange, yrange)
 	l.scrollDelta = d
 	l.Position.Offset += d
 }

op/clip/clip.go

@@ -138,6 +138,9 @@ type Path struct {
 func (p *Path) Pos() f32.Point { return p.pen }
 
 // Begin the path, storing the path data and final Op into ops.
+//
+// Caller must also call End to finish the drawing.
+// Forgetting to call it will result in a "panic: cannot mix multi ops with single ones".
 func (p *Path) Begin(o *op.Ops) {
 	*p = Path{
 		ops:     &o.Internal,

text/gotext.go

@@ -4,6 +4,7 @@ package text
 
 import (
 	"bytes"
+	"fmt"
 	"image"
 	"io"
 	"log"
@@ -276,7 +277,8 @@ func newShaperImpl(systemFonts bool, collection []FontFace) *shaperImpl {
 // It returns whether the face is now available for use. FontFaces are prioritized
 // in the order in which they are loaded, with the first face being the default.
 func (s *shaperImpl) Load(f FontFace) {
-	s.fontMap.AddFace(f.Face.Face(), opentype.FontToDescription(f.Font))
+	desc := opentype.FontToDescription(f.Font)
+	s.fontMap.AddFace(f.Face.Face(), fontscan.Location{File: fmt.Sprint(desc)}, desc)
 	s.addFace(f.Face.Face(), f.Font)
 }
 

widget/editor.go

@@ -228,19 +228,19 @@ func (e *Editor) processPointer(gtx layout.Context) (EditorEvent, bool) {
 		axis = gesture.Vertical
 		smin, smax = sbounds.Min.Y, sbounds.Max.Y
 	}
-	var scrollRange image.Rectangle
+	var scrollX, scrollY pointer.ScrollRange
 	textDims := e.text.FullDimensions()
 	visibleDims := e.text.Dimensions()
 	if e.SingleLine {
 		scrollOffX := e.text.ScrollOff().X
-		scrollRange.Min.X = min(-scrollOffX, 0)
+		scrollX.Min = min(-scrollOffX, 0)
-		scrollRange.Max.X = max(0, textDims.Size.X-(scrollOffX+visibleDims.Size.X))
+		scrollX.Max = max(0, textDims.Size.X-(scrollOffX+visibleDims.Size.X))
 	} else {
 		scrollOffY := e.text.ScrollOff().Y
-		scrollRange.Min.Y = -scrollOffY
+		scrollY.Min = -scrollOffY
-		scrollRange.Max.Y = max(0, textDims.Size.Y-(scrollOffY+visibleDims.Size.Y))
+		scrollY.Max = max(0, textDims.Size.Y-(scrollOffY+visibleDims.Size.Y))
 	}
-	sdist := e.scroller.Update(gtx.Metric, gtx.Source, gtx.Now, axis, scrollRange)
+	sdist := e.scroller.Update(gtx.Metric, gtx.Source, gtx.Now, axis, scrollX, scrollY)
 	var soff int
 	if e.SingleLine {
 		e.text.ScrollRel(sdist, 0)
@@ -289,6 +289,9 @@ func (e *Editor) processPointerEvent(gtx layout.Context, ev event.Event) (Editor
 				Y: int(math.Round(float64(evt.Position.Y))),
 			})
 			gtx.Execute(key.FocusCmd{Tag: e})
+			if !e.ReadOnly {
+				gtx.Execute(key.SoftKeyboardCmd{Show: true})
+			}
 			if e.scroller.State() != gesture.StateFlinging {
 				e.scrollCaret = true
 			}
@@ -312,8 +315,8 @@ func (e *Editor) processPointerEvent(gtx layout.Context, ev event.Event) (Editor
 				e.text.MoveWord(1, selectionExtend)
 				e.dragging = false
 			case evt.NumClicks >= 3:
-				e.text.MoveStart(selectionClear)
+				e.text.MoveLineStart(selectionClear)
-				e.text.MoveEnd(selectionExtend)
+				e.text.MoveLineEnd(selectionExtend)
 				e.dragging = false
 			}
 		}
@@ -374,8 +377,8 @@ func (e *Editor) processKey(gtx layout.Context) (EditorEvent, bool) {
 		key.Filter{Focus: e, Name: key.NameDeleteBackward, Optional: key.ModShortcutAlt | key.ModShift},
 		key.Filter{Focus: e, Name: key.NameDeleteForward, Optional: key.ModShortcutAlt | key.ModShift},
 
-		key.Filter{Focus: e, Name: key.NameHome, Optional: key.ModShift},
+		key.Filter{Focus: e, Name: key.NameHome, Optional: key.ModShortcut | key.ModShift},
-		key.Filter{Focus: e, Name: key.NameEnd, Optional: key.ModShift},
+		key.Filter{Focus: e, Name: key.NameEnd, Optional: key.ModShortcut | key.ModShift},
 		key.Filter{Focus: e, Name: key.NamePageDown, Optional: key.ModShift},
 		key.Filter{Focus: e, Name: key.NamePageUp, Optional: key.ModShift},
 		condFilter(!atBeginning, key.Filter{Focus: e, Name: key.NameLeftArrow, Optional: key.ModShortcutAlt | key.ModShift}),
@@ -395,7 +398,7 @@ func (e *Editor) processKey(gtx layout.Context) (EditorEvent, bool) {
 		case key.FocusEvent:
 			// Reset IME state.
 			e.ime.imeState = imeState{}
-			if ke.Focus {
+			if ke.Focus && !e.ReadOnly {
 				gtx.Execute(key.SoftKeyboardCmd{Show: true})
 			}
 		case key.Event:
@@ -521,6 +524,10 @@ func (e *Editor) command(gtx layout.Context, k key.Event) (EditorEvent, bool) {
 					}
 				}
 			}
+		case key.NameHome:
+			e.text.MoveTextStart(selAct)
+		case key.NameEnd:
+			e.text.MoveTextEnd(selAct)
 		}
 		return nil, false
 	}
@@ -582,9 +589,9 @@ func (e *Editor) command(gtx layout.Context, k key.Event) (EditorEvent, bool) {
 	case key.NamePageDown:
 		e.text.MovePages(+1, selAct)
 	case key.NameHome:
-		e.text.MoveStart(selAct)
+		e.text.MoveLineStart(selAct)
 	case key.NameEnd:
-		e.text.MoveEnd(selAct)
+		e.text.MoveLineEnd(selAct)
 	}
 	return nil, false
 }

widget/editor_test.go

@@ -256,7 +256,7 @@ func TestEditor(t *testing.T) {
 	// Regression test for bad in-cluster rune offset math.
 	e.SetText("æbc")
 	e.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 0, 3, len("æbc"))
 
 	textSample := "æbc\naøå••"
@@ -268,7 +268,7 @@ func TestEditor(t *testing.T) {
 	}
 	e.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
 	assertCaret(t, e, 0, 0, 0)
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 0, 3, len("æbc"))
 	e.MoveCaret(+1, +1)
 	assertCaret(t, e, 1, 0, len("æbc\n"))
@@ -276,7 +276,7 @@ func TestEditor(t *testing.T) {
 	assertCaret(t, e, 0, 3, len("æbc"))
 	e.text.MoveLines(+1, selectionClear)
 	assertCaret(t, e, 1, 4, len("æbc\naøå•"))
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 1, 5, len("æbc\naøå••"))
 	e.MoveCaret(+1, +1)
 	assertCaret(t, e, 1, 5, len("æbc\naøå••"))
@@ -300,7 +300,7 @@ func TestEditor(t *testing.T) {
 	// Test that moveLine applies x offsets from previous moves.
 	e.SetText("long line\nshort")
 	e.SetCaret(0, 0)
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	e.text.MoveLines(+1, selectionClear)
 	e.text.MoveLines(-1, selectionClear)
 	assertCaret(t, e, 0, utf8.RuneCountInString("long line"), len("long line"))
@@ -342,14 +342,14 @@ func TestEditorRTL(t *testing.T) {
 	e.MoveCaret(+1, +1)
 	assertCaret(t, e, 0, 3, len("الح"))
 	// Move to the "end" of the line. This moves to the left edge of the line.
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 0, 4, len("الحب"))
 
 	sentence := "الحب سماء لا\nتمط غير الأحلام"
 	e.SetText(sentence)
 	e.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
 	assertCaret(t, e, 0, 0, 0)
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 0, 12, len("الحب سماء لا"))
 	e.MoveCaret(+1, +1)
 	assertCaret(t, e, 1, 0, len("الحب سماء لا\n"))
@@ -361,7 +361,7 @@ func TestEditorRTL(t *testing.T) {
 	assertCaret(t, e, 0, 12, len("الحب سماء لا"))
 	e.text.MoveLines(+1, selectionClear)
 	assertCaret(t, e, 1, 14, len("الحب سماء لا\nتمط غير الأحلا"))
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 1, 15, len("الحب سماء لا\nتمط غير الأحلام"))
 	e.MoveCaret(+1, +1)
 	assertCaret(t, e, 1, 15, len("الحب سماء لا\nتمط غير الأحلام"))
@@ -417,7 +417,7 @@ func TestEditorLigature(t *testing.T) {
 	assertCaret(t, e, 0, 0, 0)
 	e.SetText("fl") // just a ligature
 	e.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 0, 2, len("fl"))
 	e.MoveCaret(-1, -1)
 	assertCaret(t, e, 0, 1, len("f"))
@@ -428,7 +428,7 @@ func TestEditorLigature(t *testing.T) {
 	e.SetText("flaffl•ffi\n•fflfi") // 3 ligatures on line 0, 2 on line 1
 	e.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
 	assertCaret(t, e, 0, 0, 0)
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	assertCaret(t, e, 0, 10, len("ffaffl•ffi"))
 	e.MoveCaret(+1, +1)
 	assertCaret(t, e, 1, 0, len("ffaffl•ffi\n"))
@@ -481,7 +481,7 @@ func TestEditorLigature(t *testing.T) {
 	e.Layout(gtx, cache, font, fontSize, op.CallOp{}, op.CallOp{})
 	// Ensure that all runes in the final cluster of a line are properly
 	// decoded when moving to the end of the line. This is a regression test.
-	e.text.MoveEnd(selectionClear)
+	e.text.MoveLineEnd(selectionClear)
 	// The first line was broken by line wrapping, not a newline character, and has a trailing
 	// whitespace. However, we should never be able to reach the "other side" of such a trailing
 	// whitespace glyph.
@@ -548,8 +548,10 @@ const (
 	moveRune
 	moveLine
 	movePage
-	moveStart
+	moveTextStart
-	moveEnd
+	moveTextEnd
+	moveLineStart
+	moveLineEnd
 	moveCoord
 	moveWord
 	deleteWord
@@ -599,10 +601,14 @@ func TestEditorCaretConsistency(t *testing.T) {
 				e.text.MoveLines(int(distance), selectionClear)
 			case movePage:
 				e.text.MovePages(int(distance), selectionClear)
-			case moveStart:
+			case moveLineStart:
-				e.text.MoveStart(selectionClear)
+				e.text.MoveLineStart(selectionClear)
-			case moveEnd:
+			case moveLineEnd:
-				e.text.MoveEnd(selectionClear)
+				e.text.MoveLineEnd(selectionClear)
+			case moveTextStart:
+				e.text.MoveTextStart(selectionClear)
+			case moveTextEnd:
+				e.text.MoveTextEnd(selectionClear)
 			case moveCoord:
 				e.text.MoveCoord(image.Pt(int(x), int(y)))
 			case moveWord:
@@ -879,7 +885,7 @@ func (editMutation) Generate(rand *rand.Rand, size int) reflect.Value {
 // to make it much narrower (which makes the lines in the editor reflow), and
 // then verifies that the updated (col, line) positions of the selected text
 // are where we expect.
-func TestEditorSelect(t *testing.T) {
+func TestEditorSelectReflow(t *testing.T) {
 	e := new(Editor)
 	e.SetText(`a 2 4 6 8 a
 b 2 4 6 8 b
@@ -982,6 +988,60 @@ g 2 4 6 8 g
 	}
 }
 
+func TestEditorSelectShortcuts(t *testing.T) {
+	tFont := font.Font{}
+	tFontSize := unit.Sp(10)
+	tShaper := text.NewShaper(text.NoSystemFonts(), text.WithCollection(gofont.Collection()))
+	var tEditor = &Editor{
+		SingleLine: false,
+		ReadOnly:   true,
+	}
+	lines := "abc abc abc\ndef def def\nghi ghi ghi"
+	tEditor.SetText(lines)
+	type testCase struct {
+		// Initial text selection.
+		startPos, endPos int
+		// Keyboard shortcut to execute.
+		keyEvent key.Event
+		// Expected text selection.
+		selection string
+	}
+
+	pos1, pos2 := 14, 21
+	for n, tst := range []testCase{
+		{pos1, pos2, key.Event{Name: "A", Modifiers: key.ModShortcut}, lines},
+		{pos2, pos1, key.Event{Name: "A", Modifiers: key.ModShortcut}, lines},
+		{pos1, pos2, key.Event{Name: key.NameHome, Modifiers: key.ModShift}, "def def d"},
+		{pos1, pos2, key.Event{Name: key.NameEnd, Modifiers: key.ModShift}, "ef"},
+		{pos2, pos1, key.Event{Name: key.NameHome, Modifiers: key.ModShift}, "de"},
+		{pos2, pos1, key.Event{Name: key.NameEnd, Modifiers: key.ModShift}, "f def def"},
+		{pos1, pos2, key.Event{Name: key.NameHome, Modifiers: key.ModShortcut | key.ModShift}, "abc abc abc\ndef def d"},
+		{pos1, pos2, key.Event{Name: key.NameEnd, Modifiers: key.ModShortcut | key.ModShift}, "ef\nghi ghi ghi"},
+		{pos2, pos1, key.Event{Name: key.NameHome, Modifiers: key.ModShortcut | key.ModShift}, "abc abc abc\nde"},
+		{pos2, pos1, key.Event{Name: key.NameEnd, Modifiers: key.ModShortcut | key.ModShift}, "f def def\nghi ghi ghi"},
+	} {
+		tRouter := new(input.Router)
+		gtx := layout.Context{
+			Ops:         new(op.Ops),
+			Locale:      english,
+			Constraints: layout.Exact(image.Pt(100, 100)),
+			Source:      tRouter.Source(),
+		}
+		gtx.Execute(key.FocusCmd{Tag: tEditor})
+		tEditor.Layout(gtx, tShaper, tFont, tFontSize, op.CallOp{}, op.CallOp{})
+
+		tEditor.SetCaret(tst.startPos, tst.endPos)
+		if cStart, cEnd := tEditor.Selection(); cStart != tst.startPos || cEnd != tst.endPos {
+			t.Errorf("TestEditorSelect %d: initial selection", n)
+		}
+		tRouter.Queue(tst.keyEvent)
+		tEditor.Update(gtx)
+		if got := tEditor.SelectedText(); got != tst.selection {
+			t.Errorf("TestEditorSelect %d: Expected %q, got %q", n, tst.selection, got)
+		}
+	}
+}
+
 // Verify that an existing selection is dismissed when you press arrow keys.
 func TestSelectMove(t *testing.T) {
 	e := new(Editor)

widget/index_test.go

@@ -284,9 +284,9 @@ func TestIndexPositionBidi(t *testing.T) {
 			name:   "bidi rtl",
 			glyphs: bidiRTLText,
 			expectedXs: []fixed.Int26_6{
-				2665, 3291, 3861, 4431, 4716, 5286, 5856, 6109, 6621, 7133, 2665, 2380, 1577, 985, 687, 266, // Positions on line 0.
+				2646, 3272, 3842, 4412, 4697, 5267, 5837, 6090, 6602, 7114, 2646, 2380, 1577, 985, 687, 266, // Positions on line 0.
 
-				7886, 7118, 6350, 5582, 4814, 4529, 4231, 3933, 3667, 2300, 2585, 3155, 3667, 2300, 2015, 1709, 1117, 266, // Positions on line 1.
+				7867, 7099, 6331, 5563, 4795, 4510, 4212, 3914, 3648, 2281, 2566, 3136, 3648, 2281, 2015, 1709, 1117, 266, // Positions on line 1.
 
 				8794, 8026, 7258, 6490, 5722, 5437, 4922, 4540, 4134, 3868, 0, 290, 860, 1430, 1715, 1989, 2559, 3071, 3583, // Positions on line 2.
 
@@ -402,7 +402,7 @@ func TestIndexPositionLines(t *testing.T) {
 					xOff:    fixed.Int26_6(0),
 					yOff:    22,
 					glyphs:  15,
-					width:   fixed.Int26_6(7133),
+					width:   fixed.Int26_6(7114),
 					ascent:  fixed.Int26_6(1407),
 					descent: fixed.Int26_6(756),
 				},
@@ -410,7 +410,7 @@ func TestIndexPositionLines(t *testing.T) {
 					xOff:    fixed.Int26_6(0),
 					yOff:    41,
 					glyphs:  15,
-					width:   fixed.Int26_6(7886),
+					width:   fixed.Int26_6(7867),
 					ascent:  fixed.Int26_6(1407),
 					descent: fixed.Int26_6(756),
 				},
@@ -477,18 +477,18 @@ func TestIndexPositionLines(t *testing.T) {
 			glyphs: bidiRTLTextOpp,
 			expectedLines: []lineInfo{
 				{
-					xOff:    fixed.Int26_6(3107),
+					xOff:    fixed.Int26_6(3126),
 					yOff:    22,
 					glyphs:  15,
-					width:   fixed.Int26_6(7133),
+					width:   fixed.Int26_6(7114),
 					ascent:  fixed.Int26_6(1407),
 					descent: fixed.Int26_6(756),
 				},
 				{
-					xOff:    fixed.Int26_6(2354),
+					xOff:    fixed.Int26_6(2373),
 					yOff:    41,
 					glyphs:  15,
-					width:   fixed.Int26_6(7886),
+					width:   fixed.Int26_6(7867),
 					ascent:  fixed.Int26_6(1407),
 					descent: fixed.Int26_6(756),
 				},

widget/material/progressbar.go

@@ -54,6 +54,9 @@ func (p ProgressBarStyle) Layout(gtx layout.Context) layout.Dimensions {
 			if !gtx.Enabled() {
 				fillColor = f32color.Disabled(fillColor)
 			}
+			if fillWidth < int(p.Radius*2) {
+				fillWidth = int(p.Radius * 2)
+			}
 			return shader(fillWidth, fillColor)
 		}),
 	)

widget/selectable.go

@@ -247,8 +247,8 @@ func (e *Selectable) processPointer(gtx layout.Context) {
 					e.text.MoveWord(1, selectionExtend)
 					e.dragging = false
 				case evt.NumClicks >= 3:
-					e.text.MoveStart(selectionClear)
+					e.text.MoveLineStart(selectionClear)
-					e.text.MoveEnd(selectionExtend)
+					e.text.MoveLineEnd(selectionExtend)
 					e.dragging = false
 				}
 			}
@@ -378,9 +378,9 @@ func (e *Selectable) command(gtx layout.Context, k key.Event) {
 	case key.NamePageDown:
 		e.text.MovePages(+1, selAct)
 	case key.NameHome:
-		e.text.MoveStart(selAct)
+		e.text.MoveLineStart(selAct)
 	case key.NameEnd:
-		e.text.MoveEnd(selAct)
+		e.text.MoveLineEnd(selAct)
 	}
 }
 

widget/text.go

@@ -639,9 +639,28 @@ func (e *textView) MoveCaret(startDelta, endDelta int) {
 	e.caret.end = e.moveByGraphemes(e.caret.end, endDelta)
 }
 
-// MoveStart moves the caret to the start of the current line, ensuring that the resulting
+// MoveTextStart moves the caret to the start of the text.
+func (e *textView) MoveTextStart(selAct selectionAction) {
+	caret := e.closestToRune(e.caret.end)
+	e.caret.start = 0
+	e.caret.end = caret.runes
+	e.caret.xoff = -caret.x
+	e.updateSelection(selAct)
+	e.clampCursorToGraphemes()
+}
+
+// MoveTextEnd moves the caret to the end of the text.
+func (e *textView) MoveTextEnd(selAct selectionAction) {
+	caret := e.closestToRune(math.MaxInt)
+	e.caret.start = caret.runes
+	e.caret.xoff = fixed.I(e.params.MaxWidth) - caret.x
+	e.updateSelection(selAct)
+	e.clampCursorToGraphemes()
+}
+
+// MoveLineStart moves the caret to the start of the current line, ensuring that the resulting
 // cursor position is on a grapheme cluster boundary.
-func (e *textView) MoveStart(selAct selectionAction) {
+func (e *textView) MoveLineStart(selAct selectionAction) {
 	caret := e.closestToRune(e.caret.start)
 	caret = e.closestToLineCol(caret.lineCol.line, 0)
 	e.caret.start = caret.runes
@@ -650,9 +669,9 @@ func (e *textView) MoveStart(selAct selectionAction) {
 	e.clampCursorToGraphemes()
 }
 
-// MoveEnd moves the caret to the end of the current line, ensuring that the resulting
+// MoveLineEnd moves the caret to the end of the current line, ensuring that the resulting
 // cursor position is on a grapheme cluster boundary.
-func (e *textView) MoveEnd(selAct selectionAction) {
+func (e *textView) MoveLineEnd(selAct selectionAction) {
 	caret := e.closestToRune(e.caret.start)
 	caret = e.closestToLineCol(caret.lineCol.line, math.MaxInt)
 	e.caret.start = caret.runes