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

server: Don't attach the thread input when changing parents if the new 

parent is the desktop (i.e. it is becoming a top-level window).
This commit is contained in:
Robert Shearman 2006-06-07 20:12:16 +01:00 committed by Alexandre Julliard
parent 43890d88f7
commit 38e74b3111
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/window.c
View File

@ -114,6 +114,12 @@ inline static struct window *get_window( user_handle_t handle )
return ret; return ret;
} }
/* check if window is the desktop */
static inline int is_desktop_window( const struct window *win )
{
return !win->parent; /* only desktop windows have no parent */
}
/* change the parent of a window (or unlink the window if the new parent is NULL) */ /* change the parent of a window (or unlink the window if the new parent is NULL) */
static int set_parent_window( struct window *win, struct window *parent ) static int set_parent_window( struct window *win, struct window *parent )
{ {
@ -136,8 +142,9 @@ static int set_parent_window( struct window *win, struct window *parent )
win->parent = parent; win->parent = parent;
list_add_head( &parent->children, &win->entry ); list_add_head( &parent->children, &win->entry );
/* if parent belongs to a different thread, attach the two threads */ /* if parent belongs to a different thread and the window isn't */
if (parent->thread && parent->thread != win->thread) /* top-level, attach the two threads */
if (parent->thread && parent->thread != win->thread && !is_desktop_window(parent))
attach_thread_input( win->thread, parent->thread ); attach_thread_input( win->thread, parent->thread );
} }
else /* move it to parent unlinked list */ else /* move it to parent unlinked list */
@ -177,12 +184,6 @@ static inline struct window *get_last_child( struct window *win )
return ptr ? LIST_ENTRY( ptr, struct window, entry ) : NULL; return ptr ? LIST_ENTRY( ptr, struct window, entry ) : NULL;
} }
/* check if window is the desktop */
static inline int is_desktop_window( const struct window *win )
{
return !win->parent; /* only desktop windows have no parent */
}
/* append a user handle to a handle array */ /* append a user handle to a handle array */
static int add_handle_to_array( struct user_handle_array *array, user_handle_t handle ) static int add_handle_to_array( struct user_handle_array *array, user_handle_t handle )
{ {
@ -425,7 +426,8 @@ static struct window *create_window( struct window *parent, struct window *owner
goto failed; goto failed;
} }
/* if parent belongs to a different thread, attach the two threads */ /* if parent belongs to a different thread and the window isn't */
/* top-level, attach the two threads */
if (parent && parent->thread && parent->thread != current && !is_desktop_window(parent)) if (parent && parent->thread && parent->thread != current && !is_desktop_window(parent))
{ {
if (!attach_thread_input( current, parent->thread )) goto failed; if (!attach_thread_input( current, parent->thread )) goto failed;