Skip to content

Merge upstream/main into lich #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omartelo merged 4 commits into from
Nov 8, 2026
Merged

Merge upstream/main into lich #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1555e7b
app: [Windows] clear hover when the pointer leaves the client area
qianniancn Nov 6, 2026
aec3b91
app: [X11] scroll once per wheel notch, not twice
Nov 6, 2026
2919cda
app: [X11] send pointer.Cancel when the pointer leaves the window
Nov 6, 2026
54450e2
Merge upstream/main into lich
omartelo Nov 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/internal/windows/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,9 +384,13 @@ const (
WM_NCACTIVATE = 0x0086
WM_NCHITTEST = 0x0084
WM_NCCALCSIZE = 0x0083
WM_NCPOINTERUPDATE = 0x0241
WM_NCPOINTERDOWN = 0x0242
WM_NCPOINTERUP = 0x0243
WM_PAINT = 0x000F
WM_POINTERCAPTURECHANGED = 0x024C
WM_POINTERDOWN = 0x0246
WM_POINTERLEAVE = 0x024A
WM_POINTERUP = 0x0247
WM_POINTERUPDATE = 0x0245
WM_POINTERWHEEL = 0x024E
Expand Down
43 changes: 28 additions & 15 deletions app/os_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,26 +313,16 @@ func windowProc(hwnd syscall.Handle, msg uint32, wParam, lParam uintptr) uintptr
return 0
}
}
case windows.WM_POINTERDOWN, windows.WM_POINTERUP, windows.WM_POINTERUPDATE, windows.WM_POINTERCAPTURECHANGED:
case windows.WM_POINTERDOWN, windows.WM_POINTERUP, windows.WM_POINTERUPDATE,
windows.WM_POINTERLEAVE, windows.WM_POINTERCAPTURECHANGED,
windows.WM_NCPOINTERUPDATE, windows.WM_NCPOINTERDOWN, windows.WM_NCPOINTERUP:
pid := getPointerIDwParam(wParam)
pi, err := windows.GetPointerInfo(uint32(pid))
if err != nil {
panic(err)
}

kind := pointer.Move
switch pi.ButtonChangeType {
case windows.POINTER_CHANGE_FIRSTBUTTON_DOWN, windows.POINTER_CHANGE_SECONDBUTTON_DOWN, windows.POINTER_CHANGE_THIRDBUTTON_DOWN, windows.POINTER_CHANGE_FOURTHBUTTON_DOWN, windows.POINTER_CHANGE_FIFTHBUTTON_DOWN:
kind = pointer.Press
case windows.POINTER_CHANGE_FIRSTBUTTON_UP, windows.POINTER_CHANGE_SECONDBUTTON_UP, windows.POINTER_CHANGE_THIRDBUTTON_UP, windows.POINTER_CHANGE_FOURTHBUTTON_UP, windows.POINTER_CHANGE_FIFTHBUTTON_UP:
kind = pointer.Release
}

if (pi.PointerFlags&windows.POINTER_FLAG_CANCELED != 0) || (msg == windows.WM_POINTERCAPTURECHANGED) {
kind = pointer.Cancel
}

w.pointerUpdate(pi, pid, kind, lParam)
w.pointerUpdate(pi, pid, pointerKind(msg, pi), lParam)
case windows.WM_CANCELMODE:
w.ProcessEvent(pointer.Event{
Kind: pointer.Cancel,
Expand Down Expand Up @@ -648,8 +638,31 @@ func (w *window) hitTest(x, y int) uintptr {
return windows.HTCLIENT
}

func pointerKind(msg uint32, pi windows.PointerInfo) pointer.Kind {
if pi.PointerFlags&windows.POINTER_FLAG_CANCELED != 0 || msg == windows.WM_POINTERCAPTURECHANGED {
return pointer.Cancel
}
switch msg {
case windows.WM_POINTERLEAVE, windows.WM_NCPOINTERUPDATE, windows.WM_NCPOINTERDOWN, windows.WM_NCPOINTERUP:
// Treat non-client input as leaving the client area.
return pointer.Leave
}
switch pi.ButtonChangeType {
case windows.POINTER_CHANGE_FIRSTBUTTON_DOWN, windows.POINTER_CHANGE_SECONDBUTTON_DOWN,
windows.POINTER_CHANGE_THIRDBUTTON_DOWN, windows.POINTER_CHANGE_FOURTHBUTTON_DOWN,
windows.POINTER_CHANGE_FIFTHBUTTON_DOWN:
return pointer.Press
case windows.POINTER_CHANGE_FIRSTBUTTON_UP, windows.POINTER_CHANGE_SECONDBUTTON_UP,
windows.POINTER_CHANGE_THIRDBUTTON_UP, windows.POINTER_CHANGE_FOURTHBUTTON_UP,
windows.POINTER_CHANGE_FIFTHBUTTON_UP:
return pointer.Release
default:
return pointer.Move
}
}

func (w *window) pointerUpdate(pi windows.PointerInfo, pid pointer.ID, kind pointer.Kind, lParam uintptr) {
if !w.config.Focused {
if !w.config.Focused && kind != pointer.Leave {
windows.SetFocus(w.hwnd)
}

Expand Down
11 changes: 11 additions & 0 deletions app/os_x11.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,11 @@ func (h *x11EventHandler) handleEvents() bool {
default:
continue
}
if ev.Kind == pointer.Scroll && _type == C.ButtonRelease {
// The X server sends a press and a release for every wheel
// notch; only the press scrolls, or each notch counts twice.
continue
}
switch _type {
case C.ButtonPress:
w.pointerBtns |= btn
Expand All @@ -734,6 +739,11 @@ func (h *x11EventHandler) handleEvents() bool {
Time: time.Duration(mevt.time) * time.Millisecond,
Modifiers: w.xkb.Modifiers(),
})
case C.LeaveNotify:
cevt := (*C.XCrossingEvent)(unsafe.Pointer(xev))
if w.pointerBtns == 0 && cevt.detail != C.NotifyInferior {
w.ProcessEvent(pointer.Event{Kind: pointer.Cancel})
}
case C.Expose: // update
// redraw only on the last expose event
redraw = (*C.XExposeEvent)(unsafe.Pointer(xev)).count == 0
Expand Down Expand Up @@ -917,6 +927,7 @@ func newX11Window(gioWin *callbacks, options []Option) error {
C.KeyPressMask | C.KeyReleaseMask | // keyboard
C.ButtonPressMask | C.ButtonReleaseMask | // mouse clicks
C.PointerMotionMask | // mouse movement
C.LeaveWindowMask | // pointer leaving the window
C.StructureNotifyMask, // resize
background_pixmap: C.None,
override_redirect: C.False,
Expand Down