move all extern private functions into single file

xorpse · Nov 20, 2020 · 1f2ea3b · 1f2ea3b
1 parent 766d9ea
commit 1f2ea3b
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 72 deletions.
diff --git a/src/border.h b/src/border.h
@@ -1,18 +1,6 @@
 #ifndef BORDER_H
 #define BORDER_H
 
-extern CGError SLSDisableUpdate(int cid);
-extern CGError SLSReenableUpdate(int cid);
-extern CGError SLSNewWindow(int cid, int type, float x, float y, CFTypeRef region, uint32_t *wid);
-extern CGError SLSReleaseWindow(int cid, uint32_t wid);
-extern CGError SLSSetWindowTags(int cid, uint32_t wid, uint64_t *tags, int tag_size);
-extern CGError SLSSetWindowShape(int cid, uint32_t wid, float x_offset, float y_offset, CFTypeRef shape);
-extern CGError SLSSetWindowOpacity(int cid, uint32_t wid, bool isOpaque);
-extern CGError SLSOrderWindow(int cid, uint32_t wid, int mode, uint32_t relativeToWID);
-extern CGError SLSSetWindowLevel(int cid, uint32_t wid, int level);
-extern CGContextRef SLWindowContextCreate(int cid, uint32_t wid, CFDictionaryRef options);
-extern CGError CGSNewRegionWithRect(CGRect *rect, CFTypeRef *outRegion);
-
 #define kCGSIgnoreForExposeTagBit (1 << 7)
 #define kCGSIgnoreForEventsTagBit (1 << 9)
 #define kCGSDisableShadowTagBit   (1 << 3)

diff --git a/src/display.h b/src/display.h
@@ -4,10 +4,6 @@
 #define DISPLAY_EVENT_HANDLER(name) void name(uint32_t did, CGDisplayChangeSummaryFlags flags, void *context)
 typedef DISPLAY_EVENT_HANDLER(display_callback);
 
-extern CFUUIDRef CGDisplayCreateUUIDFromDisplayID(uint32_t did);
-extern CFArrayRef SLSCopyManagedDisplays(int cid);
-extern uint64_t SLSManagedDisplayGetCurrentSpace(int cid, CFStringRef uuid);
-
 void display_serialize(FILE *rsp, uint32_t did);
 CFStringRef display_uuid(uint32_t did);
 uint32_t display_id(CFStringRef uuid);

diff --git a/src/display_manager.h b/src/display_manager.h
@@ -1,15 +1,6 @@
 #ifndef DISPLAY_MANAGER_H
 #define DISPLAY_MANAGER_H
 
-extern CFStringRef SLSCopyActiveMenuBarDisplayIdentifier(int cid);
-extern CFStringRef SLSCopyBestManagedDisplayForPoint(int cid, CGPoint point);
-extern bool SLSManagedDisplayIsAnimating(int cid, CFStringRef uuid);
-extern CGError SLSGetMenuBarAutohideEnabled(int cid, int *enabled);
-extern CGError SLSGetRevealedMenuBarBounds(CGRect *rect, int cid, uint64_t sid);
-extern CGError SLSGetDockRectWithReason(int cid, CGRect *rect, int *reason);
-extern Boolean CoreDockGetAutoHideEnabled(void);
-extern void CoreDockGetOrientationAndPinning(int *orientation, int *pinning);
-
 #define DOCK_ORIENTATION_BOTTOM 2
 #define DOCK_ORIENTATION_LEFT   3
 #define DOCK_ORIENTATION_RIGHT  4

diff --git a/src/manifest.m b/src/manifest.m
@@ -21,6 +21,7 @@
 #include <semaphore.h>
 #include <pthread.h>
 
+#include "misc/extern.h"
 #include "misc/macros.h"
 #include "misc/memory_pool.h"
 #include "misc/ts.h"

