编辑器

修正namespace导致变慢的问题

designer/utslcodeeditor.tsf

@@ -3955,6 +3955,7 @@ type TEditer=class(TCustomcontrol) //
         begin
             for i,v in fs do
             begin
+                if not FIsFinding then break;
                 ri :=  matchword(i,d);   
                 if ri then 
                 begin

designer/utslsynmemo.tsf

@@ -1795,7 +1795,6 @@ type TTsfFileParser = class() //
             end 
             "parserstring":
             begin
-                mtic;
                 r := parserstring(o,d);
                 return r;
             end 
@@ -2242,11 +2241,8 @@ type TTsfFileParser = class() //
         if FCacheDir then 
         begin
             fn := FCacheDir+fiofs+"lasttime"+fiofs+ModifyFname(n)+".t";
-            if importfile(ftstream(),"",fn,d)=1 and ifarray(d)  then
+            if importfile(ftstream(),"",fn,d)=1   then
             begin 
-                nns := d["nspace"];
-                nn := d["name"];
-                FNsCaches[nn][nns] := 1;
                 return d;
             end 
         end 
@@ -2255,21 +2251,35 @@ type TTsfFileParser = class() //
     begin
         if FCacheDir then 
         begin
+            ln := lowercase(n);
             if not ifarray(FFilePaths) then FFilePaths := array();
-            if not(FFileNames[lowercase(n)]) then return ;
+            if not(FFileNames[ln]) then return ;
             if not ifarray(FCacheS ) then FCacheS := array();
-            d := FCacheS[lowercase(n)];
+            fp := FCacheS[ln,"fullpath"];
-            if d then 
+            if fp then 
             begin
-                FFilePaths[lowercase(n)] := d["fullpath"];
+                FFilePaths[ln] := fp;
-                if g then return d;
+                nns := FCacheS[ln,"nspace"];
+                if nns then 
+                begin 
+                    nn := FCacheS[ln,"name"]; 
+                    FNsCaches[nn][nns] := 1;
+                end 
+                if g then return FCacheS[ln];
                 return 1;
             end
             fn := FCacheDir+fiofs+ModifyFname(n)+".p";
             if importfile(ftstream(),"",fn,d)=1 and ifarray(d) then
             begin
-                FCacheS[lowercase(n)] := d;//new tparserdobject(d);
+                FCacheS[ln] := d;//new tparserdobject(d);
-                FFilePaths[lowercase(n)] := d["fullpath"];
+                FFilePaths[ln] := d["fullpath"];
+                nns := d["nspace"];
+                if nns then 
+                begin 
+                    nn := d["name"]; 
+                    FNsCaches[nn][nns] := 1;
+                end 
+                
                 if g then return d;
                 return 1;
             end

funcext/tvclib/tcustomscrollcontrol.tsf

@@ -26,7 +26,7 @@ type tcustomscrollcontrol = class(TCustomControl)
 
     function SetWhileStep(v);
     begin
-        if not v>=1 then return ;
+        if not(v>=1) then return ;
         nv := integer(v);
         if FWhileStep=nv then return ;
         FWhileStep := nv;
@@ -334,15 +334,17 @@ type tcustomscrollcontrol = class(TCustomControl)
         // 保存当前滑块位置，迟些进行比较
         yPos := FSI.nPos;
         dd := 0;        
-        if e.delta<0 and FSI.nMax>yPos then
+        edelta := e.delta;
+        ew := abs(round(edelta/120));
+        if edelta<0 and FSI.nMax>yPos then
         begin
             //dd++;
-            dd += FWhileStep;
+            dd += FWhileStep*ew;
         end
-        if e.delta>0 and FSI.nMin<yPos then
+        if edelta>0 and FSI.nMin<yPos then
         begin
             //dd--;
-            dd -= FWhileStep;
+            dd -= FWhileStep*ew;
         end
         if not dd then return;
         FSI.fMask := SIF_POS;

funcext/tvclib/ugtkinterface.tsf

@@ -6441,12 +6441,22 @@ type tgtk_ctl_scroll_window = class(tgtk_ctl_object)
             end 
             if  ri and rxy then 
             begin 
+            
+                
                 //if hasMessageFromGtkMessageQueue(-1,_const.LM_MOUSEWHEEL)  then return true;    //20230417ÔÝʱÆÁ±Î                              
                 if hasMessageFromGtkMessageQueue(-1,_const.WM_SIZE)  then return true;  
-                if hasMessageFromGtkMessageQueue(-1,_const.WM_MOUSEMOVE)  then return true;  
+                //if hasMessageFromGtkMessageQueue(-1,_const.WM_MOUSEMOVE)  then return true;  
-                                                
+                WHEEL_DELTA := 120;                             
                 FScrollT := now();                                      
-                    dr := (dr=1)?-1:1;
+                dr := (dr=1)?(-WHEEL_DELTA):(WHEEL_DELTA);                
+                whist := feacheasylostMessageFromGtkMessageQueue(ri,_const.LM_MOUSEWHEEL);   
+                for ii,iiv in whist do 
+                begin
+                    iivw := iiv[2];
+                    lowuperdword(iivw,iivc,iivdir);
+                    dr+=iivdir;
+                end 
+                if dr=0 then return true;
                 
                 xy := makelong(rxy[0],rxy[1]);
                 ctl := 0;
@@ -6793,6 +6803,30 @@ type tGtkMessageQueue=class //
         begin
             Clean();
         end
+        ///////////////处理一下////////////////
+        if r and r[1]=0x020a then 
+        begin
+        
+        end 
+        ///////////////////////
+        unlock();
+        return r;
+    end
+    function feacheasylostmessage(h,m);
+    begin
+        r := array();
+        ri := 0;
+        idx := FCurrent;
+        lock();
+        while idx<FLen do
+        begin            
+            if FData[idx][0]=h and FData[idx][1]=m then
+            begin
+                r[ri++] := FData[idx];
+                FData[idx][0]:= 0;
+            end
+            idx++;
+        end
         unlock();  
         return r;  
     end 
@@ -6802,7 +6836,7 @@ type tGtkMessageQueue=class //
         lock();
         while idx<FLen do
         begin            
-            if FData[idx][0]=h and FData[idx][0]=m then
+            if FData[idx][0]=h and FData[idx][1]=m then
             begin
                 FData[idx][0]:= 0;
             end
@@ -6815,7 +6849,7 @@ type tGtkMessageQueue=class //
         idx := FCurrent;
         if idx<FLen then
         begin            
-            if((h=-1)or(FData[idx][0]=h))and FData[idx][0]=m then
+            if((h=-1)or(FData[idx][0]=h))and FData[idx][1]=m then
             begin
                 return 1;
             end
@@ -6881,6 +6915,12 @@ begin
     GLobal G_GTK_MESSAGE_QUEUE_A;  
     if G_GTK_MESSAGE_QUEUE_A then G_GTK_MESSAGE_QUEUE_A.haseasyLostMessage(h,m);
 end 
+function feacheasylostMessageFromGtkMessageQueue(h,m); //获取容丢失的消息
+begin
+    GLobal G_GTK_MESSAGE_QUEUE_A;  
+    if G_GTK_MESSAGE_QUEUE_A then return G_GTK_MESSAGE_QUEUE_A.feacheasylostmessage(h,m);
+end 
+
 function clearMessageFromGtkMessageQueue(h,m); //Çå³ýÏûÏ¢
 begin
     GLobal G_GTK_MESSAGE_QUEUE_A;