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@532 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2017-08-03 20:29:50 +00:00
parent cfc29ecb08
commit b60e146f86
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FindPIP.cmake
View File

@@ -33,8 +33,11 @@ if(NOT PIP_VERSION)
math(EXPR SL '${SL}-2') math(EXPR SL '${SL}-2')
string(SUBSTRING ${_VERSION} 1 ${SL} _VERSION) string(SUBSTRING ${_VERSION} 1 ${SL} _VERSION)
set(PIP_VERSION ${_VERSION} CACHE STRING "VERSION") set(PIP_VERSION ${_VERSION} CACHE STRING "VERSION")
if (NOT _PIP_MSG)
set(_PIP_MSG 1 CACHE BOOL "msg_pip" FORCE)
message(STATUS "Found PIP version ${PIP_VERSION}") message(STATUS "Found PIP version ${PIP_VERSION}")
endif() endif()
endif()
if(PIP_FIND_VERSION VERSION_GREATER PIP_VERSION) if(PIP_FIND_VERSION VERSION_GREATER PIP_VERSION)
message(FATAL_ERROR "PIP version ${PIP_VERSION} is available, but ${PIP_FIND_VERSION} requested!") message(FATAL_ERROR "PIP version ${PIP_VERSION} is available, but ${PIP_FIND_VERSION} requested!")
endif() endif()

2
src_main/console/piconsole.h
View File

@@ -425,7 +425,7 @@ public:
PIKbdListener * listener; PIKbdListener * listener;
Alignment def_align; Alignment def_align;
PIKbdListener::KBFunc ret_func; PIKbdListener::KBFunc ret_func;
int width, height, pwidth, pheight, ret, col_wid, num_format, systime_format; int width, height, pwidth, pheight, col_wid, num_format, systime_format;
uint max_y; uint max_y;
int vid; int vid;
uint cur_tab, col_cnt; uint cur_tab, col_cnt;

5
src_main/console/piscreentiles.cpp
View File

@@ -503,8 +503,11 @@ bool TileCheck::keyEvent(PIKbdListener::KeyEvent key) {
bool TileCheck::mouseEvent(PIKbdListener::MouseEvent me) { bool TileCheck::mouseEvent(PIKbdListener::MouseEvent me) {
if (me.action == PIKbdListener::MouseButtonPress) if (me.action == PIKbdListener::MouseButtonPress) {
keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return)); keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
return true;
}
return false;
} }

4
src_main/math/pifixedpoint.h
View File

@@ -31,8 +31,8 @@ public:
typedef PIFixedPoint<Precision, Type> fp; typedef PIFixedPoint<Precision, Type> fp;
PIFixedPoint(const Type &v = Type()) {val = fpv(v);} PIFixedPoint(const Type &v = Type()) {val = fpv(v);}
PIFixedPoint(const fp &v) {val = v.val;} PIFixedPoint(const fp &v) {val = v.val;}
PIFixedPoint(const float &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));} PIFixedPoint(const float &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << (Precision-1)));}
PIFixedPoint(const double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));} PIFixedPoint(const double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << (Precision-1)));}
// FixedPoint(const long double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));} // FixedPoint(const long double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));}
template<typename T> template<typename T>

2
src_main/system/piprocess.h
View File

@@ -97,7 +97,7 @@ private:
PIByteArray out; PIByteArray out;
PIFile f_in, f_out, f_err; PIFile f_in, f_out, f_err;
bool g_in, g_out, g_err, t_in, t_out, t_err; bool g_in, g_out, g_err, t_in, t_out, t_err;
int exit_code, sz; int exit_code;
bool is_exec; bool is_exec;
}; };