ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added window properties to make some x11drv-specific information 

available to higher level code.
This commit is contained in:
Alexandre Julliard 2001-06-26 21:10:11 +00:00
parent 6509fa93f9
commit 649637f53f
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/opengl32/wgl.c
View File

@ -83,7 +83,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
TRACE("(%08x)\n", hdc);
/* First, get the visual in use by the X11DRV */
template.visualid = XVisualIDFromVisual(X11DRV_GetVisual());
template.visualid = GetPropA( GetDesktopWindow(), "__wine_x11_visual_id" );
vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num);
if (vis == NULL) {
@ -455,12 +455,14 @@ static void process_attach(void) {
int num;
XVisualInfo template;
XVisualInfo *vis = NULL;
Window root = (Window)GetPropA( GetDesktopWindow(), "__wine_x11_whole_window" );
if (!visual) {
ERR("X11DRV not loaded yet. Cannot create default context.\n");
return;
if (!root)
{
ERR("X11DRV not loaded. Cannot create default context.\n");
return;
}
ENTER_GL();
/* Try to get the visual from the Root Window. We can't use the standard (presumably
@ -468,7 +470,7 @@ static void process_attach(void) {
Window was created using the standard X11DRV visual, and glXMakeCurrent can't deal
with mismatched visuals. Note that the Root Window visual may not be double
buffered, so apps actually attempting to render this way may flicker */
if (TSXGetWindowAttributes( gdi_display, X11DRV_GetXRootWindow(), &win_attr ))
if (XGetWindowAttributes( gdi_display, root, &win_attr ))
{
rootVisual = win_attr.visual;
}
@ -482,7 +484,7 @@ static void process_attach(void) {
template.visualid = XVisualIDFromVisual(rootVisual);
vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num);
if (vis != NULL) default_cx = glXCreateContext(gdi_display, vis, 0, GL_TRUE);
if (default_cx != NULL) glXMakeCurrent(gdi_display, X11DRV_GetXRootWindow(), default_cx);
if (default_cx != NULL) glXMakeCurrent(gdi_display, root, default_cx);
XFree(vis);
LEAVE_GL();

35
dlls/x11drv/window.c
View File

@ -192,14 +192,18 @@ static Window create_icon_window( Display *display, WND *win )
attr.bit_gravity = NorthWestGravity;
attr.backing_store = NotUseful/*WhenMapped*/;
data->icon_window = TSXCreateWindow( display, root_window, 0, 0,
GetSystemMetrics( SM_CXICON ),
GetSystemMetrics( SM_CYICON ),
0, screen_depth,
InputOutput, visual,
CWEventMask | CWBitGravity | CWBackingStore, &attr );
wine_tsx11_lock();
data->icon_window = XCreateWindow( display, root_window, 0, 0,
GetSystemMetrics( SM_CXICON ),
GetSystemMetrics( SM_CYICON ),
0, screen_depth,
InputOutput, visual,
CWEventMask | CWBitGravity | CWBackingStore, &attr );
XSaveContext( display, data->icon_window, winContext, (char *)win->hwndSelf );
wine_tsx11_unlock();
TRACE( "created %lx\n", data->icon_window );
SetPropA( win->hwndSelf, "__wine_x11_icon_window", (HANDLE)data->icon_window );
return data->icon_window;
}
@ -208,12 +212,15 @@ static Window create_icon_window( Display *display, WND *win )
/***********************************************************************
* destroy_icon_window
*/
inline static void destroy_icon_window( Display *display, struct x11drv_win_data *data )
inline static void destroy_icon_window( Display *display, WND *win )
{
struct x11drv_win_data *data = win->pDriverData;
if (!data->icon_window) return;
XDeleteContext( display, data->icon_window, winContext );
XDestroyWindow( display, data->icon_window );
data->icon_window = 0;
RemovePropA( win->hwndSelf, "__wine_x11_icon_window" );
}
@ -234,7 +241,7 @@ static void set_icon_hints( Display *display, WND *wndPtr, XWMHints *hints )
if (!(wndPtr->dwExStyle & WS_EX_MANAGED))
{
destroy_icon_window( display, data );
destroy_icon_window( display, wndPtr );
hints->flags &= ~(IconPixmapHint | IconMaskHint | IconWindowHint);
}
else if (!hIcon)
@ -273,7 +280,7 @@ static void set_icon_hints( Display *display, WND *wndPtr, XWMHints *hints )
hints->icon_pixmap = X11DRV_BITMAP_Pixmap(data->hWMIconBitmap);
hints->icon_mask = X11DRV_BITMAP_Pixmap(data->hWMIconMask);
destroy_icon_window( display, data );
destroy_icon_window( display, wndPtr );
hints->flags = (hints->flags & ~IconWindowHint) | IconPixmapHint | IconMaskHint;
}
}
@ -632,6 +639,11 @@ static void create_desktop( Display *display, WND *wndPtr )
wine_tsx11_unlock();
data->whole_window = data->client_window = root_window;
SetPropA( wndPtr->hwndSelf, "__wine_x11_whole_window", (HANDLE)root_window );
SetPropA( wndPtr->hwndSelf, "__wine_x11_client_window", (HANDLE)root_window );
SetPropA( wndPtr->hwndSelf, "__wine_x11_visual_id", (HANDLE)XVisualIDFromVisual(visual) );
if (root_window != DefaultRootWindow(display)) X11DRV_create_desktop_thread();
}
@ -798,7 +810,7 @@ BOOL X11DRV_DestroyWindow( HWND hwnd )
XDeleteContext( display, data->whole_window, winContext );
XDeleteContext( display, data->client_window, winContext );
XDestroyWindow( display, data->whole_window ); /* this destroys client too */
destroy_icon_window( display, data );
destroy_icon_window( display, wndPtr );
wine_tsx11_unlock();
}
@ -847,6 +859,9 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
WIN_ReleaseWndPtr( wndPtr );
SetPropA( hwnd, "__wine_x11_whole_window", (HANDLE)data->whole_window );
SetPropA( hwnd, "__wine_x11_client_window", (HANDLE)data->client_window );
/* send WM_NCCREATE */
TRACE( "hwnd %x cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cs->cx, cs->cy );
if (unicode)

3
include/x11drv.h
View File

@ -341,9 +341,6 @@ extern Atom wmChangeState;
extern Atom kwmDockWindow;
extern Atom _kde_net_wm_system_tray_window_for;
static inline Visual *X11DRV_GetVisual(void) { return visual; }
static inline Window X11DRV_GetXRootWindow(void) { return root_window; }
/* X11 clipboard driver */
extern void X11DRV_CLIPBOARD_FreeResources( Atom property );