joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-05 17:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

app/internal/window: [X11] avoid -d=checkptr check failures

Browse Source 
Casting a *XClientMessageEvent or *XSelectionEvent to *XEvent is
technically incorrect because the union XEvent is the larger structure.

Use an XEvent variable as the backing storage for the specialized
event types instead.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-27 15:29:42 +02:00
parent f5985b5e7d
commit 2f8833d985
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/window/os_x11.go
+8 -4
View File
@@ -115,7 +115,9 @@ func (w *x11Window) Close() {
w.mu.Lock() w.mu.Lock()
defer w.mu.Unlock() defer w.mu.Unlock()
ev := C.XClientMessageEvent{ var xev C.XEvent
ev := (*C.XClientMessageEvent)(unsafe.Pointer(&xev))
*ev = C.XClientMessageEvent{
_type: C.ClientMessage, _type: C.ClientMessage,
display: w.x, display: w.x,
window: w.xw, window: w.xw,
@@ -125,7 +127,7 @@ func (w *x11Window) Close() {
arr := (*[5]C.long)(unsafe.Pointer(&ev.data)) arr := (*[5]C.long)(unsafe.Pointer(&ev.data))
arr[0] = C.long(w.atoms.evDelWindow) arr[0] = C.long(w.atoms.evDelWindow)
arr[1] = C.CurrentTime arr[1] = C.CurrentTime
C.XSendEvent(w.x, w.xw, C.False, C.NoEventMask, (*C.XEvent)(unsafe.Pointer(&ev))) C.XSendEvent(w.x, w.xw, C.False, C.NoEventMask, &xev)
} }
var x11OneByte = make([]byte, 1) var x11OneByte = make([]byte, 1)
@@ -400,7 +402,9 @@ func (h *x11EventHandler) handleEvents() bool {
break break
} }
notify := func() { notify := func() {
nev := C.XSelectionEvent{ var xev C.XEvent
ev := (*C.XSelectionEvent)(unsafe.Pointer(&xev))
*ev = C.XSelectionEvent{
_type: C.SelectionNotify, _type: C.SelectionNotify,
display: cevt.display, display: cevt.display,
requestor: cevt.requestor, requestor: cevt.requestor,
@@ -409,7 +413,7 @@ func (h *x11EventHandler) handleEvents() bool {
property: cevt.property, property: cevt.property,
time: cevt.time, time: cevt.time,
} }
C.XSendEvent(w.x, cevt.requestor, 0, 0, (*C.XEvent)(unsafe.Pointer(&nev))) C.XSendEvent(w.x, cevt.requestor, 0, 0, &xev)
} }
switch cevt.target { switch cevt.target {
case w.atoms.targets: case w.atoms.targets: