2013-07-28 22:08:34 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Implementation of a cosmetic line style, which determines the color and
|
|
|
|
// other appearance of a line or curve on-screen and in exported files. Some
|
|
|
|
// styles are predefined, and others can be created by the user.
|
|
|
|
//
|
|
|
|
// Copyright 2008-2013 Jonathan Westhues.
|
|
|
|
//-----------------------------------------------------------------------------
|
2009-07-20 01:47:59 +00:00
|
|
|
#include "solvespace.h"
|
2009-11-08 01:11:38 +00:00
|
|
|
#include <png.h>
|
2009-07-20 01:47:59 +00:00
|
|
|
|
2016-03-02 17:15:28 +00:00
|
|
|
#define DEFAULT_TEXT_HEIGHT 11.5
|
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
const Style::Default Style::Defaults[] = {
|
2013-08-26 20:54:04 +00:00
|
|
|
{ { ACTIVE_GRP }, "ActiveGrp", RGBf(1.0, 1.0, 1.0), 1.5, },
|
|
|
|
{ { CONSTRUCTION }, "Construction", RGBf(0.1, 0.7, 0.1), 1.5, },
|
|
|
|
{ { INACTIVE_GRP }, "InactiveGrp", RGBf(0.5, 0.3, 0.0), 1.5, },
|
|
|
|
{ { DATUM }, "Datum", RGBf(0.0, 0.8, 0.0), 1.5, },
|
|
|
|
{ { SOLID_EDGE }, "SolidEdge", RGBf(0.8, 0.8, 0.8), 1.0, },
|
|
|
|
{ { CONSTRAINT }, "Constraint", RGBf(1.0, 0.1, 1.0), 1.0, },
|
|
|
|
{ { SELECTED }, "Selected", RGBf(1.0, 0.0, 0.0), 1.5, },
|
|
|
|
{ { HOVERED }, "Hovered", RGBf(1.0, 1.0, 0.0), 1.5, },
|
|
|
|
{ { CONTOUR_FILL }, "ContourFill", RGBf(0.0, 0.1, 0.1), 1.0, },
|
|
|
|
{ { NORMALS }, "Normals", RGBf(0.0, 0.4, 0.4), 1.0, },
|
|
|
|
{ { ANALYZE }, "Analyze", RGBf(0.0, 1.0, 1.0), 1.0, },
|
|
|
|
{ { DRAW_ERROR }, "DrawError", RGBf(1.0, 0.0, 0.0), 8.0, },
|
|
|
|
{ { DIM_SOLID }, "DimSolid", RGBf(0.1, 0.1, 0.1), 1.0, },
|
2015-03-26 10:30:12 +00:00
|
|
|
{ { 0 }, NULL, RGBf(0.0, 0.0, 0.0), 0.0 }
|
2009-09-17 07:32:36 +00:00
|
|
|
};
|
|
|
|
|
2015-11-06 08:40:12 +00:00
|
|
|
std::string Style::CnfColor(const std::string &prefix) {
|
|
|
|
return "Style_" + prefix + "_Color";
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
2015-11-06 08:40:12 +00:00
|
|
|
std::string Style::CnfWidth(const std::string &prefix) {
|
|
|
|
return "Style_" + prefix + "_Width";
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
2016-02-21 19:07:58 +00:00
|
|
|
std::string Style::CnfTextHeight(const std::string &prefix) {
|
|
|
|
return "Style_" + prefix + "_TextHeight";
|
|
|
|
}
|
2009-09-17 07:32:36 +00:00
|
|
|
|
2015-11-06 08:40:12 +00:00
|
|
|
std::string Style::CnfPrefixToName(const std::string &prefix) {
|
|
|
|
std::string name = "#def-";
|
|
|
|
|
2016-02-12 05:25:19 +00:00
|
|
|
for(size_t i = 0; i < prefix.length(); i++) {
|
2015-11-06 08:40:12 +00:00
|
|
|
if(isupper(prefix[i]) && i != 0)
|
|
|
|
name += '-';
|
|
|
|
name += tolower(prefix[i]);
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
2015-11-06 08:40:12 +00:00
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
2009-09-18 08:14:15 +00:00
|
|
|
void Style::CreateAllDefaultStyles(void) {
|
|
|
|
const Default *d;
|
|
|
|
for(d = &(Defaults[0]); d->h.v; d++) {
|
|
|
|
(void)Get(d->h);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
void Style::CreateDefaultStyle(hStyle h) {
|
2009-09-18 08:14:15 +00:00
|
|
|
bool isDefaultStyle = true;
|
2009-09-17 07:32:36 +00:00
|
|
|
const Default *d;
|
|
|
|
for(d = &(Defaults[0]); d->h.v; d++) {
|
|
|
|
if(d->h.v == h.v) break;
|
|
|
|
}
|
|
|
|
if(!d->h.v) {
|
|
|
|
// Not a default style; so just create it the same as our default
|
|
|
|
// active group entity style.
|
|
|
|
d = &(Defaults[0]);
|
2009-09-18 08:14:15 +00:00
|
|
|
isDefaultStyle = false;
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
|
|
|
|
2015-03-27 15:31:23 +00:00
|
|
|
Style ns = {};
|
2016-02-27 06:15:15 +00:00
|
|
|
FillDefaultStyle(&ns, d);
|
2016-03-02 17:15:28 +00:00
|
|
|
ns.h = h;
|
2009-09-18 08:14:15 +00:00
|
|
|
if(isDefaultStyle) {
|
2015-11-06 08:40:12 +00:00
|
|
|
ns.name = CnfPrefixToName(d->cnfPrefix);
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2015-11-06 08:40:12 +00:00
|
|
|
ns.name = "new-custom-style";
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
2009-09-17 07:32:36 +00:00
|
|
|
|
|
|
|
SK.style.Add(&ns);
|
|
|
|
}
|
|
|
|
|
2016-02-27 06:15:15 +00:00
|
|
|
void Style::FillDefaultStyle(Style *s, const Default *d) {
|
|
|
|
if(d == NULL) d = &Defaults[0];
|
2016-02-23 18:00:39 +00:00
|
|
|
s->color = CnfThawColor(d->color, CnfColor(d->cnfPrefix));
|
|
|
|
s->width = CnfThawFloat((float)(d->width), CnfWidth(d->cnfPrefix));
|
|
|
|
s->widthAs = UNITS_AS_PIXELS;
|
2016-02-21 19:07:58 +00:00
|
|
|
s->textHeight = CnfThawFloat(DEFAULT_TEXT_HEIGHT, CnfTextHeight(d->cnfPrefix));
|
2016-02-23 18:00:39 +00:00
|
|
|
s->textHeightAs = UNITS_AS_PIXELS;
|
|
|
|
s->textOrigin = 0;
|
|
|
|
s->textAngle = 0;
|
|
|
|
s->visible = true;
|
|
|
|
s->exportable = true;
|
|
|
|
s->filled = false;
|
|
|
|
s->fillColor = RGBf(0.3, 0.3, 0.3);
|
|
|
|
s->stippleType = Style::STIPPLE_CONTINUOUS;
|
|
|
|
s->stippleScale = 15.0;
|
2016-02-27 06:15:15 +00:00
|
|
|
}
|
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
void Style::LoadFactoryDefaults(void) {
|
|
|
|
const Default *d;
|
|
|
|
for(d = &(Defaults[0]); d->h.v; d++) {
|
|
|
|
Style *s = Get(d->h);
|
|
|
|
|
2016-02-23 18:00:39 +00:00
|
|
|
s->color = d->color;
|
|
|
|
s->width = d->width;
|
|
|
|
s->widthAs = UNITS_AS_PIXELS;
|
|
|
|
s->textHeight = DEFAULT_TEXT_HEIGHT;
|
|
|
|
s->textHeightAs = UNITS_AS_PIXELS;
|
|
|
|
s->textOrigin = 0;
|
|
|
|
s->textAngle = 0;
|
|
|
|
s->visible = true;
|
|
|
|
s->exportable = true;
|
|
|
|
s->filled = false;
|
|
|
|
s->fillColor = RGBf(0.3, 0.3, 0.3);
|
|
|
|
s->stippleType = Style::STIPPLE_CONTINUOUS;
|
|
|
|
s->stippleScale = 15.0;
|
|
|
|
s->name = CnfPrefixToName(d->cnfPrefix);
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
2013-12-02 06:25:09 +00:00
|
|
|
SS.backgroundColor = RGBi(0, 0, 0);
|
2009-11-08 01:11:38 +00:00
|
|
|
if(SS.bgImage.fromFile) MemFree(SS.bgImage.fromFile);
|
|
|
|
SS.bgImage.fromFile = NULL;
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void Style::FreezeDefaultStyles(void) {
|
|
|
|
const Default *d;
|
|
|
|
for(d = &(Defaults[0]); d->h.v; d++) {
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
CnfFreezeColor(Color(d->h), CnfColor(d->cnfPrefix));
|
2009-09-17 07:32:36 +00:00
|
|
|
CnfFreezeFloat((float)Width(d->h), CnfWidth(d->cnfPrefix));
|
2016-02-21 19:07:58 +00:00
|
|
|
CnfFreezeFloat((float)TextHeight(d->h), CnfTextHeight(d->cnfPrefix));
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
uint32_t Style::CreateCustomStyle(void) {
|
2009-09-23 10:59:59 +00:00
|
|
|
SS.UndoRemember();
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
uint32_t vs = max((uint32_t)Style::FIRST_CUSTOM, SK.style.MaximumId() + 1);
|
2009-09-23 10:59:59 +00:00
|
|
|
hStyle hs = { vs };
|
|
|
|
(void)Style::Get(hs);
|
|
|
|
return hs.v;
|
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void Style::AssignSelectionToStyle(uint32_t v) {
|
2009-09-23 10:59:59 +00:00
|
|
|
bool showError = false;
|
|
|
|
SS.GW.GroupSelection();
|
|
|
|
|
|
|
|
SS.UndoRemember();
|
2009-09-24 15:52:48 +00:00
|
|
|
int i;
|
|
|
|
for(i = 0; i < SS.GW.gs.entities; i++) {
|
2009-09-23 10:59:59 +00:00
|
|
|
hEntity he = SS.GW.gs.entity[i];
|
2016-03-25 08:45:49 +00:00
|
|
|
Entity *e = SK.GetEntity(he);
|
|
|
|
if(!e->IsStylable()) continue;
|
|
|
|
|
2009-09-23 10:59:59 +00:00
|
|
|
if(!he.isFromRequest()) {
|
|
|
|
showError = true;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
hRequest hr = he.request();
|
|
|
|
Request *r = SK.GetRequest(hr);
|
|
|
|
r->style.v = v;
|
2009-10-29 07:16:28 +00:00
|
|
|
SS.MarkGroupDirty(r->group);
|
2009-09-23 10:59:59 +00:00
|
|
|
}
|
2009-09-24 15:52:48 +00:00
|
|
|
for(i = 0; i < SS.GW.gs.constraints; i++) {
|
|
|
|
hConstraint hc = SS.GW.gs.constraint[i];
|
|
|
|
Constraint *c = SK.GetConstraint(hc);
|
2016-03-25 08:45:49 +00:00
|
|
|
if(!c->IsStylable()) continue;
|
2009-09-24 15:52:48 +00:00
|
|
|
|
|
|
|
c->disp.style.v = v;
|
|
|
|
}
|
2009-09-23 10:59:59 +00:00
|
|
|
|
|
|
|
if(showError) {
|
|
|
|
Error("Can't assign style to an entity that's derived from another "
|
|
|
|
"entity; try assigning a style to this entity's parent.");
|
|
|
|
}
|
|
|
|
|
|
|
|
SS.GW.ClearSelection();
|
|
|
|
InvalidateGraphics();
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleGenerateAll();
|
2009-09-23 10:59:59 +00:00
|
|
|
|
|
|
|
// And show that style's info screen in the text window.
|
|
|
|
SS.TW.GoToScreen(TextWindow::SCREEN_STYLE_INFO);
|
|
|
|
SS.TW.shown.style.v = v;
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2009-09-23 10:59:59 +00:00
|
|
|
}
|
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Look up a style by its handle. If that style does not exist, then create
|
|
|
|
// the style, according to our table of default styles.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
Style *Style::Get(hStyle h) {
|
2009-09-22 05:46:30 +00:00
|
|
|
if(h.v == 0) h.v = ACTIVE_GRP;
|
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
Style *s = SK.style.FindByIdNoOops(h);
|
|
|
|
if(s) {
|
|
|
|
// It exists, good.
|
|
|
|
return s;
|
|
|
|
} else {
|
|
|
|
// It doesn't exist; so we should create it and then return that.
|
|
|
|
CreateDefaultStyle(h);
|
|
|
|
return SK.style.FindById(h);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// A couple of wrappers, so that I can call these functions with either an
|
|
|
|
// hStyle or with the integer corresponding to that hStyle.v.
|
|
|
|
//-----------------------------------------------------------------------------
|
2015-07-10 11:54:39 +00:00
|
|
|
RgbaColor Style::Color(int s, bool forExport) {
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
hStyle hs = { (uint32_t)s };
|
2009-09-17 07:32:36 +00:00
|
|
|
return Color(hs, forExport);
|
|
|
|
}
|
|
|
|
float Style::Width(int s) {
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
hStyle hs = { (uint32_t)s };
|
2009-09-17 07:32:36 +00:00
|
|
|
return Width(hs);
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
2010-08-14 19:00:25 +00:00
|
|
|
// If a color is almost white, then we can rewrite it to black, just so that
|
|
|
|
// it won't disappear on file formats with a light background.
|
|
|
|
//-----------------------------------------------------------------------------
|
2015-07-10 11:54:39 +00:00
|
|
|
RgbaColor Style::RewriteColor(RgbaColor rgbin) {
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
Vector rgb = Vector::From(rgbin.redF(), rgbin.greenF(), rgbin.blueF());
|
2010-08-14 19:00:25 +00:00
|
|
|
rgb = rgb.Minus(Vector::From(1, 1, 1));
|
|
|
|
if(rgb.Magnitude() < 0.4 && SS.fixExportColors) {
|
|
|
|
// This is an almost-white color in a default style, which is
|
|
|
|
// good for the default on-screen view (black bg) but probably
|
|
|
|
// not desired in the exported files, which typically are shown
|
|
|
|
// against white backgrounds.
|
2013-12-02 06:25:09 +00:00
|
|
|
return RGBi(0, 0, 0);
|
2010-08-14 19:00:25 +00:00
|
|
|
} else {
|
|
|
|
return rgbin;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Return the stroke color associated with our style as 8-bit RGB.
|
2009-09-17 07:32:36 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
2015-07-10 11:54:39 +00:00
|
|
|
RgbaColor Style::Color(hStyle h, bool forExport) {
|
2009-09-17 07:32:36 +00:00
|
|
|
Style *s = Get(h);
|
2009-09-22 05:46:30 +00:00
|
|
|
if(forExport) {
|
2010-08-14 19:00:25 +00:00
|
|
|
return RewriteColor(s->color);
|
|
|
|
} else {
|
|
|
|
return s->color;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Return the fill color associated with our style as 8-bit RGB.
|
|
|
|
//-----------------------------------------------------------------------------
|
2015-07-10 11:54:39 +00:00
|
|
|
RgbaColor Style::FillColor(hStyle h, bool forExport) {
|
2010-08-14 19:00:25 +00:00
|
|
|
Style *s = Get(h);
|
|
|
|
if(forExport) {
|
|
|
|
return RewriteColor(s->fillColor);
|
|
|
|
} else {
|
|
|
|
return s->fillColor;
|
2009-09-22 05:46:30 +00:00
|
|
|
}
|
2009-09-17 07:32:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Return the width associated with our style in pixels..
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
float Style::Width(hStyle h) {
|
|
|
|
double r = 1.0;
|
|
|
|
Style *s = Get(h);
|
2009-09-24 15:52:48 +00:00
|
|
|
if(s->widthAs == UNITS_AS_MM) {
|
2009-09-17 07:32:36 +00:00
|
|
|
r = s->width * SS.GW.scale;
|
2009-09-24 15:52:48 +00:00
|
|
|
} else if(s->widthAs == UNITS_AS_PIXELS) {
|
2009-09-17 07:32:36 +00:00
|
|
|
r = s->width;
|
|
|
|
}
|
2015-03-22 13:39:12 +00:00
|
|
|
// This returns a float because ssglLineWidth expects a float, avoid casts.
|
2009-09-17 07:32:36 +00:00
|
|
|
return (float)r;
|
|
|
|
}
|
|
|
|
|
2009-09-22 05:46:30 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Return the width associated with our style in millimeters..
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
double Style::WidthMm(int hs) {
|
|
|
|
double widthpx = Width(hs);
|
|
|
|
return widthpx / SS.GW.scale;
|
|
|
|
}
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Return the associated text height, in pixels.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
double Style::TextHeight(hStyle hs) {
|
|
|
|
Style *s = Get(hs);
|
|
|
|
if(s->textHeightAs == UNITS_AS_MM) {
|
|
|
|
return s->textHeight * SS.GW.scale;
|
2016-03-02 17:15:28 +00:00
|
|
|
} else /* s->textHeightAs == UNITS_AS_PIXELS */ {
|
2009-09-24 15:52:48 +00:00
|
|
|
return s->textHeight;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-02 17:15:28 +00:00
|
|
|
double Style::DefaultTextHeight() {
|
|
|
|
hStyle hs { Style::CONSTRAINT };
|
|
|
|
return TextHeight(hs);
|
|
|
|
}
|
|
|
|
|
2009-09-22 05:46:30 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Should lines and curves from this style appear in the output file? Only
|
|
|
|
// if it's both shown and exportable.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
bool Style::Exportable(int si) {
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
hStyle hs = { (uint32_t)si };
|
2009-09-22 05:46:30 +00:00
|
|
|
Style *s = Get(hs);
|
|
|
|
return (s->exportable) && (s->visible);
|
|
|
|
}
|
|
|
|
|
2009-09-17 07:32:36 +00:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Return the appropriate style for our entity. If the entity has a style
|
|
|
|
// explicitly assigned, then it's that style. Otherwise it's the appropriate
|
|
|
|
// default style.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
hStyle Style::ForEntity(hEntity he) {
|
|
|
|
Entity *e = SK.GetEntity(he);
|
|
|
|
// If the entity has a special style, use that. If that style doesn't
|
|
|
|
// exist yet, then it will get created automatically later.
|
|
|
|
if(e->style.v != 0) {
|
|
|
|
return e->style;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Otherwise, we use the default rules.
|
|
|
|
hStyle hs;
|
|
|
|
if(e->group.v != SS.GW.activeGroup.v) {
|
|
|
|
hs.v = INACTIVE_GRP;
|
|
|
|
} else if(e->construction) {
|
|
|
|
hs.v = CONSTRUCTION;
|
|
|
|
} else {
|
|
|
|
hs.v = ACTIVE_GRP;
|
|
|
|
}
|
|
|
|
return hs;
|
|
|
|
}
|
2009-07-20 01:47:59 +00:00
|
|
|
|
2016-02-23 18:00:39 +00:00
|
|
|
int Style::PatternType(hStyle hs) {
|
|
|
|
Style *s = Get(hs);
|
|
|
|
return s->stippleType;
|
|
|
|
}
|
|
|
|
|
|
|
|
double Style::StippleScaleMm(hStyle hs) {
|
|
|
|
Style *s = Get(hs);
|
|
|
|
if(s->widthAs == UNITS_AS_MM) {
|
|
|
|
return s->stippleScale;
|
|
|
|
} else if(s->widthAs == UNITS_AS_PIXELS) {
|
|
|
|
return s->stippleScale / SS.GW.scale;
|
|
|
|
}
|
|
|
|
return 1.0;
|
|
|
|
}
|
|
|
|
|
2015-11-06 08:40:12 +00:00
|
|
|
std::string Style::DescriptionString(void) {
|
|
|
|
if(name.empty()) {
|
|
|
|
return ssprintf("s%03x-(unnamed)", h.v);
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2015-11-06 08:40:12 +00:00
|
|
|
return ssprintf("s%03x-%s", h.v, name.c_str());
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenShowListOfStyles(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.TW.GoToScreen(SCREEN_LIST_OF_STYLES);
|
|
|
|
}
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenShowStyleInfo(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.TW.GoToScreen(SCREEN_STYLE_INFO);
|
|
|
|
SS.TW.shown.style.v = v;
|
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenLoadFactoryDefaultStyles(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
Style::LoadFactoryDefaults();
|
|
|
|
SS.TW.GoToScreen(SCREEN_LIST_OF_STYLES);
|
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenCreateCustomStyle(int link, uint32_t v) {
|
2009-09-23 10:59:59 +00:00
|
|
|
Style::CreateCustomStyle();
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenChangeBackgroundColor(int link, uint32_t v) {
|
2015-07-10 11:54:39 +00:00
|
|
|
RgbaColor rgb = SS.backgroundColor;
|
2016-01-26 11:19:52 +00:00
|
|
|
SS.TW.ShowEditControlWithColorPicker(3, rgb);
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.TW.edit.meaning = EDIT_BACKGROUND_COLOR;
|
|
|
|
}
|
|
|
|
|
2009-11-08 01:11:38 +00:00
|
|
|
static int RoundUpToPowerOfTwo(int v)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for(i = 0; i < 31; i++) {
|
|
|
|
int vt = (1 << i);
|
|
|
|
if(vt >= v) {
|
|
|
|
return vt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenBackgroundImage(int link, uint32_t v) {
|
2009-11-08 01:11:38 +00:00
|
|
|
if(SS.bgImage.fromFile) MemFree(SS.bgImage.fromFile);
|
|
|
|
SS.bgImage.fromFile = NULL;
|
|
|
|
|
|
|
|
if(link == 'l') {
|
|
|
|
FILE *f = NULL;
|
|
|
|
png_struct *png_ptr = NULL;
|
|
|
|
png_info *info_ptr = NULL;
|
|
|
|
|
2015-12-27 01:03:24 +00:00
|
|
|
std::string importFile;
|
2016-01-11 08:44:56 +00:00
|
|
|
if(!GetOpenFile(importFile, "", PNG_PATTERN)) goto err;
|
2015-12-27 08:09:00 +00:00
|
|
|
f = ssfopen(importFile, "rb");
|
2009-11-08 01:11:38 +00:00
|
|
|
if(!f) goto err;
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
uint8_t header[8];
|
2013-08-26 20:48:41 +00:00
|
|
|
if (fread(header, 1, 8, f) != 8)
|
|
|
|
goto err;
|
2009-11-08 01:11:38 +00:00
|
|
|
if(png_sig_cmp(header, 0, 8)) goto err;
|
|
|
|
|
|
|
|
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
if(!png_ptr) goto err;
|
|
|
|
|
|
|
|
info_ptr = png_create_info_struct(png_ptr);
|
|
|
|
if(!info_ptr) goto err;
|
|
|
|
|
|
|
|
if(setjmp(png_jmpbuf(png_ptr))) goto err;
|
|
|
|
|
|
|
|
png_init_io(png_ptr, f);
|
|
|
|
png_set_sig_bytes(png_ptr, 8);
|
|
|
|
|
|
|
|
png_read_png(png_ptr, info_ptr,
|
|
|
|
PNG_TRANSFORM_EXPAND | PNG_TRANSFORM_STRIP_ALPHA, NULL);
|
2015-03-29 00:30:52 +00:00
|
|
|
|
2013-09-16 19:57:32 +00:00
|
|
|
int w; w = (int)png_get_image_width(png_ptr, info_ptr);
|
|
|
|
int h; h = (int)png_get_image_height(png_ptr, info_ptr);
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
uint8_t **rows; rows = png_get_rows(png_ptr, info_ptr);
|
2009-11-08 01:11:38 +00:00
|
|
|
|
|
|
|
// Round to next-highest powers of two, since the textures require
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
// that. And round up to 4, to guarantee 32-bit alignment.
|
2013-08-26 19:08:16 +00:00
|
|
|
int rw; rw = max(4, RoundUpToPowerOfTwo(w));
|
|
|
|
int rh; rh = max(4, RoundUpToPowerOfTwo(h));
|
2009-11-08 01:11:38 +00:00
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
SS.bgImage.fromFile = (uint8_t *)MemAlloc(rw*rh*3);
|
2013-10-19 05:36:45 +00:00
|
|
|
{for(int i = 0; i < h; i++) {
|
2009-11-08 01:11:38 +00:00
|
|
|
memcpy(SS.bgImage.fromFile + ((h - 1) - i)*(rw*3), rows[i], w*3);
|
2013-10-19 05:36:45 +00:00
|
|
|
}}
|
2009-11-08 01:11:38 +00:00
|
|
|
SS.bgImage.w = w;
|
|
|
|
SS.bgImage.h = h;
|
|
|
|
SS.bgImage.rw = rw;
|
|
|
|
SS.bgImage.rh = rh;
|
|
|
|
SS.bgImage.scale = SS.GW.scale;
|
|
|
|
SS.bgImage.origin = SS.GW.offset.ScaledBy(-1);
|
|
|
|
|
|
|
|
err:
|
|
|
|
if(png_ptr) png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
|
|
|
if(f) fclose(f);
|
|
|
|
}
|
2015-03-18 17:02:11 +00:00
|
|
|
SS.ScheduleShowTW();
|
2009-11-08 01:11:38 +00:00
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenChangeBackgroundImageScale(int link, uint32_t v) {
|
2009-11-08 01:11:38 +00:00
|
|
|
SS.TW.edit.meaning = EDIT_BACKGROUND_IMG_SCALE;
|
2016-01-26 11:19:52 +00:00
|
|
|
SS.TW.ShowEditControl(10, ssprintf("%.3f", SS.bgImage.scale * SS.MmPerUnit()));
|
2009-11-08 01:11:38 +00:00
|
|
|
}
|
|
|
|
|
2009-09-18 08:14:15 +00:00
|
|
|
void TextWindow::ShowListOfStyles(void) {
|
|
|
|
Printf(true, "%Ft color style-name");
|
|
|
|
|
|
|
|
bool darkbg = false;
|
|
|
|
Style *s;
|
|
|
|
for(s = SK.style.First(); s; s = SK.style.NextAfter(s)) {
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
Printf(false, "%Bp %Bz %Bp %Fl%Ll%f%D%s%E",
|
2009-09-18 08:14:15 +00:00
|
|
|
darkbg ? 'd' : 'a',
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
&s->color,
|
2009-09-18 08:14:15 +00:00
|
|
|
darkbg ? 'd' : 'a',
|
|
|
|
ScreenShowStyleInfo, s->h.v,
|
2015-11-06 08:40:12 +00:00
|
|
|
s->DescriptionString().c_str());
|
2009-09-18 08:14:15 +00:00
|
|
|
|
|
|
|
darkbg = !darkbg;
|
|
|
|
}
|
|
|
|
|
2015-03-29 00:30:52 +00:00
|
|
|
Printf(true, " %Fl%Ll%fcreate a new custom style%E",
|
2009-09-18 08:14:15 +00:00
|
|
|
&ScreenCreateCustomStyle);
|
|
|
|
|
|
|
|
Printf(false, "");
|
|
|
|
|
2015-07-10 11:54:39 +00:00
|
|
|
RgbaColor rgb = SS.backgroundColor;
|
2009-09-18 08:14:15 +00:00
|
|
|
Printf(false, "%Ft background color (r, g, b)%E");
|
|
|
|
Printf(false, "%Ba %@, %@, %@ %Fl%D%f%Ll[change]%E",
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
rgb.redF(), rgb.greenF(), rgb.blueF(),
|
2009-09-18 08:14:15 +00:00
|
|
|
top[rows-1] + 2, &ScreenChangeBackgroundColor);
|
|
|
|
|
2009-11-08 01:11:38 +00:00
|
|
|
Printf(false, "");
|
|
|
|
Printf(false, "%Ft background bitmap image%E");
|
|
|
|
if(SS.bgImage.fromFile) {
|
|
|
|
Printf(false, "%Ba %Ftwidth:%E %dpx %Ftheight:%E %dpx",
|
|
|
|
SS.bgImage.w, SS.bgImage.h);
|
2010-01-04 00:35:28 +00:00
|
|
|
|
|
|
|
Printf(false, " %Ftscale:%E %# px/%s %Fl%Ll%f%D[change]%E",
|
|
|
|
SS.bgImage.scale*SS.MmPerUnit(),
|
|
|
|
SS.UnitName(),
|
|
|
|
&ScreenChangeBackgroundImageScale, top[rows-1] + 2);
|
|
|
|
|
2009-11-08 01:11:38 +00:00
|
|
|
Printf(false, "%Ba %Fl%Lc%fclear background image%E",
|
|
|
|
&ScreenBackgroundImage);
|
|
|
|
} else {
|
|
|
|
Printf(false, "%Ba none - %Fl%Ll%fload background image%E",
|
|
|
|
&ScreenBackgroundImage);
|
|
|
|
Printf(false, " (bottom left will be center of view)");
|
|
|
|
}
|
|
|
|
|
2009-09-18 08:14:15 +00:00
|
|
|
Printf(false, "");
|
|
|
|
Printf(false, " %Fl%Ll%fload factory defaults%E",
|
|
|
|
&ScreenLoadFactoryDefaultStyles);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenChangeStyleName(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
hStyle hs = { v };
|
|
|
|
Style *s = Style::Get(hs);
|
2016-02-14 20:13:40 +00:00
|
|
|
SS.TW.ShowEditControl(12, s->name);
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.TW.edit.style = hs;
|
2015-03-29 00:30:52 +00:00
|
|
|
SS.TW.edit.meaning = EDIT_STYLE_NAME;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenDeleteStyle(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.UndoRemember();
|
|
|
|
hStyle hs = { v };
|
|
|
|
Style *s = SK.style.FindByIdNoOops(hs);
|
|
|
|
if(s) {
|
|
|
|
SK.style.RemoveById(hs);
|
|
|
|
// And it will get recreated automatically if something is still using
|
|
|
|
// the style, so no need to do anything else.
|
|
|
|
}
|
|
|
|
SS.TW.GoToScreen(SCREEN_LIST_OF_STYLES);
|
|
|
|
InvalidateGraphics();
|
|
|
|
}
|
|
|
|
|
2016-02-23 18:00:39 +00:00
|
|
|
void TextWindow::ScreenChangeStylePatternType(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
hStyle hs = { v };
|
|
|
|
Style *s = Style::Get(hs);
|
2016-02-23 18:00:39 +00:00
|
|
|
s->stippleType = link - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void TextWindow::ScreenChangeStyleMetric(int link, uint32_t v) {
|
|
|
|
hStyle hs = { v };
|
|
|
|
Style *s = Style::Get(hs);
|
|
|
|
double val;
|
|
|
|
int units, meaning, col;
|
|
|
|
switch(link) {
|
|
|
|
case 't':
|
|
|
|
val = s->textHeight;
|
|
|
|
units = s->textHeightAs;
|
|
|
|
col = 10;
|
|
|
|
meaning = EDIT_STYLE_TEXT_HEIGHT;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
val = s->stippleScale;
|
|
|
|
units = s->widthAs;
|
|
|
|
col = 17;
|
|
|
|
meaning = EDIT_STYLE_STIPPLE_PERIOD;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'w':
|
|
|
|
case 'W':
|
|
|
|
val = s->width;
|
|
|
|
units = s->widthAs;
|
|
|
|
col = 9;
|
|
|
|
meaning = EDIT_STYLE_WIDTH;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default: oops();
|
|
|
|
}
|
2009-09-24 15:52:48 +00:00
|
|
|
|
2015-11-06 08:40:12 +00:00
|
|
|
std::string edit_value;
|
2009-09-24 15:52:48 +00:00
|
|
|
if(units == Style::UNITS_AS_PIXELS) {
|
2015-11-06 08:40:12 +00:00
|
|
|
edit_value = ssprintf("%.2f", val);
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2015-11-06 08:40:12 +00:00
|
|
|
edit_value = SS.MmToString(val);
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
2016-01-26 11:19:52 +00:00
|
|
|
SS.TW.ShowEditControl(col, edit_value);
|
2009-09-29 11:35:19 +00:00
|
|
|
SS.TW.edit.style = hs;
|
2016-02-23 18:00:39 +00:00
|
|
|
SS.TW.edit.meaning = meaning;
|
2009-09-29 11:35:19 +00:00
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenChangeStyleTextAngle(int link, uint32_t v) {
|
2009-09-29 11:35:19 +00:00
|
|
|
hStyle hs = { v };
|
|
|
|
Style *s = Style::Get(hs);
|
2016-01-26 11:19:52 +00:00
|
|
|
SS.TW.ShowEditControl(9, ssprintf("%.2f", s->textAngle));
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.TW.edit.style = hs;
|
2009-09-29 11:35:19 +00:00
|
|
|
SS.TW.edit.meaning = EDIT_STYLE_TEXT_ANGLE;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenChangeStyleColor(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
hStyle hs = { v };
|
|
|
|
Style *s = Style::Get(hs);
|
2009-10-22 17:16:20 +00:00
|
|
|
// Same function used for stroke and fill colors
|
2016-01-26 11:19:52 +00:00
|
|
|
int em;
|
2015-07-10 11:54:39 +00:00
|
|
|
RgbaColor rgb;
|
2009-10-22 17:16:20 +00:00
|
|
|
if(link == 's') {
|
|
|
|
em = EDIT_STYLE_COLOR;
|
|
|
|
rgb = s->color;
|
|
|
|
} else if(link == 'f') {
|
|
|
|
em = EDIT_STYLE_FILL_COLOR;
|
|
|
|
rgb = s->fillColor;
|
|
|
|
} else {
|
|
|
|
oops();
|
|
|
|
}
|
2016-01-26 11:19:52 +00:00
|
|
|
SS.TW.ShowEditControlWithColorPicker(13, rgb);
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.TW.edit.style = hs;
|
2009-10-22 17:16:20 +00:00
|
|
|
SS.TW.edit.meaning = em;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenChangeStyleYesNo(int link, uint32_t v) {
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.UndoRemember();
|
|
|
|
hStyle hs = { v };
|
|
|
|
Style *s = Style::Get(hs);
|
|
|
|
switch(link) {
|
2010-05-09 18:25:23 +00:00
|
|
|
// Units for the width
|
2009-09-18 08:14:15 +00:00
|
|
|
case 'w':
|
2010-05-09 18:25:23 +00:00
|
|
|
if(s->widthAs != Style::UNITS_AS_MM) {
|
2009-09-24 15:52:48 +00:00
|
|
|
s->widthAs = Style::UNITS_AS_MM;
|
|
|
|
s->width /= SS.GW.scale;
|
2016-02-23 18:00:39 +00:00
|
|
|
s->stippleScale /= SS.GW.scale;
|
2010-05-09 18:25:23 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'W':
|
|
|
|
if(s->widthAs != Style::UNITS_AS_PIXELS) {
|
2009-09-24 15:52:48 +00:00
|
|
|
s->widthAs = Style::UNITS_AS_PIXELS;
|
|
|
|
s->width *= SS.GW.scale;
|
2016-02-23 18:00:39 +00:00
|
|
|
s->stippleScale *= SS.GW.scale;
|
2009-09-24 15:52:48 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2010-05-09 18:25:23 +00:00
|
|
|
// Units for the height
|
|
|
|
case 'g':
|
|
|
|
if(s->textHeightAs != Style::UNITS_AS_MM) {
|
2009-09-24 15:52:48 +00:00
|
|
|
s->textHeightAs = Style::UNITS_AS_MM;
|
|
|
|
s->textHeight /= SS.GW.scale;
|
2010-05-09 18:25:23 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'G':
|
|
|
|
if(s->textHeightAs != Style::UNITS_AS_PIXELS) {
|
2009-09-24 15:52:48 +00:00
|
|
|
s->textHeightAs = Style::UNITS_AS_PIXELS;
|
|
|
|
s->textHeight *= SS.GW.scale;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'e':
|
|
|
|
s->exportable = !(s->exportable);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'v':
|
|
|
|
s->visible = !(s->visible);
|
|
|
|
break;
|
2009-09-24 15:52:48 +00:00
|
|
|
|
2009-10-22 17:16:20 +00:00
|
|
|
case 'f':
|
|
|
|
s->filled = !(s->filled);
|
|
|
|
break;
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
// Horizontal text alignment
|
|
|
|
case 'L':
|
|
|
|
s->textOrigin |= Style::ORIGIN_LEFT;
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_RIGHT;
|
|
|
|
break;
|
|
|
|
case 'H':
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_LEFT;
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_RIGHT;
|
|
|
|
break;
|
|
|
|
case 'R':
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_LEFT;
|
|
|
|
s->textOrigin |= Style::ORIGIN_RIGHT;
|
|
|
|
break;
|
|
|
|
|
|
|
|
// Vertical text alignment
|
|
|
|
case 'B':
|
|
|
|
s->textOrigin |= Style::ORIGIN_BOT;
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_TOP;
|
|
|
|
break;
|
|
|
|
case 'V':
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_BOT;
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_TOP;
|
|
|
|
break;
|
|
|
|
case 'T':
|
|
|
|
s->textOrigin &= ~Style::ORIGIN_BOT;
|
|
|
|
s->textOrigin |= Style::ORIGIN_TOP;
|
|
|
|
break;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
InvalidateGraphics();
|
|
|
|
}
|
|
|
|
|
2013-09-16 19:51:20 +00:00
|
|
|
bool TextWindow::EditControlDoneForStyles(const char *str) {
|
2009-09-18 08:14:15 +00:00
|
|
|
Style *s;
|
|
|
|
switch(edit.meaning) {
|
2016-02-23 18:00:39 +00:00
|
|
|
case EDIT_STYLE_STIPPLE_PERIOD:
|
2009-09-24 15:52:48 +00:00
|
|
|
case EDIT_STYLE_TEXT_HEIGHT:
|
|
|
|
case EDIT_STYLE_WIDTH: {
|
2009-09-18 08:14:15 +00:00
|
|
|
SS.UndoRemember();
|
|
|
|
s = Style::Get(edit.style);
|
2009-09-24 15:52:48 +00:00
|
|
|
|
|
|
|
double v;
|
|
|
|
int units = (edit.meaning == EDIT_STYLE_TEXT_HEIGHT) ?
|
|
|
|
s->textHeightAs : s->widthAs;
|
|
|
|
if(units == Style::UNITS_AS_MM) {
|
|
|
|
v = SS.StringToMm(str);
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2009-09-24 15:52:48 +00:00
|
|
|
v = atof(str);
|
|
|
|
}
|
2015-03-27 15:43:28 +00:00
|
|
|
v = max(0.0, v);
|
2009-09-24 15:52:48 +00:00
|
|
|
if(edit.meaning == EDIT_STYLE_TEXT_HEIGHT) {
|
|
|
|
s->textHeight = v;
|
2016-02-23 18:00:39 +00:00
|
|
|
} else if(edit.meaning == EDIT_STYLE_STIPPLE_PERIOD) {
|
|
|
|
s->stippleScale = v;
|
2009-09-24 15:52:48 +00:00
|
|
|
} else {
|
|
|
|
s->width = v;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
2009-09-29 13:14:47 +00:00
|
|
|
break;
|
2009-09-24 15:52:48 +00:00
|
|
|
}
|
2009-09-29 11:35:19 +00:00
|
|
|
case EDIT_STYLE_TEXT_ANGLE:
|
|
|
|
SS.UndoRemember();
|
|
|
|
s = Style::Get(edit.style);
|
|
|
|
s->textAngle = WRAP_SYMMETRIC(atof(str), 360);
|
2009-09-29 13:14:47 +00:00
|
|
|
break;
|
2009-09-29 11:35:19 +00:00
|
|
|
|
2009-09-18 08:14:15 +00:00
|
|
|
case EDIT_BACKGROUND_COLOR:
|
2009-10-22 17:16:20 +00:00
|
|
|
case EDIT_STYLE_FILL_COLOR:
|
2009-09-18 08:14:15 +00:00
|
|
|
case EDIT_STYLE_COLOR: {
|
2010-08-14 19:00:25 +00:00
|
|
|
Vector rgb;
|
|
|
|
if(sscanf(str, "%lf, %lf, %lf", &rgb.x, &rgb.y, &rgb.z)==3) {
|
|
|
|
rgb = rgb.ClampWithin(0, 1);
|
2009-09-18 08:14:15 +00:00
|
|
|
if(edit.meaning == EDIT_STYLE_COLOR) {
|
|
|
|
SS.UndoRemember();
|
|
|
|
s = Style::Get(edit.style);
|
2010-08-14 19:00:25 +00:00
|
|
|
s->color = RGBf(rgb.x, rgb.y, rgb.z);
|
2009-10-22 17:16:20 +00:00
|
|
|
} else if(edit.meaning == EDIT_STYLE_FILL_COLOR) {
|
|
|
|
SS.UndoRemember();
|
|
|
|
s = Style::Get(edit.style);
|
2010-08-14 19:00:25 +00:00
|
|
|
s->fillColor = RGBf(rgb.x, rgb.y, rgb.z);
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2010-08-14 19:00:25 +00:00
|
|
|
SS.backgroundColor = RGBf(rgb.x, rgb.y, rgb.z);
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
Error("Bad format: specify color as r, g, b");
|
|
|
|
}
|
2009-09-29 13:14:47 +00:00
|
|
|
break;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
case EDIT_STYLE_NAME:
|
2015-11-05 19:39:27 +00:00
|
|
|
if(!*str) {
|
|
|
|
Error("Style name cannot be empty");
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
|
|
|
SS.UndoRemember();
|
|
|
|
s = Style::Get(edit.style);
|
2015-11-06 08:40:12 +00:00
|
|
|
s->name = str;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
2009-09-29 13:14:47 +00:00
|
|
|
break;
|
2009-09-18 08:14:15 +00:00
|
|
|
|
2009-11-08 01:11:38 +00:00
|
|
|
case EDIT_BACKGROUND_IMG_SCALE: {
|
2010-01-04 00:35:28 +00:00
|
|
|
Expr *e = Expr::From(str, true);
|
2009-11-08 01:11:38 +00:00
|
|
|
if(e) {
|
|
|
|
double ev = e->Eval();
|
|
|
|
if(ev < 0.001 || isnan(ev)) {
|
|
|
|
Error("Scale must not be zero or negative!");
|
|
|
|
} else {
|
2010-01-04 00:35:28 +00:00
|
|
|
SS.bgImage.scale = ev / SS.MmPerUnit();
|
2009-11-08 01:11:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2009-09-18 08:14:15 +00:00
|
|
|
default: return false;
|
|
|
|
}
|
2009-09-29 13:14:47 +00:00
|
|
|
return true;
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void TextWindow::ShowStyleInfo(void) {
|
|
|
|
Printf(true, "%Fl%f%Ll(back to list of styles)%E", &ScreenShowListOfStyles);
|
|
|
|
|
|
|
|
Style *s = Style::Get(shown.style);
|
|
|
|
|
|
|
|
if(s->h.v < Style::FIRST_CUSTOM) {
|
2015-11-06 08:40:12 +00:00
|
|
|
Printf(true, "%FtSTYLE %E%s ", s->DescriptionString().c_str());
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(true, "%FtSTYLE %E%s "
|
2009-09-18 08:14:15 +00:00
|
|
|
"[%Fl%Ll%D%frename%E/%Fl%Ll%D%fdel%E]",
|
2015-11-06 08:40:12 +00:00
|
|
|
s->DescriptionString().c_str(),
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, &ScreenChangeStyleName,
|
|
|
|
s->h.v, &ScreenDeleteStyle);
|
|
|
|
}
|
|
|
|
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(true, "%Ft line stroke style%E");
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
Printf(false, "%Ba %Ftcolor %E%Bz %Ba (%@, %@, %@) %D%f%Ls%Fl[change]%E",
|
|
|
|
&s->color,
|
|
|
|
s->color.redF(), s->color.greenF(), s->color.blueF(),
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, ScreenChangeStyleColor);
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
// The line width, and its units
|
|
|
|
if(s->widthAs == Style::UNITS_AS_PIXELS) {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, " %Ftwidth%E %@ %D%f%Lp%Fl[change]%E",
|
2009-09-18 08:14:15 +00:00
|
|
|
s->width,
|
2016-02-23 18:00:39 +00:00
|
|
|
s->h.v, &ScreenChangeStyleMetric,
|
2009-09-29 11:35:19 +00:00
|
|
|
(s->h.v < Style::FIRST_CUSTOM) ? 'w' : 'W');
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, " %Ftwidth%E %s %D%f%Lp%Fl[change]%E",
|
2015-11-06 08:40:12 +00:00
|
|
|
SS.MmToString(s->width).c_str(),
|
2016-02-23 18:00:39 +00:00
|
|
|
s->h.v, &ScreenChangeStyleMetric,
|
2009-09-29 11:35:19 +00:00
|
|
|
(s->h.v < Style::FIRST_CUSTOM) ? 'w' : 'W');
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
|
2016-02-23 18:00:39 +00:00
|
|
|
if(s->h.v >= Style::FIRST_CUSTOM) {
|
|
|
|
if(s->widthAs == Style::UNITS_AS_PIXELS) {
|
|
|
|
Printf(false, "%Ba %Ftstipple width%E %@ %D%f%Lp%Fl[change]%E",
|
|
|
|
s->stippleScale,
|
|
|
|
s->h.v, &ScreenChangeStyleMetric, 's');
|
|
|
|
} else {
|
|
|
|
Printf(false, "%Ba %Ftstipple width%E %s %D%f%Lp%Fl[change]%E",
|
|
|
|
SS.MmToString(s->stippleScale).c_str(),
|
|
|
|
s->h.v, &ScreenChangeStyleMetric, 's');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
bool widthpx = (s->widthAs == Style::UNITS_AS_PIXELS);
|
2009-09-18 08:14:15 +00:00
|
|
|
if(s->h.v < Style::FIRST_CUSTOM) {
|
2016-02-23 18:00:39 +00:00
|
|
|
Printf(false," %Ftin units of %Fdpixels%E");
|
2009-09-18 08:14:15 +00:00
|
|
|
} else {
|
2016-02-21 19:07:58 +00:00
|
|
|
Printf(false,"%Ba %Ftin units of %Fd"
|
2015-11-05 19:39:27 +00:00
|
|
|
"%D%f%LW%s pixels%E "
|
|
|
|
"%D%f%Lw%s %s",
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
widthpx ? RADIO_TRUE : RADIO_FALSE,
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
!widthpx ? RADIO_TRUE : RADIO_FALSE,
|
|
|
|
SS.UnitName());
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
|
2016-02-23 18:00:39 +00:00
|
|
|
if(s->h.v >= Style::FIRST_CUSTOM) {
|
|
|
|
Printf(false,"%Ba %Ftstipple type:%E");
|
|
|
|
|
|
|
|
const size_t patternCount = Style::LAST_STIPPLE + 1;
|
|
|
|
const char *patternsSource[patternCount] = {
|
|
|
|
"___________",
|
|
|
|
"- - - - - -",
|
|
|
|
"__ __ __ __",
|
|
|
|
"-.-.-.-.-.-",
|
|
|
|
"..-..-..-..",
|
|
|
|
"...........",
|
|
|
|
"~~~~~~~~~~~",
|
|
|
|
"__~__~__~__"
|
|
|
|
};
|
|
|
|
std::string patterns[patternCount];
|
|
|
|
|
|
|
|
for(int i = 0; i <= Style::LAST_STIPPLE; i++) {
|
|
|
|
const char *str = patternsSource[i];
|
|
|
|
do {
|
|
|
|
switch(*str) {
|
|
|
|
case ' ': patterns[i] += " "; break;
|
|
|
|
case '.': patterns[i] += "\xEE\x80\x84"; break;
|
|
|
|
case '_': patterns[i] += "\xEE\x80\x85"; break;
|
|
|
|
case '-': patterns[i] += "\xEE\x80\x86"; break;
|
|
|
|
case '~': patterns[i] += "\xEE\x80\x87"; break;
|
|
|
|
default: oops();
|
|
|
|
}
|
|
|
|
} while(*(++str));
|
|
|
|
}
|
|
|
|
|
|
|
|
for(int i = 0; i <= Style::LAST_STIPPLE; i++) {
|
|
|
|
const char *radio = s->stippleType == i ? RADIO_TRUE : RADIO_FALSE;
|
|
|
|
Printf(false, "%Bp %D%f%Lp%s %s%E",
|
|
|
|
(i % 2 == 0) ? 'd' : 'a',
|
|
|
|
s->h.v, &ScreenChangeStylePatternType,
|
|
|
|
i + 1, radio, patterns[i].c_str());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-22 17:16:20 +00:00
|
|
|
if(s->h.v >= Style::FIRST_CUSTOM) {
|
|
|
|
// The fill color, and whether contours are filled
|
2010-05-09 18:25:23 +00:00
|
|
|
|
|
|
|
Printf(false, "");
|
|
|
|
Printf(false, "%Ft contour fill style%E");
|
|
|
|
Printf(false,
|
Replaced RGB-color integers with dedicated data structure
RGB colors were represented using a uint32_t with the red, green and blue
values stuffed into the lower three octets (i.e. 0x00BBGGRR), like
Microsoft's COLORREF. This approach did not lend itself to type safety,
however, so this change replaces it with an RgbColor class that provides
the same infomation plus a handful of useful methods to work with it. (Note
that sizeof(RgbColor) == sizeof(uint32_t), so this change should not lead
to memory bloat.)
Some of the new methods/fields replace what were previously macro calls;
e.g. RED(c) is now c.red, REDf(c) is now c.redF(). The .Equals() method is
now used instead of == to compare colors.
RGB colors still need to be represented as packed integers in file I/O and
preferences, so the methods .FromPackedInt() and .ToPackedInt() are
provided. Also implemented are Cnf{Freeze,Thaw}Color(), type-safe wrappers
around Cnf{Freeze,Thaw}Int() that facilitate I/O with preferences.
(Cnf{Freeze,Thaw}Color() are defined outside of the system-dependent code
to minimize the footprint of the latter; because the same can be done with
Cnf{Freeze,Thaw}Bool(), those are also moved out of the system code with
this commit.)
Color integers were being OR'ed with 0x80000000 in some places for two
distinct purposes: One, to indicate use of a default color in
glxFillMesh(); this has been replaced by use of the .UseDefault() method.
Two, to indicate to TextWindow::Printf() that the format argument of a
"%Bp"/"%Fp" specifier is an RGB color rather than a color "code" from
TextWindow::bgColors[] or TextWindow::fgColors[] (as the specifier can
accept either); instead, we define a new flag "z" (as in "%Bz" or "%Fz") to
indicate an RGBcolor pointer, leaving "%Bp"/"%Fp" to indicate a color code
exclusively.
(This also allows TextWindow::meta[][].bg to be a char instead of an int,
partly compensating for the new .bgRgb field added immediately after.)
In array declarations, RGB colors could previously be specified as 0 (often
in a terminating element). As that no longer works, we define NULL_COLOR,
which serves much the same purpose for RgbColor variables as NULL serves
for pointers.
2013-10-16 20:00:58 +00:00
|
|
|
"%Ba %Ftcolor %E%Bz %Ba (%@, %@, %@) %D%f%Lf%Fl[change]%E",
|
|
|
|
&s->fillColor,
|
|
|
|
s->fillColor.redF(), s->fillColor.greenF(), s->fillColor.blueF(),
|
2010-05-09 18:25:23 +00:00
|
|
|
s->h.v, ScreenChangeStyleColor);
|
|
|
|
|
2015-11-05 19:39:27 +00:00
|
|
|
Printf(false, "%Bd %D%f%Lf%s contours are filled%E",
|
2009-10-22 17:16:20 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
s->filled ? CHECK_TRUE : CHECK_FALSE);
|
2009-10-22 17:16:20 +00:00
|
|
|
}
|
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
// The text height, and its units
|
2009-09-29 11:35:19 +00:00
|
|
|
Printf(false, "");
|
2016-02-21 19:07:58 +00:00
|
|
|
Printf(false, "%Ft text style%E");
|
2010-05-09 18:25:23 +00:00
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
if(s->textHeightAs == Style::UNITS_AS_PIXELS) {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, "%Ba %Ftheight %E%@ %D%f%Lt%Fl%s%E",
|
2009-09-24 15:52:48 +00:00
|
|
|
s->textHeight,
|
2016-02-23 18:00:39 +00:00
|
|
|
s->h.v, &ScreenChangeStyleMetric,
|
2016-02-21 19:07:58 +00:00
|
|
|
"[change]");
|
2009-09-24 15:52:48 +00:00
|
|
|
} else {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, "%Ba %Ftheight %E%s %D%f%Lt%Fl%s%E",
|
2015-11-06 08:40:12 +00:00
|
|
|
SS.MmToString(s->textHeight).c_str(),
|
2016-02-23 18:00:39 +00:00
|
|
|
s->h.v, &ScreenChangeStyleMetric,
|
2016-02-21 19:07:58 +00:00
|
|
|
"[change]");
|
2009-09-24 15:52:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool textHeightpx = (s->textHeightAs == Style::UNITS_AS_PIXELS);
|
|
|
|
if(s->h.v < Style::FIRST_CUSTOM) {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false,"%Bd %Ftin units of %Fdpixels");
|
2009-09-24 15:52:48 +00:00
|
|
|
} else {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false,"%Bd %Ftin units of %Fd"
|
2015-11-05 19:39:27 +00:00
|
|
|
"%D%f%LG%s pixels%E "
|
|
|
|
"%D%f%Lg%s %s",
|
2009-09-24 15:52:48 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
textHeightpx ? RADIO_TRUE : RADIO_FALSE,
|
2009-09-24 15:52:48 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
!textHeightpx ? RADIO_TRUE : RADIO_FALSE,
|
|
|
|
SS.UnitName());
|
2009-09-24 15:52:48 +00:00
|
|
|
}
|
|
|
|
|
2009-09-18 08:14:15 +00:00
|
|
|
if(s->h.v >= Style::FIRST_CUSTOM) {
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, "%Ba %Ftangle %E%@ %D%f%Ll%Fl[change]%E",
|
2009-09-29 11:35:19 +00:00
|
|
|
s->textAngle,
|
|
|
|
s->h.v, &ScreenChangeStyleTextAngle);
|
|
|
|
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, "");
|
|
|
|
Printf(false, "%Ft text comment alignment%E");
|
2009-10-22 17:16:20 +00:00
|
|
|
bool neither;
|
2009-09-24 15:52:48 +00:00
|
|
|
neither = !(s->textOrigin & (Style::ORIGIN_LEFT | Style::ORIGIN_RIGHT));
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, "%Ba "
|
2015-11-05 19:39:27 +00:00
|
|
|
"%D%f%LL%s left%E "
|
|
|
|
"%D%f%LH%s center%E "
|
|
|
|
"%D%f%LR%s right%E ",
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
(s->textOrigin & Style::ORIGIN_LEFT) ? RADIO_TRUE : RADIO_FALSE,
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
neither ? RADIO_TRUE : RADIO_FALSE,
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
(s->textOrigin & Style::ORIGIN_RIGHT) ? RADIO_TRUE : RADIO_FALSE);
|
2009-09-24 15:52:48 +00:00
|
|
|
|
|
|
|
neither = !(s->textOrigin & (Style::ORIGIN_BOT | Style::ORIGIN_TOP));
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, "%Bd "
|
2015-11-05 19:39:27 +00:00
|
|
|
"%D%f%LB%s bottom%E "
|
|
|
|
"%D%f%LV%s center%E "
|
|
|
|
"%D%f%LT%s top%E ",
|
2009-09-18 08:14:15 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
(s->textOrigin & Style::ORIGIN_BOT) ? RADIO_TRUE : RADIO_FALSE,
|
2009-09-24 15:52:48 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
neither ? RADIO_TRUE : RADIO_FALSE,
|
2009-09-24 15:52:48 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
(s->textOrigin & Style::ORIGIN_TOP) ? RADIO_TRUE : RADIO_FALSE);
|
2009-09-24 15:52:48 +00:00
|
|
|
}
|
2009-09-22 05:46:30 +00:00
|
|
|
|
2009-09-24 15:52:48 +00:00
|
|
|
if(s->h.v >= Style::FIRST_CUSTOM) {
|
2009-10-22 17:16:20 +00:00
|
|
|
Printf(false, "");
|
2010-05-09 18:25:23 +00:00
|
|
|
|
2015-11-05 19:39:27 +00:00
|
|
|
Printf(false, " %Fd%D%f%Lv%s show these objects on screen%E",
|
2009-10-22 17:16:20 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
s->visible ? CHECK_TRUE : CHECK_FALSE);
|
|
|
|
|
2015-11-05 19:39:27 +00:00
|
|
|
Printf(false, " %Fd%D%f%Le%s export these objects%E",
|
2009-10-22 17:16:20 +00:00
|
|
|
s->h.v, &ScreenChangeStyleYesNo,
|
2010-05-09 18:25:23 +00:00
|
|
|
s->exportable ? CHECK_TRUE : CHECK_FALSE);
|
2009-10-22 17:16:20 +00:00
|
|
|
|
2009-09-22 05:46:30 +00:00
|
|
|
Printf(false, "");
|
|
|
|
Printf(false, "To assign lines or curves to this style,");
|
2010-05-09 18:25:23 +00:00
|
|
|
Printf(false, "right-click them on the drawing.");
|
2009-09-18 08:14:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Use C99 integer types and C++ boolean types/values
This change comprehensively replaces the use of Microsoft-standard integer
and boolean types with their C99/C++ standard equivalents, as the latter is
more appropriate for a cross-platform application. With matter-of-course
exceptions in the Win32-specific code, the types/values have been converted
as follows:
QWORD --> uint64_t
SQWORD --> int64_t
DWORD --> uint32_t
SDWORD --> int32_t
WORD --> uint16_t
SWORD --> int16_t
BYTE --> uint8_t
BOOL --> bool
TRUE --> true
FALSE --> false
The following related changes are also included:
* Added C99 integer type definitions for Windows, as stdint.h is not
available prior to Visual Studio 2010
* Changed types of some variables in the SolveSpace class from 'int' to
'bool', as they actually represent boolean settings
* Implemented new Cnf{Freeze,Thaw}Bool() functions to support boolean
variables in the Registry
* Cnf{Freeze,Thaw}DWORD() are now Cnf{Freeze,Thaw}Int()
* TtfFont::Get{WORD,DWORD}() are now TtfFont::Get{USHORT,ULONG}() (names
inspired by the OpenType spec)
* RGB colors are packed into an integer of type uint32_t (nee DWORD), but
in a few places, these were represented by an int; these have been
corrected to uint32_t
2013-10-02 05:45:13 +00:00
|
|
|
void TextWindow::ScreenAssignSelectionToStyle(int link, uint32_t v) {
|
2009-09-23 10:59:59 +00:00
|
|
|
Style::AssignSelectionToStyle(v);
|
2009-09-22 05:46:30 +00:00
|
|
|
}
|
|
|
|
|