This commit is contained in:
parent
e7d9edec27
commit
11069552df
12 changed files with 50 additions and 15 deletions
|
|
@ -328,6 +328,8 @@ MWDECL void (*MwLLSetDarkTheme)(MwLL handle, int toggle);
|
||||||
*/
|
*/
|
||||||
MWDECL MwBool (*MwLLDoModern)(MwLL handle);
|
MWDECL MwBool (*MwLLDoModern)(MwLL handle);
|
||||||
|
|
||||||
|
MWDECL void (*MwLLRaise)(MwLL handle);
|
||||||
|
|
||||||
/* font renderer */
|
/* font renderer */
|
||||||
MWDECL void MwFLSetup(void);
|
MWDECL void MwFLSetup(void);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,12 +39,12 @@ class MwView : public BView {
|
||||||
MwView(MwLL handle, BRect rc, uint32 resizingMode, uint32 flags);
|
MwView(MwLL handle, BRect rc, uint32 resizingMode, uint32 flags);
|
||||||
~MwView();
|
~MwView();
|
||||||
|
|
||||||
void MessageReceived(BMessage* message);
|
void MessageReceived(BMessage* message);
|
||||||
void PostMessage(BMessage* message);
|
void PostMessage(BMessage* message);
|
||||||
void PostMessage(uint32 command);
|
void PostMessage(uint32 command);
|
||||||
status_t SendMessage(BMessage* message);
|
status_t SendMessage(BMessage* message);
|
||||||
status_t SendMessage(uint32 command);
|
status_t SendMessage(uint32 command);
|
||||||
void Invalidate();
|
void Invalidate();
|
||||||
|
|
||||||
void AttachedToWindow();
|
void AttachedToWindow();
|
||||||
void Draw(BRect updateRect);
|
void Draw(BRect updateRect);
|
||||||
|
|
|
||||||
|
|
@ -57,5 +57,7 @@
|
||||||
\
|
\
|
||||||
MwLLSetDarkTheme = MwLLSetDarkThemeImpl; \
|
MwLLSetDarkTheme = MwLLSetDarkThemeImpl; \
|
||||||
MwLLDoModern = MwLLDoModernImpl; \
|
MwLLDoModern = MwLLDoModernImpl; \
|
||||||
|
\
|
||||||
|
MwLLRaise = MwLLRaiseImpl; \
|
||||||
return 0; \
|
return 0; \
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -351,6 +351,10 @@ static MwBool MwLLDoModernImpl(MwLL handle) {
|
||||||
return MwFALSE;
|
return MwFALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void MwLLRaiseImpl(MwLL handle) {
|
||||||
|
(void)handle;
|
||||||
|
}
|
||||||
|
|
||||||
static int MwLLClassicMacOSCallInitImpl(void) {
|
static int MwLLClassicMacOSCallInitImpl(void) {
|
||||||
InitGraf(&qd.thePort);
|
InitGraf(&qd.thePort);
|
||||||
InitFonts();
|
InitFonts();
|
||||||
|
|
|
||||||
|
|
@ -1164,6 +1164,10 @@ static MwBool MwLLDoModernImpl(MwLL handle) {
|
||||||
return MwTRUE;
|
return MwTRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void MwLLRaiseImpl(MwLL handle) {
|
||||||
|
(void)handle;
|
||||||
|
}
|
||||||
|
|
||||||
static int MwLLCocoaCallInitImpl(void) {
|
static int MwLLCocoaCallInitImpl(void) {
|
||||||
#ifndef __APPLE__
|
#ifndef __APPLE__
|
||||||
printf("Using GNUStep Backend\n");
|
printf("Using GNUStep Backend\n");
|
||||||
|
|
|
||||||
|
|
@ -878,6 +878,10 @@ static MwBool MwLLDoModernImpl(MwLL handle) {
|
||||||
return MwTRUE;
|
return MwTRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void MwLLRaiseImpl(MwLL handle) {
|
||||||
|
(void)handle;
|
||||||
|
}
|
||||||
|
|
||||||
static int MwLLGDICallInitImpl(void) {
|
static int MwLLGDICallInitImpl(void) {
|
||||||
void* ntdll;
|
void* ntdll;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ void MwView::MessageReceived(BMessage* message) {
|
||||||
case BVIEW_MW_GET_MOUSE:
|
case BVIEW_MW_GET_MOUSE:
|
||||||
{
|
{
|
||||||
BPoint* p;
|
BPoint* p;
|
||||||
uint32 btn;
|
uint32 btn;
|
||||||
|
|
||||||
if(message->FindPointer("view-ppoint", (void**)&p) != B_OK) break;
|
if(message->FindPointer("view-ppoint", (void**)&p) != B_OK) break;
|
||||||
|
|
||||||
|
|
@ -217,7 +217,7 @@ void MwView::PostMessage(uint32 command) {
|
||||||
status_t MwView::SendMessage(BMessage* message) {
|
status_t MwView::SendMessage(BMessage* message) {
|
||||||
BMessage copy = *message;
|
BMessage copy = *message;
|
||||||
BMessage reply;
|
BMessage reply;
|
||||||
MwLL top = this->handle;
|
MwLL top = this->handle;
|
||||||
|
|
||||||
while(top->haiku.parent != NULL) top = top->haiku.parent;
|
while(top->haiku.parent != NULL) top = top->haiku.parent;
|
||||||
|
|
||||||
|
|
@ -730,9 +730,9 @@ void MwLLSetClipboardImpl(MwLL handle, const char* text, int clipboard_type) {}
|
||||||
void MwLLGetClipboardImpl(MwLL handle, int clipboard_type) {}
|
void MwLLGetClipboardImpl(MwLL handle, int clipboard_type) {}
|
||||||
|
|
||||||
void MwLLGetCursorCoordImpl(MwLL handle, MwPoint* point) {
|
void MwLLGetCursorCoordImpl(MwLL handle, MwPoint* point) {
|
||||||
MwLL top = handle;
|
MwLL top = handle;
|
||||||
BMessage msg(BVIEW_MW_GET_MOUSE);
|
BMessage msg(BVIEW_MW_GET_MOUSE);
|
||||||
BPoint p;
|
BPoint p;
|
||||||
while(top->haiku.parent != NULL) {
|
while(top->haiku.parent != NULL) {
|
||||||
top = top->haiku.parent;
|
top = top->haiku.parent;
|
||||||
}
|
}
|
||||||
|
|
@ -765,6 +765,10 @@ MwBool MwLLDoModernImpl(MwLL handle) {
|
||||||
return MwTRUE;
|
return MwTRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void MwLLRaiseImpl(MwLL handle) {
|
||||||
|
(void)handle;
|
||||||
|
}
|
||||||
|
|
||||||
int MwLLHaikuCallInitImpl() {
|
int MwLLHaikuCallInitImpl() {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2830,6 +2830,10 @@ static void MwLLSetDarkThemeImpl(MwLL handle, int toggle) {
|
||||||
(void)toggle;
|
(void)toggle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void MwLLRaiseImpl(MwLL handle) {
|
||||||
|
(void)handle;
|
||||||
|
}
|
||||||
|
|
||||||
static int MwLLWaylandCallInitImpl(void) {
|
static int MwLLWaylandCallInitImpl(void) {
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
MwBool loadWayland = MwFALSE;
|
MwBool loadWayland = MwFALSE;
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,7 @@ static struct symtbl {
|
||||||
void (*XDestroyIC)(XIC);
|
void (*XDestroyIC)(XIC);
|
||||||
void (*XSetICFocus)(XIC);
|
void (*XSetICFocus)(XIC);
|
||||||
XImage* (*XGetImage)(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int);
|
XImage* (*XGetImage)(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int);
|
||||||
|
int (*XRaiseWindow)(Display*, Window);
|
||||||
|
|
||||||
XSizeHints* (*XAllocSizeHints)(void);
|
XSizeHints* (*XAllocSizeHints)(void);
|
||||||
XVisualInfo* (*XGetVisualInfo)(Display*, long, XVisualInfo*, int*);
|
XVisualInfo* (*XGetVisualInfo)(Display*, long, XVisualInfo*, int*);
|
||||||
|
|
@ -182,6 +183,7 @@ static struct symtbl {
|
||||||
#define XPending xsymtbl.XPending
|
#define XPending xsymtbl.XPending
|
||||||
#define XChangeWindowAttributes xsymtbl.XChangeWindowAttributes
|
#define XChangeWindowAttributes xsymtbl.XChangeWindowAttributes
|
||||||
#define XGetImage xsymtbl.XGetImage
|
#define XGetImage xsymtbl.XGetImage
|
||||||
|
#define XRaiseWindow xsymtbl.XRaiseWindow
|
||||||
|
|
||||||
#if USE_XRENDER
|
#if USE_XRENDER
|
||||||
#define XRenderFindStandardFormat xsymtbl.XRenderFindStandardFormat
|
#define XRenderFindStandardFormat xsymtbl.XRenderFindStandardFormat
|
||||||
|
|
@ -1370,6 +1372,15 @@ static void MwLLSetDarkThemeImpl(MwLL handle, int toggle) {
|
||||||
(void)toggle;
|
(void)toggle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static MwBool MwLLDoModernImpl(MwLL handle) {
|
||||||
|
(void)handle;
|
||||||
|
return MwTRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void MwLLRaiseImpl(MwLL handle) {
|
||||||
|
XRaiseWindow(handle->x11.display, handle->x11.window);
|
||||||
|
}
|
||||||
|
|
||||||
static int MwLLX11CallInitImpl(void) {
|
static int MwLLX11CallInitImpl(void) {
|
||||||
MwBool loadX11 = MwFALSE;
|
MwBool loadX11 = MwFALSE;
|
||||||
if(getenv("MILSKO_BACKEND")) {
|
if(getenv("MILSKO_BACKEND")) {
|
||||||
|
|
@ -1464,6 +1475,7 @@ static int MwLLX11CallInitImpl(void) {
|
||||||
X11_FUNC_LOAD(XDestroyIC);
|
X11_FUNC_LOAD(XDestroyIC);
|
||||||
X11_FUNC_LOAD(XSetICFocus);
|
X11_FUNC_LOAD(XSetICFocus);
|
||||||
X11_FUNC_LOAD(XGetImage);
|
X11_FUNC_LOAD(XGetImage);
|
||||||
|
X11_FUNC_LOAD(XRaiseWindow);
|
||||||
|
|
||||||
X11_FUNC_LOAD(XAllocSizeHints);
|
X11_FUNC_LOAD(XAllocSizeHints);
|
||||||
X11_FUNC_LOAD(XGetVisualInfo);
|
X11_FUNC_LOAD(XGetVisualInfo);
|
||||||
|
|
@ -1491,10 +1503,5 @@ static int MwLLX11CallInitImpl(void) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static MwBool MwLLDoModernImpl(MwLL handle) {
|
|
||||||
(void)handle;
|
|
||||||
return MwTRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "call.c"
|
#include "call.c"
|
||||||
CALL(X11);
|
CALL(X11);
|
||||||
|
|
|
||||||
|
|
@ -1049,9 +1049,9 @@ void MwReparent(MwWidget handle, MwWidget new_parent) {
|
||||||
MwDispatch(handle->parent, children_update);
|
MwDispatch(handle->parent, children_update);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(new_parent == NULL){
|
if(new_parent == NULL) {
|
||||||
handle->top_step = 1;
|
handle->top_step = 1;
|
||||||
}else{
|
} else {
|
||||||
handle->top_step = 0;
|
handle->top_step = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ void (*MwLLSetDarkTheme)(MwLL handle, int toggle) = NULL;
|
||||||
|
|
||||||
MwBool (*MwLLDoModern)(MwLL handle) = NULL;
|
MwBool (*MwLLDoModern)(MwLL handle) = NULL;
|
||||||
|
|
||||||
|
void (*MwLLRaise)(MwLL handle) = NULL;
|
||||||
|
|
||||||
void MwLLCreateCommon(MwLL handle) {
|
void MwLLCreateCommon(MwLL handle) {
|
||||||
handle->common.handler = malloc(sizeof(*handle->common.handler));
|
handle->common.handler = malloc(sizeof(*handle->common.handler));
|
||||||
memset(handle->common.handler, 0, sizeof(*handle->common.handler));
|
memset(handle->common.handler, 0, sizeof(*handle->common.handler));
|
||||||
|
|
|
||||||
|
|
@ -355,6 +355,8 @@ static void mouse_down(MwWidget handle, void* ptr) {
|
||||||
sw->base.x = MwGetInteger(handle, MwNx);
|
sw->base.x = MwGetInteger(handle, MwNx);
|
||||||
sw->base.y = MwGetInteger(handle, MwNy);
|
sw->base.y = MwGetInteger(handle, MwNy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MwLLRaise(handle->lowlevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void func_handler(MwWidget handle, const char* name, void* out, va_list va) {
|
static void func_handler(MwWidget handle, const char* name, void* out, va_list va) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue