mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
add support for set_icon_filename()
This commit is contained in:
David Rose
parent
82d1ecf8d7
commit
476eba103d
@ -18,6 +18,7 @@
|
||||
#include "osxGraphicsWindow.h"
|
||||
#include "osxGraphicsBuffer.h"
|
||||
#include "osxGraphicsStateGuardian.h"
|
||||
#include "pnmImage.h"
|
||||
|
||||
|
||||
TypeHandle osxGraphicsPipe::_type_handle;
|
||||
@ -67,6 +68,121 @@ pipe_constructor() {
|
||||
return new osxGraphicsPipe;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: osxGraphicsPipe::create_cg_image
|
||||
// Access: Public, Static
|
||||
// Description: Creates a new Quartz bitmap image with the data in
|
||||
// the indicated PNMImage. The caller should eventually
|
||||
// free this image via CGImageRelease.
|
||||
////////////////////////////////////////////////////////////////////
|
||||
CGImageRef osxGraphicsPipe::
|
||||
create_cg_image(const PNMImage &pnm_image) {
|
||||
size_t width = pnm_image.get_x_size();
|
||||
size_t height = pnm_image.get_y_size();
|
||||
|
||||
#ifdef PGM_BIGGRAYS
|
||||
size_t bytes_per_component = 2;
|
||||
#else
|
||||
size_t bytes_per_component = 1;
|
||||
#endif
|
||||
size_t bits_per_component = bytes_per_component * 8;
|
||||
size_t num_components = pnm_image.get_num_channels();
|
||||
|
||||
size_t bits_per_pixel = num_components * bits_per_component;
|
||||
size_t bytes_per_row = num_components * bytes_per_component * width;
|
||||
|
||||
size_t num_bytes = bytes_per_row * height;
|
||||
bool has_alpha;
|
||||
bool is_grayscale;
|
||||
|
||||
CFStringRef color_space_name = NULL;
|
||||
switch (pnm_image.get_color_type()) {
|
||||
case PNMImage::CT_grayscale:
|
||||
color_space_name = kCGColorSpaceGenericGray;
|
||||
has_alpha = false;
|
||||
is_grayscale = true;
|
||||
break;
|
||||
|
||||
case PNMImage::CT_two_channel:
|
||||
color_space_name = kCGColorSpaceGenericGray;
|
||||
has_alpha = true;
|
||||
is_grayscale = true;
|
||||
break;
|
||||
|
||||
case PNMImage::CT_color:
|
||||
color_space_name = kCGColorSpaceGenericRGB;
|
||||
has_alpha = false;
|
||||
is_grayscale = false;
|
||||
break;
|
||||
|
||||
case PNMImage::CT_four_channel:
|
||||
color_space_name = kCGColorSpaceGenericRGB;
|
||||
has_alpha = true;
|
||||
is_grayscale = false;
|
||||
break;
|
||||
}
|
||||
nassertr(color_space_name != NULL, NULL);
|
||||
|
||||
CGColorSpaceRef color_space = CGColorSpaceCreateWithName(color_space_name);
|
||||
nassertr(color_space != NULL, NULL);
|
||||
|
||||
CGBitmapInfo bitmap_info = 0;
|
||||
#ifdef PGM_BIGGRAYS
|
||||
bitmap_info |= kCGBitmapByteOrder16Host;
|
||||
#endif
|
||||
if (has_alpha) {
|
||||
bitmap_info |= kCGImageAlphaLast;
|
||||
}
|
||||
|
||||
// Now convert the pixel data to a format friendly to
|
||||
// CGImageCreate().
|
||||
char *char_array = new char[num_bytes];
|
||||
|
||||
xelval *dp = (xelval *)char_array;
|
||||
for (size_t yi = 0; yi < height; ++yi) {
|
||||
for (size_t xi = 0; xi < width; ++xi) {
|
||||
if (is_grayscale) {
|
||||
*dp++ = (xelval)(pnm_image.get_gray(xi, yi) * PGM_MAXMAXVAL);
|
||||
} else {
|
||||
*dp++ = (xelval)(pnm_image.get_green(xi, yi) * PGM_MAXMAXVAL);
|
||||
*dp++ = (xelval)(pnm_image.get_red(xi, yi) * PGM_MAXMAXVAL);
|
||||
*dp++ = (xelval)(pnm_image.get_blue(xi, yi) * PGM_MAXMAXVAL);
|
||||
}
|
||||
if (has_alpha) {
|
||||
*dp++ = (xelval)(pnm_image.get_alpha(xi, yi) * PGM_MAXMAXVAL);
|
||||
}
|
||||
}
|
||||
}
|
||||
nassertr((void *)dp == (void *)(char_array + num_bytes), NULL);
|
||||
|
||||
CGDataProviderRef provider =
|
||||
CGDataProviderCreateWithData(NULL, char_array, num_bytes, release_data);
|
||||
nassertr(provider != NULL, NULL);
|
||||
|
||||
CGImageRef image = CGImageCreate
|
||||
(width, height, bits_per_component, bits_per_pixel, bytes_per_row,
|
||||
color_space, bitmap_info, provider,
|
||||
NULL, false, kCGRenderingIntentDefault);
|
||||
nassertr(image != NULL, NULL);
|
||||
|
||||
CGColorSpaceRelease(color_space);
|
||||
CGDataProviderRelease(provider);
|
||||
|
||||
return image;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: osxGraphicsPipe::release_data
|
||||
// Access: Private, Static
|
||||
// Description: This callback is assigned to delete the data array
|
||||
// allocated within create_cg_image().
|
||||
////////////////////////////////////////////////////////////////////
|
||||
void osxGraphicsPipe::
|
||||
release_data(void *info, const void *data, size_t size) {
|
||||
char *char_array = (char *)data;
|
||||
delete[] char_array;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: osxGraphicsPipe::make_output
|
||||
// Access: Protected, Virtual
|
||||
|
||||
@ -19,7 +19,10 @@
|
||||
#include "pandabase.h"
|
||||
#include "graphicspipe.h"
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
class osxGraphicsStateGuardian;
|
||||
class PNMImage;
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Class : osxGraphicsPipe
|
||||
@ -35,6 +38,11 @@ public:
|
||||
virtual string get_interface_name() const;
|
||||
static PT(GraphicsPipe) pipe_constructor();
|
||||
|
||||
static CGImageRef create_cg_image(const PNMImage &pnm_image);
|
||||
|
||||
private:
|
||||
static void release_data(void *info, const void *data, size_t size);
|
||||
|
||||
protected:
|
||||
virtual PT(GraphicsOutput) make_output(const string &name,
|
||||
const FrameBufferProperties &fb_prop,
|
||||
|
||||
@ -22,7 +22,11 @@
|
||||
#include "keyboardButton.h"
|
||||
#include "mouseButton.h"
|
||||
#include "osxGraphicsStateGuardian.h"
|
||||
#include "osxGraphicsPipe.h"
|
||||
#include "throw_event.h"
|
||||
#include "pnmImage.h"
|
||||
#include "virtualFileSystem.h"
|
||||
#include "config_util.h"
|
||||
|
||||
#include <OpenGL/gl.h>
|
||||
#include <AGL/agl.h>
|
||||
@ -300,7 +304,7 @@ void osxGraphicsWindow::DoResize(void)
|
||||
{
|
||||
osxdisplay_cat.debug() << "In Resize Out....." << _properties << "\n";
|
||||
// only in window mode .. not full screen
|
||||
if(_osx_window != NULL && _is_fullsreen == false && _properties.has_size())
|
||||
if(_osx_window != NULL && _is_fullscreen == false && _properties.has_size())
|
||||
{
|
||||
Rect rectPort = {0,0,0,0};
|
||||
CGRect viewRect = {{0.0f, 0.0f}, {0.0f, 0.0f}};
|
||||
@ -435,19 +439,15 @@ OSStatus osxGraphicsWindow::handleTextInput (EventHandlerCallRef myHandler, Even
|
||||
// Access: private..
|
||||
// Description: Clean up the OS level messes..
|
||||
////////////////////////////////////////////////////////////////////
|
||||
void osxGraphicsWindow::ReleaseSystemResources()
|
||||
{
|
||||
|
||||
if(_is_fullsreen)
|
||||
{
|
||||
_is_fullsreen = false;
|
||||
void osxGraphicsWindow::
|
||||
ReleaseSystemResources() {
|
||||
if (_is_fullscreen) {
|
||||
_is_fullscreen = false;
|
||||
FullScreenWindow = NULL;
|
||||
|
||||
|
||||
if(_originalMode != NULL)
|
||||
if (_originalMode != NULL) {
|
||||
CGDisplaySwitchToMode( kCGDirectMainDisplay, _originalMode );
|
||||
|
||||
|
||||
}
|
||||
|
||||
CGDisplayRelease( kCGDirectMainDisplay );
|
||||
aglSetDrawable (get_ggs_context(), NULL);
|
||||
@ -455,38 +455,48 @@ OSStatus osxGraphicsWindow::handleTextInput (EventHandlerCallRef myHandler, Even
|
||||
_originalMode = NULL;
|
||||
}
|
||||
|
||||
|
||||
// if the ggs context is assigned to this window
|
||||
// clear it..
|
||||
if(_osx_window != NULL && GetWindowPort (_osx_window) == (GrafPtr)aglGetDrawable(get_ggs_context()))
|
||||
if (_osx_window != NULL &&
|
||||
GetWindowPort (_osx_window) == (GrafPtr)aglGetDrawable(get_ggs_context())) {
|
||||
aglSetDrawable (get_ggs_context(),NULL);
|
||||
}
|
||||
|
||||
// if we are the active gl context clear it..
|
||||
if(aglGetCurrentContext() == get_ggs_context())
|
||||
if(aglGetCurrentContext() == get_ggs_context()) {
|
||||
aglSetCurrentContext (NULL);
|
||||
}
|
||||
|
||||
|
||||
if(_osx_window != NULL)
|
||||
{
|
||||
if(_osx_window != NULL) {
|
||||
SetWRefCon (_osx_window, (long int) NULL);
|
||||
HideWindow (_osx_window);
|
||||
DisposeWindow(_osx_window);
|
||||
_osx_window = NULL;
|
||||
}
|
||||
|
||||
if (_holder_aglcontext)
|
||||
{
|
||||
if (_holder_aglcontext) {
|
||||
aglDestroyContext (_holder_aglcontext);
|
||||
_holder_aglcontext = NULL;
|
||||
}
|
||||
|
||||
if (_pending_icon != NULL) {
|
||||
cerr << "release pending icon\n";
|
||||
CGImageRelease(_pending_icon);
|
||||
_pending_icon = NULL;
|
||||
}
|
||||
if (_current_icon != NULL) {
|
||||
cerr << "release current icon\n";
|
||||
CGImageRelease(_current_icon);
|
||||
_current_icon = NULL;
|
||||
}
|
||||
|
||||
WindowProperties properties;
|
||||
properties.set_foreground(false);
|
||||
properties.set_open(false);
|
||||
properties.set_cursor_filename(Filename());
|
||||
system_changed_properties(properties);
|
||||
|
||||
_is_fullsreen = false;
|
||||
_is_fullscreen = false;
|
||||
_osx_window = NULL;
|
||||
}
|
||||
|
||||
@ -507,7 +517,9 @@ osxGraphicsWindow(GraphicsPipe *pipe,
|
||||
GraphicsOutput *host) :
|
||||
GraphicsWindow(pipe, name, fb_prop, win_prop, flags, gsg, host),
|
||||
_osx_window(NULL),
|
||||
_is_fullsreen(false),
|
||||
_is_fullscreen(false),
|
||||
_pending_icon(NULL),
|
||||
_current_icon(NULL),
|
||||
#ifdef HACK_SCREEN_HASH_CONTEXT
|
||||
_holder_aglcontext(NULL),
|
||||
#endif
|
||||
@ -623,6 +635,47 @@ OSStatus osxGraphicsWindow::buildGL (bool full_screen)
|
||||
return err;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: osxGraphicsWindow::set_icon_filename
|
||||
// Access: Private
|
||||
// Description: Called internally to load up an icon file that should
|
||||
// be applied to the window. Returns true on success,
|
||||
// false on failure.
|
||||
////////////////////////////////////////////////////////////////////
|
||||
bool osxGraphicsWindow::
|
||||
set_icon_filename(const Filename &icon_filename) {
|
||||
VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
|
||||
|
||||
Filename icon_pathname = icon_filename;
|
||||
if (!vfs->resolve_filename(icon_pathname, model_path)) {
|
||||
// The filename doesn't exist.
|
||||
osxdisplay_cat.warning()
|
||||
<< "Could not find icon filename " << icon_filename << "\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
PNMImage pnmimage;
|
||||
if (!pnmimage.read(icon_pathname)) {
|
||||
osxdisplay_cat.warning()
|
||||
<< "Could not read icon filename " << icon_pathname << "\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
CGImageRef icon_image = osxGraphicsPipe::create_cg_image(pnmimage);
|
||||
if (icon_image == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (_pending_icon != NULL) {
|
||||
cerr << "release pending icon (reset)\n";
|
||||
CGImageRelease(_pending_icon);
|
||||
_pending_icon = NULL;
|
||||
}
|
||||
_pending_icon = icon_image;
|
||||
return true;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: osxGraphicsWindow::begin_frame
|
||||
// Access: Public, Virtual
|
||||
@ -636,47 +689,54 @@ bool osxGraphicsWindow::begin_frame(FrameMode mode, Thread *current_thread)
|
||||
{
|
||||
PStatTimer timer(_make_current_pcollector);
|
||||
|
||||
// cerr << " begin_frame [" << _ID << "]\n";
|
||||
|
||||
begin_frame_spam();
|
||||
if (_gsg == (GraphicsStateGuardian *)NULL || (_osx_window == NULL && _is_fullsreen != true))
|
||||
{
|
||||
if (_gsg == (GraphicsStateGuardian *)NULL ||
|
||||
(_osx_window == NULL && _is_fullscreen != true)) {
|
||||
// not powered up .. just abort..
|
||||
return false;
|
||||
}
|
||||
|
||||
if(_is_fullsreen)
|
||||
{
|
||||
// Now is a good time to apply the icon change that may have
|
||||
// recently been requested. By this point, we should be able to get
|
||||
// a handle to the dock context.
|
||||
if (_pending_icon != NULL) {
|
||||
CGContextRef context = BeginCGContextForApplicationDockTile();
|
||||
if (context != NULL) {
|
||||
SetApplicationDockTileImage(_pending_icon);
|
||||
EndCGContextForApplicationDockTile(context);
|
||||
|
||||
if (_current_icon != NULL) {
|
||||
CGImageRelease(_current_icon);
|
||||
_current_icon = NULL;
|
||||
}
|
||||
_current_icon = _pending_icon;
|
||||
_pending_icon = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (_is_fullscreen) {
|
||||
aglSetFullScreen(get_ggs_context(),0,0,0,0);
|
||||
aglReportError ("aglSetFullScreen");
|
||||
|
||||
if (!aglSetCurrentContext(get_ggs_context()))
|
||||
aglReportError ("aglSetCurrentContext");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
if(FullScreenWindow != NULL)
|
||||
} else {
|
||||
if (FullScreenWindow != NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if(!aglSetDrawable (get_ggs_context(),GetWindowPort (_osx_window)))
|
||||
{
|
||||
if (!aglSetDrawable (get_ggs_context(),GetWindowPort (_osx_window))) {
|
||||
osxdisplay_cat.error() << "Error aglSetDrawable \n";
|
||||
aglReportError("aglSetDrawable");
|
||||
}
|
||||
|
||||
|
||||
if (!aglSetCurrentContext(get_ggs_context()))
|
||||
{
|
||||
if (!aglSetCurrentContext(get_ggs_context())) {
|
||||
osxdisplay_cat.error() << "Error in aglSetCurrentContext \n";
|
||||
aglReportError ("aglSetCurrentContext");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
_gsg->reset_if_new();
|
||||
_gsg->set_current_properties(&get_fb_properties());
|
||||
return _gsg->begin_frame(current_thread);
|
||||
@ -737,7 +797,7 @@ void osxGraphicsWindow::begin_flip()
|
||||
// cerr << " begin_flip [" << _ID << "]\n";
|
||||
return;
|
||||
|
||||
if(_is_fullsreen)
|
||||
if(_is_fullscreen)
|
||||
{
|
||||
|
||||
aglSetFullScreen(get_ggs_context(),0,0,0,0);
|
||||
@ -767,7 +827,7 @@ void osxGraphicsWindow::begin_flip()
|
||||
}
|
||||
|
||||
/*
|
||||
if(_is_fullsreen)
|
||||
if(_is_fullscreen)
|
||||
aglSwapBuffers (get_ggs_context());
|
||||
else
|
||||
aglSwapBuffers (get_context());
|
||||
@ -833,13 +893,18 @@ bool osxGraphicsWindow::open_window()
|
||||
}
|
||||
|
||||
|
||||
bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
{
|
||||
bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties) {
|
||||
OSErr err = noErr;
|
||||
|
||||
if (_current_icon != NULL && _pending_icon == NULL) {
|
||||
// If we already have an icon specified, we'll need to reapply it
|
||||
// when the window is succesfully created.
|
||||
_pending_icon = _current_icon;
|
||||
_current_icon = NULL;
|
||||
}
|
||||
|
||||
static bool GlobalInits = false;
|
||||
if(GlobalInits != true)
|
||||
{
|
||||
if (GlobalInits != true) {
|
||||
//
|
||||
// one time aplication inits.. to get a window open from a standalone aplication..
|
||||
|
||||
@ -869,32 +934,21 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
GetCurrentProcess((ProcessSerialNumber *)&PSN);
|
||||
err = CPSGetCurrentProcess(&PSN);
|
||||
|
||||
if(req_properties.has_title())
|
||||
{
|
||||
if (req_properties.has_title()) {
|
||||
err = CPSSetProcessName(&PSN,(char *)req_properties.get_title().c_str());
|
||||
//_properties.set_title(req_properties.get_title());
|
||||
}
|
||||
else
|
||||
} else {
|
||||
err = CPSSetProcessName(&PSN,"");
|
||||
|
||||
|
||||
}
|
||||
|
||||
err = CPSEnableForegroundOperation(&PSN);
|
||||
err = CPSSetFrontProcess(&PSN);
|
||||
|
||||
}
|
||||
|
||||
|
||||
if(req_properties.has_fullscreen() && req_properties.get_fullscreen())
|
||||
{
|
||||
// if(FullScreenWindow != NULL)
|
||||
// return false;
|
||||
|
||||
if (req_properties.has_fullscreen() && req_properties.get_fullscreen()) {
|
||||
// capture the main display
|
||||
CGDisplayCapture( kCGDirectMainDisplay );
|
||||
// if sized try and switch it..
|
||||
if(req_properties.has_size())
|
||||
{
|
||||
if (req_properties.has_size()) {
|
||||
_originalMode = CGDisplayCurrentMode( kCGDirectMainDisplay );
|
||||
CFDictionaryRef newMode = CGDisplayBestModeForParameters( kCGDirectMainDisplay, 32, req_properties.get_x_size(), req_properties.get_y_size(), 0 );
|
||||
if (newMode == NULL) {
|
||||
@ -920,9 +974,7 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(buildGL(true) != noErr)
|
||||
{
|
||||
if (buildGL(true) != noErr) {
|
||||
if(_originalMode != NULL)
|
||||
CGDisplaySwitchToMode( kCGDirectMainDisplay, _originalMode );
|
||||
_originalMode = NULL;
|
||||
@ -930,60 +982,40 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
CGDisplayRelease( kCGDirectMainDisplay );
|
||||
return false;
|
||||
}
|
||||
// if (!aglSetCurrentContext(get_context()))
|
||||
// err = aglReportError ();
|
||||
// aglSetFullScreen(get_context(),0,0,0,0);
|
||||
// aglReportError ();
|
||||
|
||||
// VBL SYNC
|
||||
// GLint swap = 1;
|
||||
// if (!aglSetInteger (get_context(), AGL_SWAP_INTERVAL, &swap))
|
||||
// aglReportError ();
|
||||
|
||||
_properties.set_fullscreen(true);
|
||||
|
||||
_is_fullsreen =true;
|
||||
_is_fullscreen =true;
|
||||
FullScreenWindow = this;
|
||||
req_properties.clear_fullscreen();
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// lets use this as a crome based window..
|
||||
Rect r;
|
||||
if(req_properties.has_origin())
|
||||
{
|
||||
if (req_properties.has_origin()) {
|
||||
r.top = req_properties.get_y_origin();
|
||||
r.left =req_properties.get_x_origin();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
r.top = 50;
|
||||
r.left = 10;
|
||||
}
|
||||
|
||||
if(req_properties.has_size())
|
||||
{
|
||||
if (req_properties.has_size()) {
|
||||
r.right = r.left + req_properties.get_x_size();
|
||||
r.bottom = r.top + req_properties.get_y_size();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
r.right = r.left + 512;
|
||||
r.bottom = r.top + 512;
|
||||
}
|
||||
|
||||
if(req_properties.has_undecorated() && req_properties.get_undecorated())
|
||||
{ // create a unmovable .. no edge window..
|
||||
if (req_properties.has_undecorated() &&
|
||||
req_properties.get_undecorated()) { // create a unmovable .. no edge window..
|
||||
CreateNewWindow(//
|
||||
kDocumentWindowClass,
|
||||
kWindowStandardDocumentAttributes | kWindowNoTitleBarAttribute,
|
||||
&r,
|
||||
&_osx_window);
|
||||
}
|
||||
else
|
||||
{ // create a window with crome and sizing and sucj
|
||||
|
||||
} else { // create a window with crome and sizing and sucj
|
||||
// In this case, we want to constrain the window to the
|
||||
// available size.
|
||||
Rect bounds;
|
||||
@ -1002,8 +1034,7 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
&_osx_window);
|
||||
}
|
||||
|
||||
if (_osx_window)
|
||||
{
|
||||
if (_osx_window) {
|
||||
EventHandlerUPP gWinEvtHandler; // window event handler
|
||||
//EventHandlerRef ref;
|
||||
EventTypeSpec list[] = {
|
||||
@ -1014,41 +1045,10 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
{ kEventClassWindow, kEventWindowClose },
|
||||
{ kEventClassWindow, kEventWindowBoundsChanged },
|
||||
|
||||
//{ kEventClassWindow, kEventWindowHidden },
|
||||
//{ kEventClassWindow, kEventWindowCollapse },
|
||||
{ kEventClassWindow, kEventWindowCollapsed },
|
||||
{ kEventClassWindow, kEventWindowExpanded },
|
||||
{ kEventClassWindow, kEventWindowZoomed },
|
||||
//{ kEventClassWindow, kEventWindowDragStarted },
|
||||
//{ kEventClassWindow, kEventWindowDragCompleted },
|
||||
//{ kEventClassWindow, kEventWindowTransitionCompleted },
|
||||
{ kEventClassWindow, kEventWindowClosed },
|
||||
|
||||
/*
|
||||
{ kEventClassWindow, kEventWindowClickDragRgn },
|
||||
{ kEventClassWindow, kEventWindowClickResizeRgn },
|
||||
{ kEventClassWindow, kEventWindowClickCollapseRgn },
|
||||
{ kEventClassWindow, kEventWindowClickCloseRgn },
|
||||
{ kEventClassWindow, kEventWindowClickZoomRgn },
|
||||
{ kEventClassWindow, kEventWindowClickContentRgn },
|
||||
{ kEventClassWindow, kEventWindowClickProxyIconRgn },
|
||||
{ kEventClassWindow, kEventWindowClickToolbarButtonRgn },
|
||||
{ kEventClassWindow, kEventWindowClickStructureRgn },
|
||||
*/
|
||||
|
||||
// { kEventClassMouse, kEventMouseDown },// handle trackball functionality globaly because there is only a single user
|
||||
// { kEventClassMouse, kEventMouseUp },
|
||||
// { kEventClassMouse, kEventMouseMoved },
|
||||
// { kEventClassMouse, kEventMouseDragged },
|
||||
// { kEventClassMouse, kEventMouseWheelMoved } ,
|
||||
|
||||
|
||||
// { kEventClassKeyboard, kEventRawKeyDown },
|
||||
// { kEventClassKeyboard, kEventRawKeyUp } ,
|
||||
// { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
|
||||
// {kEventClassTextInput, kEventTextInputUnicodeForKeyEvent},
|
||||
|
||||
|
||||
};
|
||||
|
||||
SetWRefCon (_osx_window, (long) this); // point to the window record in the ref con of the window
|
||||
@ -1056,9 +1056,9 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
InstallWindowEventHandler (_osx_window, gWinEvtHandler, GetEventTypeCount (list), list, (void*)this, NULL); // add event handler
|
||||
ShowWindow (_osx_window);
|
||||
|
||||
if(buildGL(false) != noErr)
|
||||
{
|
||||
osxdisplay_cat.error() << " Errror In Generate GL \n";
|
||||
if(buildGL(false) != noErr) {
|
||||
osxdisplay_cat.error()
|
||||
<< " Error In Generate GL \n";
|
||||
|
||||
HideWindow (_osx_window);
|
||||
SetWRefCon (_osx_window, (long int) NULL);
|
||||
@ -1067,36 +1067,21 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
return false;
|
||||
}
|
||||
|
||||
// GrafPtr portSave = NULL;
|
||||
// GetPort (&portSave);
|
||||
// SetPort ((GrafPtr) GetWindowPort (_osx_window));
|
||||
|
||||
//
|
||||
// atach the holder context to the window..
|
||||
//
|
||||
if(!aglSetDrawable(_holder_aglcontext, GetWindowPort (_osx_window)))
|
||||
if (!aglSetDrawable(_holder_aglcontext, GetWindowPort (_osx_window))) {
|
||||
err = aglReportError ("aglSetDrawable");
|
||||
}
|
||||
|
||||
// if (!aglSetCurrentContext(get_context()))
|
||||
// err = aglReportError ("aglSetCurrentContext");
|
||||
|
||||
// VBL SYNC
|
||||
// GLint swap = 1;
|
||||
// if (!aglSetInteger (get_context(), AGL_SWAP_INTERVAL, &swap))
|
||||
// aglReportError ();
|
||||
|
||||
// SetPort (portSave);
|
||||
if(req_properties.has_fullscreen())
|
||||
{
|
||||
if (req_properties.has_fullscreen()) {
|
||||
_properties.set_fullscreen(false);
|
||||
req_properties.clear_fullscreen();
|
||||
}
|
||||
if(req_properties.has_undecorated())
|
||||
{
|
||||
if (req_properties.has_undecorated()) {
|
||||
_properties.set_undecorated(req_properties.get_undecorated());
|
||||
req_properties.clear_undecorated();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Now measure the size and placement of the window we
|
||||
@ -1108,6 +1093,10 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
req_properties.clear_origin();
|
||||
}
|
||||
|
||||
if (req_properties.has_icon_filename()) {
|
||||
set_icon_filename(req_properties.get_icon_filename());
|
||||
}
|
||||
|
||||
_properties.set_foreground(true);
|
||||
_properties.set_minimized(false);
|
||||
_properties.set_open(true);
|
||||
@ -1117,10 +1106,9 @@ bool osxGraphicsWindow::OSOpenWindow(WindowProperties &req_properties )
|
||||
_properties.get_y_size());
|
||||
}
|
||||
|
||||
// cerr << " Generate Output Properties "<< _properties <<"\n";
|
||||
|
||||
return (err == noErr);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: osxGraphicsWindow::process_events()
|
||||
// Access: virtual, protected
|
||||
@ -1271,7 +1259,7 @@ void osxGraphicsWindow::SystemSetWindowForground(bool forground)
|
||||
// Mac OS X v10.1 and later
|
||||
// should this be front window???
|
||||
GetEventParameter(event, kEventParamWindowRef, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
|
||||
if(!_is_fullsreen && (window == NULL || window != _osx_window ))
|
||||
if(!_is_fullscreen && (window == NULL || window != _osx_window ))
|
||||
return eventNotHandledErr;
|
||||
|
||||
|
||||
@ -1618,53 +1606,27 @@ bool osxGraphicsWindow::do_reshape_request(int x_origin, int y_origin, bool has_
|
||||
////////////////////////////////////////////////////////////////////
|
||||
void osxGraphicsWindow::set_properties_now(WindowProperties &properties)
|
||||
{
|
||||
// if (osxdisplay_cat.is_debug())
|
||||
// cerr<< "-------------------------------------set_properties_now in Request=[" <<properties <<"]\n";
|
||||
|
||||
// ok dork with open flag
|
||||
//
|
||||
|
||||
if (osxdisplay_cat.is_debug())
|
||||
{
|
||||
osxdisplay_cat.debug() << "------------------------------------------------------\n";
|
||||
osxdisplay_cat.debug() << "set_properties_now " << properties << "\n";
|
||||
if (osxdisplay_cat.is_debug()) {
|
||||
osxdisplay_cat.debug()
|
||||
<< "------------------------------------------------------\n";
|
||||
osxdisplay_cat.debug()
|
||||
<< "set_properties_now " << properties << "\n";
|
||||
}
|
||||
|
||||
GraphicsWindow::set_properties_now(properties);
|
||||
|
||||
if (osxdisplay_cat.is_debug())
|
||||
osxdisplay_cat.debug() << "set_properties_now After Base Class" << properties << "\n";
|
||||
|
||||
|
||||
// if(_osx_window == NULL)
|
||||
// {
|
||||
// cerr<< "-------------------------------------set_properties_now out(not Window) Request=[" <<properties <<"]\n";
|
||||
// return;
|
||||
// }
|
||||
|
||||
// open is weird..
|
||||
// looks like it is a bad thing to muck
|
||||
//
|
||||
/*
|
||||
if(properties.has_open())
|
||||
{
|
||||
printf(" properties Has Open Flag \n");
|
||||
// _properties.set_open(properties.get_open());
|
||||
properties.clear_open();
|
||||
if (osxdisplay_cat.is_debug()) {
|
||||
osxdisplay_cat.debug()
|
||||
<< "set_properties_now After Base Class" << properties << "\n";
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
// this will set the main title on the crome of the window
|
||||
//
|
||||
|
||||
// for some changes .. a full rebuild is required for the OS layer Window.
|
||||
// I think it is the crome atribute and full screen behaviour.
|
||||
bool need_full_rebuild = false;
|
||||
|
||||
// if we are not full and transitioning o full
|
||||
if (properties.has_fullscreen() && properties.get_fullscreen() != _properties.get_fullscreen())
|
||||
{
|
||||
// if we are not full and transitioning to full
|
||||
if (properties.has_fullscreen() &&
|
||||
properties.get_fullscreen() != _properties.get_fullscreen()) {
|
||||
need_full_rebuild = true;
|
||||
}
|
||||
|
||||
@ -1676,19 +1638,13 @@ void osxGraphicsWindow::set_properties_now(WindowProperties &properties)
|
||||
need_full_rebuild = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(need_full_rebuild)
|
||||
{
|
||||
if (need_full_rebuild) {
|
||||
// Logic here is .. take a union of the properties .. with the
|
||||
// new allowed to overwrite the old states. and start a bootstrap
|
||||
// of a new window ..
|
||||
|
||||
// get a copy of my properties..
|
||||
WindowProperties req_properties(_properties);
|
||||
// cerr<< "-------------------------------------Lets Go Full Rebuild Request=[" <<properties <<"]\n";
|
||||
ReleaseSystemResources();
|
||||
req_properties.add_properties(properties);
|
||||
|
||||
@ -1696,35 +1652,34 @@ void osxGraphicsWindow::set_properties_now(WindowProperties &properties)
|
||||
|
||||
// Now we've handled all of the requested properties.
|
||||
properties.clear();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if(properties.has_title())
|
||||
{
|
||||
if (properties.has_title()) {
|
||||
_properties.set_title(properties.get_title());
|
||||
if(_osx_window)
|
||||
SetWindowTitleWithCFString(_osx_window,CFStringCreateWithCString(NULL,properties.get_title().c_str(),kCFStringEncodingMacRoman));
|
||||
if (_osx_window) {
|
||||
SetWindowTitleWithCFString(_osx_window,
|
||||
CFStringCreateWithCString(NULL,properties.get_title().c_str(),
|
||||
kCFStringEncodingMacRoman));
|
||||
}
|
||||
properties.clear_title();
|
||||
}
|
||||
|
||||
// An icon filename means to load up the icon and save it. We can't
|
||||
// necessarily apply it immediately; it will get applied later, in
|
||||
// the window event handler.
|
||||
if (properties.has_icon_filename()) {
|
||||
if (set_icon_filename(properties.get_icon_filename())) {
|
||||
properties.clear_icon_filename();
|
||||
}
|
||||
}
|
||||
|
||||
// decorated .. if this changes it reqires a new window
|
||||
if(properties.has_undecorated())
|
||||
{
|
||||
if (properties.has_undecorated()) {
|
||||
_properties.set_undecorated(properties.get_undecorated());
|
||||
properties.clear_undecorated();
|
||||
}
|
||||
|
||||
// cursor managment..
|
||||
//if(properties.has_cursor_hidden())
|
||||
//{
|
||||
// _properties.set_cursor_hidden(properties.get_cursor_hidden());
|
||||
// properties.clear_cursor_hidden();
|
||||
// }
|
||||
|
||||
if(properties.has_cursor_hidden())
|
||||
{
|
||||
if (properties.has_cursor_hidden()) {
|
||||
_properties.set_cursor_hidden(properties.get_cursor_hidden());
|
||||
if (properties.get_cursor_hidden()) {
|
||||
CGDisplayHideCursor(kCGDirectMainDisplay);
|
||||
@ -1734,10 +1689,10 @@ if(properties.has_cursor_hidden())
|
||||
properties.clear_cursor_hidden();
|
||||
}
|
||||
|
||||
|
||||
// cerr<< "-------------------------------------- out request=[" <<properties <<"]\n";
|
||||
if (osxdisplay_cat.is_debug())
|
||||
osxdisplay_cat.debug() << "set_properties_now Out....." << _properties << "\n";
|
||||
if (osxdisplay_cat.is_debug()) {
|
||||
osxdisplay_cat.debug()
|
||||
<< "set_properties_now Out....." << _properties << "\n";
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@ -15,19 +15,17 @@
|
||||
|
||||
#ifndef OSXGRAPHICSWINDOW_H
|
||||
#define OSXGRAPHICSWINDOW_H
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
|
||||
#define __glext_h_
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#include <AGL/agl.h>
|
||||
|
||||
|
||||
#include "pandabase.h"
|
||||
#include "graphicsWindow.h"
|
||||
#include "buttonHandle.h"
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
#define __glext_h_
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
#include <AGL/agl.h>
|
||||
|
||||
#define HACK_SCREEN_HASH_CONTEXT true
|
||||
OSStatus aglReportError (const std::string &);
|
||||
@ -101,20 +99,15 @@ public: // do not call direct ..
|
||||
AGLContext get_ggs_context(void);
|
||||
AGLContext get_context(void);
|
||||
OSStatus buildGL(bool full_screen);
|
||||
bool set_icon_filename(const Filename &icon_filename);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// WindowProperties & properties() { return _properties; };
|
||||
private:
|
||||
public:
|
||||
UInt32 _last_key_modifiers;
|
||||
WindowRef _osx_window;
|
||||
bool _is_fullsreen;
|
||||
bool _is_fullscreen;
|
||||
|
||||
CGImageRef _pending_icon;
|
||||
CGImageRef _current_icon;
|
||||
|
||||
int _ID;
|
||||
static osxGraphicsWindow *FullScreenWindow;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user