Custom shape forms from bitmap vs file.

Author: fredvs

lib/common/kernel/linux/mseguiintf.pas

@@ -58,7 +58,7 @@ interface
   msegraphutils, mseevent, msepointer, mseguiglob, msesystypes,{msestockobjects,}
   msethread{$ifdef FPC},dynlibs{$endif},
   mselibc, msectypes, msesysintf, msegraphics,
-  msestrings, mxft, mshape, mseclasses, msebitmap, mseformatpngread  ;
+  msestrings, mxft, mshape, mseclasses, msebitmap;
 
 {$ifdef FPC}
  {$define xbooleanresult}
@@ -541,6 +541,9 @@ function Xutf8TextPropertyToTextList(para1:PDisplay; para2:PXTextProperty;
             para3:PPPchar; para4: pinteger): integer; cdecl;
                      external sXlib name 'Xutf8TextPropertyToTextList';
 
+var
+mse_shapebmp: tmaskedbitmap;
+
 implementation
 uses
  msebits,msekeyboard,sysutils,msesysutils,msefileutils,msedatalist,msedragglob
@@ -4101,7 +4104,7 @@ function gui_createwindow(const rect: rectty;
  colormap1: tcolormap;
  opt1: windowtypeoptionty;
 // valall: ptruint;
- shapebmp: tmaskedbitmap;
+// shapebmp: tmaskedbitmap;
  // shape from Xext
  xgcv :TXGCValues;
  pmap : pixmapty;
@@ -4233,22 +4236,11 @@ function gui_createwindow(const rect: rectty;
             end;
        end;
   end else
-   if (wo_customshape in options.options) and (mse_shapefile <> '') then
+   if (wo_customshape in options.options) then
   begin
     DefaultErrorHandler := XSetErrorHandler(@CustomErrorHandler);
-    shapebmp := tmaskedbitmap.Create(bmk_mono);  // Monochrome mode
-    try
-      shapebmp.LoadFromFile(mse_shapefile);  // Load b/w PNG image
-      shapebmp.MaskKind := bmk_mono;  // Ensure 1-bit mask
-      // Copy mask to pmap (1=visible/opaque, 0=transparent/clipped)
-      // Assumes mask bits are set correctly (black=1/visible, white=0/transparent)
-      XCopyArea(appdisp, shapebmp.mask.handle, pmap, shape_gc, 0, 0, width, height, 0, 0);
-    finally
-      shapebmp.Free;
-      //XSetErrorHandler(DefaultErrorHandler);  // Restore default
-    end;
-    
-end else
+    XCopyArea(appdisp, mse_shapebmp.mask.handle, pmap, shape_gc, 0, 0, width, height, 0, 0);
+  end else
   {
   if (wo_transparentbackgroundellipse in options.options) then
    begin

lib/common/kernel/mseguiglob.pas

@@ -329,18 +329,15 @@  egui = class(eerror)
  toplevelraise: boolean;
  nostaticgravity: boolean;
  mse_radiuscorner : integer = 8;
- mse_shapefile : string = '';
-// exabug: boolean;
-// nocreatestaticgravity: boolean;
-
+ 
 procedure guierror(error: guierrorty; text: string = ''); overload;
 procedure guierror(error: guierrorty; sender: tobject;
                                                   text: string = ''); overload;
 
 implementation
 
 uses
- mseclasses,msestreaming{,mseapplication,msegui,mseguiintf};
+ mseclasses,msestreaming {,mseapplication,msegui,mseguiintf};
 
 const
  errortexts: array[guierrorty] of string =

lib/common/kernel/windows/mseguiintf.pas

@@ -15,7 +15,7 @@ interface
 uses
  windows,messages,mseapplication,msetypes,msegraphutils,msesys,
  mseevent,msepointer,mseguiglob,msegraphics,
- msethread,mseformatstr,{msesysintf,}msestrings,msesystypes,msewinglob;
+ msethread,mseformatstr,{msesysintf,}msestrings,msesystypes,msewinglob, msebitmap;
 
 type
  syseventty = record
@@ -60,11 +60,14 @@ function nestedwindowproc(): boolean; //window frame clicked
  gccount: integer;
 {$endif}
 
+var
+mse_shapebmp: tmaskedbitmap;
+
 implementation
 //todo: 19.10.03 rasterops for textout
 uses
  sysutils,mselist,msekeyboard,msebits,msearrayutils,msesysutils,msegui,
- msesystimer,msegdi32gdi,msesysintf1,msedynload,msewindnd,msebitmap,mseformatpngread
+ msesystimer,msegdi32gdi,msesysintf1,msedynload,msewindnd
  {$ifdef mse_debugzorder},typinfo{$endif} ;
 
 type
@@ -2944,7 +2947,7 @@ function gui_createwindow(const rect: rectty;
  ownerwindow: winidty;
  region, region2 : THandle;
  x, deco_x, deco_y : integer;
- shapebmp: tmaskedbitmap;
+// shapebmp: tmaskedbitmap;
  //rgn, rectrgn: HRGN;
  y, startx: integer;
 
@@ -3117,30 +3120,28 @@ function gui_createwindow(const rect: rectty;
     DeleteObject(region);
    end else
    }
-if (wo_customshape in options) and (mse_shapefile <> '') then
+if (wo_customshape in options)
+then
 begin
-  shapebmp := tmaskedbitmap.Create(bmk_mono);
-  try
-    shapebmp.LoadFromFile(mse_shapefile);
-    shapebmp.maskkind := bmk_mono;
-    shapebmp.mask.size := shapebmp.size; 
-
     region := CreateRectRgn(0, 0, 0, 0);
 
-    for y := 0 to shapebmp.size.cy - 1 do
+    mse_shapebmp.maskkind := bmk_mono;
+    mse_shapebmp.mask.size := mse_shapebmp.size;  
+    
+    for y := 0 to mse_shapebmp.size.cy - 1 do
     begin
       x := 0;
-      while x < shapebmp.size.cx do
+      while x < mse_shapebmp.size.cx do
       begin
-        if (shapebmp.pixels[x, y] and $FFFFFF) > $7F7F7F then 
+        if (mse_shapebmp.pixels[x, y] and $FFFFFF) > $7F7F7F then 
         begin
           Inc(x);
           Continue;
         end;
 
        startx := x;
         // Collect everything that is "dark"
-        while (x < shapebmp.size.cx) and ((shapebmp.pixels[x, y] and $FFFFFF) <= $7F7F7F) do
+        while (x < mse_shapebmp.size.cx) and ((mse_shapebmp.pixels[x, y] and $FFFFFF) <= $7F7F7F) do
           Inc(x);
 
         region2 := CreateRectRgn(startx, y, x, y + 1);
@@ -3151,10 +3152,6 @@ function gui_createwindow(const rect: rectty;
 
     // Apply the custom region to the window handle
     SetWindowRgn(id, region, True);
-    
-  finally
-    shapebmp.Free;
-  end;
 
 end else