Change windows key

EddyGharbi · EddyGharbi · commit 3c2f70c14a19 · 2020-02-25T16:06:13.000-08:00
diff --git a/src/module.cpp b/src/module.cpp
@@ -30,47 +30,50 @@ WindowInt *window;
 
 void createWindowJS(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
+    v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);
+    std::string name(*str);
+
     v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>(); 
 	unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);
 
-    window->createWindow(handle);
+    window->createWindow(name, handle);
 }
 
 void destroyWindowJS(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();
-	unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);
+    v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);
+    std::string name(*str);
 
-    window->destroyWindow(handle);
+    window->destroyWindow(name);
 }
 
 void connectIOSurfaceJS(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();
-	unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);
+    v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);
+    std::string name(*str);
 
     v8::Local<v8::Uint32> surfaceID = v8::Local<v8::Uint32>::Cast(args[1]);
 
-    window->connectIOSurfaceJS(handle, surfaceID->Uint32Value());
+    window->connectIOSurfaceJS(name, surfaceID->Uint32Value());
 }
 
 void destroyIOSurfaceJS(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();
-	unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);
+    v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);
+    std::string name(*str);
 
-    window->destroyIOSurface(handle);
+    window->destroyIOSurface(name);
 }
 
 void moveWindowJS(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();
-	unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);
+    v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);
+    std::string name(*str);
 
     v8::Local<v8::Uint32> cx = v8::Local<v8::Uint32>::Cast(args[1]);
     v8::Local<v8::Uint32> cy = v8::Local<v8::Uint32>::Cast(args[2]);
 
-    window->moveWindow(handle, cx->Uint32Value(), cy->Uint32Value());
+    window->moveWindow(name, cx->Uint32Value(), cy->Uint32Value());
 }
 
 void init(v8::Local<v8::Object> exports) {
diff --git a/src/window-osx-int.cpp b/src/window-osx-int.cpp
@@ -33,27 +33,27 @@ WindowInt::~WindowInt(void)
     if (_impl) { delete _impl; _impl = nullptr; }
 }
 
-void WindowInt::createWindow(unsigned char* handle)
+void WindowInt::createWindow(std::string name, unsigned char* handle)
 {
-    _impl->createWindow(handle);
+    _impl->createWindow(name, handle);
 }
 
-void WindowInt::destroyWindow(unsigned char* handle)
+void WindowInt::destroyWindow(std::string name)
 {
-    _impl->destroyWindow(handle);
+    _impl->destroyWindow(name);
 }
 
-void WindowInt::connectIOSurfaceJS(unsigned char* handle, uint32_t surfaceID)
+void WindowInt::connectIOSurfaceJS(std::string name, uint32_t surfaceID)
 {
-    _impl->connectIOSurfaceJS(handle, surfaceID);
+    _impl->connectIOSurfaceJS(name, surfaceID);
 }
 
-void WindowInt::destroyIOSurface(unsigned char* handle)
+void WindowInt::destroyIOSurface(std::string name)
 {
-    _impl->destroyIOSurface(handle);
+    _impl->destroyIOSurface(name);
 }
 
-void WindowInt::moveWindow(unsigned char* handle, uint32_t cx, uint32_t cy)
+void WindowInt::moveWindow(std::string name, uint32_t cx, uint32_t cy)
 {
-    _impl->moveWindow(handle, cx, cy);
+    _impl->moveWindow(name, cx, cy);
 }
diff --git a/src/window-osx-int.hpp b/src/window-osx-int.hpp
@@ -20,6 +20,7 @@
 #define __WINDOW_CLASS_H__
 
 #include <stdint.h>
+#include <string>
 
 class WindowObjCInt;
 
@@ -30,11 +31,11 @@ class WindowInt
     ~WindowInt(void);
 
     void init(void);
-    void createWindow(unsigned char* handle);
-    void destroyWindow(unsigned char* handle);
-    void connectIOSurfaceJS(unsigned char* handle, uint32_t surfaceID);
-    void destroyIOSurface(unsigned char* handle);
-    void moveWindow(unsigned char* handle, uint32_t cx, uint32_t cy);
+    void createWindow(std::string name, unsigned char* handle);
+    void destroyWindow(std::string name);
+    void connectIOSurfaceJS(std::string name, uint32_t surfaceID);
+    void destroyIOSurface(std::string name);
+    void moveWindow(std::string name, uint32_t cx, uint32_t cy);
 
 private:
     WindowObjCInt * _impl;
