diff --git a/rainbow/Framebuffer/Ctrl.h b/rainbow/Framebuffer/Ctrl.h index 2fdcf6097..ac2f22117 100644 --- a/rainbow/Framebuffer/Ctrl.h +++ b/rainbow/Framebuffer/Ctrl.h @@ -41,8 +41,6 @@ private: static void MouseEventFB(Ptr t, int event, Point p, int zdelta); Vector GetPaintRects(); - static void DoMouseFB(int event, Point p, int zdelta); - static void DrawLine(const Vector& clip, int x, int y, int cx, int cy, bool horz, const byte *pattern, int animation); static void DragRectDraw0(const Vector& clip, const Rect& rect, int n, @@ -59,6 +57,7 @@ protected: static int PaintLock; public: + static void DoMouseFB(int event, Point p, int zdelta = 0); static bool DoKeyFB(dword key, int cnt); static void InitFB(); diff --git a/rainbow/SDL20/Keys.h b/rainbow/SDL20/Keys.h index 893da7085..4d9e4aff3 100644 --- a/rainbow/SDL20/Keys.h +++ b/rainbow/SDL20/Keys.h @@ -108,3 +108,15 @@ K_CTRL_EQUAL = K_CTRL|0xbb|K_DELTA, K_CTRL_APOSTROPHE= K_CTRL|0xde|K_DELTA, K_BREAK = SDLK_PAUSE + K_DELTA, // Is it really? + +K_PLUS = 0, // not yet defined +K_MINUS = 0, // not yet defined +K_COMMA = 0, // not yet defined +K_PERIOD = 0, // not yet defined +K_SEMICOLON = 0, // not yet defined +K_SLASH = 0, // not yet defined +K_GRAVE = 0, // not yet defined +K_LBRACKET = 0, // not yet defined +K_BACKSLASH = 0, // not yet defined +K_RBRACKET = 0, // not yet defined +K_QUOTEDBL = 0, // not yet defined diff --git a/rainbow/SDL20/Wnd.cpp b/rainbow/SDL20/Wnd.cpp index 93bfdfa26..50cb3c71b 100644 --- a/rainbow/SDL20/Wnd.cpp +++ b/rainbow/SDL20/Wnd.cpp @@ -495,11 +495,12 @@ Rect Ctrl::GetVirtualWorkArea() return framebuffer.GetSize(); } +/* Rect Ctrl::GetWorkArea(Point pt) { return framebuffer.GetSize(); } - +*/ Rect Ctrl::GetVirtualScreenArea() { GuiLock __; diff --git a/rainbow/Skeleton/Keys.h b/rainbow/Skeleton/Keys.h index 65bf2f058..d1fa2f84c 100644 --- a/rainbow/Skeleton/Keys.h +++ b/rainbow/Skeleton/Keys.h @@ -107,3 +107,15 @@ K_CTRL_EQUAL, K_CTRL_APOSTROPHE, K_BREAK, + +K_PLUS = 0, // not yet defined +K_MINUS = 0, // not yet defined +K_COMMA = 0, // not yet defined +K_PERIOD = 0, // not yet defined +K_SEMICOLON = 0, // not yet defined +K_SLASH = 0, // not yet defined +K_GRAVE = 0, // not yet defined +K_LBRACKET = 0, // not yet defined +K_BACKSLASH = 0, // not yet defined +K_RBRACKET = 0, // not yet defined +K_QUOTEDBL = 0, // not yet defined