Attachment #134677 for bug #197489

View | Details | Raw Unified | Return to bug 197489
Collapse All | Expand All




  visual = gdk_rgb_get_visual();
  id->x.visual = GDK_VISUAL_XVISUAL(visual);	/* the visual type */
  id->x.depth = visual->depth;	/* the depth of the screen in bpp */

  id->x.shm = 0;
  id->x.shmp = 0;
  id->max_shm = 0;
#ifdef HAVE_SHM
  if (XShmQueryExtension(id->x.disp))
    {

	      id->x.last_xim = NULL;
	      id->x.last_sxim = NULL;
	      id->max_shm = 0x7fffffff;
	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap) &&
		  (pm == True))
		id->x.shmp = 1;
	    }
	}
    }
  else
#endif

      id->x.shm = 0;
      id->x.shmp = 0;
    }
  id->cache.on_image = 0;
  id->cache.size_image = 0;
  id->cache.num_image = 0;

	}
      if (p->flags & PARAMS_SHAREDPIXMAPS)
	{
	  if (!p->sharedpixmaps)
	    id->x.shmp = 0;
	}
      if (p->flags & PARAMS_PALETTEOVERRIDE)
	override = p->paletteoverride;




  id->x.root = DefaultRootWindow(disp);		/* the root window id */
  id->x.visual = DefaultVisual(disp, id->x.screen);	/* the visual type */
  id->x.depth = DefaultDepth(disp, id->x.screen);	/* the depth of the screen in bpp */

  id->x.shm = 0;
  id->x.shmp = 0;
  id->max_shm = 0;
#ifdef HAVE_SHM
  if (XShmQueryExtension(id->x.disp))
    {

	      id->x.last_xim = NULL;
	      id->x.last_sxim = NULL;
	      id->max_shm = 0x7fffffff;
	      if ((XShmPixmapFormat(id->x.disp) == ZPixmap &&
		   (pm == True)))
		id->x.shmp = 1;
	    }
	}
    }
  else
#endif

      id->x.shm = 0;
      id->x.shmp = 0;
    }
  id->cache.on_image = 0;
  id->cache.size_image = 0;
  id->cache.num_image = 0;

	}
      if (p->flags & PARAMS_SHAREDPIXMAPS)
	{
	  if (!p->sharedpixmaps)
	    id->x.shmp = 0;
	}
      if (p->flags & PARAMS_PALETTEOVERRIDE)
	override = p->paletteoverride;

Return to bug 197489

Lines 674-679 gdk_imlib_init_params(GdkImlibInitParams Link Here

(-)imlib-1.9.15.orig/gdk_imlib/misc.c (-8 / +9 lines)
674	visual = gdk_rgb_get_visual();	674	visual = gdk_rgb_get_visual();
675	id->x.visual = GDK_VISUAL_XVISUAL(visual); /* the visual type */	675	id->x.visual = GDK_VISUAL_XVISUAL(visual); /* the visual type */
676	id->x.depth = visual->depth; /* the depth of the screen in bpp */	676	id->x.depth = visual->depth; /* the depth of the screen in bpp */
		677
		678	id->x.shm = 0;
		679	id->x.shmp = 0;
		680	id->max_shm = 0;
677	#ifdef HAVE_SHM	681	#ifdef HAVE_SHM
678	if (XShmQueryExtension(id->x.disp))	682	if (XShmQueryExtension(id->x.disp))
679	{	683	{
Lines 689-705 gdk_imlib_init_params(GdkImlibInitParams Link Here
689	id->x.last_xim = NULL;	693	id->x.last_xim = NULL;
690	id->x.last_sxim = NULL;	694	id->x.last_sxim = NULL;
691	id->max_shm = 0x7fffffff;	695	id->max_shm = 0x7fffffff;
692	if (XShmPixmapFormat(id->x.disp) == ZPixmap)	696	if ((XShmPixmapFormat(id->x.disp) == ZPixmap) &&
		697	(pm == True))
693	id->x.shmp = 1;	698	id->x.shmp = 1;
694	}	699	}
695	}	700	}
696	}	701	}
697	else
698	#endif	702	#endif
699	{	703
700	id->x.shm = 0;
701	id->x.shmp = 0;
702	}
703	id->cache.on_image = 0;	704	id->cache.on_image = 0;
704	id->cache.size_image = 0;	705	id->cache.size_image = 0;
705	id->cache.num_image = 0;	706	id->cache.num_image = 0;
Lines 935-942 gdk_imlib_init_params(GdkImlibInitParams Link Here
935	}	936	}
936	if (p->flags & PARAMS_SHAREDPIXMAPS)	937	if (p->flags & PARAMS_SHAREDPIXMAPS)
937	{	938	{
938	if (id->x.shm)	939	if (!p->sharedpixmaps)
939	id->x.shmp = p->sharedpixmaps;	940	id->x.shmp = 0;
940	}	941	}
941	if (p->flags & PARAMS_PALETTEOVERRIDE)	942	if (p->flags & PARAMS_PALETTEOVERRIDE)
942	override = p->paletteoverride;	943	override = p->paletteoverride;