diff --git a/src/window-osx-obj-c-int.h b/src/window-osx-obj-c-int.h
@@ -21,6 +21,7 @@
 
 
 #include <stdint.h>
+#include <string>
 
 class WindowObjCInt
 {
@@ -29,11 +30,11 @@ class WindowObjCInt
     ~WindowObjCInt(void);
 
     void init(void);
-    void createWindow(unsigned char* handle);
-    void destroyWindow(unsigned char* handle);
-    void connectIOSurfaceJS(unsigned char* handle, uint32_t surfaceID);
-    void destroyIOSurface(unsigned char* handle);
-    void moveWindow(unsigned char* handle, uint32_t cx, uint32_t cy);
+    void createWindow(std::string name, unsigned char* handle);
+    void destroyWindow(std::string name);
+    void connectIOSurfaceJS(std::string name, uint32_t surfaceID);
+    void destroyIOSurface(std::string name);
+    void moveWindow(std::string name, uint32_t cx, uint32_t cy);
 
 private:
     void * self;
diff --git a/src/window-osx.h b/src/window-osx.h
@@ -31,6 +31,7 @@
 #include <iostream>
 #include <thread>
 #include <mutex>
+#include <string>
 
 @interface WindowImplObj : NSObject
 @end
@@ -57,4 +58,4 @@ struct WindowInfo {
     bool destroyed = false;
 };
 
-std::map<void*, void*> windows; // <NSView* parent, WindowInfo* wi>
+std::map<std::string, void*> windows; // <std::string name, WindowInfo* wi>
diff --git a/src/window-osx.mm b/src/window-osx.mm
@@ -378,7 +378,7 @@ @implementation WindowImplObj
     self = [[WindowImplObj alloc] init];
 }
 
-void WindowObjCInt::createWindow(unsigned char* handle)
+void WindowObjCInt::createWindow(std::string name, unsigned char* handle)
 {
   WindowInfo* wi = new WindowInfo();
 
@@ -388,13 +388,12 @@ @implementation WindowImplObj
   wi->view = [[OpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)];
   [winParent.contentView addSubview:wi->view];
 
-  windows.emplace(viewParent, wi);
+  windows.emplace(name, wi);
 }
 
-void WindowObjCInt::destroyWindow(unsigned char* handle)
+void WindowObjCInt::destroyWindow(std::string name)
 {
-  NSView *viewParent = *reinterpret_cast<NSView**>(handle);
-  auto it = windows.find(viewParent);
+  auto it = windows.find(name);
   if (it == windows.end())
     return;
 
@@ -414,13 +413,12 @@ @implementation WindowImplObj
   [wi->view removeFromSuperview];
   CFRelease(wi->view);
 
-  windows.erase(viewParent);
+  windows.erase(name);
 }
 
-void WindowObjCInt::connectIOSurfaceJS(unsigned char* handle, uint32_t surfaceID)
+void WindowObjCInt::connectIOSurfaceJS(std::string name, uint32_t surfaceID)
 {
-  NSView* viewParent = *reinterpret_cast<NSView**>(handle);
-  auto it = windows.find(viewParent);
+  auto it = windows.find(name);
   if (it == windows.end())
     return;
 
@@ -437,10 +435,9 @@ @implementation WindowImplObj
                                   IOSurfaceGetHeight(wi->view.glData->surface))];
 }
 
-void WindowObjCInt::destroyIOSurface(unsigned char* handle)
+void WindowObjCInt::destroyIOSurface(std::string name)
 {
-  NSView *viewParent = *reinterpret_cast<NSView**>(handle);
-  auto it = windows.find(viewParent);
+  auto it = windows.find(name);
   if (it == windows.end())
     return;
 
@@ -451,10 +448,9 @@ @implementation WindowImplObj
   }
 }
 
