fix warning

EthanArbuckle · May 20, 2020 · 8a6a5aa · 8a6a5aa
1 parent db45210
commit 8a6a5aa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/vncforios/hid.h b/vncforios/hid.h
@@ -11,6 +11,6 @@
 
 void setup_hid(CGSize displaySize);
 void VNCKeyboard(rfbBool down, rfbKeySym key, rfbClientPtr client);
-void VNCPointerNew(uint8_t buttonMask, int x, int y, rfbClientPtr client);
+void VNCPointerNew(int buttonMask, int x, int y, rfbClientPtr client);
 
 #endif /* hid_h */
diff --git a/vncforios/hid.m b/vncforios/hid.m
@@ -14,8 +14,7 @@
 static CGSize displaySize;
 static uint64_t multitouchDeviceID;
 
-void setup_hid(CGSize scaledDisplaySize)
-{
+void setup_hid(CGSize scaledDisplaySize) {
     eventClient = IOHIDEventSystemClientCreate(kCFAllocatorDefault);
     displaySize = scaledDisplaySize;
 
@@ -51,15 +50,13 @@ void setup_hid(CGSize scaledDisplaySize)
     NSLog(@"AppleMultitouchDevice: 0x%llx", multitouchDeviceID);
 }
 
-static void send_event(IOHIDEventRef event)
-{
+static void send_event(IOHIDEventRef event) {
     IOHIDEventSetSenderID(event, multitouchDeviceID);
     IOHIDEventSystemClientDispatchEvent(eventClient, event);
     CFRelease(event);
 }
 
-void VNCKeyboard(rfbBool down, rfbKeySym key, rfbClientPtr client)
-{
+void VNCKeyboard(rfbBool down, rfbKeySym key, rfbClientPtr client) {
     uint16_t usage;
     uint16_t usagePage = kHIDPage_KeyboardOrKeypad;
 
@@ -195,9 +192,8 @@ void VNCKeyboard(rfbBool down, rfbKeySym key, rfbClientPtr client)
     send_event(event);
 }
 
-static uint8_t lastButtonMask;
-void VNCPointerNew(uint8_t buttonMask, int x, int y, rfbClientPtr client)
-{
+static int lastButtonMask;
+void VNCPointerNew(int buttonMask, int x, int y, rfbClientPtr client) {
     int diff = lastButtonMask ^ buttonMask;
     bool wasDown = (lastButtonMask & 0x1) != 0;
     bool isDown = (buttonMask & 0x1) != 0;

diff --git a/vncforios/main.m b/vncforios/main.m
@@ -17,18 +17,15 @@
 static CFStringRef displayName;
 static IOSurfaceAcceleratorRef accelerator;
 
-static enum rfbNewClientAction vnc_client_new(rfbClientPtr client)
-{
+static enum rfbNewClientAction vnc_client_new(rfbClientPtr client) {
     return RFB_CLIENT_ACCEPT;
 }
 
-static rfbBool vnc_check_password(rfbClientPtr client, const char *data, int size)
-{
+static rfbBool vnc_check_password(rfbClientPtr client, const char *data, int size) {
     return 1;
 }
 
-void create_vnc_server()
-{
+void create_vnc_server() {
     int BytesPerPixel = 4;
     int BitsPerSample = 8;
 
@@ -71,8 +68,8 @@ void create_vnc_server()
     rfbRunEventLoop(_remote_screen, -1, true);
 }
 
-void draw(CFRunLoopTimerRef timer, void *info) {
-
+void draw(void) {
+    
     IOSurfaceLock(fullsizeSurface, 0, nil);
     CARenderServerRenderDisplay(0, displayName, fullsizeSurface, 0, 0);
     IOSurfaceUnlock(fullsizeSurface, 0, 0);
@@ -89,14 +86,12 @@ @interface VncSurfaceDrawer : NSObject
 @end
 @implementation VncSurfaceDrawer
 
-- (void)draw
-{
-    draw(NULL, NULL);
+- (void)draw {
+    draw();
 }
 
 @end
 
-
 int main(int argc, const char *argv[]) {
 
     @autoreleasepool {