Lines 675-680 Imlib_init_with_params(Display * disp, I Link Here

(-)imlib-1.9.15.orig/Imlib/misc.c (-8 / +9 lines)
675	id->x.root = DefaultRootWindow(disp); /* the root window id */	675	id->x.root = DefaultRootWindow(disp); /* the root window id */
676	id->x.visual = DefaultVisual(disp, id->x.screen); /* the visual type */	676	id->x.visual = DefaultVisual(disp, id->x.screen); /* the visual type */
677	id->x.depth = DefaultDepth(disp, id->x.screen); /* the depth of the screen in bpp */	677	id->x.depth = DefaultDepth(disp, id->x.screen); /* the depth of the screen in bpp */
		678
		679	id->x.shm = 0;
		680	id->x.shmp = 0;
		681	id->max_shm = 0;
678	#ifdef HAVE_SHM	682	#ifdef HAVE_SHM
679	if (XShmQueryExtension(id->x.disp))	683	if (XShmQueryExtension(id->x.disp))
680	{	684	{
Lines 690-706 Imlib_init_with_params(Display * disp, I Link Here
690	id->x.last_xim = NULL;	694	id->x.last_xim = NULL;
691	id->x.last_sxim = NULL;	695	id->x.last_sxim = NULL;
692	id->max_shm = 0x7fffffff;	696	id->max_shm = 0x7fffffff;
693	if (XShmPixmapFormat(id->x.disp) == ZPixmap)	697	if ((XShmPixmapFormat(id->x.disp) == ZPixmap &&
		698	(pm == True)))
694	id->x.shmp = 1;	699	id->x.shmp = 1;
695	}	700	}
696	}	701	}
697	}	702	}
698	else
699	#endif	703	#endif
700	{	704
701	id->x.shm = 0;
702	id->x.shmp = 0;
703	}
704	id->cache.on_image = 0;	705	id->cache.on_image = 0;
705	id->cache.size_image = 0;	706	id->cache.size_image = 0;
706	id->cache.num_image = 0;	707	id->cache.num_image = 0;
Lines 952-959 Imlib_init_with_params(Display * disp, I Link Here
952	}	953	}
953	if (p->flags & PARAMS_SHAREDPIXMAPS)	954	if (p->flags & PARAMS_SHAREDPIXMAPS)
954	{	955	{
955	if (id->x.shm)	956	if (!p->sharedpixmaps)
956	id->x.shmp = p->sharedpixmaps;	957	id->x.shmp = 0;
957	}	958	}
958	if (p->flags & PARAMS_PALETTEOVERRIDE)	959	if (p->flags & PARAMS_PALETTEOVERRIDE)
959	override = p->paletteoverride;	960	override = p->paletteoverride;