- github.com/bnema/purego v0.13.0-bnema.1 → v0.13.0-bnema.2
- github.com/bnema/purego-cef v0.14.2 → v0.14.4
- github.com/bnema/puregotk v0.7.2 → v0.7.6
- golang.org/x/sys v0.43.0 → v0.50.0
#2 build(deps): update 4 dependencies
M go.mod +5 -5
| @@ -1,10 +1,10 @@ | |||
| 1 | 1 | module github.com/bnema/purego-cef2gtk | |
| 2 | 2 | ||
| 3 | - | go 1.26 | |
| 3 | + | go 1.26.0 | |
| 4 | 4 | ||
| 5 | 5 | require ( | |
| 6 | - | github.com/bnema/purego v0.13.0-bnema.1 | |
| 7 | - | github.com/bnema/purego-cef v0.14.2 | |
| 8 | - | github.com/bnema/puregotk v0.7.2 | |
| 9 | - | golang.org/x/sys v0.43.0 | |
| 6 | + | github.com/bnema/purego v0.13.0-bnema.2 | |
| 7 | + | github.com/bnema/purego-cef v0.14.4 | |
| 8 | + | github.com/bnema/puregotk v0.7.6 | |
| 9 | + | golang.org/x/sys v0.50.0 | |
| 10 | 10 | ) | |
| @@ -1,10 +1,10 @@ | |||||
| 1 | module github.com/bnema/purego-cef2gtk | 1 | module github.com/bnema/purego-cef2gtk | ||
| 2 | 2 | ||||
| 3 | - | go 1.26 | 3 | + | go 1.26.0 |
| 4 | 4 | ||||
| 5 | require ( | 5 | require ( | ||
| 6 | - | github.com/bnema/purego v0.13.0-bnema.1 | 6 | + | github.com/bnema/purego v0.13.0-bnema.2 |
| 7 | - | github.com/bnema/purego-cef v0.14.2 | 7 | + | github.com/bnema/purego-cef v0.14.4 |
| 8 | - | github.com/bnema/puregotk v0.7.2 | 8 | + | github.com/bnema/puregotk v0.7.6 |
| 9 | - | golang.org/x/sys v0.43.0 | 9 | + | golang.org/x/sys v0.50.0 |
| 10 | ) | 10 | ) | ||
M go.sum +8 -8 generated file: collapsed
M internal/gtkgl/input_bridge.go +2 -3
| @@ -1158,7 +1158,6 @@ func TranslateMouseButton(gdkButton uint) cef.MouseButtonType { | |||
| 1158 | 1158 | const ( | |
| 1159 | 1159 | gdkKeyReturn = 0xff0d | |
| 1160 | 1160 | gdkKeyTab = 0xff09 | |
| 1161 | - | gdkKeyISOLeftTab = 0xfe20 // what GTK reports for Shift+Tab | |
| 1162 | 1161 | gdkKeyBackSpace = 0xff08 | |
| 1163 | 1162 | gdkKeyEscape = 0xff1b | |
| 1164 | 1163 | gdkKeyDelete = 0xffff | |
| @@ -1192,7 +1191,7 @@ func KeyvalToChar(keyval uint) uint16 { | |||
| 1192 | 1191 | switch keyval { | |
| 1193 | 1192 | case gdkKeyReturn: | |
| 1194 | 1193 | return '\r' | |
| 1195 | - | case gdkKeyTab, gdkKeyISOLeftTab: | |
| 1194 | + | case gdkKeyTab: | |
| 1196 | 1195 | return '\t' | |
| 1197 | 1196 | case gdkKeyBackSpace: | |
| 1198 | 1197 | return '\b' | |
| @@ -1235,7 +1234,7 @@ func gdkKeyvalToVKRange(keyval uint) (int32, bool) { | |||
| 1235 | 1234 | } | |
| 1236 | 1235 | ||
| 1237 | 1236 | var gdkKeyvalToVKMap = map[uint]int32{ | |
| 1238 | - | gdkKeyReturn: 0x0D, gdkKeyEscape: 0x1B, gdkKeyTab: 0x09, gdkKeyISOLeftTab: 0x09, gdkKeyBackSpace: 0x08, gdkKeyDelete: 0x2E, gdkKeySpace: 0x20, gdkKeyHome: 0x24, gdkKeyEnd: 0x23, gdkKeyPageUp: 0x21, gdkKeyPageDown: 0x22, 0xff63: 0x2D, | |
| 1237 | + | gdkKeyReturn: 0x0D, gdkKeyEscape: 0x1B, gdkKeyTab: 0x09, gdkKeyBackSpace: 0x08, gdkKeyDelete: 0x2E, gdkKeySpace: 0x20, gdkKeyHome: 0x24, gdkKeyEnd: 0x23, gdkKeyPageUp: 0x21, gdkKeyPageDown: 0x22, 0xff63: 0x2D, | |
| 1239 | 1238 | 0xffe1: 0xA0, 0xffe2: 0xA1, 0xffe3: 0xA2, 0xffe4: 0xA3, 0xffe9: 0xA4, 0xffea: 0xA5, | |
| 1240 | 1239 | '.': 0xBE, '>': 0xBE, ',': 0xBC, '<': 0xBC, '-': 0xBD, '_': 0xBD, '=': 0xBB, '+': 0xBB, ';': 0xBA, ':': 0xBA, '/': 0xBF, '?': 0xBF, '`': 0xC0, '~': 0xC0, '[': 0xDB, '{': 0xDB, '\\': 0xDC, '|': 0xDC, ']': 0xDD, '}': 0xDD, '\'': 0xDE, '"': 0xDE, | |
| 1241 | 1240 | '!': 0x31, '@': 0x32, '#': 0x33, '$': 0x34, '%': 0x35, '^': 0x36, '&': 0x37, '*': 0x38, '(': 0x39, ')': 0x30, | |
| @@ -1158,7 +1158,6 @@ func TranslateMouseButton(gdkButton uint) cef.MouseButtonType { | |||||
| 1158 | const ( | 1158 | const ( | ||
| 1159 | gdkKeyReturn = 0xff0d | 1159 | gdkKeyReturn = 0xff0d | ||
| 1160 | gdkKeyTab = 0xff09 | 1160 | gdkKeyTab = 0xff09 | ||
| 1161 | - | gdkKeyISOLeftTab = 0xfe20 // what GTK reports for Shift+Tab | |||
| 1162 | gdkKeyBackSpace = 0xff08 | 1161 | gdkKeyBackSpace = 0xff08 | ||
| 1163 | gdkKeyEscape = 0xff1b | 1162 | gdkKeyEscape = 0xff1b | ||
| 1164 | gdkKeyDelete = 0xffff | 1163 | gdkKeyDelete = 0xffff | ||
| @@ -1192,7 +1191,7 @@ func KeyvalToChar(keyval uint) uint16 { | |||||
| 1192 | switch keyval { | 1191 | switch keyval { | ||
| 1193 | case gdkKeyReturn: | 1192 | case gdkKeyReturn: | ||
| 1194 | return '\r' | 1193 | return '\r' | ||
| 1195 | - | case gdkKeyTab, gdkKeyISOLeftTab: | 1194 | + | case gdkKeyTab: |
| 1196 | return '\t' | 1195 | return '\t' | ||
| 1197 | case gdkKeyBackSpace: | 1196 | case gdkKeyBackSpace: | ||
| 1198 | return '\b' | 1197 | return '\b' | ||
| @@ -1235,7 +1234,7 @@ func gdkKeyvalToVKRange(keyval uint) (int32, bool) { | |||||
| 1235 | } | 1234 | } | ||
| 1236 | 1235 | ||||
| 1237 | var gdkKeyvalToVKMap = map[uint]int32{ | 1236 | var gdkKeyvalToVKMap = map[uint]int32{ | ||
| 1238 | - | gdkKeyReturn: 0x0D, gdkKeyEscape: 0x1B, gdkKeyTab: 0x09, gdkKeyISOLeftTab: 0x09, gdkKeyBackSpace: 0x08, gdkKeyDelete: 0x2E, gdkKeySpace: 0x20, gdkKeyHome: 0x24, gdkKeyEnd: 0x23, gdkKeyPageUp: 0x21, gdkKeyPageDown: 0x22, 0xff63: 0x2D, | 1237 | + | gdkKeyReturn: 0x0D, gdkKeyEscape: 0x1B, gdkKeyTab: 0x09, gdkKeyBackSpace: 0x08, gdkKeyDelete: 0x2E, gdkKeySpace: 0x20, gdkKeyHome: 0x24, gdkKeyEnd: 0x23, gdkKeyPageUp: 0x21, gdkKeyPageDown: 0x22, 0xff63: 0x2D, |
| 1239 | 0xffe1: 0xA0, 0xffe2: 0xA1, 0xffe3: 0xA2, 0xffe4: 0xA3, 0xffe9: 0xA4, 0xffea: 0xA5, | 1238 | 0xffe1: 0xA0, 0xffe2: 0xA1, 0xffe3: 0xA2, 0xffe4: 0xA3, 0xffe9: 0xA4, 0xffea: 0xA5, | ||
| 1240 | '.': 0xBE, '>': 0xBE, ',': 0xBC, '<': 0xBC, '-': 0xBD, '_': 0xBD, '=': 0xBB, '+': 0xBB, ';': 0xBA, ':': 0xBA, '/': 0xBF, '?': 0xBF, '`': 0xC0, '~': 0xC0, '[': 0xDB, '{': 0xDB, '\\': 0xDC, '|': 0xDC, ']': 0xDD, '}': 0xDD, '\'': 0xDE, '"': 0xDE, | 1239 | '.': 0xBE, '>': 0xBE, ',': 0xBC, '<': 0xBC, '-': 0xBD, '_': 0xBD, '=': 0xBB, '+': 0xBB, ';': 0xBA, ':': 0xBA, '/': 0xBF, '?': 0xBF, '`': 0xC0, '~': 0xC0, '[': 0xDB, '{': 0xDB, '\\': 0xDC, '|': 0xDC, ']': 0xDD, '}': 0xDD, '\'': 0xDE, '"': 0xDE, | ||
| 1241 | '!': 0x31, '@': 0x32, '#': 0x33, '$': 0x34, '%': 0x35, '^': 0x36, '&': 0x37, '*': 0x38, '(': 0x39, ')': 0x30, | 1240 | '!': 0x31, '@': 0x32, '#': 0x33, '$': 0x34, '%': 0x35, '^': 0x36, '&': 0x37, '*': 0x38, '(': 0x39, ')': 0x30, | ||
M internal/gtkgl/input_bridge_test.go +7 -38
| @@ -982,15 +982,13 @@ func TestTranslateModifiers(t *testing.T) { | |||
| 982 | 982 | ||
| 983 | 983 | func TestGDKKeyvalToWindowsVK(t *testing.T) { | |
| 984 | 984 | tests := map[uint]int32{ | |
| 985 | - | 'a': 0x41, | |
| 986 | - | 'A': 0x41, | |
| 987 | - | '7': 0x37, | |
| 988 | - | '!': 0x31, | |
| 989 | - | '.': 0xBE, | |
| 990 | - | 0xffbe: 0x70, // GDK_KEY_F1 | |
| 991 | - | 0xff51: 0x25, // GDK_KEY_Left | |
| 992 | - | 0xff09: 0x09, // GDK_KEY_Tab | |
| 993 | - | gdkKeyISOLeftTab: 0x09, // Shift+Tab | |
| 985 | + | 'a': 0x41, | |
| 986 | + | 'A': 0x41, | |
| 987 | + | '7': 0x37, | |
| 988 | + | '!': 0x31, | |
| 989 | + | '.': 0xBE, | |
| 990 | + | 0xffbe: 0x70, // GDK_KEY_F1 | |
| 991 | + | 0xff51: 0x25, // GDK_KEY_Left | |
| 994 | 992 | } | |
| 995 | 993 | for keyval, want := range tests { | |
| 996 | 994 | if got := GDKKeyvalToWindowsVK(keyval); got != want { | |
| @@ -999,35 +997,6 @@ func TestGDKKeyvalToWindowsVK(t *testing.T) { | |||
| 999 | 997 | } | |
| 1000 | 998 | } | |
| 1001 | 999 | ||
| 1002 | - | // Shift+Tab arrives from GTK as GDK_KEY_ISO_Left_Tab; Chromium moves focus | |
| 1003 | - | // backwards only when it sees VK_TAB with the Shift flag, like Tab. | |
| 1004 | - | func TestInputBridgeShiftTabSendsTabKeyEvents(t *testing.T) { | |
| 1005 | - | host := &recordingBrowserHost{} | |
| 1006 | - | ib := NewInputBridge(host, 1) | |
| 1007 | - | shift := uint(gdk.ShiftMaskValue) | |
| 1008 | - | ||
| 1009 | - | ib.forwardKeyPress(gdkKeyISOLeftTab, 23, shift, func() bool { return false }) | |
| 1010 | - | ib.onKeyRelease(gdkKeyISOLeftTab, 23, shift) | |
| 1011 | - | ||
| 1012 | - | if len(host.keys) != 3 { | |
| 1013 | - | t.Fatalf("Shift+Tab key events = %d, want 3 (rawkeydown, char, keyup)", len(host.keys)) | |
| 1014 | - | } | |
| 1015 | - | wantTypes := []cef.KeyEventType{ | |
| 1016 | - | cef.KeyEventTypeKeyeventRawkeydown, cef.KeyEventTypeKeyeventChar, cef.KeyEventTypeKeyeventKeyup, | |
| 1017 | - | } | |
| 1018 | - | for i, evt := range host.keys { | |
| 1019 | - | if evt.Type != wantTypes[i] || evt.WindowsKeyCode != 0x09 { | |
| 1020 | - | t.Fatalf("event %d = type %v code %#x, want type %v code VK_TAB", i, evt.Type, evt.WindowsKeyCode, wantTypes[i]) | |
| 1021 | - | } | |
| 1022 | - | if evt.Modifiers&uint32(cef.EventFlagsEventflagShiftDown) == 0 { | |
| 1023 | - | t.Fatalf("event %d modifiers = %#x, want Shift down", i, evt.Modifiers) | |
| 1024 | - | } | |
| 1025 | - | } | |
| 1026 | - | if host.keys[1].Character != '\t' { | |
| 1027 | - | t.Fatalf("char event character = %#x, want tab", host.keys[1].Character) | |
| 1028 | - | } | |
| 1029 | - | } | |
| 1030 | - | ||
| 1031 | 1000 | func TestBuildMouseEventScaleDefault(t *testing.T) { | |
| 1032 | 1001 | evt := BuildMouseEvent(10.5, 2, 0, 0) | |
| 1033 | 1002 | if evt.X != 10 || evt.Y != 2 { | |
| @@ -982,15 +982,13 @@ func TestTranslateModifiers(t *testing.T) { | |||||
| 982 | 982 | ||||
| 983 | func TestGDKKeyvalToWindowsVK(t *testing.T) { | 983 | func TestGDKKeyvalToWindowsVK(t *testing.T) { | ||
| 984 | tests := map[uint]int32{ | 984 | tests := map[uint]int32{ | ||
| 985 | - | 'a': 0x41, | 985 | + | 'a': 0x41, |
| 986 | - | 'A': 0x41, | 986 | + | 'A': 0x41, |
| 987 | - | '7': 0x37, | 987 | + | '7': 0x37, |
| 988 | - | '!': 0x31, | 988 | + | '!': 0x31, |
| 989 | - | '.': 0xBE, | 989 | + | '.': 0xBE, |
| 990 | - | 0xffbe: 0x70, // GDK_KEY_F1 | 990 | + | 0xffbe: 0x70, // GDK_KEY_F1 |
| 991 | - | 0xff51: 0x25, // GDK_KEY_Left | 991 | + | 0xff51: 0x25, // GDK_KEY_Left |
| 992 | - | 0xff09: 0x09, // GDK_KEY_Tab | |||
| 993 | - | gdkKeyISOLeftTab: 0x09, // Shift+Tab | |||
| 994 | } | 992 | } | ||
| 995 | for keyval, want := range tests { | 993 | for keyval, want := range tests { | ||
| 996 | if got := GDKKeyvalToWindowsVK(keyval); got != want { | 994 | if got := GDKKeyvalToWindowsVK(keyval); got != want { | ||
| @@ -999,35 +997,6 @@ func TestGDKKeyvalToWindowsVK(t *testing.T) { | |||||
| 999 | } | 997 | } | ||
| 1000 | } | 998 | } | ||
| 1001 | 999 | ||||
| 1002 | - | // Shift+Tab arrives from GTK as GDK_KEY_ISO_Left_Tab; Chromium moves focus | |||
| 1003 | - | // backwards only when it sees VK_TAB with the Shift flag, like Tab. | |||
| 1004 | - | func TestInputBridgeShiftTabSendsTabKeyEvents(t *testing.T) { | |||
| 1005 | - | host := &recordingBrowserHost{} | |||
| 1006 | - | ib := NewInputBridge(host, 1) | |||
| 1007 | - | shift := uint(gdk.ShiftMaskValue) | |||
| 1008 | - | ||||
| 1009 | - | ib.forwardKeyPress(gdkKeyISOLeftTab, 23, shift, func() bool { return false }) | |||
| 1010 | - | ib.onKeyRelease(gdkKeyISOLeftTab, 23, shift) | |||
| 1011 | - | ||||
| 1012 | - | if len(host.keys) != 3 { | |||
| 1013 | - | t.Fatalf("Shift+Tab key events = %d, want 3 (rawkeydown, char, keyup)", len(host.keys)) | |||
| 1014 | - | } | |||
| 1015 | - | wantTypes := []cef.KeyEventType{ | |||
| 1016 | - | cef.KeyEventTypeKeyeventRawkeydown, cef.KeyEventTypeKeyeventChar, cef.KeyEventTypeKeyeventKeyup, | |||
| 1017 | - | } | |||
| 1018 | - | for i, evt := range host.keys { | |||
| 1019 | - | if evt.Type != wantTypes[i] || evt.WindowsKeyCode != 0x09 { | |||
| 1020 | - | t.Fatalf("event %d = type %v code %#x, want type %v code VK_TAB", i, evt.Type, evt.WindowsKeyCode, wantTypes[i]) | |||
| 1021 | - | } | |||
| 1022 | - | if evt.Modifiers&uint32(cef.EventFlagsEventflagShiftDown) == 0 { | |||
| 1023 | - | t.Fatalf("event %d modifiers = %#x, want Shift down", i, evt.Modifiers) | |||
| 1024 | - | } | |||
| 1025 | - | } | |||
| 1026 | - | if host.keys[1].Character != '\t' { | |||
| 1027 | - | t.Fatalf("char event character = %#x, want tab", host.keys[1].Character) | |||
| 1028 | - | } | |||
| 1029 | - | } | |||
| 1030 | - | ||||
| 1031 | func TestBuildMouseEventScaleDefault(t *testing.T) { | 1000 | func TestBuildMouseEventScaleDefault(t *testing.T) { | ||
| 1032 | evt := BuildMouseEvent(10.5, 2, 0, 0) | 1001 | evt := BuildMouseEvent(10.5, 2, 0, 0) | ||
| 1033 | if evt.X != 10 || evt.Y != 2 { | 1002 | if evt.X != 10 || evt.Y != 2 { | ||
Comments00 unresolved
no comments yet.