Skip to content

Commit cdd61a0

Browse files
committed
csharpier
1 parent dc0ff3b commit cdd61a0

2 files changed

Lines changed: 38 additions & 8 deletions

File tree

YMouseButtonControl.Linux/Services/CurrentWindowServiceX11.cs

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,47 @@ private static string GetForegroundWindow()
4343
var prop = X11.XInternAtom(display, Marshal.StringToHGlobalAnsi("_NET_ACTIVE_WINDOW"), 0);
4444
var pidProp = X11.XInternAtom(display, Marshal.StringToHGlobalAnsi("_NET_WM_PID"), 1);
4545

46-
if (X11.XGetWindowProperty(display, root, prop, 0, sizeof(ulong), 0, 0,
47-
out _, out _, out _,
48-
out _, out var outProp) != 0 || outProp == nint.Zero)
46+
if (
47+
X11.XGetWindowProperty(
48+
display,
49+
root,
50+
prop,
51+
0,
52+
sizeof(ulong),
53+
0,
54+
0,
55+
out _,
56+
out _,
57+
out _,
58+
out _,
59+
out var outProp
60+
) != 0
61+
|| outProp == nint.Zero
62+
)
4963
{
5064
return null;
5165
}
5266

5367
var activeWindow = *(nint*)outProp;
5468
X11.XFree(outProp);
5569

56-
if (X11.XGetWindowProperty(display, activeWindow, pidProp, 0, sizeof(int), 0, 0, out _, out _, out _, out _,
57-
out var prop2) != 0 || prop2 == nint.Zero)
70+
if (
71+
X11.XGetWindowProperty(
72+
display,
73+
activeWindow,
74+
pidProp,
75+
0,
76+
sizeof(int),
77+
0,
78+
0,
79+
out _,
80+
out _,
81+
out _,
82+
out _,
83+
out var prop2
84+
) != 0
85+
|| prop2 == nint.Zero
86+
)
5887
{
5988
return null;
6089
}
@@ -95,5 +124,6 @@ internal static partial int XGetWindowProperty(
95124
out int actualFormatReturn,
96125
out ulong nItemsReturn,
97126
out ulong bytesAfterReturn,
98-
out IntPtr propReturn);
99-
}
127+
out IntPtr propReturn
128+
);
129+
}

YMouseButtonControl/DependencyInjection/ServicesBootstrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ private static void RegisterMacOsServices(IServiceCollection services)
8181
.AddScoped<ICurrentWindowService, MacOS.Services.CurrentWindowService>()
8282
.AddScoped<IBackgroundTasksRunner, MacOS.Services.BackgroundTasksRunner>();
8383
}
84-
}
84+
}

0 commit comments

Comments
 (0)