From eb9e30e1ac4cc63f447061810fdb2cc7da4743de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Mon, 12 May 2014 23:38:46 +0000 Subject: [PATCH] [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 | 3 +- .../gambas3/.src/Component/CComponent.class | 3 +- .../src/gb.desktop/.component | 0 .../src/gb.desktop/.directory | 0 .../.hidden/control/desktopwatcher.png | Bin .../.hidden/xdg-utils-1.0.2/LICENSE | 0 .../.hidden/xdg-utils-1.0.2/scripts/README | 0 .../xdg-utils-1.0.2/scripts/xdg-desktop-icon | 0 .../xdg-utils-1.0.2/scripts/xdg-desktop-menu | 0 .../.hidden/xdg-utils-1.0.2/scripts/xdg-email | 0 .../xdg-utils-1.0.2/scripts/xdg-icon-resource | 0 .../.hidden/xdg-utils-1.0.2/scripts/xdg-mime | 0 .../.hidden/xdg-utils-1.0.2/scripts/xdg-open | 0 .../xdg-utils-1.0.2/scripts/xdg-screensaver | 0 .../xdg-utils-1.0.3.pre.patch/xdg-email | 0 .../.hidden/xdg-utils-1.0.3.pre/xdg-copy | 0 .../xdg-utils-1.0.3.pre/xdg-desktop-icon | 0 .../xdg-utils-1.0.3.pre/xdg-desktop-menu | 0 .../.hidden/xdg-utils-1.0.3.pre/xdg-email | 0 .../xdg-utils-1.0.3.pre/xdg-file-dialog | 0 .../xdg-utils-1.0.3.pre/xdg-icon-resource | 0 .../.hidden/xdg-utils-1.0.3.pre/xdg-mime | 0 .../.hidden/xdg-utils-1.0.3.pre/xdg-open | 0 .../xdg-utils-1.0.3.pre/xdg-screensaver | 0 .../.hidden/xdg-utils-1.0.3.pre/xdg-settings | 0 .../.hidden/xdg-utils-1.0.3.pre/xdg-su | 0 .../.hidden/xdg-utils-1.0.3.pre/xdg-terminal | 0 {gb.desktop => comp}/src/gb.desktop/.icon.png | Bin {gb.desktop => comp}/src/gb.desktop/.info | 0 {gb.desktop => comp}/src/gb.desktop/.list | 0 {gb.desktop => comp}/src/gb.desktop/.project | 1 + comp/src/gb.desktop/.settings | 24 ++++++ .../src/gb.desktop/.src/Atom.class | 2 +- .../src/gb.desktop/.src/Desktop.class | 36 ++++---- .../src/gb.desktop/.src/DesktopFile.class | 0 .../src/gb.desktop/.src/DesktopMime.class | 0 .../src/gb.desktop/.src/DesktopWatcher.class | 10 +-- .../src/gb.desktop/.src/DesktopWindow.class | 44 +++++----- .../src/gb.desktop/.src/Main.module | 21 +---- .../src/gb.desktop/.src/Tests/Form1.class | 14 +-- .../src/gb.desktop/.src/Tests/Form1.form | 0 .../src/gb.desktop/.src/Tests/Form11.class | 0 .../src/gb.desktop/.src/Tests/Form11.form | 0 .../src/gb.desktop/.src/Tests/Form2.class | 0 .../src/gb.desktop/.src/Tests/Form2.form | 0 .../src/gb.desktop/.src/_DesktopIcons.class | 0 .../src/gb.desktop/.src/_DesktopMenus.class | 0 .../src/gb.desktop/.src/_DesktopVirtual.class | 8 +- .../gb.desktop/.src/_Desktop_Passwords.class | 2 +- .../.src/_Desktop_ScreenSaver.class | 0 .../gb.desktop/.src/_Desktop_Windows.class | 4 +- comp/src/gb.desktop/.startup | 11 +++ .../src/gb.desktop/xdg-utils/xdg-copy | 0 .../src/gb.desktop/xdg-utils/xdg-desktop-icon | 0 .../src/gb.desktop/xdg-utils/xdg-desktop-menu | 0 .../src/gb.desktop/xdg-utils/xdg-email | 0 .../src/gb.desktop/xdg-utils/xdg-file-dialog | 0 .../gb.desktop/xdg-utils/xdg-icon-resource | 0 .../src/gb.desktop/xdg-utils/xdg-mime | 0 .../src/gb.desktop/xdg-utils/xdg-open | 0 .../src/gb.desktop/xdg-utils/xdg-screensaver | 0 .../src/gb.desktop/xdg-utils/xdg-settings | 0 .../src/gb.desktop/xdg-utils/xdg-su | 0 .../src/gb.desktop/xdg-utils/xdg-terminal | 0 .../.src/File/Chooser/FDirChooser.class | 2 + comp/src/order | 3 +- configure.ac | 3 +- .../Drawing/QuasiRegular/.src/FMain.class | 2 +- .../AUTHORS | 0 .../COPYING | 0 .../ChangeLog | 0 .../INSTALL | 0 gb.desktop.gnome.keyring/Makefile.am | 3 + {gb.desktop => gb.desktop.gnome.keyring}/NEWS | 0 .../README | 0 .../acinclude.m4 | 0 .../component.am | 0 gb.desktop.gnome.keyring/configure.ac | 18 ++++ .../gambas.h | 0 .../gb_common.h | 0 {gb.desktop => gb.desktop.gnome.keyring}/m4 | 0 .../missing | 0 .../reconf | 0 gb.desktop.gnome.keyring/src/Makefile.am | 11 +++ .../src/gb.desktop.gnome.keyring.component | 1 - .../src}/keyring.c | 0 .../src}/keyring.h | 0 .../src}/main.c | 0 .../src}/main.h | 0 gb.desktop.x11/AUTHORS | 0 gb.desktop.x11/COPYING | 1 + gb.desktop.x11/ChangeLog | 0 gb.desktop.x11/INSTALL | 1 + {gb.desktop => gb.desktop.x11}/Makefile.am | 2 +- gb.desktop.x11/NEWS | 0 gb.desktop.x11/README | 0 gb.desktop.x11/acinclude.m4 | 1 + gb.desktop.x11/component.am | 1 + gb.desktop.x11/configure.ac | 23 +++++ gb.desktop.x11/gambas.h | 1 + {gb.desktop => gb.desktop.x11}/gb.image.h | 0 gb.desktop.x11/gb_common.h | 1 + gb.desktop.x11/m4 | 1 + gb.desktop.x11/missing | 1 + gb.desktop.x11/reconf | 1 + gb.desktop.x11/src/Makefile.am | 14 +++ {gb.desktop => gb.desktop.x11}/src/desktop.c | 80 +++++++++--------- {gb.desktop => gb.desktop.x11}/src/desktop.h | 4 +- gb.desktop.x11/src/gb.desktop.x11.component | 4 + {gb.desktop => gb.desktop.x11}/src/gb_list.c | 0 {gb.desktop => gb.desktop.x11}/src/main.c | 4 +- {gb.desktop => gb.desktop.x11}/src/main.h | 0 {gb.desktop => gb.desktop.x11}/src/x11.c | 0 {gb.desktop => gb.desktop.x11}/src/x11.h | 0 gb.desktop/configure.ac | 31 ------- gb.desktop/gb_list.h | 1 - gb.desktop/gb_list_temp.h | 1 - gb.desktop/src/Makefile.am | 16 ---- gb.desktop/src/gb.desktop.component | 1 - gb.desktop/src/gnome/Makefile.am | 11 --- 120 files changed, 236 insertions(+), 191 deletions(-) rename {gb.desktop => comp}/src/gb.desktop/.component (100%) rename {gb.desktop => comp}/src/gb.desktop/.directory (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/control/desktopwatcher.png (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/LICENSE (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/README (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-icon (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-menu (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-email (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-icon-resource (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-mime (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-open (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-screensaver (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre.patch/xdg-email (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-copy (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-icon (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-menu (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-email (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-file-dialog (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-icon-resource (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-mime (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-open (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-screensaver (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-settings (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-su (100%) rename {gb.desktop => comp}/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-terminal (100%) rename {gb.desktop => comp}/src/gb.desktop/.icon.png (100%) rename {gb.desktop => comp}/src/gb.desktop/.info (100%) rename {gb.desktop => comp}/src/gb.desktop/.list (100%) rename {gb.desktop => comp}/src/gb.desktop/.project (93%) create mode 100644 comp/src/gb.desktop/.settings rename {gb.desktop => comp}/src/gb.desktop/.src/Atom.class (84%) rename {gb.desktop => comp}/src/gb.desktop/.src/Desktop.class (90%) rename {gb.desktop => comp}/src/gb.desktop/.src/DesktopFile.class (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/DesktopMime.class (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/DesktopWatcher.class (87%) rename {gb.desktop => comp}/src/gb.desktop/.src/DesktopWindow.class (71%) rename {gb.desktop => comp}/src/gb.desktop/.src/Main.module (86%) rename {gb.desktop => comp}/src/gb.desktop/.src/Tests/Form1.class (77%) rename {gb.desktop => comp}/src/gb.desktop/.src/Tests/Form1.form (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/Tests/Form11.class (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/Tests/Form11.form (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/Tests/Form2.class (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/Tests/Form2.form (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/_DesktopIcons.class (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/_DesktopMenus.class (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/_DesktopVirtual.class (82%) rename {gb.desktop => comp}/src/gb.desktop/.src/_Desktop_Passwords.class (98%) rename {gb.desktop => comp}/src/gb.desktop/.src/_Desktop_ScreenSaver.class (100%) rename {gb.desktop => comp}/src/gb.desktop/.src/_Desktop_Windows.class (89%) create mode 100644 comp/src/gb.desktop/.startup rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-copy (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-desktop-icon (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-desktop-menu (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-email (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-file-dialog (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-icon-resource (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-mime (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-open (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-screensaver (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-settings (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-su (100%) rename {gb.desktop => comp}/src/gb.desktop/xdg-utils/xdg-terminal (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/AUTHORS (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/COPYING (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/ChangeLog (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/INSTALL (100%) create mode 100644 gb.desktop.gnome.keyring/Makefile.am rename {gb.desktop => gb.desktop.gnome.keyring}/NEWS (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/README (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/acinclude.m4 (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/component.am (100%) create mode 100644 gb.desktop.gnome.keyring/configure.ac rename {gb.desktop => gb.desktop.gnome.keyring}/gambas.h (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/gb_common.h (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/m4 (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/missing (100%) rename {gb.desktop => gb.desktop.gnome.keyring}/reconf (100%) create mode 100644 gb.desktop.gnome.keyring/src/Makefile.am rename gb.desktop/src/gnome/gb.desktop.gnome.component => gb.desktop.gnome.keyring/src/gb.desktop.gnome.keyring.component (64%) rename {gb.desktop/src/gnome => gb.desktop.gnome.keyring/src}/keyring.c (100%) rename {gb.desktop/src/gnome => gb.desktop.gnome.keyring/src}/keyring.h (100%) rename {gb.desktop/src/gnome => gb.desktop.gnome.keyring/src}/main.c (100%) rename {gb.desktop/src/gnome => gb.desktop.gnome.keyring/src}/main.h (100%) create mode 100644 gb.desktop.x11/AUTHORS create mode 120000 gb.desktop.x11/COPYING create mode 100644 gb.desktop.x11/ChangeLog create mode 120000 gb.desktop.x11/INSTALL rename {gb.desktop => gb.desktop.x11}/Makefile.am (71%) create mode 100644 gb.desktop.x11/NEWS create mode 100644 gb.desktop.x11/README create mode 120000 gb.desktop.x11/acinclude.m4 create mode 120000 gb.desktop.x11/component.am create mode 100644 gb.desktop.x11/configure.ac create mode 120000 gb.desktop.x11/gambas.h rename {gb.desktop => gb.desktop.x11}/gb.image.h (100%) create mode 120000 gb.desktop.x11/gb_common.h create mode 120000 gb.desktop.x11/m4 create mode 120000 gb.desktop.x11/missing create mode 120000 gb.desktop.x11/reconf create mode 100644 gb.desktop.x11/src/Makefile.am rename {gb.desktop => gb.desktop.x11}/src/desktop.c (84%) rename {gb.desktop => gb.desktop.x11}/src/desktop.h (94%) create mode 100644 gb.desktop.x11/src/gb.desktop.x11.component rename {gb.desktop => gb.desktop.x11}/src/gb_list.c (100%) rename {gb.desktop => gb.desktop.x11}/src/main.c (97%) rename {gb.desktop => gb.desktop.x11}/src/main.h (100%) rename {gb.desktop => gb.desktop.x11}/src/x11.c (100%) rename {gb.desktop => gb.desktop.x11}/src/x11.h (100%) delete mode 100644 gb.desktop/configure.ac delete mode 120000 gb.desktop/gb_list.h delete mode 120000 gb.desktop/gb_list_temp.h delete mode 100644 gb.desktop/src/Makefile.am delete mode 120000 gb.desktop/src/gb.desktop.component delete mode 100644 gb.desktop/src/gnome/Makefile.am diff --git a/Makefile.am b/Makefile.am index 680240e76..07a198e83 100644 --- a/Makefile.am +++ b/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@ \ diff --git a/app/src/gambas3/.src/Component/CComponent.class b/app/src/gambas3/.src/Component/CComponent.class index f91f2ace4..2e6e61623 100644 --- a/app/src/gambas3/.src/Component/CComponent.class +++ b/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") diff --git a/gb.desktop/src/gb.desktop/.component b/comp/src/gb.desktop/.component similarity index 100% rename from gb.desktop/src/gb.desktop/.component rename to comp/src/gb.desktop/.component diff --git a/gb.desktop/src/gb.desktop/.directory b/comp/src/gb.desktop/.directory similarity index 100% rename from gb.desktop/src/gb.desktop/.directory rename to comp/src/gb.desktop/.directory diff --git a/gb.desktop/src/gb.desktop/.hidden/control/desktopwatcher.png b/comp/src/gb.desktop/.hidden/control/desktopwatcher.png similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/control/desktopwatcher.png rename to comp/src/gb.desktop/.hidden/control/desktopwatcher.png diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/LICENSE b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/LICENSE similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/LICENSE rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/LICENSE diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/README b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/README similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/README rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/README diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-icon b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-icon similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-icon rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-icon diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-menu b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-menu similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-menu rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-desktop-menu diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-email b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-email similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-email rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-email diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-icon-resource b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-icon-resource similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-icon-resource rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-icon-resource diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-mime b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-mime similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-mime rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-mime diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-open b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-open similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-open rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-open diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-screensaver b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-screensaver similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-screensaver rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.2/scripts/xdg-screensaver diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre.patch/xdg-email b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre.patch/xdg-email similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre.patch/xdg-email rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre.patch/xdg-email diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-copy b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-copy similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-copy rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-copy diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-icon b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-icon similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-icon rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-icon diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-menu b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-menu similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-menu rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-desktop-menu diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-email b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-email similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-email rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-email diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-file-dialog b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-file-dialog similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-file-dialog rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-file-dialog diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-icon-resource b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-icon-resource similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-icon-resource rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-icon-resource diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-mime b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-mime similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-mime rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-mime diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-open b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-open similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-open rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-open diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-screensaver b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-screensaver similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-screensaver rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-screensaver diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-settings b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-settings similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-settings rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-settings diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-su b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-su similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-su rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-su diff --git a/gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-terminal b/comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-terminal similarity index 100% rename from gb.desktop/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-terminal rename to comp/src/gb.desktop/.hidden/xdg-utils-1.0.3.pre/xdg-terminal diff --git a/gb.desktop/src/gb.desktop/.icon.png b/comp/src/gb.desktop/.icon.png similarity index 100% rename from gb.desktop/src/gb.desktop/.icon.png rename to comp/src/gb.desktop/.icon.png diff --git a/gb.desktop/src/gb.desktop/.info b/comp/src/gb.desktop/.info similarity index 100% rename from gb.desktop/src/gb.desktop/.info rename to comp/src/gb.desktop/.info diff --git a/gb.desktop/src/gb.desktop/.list b/comp/src/gb.desktop/.list similarity index 100% rename from gb.desktop/src/gb.desktop/.list rename to comp/src/gb.desktop/.list diff --git a/gb.desktop/src/gb.desktop/.project b/comp/src/gb.desktop/.project similarity index 93% rename from gb.desktop/src/gb.desktop/.project rename to comp/src/gb.desktop/.project index dc09e912e..69697da6c 100644 --- a/gb.desktop/src/gb.desktop/.project +++ b/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 diff --git a/comp/src/gb.desktop/.settings b/comp/src/gb.desktop/.settings new file mode 100644 index 000000000..776a9469f --- /dev/null +++ b/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 + diff --git a/gb.desktop/src/gb.desktop/.src/Atom.class b/comp/src/gb.desktop/.src/Atom.class similarity index 84% rename from gb.desktop/src/gb.desktop/.src/Atom.class rename to comp/src/gb.desktop/.src/Atom.class index 555f2a2fe..275972788 100644 --- a/gb.desktop/src/gb.desktop/.src/Atom.class +++ b/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 diff --git a/gb.desktop/src/gb.desktop/.src/Desktop.class b/comp/src/gb.desktop/.src/Desktop.class similarity index 90% rename from gb.desktop/src/gb.desktop/.src/Desktop.class rename to comp/src/gb.desktop/.src/Desktop.class index 487ed3883..bb6b01357 100644 --- a/gb.desktop/src/gb.desktop/.src/Desktop.class +++ b/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 diff --git a/gb.desktop/src/gb.desktop/.src/DesktopFile.class b/comp/src/gb.desktop/.src/DesktopFile.class similarity index 100% rename from gb.desktop/src/gb.desktop/.src/DesktopFile.class rename to comp/src/gb.desktop/.src/DesktopFile.class diff --git a/gb.desktop/src/gb.desktop/.src/DesktopMime.class b/comp/src/gb.desktop/.src/DesktopMime.class similarity index 100% rename from gb.desktop/src/gb.desktop/.src/DesktopMime.class rename to comp/src/gb.desktop/.src/DesktopMime.class diff --git a/gb.desktop/src/gb.desktop/.src/DesktopWatcher.class b/comp/src/gb.desktop/.src/DesktopWatcher.class similarity index 87% rename from gb.desktop/src/gb.desktop/.src/DesktopWatcher.class rename to comp/src/gb.desktop/.src/DesktopWatcher.class index 1ad4d3b51..3096d910f 100644 --- a/gb.desktop/src/gb.desktop/.src/DesktopWatcher.class +++ b/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 diff --git a/gb.desktop/src/gb.desktop/.src/DesktopWindow.class b/comp/src/gb.desktop/.src/DesktopWindow.class similarity index 71% rename from gb.desktop/src/gb.desktop/.src/DesktopWindow.class rename to comp/src/gb.desktop/.src/DesktopWindow.class index 4eadd25fe..7122bb69c 100644 --- a/gb.desktop/src/gb.desktop/.src/DesktopWindow.class +++ b/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 diff --git a/gb.desktop/src/gb.desktop/.src/Main.module b/comp/src/gb.desktop/.src/Main.module similarity index 86% rename from gb.desktop/src/gb.desktop/.src/Main.module rename to comp/src/gb.desktop/.src/Main.module index 66c0ab541..ac490deba 100644 --- a/gb.desktop/src/gb.desktop/.src/Main.module +++ b/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 diff --git a/gb.desktop/src/gb.desktop/.src/Tests/Form1.class b/comp/src/gb.desktop/.src/Tests/Form1.class similarity index 77% rename from gb.desktop/src/gb.desktop/.src/Tests/Form1.class rename to comp/src/gb.desktop/.src/Tests/Form1.class index 271602a20..62912ff54 100644 --- a/gb.desktop/src/gb.desktop/.src/Tests/Form1.class +++ b/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) diff --git a/gb.desktop/src/gb.desktop/.src/Tests/Form1.form b/comp/src/gb.desktop/.src/Tests/Form1.form similarity index 100% rename from gb.desktop/src/gb.desktop/.src/Tests/Form1.form rename to comp/src/gb.desktop/.src/Tests/Form1.form diff --git a/gb.desktop/src/gb.desktop/.src/Tests/Form11.class b/comp/src/gb.desktop/.src/Tests/Form11.class similarity index 100% rename from gb.desktop/src/gb.desktop/.src/Tests/Form11.class rename to comp/src/gb.desktop/.src/Tests/Form11.class diff --git a/gb.desktop/src/gb.desktop/.src/Tests/Form11.form b/comp/src/gb.desktop/.src/Tests/Form11.form similarity index 100% rename from gb.desktop/src/gb.desktop/.src/Tests/Form11.form rename to comp/src/gb.desktop/.src/Tests/Form11.form diff --git a/gb.desktop/src/gb.desktop/.src/Tests/Form2.class b/comp/src/gb.desktop/.src/Tests/Form2.class similarity index 100% rename from gb.desktop/src/gb.desktop/.src/Tests/Form2.class rename to comp/src/gb.desktop/.src/Tests/Form2.class diff --git a/gb.desktop/src/gb.desktop/.src/Tests/Form2.form b/comp/src/gb.desktop/.src/Tests/Form2.form similarity index 100% rename from gb.desktop/src/gb.desktop/.src/Tests/Form2.form rename to comp/src/gb.desktop/.src/Tests/Form2.form diff --git a/gb.desktop/src/gb.desktop/.src/_DesktopIcons.class b/comp/src/gb.desktop/.src/_DesktopIcons.class similarity index 100% rename from gb.desktop/src/gb.desktop/.src/_DesktopIcons.class rename to comp/src/gb.desktop/.src/_DesktopIcons.class diff --git a/gb.desktop/src/gb.desktop/.src/_DesktopMenus.class b/comp/src/gb.desktop/.src/_DesktopMenus.class similarity index 100% rename from gb.desktop/src/gb.desktop/.src/_DesktopMenus.class rename to comp/src/gb.desktop/.src/_DesktopMenus.class diff --git a/gb.desktop/src/gb.desktop/.src/_DesktopVirtual.class b/comp/src/gb.desktop/.src/_DesktopVirtual.class similarity index 82% rename from gb.desktop/src/gb.desktop/.src/_DesktopVirtual.class rename to comp/src/gb.desktop/.src/_DesktopVirtual.class index 2380f8190..352c9cde5 100644 --- a/gb.desktop/src/gb.desktop/.src/_DesktopVirtual.class +++ b/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 diff --git a/gb.desktop/src/gb.desktop/.src/_Desktop_Passwords.class b/comp/src/gb.desktop/.src/_Desktop_Passwords.class similarity index 98% rename from gb.desktop/src/gb.desktop/.src/_Desktop_Passwords.class rename to comp/src/gb.desktop/.src/_Desktop_Passwords.class index f54b026bf..95098325b 100644 --- a/gb.desktop/src/gb.desktop/.src/_Desktop_Passwords.class +++ b/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" diff --git a/gb.desktop/src/gb.desktop/.src/_Desktop_ScreenSaver.class b/comp/src/gb.desktop/.src/_Desktop_ScreenSaver.class similarity index 100% rename from gb.desktop/src/gb.desktop/.src/_Desktop_ScreenSaver.class rename to comp/src/gb.desktop/.src/_Desktop_ScreenSaver.class diff --git a/gb.desktop/src/gb.desktop/.src/_Desktop_Windows.class b/comp/src/gb.desktop/.src/_Desktop_Windows.class similarity index 89% rename from gb.desktop/src/gb.desktop/.src/_Desktop_Windows.class rename to comp/src/gb.desktop/.src/_Desktop_Windows.class index 325f72ce3..e5981c6a8 100644 --- a/gb.desktop/src/gb.desktop/.src/_Desktop_Windows.class +++ b/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 diff --git a/comp/src/gb.desktop/.startup b/comp/src/gb.desktop/.startup new file mode 100644 index 000000000..922a029a0 --- /dev/null +++ b/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 + diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-copy b/comp/src/gb.desktop/xdg-utils/xdg-copy similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-copy rename to comp/src/gb.desktop/xdg-utils/xdg-copy diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-desktop-icon b/comp/src/gb.desktop/xdg-utils/xdg-desktop-icon similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-desktop-icon rename to comp/src/gb.desktop/xdg-utils/xdg-desktop-icon diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-desktop-menu b/comp/src/gb.desktop/xdg-utils/xdg-desktop-menu similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-desktop-menu rename to comp/src/gb.desktop/xdg-utils/xdg-desktop-menu diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-email b/comp/src/gb.desktop/xdg-utils/xdg-email similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-email rename to comp/src/gb.desktop/xdg-utils/xdg-email diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-file-dialog b/comp/src/gb.desktop/xdg-utils/xdg-file-dialog similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-file-dialog rename to comp/src/gb.desktop/xdg-utils/xdg-file-dialog diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-icon-resource b/comp/src/gb.desktop/xdg-utils/xdg-icon-resource similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-icon-resource rename to comp/src/gb.desktop/xdg-utils/xdg-icon-resource diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-mime b/comp/src/gb.desktop/xdg-utils/xdg-mime similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-mime rename to comp/src/gb.desktop/xdg-utils/xdg-mime diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-open b/comp/src/gb.desktop/xdg-utils/xdg-open similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-open rename to comp/src/gb.desktop/xdg-utils/xdg-open diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-screensaver b/comp/src/gb.desktop/xdg-utils/xdg-screensaver similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-screensaver rename to comp/src/gb.desktop/xdg-utils/xdg-screensaver diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-settings b/comp/src/gb.desktop/xdg-utils/xdg-settings similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-settings rename to comp/src/gb.desktop/xdg-utils/xdg-settings diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-su b/comp/src/gb.desktop/xdg-utils/xdg-su similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-su rename to comp/src/gb.desktop/xdg-utils/xdg-su diff --git a/gb.desktop/src/gb.desktop/xdg-utils/xdg-terminal b/comp/src/gb.desktop/xdg-utils/xdg-terminal similarity index 100% rename from gb.desktop/src/gb.desktop/xdg-utils/xdg-terminal rename to comp/src/gb.desktop/xdg-utils/xdg-terminal diff --git a/comp/src/gb.form/.src/File/Chooser/FDirChooser.class b/comp/src/gb.form/.src/File/Chooser/FDirChooser.class index 09d499af0..48b8ea082 100644 --- a/comp/src/gb.form/.src/File/Chooser/FDirChooser.class +++ b/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 diff --git a/comp/src/order b/comp/src/order index fbf433f1d..b7595e3fe 100644 --- a/comp/src/order +++ b/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 diff --git a/configure.ac b/configure.ac index 8eeee49b6..a4edcb196 100644 --- a/configure.ac +++ b/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) diff --git a/examples/examples/Drawing/QuasiRegular/.src/FMain.class b/examples/examples/Drawing/QuasiRegular/.src/FMain.class index d1caa0ff9..fb6c078d2 100644 --- a/examples/examples/Drawing/QuasiRegular/.src/FMain.class +++ b/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 diff --git a/gb.desktop/AUTHORS b/gb.desktop.gnome.keyring/AUTHORS similarity index 100% rename from gb.desktop/AUTHORS rename to gb.desktop.gnome.keyring/AUTHORS diff --git a/gb.desktop/COPYING b/gb.desktop.gnome.keyring/COPYING similarity index 100% rename from gb.desktop/COPYING rename to gb.desktop.gnome.keyring/COPYING diff --git a/gb.desktop/ChangeLog b/gb.desktop.gnome.keyring/ChangeLog similarity index 100% rename from gb.desktop/ChangeLog rename to gb.desktop.gnome.keyring/ChangeLog diff --git a/gb.desktop/INSTALL b/gb.desktop.gnome.keyring/INSTALL similarity index 100% rename from gb.desktop/INSTALL rename to gb.desktop.gnome.keyring/INSTALL diff --git a/gb.desktop.gnome.keyring/Makefile.am b/gb.desktop.gnome.keyring/Makefile.am new file mode 100644 index 000000000..6ebcb7006 --- /dev/null +++ b/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 diff --git a/gb.desktop/NEWS b/gb.desktop.gnome.keyring/NEWS similarity index 100% rename from gb.desktop/NEWS rename to gb.desktop.gnome.keyring/NEWS diff --git a/gb.desktop/README b/gb.desktop.gnome.keyring/README similarity index 100% rename from gb.desktop/README rename to gb.desktop.gnome.keyring/README diff --git a/gb.desktop/acinclude.m4 b/gb.desktop.gnome.keyring/acinclude.m4 similarity index 100% rename from gb.desktop/acinclude.m4 rename to gb.desktop.gnome.keyring/acinclude.m4 diff --git a/gb.desktop/component.am b/gb.desktop.gnome.keyring/component.am similarity index 100% rename from gb.desktop/component.am rename to gb.desktop.gnome.keyring/component.am diff --git a/gb.desktop.gnome.keyring/configure.ac b/gb.desktop.gnome.keyring/configure.ac new file mode 100644 index 000000000..ab0ed91fd --- /dev/null +++ b/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 diff --git a/gb.desktop/gambas.h b/gb.desktop.gnome.keyring/gambas.h similarity index 100% rename from gb.desktop/gambas.h rename to gb.desktop.gnome.keyring/gambas.h diff --git a/gb.desktop/gb_common.h b/gb.desktop.gnome.keyring/gb_common.h similarity index 100% rename from gb.desktop/gb_common.h rename to gb.desktop.gnome.keyring/gb_common.h diff --git a/gb.desktop/m4 b/gb.desktop.gnome.keyring/m4 similarity index 100% rename from gb.desktop/m4 rename to gb.desktop.gnome.keyring/m4 diff --git a/gb.desktop/missing b/gb.desktop.gnome.keyring/missing similarity index 100% rename from gb.desktop/missing rename to gb.desktop.gnome.keyring/missing diff --git a/gb.desktop/reconf b/gb.desktop.gnome.keyring/reconf similarity index 100% rename from gb.desktop/reconf rename to gb.desktop.gnome.keyring/reconf diff --git a/gb.desktop.gnome.keyring/src/Makefile.am b/gb.desktop.gnome.keyring/src/Makefile.am new file mode 100644 index 000000000..37f244f8d --- /dev/null +++ b/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 + diff --git a/gb.desktop/src/gnome/gb.desktop.gnome.component b/gb.desktop.gnome.keyring/src/gb.desktop.gnome.keyring.component similarity index 64% rename from gb.desktop/src/gnome/gb.desktop.gnome.component rename to gb.desktop.gnome.keyring/src/gb.desktop.gnome.keyring.component index 866c69ba4..978cabe61 100644 --- a/gb.desktop/src/gnome/gb.desktop.gnome.component +++ b/gb.desktop.gnome.keyring/src/gb.desktop.gnome.keyring.component @@ -1,4 +1,3 @@ [Component] -Key=gb.desktop.component State=Stable Requires=gb.desktop diff --git a/gb.desktop/src/gnome/keyring.c b/gb.desktop.gnome.keyring/src/keyring.c similarity index 100% rename from gb.desktop/src/gnome/keyring.c rename to gb.desktop.gnome.keyring/src/keyring.c diff --git a/gb.desktop/src/gnome/keyring.h b/gb.desktop.gnome.keyring/src/keyring.h similarity index 100% rename from gb.desktop/src/gnome/keyring.h rename to gb.desktop.gnome.keyring/src/keyring.h diff --git a/gb.desktop/src/gnome/main.c b/gb.desktop.gnome.keyring/src/main.c similarity index 100% rename from gb.desktop/src/gnome/main.c rename to gb.desktop.gnome.keyring/src/main.c diff --git a/gb.desktop/src/gnome/main.h b/gb.desktop.gnome.keyring/src/main.h similarity index 100% rename from gb.desktop/src/gnome/main.h rename to gb.desktop.gnome.keyring/src/main.h diff --git a/gb.desktop.x11/AUTHORS b/gb.desktop.x11/AUTHORS new file mode 100644 index 000000000..e69de29bb diff --git a/gb.desktop.x11/COPYING b/gb.desktop.x11/COPYING new file mode 120000 index 000000000..012065c85 --- /dev/null +++ b/gb.desktop.x11/COPYING @@ -0,0 +1 @@ +../COPYING \ No newline at end of file diff --git a/gb.desktop.x11/ChangeLog b/gb.desktop.x11/ChangeLog new file mode 100644 index 000000000..e69de29bb diff --git a/gb.desktop.x11/INSTALL b/gb.desktop.x11/INSTALL new file mode 120000 index 000000000..99d491b4f --- /dev/null +++ b/gb.desktop.x11/INSTALL @@ -0,0 +1 @@ +../INSTALL \ No newline at end of file diff --git a/gb.desktop/Makefile.am b/gb.desktop.x11/Makefile.am similarity index 71% rename from gb.desktop/Makefile.am rename to gb.desktop.x11/Makefile.am index 87f059c6b..528056986 100644 --- a/gb.desktop/Makefile.am +++ b/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 diff --git a/gb.desktop.x11/NEWS b/gb.desktop.x11/NEWS new file mode 100644 index 000000000..e69de29bb diff --git a/gb.desktop.x11/README b/gb.desktop.x11/README new file mode 100644 index 000000000..e69de29bb diff --git a/gb.desktop.x11/acinclude.m4 b/gb.desktop.x11/acinclude.m4 new file mode 120000 index 000000000..d84c32a31 --- /dev/null +++ b/gb.desktop.x11/acinclude.m4 @@ -0,0 +1 @@ +../acinclude.m4 \ No newline at end of file diff --git a/gb.desktop.x11/component.am b/gb.desktop.x11/component.am new file mode 120000 index 000000000..2f0eee34f --- /dev/null +++ b/gb.desktop.x11/component.am @@ -0,0 +1 @@ +../component.am \ No newline at end of file diff --git a/gb.desktop.x11/configure.ac b/gb.desktop.x11/configure.ac new file mode 100644 index 000000000..b616663e9 --- /dev/null +++ b/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 diff --git a/gb.desktop.x11/gambas.h b/gb.desktop.x11/gambas.h new file mode 120000 index 000000000..03677ecd0 --- /dev/null +++ b/gb.desktop.x11/gambas.h @@ -0,0 +1 @@ +../main/share/gambas.h \ No newline at end of file diff --git a/gb.desktop/gb.image.h b/gb.desktop.x11/gb.image.h similarity index 100% rename from gb.desktop/gb.image.h rename to gb.desktop.x11/gb.image.h diff --git a/gb.desktop.x11/gb_common.h b/gb.desktop.x11/gb_common.h new file mode 120000 index 000000000..707d79da6 --- /dev/null +++ b/gb.desktop.x11/gb_common.h @@ -0,0 +1 @@ +../main/share/gb_common.h \ No newline at end of file diff --git a/gb.desktop.x11/m4 b/gb.desktop.x11/m4 new file mode 120000 index 000000000..7d49a2a4b --- /dev/null +++ b/gb.desktop.x11/m4 @@ -0,0 +1 @@ +../m4 \ No newline at end of file diff --git a/gb.desktop.x11/missing b/gb.desktop.x11/missing new file mode 120000 index 000000000..f3ade9ba1 --- /dev/null +++ b/gb.desktop.x11/missing @@ -0,0 +1 @@ +../missing \ No newline at end of file diff --git a/gb.desktop.x11/reconf b/gb.desktop.x11/reconf new file mode 120000 index 000000000..48a376da6 --- /dev/null +++ b/gb.desktop.x11/reconf @@ -0,0 +1 @@ +../reconf \ No newline at end of file diff --git a/gb.desktop.x11/src/Makefile.am b/gb.desktop.x11/src/Makefile.am new file mode 100644 index 000000000..729f2694a --- /dev/null +++ b/gb.desktop.x11/src/Makefile.am @@ -0,0 +1,14 @@ +COMPONENT = gb.desktop.x11 +include $(top_srcdir)/component.am + +gblib_LTLIBRARIES = gb.desktop.x11.la + +gb_desktop_x11_la_LIBADD = @DESKTOP_X11_LIB@ +gb_desktop_x11_la_LDFLAGS = -module @LD_FLAGS@ @DESKTOP_X11_LDFLAGS@ +gb_desktop_x11_la_CPPFLAGS = @DESKTOP_X11_INC@ + +gb_desktop_x11_la_SOURCES = \ + main.c main.h \ + desktop.c desktop.h \ + x11.c x11.h \ + gb_list.c diff --git a/gb.desktop/src/desktop.c b/gb.desktop.x11/src/desktop.c similarity index 84% rename from gb.desktop/src/desktop.c rename to gb.desktop.x11/src/desktop.c index 6e40756da..76ffe7b7b 100644 --- a/gb.desktop/src/desktop.c +++ b/gb.desktop.x11/src/desktop.c @@ -74,7 +74,7 @@ DECLARE_EVENT(EVENT_Window); END_METHOD*/ -BEGIN_METHOD(CDESKTOP_find, GB_STRING title; GB_STRING klass; GB_STRING role) +BEGIN_METHOD(X11_FindWindow, GB_STRING title; GB_STRING klass; GB_STRING role) Window *windows; Window win; @@ -132,7 +132,7 @@ BEGIN_METHOD(CDESKTOP_find, GB_STRING title; GB_STRING klass; GB_STRING role) END_METHOD -BEGIN_METHOD(CDESKTOP_sendkey, GB_STRING key; GB_BOOLEAN press) +BEGIN_METHOD(X11_SendKey, GB_STRING key; GB_BOOLEAN press) char *error; @@ -145,7 +145,7 @@ BEGIN_METHOD(CDESKTOP_sendkey, GB_STRING key; GB_BOOLEAN press) END_METHOD -BEGIN_PROPERTY(Desktop_Root) +BEGIN_PROPERTY(X11_RootWindow) if (X11_init()) return; @@ -155,7 +155,7 @@ BEGIN_PROPERTY(Desktop_Root) END_PROPERTY -BEGIN_PROPERTY(Desktop_Time) +BEGIN_PROPERTY(X11_Time) intptr_t time; @@ -166,7 +166,7 @@ BEGIN_PROPERTY(Desktop_Time) END_PROPERTY -BEGIN_METHOD(CDESKTOP_get_window_property, GB_STRING name; GB_INTEGER window) +BEGIN_METHOD(X11_GetWindowProperty, GB_STRING name; GB_INTEGER window) char *value; Atom type; @@ -271,7 +271,7 @@ BEGIN_METHOD(CDESKTOP_get_window_property, GB_STRING name; GB_INTEGER window) END_METHOD -BEGIN_METHOD(CDESKTOP_set_window_property, GB_STRING name; GB_STRING type; GB_VARIANT value; GB_INTEGER window) +BEGIN_METHOD(X11_SetWindowProperty, GB_STRING name; GB_STRING type; GB_VARIANT value; GB_INTEGER window) Atom type; Atom prop; @@ -402,7 +402,7 @@ __ERROR: END_METHOD -BEGIN_METHOD(CDESKTOP_intern_atom, GB_STRING atom; GB_BOOLEAN create) +BEGIN_METHOD(X11_InternAtom, GB_STRING atom; GB_BOOLEAN create) if (X11_init()) return; @@ -411,7 +411,7 @@ BEGIN_METHOD(CDESKTOP_intern_atom, GB_STRING atom; GB_BOOLEAN create) END_METHOD -BEGIN_METHOD(CDESKTOP_get_atom_name, GB_INTEGER atom) +BEGIN_METHOD(X11_GetAtomName, GB_INTEGER atom) char *name; @@ -424,7 +424,7 @@ BEGIN_METHOD(CDESKTOP_get_atom_name, GB_INTEGER atom) END_METHOD -BEGIN_METHOD(CDESKTOP_send_client_message, GB_STRING message; GB_OBJECT data; GB_INTEGER window) +BEGIN_METHOD(X11_SendClientMessage, GB_STRING message; GB_OBJECT data; GB_INTEGER window) GB_ARRAY array; void *data = NULL; @@ -481,7 +481,7 @@ BEGIN_METHOD(CDESKTOP_send_client_message, GB_STRING message; GB_OBJECT data; GB END_METHOD -BEGIN_PROPERTY(CDESKTOP_event_filter) +BEGIN_PROPERTY(X11_EventFilter) if (X11_init()) return; @@ -493,7 +493,7 @@ BEGIN_PROPERTY(CDESKTOP_event_filter) END_PROPERTY -BEGIN_METHOD(CDESKTOP_watch_window, GB_INTEGER window; GB_BOOLEAN watch) +BEGIN_METHOD(X11_WatchWindow, GB_INTEGER window; GB_BOOLEAN watch) XWindowAttributes attr; int mask = PropertyChangeMask | StructureNotifyMask; @@ -510,7 +510,7 @@ BEGIN_METHOD(CDESKTOP_watch_window, GB_INTEGER window; GB_BOOLEAN watch) END_METHOD -BEGIN_METHOD(CDESKTOP_get_window_geometry, GB_INTEGER window) +BEGIN_METHOD(X11_GetWindowGeometry, GB_INTEGER window) GB_ARRAY array; int *data; @@ -527,7 +527,7 @@ BEGIN_METHOD(CDESKTOP_get_window_geometry, GB_INTEGER window) END_METHOD -BEGIN_METHOD(CDESKTOP_make_icon, GB_OBJECT data; GB_INTEGER width; GB_INTEGER height) +BEGIN_METHOD(X11_MakeIcon, GB_OBJECT data; GB_INTEGER width; GB_INTEGER height) GB_ARRAY array; int *data; @@ -593,7 +593,7 @@ BEGIN_METHOD(CDESKTOP_make_icon, GB_OBJECT data; GB_INTEGER width; GB_INTEGER he END_METHOD -BEGIN_METHOD(CDESKTOP_minimize_window, GB_INTEGER window; GB_BOOLEAN minimized) +BEGIN_METHOD(X11_MinimizeWindow, GB_INTEGER window; GB_BOOLEAN minimized) if (X11_init()) return; @@ -614,7 +614,7 @@ BEGIN_METHOD(CDESKTOP_minimize_window, GB_INTEGER window; GB_BOOLEAN minimized) END_METHOD -BEGIN_METHOD_VOID(Desktop_Flush) +BEGIN_METHOD_VOID(X11_Flush) if (X11_init()) return; @@ -624,7 +624,7 @@ BEGIN_METHOD_VOID(Desktop_Flush) END_METHOD -BEGIN_METHOD_VOID(Desktop_Sync) +BEGIN_METHOD_VOID(X11_Sync) if (X11_init()) return; @@ -648,30 +648,30 @@ END_METHOD END_METHOD*/ -GB_DESC CDesktopDesc[] = +GB_DESC X11Desc[] = { - GB_DECLARE("_Desktop", 0), GB_VIRTUAL_CLASS(), + GB_DECLARE("X11", 0), GB_VIRTUAL_CLASS(), //GB_STATIC_METHOD("Init", NULL, CDESKTOP_init, NULL), GB_CONSTANT("CurrentTime", "i", CurrentTime), - GB_STATIC_METHOD("FindWindow", "Integer[]", CDESKTOP_find, "[(Title)s(Application)s(Role)s]"), - GB_STATIC_METHOD("SendKey", NULL, CDESKTOP_sendkey, "(Key)s(Press)b"), - GB_STATIC_PROPERTY_READ("RootWindow", "i", Desktop_Root), - GB_STATIC_PROPERTY_READ("Time", "i", Desktop_Time), - GB_STATIC_METHOD("GetWindowProperty", "v", CDESKTOP_get_window_property, "(Property)s[(Window)i]"), - GB_STATIC_METHOD("SetWindowProperty", NULL, CDESKTOP_set_window_property, "(Property)s(Type)s(Value)v[(Window)i]"), - GB_STATIC_METHOD("InternAtom", "i", CDESKTOP_intern_atom, "(Atom)s[(Create)b]"), - GB_STATIC_METHOD("GetAtomName", "s", CDESKTOP_get_atom_name, "(Atom)i"), - GB_STATIC_METHOD("SendClientMessageToRootWindow", NULL, CDESKTOP_send_client_message, "(Message)s[(Data)Array;(Window)i]"), - GB_STATIC_PROPERTY("EventFilter", "b", CDESKTOP_event_filter), - GB_STATIC_METHOD("WatchWindow", NULL, CDESKTOP_watch_window, "(Window)i(Watch)b"), - GB_STATIC_METHOD("GetWindowGeometry", "Integer[]", CDESKTOP_get_window_geometry, "(Window)i"), - GB_STATIC_METHOD("MakeIcon", "Image", CDESKTOP_make_icon, "(Data)Array;[(Width)i(Height)h]"), - GB_STATIC_METHOD("MinimizeWindow", NULL, CDESKTOP_minimize_window, "(Window)i(Minimized)b"), - GB_STATIC_METHOD("Sync", NULL, Desktop_Sync, NULL), - GB_STATIC_METHOD("Flush", NULL, Desktop_Flush, NULL), + GB_STATIC_METHOD("FindWindow", "Integer[]", X11_FindWindow, "[(Title)s(Application)s(Role)s]"), + GB_STATIC_METHOD("SendKey", NULL, X11_SendKey, "(Key)s(Press)b"), + GB_STATIC_PROPERTY_READ("RootWindow", "i", X11_RootWindow), + GB_STATIC_PROPERTY_READ("Time", "i", X11_Time), + GB_STATIC_METHOD("GetWindowProperty", "v", X11_GetWindowProperty, "(Property)s[(Window)i]"), + GB_STATIC_METHOD("SetWindowProperty", NULL, X11_SetWindowProperty, "(Property)s(Type)s(Value)v[(Window)i]"), + GB_STATIC_METHOD("InternAtom", "i", X11_InternAtom, "(Atom)s[(Create)b]"), + GB_STATIC_METHOD("GetAtomName", "s", X11_GetAtomName, "(Atom)i"), + GB_STATIC_METHOD("SendClientMessageToRootWindow", NULL, X11_SendClientMessage, "(Message)s[(Data)Array;(Window)i]"), + GB_STATIC_PROPERTY("EventFilter", "b", X11_EventFilter), + GB_STATIC_METHOD("WatchWindow", NULL, X11_WatchWindow, "(Window)i(Watch)b"), + GB_STATIC_METHOD("GetWindowGeometry", "Integer[]", X11_GetWindowGeometry, "(Window)i"), + GB_STATIC_METHOD("MakeIcon", "Image", X11_MakeIcon, "(Data)Array;[(Width)i(Height)h]"), + GB_STATIC_METHOD("MinimizeWindow", NULL, X11_MinimizeWindow, "(Window)i(Minimized)b"), + GB_STATIC_METHOD("Sync", NULL, X11_Sync, NULL), + GB_STATIC_METHOD("Flush", NULL, X11_Flush, NULL), GB_END_DECLARE }; @@ -726,7 +726,7 @@ static void enable_event_filter(bool enable) (*set_event_filter)(enable ? x11_event_filter : 0); } -BEGIN_METHOD(CDESKTOPWATCHER_new, GB_INTEGER window; GB_STRING property) +BEGIN_METHOD(X11Watcher_new, GB_INTEGER window; GB_STRING property) if (X11_init()) return; @@ -741,7 +741,7 @@ BEGIN_METHOD(CDESKTOPWATCHER_new, GB_INTEGER window; GB_STRING property) END_METHOD -BEGIN_METHOD_VOID(CDESKTOPWATCHER_free) +BEGIN_METHOD_VOID(X11Watcher_free) LIST_remove(&_watcher_list, WATCHER, &WATCHER->list); if (!_watcher_list) @@ -749,12 +749,12 @@ BEGIN_METHOD_VOID(CDESKTOPWATCHER_free) END_METHOD -GB_DESC CDesktopWatcherDesc[] = +GB_DESC X11WatcherDesc[] = { - GB_DECLARE("_DesktopWatcher", sizeof(CDESKTOPWATCHER)), + GB_DECLARE("X11Watcher", sizeof(CDESKTOPWATCHER)), - GB_METHOD("_new", NULL, CDESKTOPWATCHER_new, "[(Window)i(Property)s]"), - GB_METHOD("_free", NULL, CDESKTOPWATCHER_free, NULL), + GB_METHOD("_new", NULL, X11Watcher_new, "[(Window)i(Property)s]"), + GB_METHOD("_free", NULL, X11Watcher_free, NULL), GB_EVENT("Change", NULL, "(Window)i(Property)i", &EVENT_Change), GB_EVENT("Window", NULL, "(Window)i(X)i(Y)i(Width)i(Height)i", &EVENT_Window), diff --git a/gb.desktop/src/desktop.h b/gb.desktop.x11/src/desktop.h similarity index 94% rename from gb.desktop/src/desktop.h rename to gb.desktop.x11/src/desktop.h index 6600771c2..f71405cd0 100644 --- a/gb.desktop/src/desktop.h +++ b/gb.desktop.x11/src/desktop.h @@ -28,8 +28,8 @@ #include "gb_list.h" #ifndef __DESKTOP_C -extern GB_DESC CDesktopDesc[]; -extern GB_DESC CDesktopWatcherDesc[]; +extern GB_DESC X11Desc[]; +extern GB_DESC X11WatcherDesc[]; #endif typedef diff --git a/gb.desktop.x11/src/gb.desktop.x11.component b/gb.desktop.x11/src/gb.desktop.x11.component new file mode 100644 index 000000000..6ce47c387 --- /dev/null +++ b/gb.desktop.x11/src/gb.desktop.x11.component @@ -0,0 +1,4 @@ +[Component] +Author=Benoît Minisini +State=1 +Requires=gb.image diff --git a/gb.desktop/src/gb_list.c b/gb.desktop.x11/src/gb_list.c similarity index 100% rename from gb.desktop/src/gb_list.c rename to gb.desktop.x11/src/gb_list.c diff --git a/gb.desktop/src/main.c b/gb.desktop.x11/src/main.c similarity index 97% rename from gb.desktop/src/main.c rename to gb.desktop.x11/src/main.c index 24a722da1..485a8e56f 100644 --- a/gb.desktop/src/main.c +++ b/gb.desktop.x11/src/main.c @@ -32,8 +32,8 @@ IMAGE_INTERFACE IMAGE EXPORT; GB_DESC *GB_CLASSES[] EXPORT = { - CDesktopDesc, - CDesktopWatcherDesc, + X11Desc, + X11WatcherDesc, NULL }; diff --git a/gb.desktop/src/main.h b/gb.desktop.x11/src/main.h similarity index 100% rename from gb.desktop/src/main.h rename to gb.desktop.x11/src/main.h diff --git a/gb.desktop/src/x11.c b/gb.desktop.x11/src/x11.c similarity index 100% rename from gb.desktop/src/x11.c rename to gb.desktop.x11/src/x11.c diff --git a/gb.desktop/src/x11.h b/gb.desktop.x11/src/x11.h similarity index 100% rename from gb.desktop/src/x11.h rename to gb.desktop.x11/src/x11.h diff --git a/gb.desktop/configure.ac b/gb.desktop/configure.ac deleted file mode 100644 index bac43fe74..000000000 --- a/gb.desktop/configure.ac +++ /dev/null @@ -1,31 +0,0 @@ -dnl ---- configure.ac for gb.desktop - -m4_include([../version.m4]) -AC_INIT(gambas3-gb-desktop, GB_VERSION, GB_MAIL, [], GB_URL) -AC_CONFIG_MACRO_DIR([m4]) - -GB_INIT(gb.desktop) -AC_PROG_LIBTOOL - -GB_CHECK_XWINDOW - -AC_CHECK_LIB(Xtst, XTestQueryExtension, [X_LIBS="$X_LIBS -lXtst"], [touch DISABLED], [$X_LIBS]) - -GB_COMPONENT( - desktop, DESKTOP, gb.desktop, [src], - [], - [], - [$C_LIB $THREAD_LIB $X_LIBS], - [$THREAD_INC ]) - -GB_COMPONENT_PKG_CONFIG( - gnome, GNOME, gb.desktop.gnome, [gnome], - gnome-keyring-1) - -AC_OUTPUT( \ -Makefile \ -src/Makefile \ -src/gnome/Makefile \ -) - -GB_PRINT_MESSAGES diff --git a/gb.desktop/gb_list.h b/gb.desktop/gb_list.h deleted file mode 120000 index cfd354892..000000000 --- a/gb.desktop/gb_list.h +++ /dev/null @@ -1 +0,0 @@ -../main/share/gb_list.h \ No newline at end of file diff --git a/gb.desktop/gb_list_temp.h b/gb.desktop/gb_list_temp.h deleted file mode 120000 index 0bd26c393..000000000 --- a/gb.desktop/gb_list_temp.h +++ /dev/null @@ -1 +0,0 @@ -../main/share/gb_list_temp.h \ No newline at end of file diff --git a/gb.desktop/src/Makefile.am b/gb.desktop/src/Makefile.am deleted file mode 100644 index 1a4d28cb0..000000000 --- a/gb.desktop/src/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -COMPONENT = gb.desktop -include $(top_srcdir)/component.am - -SUBDIRS = . @GNOME_DIR@ - -gblib_LTLIBRARIES = gb.desktop.la - -gb_desktop_la_LIBADD = @DESKTOP_LIB@ -gb_desktop_la_LDFLAGS = -module @LD_FLAGS@ @DESKTOP_LDFLAGS@ -gb_desktop_la_CPPFLAGS = @DESKTOP_INC@ - -gb_desktop_la_SOURCES = \ - main.c main.h \ - desktop.c desktop.h \ - x11.c x11.h \ - gb_list.c diff --git a/gb.desktop/src/gb.desktop.component b/gb.desktop/src/gb.desktop.component deleted file mode 120000 index 270c34940..000000000 --- a/gb.desktop/src/gb.desktop.component +++ /dev/null @@ -1 +0,0 @@ -gb.desktop/.component \ No newline at end of file diff --git a/gb.desktop/src/gnome/Makefile.am b/gb.desktop/src/gnome/Makefile.am deleted file mode 100644 index c41c663de..000000000 --- a/gb.desktop/src/gnome/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -COMPONENT = gb.desktop.gnome -include $(top_srcdir)/component.am - -gblib_LTLIBRARIES = gb.desktop.gnome.la - -gb_desktop_gnome_la_LIBADD = @GNOME_LIB@ -gb_desktop_gnome_la_LDFLAGS = -module @LD_FLAGS@ @GNOME_LDFLAGS@ -gb_desktop_gnome_la_CPPFLAGS = @GNOME_INC@ - -gb_desktop_gnome_la_SOURCES = main.h main.c keyring.c keyring.h -