diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/Design.module gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/Design.module --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/Design.module 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/Design.module 2022-04-12 17:58:31.000000000 +0000 @@ -1,5 +1,6 @@ ' Gambas module file +Private Const MAX_IGNORE_EXTERN As Integer = 8 Private Const DEBUG_REMOTE As Boolean = False Private UseTerminal As Boolean @@ -566,6 +567,7 @@ Private Sub AfterStop() Dim hForm As Object + Dim I As Integer If $iState = STATE_STOP Then Return @@ -614,6 +616,9 @@ $hTimerExtern.Stop $hTimerExtern = Null Try Kill $sExternLink + For I = 1 To MAX_IGNORE_EXTERN + Try Kill $sExternLink & ".*" + Next FDebugInfo.StopWaitForRemote $bExtern = False Endif @@ -1335,6 +1340,8 @@ $sExternLink = "/tmp/gambas-" & Project.Name & ".debug" + ' FIXME: race condition here! + Try hStat = Stat($sExternLink) If hStat And If IsDir(hStat.Link) Then FMain.ShowErrorWith(("Unable to start extern debugging."), ("Another extern debugging is active.")) @@ -1347,6 +1354,8 @@ FMain.ShowErrorWith(("Unable to start extern debugging.")) Return Endif + + SetExternIgnore(0) $bConsole = Action["console"].Value @@ -1393,11 +1402,36 @@ ' End +Public Sub SetExternIgnore(iNum As Integer) + + Dim I As Integer + Dim sPath As String + + For I = 1 To MAX_IGNORE_EXTERN + sPath = $sExternLink & "." & CStr(I) + If I <= iNum Then + Try File.Save(sPath, "") + Else + Try Kill sPath + Endif + Next + +End + + Public Sub TimerExtern_Timer() Dim sPath As String Dim hLock As File + Dim I As Integer + + For I = 1 To MAX_IGNORE_EXTERN + sPath = $sExternLink & "." & CStr(I) + If Not Exist(sPath) Then Break + Next + FDebugInfo.SetExternIgnore(I - 1) + If ProcessId Then sPath = File.SetExt($sFifo, "lock") Try hLock = Lock sPath diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.class gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.class --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.class 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.class 2022-04-12 17:58:31.000000000 +0000 @@ -1822,3 +1822,18 @@ MTest.SaveTestWith(cmbTest.Index) End + +Public Sub spnIgnoreExtern_Change() + + Design.SetExternIgnore(spnIgnoreExtern.Value) + +End + +Public Sub SetExternIgnore(iNum As Integer) + + Object.Lock(spnIgnoreExtern) + spnIgnoreExtern.Value = iNum + Object.Unlock(spnIgnoreExtern) + +End + diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.form gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.form --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.form 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Debug/FDebugInfo.form 2022-04-12 17:58:31.000000000 +0000 @@ -213,6 +213,50 @@ } } } + { panRemoteDebug Panel + MoveScaled(73,9,38,22) + Visible = False + Background = Color.TextBackground + Expand = True + Arrangement = Arrange.Vertical + Centered = True + Spacing = True + Margin = True + { spnRemoteDebug Spinner + MoveScaled(9,2,13,6) + Type = Spinner.Circle + } + { Label1 TextLabel + MoveScaled(6,10,18,5) + Foreground = Color.LightForeground + AutoResize = True + Text = ("Waiting for extern process") & "..." + Alignment = Align.Center + } + { HBox2 HBox + MoveScaled(2,16,34,4) + Visible = False + Centered = True + Spacing = True + { Label3 Label + MoveScaled(1,0,6,4) + Foreground = Color.LightForeground + AutoResize = True + Text = ("Ignore") + } + { spnIgnoreExtern SpinBox + MoveScaled(9,0,9,4) + Foreground = Color.LightForeground + MaxValue = 8 + } + { Label4 Label + MoveScaled(19,0,9,4) + Foreground = Color.LightForeground + AutoResize = True + Text = ("processes") + } + } + } { sepError Separator MoveScaled(35,35,17,0) Visible = False @@ -234,27 +278,6 @@ Alignment = Align.Normal } } - { panRemoteDebug Panel - MoveScaled(113,34,20,18) - Visible = False - Background = Color.TextBackground - Expand = True - Arrangement = Arrange.Vertical - Centered = True - Spacing = True - Margin = True - { spnRemoteDebug Spinner - MoveScaled(4,2,13,6) - Type = Spinner.Circle - } - { Label1 TextLabel - MoveScaled(1,10,18,5) - Foreground = Color.LightForeground - AutoResize = True - Text = ("Waiting for extern process") & "..." - Alignment = Align.Center - } - } } Index = 1 Text = ("Console") diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Editor/Form/CControl.class gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Editor/Form/CControl.class --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/app/src/gambas3/.src/Editor/Form/CControl.class 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/app/src/gambas3/.src/Editor/Form/CControl.class 2022-04-12 17:58:31.000000000 +0000 @@ -330,7 +330,7 @@ If bExist Then Try hCtrl = New (sClass, hParent) If Not hCtrl Then Try hCtrl = New ($hFamily.Name & sClass, hParent) - If Not hCtrl Then hCtrl = New TabPanel(hParent) + If Not hCtrl Then hCtrl = New DrawingArea(hParent) Endif diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.component gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.component --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.component 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.component 2022-04-12 17:58:31.000000000 +0000 @@ -1,4 +1,4 @@ [Component] Key=gb.eval.highlight -Version=3.16.90 +Version=3.17.90 Requires=gb.eval diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/properties gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/properties --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/properties 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/properties 2022-04-12 17:58:31.000000000 +0000 @@ -186,6 +186,8 @@ rest-after inherit,initial,unset rest-before inherit,initial,unset right auto,#length,#%,initial,inherit,unset +scrollbar-color #color,auto +scrollbar-width none,thin,auto tab-size #number,#length,initial,inherit,unset table-layout auto,fixed,initial,inherit,unset text-align left,right,center,justify,initial,inherit,unset diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/values gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/values --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/values 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/css/values 2022-04-12 17:58:31.000000000 +0000 @@ -183,6 +183,7 @@ repeat-x repeat-y reverse +revert ridge right rightbottom diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.project gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.project --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.project 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.eval.highlight/.project 2022-04-12 17:58:31.000000000 +0000 @@ -1,6 +1,6 @@ # Gambas Project File 3.0 Startup=Main -Version=3.16.90 +Version=3.17.90 VersionFile=1 Component=gb.image Component=gb.eval diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.class gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.class --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.class 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.class 2022-04-12 17:58:31.000000000 +0000 @@ -23,7 +23,6 @@ Dim iBusy As Integer Dim WB As Integer Dim HT As Integer - Dim hSpace As Spring Dim sStyle As String sTitle = Message.Title @@ -117,7 +116,8 @@ Endif Endif Next - hSpace = New Spring(panButton) + 'hSpace = New Spring(panButton) + panButton.H = Max(H, DS * 4) W = Max(DS * 32, Max(txtMessage.W + 2, WB) + picMessage.W + DS * 7) @@ -152,18 +152,60 @@ End -Public Sub Form_KeyPress() +Private Sub SetCurrentButton(iDir As Integer) Dim hButton As Button - If Key.Code = Key.Return Or If Key.Code = Key.Enter Then - Try hButton = Application.ActiveControl - If hButton Then - hButton.Value = True - Stop Event + Try hButton = Application.ActiveControl + + If hButton Then + If iDir < 0 Then + Try hButton = hButton.Previous + Else + Try hButton = hButton.Next + Endif + If Error Then hButton = Null + Endif + + If Not hButton Then + If iDir < 0 Then + hButton = panButton.Children[panButton.Children.Max] + Else + hButton = panButton.Children[0] Endif Endif + + hButton.SetFocus + +End + + +Public Sub Form_KeyPress() + Dim hButton As Button + + Select Key.Code + + Case Key.Return, Key.Enter, Key.Space + + Try hButton = Application.ActiveControl + If hButton Then + hButton.Value = True + Stop Event + Endif + + Case Key.Left, Key.Up + + If Key.Normal Then SetCurrentButton(-1) + Stop Event + + Case Key.Right, Key.Down + + If Key.Normal Then SetCurrentButton(1) + Stop Event + + End Select + End Public Sub mnuCopy_Click() diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.form gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.form --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.form 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Message/FMessage.form 2022-04-12 17:58:31.000000000 +0000 @@ -63,11 +63,8 @@ } { panButton HBox MoveScaled(10,24,37,4) + Centered = True Spacing = True - { Panel1 Panel - MoveScaled(2,0,4,4) - Expand = True - } } } } diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Test/TestMessage.module gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Test/TestMessage.module --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Test/TestMessage.module 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.gui.base/.src/Test/TestMessage.module 2022-04-12 17:58:31.000000000 +0000 @@ -5,13 +5,10 @@ Public Sub Main() - Cursor.Toto = 17 - Return - - 'Print Message.Question("Ceci est un message d'avertissement dont le texte est tout spécialement long afin de tester la boite de dialogue. Toutes les modifications non enregistrées seront perdues !", "Sauvegarder", "Envoyer", "Annuler") + Print Message.Question("Ceci est un message d'avertissement dont le texte est tout spécialement long afin de tester la boite de dialogue. Toutes les modifications non enregistrées seront perdues !", "Sauvegarder", "Envoyer", "Annuler") 'Message("1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12") 'Message("Le programme a retourné la valeur 1") - 'Return + Return Dim p As String p = "

