[GB.DESKTOP]

* NEW: 'gb.desktop' is now a pure Gambas component that relies on 
  'gb.desktop.x11' and 'gb.desktop.gnome.keyring'.

[GB.DESKTOP.X11]
* NEW: This new component offers a bunch of helper functions that allows to
  deal with the low-level X11 library.

[GB.DESKTOP.GNOME]
* NEW: This component has been renamed as 'gb.desktop.gnome.keyring'.

[GB.DESKTOP.GNOME.KEYRING]
* NEW: This component was named 'gb.desktop.gnome' before. It allows to 
  store and retrieve passwords from the GNOME 2 keyring.

[GB.FORM]
* OPT: A little optimization in the DirChooser control.


git-svn-id: svn://localhost/gambas/trunk@6260 867c0c6c-44f3-4631-809d-bfa615b0a4ec

Makefile.am

@@ -22,7 +22,8 @@ SUBDIRS = \
  @gtk_dir@ \
  @gtk3_dir@ \
  @opengl_dir@ \
- @desktop_dir@ \
+ @x11_dir@ \
+ @keyring_dir@ \
  @pdf_dir@ \
  @cairo_dir@ \
  @imageio_dir@ \

app/src/gambas3/.src/Component/CComponent.class

@@ -96,7 +96,8 @@ Static Private Sub InitComponentNames()
   $cName["gb.db.sqlite3"] = ("SQLite 3 database driver")
   $cName["gb.debug"] = ("Application debugger helper")
   $cName["gb.desktop"] = ("Desktop management component")
-  $cName["gb.desktop.gnome"] = ("Gnome keyring support for desktop management component")
+  $cName["gb.desktop.x11"] = ("X-Window library support")
+  $cName["gb.desktop.gnome.keyring"] = ("Gnome keyring support for desktop management component")
   $cName["gb.dbus"] = ("D-Bus interface")
   $cName["gb.eval"] = ("Expression evaluator")
   $cName["gb.eval.highlight"] = ("Syntax highlighter routines")

comp/src/gb.desktop/.project

@@ -7,6 +7,7 @@ VersionFile=1
 Component=gb.image
 Component=gb.gui
 Component=gb.desktop
+Component=gb.desktop.x11
 TabSize=2
 Type=Component
 Maintainer=benoit

comp/src/gb.desktop/.settings

@@ -0,0 +1,24 @@
+[Breakpoints]
+Count=0
+
+[DebugWindow]
+Count=0
+
+[DebugWindow/$aDataDir]
+Geometry=[0,0,210,210]
+
+[OpenFile]
+File[1]=".src/DesktopWindow.class:42.16"
+File[2]=".src/Desktop.class:297.17"
+File[3]=".src/_DesktopVirtual.class:21.13"
+File[4]=".src/_Desktop_Windows.class:20.15"
+File[5]=".src/Main.module:154.18"
+File[6]=".src/_Desktop_Passwords.class:68.21"
+File[7]=".src/_Desktop_ScreenSaver.class:0.0"
+Active=8
+File[8]=".src/DesktopWatcher.class:90.28"
+Count=8
+
+[Watches]
+Count=0
+

comp/src/gb.desktop/.src/Atom.class

@@ -8,7 +8,7 @@ Static Public Sub _get(sAtom As String) As Integer
   
   Try iAtom = $cAtom[sAtom]
   If Error Then
-    iAtom = _Desktop.InternAtom(sAtom, True)
+    iAtom = X11.InternAtom(sAtom, True)
     $cAtom[sAtom] = iAtom
   Endif
   Return iAtom

comp/src/gb.desktop/.src/Desktop.class

@@ -102,7 +102,7 @@ End
 
 Static Public Sub FindWindow(Optional Title As String, Application As String, Role As String) As Integer[]
 
-  Return _Desktop.FindWindow(Title, Application, Role)
+  Return X11.FindWindow(Title, Application, Role)
 
 End
 
@@ -144,7 +144,7 @@ Static Public Sub SendKeys(Keys As String)
       aRelease.Reverse
       For Each sCar In aRelease
         'DEBUG sCar;; FALSE
-        _Desktop.SendKey(sCar, False)
+        X11.SendKey(sCar, False)
       Next
       aRelease.Clear
       Continue
