Attachment 299075 Details for Bug 438910 – patch

[patch] patch

openMotif-2.3.0-motifzone_1400.patch (text/plain), 5.48 KB, created by ritz on 2008-03-25 21:47:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ritz

Created: 2008-03-25 21:47:27 UTC

Size: 5.48 KB

patch

obsolete

>*** openmotif-2.3.0/lib/Xm/XmP.h.close-display	Mon Nov 14 09:38:28 2005
>--- openmotif-2.3.0/lib/Xm/XmP.h	Tue Jan  1 09:51:05 2008
>***************
>*** 1293,1298 ****
>--- 1293,1300 ----
>  extern Boolean XmeNamesAreEqual(
>          register char *in_str,
>          register char *test_str );
>+ extern void XmeReleaseDisplayDefaults( Display* display );
>+ 
>      /* Primitive.c */
>  extern void XmeResolvePartOffsets(
>  			WidgetClass w_class,
>*** openmotif-2.3.0/lib/Xm/ResConvert.c.close-display	Mon Jan 16 10:56:23 2006
>--- openmotif-2.3.0/lib/Xm/ResConvert.c	Tue Jan  1 14:56:13 2008
>***************
>*** 1698,1753 ****
>   *   specifyRenderTable trait.
>   *
>   *************************************************************************/
>  typedef struct _system_font_list
>  {
>      Display	*display;
>      XmFontList	 fontlist;
>  } SystemFontList;
>  
>  static XmFontList DefaultSystemFontList(Display *display, XmFontList fontlist)
>  {
>!     static SystemFontList	*sFontLists = NULL;
>!     static int			 nsFontLists = 0;
>!     static int			 maxnsFontLists = 0;
>  
>      if (fontlist)
>      {
>! 	if (nsFontLists >= maxnsFontLists)
>  	{
>  	    Cardinal nbytes;
>  
>! 	    maxnsFontLists += 8;
>! 	    nbytes = (Cardinal) sizeof(SystemFontList)*maxnsFontLists;
>! 	    if (NULL == sFontLists)
>  	    {
>! 	        sFontLists = (SystemFontList*) XtMalloc(nbytes);
>! 		memset((void*) sFontLists, 0, nbytes);
>  	    }
>  	    else
>  	    {
>! 	        sFontLists =
>! 		  (SystemFontList*) XtRealloc((char*) sFontLists, nbytes);
>! 		memset((void*) &sFontLists[nsFontLists], 0, nbytes);
>  	    }
>- 	    sFontLists[nsFontLists].display = display;
>- 	    sFontLists[nsFontLists].fontlist = fontlist;
>- 	    nsFontLists++;
>  	}
>      }
>      else
>      {
>  	int i;
>! 	if (NULL == sFontLists) return NULL;
>  
>! 	for (i=0; i<nsFontLists; i++)
>  	{
>! 	    if (sFontLists[i].display == display)
>! 	      return sFontLists[i].fontlist;
>  	}
>      }
>      return NULL;
>  }
>  
>  XmFontList 
>  XmeGetDefaultRenderTable(
>          Widget w,
>--- 1698,1799 ----
>   *   specifyRenderTable trait.
>   *
>   *************************************************************************/
>+ 
>+ 
>  typedef struct _system_font_list
>  {
>      Display	*display;
>      XmFontList	 fontlist;
>  } SystemFontList;
>  
>+ static SystemFontList	*sFontLists_SFL = NULL;
>+ static int		nsFontLists_SFL = 0;
>+ static int		maxnsFontLists_SFL = 0;
>+ 
>+ static void ReleaseSystemFontList(Display* display)
>+ {
>+   int i;
>+     if (NULL == sFontLists_SFL) return;
>+     for (i=0; i<nsFontLists_SFL; i++)
>+     {
>+       if (sFontLists_SFL[i].display == display)
>+       {
>+         int lfi = nsFontLists_SFL - 1;
>+         XmFontList fontlist = sFontLists_SFL[i].fontlist;
>+         XmFontContext font_context;
>+         int need_free_check = 1;
>+ 
>+         if (lfi != i)
>+         {
>+           sFontLists_SFL[i] = sFontLists_SFL[lfi];
>+         }
>+         --nsFontLists_SFL;
>+ 
>+         while (need_free_check && XmFontListInitFontContext(&font_context, fontlist)) {
>+           XmFontListEntry fl_entry = XmFontListNextEntry(font_context);
>+           XmFontListFreeFontContext(font_context);
>+           if (fl_entry) {
>+             fontlist = XmFontListRemoveEntry(fontlist, fl_entry);
>+           } else {
>+             need_free_check = 0;
>+           }
>+         }
>+         if (fontlist) {
>+           XmFontListFree(fontlist);
>+         }
>+         break;
>+       }
>+     }
>+ }
>+ 
>  static XmFontList DefaultSystemFontList(Display *display, XmFontList fontlist)
>  {
>!     struct _XDisplay* xdisplay = (struct _XDisplay*)display;
>  
>      if (fontlist)
>      {
>! 	if (nsFontLists_SFL >= maxnsFontLists_SFL)
>  	{
>  	    Cardinal nbytes;
>  
>! 	    maxnsFontLists_SFL += 8;
>! 	    nbytes = (Cardinal) sizeof(SystemFontList)*maxnsFontLists_SFL;
>! 	    if (NULL == sFontLists_SFL)
>  	    {
>! 	        sFontLists_SFL = (SystemFontList*) XtMalloc(nbytes);
>! 		memset((void*) sFontLists_SFL, 0, nbytes);
>  	    }
>  	    else
>  	    {
>! 	        sFontLists_SFL =
>! 		  (SystemFontList*) XtRealloc((char*) sFontLists_SFL, nbytes);
>! 		memset((void*) &sFontLists_SFL[nsFontLists_SFL], 0, nbytes);
>  	    }
>  	}
>+ 	sFontLists_SFL[nsFontLists_SFL].display = display;
>+ 	sFontLists_SFL[nsFontLists_SFL].fontlist = fontlist;
>+ 	nsFontLists_SFL++;
>      }
>      else
>      {
>  	int i;
>! 	if (NULL == sFontLists_SFL) return NULL;
>  
>! 	for (i=0; i<nsFontLists_SFL; i++)
>  	{
>! 	    if (sFontLists_SFL[i].display == display)
>! 	      return sFontLists_SFL[i].fontlist;
>  	}
>      }
>      return NULL;
>  }
>  
>+ void
>+ XmeReleaseDisplayDefaults(Display* display)
>+ {
>+   ReleaseSystemFontList(display);
>+ }
>+ 
>  XmFontList 
>  XmeGetDefaultRenderTable(
>          Widget w,
>*** openmotif-2.3.0/lib/Xm/VendorS.c.close-display	Thu Nov 18 03:54:33 2004
>--- openmotif-2.3.0/lib/Xm/VendorS.c	Tue Jan  1 09:55:57 2008
>***************
>*** 1438,1443 ****
>--- 1438,1455 ----
>  
>  /************************************************************************
>   *
>+  *     XmeCloseDisplay
>+  *
>+  ************************************************************************/
>+ /*ARGSUSED*/
>+ static void
>+ CloseDisplay(Display* display)
>+ {
>+   XmeReleaseDisplayDefaults(display);
>+ }
>+ 
>+ /************************************************************************
>+  *
>   *     DisplayClosedCallback
>   *
>   ************************************************************************/
>***************
>*** 1450,1455 ****
>--- 1462,1471 ----
>  {
>    _XmProcessLock();
>    _XmDisplayHandle = NULL;
>+   if (shellParent)
>+   {
>+     CloseDisplay(XtDisplay(shellParent));
>+   }
>    _XmProcessUnlock();
>  }
>

Actions: View | Diff

Attachments on bug 438910: 299075 | 311045