pyrite-dev/mdebase
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better

Browse source
This commit is contained in:
Nishi 2025-12-10 12:04:30 +09:00
commit 22a92b9af1
Signed by: nishi
GPG key ID: 27EF69B208EB9343
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
milkwm/xserver.c
View file

@ -107,7 +107,7 @@ int init_x(void) {
} }
static void save(Window w) { static void save(Window w) {
XGrabButton(xdisplay, 1, 0, w, True, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None); XGrabButton(xdisplay, 1, 0, w, True, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, GrabModeSync, GrabModeAsync, None, None);
XSelectInput(xdisplay, w, StructureNotifyMask | FocusChangeMask | PropertyChangeMask); XSelectInput(xdisplay, w, StructureNotifyMask | FocusChangeMask | PropertyChangeMask);
XSetWindowBorderWidth(xdisplay, w, 0); XSetWindowBorderWidth(xdisplay, w, 0);
XAddToSaveSet(xdisplay, w); XAddToSaveSet(xdisplay, w);
@ -179,11 +179,12 @@ void loop_x(void) {
while(1) { while(1) {
XNextEvent(xdisplay, &ev); XNextEvent(xdisplay, &ev);
if((ev.type == ButtonPress || ev.type == ButtonRelease) && ev.xbutton.subwindow != None && ev.xbutton.button == Button1) { if((ev.type == ButtonPress || ev.type == ButtonRelease) && ev.xbutton.button == Button1) {
Window w = None; Window w = None, t = ev.xbutton.window;
if(ev.xbutton.subwindow != None) t = ev.xbutton.subwindow;
if(ev.type == ButtonPress) { if(ev.type == ButtonPress) {
for(i = 0; i < arrlen(windows); i++) { for(i = 0; i < arrlen(windows); i++) {
if(windows[i].frame->lowlevel->x11.window == ev.xbutton.subwindow || parent_eq(ev.xbutton.subwindow, windows[i].frame->lowlevel->x11.window)) { if(windows[i].frame->lowlevel->x11.window == t || parent_eq(t, windows[i].frame->lowlevel->x11.window)) {
set_focus(windows[i].client); set_focus(windows[i].client);
w = windows[i].frame->lowlevel->x11.window; w = windows[i].frame->lowlevel->x11.window;
break; break;
@ -191,25 +192,22 @@ void loop_x(void) {
} }
} }
ev.xbutton.window = ev.xbutton.subwindow;
ev.xbutton.subwindow = None;
XSendEvent(xdisplay, ev.xbutton.window, False, 0, &ev);
if(w != None) XRaiseWindow(xdisplay, w); if(w != None) XRaiseWindow(xdisplay, w);
XAllowEvents(xdisplay, ReplayPointer, CurrentTime);
} else if(ev.type == MotionNotify && ev.xmotion.subwindow != None) { } else if(ev.type == MotionNotify && ev.xmotion.subwindow != None) {
Window w = None; Window w = None, t = ev.xmotion.window;
if(ev.xmotion.subwindow != None) t = ev.xmotion.subwindow;
for(i = 0; i < arrlen(windows); i++) { for(i = 0; i < arrlen(windows); i++) {
if(windows[i].frame->lowlevel->x11.window == ev.xbutton.subwindow || parent_eq(ev.xbutton.subwindow, windows[i].frame->lowlevel->x11.window)) { if(windows[i].frame->lowlevel->x11.window == t || parent_eq(t, windows[i].frame->lowlevel->x11.window)) {
w = windows[i].frame->lowlevel->x11.window; w = windows[i].frame->lowlevel->x11.window;
break; break;
} }
} }
ev.xmotion.window = ev.xmotion.subwindow;
ev.xmotion.subwindow = None;
XSendEvent(xdisplay, ev.xmotion.window, False, 0, &ev);
if(w != None) XRaiseWindow(xdisplay, w); if(w != None) XRaiseWindow(xdisplay, w);
XAllowEvents(xdisplay, ReplayPointer, CurrentTime);
} else if(ev.type == FocusIn && ev.xfocus.window != focus) { } else if(ev.type == FocusIn && ev.xfocus.window != focus) {
set_focus(focus); set_focus(focus);
} else if(ev.type == FocusOut && focus != None) { } else if(ev.type == FocusOut && focus != None) {