diff --git a/src/misc/extern.h b/src/misc/extern.h
@@ -0,0 +1,64 @@
+extern AXError _AXUIElementGetWindow(AXUIElementRef ref, uint32_t *wid);
+extern int SLSMainConnectionID(void);
+extern CGError SLSGetWindowBounds(int cid, uint32_t wid, CGRect *frame);
+extern CGError SLSGetWindowLevel(int cid, uint32_t wid, int *level);
+extern CGError SLSGetWindowAlpha(int cid, uint32_t wid, float *alpha);
+extern CGError SLSSetWindowResolution(int cid, uint32_t wid, double resolution);
+extern CGError SLSCopyWindowProperty(int cid, uint32_t wid, CFStringRef property, CFTypeRef *value);
+extern CFStringRef SLSCopyManagedDisplayForWindow(int cid, uint32_t wid);
+extern CFStringRef SLSCopyBestManagedDisplayForRect(int cid, CGRect rect);
+extern CFArrayRef SLSCopySpacesForWindows(int cid, int selector, CFArrayRef window_list);
+extern CGError SLSDisableUpdate(int cid);
+extern CGError SLSReenableUpdate(int cid);
+extern CGError SLSNewWindow(int cid, int type, float x, float y, CFTypeRef region, uint32_t *wid);
+extern CGError SLSReleaseWindow(int cid, uint32_t wid);
+extern CGError SLSSetWindowTags(int cid, uint32_t wid, uint64_t *tags, int tag_size);
+extern CGError SLSSetWindowShape(int cid, uint32_t wid, float x_offset, float y_offset, CFTypeRef shape);
+extern CGError SLSSetWindowOpacity(int cid, uint32_t wid, bool opaque);
+extern CGError SLSOrderWindow(int cid, uint32_t wid, int mode, uint32_t rel_wid);
+extern CGError SLSSetWindowLevel(int cid, uint32_t wid, int level);
+extern CGContextRef SLWindowContextCreate(int cid, uint32_t wid, CFDictionaryRef options);
+extern CGError CGSNewRegionWithRect(CGRect *rect, CFTypeRef *region);
+extern CFUUIDRef CGDisplayCreateUUIDFromDisplayID(uint32_t did);
+extern CFArrayRef SLSCopyManagedDisplays(int cid);
+extern uint64_t SLSManagedDisplayGetCurrentSpace(int cid, CFStringRef uuid);
+extern CFStringRef SLSCopyActiveMenuBarDisplayIdentifier(int cid);
+extern CFStringRef SLSCopyBestManagedDisplayForPoint(int cid, CGPoint point);
+extern bool SLSManagedDisplayIsAnimating(int cid, CFStringRef uuid);
+extern CGError SLSGetMenuBarAutohideEnabled(int cid, int *enabled);
+extern CGError SLSGetRevealedMenuBarBounds(CGRect *rect, int cid, uint64_t sid);
+extern CGError SLSGetDockRectWithReason(int cid, CGRect *rect, int *reason);
+extern Boolean CoreDockGetAutoHideEnabled(void);
+extern void CoreDockGetOrientationAndPinning(int *orientation, int *pinning);
+extern CFStringRef SLSCopyManagedDisplayForSpace(int cid, uint64_t sid);
+extern int SLSSpaceGetType(int cid, uint64_t sid);
+extern CFStringRef SLSSpaceCopyName(int cid, uint64_t sid);
+extern CFArrayRef SLSCopyWindowsWithOptionsAndTags(int cid, uint32_t owner, CFArrayRef spaces, uint32_t options, uint64_t *set_tags, uint64_t *clear_tags);
+extern int SLSGetSpaceManagementMode(int cid);
+extern CFArrayRef SLSCopyManagedDisplaySpaces(int cid);
+extern CGError SLSProcessAssignToSpace(int cid, pid_t pid, uint64_t sid);
+extern CGError SLSProcessAssignToAllSpaces(int cid, pid_t pid);
+extern void SLSMoveWindowsToManagedSpace(int cid, CFArrayRef window_list, uint64_t sid);
+extern CGError CoreDockSendNotification(CFStringRef notification, int unknown);
+extern CGError SLSMoveWindow(int cid, uint32_t wid, CGPoint *point);
+extern CFArrayRef SLSCopyAssociatedWindows(int cid, uint32_t wid);
+extern CFTypeRef SLSWindowQueryWindows(int cid, CFArrayRef windows, int count);
+extern CFTypeRef SLSWindowQueryResultCopyWindows(CFTypeRef window_query);
+extern CGError SLSWindowIteratorAdvance(CFTypeRef iterator);
+extern uint32_t SLSWindowIteratorGetParentID(CFTypeRef iterator);
+extern uint32_t SLSWindowIteratorGetWindowID(CFTypeRef iterator);
+extern uint64_t SLSWindowIteratorGetTags(CFTypeRef iterator);
+extern OSStatus _SLPSGetFrontProcess(ProcessSerialNumber *psn);
+extern CGError SLSGetWindowOwner(int cid, uint32_t wid, int *wcid);
+extern CGError SLSGetConnectionPSN(int cid, ProcessSerialNumber *psn);
+extern CGError SLSConnectionGetPID(int cid, pid_t *pid);
+extern CGError _SLPSSetFrontProcessWithOptions(ProcessSerialNumber *psn, uint32_t wid, uint32_t mode);
+extern CGError SLPSPostEventRecordTo(ProcessSerialNumber *psn, uint8_t *bytes);
+extern OSStatus SLSFindWindowByGeometry(int cid, int zero, int one, int zero_again, CGPoint *screen_point, CGPoint *window_point, uint32_t *wid, int *wcid);
+extern CGError SLSGetCurrentCursorLocation(int cid, CGPoint *point);
+
+#if 0
+extern CFArrayRef _LSCopyApplicationArrayInFrontToBackOrder(int negative_one, int one);
+extern void _LSASNExtractHighAndLowParts(const void *asn, uint32_t *high, uint32_t *low);
+extern CFTypeID _LSASNGetTypeID(void);
+#endif
diff --git a/src/misc/helpers.h b/src/misc/helpers.h
@@ -1,8 +1,6 @@
 #ifndef HELPERS_H
 #define HELPERS_H
 
