|
@@ -78,7 +78,7 @@ public: |
|
|
carla_zeroStruct(attr); |
|
|
carla_zeroStruct(attr); |
|
|
|
|
|
|
|
|
attr.border_pixel = 0; |
|
|
attr.border_pixel = 0; |
|
|
attr.event_mask = KeyPressMask|KeyReleaseMask; |
|
|
|
|
|
|
|
|
attr.event_mask = KeyPressMask|KeyReleaseMask|FocusChangeMask; |
|
|
|
|
|
|
|
|
if (fIsResizable) |
|
|
if (fIsResizable) |
|
|
attr.event_mask |= StructureNotifyMask; |
|
|
attr.event_mask |= StructureNotifyMask; |
|
@@ -238,9 +238,14 @@ public: |
|
|
carla_zeroStruct(sizeHints); |
|
|
carla_zeroStruct(sizeHints); |
|
|
|
|
|
|
|
|
if (XGetNormalHints(fDisplay, fChildWindow, &sizeHints) && !gErrorTriggered) |
|
|
if (XGetNormalHints(fDisplay, fChildWindow, &sizeHints) && !gErrorTriggered) |
|
|
|
|
|
{ |
|
|
XSetNormalHints(fDisplay, fHostWindow, &sizeHints); |
|
|
XSetNormalHints(fDisplay, fHostWindow, &sizeHints); |
|
|
|
|
|
} |
|
|
else |
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
carla_stdout("Caught errors while accessing child window"); |
|
|
fChildWindow = 0; |
|
|
fChildWindow = 0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
fChildWindowConfigured = true; |
|
|
fChildWindowConfigured = true; |
|
|
XSetErrorHandler(oldErrorHandler); |
|
|
XSetErrorHandler(oldErrorHandler); |
|
@@ -274,6 +279,13 @@ public: |
|
|
fCallback->handlePluginUIClosed(); |
|
|
fCallback->handlePluginUIClosed(); |
|
|
} |
|
|
} |
|
|
break; |
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case FocusIn: |
|
|
|
|
|
if (fChildWindow == 0) |
|
|
|
|
|
fChildWindow = getChildWindow(); |
|
|
|
|
|
if (fChildWindow != 0) |
|
|
|
|
|
XSetInputFocus(fDisplay, fChildWindow, RevertToNone, CurrentTime); |
|
|
|
|
|
break; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (type != nullptr) |
|
|
if (type != nullptr) |
|
|