used utf8 instead of gb18080 in few files.

This commit is contained in:
2023-06-28 18:36:12 +08:00
parent f62c0e3110
commit 7e469db038
4 changed files with 92 additions and 92 deletions

View File

@@ -1,4 +1,4 @@
#ifndef HGL_EVENT_PROC_INCLUDE #ifndef HGL_EVENT_PROC_INCLUDE
#define HGL_EVENT_PROC_INCLUDE #define HGL_EVENT_PROC_INCLUDE
#include<hgl/type/Queue.h> #include<hgl/type/Queue.h>
@@ -6,7 +6,7 @@
namespace hgl namespace hgl
{ {
/** /**
* <EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> * 事件基类
*/ */
class EventProc class EventProc
{ {
@@ -21,7 +21,7 @@ namespace hgl
using EventProcQueue=Queue<EventProc *>; using EventProcQueue=Queue<EventProc *>;
/** /**
* ִ<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD> * 执行一个事件
*/ */
inline bool UpdateEvent(EventProcQueue *epq) inline bool UpdateEvent(EventProcQueue *epq)
{ {
@@ -42,9 +42,9 @@ namespace hgl
} }
/** /**
* ˢ<EFBFBD><EFBFBD>ִ<EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> * 刷新执行事件队列
* @param epq <EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> * @param epq 事件队列
* @param max_count <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˢ<EFBFBD>¸<EFBFBD><EFBFBD><EFBFBD>(-1<><31>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) * @param max_count 最大刷新个数(-1表示无限制)
*/ */
inline int UpdateEventQueue(EventProcQueue *epq,int max_count=-1) inline int UpdateEventQueue(EventProcQueue *epq,int max_count=-1)
{ {

View File

@@ -1,4 +1,4 @@
#ifndef HGL_IO_INPUT_EVENT_INCLUDE #ifndef HGL_IO_INPUT_EVENT_INCLUDE
#define HGL_IO_INPUT_EVENT_INCLUDE #define HGL_IO_INPUT_EVENT_INCLUDE
#include<hgl/type/SortedSets.h> #include<hgl/type/SortedSets.h>
@@ -9,15 +9,15 @@ namespace hgl
{ {
struct EventHeader struct EventHeader
{ {
uint8 type; ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> uint8 type; ///<输入源类型
uint8 index; ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD>ͬһ<CDAC><EFBFBD>ж<EFBFBD><D0B6><EFBFBD>) uint8 index; ///<输入源索引(比如同一设备有多个)
uint16 id; ///<<EFBFBD>¼<EFBFBD>id uint16 id; ///<事件id
}; };
constexpr size_t EventHeaderBytes=sizeof(EventHeader); constexpr size_t EventHeaderBytes=sizeof(EventHeader);
/** /**
* <EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> * 事件处理结果
*/ */
enum class EventProcResult enum class EventProcResult
{ {

View File

@@ -1,4 +1,4 @@
#ifndef HGL_IO_DEVICE_MOUSE_EVENT_INCLUDE #ifndef HGL_IO_DEVICE_MOUSE_EVENT_INCLUDE
#define HGL_IO_DEVICE_MOUSE_EVENT_INCLUDE #define HGL_IO_DEVICE_MOUSE_EVENT_INCLUDE
#include<hgl/TypeFunc.h> #include<hgl/TypeFunc.h>
@@ -7,7 +7,7 @@ namespace hgl
namespace io namespace io
{ {
/** /**
* <EFBFBD>ֱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ö<EFBFBD><EFBFBD> * 手柄按键枚举
*/ */
enum class JoystickButton enum class JoystickButton
{ {
@@ -33,10 +33,10 @@ namespace hgl
Left =JoystickButton::Left, Left =JoystickButton::Left,
Right =JoystickButton::Right, Right =JoystickButton::Right,
Fork =JoystickButton::_0, // <EFBFBD><EFBFBD> Fork =JoystickButton::_0, //
Circle =JoystickButton::_1, // Բ Circle =JoystickButton::_1, //
Square =JoystickButton::_2, // <EFBFBD><EFBFBD> Square =JoystickButton::_2, //
Triangle =JoystickButton::_3, // <EFBFBD><EFBFBD><EFBFBD><EFBFBD> Triangle =JoystickButton::_3, // 三角
L1 =JoystickButton::_6, L2 =JoystickButton::_4, L1 =JoystickButton::_6, L2 =JoystickButton::_4,
R1 =JoystickButton::_7, R2 =JoystickButton::_5, R1 =JoystickButton::_7, R2 =JoystickButton::_5,
@@ -54,7 +54,7 @@ namespace hgl
// R=JoystickButton::_5, // R=JoystickButton::_5,
// //XBOX/XBOX360 // //XBOX/XBOX360
// //XBOX, //<EFBFBD><EFBFBD><EFBFBD>ϼ<EFBFBD> // //XBOX, //西瓜键
//}; //};
}//namespace io }//namespace io
}//namespace hgl }//namespace hgl

View File

@@ -1,4 +1,4 @@
#ifndef HGL_IO_KEYBOARD_EVENT_INCLUDE #ifndef HGL_IO_KEYBOARD_EVENT_INCLUDE
#define HGL_IO_KEYBOARD_EVENT_INCLUDE #define HGL_IO_KEYBOARD_EVENT_INCLUDE
#include<hgl/io/event/InputEvent.h> #include<hgl/io/event/InputEvent.h>
@@ -7,15 +7,15 @@ namespace hgl
namespace io namespace io
{ {
/** /**
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ö<EFBFBD>ٶ<EFBFBD><EFBFBD><EFBFBD> * 按键枚举定义
*/ */
enum class KeyboardButton enum class KeyboardButton
{ {
NONE=0, NONE=0,
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //主键盘区
Esc, ///<ESC Esc, ///<ESC
//F<EFBFBD><EFBFBD><EFBFBD>ܼ<EFBFBD> //F功能键
F1, ///<F1 F1, ///<F1
F2, ///<F2 F2, ///<F2
F3, ///<F3 F3, ///<F3
@@ -29,26 +29,26 @@ namespace hgl
F11, ///<F11 F11, ///<F11
F12, ///<F12 F12, ///<F12
Grave, //<`<EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>1<EFBFBD><31><EFBFBD>ߵİ<DFB5>ť) Grave, //<`号(主键盘数字键1左边的按钮)
//10<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //10个数字
_0, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>0 _0, ///<数字键0
_1, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>1 _1, ///<数字键1
_2, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>2 _2, ///<数字键2
_3, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>3 _3, ///<数字键3
_4, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>4 _4, ///<数字键4
_5, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>5 _5, ///<数字键5
_6, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>6 _6, ///<数字键6
_7, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>7 _7, ///<数字键7
_8, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>8 _8, ///<数字键8
_9, ///<<EFBFBD><EFBFBD><EFBFBD>ּ<EFBFBD>9 _9, ///<数字键9
Minus, ///< - (<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) Minus, ///< - (减号)
Equals, ///< = (<EFBFBD>Ⱥ<EFBFBD>) Equals, ///< = (等号)
BackSlash, ///< \ (<EFBFBD><EFBFBD>б<EFBFBD><EFBFBD>) BackSlash, ///< \ (反斜杠)
BackSpace, ///< <EFBFBD>˸<EFBFBD><EFBFBD><EFBFBD> BackSpace, ///< 退格键
Tab, ///<Tab<EFBFBD><EFBFBD> Tab, ///<Tab
A, ///<A A, ///<A
B, ///<B B, ///<B
@@ -80,66 +80,66 @@ namespace hgl
LeftBracket, ///<[ LeftBracket, ///<[
RightBracket, ///<] RightBracket, ///<]
CapsLock, ///<<EFBFBD><EFBFBD>д<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CapsLock, ///<大写锁定键
Semicolon, ///<; (<EFBFBD>ֺ<EFBFBD>) Semicolon, ///<; (分号)
Apostrophe, ///<' (<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) Apostrophe, ///<' (单引号)
Enter, ///<<EFBFBD>س<EFBFBD><EFBFBD><EFBFBD> Enter, ///<回车键
LeftShift, ///<<EFBFBD><EFBFBD><EFBFBD>ߵ<EFBFBD>Shift<EFBFBD><EFBFBD> LeftShift, ///<左边的Shift
Comma, ///<, (<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) Comma, ///<, (逗号)
Period, ///<. (<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) Period, ///<. (句号)
Slash, ///</ (<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) Slash, ///</ (除号)
RightShift, ///<<EFBFBD>ұߵ<EFBFBD>Shift<EFBFBD><EFBFBD> RightShift, ///<右边的Shift
LeftCtrl, ///<<EFBFBD><EFBFBD><EFBFBD>ߵ<EFBFBD>Ctrl<EFBFBD><EFBFBD> LeftCtrl, ///<左边的Ctrl
LeftOS, ///<<EFBFBD><EFBFBD><EFBFBD>ߵ<EFBFBD>OS<EFBFBD><EFBFBD>(Win/Apple<EFBFBD><EFBFBD>) LeftOS, ///<左边的OS键(Win/Apple)
LeftAlt, ///<<EFBFBD><EFBFBD><EFBFBD>ߵ<EFBFBD>Alt<EFBFBD><EFBFBD> LeftAlt, ///<左边的Alt
Space, ///<<EFBFBD>ո<EFBFBD><EFBFBD><EFBFBD> Space, ///<空格键
RightAlt, ///<<EFBFBD>ұߵ<EFBFBD>Alt<EFBFBD><EFBFBD> RightAlt, ///<右边的Alt
RightOS, ///<<EFBFBD>ұߵ<EFBFBD>OS<EFBFBD><EFBFBD>(Win/Apple<EFBFBD><EFBFBD>) RightOS, ///<右边的OS键(Win/Apple)
RightMenu, ///<<EFBFBD>ұߵ<EFBFBD>Menu<EFBFBD><EFBFBD> RightMenu, ///<右边的Menu
RightCtrl, ///<<EFBFBD>ұߵ<EFBFBD>Ctrl<EFBFBD><EFBFBD> RightCtrl, ///<右边的Ctrl
//<EFBFBD>м<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //中键盘区
PrintScreen, ///<<EFBFBD><EFBFBD>ӡ<EFBFBD><EFBFBD>Ļ<EFBFBD><EFBFBD> PrintScreen, ///<打印屏幕键
ScrollLock, ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ScrollLock, ///<滚动锁定键
Pause, ///<<EFBFBD><EFBFBD>ͣ<EFBFBD><EFBFBD> Pause, ///<暂停键
Insert, ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Insert, ///<插入键
Delete, ///<ɾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> Delete, ///<删除键
Home, ///<<EFBFBD><EFBFBD><EFBFBD>׼<EFBFBD> Home, ///<行首键
End, ///<<EFBFBD><EFBFBD>β<EFBFBD><EFBFBD> End, ///<行尾键
PageUp, ///<<EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD>ҳ<EFBFBD><EFBFBD> PageUp, ///<向前翻页键
PageDown, ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD><EFBFBD> PageDown, ///<向后翻页键
Up, ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Up, ///<↑光标键
Down, ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Down, ///<↓光标键
Left, ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Left, ///<←光标键
Right, ///<<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Right, ///<→光标键
//С<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //小键盘区
NumLock, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NumLock, ///<小键盘 数字锁定键
NumAdd, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> + NumAdd, ///<小键盘 +
NumSubtract, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> - NumSubtract, ///<小键盘 -
NumMultiply, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> * NumMultiply, ///<小键盘 *
NumDivide, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> / NumDivide, ///<小键盘 /
Num0, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0 Num0, ///<小键盘 0
Num1, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 Num1, ///<小键盘 1
Num2, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 Num2, ///<小键盘 2
Num3, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 3 Num3, ///<小键盘 3
Num4, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 4 Num4, ///<小键盘 4
Num5, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 5 Num5, ///<小键盘 5
Num6, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 6 Num6, ///<小键盘 6
Num7, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7 Num7, ///<小键盘 7
Num8, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 8 Num8, ///<小键盘 8
Num9, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 9 Num9, ///<小键盘 9
NumDecimal, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> . (С<><D0A1><EFBFBD><EFBFBD><><C9BE><EFBFBD><EFBFBD>) NumDecimal, ///<小键盘 . (小数点/删除键)
NumEnter, ///<С<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>س<EFBFBD><D8B3><EFBFBD> NumEnter, ///<小键盘 回车键
ENUM_CLASS_RANGE(NONE,NumEnter) ENUM_CLASS_RANGE(NONE,NumEnter)
};//enum KeyboardButton };//enum KeyboardButton
@@ -227,7 +227,7 @@ namespace hgl
public: public:
/** /**
* ij<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ * 某按键是否按下状态
*/ */
const bool HasPressed(const KeyboardButton &kb)const const bool HasPressed(const KeyboardButton &kb)const
{ {
@@ -237,7 +237,7 @@ namespace hgl
} }
/** /**
* <EFBFBD><EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD> * 设定当前时间
*/ */
void SetCurTime(const double &ct) void SetCurTime(const double &ct)
{ {
@@ -245,7 +245,7 @@ namespace hgl
} }
/** /**
* <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>ʱ<EFBFBD><EFBFBD> * 获取按键按下的时间
*/ */
const double GetPressedTime(const KeyboardButton &kb)const const double GetPressedTime(const KeyboardButton &kb)const
{ {