-void WindowObjCInt::moveWindow(unsigned char* handle, uint32_t cx, uint32_t cy)
+void WindowObjCInt::moveWindow(std::string name, uint32_t cx, uint32_t cy)
 {
-  NSView *viewParent = *reinterpret_cast<NSView**>(handle);
-  auto it = windows.find(viewParent);
+  auto it = windows.find(name);
   if (it == windows.end())
     return;
 

Original file line number	Diff line number	Diff line change
`@@ -30,47 +30,50 @@ WindowInt *window;`
`30`	`30`
`31`	`31`	`void createWindowJS(const v8::FunctionCallbackInfo<v8::Value>& args)`
`32`	`32`	`{`
	`33`	`+ v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);`
	`34`	`+ std::string name(*str);`
	`35`	`+`
`33`	`36`	`v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();`
`34`	`37`	`unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);`
`35`	`38`
`36`		`- window->createWindow(handle);`
	`39`	`+ window->createWindow(name, handle);`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`void destroyWindowJS(const v8::FunctionCallbackInfo<v8::Value>& args)`
`40`	`43`	`{`
`41`		`- v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();`
`42`		`- unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);`
	`44`	`+ v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);`
	`45`	`+ std::string name(*str);`
`43`	`46`
`44`		`- window->destroyWindow(handle);`
	`47`	`+ window->destroyWindow(name);`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`void connectIOSurfaceJS(const v8::FunctionCallbackInfo<v8::Value>& args)`
`48`	`51`	`{`
`49`		`- v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();`
`50`		`- unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);`
	`52`	`+ v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);`
	`53`	`+ std::string name(*str);`
`51`	`54`
`52`	`55`	`v8::Local<v8::Uint32> surfaceID = v8::Local<v8::Uint32>::Cast(args[1]);`
`53`	`56`
`54`		`- window->connectIOSurfaceJS(handle, surfaceID->Uint32Value());`
	`57`	`+ window->connectIOSurfaceJS(name, surfaceID->Uint32Value());`
`55`	`58`	`}`
`56`	`59`
`57`	`60`	`void destroyIOSurfaceJS(const v8::FunctionCallbackInfo<v8::Value>& args)`
`58`	`61`	`{`
`59`		`- v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();`
`60`		`- unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);`
	`62`	`+ v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);`
	`63`	`+ std::string name(*str);`
`61`	`64`
`62`		`- window->destroyIOSurface(handle);`
	`65`	`+ window->destroyIOSurface(name);`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`void moveWindowJS(const v8::FunctionCallbackInfo<v8::Value>& args)`
`66`	`69`	`{`
`67`		`- v8::Local<v8::Object> bufferObj = args[0].As<v8::Object>();`
`68`		`- unsigned char* handle = (unsigned char*)node::Buffer::Data(bufferObj);`
	`70`	`+ v8::String::Utf8Value str(v8::Isolate::GetCurrent(), args[0]);`
	`71`	`+ std::string name(*str);`
`69`	`72`
`70`	`73`	`v8::Local<v8::Uint32> cx = v8::Local<v8::Uint32>::Cast(args[1]);`
`71`	`74`	`v8::Local<v8::Uint32> cy = v8::Local<v8::Uint32>::Cast(args[2]);`
`72`	`75`
`73`		`- window->moveWindow(handle, cx->Uint32Value(), cy->Uint32Value());`
	`76`	`+ window->moveWindow(name, cx->Uint32Value(), cy->Uint32Value());`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`void init(v8::Local<v8::Object> exports) {`
Original file line number	Diff line number	Diff line change
`@@ -33,27 +33,27 @@ WindowInt::~WindowInt(void)`
`33`	`33`	`if (_impl) { delete _impl; _impl = nullptr; }`
`34`	`34`	`}`
`35`	`35`
`36`		`-void WindowInt::createWindow(unsigned char* handle)`
	`36`	`+void WindowInt::createWindow(std::string name, unsigned char* handle)`
`37`	`37`	`{`
`38`		`- _impl->createWindow(handle);`
	`38`	`+ _impl->createWindow(name, handle);`
`39`	`39`	`}`
`40`	`40`
`41`		`-void WindowInt::destroyWindow(unsigned char* handle)`
	`41`	`+void WindowInt::destroyWindow(std::string name)`
`42`	`42`	`{`
`43`		`- _impl->destroyWindow(handle);`
	`43`	`+ _impl->destroyWindow(name);`
`44`	`44`	`}`
`45`	`45`
`46`		`-void WindowInt::connectIOSurfaceJS(unsigned char* handle, uint32_t surfaceID)`
	`46`	`+void WindowInt::connectIOSurfaceJS(std::string name, uint32_t surfaceID)`
`47`	`47`	`{`
`48`		`- _impl->connectIOSurfaceJS(handle, surfaceID);`
	`48`	`+ _impl->connectIOSurfaceJS(name, surfaceID);`
`49`	`49`	`}`
`50`	`50`
`51`		`-void WindowInt::destroyIOSurface(unsigned char* handle)`
	`51`	`+void WindowInt::destroyIOSurface(std::string name)`
`52`	`52`	`{`
`53`		`- _impl->destroyIOSurface(handle);`
	`53`	`+ _impl->destroyIOSurface(name);`
`54`	`54`	`}`
`55`	`55`
`56`		`-void WindowInt::moveWindow(unsigned char* handle, uint32_t cx, uint32_t cy)`
	`56`	`+void WindowInt::moveWindow(std::string name, uint32_t cx, uint32_t cy)`
`57`	`57`	`{`
`58`		`- _impl->moveWindow(handle, cx, cy);`
	`58`	`+ _impl->moveWindow(name, cx, cy);`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ @implementation WindowImplObj`
`378`	`378`	`self = [[WindowImplObj alloc] init];`
`379`	`379`	`}`
`380`	`380`
`381`		`-void WindowObjCInt::createWindow(unsigned char* handle)`
	`381`	`+void WindowObjCInt::createWindow(std::string name, unsigned char* handle)`
`382`	`382`	`{`
`383`	`383`	`WindowInfo* wi = new WindowInfo();`
`384`	`384`
`@@ -388,13 +388,12 @@ @implementation WindowImplObj`
`388`	`388`	`wi->view = [[OpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)];`
`389`	`389`	`[winParent.contentView addSubview:wi->view];`
`390`	`390`
`391`		`- windows.emplace(viewParent, wi);`
	`391`	`+ windows.emplace(name, wi);`
`392`	`392`	`}`
`393`	`393`
`394`		`-void WindowObjCInt::destroyWindow(unsigned char* handle)`
	`394`	`+void WindowObjCInt::destroyWindow(std::string name)`
`395`	`395`	`{`
`396`		`- NSView viewParent = reinterpret_cast<NSView**>(handle);`
`397`		`- auto it = windows.find(viewParent);`
	`396`	`+ auto it = windows.find(name);`
`398`	`397`	`if (it == windows.end())`
`399`	`398`	`return;`
`400`	`399`
`@@ -414,13 +413,12 @@ @implementation WindowImplObj`
`414`	`413`	`[wi->view removeFromSuperview];`
`415`	`414`	`CFRelease(wi->view);`
`416`	`415`
`417`		`- windows.erase(viewParent);`
	`416`	`+ windows.erase(name);`
`418`	`417`	`}`
`419`	`418`
`420`		`-void WindowObjCInt::connectIOSurfaceJS(unsigned char* handle, uint32_t surfaceID)`
	`419`	`+void WindowObjCInt::connectIOSurfaceJS(std::string name, uint32_t surfaceID)`
`421`	`420`	`{`
`422`		`- NSView* viewParent = reinterpret_cast<NSView*>(handle);`
`423`		`- auto it = windows.find(viewParent);`
	`421`	`+ auto it = windows.find(name);`
`424`	`422`	`if (it == windows.end())`
`425`	`423`	`return;`
`426`	`424`
`@@ -437,10 +435,9 @@ @implementation WindowImplObj`
`437`	`435`	`IOSurfaceGetHeight(wi->view.glData->surface))];`
`438`	`436`	`}`
`439`	`437`
`440`		`-void WindowObjCInt::destroyIOSurface(unsigned char* handle)`
	`438`	`+void WindowObjCInt::destroyIOSurface(std::string name)`
`441`	`439`	`{`
`442`		`- NSView viewParent = reinterpret_cast<NSView**>(handle);`
`443`		`- auto it = windows.find(viewParent);`
	`440`	`+ auto it = windows.find(name);`
`444`	`441`	`if (it == windows.end())`
`445`	`442`	`return;`
`446`	`443`
`@@ -451,10 +448,9 @@ @implementation WindowImplObj`
`451`	`448`	`}`
`452`	`449`	`}`
`453`	`450`
`454`		`-void WindowObjCInt::moveWindow(unsigned char* handle, uint32_t cx, uint32_t cy)`
	`451`	`+void WindowObjCInt::moveWindow(std::string name, uint32_t cx, uint32_t cy)`
`455`	`452`	`{`
`456`		`- NSView viewParent = reinterpret_cast<NSView**>(handle);`
`457`		`- auto it = windows.find(viewParent);`
	`453`	`+ auto it = windows.find(name);`
`458`	`454`	`if (it == windows.end())`
`459`	`455`	`return;`
`460`	`456`