Merge Windows build system config and better loading into master (#1)

Author: RedFantom

.appveyor.yml

@@ -0,0 +1,44 @@
+environment:
+  matrix:
+    - PYTHON: "C:\\PYTHON38-x64"
+build: off
+install:
+  - set PATH=C:\msys64\usr\bin;%PATH%
+  # Load PGP Keys for Msys64
+  - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+  - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+  - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+  - bash -lc "pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+  # Kill gpg-agent due to bug in MSYS
+  - TaskKill /IM gpg-agent.exe /F
+  # Update known packages
+  - bash -lc "pacman --needed --noconfirm -Syu"
+  - bash -lc "pacman --needed --noconfirm -Sy"
+  # Install Python build dependencies
+  - "%PYTHON%\\python.exe -m pip install scikit-build nose"
+  # Now using MinGW pkg-config and related executables
+  - set PATH=C:\msys64\mingw64\bin;%PATH%
+  # Download Dependencies (dependency walker)
+  - appveyor DownloadFile https://github.com/lucasg/Dependencies/releases/download/v1.10/Dependencies_x64_Release.zip
+  - 7z e Dependencies_x64_Release.zip -odeps -y
+  # Add %PYTHON% to the path for libffi-7.dll
+  - set PATH=%PYTHON%;C:\msys64\mingw64\lib;%PATH%
+build_script:
+  - "%PYTHON%\\python.exe setup.py build bdist_wheel"
+  # Simplify PATH so as to test binary distribution
+  - set PATH=C:\WINDOWS\system32;C:\WINDOWS
+test_script:
+  - "%PYTHON%\\python.exe -m nose"
+artifacts:
+  - path: "/dist/*.whl"
+deploy:
+  provider: GitHub
+  auth_token:
+    secure: QimY++/91urL/oMJL/q2zYFqc1C7747HguEaIbPQovtC3zG8CK+TiCmFOCXy1D6e
+  artifact: "/dist/*.whl"
+  draft: false
+  prerelease: false
+  force_update: true
+  on:
+    branch: master
+    appveyor_repo_tag: true

.gitignore

@@ -98,3 +98,11 @@ MANIFEST
 /docs/doxygen/xml
 /html
 /latex
+
+# GTK Themes and configuration
+/gttk/*
+!/gttk/__init__.py
+!/gttk/gttk.tcl
+
+# Dependencies Program
+/deps

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED ( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 ## ===========================================================================
 ##  Project Information
@@ -62,18 +62,18 @@ MESSAGE ( STATUS "===========================================================" )
 ## ===========================================================================
 ##  Locate Tcl/Tk
 ## ===========================================================================
-MESSAGE ( STATUS "Searching for Tcl/Tk..." )
-FIND_PACKAGE ( TCL REQUIRED )
-FIND_PACKAGE ( TclStub REQUIRED )
-MESSAGE ( STATUS "  TCL_TCLSH:               " ${TCL_TCLSH} )
-MESSAGE ( STATUS "  TCL_INCLUDE_PATH:        " ${TCL_INCLUDE_PATH} )
-MESSAGE ( STATUS "  TCL_STUB_LIBRARY:        " ${TCL_STUB_LIBRARY} )
-MESSAGE ( STATUS "  TCL_LIBRARY:             " ${TCL_LIBRARY} )
-MESSAGE ( STATUS "  TK_WISH:                 " ${TK_WISH} )
-MESSAGE ( STATUS "  TK_INCLUDE_PATH:         " ${TK_INCLUDE_PATH} )
-MESSAGE ( STATUS "  TK_STUB_LIBRARY:         " ${TK_STUB_LIBRARY} )
-MESSAGE ( STATUS "  TTK_STUB_LIBRARY:        " ${TTK_STUB_LIBRARY} )
-MESSAGE ( STATUS "  TK_LIBRARY:              " ${TK_LIBRARY} )
+MESSAGE(STATUS "Searching for Tcl/Tk...")
+FIND_PACKAGE(TCL REQUIRED)
+FIND_PACKAGE(TclStub REQUIRED)
+MESSAGE(STATUS "  TCL_TCLSH:               " ${TCL_TCLSH})
+MESSAGE(STATUS "  TCL_INCLUDE_PATH:        " ${TCL_INCLUDE_PATH})
+MESSAGE(STATUS "  TCL_STUB_LIBRARY:        " ${TCL_STUB_LIBRARY})
+MESSAGE(STATUS "  TCL_LIBRARY:             " ${TCL_LIBRARY})
+MESSAGE(STATUS "  TK_WISH:                 " ${TK_WISH})
+MESSAGE(STATUS "  TK_INCLUDE_PATH:         " ${TK_INCLUDE_PATH})
+MESSAGE(STATUS "  TK_STUB_LIBRARY:         " ${TK_STUB_LIBRARY})
+MESSAGE(STATUS "  TTK_STUB_LIBRARY:        " ${TTK_STUB_LIBRARY})
+MESSAGE(STATUS "  TK_LIBRARY:              " ${TK_LIBRARY})
 # STRING  ( REPLACE stub "" TCL_LIBRARY_STATIC   ${TCL_STUB_LIBRARY} )
 # STRING  ( REPLACE stub "" TK_LIBRARY_STATIC    ${TK_STUB_LIBRARY} )
 # MESSAGE ( STATUS "  TCL_LIBRARY_STATIC:      " ${TCL_LIBRARY_STATIC} )
@@ -84,14 +84,14 @@ IF ( WIN32 AND NO_MSVCRT )
   STRING ( REPLACE /MDd /MTd CMAKE_C_FLAGS_DEBUG     ${CMAKE_C_FLAGS_DEBUG} )
   STRING ( REPLACE /MD  /MT  CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
   STRING ( REPLACE /MDd /MTd CMAKE_CXX_FLAGS_DEBUG   ${CMAKE_CXX_FLAGS_DEBUG} )
-  SET (    CMAKE_EXE_LINKER_FLAGS
-        "${CMAKE_EXE_LINKER_FLAGS} /nodefaultlib:MSVCRT.LIB" )
+  # SET (    CMAKE_EXE_LINKER_FLAGS
+  #       "${CMAKE_EXE_LINKER_FLAGS} /nodefaultlib:MSVCRT.LIB" )
   SET (    CMAKE_EXE_LINKER_FLAGS_RELEASE
         "${CMAKE_EXE_LINKER_FLAGS_RELEASE} LIBCMT.LIB" )
   SET (    CMAKE_EXE_LINKER_FLAGS_DEBUG
         "${CMAKE_EXE_LINKER_FLAGS_DEBUG} LIBCMTD.LIB" )
-  SET (    CMAKE_SHARED_LINKER_FLAGS
-        "${CMAKE_SHARED_LINKER_FLAGS} /nodefaultlib:MSVCRT.LIB" )
+  # SET (    CMAKE_SHARED_LINKER_FLAGS
+  #       "${CMAKE_SHARED_LINKER_FLAGS} /nodefaultlib:MSVCRT.LIB" )
   SET (    CMAKE_SHARED_LINKER_FLAGS_RELEASE
         "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} LIBCMT.LIB" )
   SET (    CMAKE_SHARED_LINKER_FLAGS_DEBUG
@@ -127,6 +127,11 @@ ADD_DEFINITIONS     ( -DPACKAGE_VERSION="${PKG_VERSION}" )
 INCLUDE_DIRECTORIES ( ${TCL_INCLUDE_PATH} )
 INCLUDE_DIRECTORIES ( ${TK_INCLUDE_PATH} )
 INCLUDE_DIRECTORIES ( ${TK_INCLUDE_PATH}/tk-private/generic/ttk )
+IF ( WIN32 )  # Include additional directories for MSYS build
+  INCLUDE_DIRECTORIES ( ${TK_INCLUDE_PATH}/tk8.6/tk-private/generic )
+  INCLUDE_DIRECTORIES ( ${TK_INCLUDE_PATH}/tk8.6/tk-private/generic/ttk )
+  INCLUDE_DIRECTORIES ( ${TK_INCLUDE_PATH}/tk8.6/tk-private/win )
+ENDIF ( WIN32 )
 INCLUDE_DIRECTORIES ( ${PROJECT_SOURCE_DIR}/generic )
 
 ## ===========================================================================
@@ -162,15 +167,15 @@ ENDIF ( USE_GNOME )
 ## ===========================================================================
 ##  Locate GTK...
 ## ===========================================================================
-MESSAGE ( STATUS "Searching for GTK2..." )
+MESSAGE(STATUS "Searching for GTK2...")
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GTK "gtk+-2.0")
 if (GTK_FOUND)
-  LINK_LIBRARIES( ${GTK_LIBRARIES})
-  add_definitions(${GTK_CFLAGS} ${GTK_CFLAGS_OTHER})
+    LINK_LIBRARIES(${GTK_LIBRARIES})
+    add_definitions(${GTK_CFLAGS} ${GTK_CFLAGS_OTHER})
 
-MESSAGE ( STATUS "  GTK 2.x Found!" )
-endif()
+    MESSAGE(STATUS "  GTK 2.x Found!")
+endif ()
 
 ## ===========================================================================
 ##  Target: gttk_Symbols.[h|cpp]
@@ -190,6 +195,7 @@ endif()
 #                               PROPERTIES GENERATED true )
 
 SET ( PKG_TARGET_LIB_NAME ${PKG_NAME} )
+
 ## ===========================================================================
 ##  Target: gttk shared library
 ## ===========================================================================
@@ -231,17 +237,13 @@ ELSE ( LOAD_GTK_DYNAMICALLY )
   ENDIF ( UNIX )
 ENDIF ( LOAD_GTK_DYNAMICALLY )
 
-FILE ( WRITE library/pkgIndex.tcl 
+FILE ( WRITE gttk/pkgIndex.tcl
 "package ifneeded ttk::theme::gttk ${PKG_VERSION} \\
   [list load [file join $dir lib${PKG_NAME}[info sharedlibextension]] gttk]" )
 
 INSTALL ( TARGETS ${PKG_TARGET_LIB_NAME}
           RUNTIME DESTINATION ${PKG_TARGET_LIB_NAME}
           LIBRARY DESTINATION ${PKG_TARGET_LIB_NAME}
           ARCHIVE DESTINATION ${PKG_TARGET_LIB_NAME} )
-INSTALL ( FILES library/pkgIndex.tcl library/gttk.tcl
+INSTALL ( FILES gttk/pkgIndex.tcl gttk/gttk.tcl
           DESTINATION ${PKG_TARGET_LIB_NAME} )
-
-ENABLE_TESTING ( )
-ADD_TEST ( demo   ${TK_WISH} ${PROJECT_SOURCE_DIR}/demos/demo.tcl )
-ADD_TEST ( styles ${TK_WISH} ${PROJECT_SOURCE_DIR}/demos/WidgetStates.tcl )

example.py

@@ -80,13 +80,14 @@ def screenshot(self, *args):
 
 if __name__ == '__main__':
     sys.path = sys.path[2:]
-
-    import gttk
+    from gttk import GTTK
 
     window = Example()
+    gttk = GTTK(window)
     style = ttk.Style(window)
 
     style.theme_use("gttk")
 
-    window.mainloop()
+    print(gttk.get_theme_colour_keys())
 
+    window.mainloop()

generic/gttk_GtkApp.cpp

@@ -143,11 +143,11 @@ gttk_WidgetCache **gttk_CreateGtkApp(Tcl_Interp *interp) {
    */
   wc->gttk_MainInterp  = interp;
   wc->gttk_tkwin       = Tk_MainWindow(interp);
-  if (wc->gttk_tkwin != NULL && wc->gttk_MainDisplay == None) {
+  if (wc->gttk_tkwin != NULL && wc->gttk_MainDisplay == NULL) {
     Tk_MakeWindowExist(wc->gttk_tkwin);
     wc->gttk_MainDisplay = Tk_Display(wc->gttk_tkwin);
   }
-  if (wc->gttk_MainDisplay == None) {
+  if (wc->gttk_MainDisplay == NULL) {
     Tcl_MutexUnlock(&gttkMutex);
     Tcl_Free((char *) wc_array[0]);
     Tcl_Free((char *) wc_array[1]);

generic/gttk_Init.cpp

@@ -290,10 +290,10 @@ int gttk_GtkEnum(ClientData clientData, Tcl_Interp *interp,
 int gttk_GtkDirectory(ClientData clientData, Tcl_Interp *interp,
                                  int objc, Tcl_Obj *const objv[]) {
   static const char *Methods[] = {
-    "theme", "default_files", (char *) NULL
+    "theme", "default_files", "module", (char *) NULL
   };
   enum methods {
-    THEME, DEFAULT_FILES
+    THEME, DEFAULT_FILES, MODULE
   };
   int type;
   gchar *dir = NULL, **dirs = NULL;
@@ -332,6 +332,9 @@ int gttk_GtkDirectory(ClientData clientData, Tcl_Interp *interp,
         dirs = gttk_gtk_rc_get_default_files();
       }
       break;
+    case MODULE:
+      dir = gtk_rc_get_module_dir();
+      break;
   }
   if (dir) {
     Tcl_SetResult(interp, (char *) dir, TCL_VOLATILE);

generic/gttk_Utilities.cpp

@@ -281,13 +281,13 @@ void gttk_CopyGtkPixmapOnToDrawable(GdkPixmap *gdkDrawable, Drawable d,
     GC gc = Tk_GetGC(tkwin, GCForeground | GCBackground | GCGraphicsExposures,
                      &gcValues);
     GdkGC *gdkGC = gttk_gdk_gc_new(gdkDrawable);
-    HDC hdcSrc = gttk_gdk_win32_hdc_get(gdkDrawable, gdkGC, gc_usage);
+    HDC hdcSrc = gdk_win32_hdc_get(gdkDrawable, gdkGC, gc_usage);
     /* Create a Tk Drawable from the HDC... */
     TkWinDrawable gtkD;
     gtkD.type = TWD_WINDC;
     gtkD.winDC.hdc = hdcSrc;
     XCopyArea(Tk_Display(tkwin), (Drawable) &gtkD, d, gc, x, y, w, h, x1, x2);
-    gttk_gdk_win32_hdc_release(gdkDrawable, gdkGC, gc_usage);
+    gdk_win32_hdc_release(gdkDrawable, gdkGC, gc_usage);
     if (gdkGC) gttk_g_object_unref(gdkGC);
     Tk_FreeGC(Tk_Display(tkwin), gc);
 #else

gttk/__init__.py

@@ -5,7 +5,9 @@
 """
 import contextlib
 import os
+import tkinter as tk
 from tkinter import ttk
+from typing import List, Tuple
 
 
 @contextlib.contextmanager
@@ -17,17 +19,51 @@ def chdir(target):
     finally:
         os.chdir(cwd)
 
-__orig_ttk_Style_init__ = ttk.Style.__init__
 
+class GTTK(object):
+    """
+    Class representing the GTTK extension
+    """
 
-def __ttk_Style_init__(self, *args, **kwargs):
-    __orig_ttk_Style_init__(self, *args, **kwargs)
+    def __init__(self, window: tk.Tk):
+        """
+        Initialize gttk and load it into a window
 
-    folder = os.path.dirname(os.path.abspath(__file__))
+        :param window: Window with Tk/Tcl interpreter to load gttk for
+        """
+        self.tk = window.tk
+        folder = os.path.dirname(os.path.abspath(__file__)).replace("\\", "/")
+        with chdir(folder):
+            self.tk.eval("set dir {0}; source {0}/pkgIndex.tcl".format(folder))
+            self.tk.call("package", "require", "ttk::theme::gttk")
+        print(self.get_current_theme())
 
-    with chdir(folder):
-        self.tk.eval("set dir {0}; source {0}/pkgIndex.tcl".format(folder))
-        self.tk.call("package", "require", "ttk::theme::gttk")
+    def get_themes_directory(self) -> str:
+        """Return the directory in which GTK looks for installed themes"""
+        return self.tk.call("ttk::theme::gttk::gtkDirectory", "theme")
 
+    def get_default_files(self) -> Tuple[str]:
+        """Return the files that GTK parses by default at start-up"""
+        return self.tk.call("ttk::theme::gttk::gtkDirectory", "default_files")
 
-ttk.Style.__init__ = __ttk_Style_init__
+    def get_current_theme(self) -> str:
+        """Return the name of the currently active GTK theme"""
+        return self.tk.call("ttk::theme::gttk::currentThemeName")
+
+    def get_module_path(self) -> str:
+        """Return the name of the module path (theme engines)"""
+        return self.tk.call("ttk::theme::gttk::gtkDirectory", "module")
+
+    def get_gtk_enum_value(self, value: int) -> str:
+        """
+        Return a value of a the GtkPositionType enum
+
+        TODO: Extend gttk_GtkEnum in gttk_Init.cpp for more enums
+        """
+        return self.tk.call("ttk::theme::gttk::gtkEnum", "GtkPositionType", 0)
+
+    def get_theme_colour(self, name: str) -> str:
+        return self.tk.call("ttk::theme::gttk::currentThemeColour", name)
+
+    def get_theme_colour_keys(self) -> Tuple[str]:
+        return self.tk.call("ttk::theme::gttk::currentThemeColourKeys")