Synchro with last commit of main branch (custom shape of forms).

Author: fredvs

lib/common/kernel/linux/mseguiintf.pas

@@ -53,12 +53,11 @@ interface
  {$define mse_debug}
 {$endif}
 
-uses
-  mxlib, mxrandr, msetypes, mseapplication, msesys,
-  msegraphutils, mseevent, msepointer, mseguiglob, msesystypes,{msestockobjects,}
-  msethread{$ifdef FPC},dynlibs{$endif},
-  mselibc, msectypes, msesysintf, msegraphics,
-  msestrings, mxft, mshape, mseclasses;
+{$ifdef FPC}mxlib{$else}Xlib{$endif},msetypes,mseapplication,msesys,
+ msegraphutils,mseevent,msepointer,mseguiglob,msesystypes,{msestockobjects,}
+ msethread{$ifdef FPC},mx,mxutil,dynlibs{$endif},
+ mselibc,msectypes,msesysintf,msegraphics,
+ msestrings,mxft,mxrender,mxrandr,mshape, mseclasses, msebitmap;
 
 {$ifdef FPC}
  {$define xbooleanresult}
@@ -473,6 +472,8 @@  MwmHints = record
    TXICCEncodingStyle = (XStringStyle,XCompoundTextStyle,XTextStyle,
      XStdICCTextStyle,XUTF8StringStyle);
   }