@@ -156,13 +156,13 @@ Static Public Sub SendKeys(Keys As String)
 
     If bHold Then
       'DEBUG sCar;; TRUE
-      _Desktop.SendKey(sCar, True)
+      X11.SendKey(sCar, True)
       aRelease.Add(sCar)
     Else
       'DEBUG sCar;; TRUE
-      _Desktop.SendKey(sCar, True)
+      X11.SendKey(sCar, True)
       'DEBUG sCar;; FALSE
-      _Desktop.SendKey(sCar, False)
+      X11.SendKey(sCar, False)
     Endif
 
   Loop
@@ -172,7 +172,7 @@ Catch
   sErr = Error.Text & ": '" & sCar & "'"
 
   For Each sCar In aRelease
-    _Desktop.SendKey(sCar, False)
+    X11.SendKey(sCar, False)
   Next
 
   Error.Raise(sErr)
@@ -199,7 +199,7 @@ Static Private Sub GetDesktop() As String
       $sDesktop = "WINDOWMAKER"
     Else If Application.Env["DESKTOP_SESSION"] = "LXDE" Then
       $sDesktop = "LXDE"
-    Else If InStr(_Desktop.GetWindowProperty("_DT_SAVE_MODE"), "xfce4") Then
+    Else If InStr(X11.GetWindowProperty("_DT_SAVE_MODE"), "xfce4") Then
       $sDesktop = "XFCE"
     Else
       Select Case Application.Env["XDG_CURRENT_DESKTOP"]
@@ -295,26 +295,26 @@ End
 
 Static Private Function Current_Read() As Integer
 
-  Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0]
+  Try Return X11.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0]
 
 End
 
 Static Private Sub Current_Write(Value As Integer)
 
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_CURRENT_DESKTOP"], [Value])
+  X11.SendClientMessageToRootWindow(Atom["_NET_CURRENT_DESKTOP"], [Value])
 
 End
 
 Static Private Function Count_Read() As Integer
 
-  Try Return _Desktop.GetWindowProperty(Atom["_NET_NUMBER_OF_DESKTOPS"])[0]
+  Try Return X11.GetWindowProperty(Atom["_NET_NUMBER_OF_DESKTOPS"])[0]
   Return 1
 
 End
 
 Static Private Sub Count_Write(Value As Integer)
 
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value])
+  X11.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value])
 
 End
 
@@ -326,25 +326,25 @@ End
 
 Static Private Function ActiveWindow_Read() As Integer
 
-  Return _Desktop.GetWindowProperty(Atom["_NET_ACTIVE_WINDOW"])[0]
+  Return X11.GetWindowProperty(Atom["_NET_ACTIVE_WINDOW"])[0]
 
 End
 
 Static Private Sub ActiveWindow_Write(Value As Integer)
 
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_ACTIVE_WINDOW"], [1, _Desktop.Time, Value, 0, 0], Value)
+  X11.SendClientMessageToRootWindow(Atom["_NET_ACTIVE_WINDOW"], [1, X11.Time, Value, 0, 0], Value)
 
 End
 
 Static Private Function Showing_Read() As Boolean
 
-  Return _Desktop.GetWindowProperty(Atom["_NET_SHOWING_DESKTOP"])[0]
+  Return X11.GetWindowProperty(Atom["_NET_SHOWING_DESKTOP"])[0]
 
 End
 
 Static Private Sub Showing_Write(Value As Boolean)
 
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)])
+  X11.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)])
 
 End
 
@@ -352,7 +352,7 @@ End
 '
 '   Dim iWidth As Integer
 '
-'   Try iWidth = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[0]
+'   Try iWidth = X11.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[0]
 '   If iWidth = 0 Then iWidth = Super.Width
 '   Return iWidth
 '
@@ -362,7 +362,7 @@ End
 '
 '   Dim iHeight As Integer
 '
-'   Try iHeight = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[1]
+'   Try iHeight = X11.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[1]
 '   If iHeight = 0 Then iHeight = Super.Height
 '   Return iHeight
 '
@@ -394,7 +394,7 @@ End
 
 Static Private Function RootWindow_Read() As Integer
 
-  Return _Desktop.RootWindow
+  Return X11.RootWindow
 
 End
 

comp/src/gb.desktop/.src/DesktopWatcher.class

