SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@488 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2017-04-28 12:38:14 +00:00
parent 6b46c0cd54
commit 41a0acb3b3
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src_main/console/piscreentypes.h
View File

@@ -92,7 +92,6 @@ namespace PIScreenTypes {
typedef PIFlags<CharFlag> CharFlags; typedef PIFlags<CharFlag> CharFlags;
typedef PIFlags<FocusFlag> FocusFlags; typedef PIFlags<FocusFlag> FocusFlags;
#pragma pack(push, 1)
union CellFormat { union CellFormat {
CellFormat(uint f = 0) {raw_format = f;} CellFormat(uint f = 0) {raw_format = f;}
CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) { CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) {
@@ -125,7 +124,6 @@ namespace PIScreenTypes {
return *this; return *this;
} }
}; };
#pragma pack(pop)
struct TileEvent { struct TileEvent {
TileEvent(int t = -1, const PIVariant & d = PIVariant()): type(t), data(d) {} TileEvent(int t = -1, const PIVariant & d = PIVariant()): type(t), data(d) {}
@@ -145,12 +143,12 @@ namespace PIScreenTypes {
} }
//inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.symbol << v.format.raw_format; return s;} inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.format.raw_format << v.symbol; return s;}
//inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.symbol >> v.format.raw_format; return s;} inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
__PICONTAINERS_SIMPLE_TYPE__(PIScreenTypes::Cell) //__PICONTAINERS_SIMPLE_TYPE__(PIScreenTypes::Cell)
__PIBYTEARRAY_SIMPLE_TYPE__(PIScreenTypes::Cell) //__PIBYTEARRAY_SIMPLE_TYPE__(PIScreenTypes::Cell)
#endif // PISCREENTYPES_H #endif // PISCREENTYPES_H

2
src_main/core/piinit.cpp
View File

@@ -181,8 +181,6 @@ PIInit::PIInit() {
memset(__sysoemname__, 0, 256); memset(__sysoemname__, 0, 256);
memcpy(__sysoemname__, "ibm-", 4); memcpy(__sysoemname__, "ibm-", 4);
memcpy(&(__sysoemname__[4]), cpinfo.CodePageName, l); memcpy(&(__sysoemname__[4]), cpinfo.CodePageName, l);
uint ccp = GetConsoleCP();
printf("%i\n", ccp);
# else # else
/*PIString en(getenv("LANG")); /*PIString en(getenv("LANG"));
if (!en.isEmpty()) if (!en.isEmpty())