X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0253070f52291f447076837bf1311195135bb95..b75867a61bad7efdce7ab11963a3672ce78a1e35:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 6337f7dc21..65db013776 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -19,12 +19,21 @@ #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" +#if wxUSE_WX_RESOURCES #include "wx/resource.h" +#endif #include "wx/module.h" #include "wx/image.h" - +#if wxUSE_THREADS +#include "wx/thread.h" +#endif #include "unistd.h" +#include "glib.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" +#include "wx/gtk/win_gtk.h" + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- @@ -137,7 +146,13 @@ END_EVENT_TABLE() gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { if (wxTheApp) while (wxTheApp->ProcessIdle()) {} - usleep( 10000 ); +#if wxUSE_THREADS + wxMutexGuiLeave(); +#endif + usleep(10000); +#if wxUSE_THREADS + wxMutexGuiEnter(); +#endif return TRUE; } @@ -146,22 +161,93 @@ wxApp::wxApp() m_idleTag = 0; m_topWindow = (wxWindow *) NULL; m_exitOnFrameDelete = TRUE; + m_colorCube = (unsigned char*) NULL; wxTheApp = this; } wxApp::~wxApp(void) { gtk_idle_remove( m_idleTag ); + + if (m_colorCube) free(m_colorCube); } -bool wxApp::OnInit(void) +bool wxApp::InitVisual() { + /* Nothing to do for 15, 16, 24, 32 bit displays */ + + GdkVisual *visual = gdk_visual_get_system(); + if (visual->depth > 8) return TRUE; + + /* this initiates the standard palette as defined by GdkImlib + in the GNOME libraries. it ensures that all GNOME applications + use the same 64 colormap entries on 8-bit displays so you + can use several rather graphics-heavy applications at the + same time */ + + /* + GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); + + for (int i = 0; i < 64; i++) + { + GdkColor col; + col.red = g_palette[i*3 + 0] << 8; + col.green = g_palette[i*3 + 1] << 8; + col.blue = g_palette[i*3 + 2] << 8; + col.pixel = 0; + + gdk_color_alloc( cmap, &col ); + } + + gtk_widget_set_default_colormap( cmap ); + */ + + /* initialize color cube for 8-bit color reduction dithering */ + + GdkColormap *cmap = gtk_widget_get_default_colormap(); + + m_colorCube = (unsigned char*)malloc(32 * 32 * 32); + + for (int r = 0; r < 32; r++) + { + for (int g = 0; g < 32; g++) + { + for (int b = 0; b < 32; b++) + { + int rr = (r << 3) | (r >> 2); + int gg = (g << 3) | (g >> 2); + int bb = (b << 3) | (b >> 2); + + GdkColor *colors = cmap->colors; + int max = 3 * (65536); + int index = -1; + + for (int i = 0; i < cmap->size; i++) + { + int rdiff = ((rr << 8) - colors[i].red); + int gdiff = ((gg << 8)- colors[i].green); + int bdiff = ((bb << 8)- colors[i].blue); + int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); + if (sum < max) { index = i; max = sum; } + } + + m_colorCube[ (r*1024) + (g*32) + b ] = index; + } + } + } + return TRUE; } bool wxApp::OnInitGui(void) { m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); + + return TRUE; +} + +bool wxApp::OnInit(void) +{ return TRUE; } @@ -183,21 +269,21 @@ void wxApp::OnIdle( wxIdleEvent &event ) { static bool inOnIdle = FALSE; - // Avoid recursion (via ProcessEvent default case) + /* Avoid recursion (via ProcessEvent default case) */ if (inOnIdle) return; inOnIdle = TRUE; - // 'Garbage' collection of windows deleted with Close(). + /* 'Garbage' collection of windows deleted with Close(). */ DeletePendingObjects(); - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if (pLog != NULL && pLog->HasPendingMessages()) - pLog->Flush(); + /* flush the logged messages if any */ + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); - // Send OnIdle events to all windows + /* Send OnIdle events to all windows */ bool needMore = SendIdleEvents(); if (needMore) @@ -213,8 +299,8 @@ bool wxApp::SendIdleEvents(void) wxNode* node = wxTopLevelWindows.First(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) + wxWindow* win = (wxWindow*) node->Data(); + if (SendIdleEvents(win)) needMore = TRUE; node = node->Next(); } @@ -305,15 +391,8 @@ void wxApp::SetTopWindow( wxWindow *win ) void wxApp::CommonInit(void) { - -/* -#if wxUSE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); -#endif -*/ wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - + wxTheFontNameDirectory = new wxFontNameDirectory; wxTheFontNameDirectory->Initialize(); @@ -323,7 +402,11 @@ void wxApp::CommonInit(void) wxInitializeStockLists(); wxInitializeStockObjects(); +#if wxUSE_WX_RESOURCES + wxTheResourceCache = new wxResourceCache(wxKEY_STRING); + wxInitializeResourceSystem(); +#endif wxImage::InitStandardHandlers(); @@ -332,18 +415,25 @@ void wxApp::CommonInit(void) void wxApp::CommonCleanUp(void) { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxTheFontNameDirectory); + if (wxTheColourDatabase) delete wxTheColourDatabase; + wxTheColourDatabase = (wxColourDatabase*) NULL; + + if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; + wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; + wxDeleteStockObjects(); +#if wxUSE_WX_RESOURCES wxFlushResources(); - wxDELETE(wxTheResourceCache); + if (wxTheResourceCache) delete wxTheResourceCache; + wxTheResourceCache = (wxResourceCache*) NULL; + + wxCleanUpResourceSystem(); +#endif wxDeleteStockLists(); - wxCleanUpResourceSystem(); - wxImage::CleanUpHandlers(); wxSystemSettings::Done(); @@ -364,14 +454,6 @@ int wxEntry( int argc, char *argv[] ) wxClassInfo::InitializeClasses(); - /* Debug stream no longer used -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); -#endif -*/ if (!wxTheApp) { @@ -407,30 +489,15 @@ int wxEntry( int argc, char *argv[] ) gtk_init( &argc, &argv ); - GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); - - for (int i = 0; i < 64; i++) - { - GdkColor col; - col.red = g_palette[i*3 + 0] << 8; - col.green = g_palette[i*3 + 1] << 8; - col.blue = g_palette[i*3 + 2] << 8; - col.pixel = 0; - - gdk_color_alloc( cmap, &col ); - } - - gtk_widget_push_colormap( cmap ); - - gtk_widget_set_default_colormap( cmap ); + if (!wxTheApp->InitVisual()) return 0; wxApp::CommonInit(); + if (!wxTheApp->OnInitGui()) return 0; + wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; - - wxTheApp->OnInitGui(); - + // Here frames insert themselves automatically // into wxTopLevelWindows by getting created // in OnInit(). @@ -466,18 +533,12 @@ int wxEntry( int argc, char *argv[] ) wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } -// wxDebugContext::SetStream(NULL, NULL); #endif - wxLog *oldLog = wxLog::SetActiveTarget( NULL ); + wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); if (oldLog) delete oldLog; return retValue; } -//----------------------------------------------------------------------------- - - - -