/[emacs]/emacs/src/xfns.c
ViewVC logotype

Diff of /emacs/src/xfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.588 by handa, Mon Jul 28 13:05:14 2003 UTC revision 1.589 by handa, Thu Jul 31 00:52:00 2003 UTC
# Line 623  x_create_bitmap_from_data (f, bits, widt Line 623  x_create_bitmap_from_data (f, bits, widt
623    
624    id = x_allocate_bitmap_record (f);    id = x_allocate_bitmap_record (f);
625    dpyinfo->bitmaps[id - 1].pixmap = bitmap;    dpyinfo->bitmaps[id - 1].pixmap = bitmap;
626      dpyinfo->bitmaps[id - 1].have_mask = 0;
627    dpyinfo->bitmaps[id - 1].file = NULL;    dpyinfo->bitmaps[id - 1].file = NULL;
628    dpyinfo->bitmaps[id - 1].refcount = 1;    dpyinfo->bitmaps[id - 1].refcount = 1;
629    dpyinfo->bitmaps[id - 1].depth = 1;    dpyinfo->bitmaps[id - 1].depth = 1;
# Line 674  x_create_bitmap_from_file (f, file) Line 675  x_create_bitmap_from_file (f, file)
675    
676    id = x_allocate_bitmap_record (f);    id = x_allocate_bitmap_record (f);
677    dpyinfo->bitmaps[id - 1].pixmap = bitmap;    dpyinfo->bitmaps[id - 1].pixmap = bitmap;
678      dpyinfo->bitmaps[id - 1].have_mask = 0;
679    dpyinfo->bitmaps[id - 1].refcount = 1;    dpyinfo->bitmaps[id - 1].refcount = 1;
680    dpyinfo->bitmaps[id - 1].file    dpyinfo->bitmaps[id - 1].file
681      = (char *) xmalloc (SBYTES (file) + 1);      = (char *) xmalloc (SBYTES (file) + 1);
# Line 701  x_destroy_bitmap (f, id) Line 703  x_destroy_bitmap (f, id)
703          {          {
704            BLOCK_INPUT;            BLOCK_INPUT;
705            XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].pixmap);            XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].pixmap);
706            XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].mask);            if (dpyinfo->bitmaps[id - 1].have_mask)
707                XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].mask);
708            if (dpyinfo->bitmaps[id - 1].file)            if (dpyinfo->bitmaps[id - 1].file)
709              {              {
710                xfree (dpyinfo->bitmaps[id - 1].file);                xfree (dpyinfo->bitmaps[id - 1].file);
# Line 723  x_destroy_all_bitmaps (dpyinfo) Line 726  x_destroy_all_bitmaps (dpyinfo)
726      if (dpyinfo->bitmaps[i].refcount > 0)      if (dpyinfo->bitmaps[i].refcount > 0)
727        {        {
728          XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].pixmap);          XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].pixmap);
729          XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].mask);          if (dpyinfo->bitmaps[i].have_mask)
730              XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].mask);
731          if (dpyinfo->bitmaps[i].file)          if (dpyinfo->bitmaps[i].file)
732            xfree (dpyinfo->bitmaps[i].file);            xfree (dpyinfo->bitmaps[i].file);
733        }        }
# Line 822  x_create_bitmap_mask(f, id) Line 826  x_create_bitmap_mask(f, id)
826               width, height);               width, height);
827    XFreeGC (FRAME_X_DISPLAY (f), gc);    XFreeGC (FRAME_X_DISPLAY (f), gc);
828    
829      dpyinfo->bitmaps[id - 1].have_mask = 1;
830    dpyinfo->bitmaps[id - 1].mask = mask;    dpyinfo->bitmaps[id - 1].mask = mask;
831    
832    XDestroyImage (ximg);    XDestroyImage (ximg);

Legend:
Removed from v.1.588  
changed lines
  Added in v.1.589

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26