+function CustomErrorHandler(dpy: PDisplay; err: PXErrorEvent): cint; cdecl;
+ 
 function XSetWMHints(Display: PDisplay; W: xid; WMHints: PXWMHints): cint; cdecl;
                               external sXLib name 'XSetWMHints';
 function XSetForeground(Display: PDisplay; GC: TGC;
@@ -539,6 +540,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
@@ -908,6 +912,14 @@  clipboardinfoty = record
 // lastshiftstate: shiftstatesty;
  clipboardbuffers: array[clipboardbufferty] of clipboardinfoty;
  fidnum: integer;
+ DefaultErrorHandler: TXErrorHandler;
+
+function CustomErrorHandler(dpy: PDisplay; err: PXErrorEvent): cint; cdecl;
+begin
+  if (err^.error_code = 3) and (err^.request_code = 15) then
+    Exit(0);  // Ignore silently
+  Result := DefaultErrorHandler(dpy, err);  // Handle others normally
+end;
 
 procedure deleteitemat(var dest: atomarty; index: integer); overload;
 begin
@@ -4091,7 +4103,7 @@ function gui_createwindow(const rect: rectty;
  colormap1: tcolormap;
  opt1: windowtypeoptionty;
 // valall: ptruint;
- 
+// shapebmp: tmaskedbitmap;
  // shape from Xext
  xgcv :TXGCValues;
  pmap : pixmapty;
@@ -4172,8 +4184,11 @@ function gui_createwindow(const rect: rectty;
 //////////////////////////////////////////////
 
   if (mse_hasxext = true) and  ((wo_rounded in options.options) or (wo_ellipse in options.options)
-  or (wo_transparentbackground  in options.options) or (wo_transparentbackgroundround  in options.options)
-  or (wo_transparentbackgroundellipse in options.options)) then
+  or (wo_customshape in options.options) 
+  or (wo_transparentbackground in options.options)
+  or (wo_transparentbackgroundround in options.options)
+  //or (wo_transparentbackgroundellipse in options.options)
+  ) then
  begin
  // shape
   //* create a graphics context for drawing on the window */
@@ -4220,6 +4235,12 @@ function gui_createwindow(const rect: rectty;
             end;
        end;
   end else
+   if (wo_customshape in options.options) then
+  begin
+    DefaultErrorHandler := XSetErrorHandler(@CustomErrorHandler);
+    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
     if length(mse_formchild) = 0 then
@@ -4237,6 +4258,7 @@ function gui_createwindow(const rect: rectty;
             end;  
         end;              
  end else
+ }
   if (wo_transparentbackgroundround in options.options) then
   begin
      if length(mse_formchild) = 0 then
@@ -4422,7 +4444,6 @@ function gui_createwindow(const rect: rectty;
    xdeleteproperty(appdisp,id,xdndatoms[xdnd_aware]);
   end;
  end;
- 
   gdi_unlock;
 end;
 

lib/common/kernel/mseguiglob.pas

@@ -136,9 +136,10 @@  keyeventinfoty = record
                    wo_ellipse,
                    wo_rounded,
                    wo_transparentbackground,
-                   wo_transparentbackgroundellipse,
+                   //wo_transparentbackgroundellipse, // removed because fpc published set are limitged to 31 elements 
                    wo_transparentbackgroundround, 
-                   wo_onalldesktops
+                   wo_onalldesktops,
+                   wo_customshape
                    );
  windowoptionsty = set of windowoptionty;
  windowtypeoptionty = wo_popup..wo_dnd;
@@ -328,17 +329,15 @@  egui = class(eerror)
  toplevelraise: boolean;
  nostaticgravity: boolean;
  mse_radiuscorner : integer = 8;
-// 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
+ msesystimer,msegdi32gdi,msesysintf1,msedynload,msewindnd
  {$ifdef mse_debugzorder},typinfo{$endif} ;
 
 type
@@ -2944,6 +2947,10 @@ function gui_createwindow(const rect: rectty;
  ownerwindow: winidty;
  region, region2 : THandle;
  x, deco_x, deco_y : integer;
+// shapebmp: tmaskedbitmap;
+ //rgn, rectrgn: HRGN;
+ y, startx: integer;
+ 
 begin
  fillchar(awindow,sizeof(awindow),0);
  with awindow,win32windowty(awindow.platformdata).d,options do begin
@@ -3029,8 +3036,7 @@ function gui_createwindow(const rect: rectty;
     groupleaderwindow:= id;
    end;
   end;
-  
-  
+    
 
   if id = 0 then begin
    result:= gue_createwindow;
@@ -3082,6 +3088,8 @@ function gui_createwindow(const rect: rectty;
     DeleteObject(region2);
     DeleteObject(region);
    end else
+   
+   {
    if wo_transparentbackgroundellipse in options then
   begin
    if length(mse_formchild) = 0 then
@@ -3111,6 +3119,42 @@ function gui_createwindow(const rect: rectty;
     DeleteObject(region2);
     DeleteObject(region);
    end else
+   }
+if (wo_customshape in options)
+then
+begin
+    region := CreateRectRgn(0, 0, 0, 0);
+    
+     mse_shapebmp.options := [bmo_graymask];
+     mse_shapebmp.mask.size := mse_shapebmp.size;  
+    
+    for y := 0 to mse_shapebmp.size.cy - 1 do
+    begin
+      x := 0;
+      while x < mse_shapebmp.size.cx do
+      begin
+        if (mse_shapebmp.pixels[x, y] and $FFFFFF) > $7F7F7F then 
+        begin
+          Inc(x);
+          Continue;
+        end;
+
+       startx := x;
+        // Collect everything that is "dark"
+        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);
+        CombineRgn(region, region, region2, RGN_OR);
+        DeleteObject(region2);
+      end;
+    end;
+
+    // Apply the custom region to the window handle
+    SetWindowRgn(id, region, True);
+
+end else
+ 
    if wo_transparentbackgroundround in options then
    begin
     if length(mse_formchild) = 0 then

lib/common/widgets/mseforms.pas

@@ -1168,7 +1168,7 @@ procedure tcustommseform.dooncreate;
    try
     foncreate(self);
     if (wo_transparentbackground in foptionswindow) or 
-       (wo_transparentbackgroundellipse in foptionswindow) or 
+     //  (wo_transparentbackgroundellipse in foptionswindow) or 
        (wo_transparentbackgroundround in foptionswindow) then SetChildBounds(self);
    finally
     endsuspendgloballoading;