-extern AXError _AXUIElementGetWindow(AXUIElementRef ref, uint32_t *wid);
-
 static const char *bool_str[] = { "off", "on" };
 
 static const char *layer_str[] =

diff --git a/src/process_manager.h b/src/process_manager.h
@@ -1,12 +1,6 @@
 #ifndef PROCESS_MANAGER_H
 #define PROCESS_MANAGER_H
 
-#if 0
-extern CFArrayRef _LSCopyApplicationArrayInFrontToBackOrder(int negative_one, int one);
-extern void _LSASNExtractHighAndLowParts(const void *asn, uint32_t *high, uint32_t *low);
-extern CFTypeID _LSASNGetTypeID(void);
-#endif
-
 #define PROCESS_EVENT_HANDLER(name) OSStatus name(EventHandlerCallRef ref, EventRef event, void *user_data)
 typedef PROCESS_EVENT_HANDLER(process_event_handler);
 

diff --git a/src/space.h b/src/space.h
@@ -1,11 +1,6 @@
 #ifndef SPACE_H
 #define SPACE_H
 
-extern CFStringRef SLSCopyManagedDisplayForSpace(int cid, uint64_t sid);
-extern int SLSSpaceGetType(int cid, uint64_t sid);
-extern CFStringRef SLSSpaceCopyName(int cid, uint64_t sid);
-extern CFArrayRef SLSCopyWindowsWithOptionsAndTags(int cid, uint32_t owner, CFArrayRef spaces, uint32_t options, uint64_t *set_tags, uint64_t *clear_tags);
-
 CFStringRef space_display_uuid(uint64_t sid);
 uint32_t space_display_id(uint64_t sid);
 uint32_t *space_window_list_for_connection(uint64_t sid, int cid, int *count, bool include_minimized);

