Skip to content

Commit 430bfc6

Browse files
FelixKratzFelixKratz
committed
move extern functions
1 parent a3a84ec commit 430bfc6

File tree

5 files changed

+105
-101
lines changed

5 files changed

+105
-101
lines changed

‎src/app_windows.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
#pragma once
22
#include "event.h"
33

4-
extern CGError SLSGetWindowOwner(int cid, uint32_t wid, int* out_cid);
5-
extern CGError SLSConnectionGetPID(int cid, pid_t *pid);
6-
extern CFArrayRef SLSCopyWindowsWithOptionsAndTags(int cid, uint32_t owner, CFArrayRef spaces, uint32_t options, uint64_t *set_tags, uint64_t *clear_tags);
7-
extern CFTypeRef SLSWindowQueryWindows(int cid, CFArrayRef windows, uint32_t options);
8-
extern CFTypeRef SLSWindowQueryResultCopyWindows(CFTypeRef window_query);
9-
extern int SLSWindowIteratorGetCount(CFTypeRef iterator);
10-
extern bool SLSWindowIteratorAdvance(CFTypeRef iterator);
11-
extern uint32_t SLSWindowIteratorGetParentID(CFTypeRef iterator);
12-
extern uint32_t SLSWindowIteratorGetWindowID(CFTypeRef iterator);
13-
extern uint64_t SLSWindowIteratorGetTags(CFTypeRef iterator);
14-
extern uint64_t SLSWindowIteratorGetAttributes(CFTypeRef iterator);
15-
extern CGError SLSRegisterNotifyProc(void* callback, uint32_t event, void* context);
16-
extern CGError SLSRequestNotificationsForWindows(int cid, uint32_t* wid_list, uint32_t list_count);
17-
184
struct app_window {
195
uint32_t wid;
206
uint64_t sid;

‎src/display.h

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,6 @@
55
#define DISPLAY_EVENT_HANDLER(name) void name(uint32_t did, CGDisplayChangeSummaryFlags flags, void *context)
66
typedef DISPLAY_EVENT_HANDLER(display_callback);
77

8-
extern CGError DisplayServicesRegisterForBrightnessChangeNotifications(uint32_t did, uint32_t passthrough, void* callback);
9-
extern CGError DisplayServicesRegisterForAmbientLightCompensationNotifications(uint32_t did, uint32_t passthrough, void* callback);
10-
11-
extern CGError DisplayServicesUnregisterForBrightnessChangeNotifications(uint32_t did, uint32_t passthrough);
12-
extern CGError DisplayServicesUnregisterForAmbientLightCompensationNotifications(uint32_t did, uint32_t passthrough);
13-
14-
extern CGError DisplayServicesGetBrightness(uint32_t did, float* brightness);
15-
extern CGError DisplayServicesCanChangeBrightness(uint32_t did);
16-
extern CGError DisplayServicesAmbientLightCompensationEnabled(uint32_t did, bool* out);
17-
18-
extern CFUUIDRef CGDisplayCreateUUIDFromDisplayID(uint32_t did);
19-
extern CFArrayRef SLSCopyManagedDisplays(int cid);
20-
extern uint64_t SLSManagedDisplayGetCurrentSpace(int cid, CFStringRef uuid);
21-
22-
extern CFStringRef SLSCopyBestManagedDisplayForRect(int cid, CGRect rect);
23-
extern CGError SLSGetCurrentCursorLocation(int cid, CGPoint *point);
24-
extern CFStringRef SLSCopyActiveMenuBarDisplayIdentifier(int cid);
25-
extern CGError SLSGetMenuBarAutohideEnabled(int cid, int *enabled);
26-
extern CGError SLSGetRevealedMenuBarBounds(CGRect *rect, int cid, uint64_t sid);
27-
extern CFStringRef SLSCopyBestManagedDisplayForPoint(int cid, CGPoint point);
28-
extern CGError SLSSetMenuBarVisibilityOverrideOnDisplay(int cid, int did, bool override);
29-
extern CGError SLSSetMenuBarAutohideEnabled(int cid, bool enabled);
30-
318
uint32_t display_main_display_id(void);
329
uint32_t display_active_display_id(void);
3310
uint32_t display_active_display_adid(void);

‎src/misc/extern.h

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#include <CoreGraphics/CoreGraphics.h>
2+
3+
extern CGError DisplayServicesRegisterForBrightnessChangeNotifications(uint32_t did, uint32_t passthrough, void* callback);
4+
extern CGError DisplayServicesRegisterForAmbientLightCompensationNotifications(uint32_t did, uint32_t passthrough, void* callback);
5+
6+
extern CGError DisplayServicesUnregisterForBrightnessChangeNotifications(uint32_t did, uint32_t passthrough);
7+
extern CGError DisplayServicesUnregisterForAmbientLightCompensationNotifications(uint32_t did, uint32_t passthrough);
8+
9+
extern CGError DisplayServicesGetBrightness(uint32_t did, float* brightness);
10+
extern CGError DisplayServicesCanChangeBrightness(uint32_t did);
11+
extern CGError DisplayServicesAmbientLightCompensationEnabled(uint32_t did, bool* out);
12+
13+
extern CFArrayRef SLSCopyManagedDisplaySpaces(int cid);
14+
extern uint32_t SLSGetActiveSpace(int cid);
15+
extern CFStringRef SLSCopyManagedDisplayForSpace(int cid, uint64_t sid);
16+
extern CFArrayRef SLSHWCaptureSpace(int64_t cid, int64_t sid, int64_t flags);
17+
18+
extern CGError SLSGetWindowOwner(int cid, uint32_t wid, int* out_cid);
19+
extern CGError SLSConnectionGetPID(int cid, pid_t *pid);
20+
extern CFArrayRef SLSCopyWindowsWithOptionsAndTags(int cid, uint32_t owner, CFArrayRef spaces, uint32_t options, uint64_t *set_tags, uint64_t *clear_tags);
21+
extern CFTypeRef SLSWindowQueryWindows(int cid, CFArrayRef windows, uint32_t options);
22+
extern CFTypeRef SLSWindowQueryResultCopyWindows(CFTypeRef window_query);
23+
extern int SLSWindowIteratorGetCount(CFTypeRef iterator);
24+
extern bool SLSWindowIteratorAdvance(CFTypeRef iterator);
25+
extern uint32_t SLSWindowIteratorGetParentID(CFTypeRef iterator);
26+
extern uint32_t SLSWindowIteratorGetWindowID(CFTypeRef iterator);
27+
extern uint64_t SLSWindowIteratorGetTags(CFTypeRef iterator);
28+
extern uint64_t SLSWindowIteratorGetAttributes(CFTypeRef iterator);
29+
extern CGError SLSRegisterNotifyProc(void* callback, uint32_t event, void* context);
30+
extern CGError SLSRequestNotificationsForWindows(int cid, uint32_t* wid_list, uint32_t list_count);
31+
32+
extern CFUUIDRef CGDisplayCreateUUIDFromDisplayID(uint32_t did);
33+
extern CFArrayRef SLSCopyManagedDisplays(int cid);
34+
extern uint64_t SLSManagedDisplayGetCurrentSpace(int cid, CFStringRef uuid);
35+
36+
extern CFStringRef SLSCopyBestManagedDisplayForRect(int cid, CGRect rect);
37+
extern CGError SLSGetCurrentCursorLocation(int cid, CGPoint *point);
38+
extern CFStringRef SLSCopyActiveMenuBarDisplayIdentifier(int cid);
39+
extern CGError SLSGetMenuBarAutohideEnabled(int cid, int *enabled);
40+
extern CGError SLSGetRevealedMenuBarBounds(CGRect *rect, int cid, uint64_t sid);
41+
extern CFStringRef SLSCopyBestManagedDisplayForPoint(int cid, CGPoint point);
42+
extern CGError SLSSetMenuBarVisibilityOverrideOnDisplay(int cid, int did, bool override);
43+
extern CGError SLSSetMenuBarAutohideEnabled(int cid, bool enabled);
44+
extern CGError SLSFlushWindowContentRegion(int cid, uint32_t wid, void* dirty);
45+
extern CFTypeRef SLSTransactionCreate(int cid);
46+
extern CGError SLSTransactionOrderWindow(CFTypeRef transaction, uint32_t wid, int mode, uint32_t relativeToWID);
47+
extern CGError SLSTransactionSetWindowLevel(CFTypeRef transaction, uint32_t wid, int level);
48+
extern CGError SLSTransactionSetWindowShape(CFTypeRef transaction, uint32_t wid, float x_offset, float y_offset, CFTypeRef shape);
49+
extern CGError SLSTransactionMoveWindowWithGroup(CFTypeRef transaction, uint32_t wid, CGPoint point);
50+
extern CGError SLSTransactionCommitUsingMethod(CFTypeRef transaction, uint32_t method);
51+
extern CGError SLSTransactionCommit(CFTypeRef transaction, uint32_t async);
52+
53+
extern CFTypeRef CGRegionCreateEmptyRegion(void);
54+
extern CGError SLSDisableUpdate(int cid);
55+
extern CGError SLSReenableUpdate(int cid);
56+
extern CGError SLSNewWindowWithOpaqueShapeAndContext(int cid, int type, CFTypeRef region, CFTypeRef opaque_shape, int options, uint64_t *tags, float x, float y, int tag_size, uint32_t *wid, void *context);
57+
extern CGError SLSNewWindow(int cid, int type, float x, float y, CFTypeRef region, uint64_t *wid);
58+
extern CGError SLSReleaseWindow(int cid, uint32_t wid);
59+
extern CGError SLSSetWindowTags(int cid, uint32_t wid, uint64_t* tags, int tag_size);
60+
extern CGError SLSClearWindowTags(int cid, uint32_t wid, uint64_t* tags, int tag_size);
61+
extern CGError SLSSetWindowShape(int cid, uint32_t wid, float x_offset, float y_offset, CFTypeRef shape);
62+
extern CGError SLSSetWindowOpaqueShape(int cid, uint32_t wid, float x_offset, float y_offset, CFTypeRef region);
63+
extern CGError SLSSetWindowResolution(int cid, uint32_t wid, double res);
64+
extern CGError SLSSetWindowOpacity(int cid, uint32_t wid, bool isOpaque);
65+
extern CGError SLSSetWindowAlpha(int cid, uint32_t wid, float alpha);
66+
extern CGError SLSSetWindowBackgroundBlurRadius(int cid, uint32_t wid, uint32_t radius);
67+
extern CGError SLSOrderWindow(int cid, uint32_t wid, int mode, uint32_t relativeToWID);
68+
extern CGError SLSSetWindowLevel(int cid, uint32_t wid, int level);
69+
extern CGContextRef SLWindowContextCreate(int cid, uint32_t wid, CFDictionaryRef options);
70+
extern CGError CGSNewRegionWithRect(CGRect *rect, CFTypeRef *outRegion);
71+
extern CGError SLSAddActivationRegion(uint32_t cid, uint32_t wid, CFTypeRef region);
72+
extern CGError SLSAddTrackingRect(uint32_t cid, uint32_t wid, CGRect rect);
73+
extern CGError SLSClearActivationRegion(uint32_t cid, uint32_t wid);
74+
extern CGError SLSRemoveAllTrackingAreas(uint32_t cid, uint32_t wid);
75+
extern CGError SLSMoveWindow(int cid, uint32_t wid, CGPoint* point);
76+
extern CGError SLSWindowSetShadowProperties(uint32_t wid, CFDictionaryRef properties);
77+
extern CGError SLSAddWindowToWindowOrderingGroup(int cid, uint32_t parent_wid, uint32_t child_wid, int order);
78+
extern CGError SLSRemoveFromOrderingGroup(int cid, uint32_t wid);
79+
extern CGError SLSReassociateWindowsSpacesByGeometry(int cid, CFArrayRef wids);
80+
extern CGError SLSMoveWindowsToManagedSpace(int cid, CFArrayRef window_list, uint64_t sid);
81+
extern CGError SLSMoveWindowWithGroup(int cid, uint32_t wid, CGPoint* point);
82+
83+
extern void SLSCaptureWindowsContentsToRectWithOptions(uint32_t cid, uint64_t* wid, bool meh, CGRect bounds, uint32_t flags, CGImageRef* image);
84+
extern int SLSGetScreenRectForWindow(uint32_t cid, uint32_t wid, CGRect* out);
85+
86+
extern int SLSSpaceGetType(int cid, uint64_t sid);
87+
88+
extern CGError SLSAddSurface(int cid, uint32_t wid, uint32_t* outSID);
89+
extern CGError SLSRemoveSurface(int cid, uint32_t wid, uint32_t sid);
90+
extern CGError SLSBindSurface(int cid, uint32_t wid, uint32_t sid, int param1, int param2, unsigned int context_id);
91+
extern CGError SLSSetSurfaceBounds(int cid, uint32_t wid, uint32_t sid, CGRect bounds);
92+
extern CGError SLSSetSurfaceOpacity(int cid, uint32_t wid, uint32_t sid, bool opaque);
93+
extern CGError SLSOrderSurface(int cid, uint32_t wid, uint32_t surface, int mode, uint32_t other_surface);
94+
extern CGError SLSSetSurfaceResolution(int cid, uint32_t wid, uint32_t sid, CGFloat scale);
95+
extern CGError SLSFlushSurface(int cid, uint32_t wid, uint32_t surface, int param);
96+
extern CGError SLSSetSurfaceColorSpace(int cid, uint32_t wid, uint32_t surface, CGColorSpaceRef color_space);
97+
98+
extern int SLSSpaceCreate(int cid, int one, int zero);
99+
extern CGError SLSSpaceSetAbsoluteLevel(int cid, int sid, int level);
100+
extern CGError SLSShowSpaces(int cid, CFArrayRef space_list);
101+
extern CGError SLSHideSpaces(int cid, CFArrayRef space_list);
102+
extern CGError SLSSpaceAddWindowsAndRemoveFromSpaces(int cid, int sid, CFArrayRef array, int seven);
103+
104+

‎src/misc/helpers.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <time.h>
88
#include "env_vars.h"
99
#include "defines.h"
10+
#include "extern.h"
1011

1112
#define array_count(a) (sizeof((a)) / sizeof(*(a)))
1213
#define max(a, b) (a > b ? a : b)
@@ -16,10 +17,6 @@
1617
#define MAXLEN 512
1718
#define FORK_TIMEOUT 60
1819

19-
extern CFArrayRef SLSCopyManagedDisplaySpaces(int cid);
20-
extern uint32_t SLSGetActiveSpace(int cid);
21-
extern CFStringRef SLSCopyManagedDisplayForSpace(int cid, uint64_t sid);
22-
extern CFArrayRef SLSHWCaptureSpace(int64_t cid, int64_t sid, int64_t flags);
2320
extern int g_connection;
2421

2522
struct signal_args {

‎src/window.h

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,6 @@
11
#pragma once
22
#include "misc/helpers.h"
33

4-
extern CGError SLSFlushWindowContentRegion(int cid, uint32_t wid, void* dirty);
5-
extern CFTypeRef SLSTransactionCreate(int cid);
6-
extern CGError SLSTransactionOrderWindow(CFTypeRef transaction, uint32_t wid, int mode, uint32_t relativeToWID);
7-
extern CGError SLSTransactionSetWindowLevel(CFTypeRef transaction, uint32_t wid, int level);
8-
extern CGError SLSTransactionSetWindowShape(CFTypeRef transaction, uint32_t wid, float x_offset, float y_offset, CFTypeRef shape);
9-
extern CGError SLSTransactionMoveWindowWithGroup(CFTypeRef transaction, uint32_t wid, CGPoint point);
10-
extern CGError SLSTransactionCommitUsingMethod(CFTypeRef transaction, uint32_t method);
11-
extern CGError SLSTransactionCommit(CFTypeRef transaction, uint32_t async);
12-
13-
extern CFTypeRef CGRegionCreateEmptyRegion(void);
14-
extern CGError SLSDisableUpdate(int cid);
15-
extern CGError SLSReenableUpdate(int cid);
16-
extern CGError SLSNewWindowWithOpaqueShapeAndContext(int cid, int type, CFTypeRef region, CFTypeRef opaque_shape, int options, uint64_t *tags, float x, float y, int tag_size, uint32_t *wid, void *context);
17-
extern CGError SLSNewWindow(int cid, int type, float x, float y, CFTypeRef region, uint64_t *wid);
18-
extern CGError SLSReleaseWindow(int cid, uint32_t wid);
19-
extern CGError SLSSetWindowTags(int cid, uint32_t wid, uint64_t* tags, int tag_size);
20-
extern CGError SLSClearWindowTags(int cid, uint32_t wid, uint64_t* tags, int tag_size);
21-
extern CGError SLSSetWindowShape(int cid, uint32_t wid, float x_offset, float y_offset, CFTypeRef shape);
22-
extern CGError SLSSetWindowOpaqueShape(int cid, uint32_t wid, float x_offset, float y_offset, CFTypeRef region);
23-
extern CGError SLSSetWindowResolution(int cid, uint32_t wid, double res);
24-
extern CGError SLSSetWindowOpacity(int cid, uint32_t wid, bool isOpaque);
25-
extern CGError SLSSetWindowAlpha(int cid, uint32_t wid, float alpha);
26-
extern CGError SLSSetWindowBackgroundBlurRadius(int cid, uint32_t wid, uint32_t radius);
27-
extern CGError SLSOrderWindow(int cid, uint32_t wid, int mode, uint32_t relativeToWID);
28-
extern CGError SLSSetWindowLevel(int cid, uint32_t wid, int level);
29-
extern CGContextRef SLWindowContextCreate(int cid, uint32_t wid, CFDictionaryRef options);
30-
extern CGError CGSNewRegionWithRect(CGRect *rect, CFTypeRef *outRegion);
31-
extern CGError SLSAddActivationRegion(uint32_t cid, uint32_t wid, CFTypeRef region);
32-
extern CGError SLSAddTrackingRect(uint32_t cid, uint32_t wid, CGRect rect);
33-
extern CGError SLSClearActivationRegion(uint32_t cid, uint32_t wid);
34-
extern CGError SLSRemoveAllTrackingAreas(uint32_t cid, uint32_t wid);
35-
extern CGError SLSMoveWindow(int cid, uint32_t wid, CGPoint* point);
36-
extern CGError SLSWindowSetShadowProperties(uint32_t wid, CFDictionaryRef properties);
37-
extern CGError SLSAddWindowToWindowOrderingGroup(int cid, uint32_t parent_wid, uint32_t child_wid, int order);
38-
extern CGError SLSRemoveFromOrderingGroup(int cid, uint32_t wid);
39-
extern CGError SLSReassociateWindowsSpacesByGeometry(int cid, CFArrayRef wids);
40-
extern CGError SLSMoveWindowsToManagedSpace(int cid, CFArrayRef window_list, uint64_t sid);
41-
extern CGError SLSMoveWindowWithGroup(int cid, uint32_t wid, CGPoint* point);
42-
43-
extern void SLSCaptureWindowsContentsToRectWithOptions(uint32_t cid, uint64_t* wid, bool meh, CGRect bounds, uint32_t flags, CGImageRef* image);
44-
extern int SLSGetScreenRectForWindow(uint32_t cid, uint32_t wid, CGRect* out);
45-
46-
extern int SLSSpaceGetType(int cid, uint64_t sid);
47-
48-
extern CGError SLSAddSurface(int cid, uint32_t wid, uint32_t* outSID);
49-
extern CGError SLSRemoveSurface(int cid, uint32_t wid, uint32_t sid);
50-
extern CGError SLSBindSurface(int cid, uint32_t wid, uint32_t sid, int param1, int param2, unsigned int context_id);
51-
extern CGError SLSSetSurfaceBounds(int cid, uint32_t wid, uint32_t sid, CGRect bounds);
52-
extern CGError SLSSetSurfaceOpacity(int cid, uint32_t wid, uint32_t sid, bool opaque);
53-
extern CGError SLSOrderSurface(int cid, uint32_t wid, uint32_t surface, int mode, uint32_t other_surface);
54-
extern CGError SLSSetSurfaceResolution(int cid, uint32_t wid, uint32_t sid, CGFloat scale);
55-
extern CGError SLSFlushSurface(int cid, uint32_t wid, uint32_t surface, int param);
56-
extern CGError SLSSetSurfaceColorSpace(int cid, uint32_t wid, uint32_t surface, CGColorSpaceRef color_space);
57-
58-
extern int SLSSpaceCreate(int cid, int one, int zero);
59-
extern CGError SLSSpaceSetAbsoluteLevel(int cid, int sid, int level);
60-
extern CGError SLSShowSpaces(int cid, CFArrayRef space_list);
61-
extern CGError SLSHideSpaces(int cid, CFArrayRef space_list);
62-
extern CGError SLSSpaceAddWindowsAndRemoveFromSpaces(int cid, int sid, CFArrayRef array, int seven);
63-
644
#define kCGSExposeFadeTagBit (1ULL << 1)
655
#define kCGSPreventsActivationTagBit (1ULL << 16)
666

0 commit comments

Comments
 (0)