Desktop Properties

" diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.web.gui/.src/Table/WebTable.class gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.web.gui/.src/Table/WebTable.class --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/comp/src/gb.web.gui/.src/Table/WebTable.class 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/comp/src/gb.web.gui/.src/Table/WebTable.class 2022-04-12 17:58:31.000000000 +0000 @@ -227,7 +227,7 @@ If $bNoScrolling Then $bNoScrolling = False Else - If $iEnsureVisible > 0 Then + If $iEnsureVisible >= 0 Then WebForm._AddJavascript("gw.table.ensureVisible(" & JS(Me.Name) & "," & CStr($iEnsureVisible) & ")") $iEnsureVisible = -1 Else diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/debian/changelog gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/debian/changelog --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/debian/changelog 2022-04-06 15:58:37.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/debian/changelog 2022-04-12 17:58:34.000000000 +0000 @@ -1,8 +1,8 @@ -gambas3 (3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1) impish; urgency=low +gambas3 (3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1) impish; urgency=low * Auto build. - -- Benoit Minisini Wed, 06 Apr 2022 15:58:37 +0000 + -- Benoit Minisini Tue, 12 Apr 2022 17:58:34 +0000 gambas3 (3.15.90) saucy; urgency=low diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/debian/git-build-recipe.manifest gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/debian/git-build-recipe.manifest --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/debian/git-build-recipe.manifest 2022-04-06 15:58:37.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/debian/git-build-recipe.manifest 2022-04-12 17:58:34.000000000 +0000 @@ -1,4 +1,4 @@ -# git-build-recipe format 0.4 deb-version 3.17.1+git202204041713.57a3c9342+build11 -lp:~gambas-team/+git/gambas git-commit:57a3c934264bf97ba8e87fb516c39db1fe0fbaa5 +# git-build-recipe format 0.4 deb-version 3.17.2+git202204080046.0a6932e31+build11 +lp:~gambas-team/+git/gambas git-commit:0a6932e31521f9b683aa3dae73891a2d0cf2359a nest debian-common lp:~gambas-team/+git/gambas3-stable-common debian git-commit:bfc1fd96c174c393c76d41aec310e90fd2ea88d7 merge debian lp:~gambas-team/+git/gambas3-stable-groovy git-commit:36b4b3215f2f81759f51ba2e073d2ee3b30bebe4 diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.gtk/src/CStyle.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.gtk/src/CStyle.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.gtk/src/CStyle.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.gtk/src/CStyle.cpp 2022-04-12 17:58:31.000000000 +0000 @@ -527,6 +527,7 @@ gt_add_css_color(&css, color); g_stradd(&css, "; background-image:none; }\n"); gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(_css), css, -1, NULL); + g_free(css); gtk_style_context_add_provider(style, _css, GTK_STYLE_PROVIDER_PRIORITY_USER); #if GTK_CHECK_VERSION(3, 12, 0) @@ -545,8 +546,8 @@ gtk_render_frame(style, _cr, x, y, w, h); - if (color != GB_COLOR_DEFAULT) - gtk_style_context_remove_provider(style, _css); + /*if (color != GB_COLOR_DEFAULT) + gtk_style_context_remove_provider(style, _css);*/ } #endif diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.gtk3/src/CStyle.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.gtk3/src/CStyle.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.gtk3/src/CStyle.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.gtk3/src/CStyle.cpp 2022-04-12 17:58:31.000000000 +0000 @@ -527,6 +527,7 @@ gt_add_css_color(&css, color); g_stradd(&css, "; background-image:none; }\n"); gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(_css), css, -1, NULL); + g_free(css); gtk_style_context_add_provider(style, _css, GTK_STYLE_PROVIDER_PRIORITY_USER); #if GTK_CHECK_VERSION(3, 12, 0) @@ -545,8 +546,8 @@ gtk_render_frame(style, _cr, x, y, w, h); - if (color != GB_COLOR_DEFAULT) - gtk_style_context_remove_provider(style, _css); + /*if (color != GB_COLOR_DEFAULT) + gtk_style_context_remove_provider(style, _css);*/ } #endif diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/CMouse.h gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/CMouse.h --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/CMouse.h 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/CMouse.h 2022-04-12 17:58:32.000000000 +0000 @@ -96,4 +96,6 @@ void CMOUSE_set_control(void *control); void CMOUSE_finish_event(void); +#define CMOUSE_is_valid() (MOUSE_info.valid != 0) + #endif diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/cpaint_impl.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/cpaint_impl.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/cpaint_impl.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/cpaint_impl.cpp 2022-04-12 17:58:32.000000000 +0000 @@ -405,12 +405,13 @@ p->setFont(f); // Strange bug of QT. Sometimes the font does not apply (cf. DrawTextShadow) - if (f != p->font()) + /*if (f != p->font()) { + fprintf(stderr, "set_painter_font: %s / %s\n", TO_UTF8(f.toString()), TO_UTF8(p->font().toString())); QFont f2; f2.fromString(f.toString()); p->setFont(f2); - } + }*/ } static void apply_font(QFont &font, void *object = 0) diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/CWidget.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/CWidget.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/CWidget.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/CWidget.cpp 2022-04-12 17:58:32.000000000 +0000 @@ -1314,7 +1314,11 @@ if (win->opened && QWIDGET(win)->isVisible()) { - WIDGET->setFocus(); + if (qobject_cast(WIDGET) || qobject_cast(WIDGET) || qobject_cast(WIDGET)) + WIDGET->setFocus(Qt::MouseFocusReason); + else + WIDGET->setFocus(Qt::TabFocusReason); + //WIDGET->window()->setAttribute(Qt::WA_KeyboardFocusChange, false); } else if ((CWIDGET *)win != THIS) { diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/CWindow.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/CWindow.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt4/src/CWindow.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt4/src/CWindow.cpp 2022-04-12 17:58:32.000000000 +0000 @@ -244,7 +244,7 @@ if (THIS->focus) { //qDebug("handle_focus on %s", THIS->focus->name); - THIS->focus->widget->setFocus(); + CWIDGET_set_focus(THIS->focus); GB.Unref(POINTER(&THIS->focus)); THIS->focus = NULL; } @@ -2236,8 +2236,11 @@ else setWindowFlags(windowFlags() | Qt::FramelessWindowHint); - if (visible) show(); - move(THIS->x, THIS->y); + if (visible) + { + show(); + move(THIS->x, THIS->y); + } #else diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/CMouse.h gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/CMouse.h --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/CMouse.h 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/CMouse.h 2022-04-12 17:58:32.000000000 +0000 @@ -96,4 +96,6 @@ void CMOUSE_set_control(void *control); void CMOUSE_finish_event(void); +#define CMOUSE_is_valid() (MOUSE_info.valid != 0) + #endif diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/cpaint_impl.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/cpaint_impl.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/cpaint_impl.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/cpaint_impl.cpp 2022-04-12 17:58:32.000000000 +0000 @@ -405,12 +405,13 @@ p->setFont(f); // Strange bug of QT. Sometimes the font does not apply (cf. DrawTextShadow) - if (f != p->font()) + /*if (f != p->font()) { + fprintf(stderr, "set_painter_font: %s / %s\n", TO_UTF8(f.toString()), TO_UTF8(p->font().toString())); QFont f2; f2.fromString(f.toString()); p->setFont(f2); - } + }*/ } static void apply_font(QFont &font, void *object = 0) diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/CWidget.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/CWidget.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/CWidget.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/CWidget.cpp 2022-04-12 17:58:32.000000000 +0000 @@ -1314,7 +1314,11 @@ if (win->opened && QWIDGET(win)->isVisible()) { - WIDGET->setFocus(); + if (qobject_cast(WIDGET) || qobject_cast(WIDGET) || qobject_cast(WIDGET)) + WIDGET->setFocus(Qt::MouseFocusReason); + else + WIDGET->setFocus(Qt::TabFocusReason); + //WIDGET->window()->setAttribute(Qt::WA_KeyboardFocusChange, false); } else if ((CWIDGET *)win != THIS) { diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/CWindow.cpp gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/CWindow.cpp --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/gb.qt5/src/CWindow.cpp 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/gb.qt5/src/CWindow.cpp 2022-04-12 17:58:32.000000000 +0000 @@ -244,7 +244,7 @@ if (THIS->focus) { //qDebug("handle_focus on %s", THIS->focus->name); - THIS->focus->widget->setFocus(); + CWIDGET_set_focus(THIS->focus); GB.Unref(POINTER(&THIS->focus)); THIS->focus = NULL; } @@ -2236,8 +2236,11 @@ else setWindowFlags(windowFlags() | Qt::FramelessWindowHint); - if (visible) show(); - move(THIS->x, THIS->y); + if (visible) + { + show(); + move(THIS->x, THIS->y); + } #else diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/main/gbc/gbc_compile.c gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/main/gbc/gbc_compile.c --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/main/gbc/gbc_compile.c 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/main/gbc/gbc_compile.c 2022-04-12 17:58:32.000000000 +0000 @@ -166,6 +166,7 @@ ARCH_FIND find; const char *name; char *rpath = NULL; + bool is_file = FALSE; if (*path == ':') { @@ -188,16 +189,31 @@ name = path; if (!FILE_exist(path)) path = NULL; + /* + { + is_file = TRUE; + path = FILE_cat(FILE_get_dir(path), ".list", NULL); + if (!FILE_exist(path)) + path = NULL; + } + */ } if (path) { - arch = ARCH_open(path); + if (is_file) + { + add_file_list(path); + } + else + { + arch = ARCH_open(path); - if (!ARCH_find(arch, ".list", 0, &find)) - add_memory_list(&arch->addr[find.pos], find.len); + if (!ARCH_find(arch, ".list", 0, &find)) + add_memory_list(&arch->addr[find.pos], find.len); - ARCH_close(arch); + ARCH_close(arch); + } } else ERROR_warning((ref ? "cannot find reference: %s" : "cannot find library: %s"), name); @@ -271,7 +287,7 @@ fprintf(fs, "%s\n", def); } -/*static char *find_version_in_file(void) +static char *find_version_in_file(void) { char *dir, *pdir; FILE *fv; @@ -311,7 +327,7 @@ len--; line[len] = 0; return STR_copy(line); -}*/ +} static void startup_print_version(FILE *fs) { @@ -326,7 +342,7 @@ if (read_line(fp, line, sizeof(line))) break; - /*if (line_begins_with(line, "VersionFile=", 12)) + if (line_begins_with(line, "VersionFile=", 12)) { if (line[12] == '1') { @@ -334,7 +350,7 @@ break; } } - else*/ if (line_begins_with(line, "Version=", 8)) + else if (line_begins_with(line, "Version=", 8)) { version = STR_copy(&line[8]); } diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/VERSION gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/VERSION --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/VERSION 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/VERSION 2022-04-12 17:58:31.000000000 +0000 @@ -1 +1 @@ -3.17.1 +3.17.2 diff -Nru gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/version.m4 gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/version.m4 --- gambas3-3.17.1+git202204041713.57a3c9342+build11~ubuntu21.10.1/version.m4 2022-04-06 15:58:35.000000000 +0000 +++ gambas3-3.17.2+git202204080046.0a6932e31+build11~ubuntu21.10.1/version.m4 2022-04-12 17:58:32.000000000 +0000 @@ -1,13 +1,13 @@ ## Package version and e-mail for bugs are defined here -m4_define([GB_VERSION], [3.17.1]) +m4_define([GB_VERSION], [3.17.2]) m4_define([GB_MAIL], [g4mba5@gmail.com]) m4_define([GB_URL], [http://gambas.sourceforge.net]) m4_define([GB_VERSION_MAJOR], [3]) m4_define([GB_VERSION_MINOR], [17]) -m4_define([GB_VERSION_RELEASE], [1]) +m4_define([GB_VERSION_RELEASE], [2]) -m4_define([GB_VERSION_FULL], [0x03170001]) +m4_define([GB_VERSION_FULL], [0x03170002]) m4_define([GB_PCODE_VERSION], [0x03150000]) m4_define([GB_PCODE_VERSION_MIN],[0x03000000])