@@ -17,13 +17,13 @@ Event WindowState(Window As DesktopWindow)
 Event WindowName(Window As DesktopWindow)
 Event WindowIcon(Window As DesktopWindow)
 
-Private $hWatcher As _DesktopWatcher
+Private $hWatcher As X11Watcher
 Private $bRootWindow As Boolean
 
 Public Sub _new(Optional RootWindow As Boolean)
   
   $bRootWindow = RootWindow
-  $hWatcher = New _DesktopWatcher(If(RootWindow, _Desktop.RootWindow, 0)) As "DesktopWatcher"
+  $hWatcher = New X11Watcher(If(RootWindow, X11.RootWindow, 0)) As "DesktopWatcher"
   
 End
 
@@ -31,7 +31,7 @@ Public Sub DesktopWatcher_Change(Window As Integer, {Property} As Integer)
   
   Dim hWin As DesktopWindow 
 
-  If Window = _Desktop.RootWindow Then
+  If Window = X11.RootWindow Then
   
     Select Case {Property}
       Case Atom["_NET_CLIENT_LIST_STACKING"]
@@ -46,7 +46,7 @@ Public Sub DesktopWatcher_Change(Window As Integer, {Property} As Integer)
       Case Atom["_NET_DESKTOP_GEOMETRY"]
         Raise Geometry
     End Select
-  'Print "DesktopWatcher: Window = ";; Window;; " Property = ";; _Desktop.GetAtomName({Property})
+  'Print "DesktopWatcher: Window = ";; Window;; " Property = ";; X11.GetAtomName({Property})
 
   Else  
   
@@ -88,6 +88,6 @@ Private Sub RootWindow_Write(Value As Boolean)
 
   If Value = $bRootWindow Then Return
   $bRootWindow = Value
-  $hWatcher = New _DesktopWatcher(If($bRootWindow, _Desktop.RootWindow, 0)) As "DesktopWatcher"
+  $hWatcher = New X11Watcher(If($bRootWindow, X11.RootWindow, 0)) As "DesktopWatcher"
 
 End

comp/src/gb.desktop/.src/DesktopWindow.class

@@ -40,8 +40,8 @@ Private Sub GetDimensions()
   Dim aExt As Integer[]
   
   If Not $aDim Then 
-    $aDim = _Desktop.GetWindowGeometry($iId)
-    aExt = _Desktop.GetWindowProperty(Atom["_NET_FRAME_EXTENTS"], $iId)
+    $aDim = X11.GetWindowGeometry($iId)
+    aExt = X11.GetWindowProperty(Atom["_NET_FRAME_EXTENTS"], $iId)
     $aDim[0] -= aExt[0]
     $aDim[1] -= aExt[2]
   Endif
@@ -79,33 +79,33 @@ End
 
 Public Sub Close()
   
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_CLOSE_WINDOW"], [_Desktop.CurrentTime, 2], $iId)
+  X11.SendClientMessageToRootWindow(Atom["_NET_CLOSE_WINDOW"], [X11.CurrentTime, 2], $iId)
   
 End
 
 Public Sub Move(X As Integer, Y As Integer, Optional Width As Integer, Optional Height As Integer)
   
   If Width > 0 And Height > 0 Then
-    _Desktop.SendClientMessageToRootWindow(Atom["_NET_MOVERESIZE_WINDOW"], [&X10111100000000, X, Y, Width, Height], $iId)
+    X11.SendClientMessageToRootWindow(Atom["_NET_MOVERESIZE_WINDOW"], [&X10111100000000, X, Y, Width, Height], $iId)
   Else
-    _Desktop.SendClientMessageToRootWindow(Atom["_NET_MOVERESIZE_WINDOW"], [&X10001100000000, X, Y], $iId)
+    X11.SendClientMessageToRootWindow(Atom["_NET_MOVERESIZE_WINDOW"], [&X10001100000000, X, Y], $iId)
   Endif
-  _Desktop.Flush
+  X11.Flush
   Refresh
   
 End
 
 Public Sub Resize(Width As Integer, Height As Integer)
   
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_MOVERESIZE_WINDOW"], [&X10110000000000, 0, 0, Width, Height], $iId)
-  _Desktop.Flush
+  X11.SendClientMessageToRootWindow(Atom["_NET_MOVERESIZE_WINDOW"], [&X10110000000000, 0, 0, Width, Height], $iId)
+  X11.Flush
   Refresh
   
 End
 
 Private Function Name_Read() As String
 
