X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c978d36124197b5612a2cabefed7591ad0eea6e2..7fe1a8b5a92c3254739b792247c8839d0087a23a:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 214d4554f7..9659dc351c 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -97,11 +97,8 @@ bool wxMask::Create( const wxBitmap& bitmap, m_display = bitmap.GetDisplay(); Display *xdisplay = (Display*) m_display; - int xscreen = DefaultScreen( xdisplay ); Window xroot = RootWindow( xdisplay, xscreen ); - Visual* xvisual = DefaultVisual( xdisplay, xscreen ); - int bpp = DefaultDepth( xdisplay, xscreen ); m_bitmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, image.GetWidth(), image.GetHeight(), 1 ); GC gc = XCreateGC( xdisplay, (Pixmap) m_bitmap, 0, NULL ); @@ -117,18 +114,8 @@ bool wxMask::Create( const wxBitmap& bitmap, unsigned char green = colour.Green(); unsigned char blue = colour.Blue(); - XVisualInfo vinfo_template; - XVisualInfo *vi; - - vinfo_template.visual = xvisual; - vinfo_template.visualid = XVisualIDFromVisual( xvisual ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxASSERT_MSG( vi, wxT("No visual info") ); + int bpp = wxTheApp->m_visualDepth; - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; if (bpp == 15) { red = red & 0xf8; @@ -150,11 +137,13 @@ bool wxMask::Create( const wxBitmap& bitmap, XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) ); - for (int j = 0; j < image.GetHeight(); j++) + int width = image.GetWidth(); + int height = image.GetHeight(); + for (int j = 0; j < height; j++) { int start_x = -1; int i; - for (i = 0; i < image.GetWidth(); i++) + for (i = 0; i < width; i++) { if ((data[index] == red) && (data[index+1] == green) && @@ -538,7 +527,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) Window xroot = RootWindow( xdisplay, xscreen ); Visual* xvisual = DefaultVisual( xdisplay, xscreen ); - int bpp = DefaultDepth( xdisplay, xscreen ); + int bpp = wxTheApp->m_visualDepth; int width = image.GetWidth(); int height = image.GetHeight(); @@ -588,20 +577,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) SetMask( mask ); } - // Retrieve info - - XVisualInfo vinfo_template; - XVisualInfo *vi; - - vinfo_template.visual = xvisual; - vinfo_template.visualid = XVisualIDFromVisual( xvisual ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxASSERT_MSG( vi, wxT("No visual info") ); - - if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; if (bpp < 8) bpp = 8; // Render @@ -611,22 +586,22 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (bpp > 8) { - if ((vi->red_mask > vi->green_mask) && (vi->green_mask > vi->blue_mask)) b_o = RGB; - else if ((vi->red_mask > vi->blue_mask) && (vi->blue_mask > vi->green_mask)) b_o = RBG; - else if ((vi->blue_mask > vi->red_mask) && (vi->red_mask > vi->green_mask)) b_o = BRG; - else if ((vi->blue_mask > vi->green_mask) && (vi->green_mask > vi->red_mask)) b_o = BGR; - else if ((vi->green_mask > vi->red_mask) && (vi->red_mask > vi->blue_mask)) b_o = GRB; - else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask)) b_o = GBR; + if ((wxTheApp->m_visualRedMask > wxTheApp->m_visualGreenMask) && (wxTheApp->m_visualGreenMask > wxTheApp->m_visualBlueMask)) b_o = RGB; + else if ((wxTheApp->m_visualRedMask > wxTheApp->m_visualBlueMask) && (wxTheApp->m_visualBlueMask > wxTheApp->m_visualGreenMask)) b_o = RBG; + else if ((wxTheApp->m_visualBlueMask > wxTheApp->m_visualRedMask) && (wxTheApp->m_visualRedMask > wxTheApp->m_visualGreenMask)) b_o = BRG; + else if ((wxTheApp->m_visualBlueMask > wxTheApp->m_visualGreenMask) && (wxTheApp->m_visualGreenMask > wxTheApp->m_visualRedMask)) b_o = BGR; + else if ((wxTheApp->m_visualGreenMask > wxTheApp->m_visualRedMask) && (wxTheApp->m_visualRedMask > wxTheApp->m_visualBlueMask)) b_o = GRB; + else if ((wxTheApp->m_visualGreenMask > wxTheApp->m_visualBlueMask) && (wxTheApp->m_visualBlueMask > wxTheApp->m_visualRedMask)) b_o = GBR; } - XFree( vi ); - int r_mask = image.GetMaskRed(); int g_mask = image.GetMaskGreen(); int b_mask = image.GetMaskBlue(); unsigned char* data = image.GetData(); wxASSERT_MSG( data, "No image data" ); + + unsigned char *colorCube = wxTheApp->m_colorCube; bool hasMask = image.HasMask(); @@ -655,27 +630,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) case 8: { int pixel = 0; -#if 0 - if (wxTheApp->m_colorCube) - { - pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; - } - else - { - GdkColormap *cmap = gtk_widget_get_default_colormap(); - GdkColor *colors = cmap->colors; - int max = 3 * (65536); - - for (int i = 0; i < cmap->size; i++) - { - int rdiff = (r << 8) - colors[i].red; - int gdiff = (g << 8) - colors[i].green; - int bdiff = (b << 8) - colors[i].blue; - int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); - if (sum < max) { pixel = i; max = sum; } - } - } -#endif + pixel = colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ]; XPutPixel( data_image, x, y, pixel ); break; } @@ -750,10 +705,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) GC gc = XCreateGC( xdisplay, (Pixmap) M_BMPDATA->m_pixmap, 0, NULL ); XPutImage( xdisplay, (Pixmap) M_BMPDATA->m_pixmap, gc, data_image, 0, 0, 0, 0, width, height ); -#ifdef __WXDEBUG__ - XSync(wxGlobalDisplay(), False); -#endif - XDestroyImage( data_image ); XFreeGC( xdisplay, gc ); @@ -774,24 +725,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) // wxUSE_NANOX } -static void wxCalcPrecAndShift( unsigned long mask, int *shift, int *prec ) -{ - *shift = 0; - *prec = 0; - - while (!(mask & 0x1)) - { - (*shift)++; - mask >>= 1; - } - - while (mask & 0x1) - { - (*prec)++; - mask >>= 1; - } -} - wxImage wxBitmap::ConvertToImage() const { wxImage image; @@ -800,17 +733,14 @@ wxImage wxBitmap::ConvertToImage() const Display *xdisplay = (Display*) M_BMPDATA->m_display; wxASSERT_MSG( xdisplay, wxT("No display") ); - - int xscreen = DefaultScreen( xdisplay ); - Visual* xvisual = DefaultVisual( xdisplay, xscreen ); - - int bpp = DefaultDepth( xdisplay, xscreen ); #if wxUSE_NANOX + //int bpp = DefaultDepth(xdisplay, xscreen); wxGetImageFromDrawable((Pixmap) GetPixmap(), 0, 0, GetWidth(), GetHeight(), image); return image; #else // !wxUSE_NANOX + int bpp = wxTheApp->m_visualDepth; XImage *x_image = NULL; if (GetPixmap()) { @@ -863,53 +793,29 @@ wxImage wxBitmap::ConvertToImage() const if (GetPixmap()) { - // Retrieve info - - XVisualInfo vinfo_template; - XVisualInfo *vi; - - vinfo_template.visual = xvisual; - vinfo_template.visualid = XVisualIDFromVisual( xvisual ); - vinfo_template.depth = bpp; - int nitem = 0; - - vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxASSERT_MSG( vi, wxT("No visual info") ); - - int red_prec,green_prec,blue_prec; - int red_shift,green_shift,blue_shift; - wxCalcPrecAndShift( vi->red_mask, &red_shift, &red_prec ); - wxCalcPrecAndShift( vi->green_mask, &green_shift, &green_prec ); - wxCalcPrecAndShift( vi->blue_mask, &blue_shift, &blue_prec ); - if (bpp == 16) bpp = red_prec + green_prec + blue_prec; - - red_shift_right = red_shift; - red_shift_left = 8-red_prec; - green_shift_right = green_shift; - green_shift_left = 8-green_prec; - blue_shift_right = blue_shift; - blue_shift_left = 8-blue_prec; - -#if 0 - use_shift = (vi->visual->c_class == TrueColor) || (vi->visual->c_class == DirectColor); -#else - use_shift = TRUE; -#endif + red_shift_right = wxTheApp->m_visualRedShift; + red_shift_left = 8-wxTheApp->m_visualRedPrec; + green_shift_right = wxTheApp->m_visualGreenShift; + green_shift_left = 8-wxTheApp->m_visualGreenPrec; + blue_shift_right = wxTheApp->m_visualBlueShift; + blue_shift_left = 8-wxTheApp->m_visualBluePrec; - XFree( vi ); + use_shift = (wxTheApp->m_visualType == GrayScale) || (wxTheApp->m_visualType != PseudoColor); } + if (GetBitmap()) { bpp = 1; } + XColor *colors = (XColor*) wxTheApp->m_visualColormap; -// GdkColormap *cmap = gtk_widget_get_default_colormap(); - + int width = GetWidth(); + int height = GetHeight(); long pos = 0; - for (int j = 0; j < GetHeight(); j++) + for (int j = 0; j < height; j++) { - for (int i = 0; i < GetWidth(); i++) + for (int i = 0; i < width; i++) { unsigned long pixel = XGetPixel( x_image, i, j ); if (bpp == 1) @@ -933,14 +839,12 @@ wxImage wxBitmap::ConvertToImage() const data[pos+1] = (pixel >> green_shift_right) << green_shift_left; data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left; } -#if 0 - else if (cmap->colors) + else if (colors) { - data[pos] = cmap->colors[pixel].red >> 8; - data[pos+1] = cmap->colors[pixel].green >> 8; - data[pos+2] = cmap->colors[pixel].blue >> 8; + data[pos] = colors[pixel].red >> 8; + data[pos+1] = colors[pixel].green >> 8; + data[pos+2] = colors[pixel].blue >> 8; } -#endif else { wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") );