diff --git a/src/space_manager.h b/src/space_manager.h
@@ -1,13 +1,6 @@
 #ifndef SPACE_MANAGER
 #define SPACE_MANAGER
 
-extern int SLSGetSpaceManagementMode(int cid);
-extern CFArrayRef SLSCopyManagedDisplaySpaces(int cid);
-extern CGError SLSProcessAssignToSpace(int cid, pid_t pid, uint64_t sid);
-extern CGError SLSProcessAssignToAllSpaces(int cid, pid_t pid);
-extern void SLSMoveWindowsToManagedSpace(int cid, CFArrayRef window_list, uint64_t sid);
-extern CGError CoreDockSendNotification(CFStringRef notification, int unknown);
-
 struct space_label
 {
     uint64_t sid;

diff --git a/src/window.h b/src/window.h
@@ -1,16 +1,6 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-extern int SLSMainConnectionID(void);
-extern CGError SLSGetWindowBounds(int cid, uint32_t wid, CGRect *frame);
-extern CGError SLSGetWindowLevel(int cid, uint32_t wid, int *level);
-extern CGError SLSGetWindowAlpha(int cid, uint32_t wid, float *alpha);
-extern CGError SLSSetWindowResolution(int cid, uint32_t wid, float resolution);
-extern CGError SLSCopyWindowProperty(int cid, uint32_t wid, CFStringRef property, CFTypeRef *value);
-extern CFStringRef SLSCopyManagedDisplayForWindow(int cid, uint32_t wid);
-extern CFStringRef SLSCopyBestManagedDisplayForRect(int cid, CGRect rect);
-extern CFArrayRef SLSCopySpacesForWindows(int cid, int selector, CFArrayRef window_list);
-
 const CFStringRef kAXFullscreenAttribute = CFSTR("AXFullScreen");
 
 #define AX_WINDOW_MINIMIZED_INDEX      0

diff --git a/src/window_manager.h b/src/window_manager.h
@@ -1,23 +1,6 @@
 #ifndef WINDOW_MANAGER_H
 #define WINDOW_MANAGER_H
 
-extern CGError SLSMoveWindow(int cid, uint32_t wid, CGPoint *point);
-extern CFArrayRef SLSCopyAssociatedWindows(int cid, uint32_t wid);
-extern CFTypeRef SLSWindowQueryWindows(int cid, CFArrayRef windows, int count);
-extern CFTypeRef SLSWindowQueryResultCopyWindows(CFTypeRef window_query);
-extern CGError SLSWindowIteratorAdvance(CFTypeRef iterator);
-extern uint32_t SLSWindowIteratorGetParentID(CFTypeRef iterator);
-extern uint32_t SLSWindowIteratorGetWindowID(CFTypeRef iterator);
-extern uint64_t SLSWindowIteratorGetTags(CFTypeRef iterator);
-extern OSStatus _SLPSGetFrontProcess(ProcessSerialNumber *psn);
-extern CGError SLSGetWindowOwner(int cid, uint32_t wid, int *wcid);
-extern CGError SLSGetConnectionPSN(int cid, ProcessSerialNumber *psn);
-extern CGError SLSConnectionGetPID(int cid, pid_t *pid);
-extern CGError _SLPSSetFrontProcessWithOptions(ProcessSerialNumber *psn, uint32_t wid, uint32_t mode);
-extern CGError SLPSPostEventRecordTo(ProcessSerialNumber *psn, uint8_t *bytes);
-extern OSStatus SLSFindWindowByGeometry(int cid, int zero, int one, int zero_again, CGPoint *screen_point, CGPoint *window_point, uint32_t *wid, int *wcid);
-extern CGError SLSGetCurrentCursorLocation(int cid, CGPoint *point);
-
 #define kCPSAllWindows    0x100
 #define kCPSUserGenerated 0x200
 #define kCPSNoWindows     0x400