mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hand-apply patches (rail improvements) from Authentic8 branch: 6d97878

Browse Source
This commit is contained in:
Jim Grandy 2013-06-30 16:12:09 -07:00
parent cac061eb29
commit 92c2a9759e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sesman/chansrv/rail.c
View File

@ -28,6 +28,7 @@
#include "log.h" #include "log.h"
#include "os_calls.h" #include "os_calls.h"
#include "thread_calls.h" #include "thread_calls.h"
#include "list.h"
extern int g_rail_chan_id; /* in chansrv.c */ extern int g_rail_chan_id; /* in chansrv.c */
extern int g_display_num; /* in chansrv.c */ extern int g_display_num; /* in chansrv.c */
@ -49,6 +50,8 @@ int g_rail_up = 0;
/* for rail_is_another_wm_running */ /* for rail_is_another_wm_running */
static int g_rail_running = 1; static int g_rail_running = 1;
/* list of valid rail windows */
static struct list* g_window_list = 0;
/* Indicates a Client Execute PDU from client to server. */ /* Indicates a Client Execute PDU from client to server. */
#define TS_RAIL_ORDER_EXEC 0x0001 #define TS_RAIL_ORDER_EXEC 0x0001
@ -219,7 +222,8 @@ rail_init(void)
log_message(LOG_LEVEL_ERROR, "rail_init: another window manager " log_message(LOG_LEVEL_ERROR, "rail_init: another window manager "
"is running"); "is running");
} }
list_delete(g_window_list);
g_window_list = list_create();
rail_send_init(); rail_send_init();
g_rail_up = 1; g_rail_up = 1;
return 0; return 0;
@ -231,6 +235,8 @@ rail_deinit(void)
{ {
if (g_rail_up) if (g_rail_up)
{ {
list_delete(g_window_list);
g_window_list = 0;
/* no longer window manager */ /* no longer window manager */
XSelectInput(g_display, g_root_window, 0); XSelectInput(g_display, g_root_window, 0);
g_rail_up = 0; g_rail_up = 0;
@ -1051,6 +1057,7 @@ rail_xevent(void *xevent)
XEvent *lxevent; XEvent *lxevent;
XWindowChanges xwc; XWindowChanges xwc;
int rv; int rv;
int index;
XWindowAttributes wnd_attributes; XWindowAttributes wnd_attributes;
char* prop_name; char* prop_name;
@ -1105,17 +1112,18 @@ rail_xevent(void *xevent)
XSelectInput(g_display, lxevent->xcreatewindow.window, XSelectInput(g_display, lxevent->xcreatewindow.window,
PropertyChangeMask | StructureNotifyMask); PropertyChangeMask | StructureNotifyMask);
rail_win_set_state(lxevent->xcreatewindow.window, 0x0); /* WithdrawnState */ rail_win_set_state(lxevent->xcreatewindow.window, 0x0); /* WithdrawnState */
list_add_item(g_window_list, lxevent->xcreatewindow.window);
rv = 0; rv = 0;
break; break;
case DestroyNotify: case DestroyNotify:
LOG(10, (" got DestroyNotify 0x%8.8x", lxevent->xdestroywindow.window)); LOG(10, (" got DestroyNotify 0x%8.8x", lxevent->xdestroywindow.window));
/* index = list_index_of(g_window_list, lxevent->xdestroywindow.window);
* FIXME The destroy msg may be sent from a non-rail window. Ideally, if (index >= 0)
* this will be handled by client, but we better have to maintain {
* a list of managed rail windows here. rail_destroy_window(lxevent->xdestroywindow.window);
*/ list_remove_item(g_window_list, index);
rail_destroy_window(lxevent->xdestroywindow.window); }
v = 0; v = 0;
break; break;