-  Try Return _Desktop.GetWindowProperty(Atom["_NET_WM_NAME"], $iId)[0]
+  Try Return X11.GetWindowProperty(Atom["_NET_WM_NAME"], $iId)[0]
 
 End
 
@@ -113,44 +113,44 @@ Private Function VisibleName_Read() As String
 
   Dim sName As String
 
-  Try sName = _Desktop.GetWindowProperty(Atom["_NET_WM_VISIBLE_NAME"], $iId)[0]
+  Try sName = X11.GetWindowProperty(Atom["_NET_WM_VISIBLE_NAME"], $iId)[0]
   If Not sName Then Return Name_Read()
 
 End
 
 Private Function Desktop_Read() As Integer
 
-  Try Return _Desktop.GetWindowProperty(Atom["_NET_WM_DESKTOP"], $iId)[0]
+  Try Return X11.GetWindowProperty(Atom["_NET_WM_DESKTOP"], $iId)[0]
 
 End
 
 Private Sub Desktop_Write(Value As Integer)
 
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_WM_DESKTOP"], [Value, 2], $iId)
+  X11.SendClientMessageToRootWindow(Atom["_NET_WM_DESKTOP"], [Value, 2], $iId)
 
 End
 
 Private Function GetState() As String[]
 
-  Return _Desktop.GetWindowProperty(Atom["_NET_WM_STATE"], $iId)
+  Return X11.GetWindowProperty(Atom["_NET_WM_STATE"], $iId)
 
 End
 
 Private Sub SetState(State As String, Optional State2 As String)
   
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_WM_STATE"], [1, Atom[State], Atom[State2], 2], $iId)
+  X11.SendClientMessageToRootWindow(Atom["_NET_WM_STATE"], [1, Atom[State], Atom[State2], 2], $iId)
   
 End
 
 Private Sub ClearState(State As String, Optional State2 As String)
   
-  _Desktop.SendClientMessageToRootWindow(Atom["_NET_WM_STATE"], [0, Atom[State], Atom[State2], 2], $iId)
+  X11.SendClientMessageToRootWindow(Atom["_NET_WM_STATE"], [0, Atom[State], Atom[State2], 2], $iId)
   
 End
 
 ' Private Sub ToggleState(State As String, Optional State2 As String)
 '   
-'   _Desktop.SendClientMessageToRootWindow(Atom["_NET_WM_STATE"], [Atom["_NET_WM_STATE_TOGGLE"], Atom[State], Atom[State2], 2], $iId)
+'   X11.SendClientMessageToRootWindow(Atom["_NET_WM_STATE"], [Atom["_NET_WM_STATE_TOGGLE"], Atom[State], Atom[State2], 2], $iId)
 '   
 ' End
 
@@ -164,8 +164,8 @@ Private Function Icon_Read() As Image
 
   Dim aIcon As Integer[]
 
-  aIcon = _Desktop.GetWindowProperty(Atom["_NET_WM_ICON"], $iId)
-  If aIcon Then Return _Desktop.MakeIcon(aIcon) 
+  aIcon = X11.GetWindowProperty(Atom["_NET_WM_ICON"], $iId)
+  If aIcon Then Return X11.MakeIcon(aIcon) 
 
 End
 
@@ -173,14 +173,14 @@ Private Function Minimized_Read() As Boolean
 
   Dim aProp As Integer[]
 
-  aProp = _Desktop.GetWindowProperty(Atom["WM_STATE"], $iId)
+  aProp = X11.GetWindowProperty(Atom["WM_STATE"], $iId)
   If aProp And If aProp[0] = 3 Then Return True
 
 End
 
 Private Sub Minimized_Write(Value As Boolean)
 
-  _Desktop.MinimizeWindow($iId, Value)
+  X11.MinimizeWindow($iId, Value)
 
 End
 
@@ -269,10 +269,10 @@ Public Sub GetIcon(Width As Integer, Height As Integer) As Image
   Dim aIcon As Integer[]
   Dim hImage As Image
 
-  aIcon = _Desktop.GetWindowProperty(Atom["_NET_WM_ICON"], $iId)
+  aIcon = X11.GetWindowProperty(Atom["_NET_WM_ICON"], $iId)
   If Not aIcon Then Return
   
