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: cleanup X11 initialization

Browse Source 
Removed redundant XSelectInput and XChangeWindowAttributes as well as
obsolete screen parameter in x11DetectUIScale.

Signed-off-by: Denis Bernard <db047h@gmail.com>
This commit is contained in:
Denis Bernard
2019-11-11 13:41:54 +01:00
committed by Elias Naur
parent a770a2425c
commit 2e0406802b
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/window/os_x11.go
+15 -23
View File
@@ -478,30 +478,26 @@ func newX11Window(gioWin Callbacks, opts *Options) error {
return errors.New("x11: cannot connect to the X server") return errors.New("x11: cannot connect to the X server")
} }
root := C.XDefaultRootWindow(dpy) ppsp := x11DetectUIScale(dpy)
screen := C.XDefaultScreen(dpy)
ppsp := x11DetectUIScale(dpy, screen)
cfg := config{pxPerDp: ppsp, pxPerSp: ppsp} cfg := config{pxPerDp: ppsp, pxPerSp: ppsp}
swa := C.XSetWindowAttributes{
event_mask: C.ExposureMask | C.FocusChangeMask | // update
C.KeyPressMask | C.KeyReleaseMask | // keyboard
C.ButtonPressMask | C.ButtonReleaseMask | // mouse clicks
C.PointerMotionMask | // mouse movement
C.StructureNotifyMask, // resize
background_pixmap: C.None,
override_redirect: C.False,
}
win := C.XCreateWindow(dpy, C.XDefaultRootWindow(dpy),
0, 0, C.uint(cfg.Px(opts.Width)), C.uint(cfg.Px(opts.Height)),
0, C.CopyFromParent, C.InputOutput, nil,
C.CWEventMask|C.CWBackPixmap|C.CWOverrideRedirect, &swa)
var ( var (
swa C.XSetWindowAttributes
xim C.XIM xim C.XIM
xic C.XIC xic C.XIC
) )
swa.event_mask = C.ExposureMask | C.PointerMotionMask | C.KeyPressMask
swa.background_pixmap = C.None
win := C.XCreateWindow(dpy, root,
0, 0, C.uint(cfg.Px(opts.Width)), C.uint(cfg.Px(opts.Height)), 0,
C.CopyFromParent, C.InputOutput,
nil, C.CWEventMask|C.CWBackPixmap,
&swa)
C.gio_x11_init_ime(dpy, win, &xim, &xic) C.gio_x11_init_ime(dpy, win, &xim, &xic)
C.XSelectInput(dpy, win, 0|
C.ExposureMask|C.FocusChangeMask| // update
C.KeyPressMask|C.KeyReleaseMask| // keyboard
C.ButtonPressMask|C.ButtonReleaseMask| // mouse clicks
C.PointerMotionMask| // mouse movement
C.StructureNotifyMask, // resize
)
w := &x11Window{ w := &x11Window{
w: gioWin, x: dpy, xw: win, w: gioWin, x: dpy, xw: win,
@@ -514,10 +510,6 @@ func newX11Window(gioWin Callbacks, opts *Options) error {
w.notify.read = pipe[0] w.notify.read = pipe[0]
w.notify.write = pipe[1] w.notify.write = pipe[1]
var xattr C.XSetWindowAttributes
xattr.override_redirect = C.False
C.XChangeWindowAttributes(dpy, win, C.CWOverrideRedirect, &xattr)
var hints C.XWMHints var hints C.XWMHints
hints.input = C.True hints.input = C.True
hints.flags = C.InputHint hints.flags = C.InputHint
@@ -548,7 +540,7 @@ func newX11Window(gioWin Callbacks, opts *Options) error {
} }
// detectUIScale reports the system UI scale, or 1.0 if it fails. // detectUIScale reports the system UI scale, or 1.0 if it fails.
func x11DetectUIScale(dpy *C.Display, screen C.int) float32 { func x11DetectUIScale(dpy *C.Display) float32 {
// default fixed DPI value used in most desktop UI toolkits // default fixed DPI value used in most desktop UI toolkits
const defaultDesktopDPI = 96 const defaultDesktopDPI = 96
var scale float32 = 1.0 var scale float32 = 1.0