diff --git a/doc/index.html b/doc/index.html index e80e85f32..b1850a76d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -452,6 +452,9 @@
MwWindowClass
+
+ MwWindowMakeBorderless +

Mw/Constants.h

@@ -2694,6 +2697,28 @@ Window widget class. +
+
MWDECL void MwWindowMakeBorderless (
+	MwWidget handle,
+	int toggle
+);
+
+
+ Makes window borderless. +
+
+ Parameter handle +
+
+ Widget. +
+
+ Parameter toggle +
+
+ Toggle. +
+
diff --git a/include/Mw/LowLevel.h b/include/Mw/LowLevel.h index 3d83a89ba..6007d69e5 100644 --- a/include/Mw/LowLevel.h +++ b/include/Mw/LowLevel.h @@ -110,6 +110,7 @@ MWDECL void MwLLShow(MwLL handle, int show); MWDECL void MwLLMakePopup(MwLL handle, MwLL parent); MWDECL void MwLLSetSizeHints(MwLL handle, int minx, int miny, int maxx, int maxy); +MWDECL void MwLLMakeBorderless(MwLL handle, int toggle); #ifdef __cplusplus } diff --git a/include/Mw/Widget/Window.h b/include/Mw/Widget/Window.h index a229c95cb..abc7e69e8 100644 --- a/include/Mw/Widget/Window.h +++ b/include/Mw/Widget/Window.h @@ -19,6 +19,13 @@ extern "C" { */ MWDECL MwClass MwWindowClass; +/*! + * %brief Makes window borderless + * %param handle Widget + * %param toggle Toggle + */ +MWDECL void MwWindowMakeBorderless(MwWidget handle, int toggle); + #ifdef __cplusplus } #endif diff --git a/include/MwOO/Base.h b/include/MwOO/Base.h index f929729dc..f5302d668 100644 --- a/include/MwOO/Base.h +++ b/include/MwOO/Base.h @@ -36,6 +36,7 @@ class Base { virtual void OnMenu(void*) {}; virtual void OnMouseDownHandler(void*) {}; virtual void OnMouseUpHandler(void*) {}; + virtual void OnMouseMoveHandler(void*) {}; virtual void OnChangedHandler(void*) {}; virtual void OnKeyHandler(void*) {}; virtual void OnKeyReleaseHandler(void*) {}; diff --git a/include/MwOO/Widget/Window.h b/include/MwOO/Widget/Window.h index 1f17f3432..a24802816 100644 --- a/include/MwOO/Widget/Window.h +++ b/include/MwOO/Widget/Window.h @@ -8,6 +8,7 @@ namespace MwOO { class Window : public MwOO::Base { public: Window(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); + void MakeBorderless(int toggle); void SetTitle(const char* value); const char* GetTitle(void); void SetBackground(const char* value); diff --git a/oosrc/base.cc b/oosrc/base.cc index 0684bdc86..d21361340 100644 --- a/oosrc/base.cc +++ b/oosrc/base.cc @@ -92,6 +92,10 @@ static void __OnMouseUpHandler(MwWidget widget, void* user, void* call){ MwOO::Base* c = (MwOO::Base*)user; (void)widget; c->OnMouseUpHandler(call); } +static void __OnMouseMoveHandler(MwWidget widget, void* user, void* call){ + MwOO::Base* c = (MwOO::Base*)user; + (void)widget; c->OnMouseMoveHandler(call); +} static void __OnChangedHandler(MwWidget widget, void* user, void* call){ MwOO::Base* c = (MwOO::Base*)user; (void)widget; c->OnChangedHandler(call); @@ -116,6 +120,7 @@ void MwOO::Base::SetHandler(void){ MwAddUserHandler(this->widget, MwNmenuHandler, __OnMenu, this); MwAddUserHandler(this->widget, MwNmouseDownHandler, __OnMouseDownHandler, this); MwAddUserHandler(this->widget, MwNmouseUpHandler, __OnMouseUpHandler, this); + MwAddUserHandler(this->widget, MwNmouseMoveHandler, __OnMouseMoveHandler, this); MwAddUserHandler(this->widget, MwNchangedHandler, __OnChangedHandler, this); MwAddUserHandler(this->widget, MwNkeyHandler, __OnKeyHandler, this); MwAddUserHandler(this->widget, MwNkeyReleaseHandler, __OnKeyReleaseHandler, this); diff --git a/oosrc/widget/window.cc b/oosrc/widget/window.cc index 2ae9a2600..3d215f175 100644 --- a/oosrc/widget/window.cc +++ b/oosrc/widget/window.cc @@ -5,6 +5,9 @@ MwOO::Window::Window(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwWindowClass, widget_name, parent, x, y, w, h){ } +void MwOO::Window::MakeBorderless(int toggle){ + MwWindowMakeBorderless(this->widget, toggle); +} void MwOO::Window::SetTitle(const char* value){ MwSetText(this->widget, MwNtitle, value); } diff --git a/resource/icon/error.png b/resource/icon/error.png index f1712c499..7ef3ff2cd 100644 Binary files a/resource/icon/error.png and b/resource/icon/error.png differ diff --git a/resource/icon/info.png b/resource/icon/info.png index 0a8d2e18e..43dd80939 100644 Binary files a/resource/icon/info.png and b/resource/icon/info.png differ diff --git a/resource/icon/news.png b/resource/icon/news.png index 9157f9d23..8d5eb4abf 100644 Binary files a/resource/icon/news.png and b/resource/icon/news.png differ diff --git a/resource/icon/note.png b/resource/icon/note.png index 76cd0805d..f63620122 100644 Binary files a/resource/icon/note.png and b/resource/icon/note.png differ diff --git a/resource/icon/question.png b/resource/icon/question.png index ccd9ac97e..2599ac268 100644 Binary files a/resource/icon/question.png and b/resource/icon/question.png differ diff --git a/resource/icon/warning.png b/resource/icon/warning.png index d74b0115d..d1ebad948 100644 Binary files a/resource/icon/warning.png and b/resource/icon/warning.png differ diff --git a/src/backend/gdi.c b/src/backend/gdi.c index d24373e42..ebaaed72c 100644 --- a/src/backend/gdi.c +++ b/src/backend/gdi.c @@ -488,3 +488,17 @@ void MwLLSetSizeHints(MwLL handle, int minx, int miny, int maxx, int maxy) { u->max.x = maxx; u->max.y = maxy; } + +void MwLLMakeBorderless(MwLL handle, int toggle) { + LPARAM lp = GetWindowLongPtr(handle->hWnd, GWL_STYLE); + + if(toggle) { + lp &= ~WS_CAPTION; + } else { + lp |= WS_CAPTION; + } + + SetWindowLongPtr(handle->hWnd, GWL_STYLE, lp); + + SetWindowPos(handle->hWnd, NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); +} diff --git a/src/backend/x11.c b/src/backend/x11.c index 65a98574e..adcf28c97 100644 --- a/src/backend/x11.c +++ b/src/backend/x11.c @@ -1,6 +1,25 @@ /* $Id$ */ #include +typedef struct mwm_hints { + unsigned long flags; + unsigned long functions; + unsigned long decorations; + long input_mode; + unsigned long status; +} mwm_hints_t; +enum mwm_hints_enum { + MWM_HINTS_FUNCTIONS = (1L << 0), + MWM_HINTS_DECORATIONS = (1L << 1), + + MWM_FUNC_ALL = (1L << 0), + MWM_FUNC_RESIZE = (1L << 1), + MWM_FUNC_MOVE = (1L << 2), + MWM_FUNC_MINIMIZE = (1L << 3), + MWM_FUNC_MAXIMIZE = (1L << 4), + MWM_FUNC_CLOSE = (1L << 5) +}; + static unsigned long mask = ExposureMask | StructureNotifyMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | KeymapNotify; static void create_pixmap(MwLL handle) { @@ -180,9 +199,9 @@ void MwLLNextEvent(MwLL handle) { p.button = MwLLMouseWheelDown; } - MwLLDispatch(handle, down, &p); - XSetInputFocus(handle->display, handle->window, RevertToNone, CurrentTime); + + MwLLDispatch(handle, down, &p); } else if(ev.type == ButtonRelease) { MwLLMouse p; p.point.x = ev.xbutton.x; @@ -562,3 +581,25 @@ void MwLLSetSizeHints(MwLL handle, int minx, int miny, int maxx, int maxy) { XSetWMSizeHints(handle->display, handle->window, hints, XA_WM_NORMAL_HINTS); XFree(hints); } + +void MwLLMakeBorderless(MwLL handle, int toggle) { + Atom atom = XInternAtom(handle->display, "_MOTIF_WM_HINTS", 0); + mwm_hints_t hints; + int x = 0, y = 0; + Window child, root, parent; + Window* children; + unsigned int nchild; + + XQueryTree(handle->display, handle->window, &root, &parent, &children, &nchild); + if(children != NULL) XFree(children); + + XTranslateCoordinates(handle->display, parent, RootWindow(handle->display, DefaultScreen(handle->display)), 0, 0, &x, &y, &child); + + hints.flags = MWM_HINTS_DECORATIONS; + hints.decorations = toggle ? 0 : 1; + XChangeProperty(handle->display, handle->window, atom, atom, 32, PropModeReplace, (unsigned char*)&hints, 5); + + XUnmapWindow(handle->display, handle->window); + XMapWindow(handle->display, handle->window); + XMoveWindow(handle->display, handle->window, x, y); +} diff --git a/src/widget/window.c b/src/widget/window.c index 462f856f7..53b046b26 100644 --- a/src/widget/window.c +++ b/src/widget/window.c @@ -42,3 +42,7 @@ MwClass MwWindowClass = &MwWindowClassRec; void MwWindowSetIcon(MwWidget handle, MwLLPixmap pixmap) { MwLLSetIcon(handle->lowlevel, pixmap); } + +void MwWindowMakeBorderless(MwWidget handle, int toggle) { + MwLLMakeBorderless(handle->lowlevel, toggle); +}