-  hImage = _Desktop.MakeIcon(aIcon, Width, Height)
+  hImage = X11.MakeIcon(aIcon, Width, Height)
   If hImage Then Return hImage.Stretch(Width, Height)
   
 End

comp/src/gb.desktop/.src/Main.module

@@ -152,22 +152,7 @@ End
 
 Public Sub Main()
 
-  ' Dim hWin As DesktopWindow
-  ' 
-  ' For Each hWin In Desktop.Windows
-  '   'Print hWin.VisibleName
-  '   If hWin.VisibleName Like "gambas3 3.3.0 - *" Then
-  '     Print hWin.X;; hWin.Y;; hWin.Width;; hWin.Height
-  '     hWin.Resize(400, 400)
-  '     hWin.Refresh
-  '     Print hWin.X;; hWin.Y;; hWin.Width;; hWin.Height
-  '   Endif
-  ' Next
-  
-  With DesktopMime.FromFile("~/gambas/3.0/trunk/app/src/gambas3/gambas3.gambas")
-    Print .Type
-    Print .GenericIcon
-  End With
+  Print Desktop.Current
   
 End
 
@@ -175,9 +160,9 @@ End
 
 Public Sub Desktop_Change(Window As Integer, Atom As Integer)
   
-  Debug Window;; _Desktop.GetAtomName(Atom)
+  Debug Window;; X11.GetAtomName(Atom)
   
-  If Window = _Desktop.RootWindow And If Atom = _NET_CLIENT_LIST Then
+  If Window = X11.RootWindow And If Atom = _NET_CLIENT_LIST Then
   Endif
   
 End

comp/src/gb.desktop/.src/Tests/Form1.class

@@ -14,22 +14,22 @@ Public Sub Button1_Click()
   Dim iDesktop As Integer
   Dim hWindow As DesktopWindow
   
-  iCurrentDesktop = _Desktop.GetWindowProperty("_NET_CURRENT_DESKTOP", _Desktop.RootWindow)[0]
+  iCurrentDesktop = X11.GetWindowProperty("_NET_CURRENT_DESKTOP", X11.RootWindow)[0]
 
   For Each hPictureBox In ScrollView1.Children
     hPictureBox.Delete
   Next
 
-  _NET_CLIENT_LIST = _Desktop.InternAtom("_NET_CLIENT_LIST")  
-  _NET_WM_ICON = _Desktop.InternAtom("_NET_WM_ICON")  
-  aWindow = _Desktop.GetWindowProperty(_NET_CLIENT_LIST, _Desktop.RootWindow)
+  _NET_CLIENT_LIST = X11.InternAtom("_NET_CLIENT_LIST")  
+  _NET_WM_ICON = X11.InternAtom("_NET_WM_ICON")  
+  aWindow = X11.GetWindowProperty(_NET_CLIENT_LIST, X11.RootWindow)
   For Each iWindow In aWindow
     hWindow = New DesktopWindow(iWindow)
-    'iDesktop = _Desktop.GetWindowProperty("_NET_WM_DESKTOP", hWindow)[0]
+    'iDesktop = X11.GetWindowProperty("_NET_WM_DESKTOP", hWindow)[0]
     iDesktop = hWindow.Desktop
     'If iDesktop <> iCurrentDesktop And If iDesktop >= 0 Then Continue
     
-    aIcon = _Desktop.GetWindowProperty(_NET_WM_ICON, iWindow)
+    aIcon = X11.GetWindowProperty(_NET_WM_ICON, iWindow)
     hPictureBox = New PictureBox(ScrollView1)
     hPictureBox.Border = Border.Plain
     hPictureBox.Alignment = Align.Center
@@ -53,7 +53,7 @@ Public Sub Button1_Click()
     '   '   If iInd Mod 8 = 7 Then Print
     '   ' Next
     '   
-    '   hImage = _Desktop.MakeIcon(aIcon)
+    '   hImage = X11.MakeIcon(aIcon)
     '   If hImage Then
     '     hPictureBox.Picture = hImage.Picture
     '     hPictureBox.Resize(hImage.W + 4, hImage.H + 4)

comp/src/gb.desktop/.src/_DesktopVirtual.class

@@ -19,11 +19,11 @@ Public Sub Refresh()
   Dim aName As String[]
   Dim iInd As Integer
   
