jyapayne/gintro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small fix for tiny modules like fontconfig

Browse source
This commit is contained in:
Stefan Salewski 2020-07-11 12:33:51 +02:00
commit 0f492ed6b5
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.adoc
View file

@ -1,6 +1,6 @@
= High level GTK3 (and GTK4) bindings for the Nim programming language = High level GTK3 (and GTK4) bindings for the Nim programming language
(c) Stefan Salewski (c) Stefan Salewski
//Version 0.7.8 //Version 0.7.9
:experimental: :experimental:
:imagesdir: http://ssalewski.de/tmp :imagesdir: http://ssalewski.de/tmp
:source-highlighter: pygments :source-highlighter: pygments
@ -25,7 +25,7 @@ with code inserted from files directly.
NOTE: This work is partly based on earlier works of J. Mansour and has been supported by A. Rumpf, E. Bassi and other _Nim_ and _GTK/Gnome_ developers. NOTE: This work is partly based on earlier works of J. Mansour and has been supported by A. Rumpf, E. Bassi and other _Nim_ and _GTK/Gnome_ developers.
The `combinatorics` module was kindly provided by R. Behrends. The `combinatorics` module was kindly provided by R. Behrends.
NOTE: This is version 0.7.8 which contains again some changes. The two GTK4 examples from http://ssalewski.de/gtkprogramming.html NOTE: This is version 0.7.9 which contains again some changes. The two GTK4 examples from http://ssalewski.de/gtkprogramming.html
should work now, and the existing GTK3 examples seems still to work. But maybe other programs don't work any should work now, and the existing GTK3 examples seems still to work. But maybe other programs don't work any
more now? more now?

2
gintro.nimble
View file

@ -1,6 +1,6 @@
# Package # Package
version = "0.7.8" version = "0.7.9"
author = "Stefan Salewski" author = "Stefan Salewski"
description = "High level GObject-Introspection based GTK3/GTK4 bindings" description = "High level GObject-Introspection based GTK3/GTK4 bindings"
license = "MIT" license = "MIT"

17
tests/gen.nim
View file

@ -1,6 +1,6 @@
# High level gobject-introspection based GTK3/GTK4 bindings for the Nim programming language # High level gobject-introspection based GTK3/GTK4 bindings for the Nim programming language
# nimpretty --maxLineLen:130 gen.nim # nimpretty --maxLineLen:130 gen.nim
# v 0.7.8 2020-JUL-07 # v 0.7.9 2020-JUL-11
# (c) S. Salewski 2018 # (c) S. Salewski 2018
# https://wiki.gnome.org/Projects/GObjectIntrospection # https://wiki.gnome.org/Projects/GObjectIntrospection
@ -861,6 +861,8 @@ proc writeMethod(info: GIBaseInfo; minfo: GIFunctionInfo) =
assert(freeMeName != "") assert(freeMeName != "")
# assert(info != nil) # why can it be nil? # assert(info != nil) # why can it be nil?
# if Lib.len == 0: # xlib, fontconfig, freetype2 # but Lib is local to main(), so let it crash
# return
assert(isCallableInfo(mInfo)) assert(isCallableInfo(mInfo))
assert(isFunctionInfo(mInfo)) assert(isFunctionInfo(mInfo))
var plist, arglist, arrLex, blex: string var plist, arglist, arrLex, blex: string
@ -2260,6 +2262,7 @@ proc main(namespace: string; version: cstring = nil) =
return return
#let loadedVersion = g_irepository_get_version(gi, namespace) #let loadedVersion = g_irepository_get_version(gi, namespace)
let dep: cstringArray = gi.gIrepositoryGetDependencies(namespace) let dep: cstringArray = gi.gIrepositoryGetDependencies(namespace)
var weImportGObject = false
output.writeLine("# dependencies:") output.writeLine("# dependencies:")
var importedModules = "" var importedModules = ""
for j in 0 .. 12: for j in 0 .. 12:
@ -2267,7 +2270,10 @@ proc main(namespace: string; version: cstring = nil) =
if j == 0: if j == 0:
importedModules = "import " importedModules = "import "
output.writeLine("# ", dep[j]) output.writeLine("# ", dep[j])
importedModules.add(fixedModName(($dep[j]).split('-', 2)[0].toLowerAscii) & ", ") let h = fixedModName(($dep[j]).split('-', 2)[0].toLowerAscii) & ", "
importedModules.add(h)
if h == "gobject, ":
weImportGObject = true
importedModules.removeSuffix(", ") importedModules.removeSuffix(", ")
strfreev(dep) strfreev(dep)
let idep: cstringArray = gi.gIrepositoryGetImmediateDependencies(namespace) let idep: cstringArray = gi.gIrepositoryGetImmediateDependencies(namespace)
@ -2487,7 +2493,8 @@ proc uint8ArrayZT2seq*(p: pointer): seq[uint8] =
output.writeLine(" qt = \"NGIQ\" & $epochTime()") output.writeLine(" qt = \"NGIQ\" & $epochTime()")
output.writeLine("let Quark* = g_quark_from_static_string(qt)") output.writeLine("let Quark* = g_quark_from_static_string(qt)")
if namespace notin ["GObject", "GLib", "xlib", "GModule"]: #if namespace notin ["GObject", "GLib", "xlib", "GModule"]: #
if weImportGObject:
output.writeLine("\nproc finalizeGObject*[T](o: ref T) =") output.writeLine("\nproc finalizeGObject*[T](o: ref T) =")
output.writeLine(" if not o.ignoreFinalizer:") output.writeLine(" if not o.ignoreFinalizer:")
output.writeLine(" gobject.g_object_remove_toggle_ref(o.impl, gobject.toggleNotify, addr(o[]))") output.writeLine(" gobject.g_object_remove_toggle_ref(o.impl, gobject.toggleNotify, addr(o[]))")
@ -2779,7 +2786,7 @@ proc get$1*(builder: Builder; name: string): $1 =
el.add("* = pointer\n") el.add("* = pointer\n")
arrayTypes.add(" " & el) arrayTypes.add(" " & el)
if arrayCollector.len == 0: if arrayCollector.len == 0:
arrayTypes = "\n" arrayTypes.setLen(0) # = "\n"
output.data = output.data.replace("PutAllTheArrayTypesHere", arrayTypes) output.data = output.data.replace("PutAllTheArrayTypesHere", arrayTypes)
output.setPosition(output.data.len) output.setPosition(output.data.len)
@ -2896,4 +2903,4 @@ proc launch() =
supmod4.close supmod4.close
launch() launch()
# 2898 lines qdata # 2906 lines