Henrik Grimler [Sat, 28 Mar 2020 15:32:18 +0000 (16:32 +0100)]
lib/sfdpgen: include malloc.h in PriorityQueue.c to define free
Works now that lib/cgraph/malloc.h is not included. Since we get the
`free` definition from malloc.h we also do not need
`#define FREE free` and friends.
Henrik Grimler [Sat, 28 Mar 2020 14:50:15 +0000 (15:50 +0100)]
lib/cgraph: include empty malloc.h from subdir include
Having it directly in cgraph/ means that this file is found by all
other libs with `-Ilib/cgraph/`. Since it is only needed by cgraph we
can move it to a subdirectory and add `-Iinclude/` to the cgraph
Makefile. If the other libraries and plugins picks up the empty
malloc.h it causes problems on some systems when compiling for example
lib/sfdpgen/PriorityQueue.c and plugin/visio/VisioGraphic.cpp where it
gives errors like:
```
/storage/termux-build/graphviz/src/lib/sfdpgen/PriorityQueue.c:96:40: error: use of undeclared identifier 'free'; did you mean 'frexp'?
DoubleLinkedList_delete_element(l, free, &((q->buckets)[gainold]));
^~~~
frexp
```
and
```
[...]
In file included from /storage/termux-build/graphviz/src/plugin/visio/VisioGraphic.cpp:16:
In file included from /storage/termux-build/_cache/android-r20-api-24-v3/bin/../sysroot/usr/include/c++/v1/algorithm:644:
In file included from /storage/termux-build/_cache/android-r20-api-24-v3/bin/../sysroot/usr/include/c++/v1/memory:654:
In file included from /storage/termux-build/_cache/android-r20-api-24-v3/bin/../sysroot/usr/include/c++/v1/typeinfo:61:
In file included from /storage/termux-build/_cache/android-r20-api-24-v3/bin/../sysroot/usr/include/c++/v1/exception:82:
/storage/termux-build/_cache/android-r20-api-24-v3/bin/../sysroot/usr/include/c++/v1/cstdlib:125:9: error: no member named 'calloc' in the global namespace
using ::calloc;
~~^
[...]
```
On other systems the compilation succeeds but with warnings like
```
../../../lib/common/memory.c:47:10: warning: implicitly declaring library function 'malloc' with type 'void *(unsigned long)' [-Wimplicit-function-declaration]
```
Stephen C North [Tue, 24 Dec 2019 02:18:13 +0000 (21:18 -0500)]
an assert in applyattrs() is too restrictive when setting edge [key=something}
as the object tag can be AGINEDGE not AGEDGE==AGOUTEDGE so we changed that
Stephen C North [Tue, 26 Nov 2019 20:47:38 +0000 (15:47 -0500)]
Attempted fix for https://gitlab.com/graphviz/graphviz/issues/1631
Stand-alone attributes within subgraphs are incorrectly handled for dot/canon/xdot output files. Fix is to access local dictionary, not root, when writing nodes within subgraphs.
This undoes a commit that changed scale to 1/scale, which now looks
totally stupid, but there was a reason, so the stupidity may have
been at a deeper level. Wish we had a better comment about that.
Stephen C North [Wed, 28 Aug 2019 20:12:01 +0000 (16:12 -0400)]
Accepted patches proposed in https://gitlab.com/graphviz/graphviz/issues/1583
to provide clickable TOC links in Cgraph documentation which for some reason
is still named Agraph.tex
This change broke gvpr, as demonstrated by the following gvpr script:
N [ color=="blue"] {color="red";}
N [ color=="blue"] {color="red";}
I don't know if the mods were more substantive than just cleanup
as they were related to other win64 work at the same time.
Stephen C North [Fri, 24 May 2019 03:30:48 +0000 (23:30 -0400)]
Merge https://gitlab.com/graphviz/graphviz/merge_requests/1313
Replaced hardcoded ruby-1.9 version with RUBY_VER variable
by Christian Vögl1
For some reason the gitlab pipeline failed and I don't know how
to re-try it.
Brendan Shanks [Wed, 15 May 2019 00:32:31 +0000 (17:32 -0700)]
macOS: Use system-provided icon for 'Attributes' toolbar item in main window (#1535)
Use the system-provided 'i' icon (NSImageNameInfo/'NSInfo') for the Attributes toolbar item.
The previous icon ('InspectorToolbarImage.tif') looks like it came from 10.4's Preview.app, it
doesn't look too bad but there are noticeable differences between it and the current system icon.
Brendan Shanks [Tue, 14 May 2019 23:58:12 +0000 (16:58 -0700)]
macOS: Rename attributes toolbar item images to fix display correctly in dark mode (#1535)
Add 'Template' to the end of the attributes toolbar item image filenames. This causes macOS to treat them as 'template' images, so they display correctly in dark mode.
Brendan Shanks [Tue, 14 May 2019 23:48:29 +0000 (16:48 -0700)]
macOS: Fix colors in Attributes window to work correctly in dark mode (#1535)
Change colors of some interface elements in the Attributes window to display correctly in dark mode on macOS 10.14.
To keep compatibility with old versions, changes made using Interface Builder 3.2.6 running on 10.6.
* For the attribute NSTableView: set the background color from white to the current default 'Control Background Color'
* For the 'key' NSTextFieldCell in the attribute table: set the text color from 'Control Text Color' to 'Text Color', and the background color from 'Control Background Color' to the default 'Text Background Color'. For the text color it would be preferable to use the current default 'Label Color' but that's only available on 10.10 and up
* For the 'value' NSTextFieldCell in the attribute table: set the background color from 'Control Background Color' to the default 'Text Background Color'. The text color is already set to the current default 'Control Text Color'
projects / graphviz / log