-  aDim = _Desktop.GetWindowProperty(Atom["_NET_WORKAREA"])
+  aDim = X11.GetWindowProperty(Atom["_NET_WORKAREA"])
   iInd = $iIndex * 4
   Try $aGeom = [aDim[iInd], aDim[iInd + 1], aDim[iInd + 2], aDim[iInd + 3]]
   
-  aName = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_NAMES"])
+  aName = X11.GetWindowProperty(Atom["_NET_DESKTOP_NAMES"])
   Try $sName = aName[$iIndex]
   
 End
@@ -67,9 +67,9 @@ Private Sub Name_Write(Value As String)
 
   $sName = Value
 
-  aName = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_NAMES"])
+  aName = X11.GetWindowProperty(Atom["_NET_DESKTOP_NAMES"])
   Try aName[$iIndex] = $sName
-  _Desktop.SetWindowProperty(Atom["_NET_DESKTOP_NAMES"], Atom["UTF8_STRING"], aName)
+  X11.SetWindowProperty(Atom["_NET_DESKTOP_NAMES"], Atom["UTF8_STRING"], aName)
 
 End
 

comp/src/gb.desktop/.src/_Desktop_Passwords.class

@@ -28,7 +28,7 @@ Private Sub OpenWallet()
     
     Case "GNOME", "LXDE", "MATE", "XFCE"
     
-      Component.Load("gb.desktop.gnome")
+      Component.Load("gb.desktop.gnome.keyring")
     
     Case "KDE4"
     

comp/src/gb.desktop/.src/_Desktop_Windows.class

@@ -18,8 +18,8 @@ End
 
 Public Sub Refresh()
   
-  '$aWin = _Desktop.GetWindowProperty(Atom["_NET_CLIENT_LIST"])
-  $aWin = _Desktop.GetWindowProperty(Atom["_NET_CLIENT_LIST_STACKING"])
+  '$aWin = X11.GetWindowProperty(Atom["_NET_CLIENT_LIST"])
+  $aWin = X11.GetWindowProperty(Atom["_NET_CLIENT_LIST_STACKING"])
   If Not $aWin Then $aWin = New Integer[]
   $cWin = Null
   

comp/src/gb.desktop/.startup

@@ -0,0 +1,11 @@
+Main
+Desktop-neutral routines from Portland project
+0
+0
+3.5.90
+
+gb.image
+gb.gui
+gb.desktop
+gb.desktop.x11
+

comp/src/gb.form/.src/File/Chooser/FDirChooser.class

@@ -256,6 +256,8 @@ End
 
 Public Sub SetDir(sDir As String)
 
+  If sDir = dvwChoose.Current Then Return
+
   If IsBookmarkVisible() Then
     SetBookmark($hBookmarkList.FindBest(sDir))
   Endif

comp/src/order

@@ -1,2 +1 @@
-gb.eval.highlight gb.args gb.settings gb.gui.base gb.form gb.form.stock gb.form.dialog gb.form.mdi gb.db.form gb.web gb.report gb.chart 
-gb.mysql gb.net.pop3 gb.memcached gb.map gb.logging gb.markdown
+gb.eval.highlight gb.args gb.settings gb.gui.base gb.form gb.form.stock gb.form.dialog gb.form.mdi gb.db.form gb.desktop gb.web gb.report gb.chart gb.mysql gb.net.pop3 gb.memcached gb.map gb.logging gb.markdown

configure.ac

@@ -33,7 +33,8 @@ GB_CONFIG_SUBDIRS(qt4, gb.qt4)
 GB_CONFIG_SUBDIRS(gtk, gb.gtk)
 GB_CONFIG_SUBDIRS(gtk3, gb.gtk3)
 GB_CONFIG_SUBDIRS(opengl, gb.opengl)
-GB_CONFIG_SUBDIRS(desktop, gb.desktop)
+GB_CONFIG_SUBDIRS(x11, gb.desktop.x11)
+GB_CONFIG_SUBDIRS(keyring, gb.desktop.gnome.keyring)
 GB_CONFIG_SUBDIRS(pdf, gb.pdf)
 GB_CONFIG_SUBDIRS(cairo, gb.cairo)
 GB_CONFIG_SUBDIRS(imageio, gb.image.io)

examples/examples/Drawing/QuasiRegular/.src/FMain.class

@@ -6,7 +6,7 @@ Private Const GRID_SIZE As Integer = 64
 
 Fast Private Sub Compute()
   
-  Dim hImage As New Image(1920, 1080, Color.White)
+  Dim hImage As New Image(3840, 2160, Color.White)
   Dim I, J As Integer
   Dim X, Y, XR, YR As Float
   Dim CA, SA As Float

gb.desktop.gnome.keyring/Makefile.am

@@ -0,0 +1,3 @@
+ACLOCAL_AMFLAGS = -I m4 --install
+SUBDIRS = @DESKTOP_GNOME_KEYRING_DIR@
+EXTRA_DIST = reconf gambas.h gb*.h

gb.desktop.gnome.keyring/configure.ac

@@ -0,0 +1,18 @@
+dnl ---- configure.ac for gb.desktop.gnome.keyring
+
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-desktop-gnome-keyring, GB_VERSION, GB_MAIL, [], GB_URL)
+AC_CONFIG_MACRO_DIR([m4])
+
+GB_INIT(gb.desktop.gnome.keyring)
+AC_PROG_LIBTOOL
+
+GB_COMPONENT_PKG_CONFIG(
+  gb_desktop_gnome_keyring,
+  DESKTOP_GNOME_KEYRING,
+  gb.desktop.gnome.keyring,
+  [src],
+  gnome-keyring-1)
+
+AC_OUTPUT( Makefile src/Makefile )
+GB_PRINT_MESSAGES

gb.desktop.gnome.keyring/src/Makefile.am

@@ -0,0 +1,11 @@
+COMPONENT = gb.desktop.gnome.keyring
+include $(top_srcdir)/component.am
+
+gblib_LTLIBRARIES = gb.desktop.gnome.keyring.la
+
+gb_desktop_gnome_keyring_la_LIBADD = @DESKTOP_GNOME_KEYRING_LIB@
+gb_desktop_gnome_keyring_la_LDFLAGS = -module @LD_FLAGS@ @DESKTOP_GNOME_KEYRING_LDFLAGS@
+gb_desktop_gnome_keyring_la_CPPFLAGS = @DESKTOP_GNOME_KEYRING_INC@ 
+
+gb_desktop_gnome_keyring_la_SOURCES = main.h main.c keyring.c keyring.h
+

gb.desktop.gnome.keyring/src/gb.desktop.gnome.keyring.component

@@ -1,4 +1,3 @@
 [Component]
-Key=gb.desktop.component
 State=Stable
 Requires=gb.desktop

gb.desktop.x11/COPYING

@@ -0,0 +1 @@
+../COPYING

gb.desktop.x11/INSTALL

@@ -0,0 +1 @@
+../INSTALL

gb.desktop.x11/Makefile.am

@@ -1,3 +1,3 @@
 ACLOCAL_AMFLAGS = -I m4 --install
-SUBDIRS = @DESKTOP_DIR@
+SUBDIRS = @DESKTOP_X11_DIR@
 EXTRA_DIST = reconf gambas.h gb*.h

gb.desktop.x11/acinclude.m4

@@ -0,0 +1 @@
+../acinclude.m4

gb.desktop.x11/component.am

@@ -0,0 +1 @@
+../component.am

gb.desktop.x11/configure.ac

@@ -0,0 +1,23 @@
+dnl ---- configure.ac for gb.desktop.x11
+
+m4_include([../version.m4])
+AC_INIT(gambas3-gb-desktop-x11, GB_VERSION, GB_MAIL, [], GB_URL)
+AC_CONFIG_MACRO_DIR([m4])
+GB_INIT(gb.desktop.x11)
+
+AC_PROG_LIBTOOL
+GB_CHECK_XWINDOW
+AC_CHECK_LIB(Xtst, XTestQueryExtension, [X_LIBS="$X_LIBS -lXtst"], [touch DISABLED], [$X_LIBS])
+
+GB_COMPONENT(
+  desktop_x11,
+  DESKTOP_X11,
+  gb.desktop.x11,
+  [src],
+  [],
+  [],
+  [$C_LIB $THREAD_LIB $X_LIBS],
+  [$THREAD_INC])
+
+AC_OUTPUT( Makefile src/Makefile )
+GB_PRINT_MESSAGES

gb.desktop.x11/gambas.h

@@ -0,0 +1 @@
+../main/share/gambas.h