Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce

1 files changed, 194 insertions, 18 deletions

diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c
index a22336e2..10a67f07 100644
--- a/sesman/chansrv/rail.c
+++ b/sesman/chansrv/rail.c
@@ -28,6 +28,8 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/Xrandr.h>
+#include <X11/cursorfont.h>
 #include "chansrv.h"
 #include "rail.h"
 #include "xcommon.h"
@@ -65,6 +67,8 @@ static int g_got_focus = 0;
 static int g_focus_counter = 0;
 static Window g_focus_win = 0;
 
+static int g_xrr_event_base = 0; /* non zero means we got extension */
+
 /* used in valid field of struct rail_window_data */
 #define RWD_X       (1 << 0)
 #define RWD_Y       (1 << 1)
@@ -79,7 +83,7 @@ struct rail_window_data
     int y;
     int width;
     int height;
-    char title[64]; /* first 64 bytes of title for compare */
+    int title_crc; /* crc of title for compare */
 };
 
 /* Indicates a Client Execute PDU from client to server. */
@@ -325,6 +329,11 @@ rail_is_another_wm_running(void)
 int APP_CC
 rail_init(void)
 {
+    int dummy;
+    int ver_maj;
+    int ver_min;
+    Status st;
+    
     LOG(10, ("chansrv::rail_init:"));
     xcommon_init();
 
@@ -338,6 +347,29 @@ rail_init(void)
     rail_send_init();
     g_rail_up = 1;
     g_rwd_atom = XInternAtom(g_display, "XRDP_RAIL_WINDOW_DATA", 0);
+
+    if (!XRRQueryExtension(g_display, &g_xrr_event_base, &dummy))
+    {
+        g_xrr_event_base = 0;
+        log_message(LOG_LEVEL_ERROR, "rail_init: RandR extension not found");
+    }
+
+    if (g_xrr_event_base > 0)
+    {
+        LOG(0, ("rail_init: found RandR entension"));
+        st = XRRQueryVersion(g_display, &ver_maj, &ver_min);
+        if (st)
+        {
+            LOG(0, ("rail_init: RandR version major %d minor %d", ver_maj, ver_min));
+        }
+        XRRSelectInput(g_display, g_root_window, RRScreenChangeNotifyMask);
+    }
+
+    if (g_default_cursor == 0)
+    {
+        g_default_cursor = XCreateFontCursor(g_display, XC_left_ptr);
+        XDefineCursor(g_display, g_root_window, g_default_cursor);
+    }
     return 0;
 }
 
@@ -513,12 +545,22 @@ rail_process_activate(struct stream *s, int size)
 {
     int window_id;
     int enabled;
+    int index;
     XWindowAttributes window_attributes;
     Window transient_for = 0;
 
     LOG(10, ("chansrv::rail_process_activate:"));
     in_uint32_le(s, window_id);
     in_uint8(s, enabled);
+
+    index = list_index_of(g_window_list, window_id);
+    if (index < 0)
+    {
+        LOG(10, ("chansrv::rail_process_activate: window 0x%8.8x not in list",
+                 window_id));
+        return 0;
+    }
+    
     g_focus_counter++;
     g_got_focus = enabled;
     LOG(10, ("  window_id 0x%8.8x enabled %d", window_id, enabled));
@@ -781,11 +823,20 @@ rail_process_system_command(struct stream *s, int size)
 {
     int window_id;
     int command;
+    int index;
 
     LOG(10, ("chansrv::rail_process_system_command:"));
     in_uint32_le(s, window_id);
     in_uint16_le(s, command);
 
+    index = list_index_of(g_window_list, window_id);
+    if (index < 0)
+    {
+        LOG(10, ("chansrv::rail_process_system_command: window 0x%8.8x not in list",
+                 window_id));
+        return 0;
+    }
+    
     switch (command)
     {
         case SC_SIZE:
@@ -1061,6 +1112,77 @@ rail_data_in(struct stream *s, int chan_id, int chan_flags, int length,
     return  0;
 }
 
+static int g_crc_seed = 0xffffffff;
+static int g_crc_table[256] =
+{
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+#define CRC_START(in_crc) (in_crc) = g_crc_seed
+#define CRC_PASS(in_pixel, in_crc) \
+  (in_crc) = g_crc_table[((in_crc) ^ (in_pixel)) & 0xff] ^ ((in_crc) >> 8)
+#define CRC_END(in_crc) (in_crc) = ((in_crc) ^ g_crc_seed)
+
+/*****************************************************************************/
+static int
+get_string_crc(const char* text)
+{
+    int index;
+    int crc;
+
+    CRC_START(crc);
+    index = 0;
+    while (text[index] != 0)
+    {
+        CRC_PASS(text[index], crc);
+        index++;
+    }
+    CRC_END(crc);
+    return crc;
+}
+
 /*****************************************************************************/
 /* returns 0, event handled, 1 unhandled */
 static int APP_CC
@@ -1070,6 +1192,7 @@ rail_win_send_text(Window win)
     struct stream* s;
     int len = 0;
     int flags;
+    int crc;
     struct rail_window_data* rwd;
     
     len = rail_win_get_text(win, &data);
@@ -1080,7 +1203,8 @@ rail_win_send_text(Window win)
         {
             if (rwd->valid & RWD_TITLE)
             {
-                if (g_strncmp(rwd->title, data, 63) == 0)
+                crc = get_string_crc(data);
+                if (rwd->title_crc == crc)
                 {
                     LOG(10, ("chansrv::rail_win_send_text: skipping, title not changed"));
                     XFree(data);
@@ -1112,7 +1236,8 @@ rail_win_send_text(Window win)
         XFree(data);
         /* update rail window data */
         rwd->valid |= RWD_TITLE;
-        g_strncpy(rwd->title, data, 63);
+        crc = get_string_crc(data);
+        rwd->title_crc = crc;
         rail_set_window_data(win, rwd);
     }
     XFree(rwd);
@@ -1182,6 +1307,7 @@ rail_create_window(Window window_id, Window owner_id)
 
     int flags;
     int index;
+    int crc;
     Window transient_for = 0;
     struct rail_window_data* rwd;
     struct stream* s;
@@ -1252,14 +1378,15 @@ rail_create_window(Window window_id, Window owner_id)
         out_uint16_le(s, title_size); /* title_size */
         out_uint8a(s, title_bytes, title_size); /* title */
         rwd->valid |= RWD_TITLE;
-        g_strncpy(rwd->title, title_bytes, 63);
+        crc = get_string_crc(title_bytes);
+        rwd->title_crc = crc;
     }
     else
     {
         out_uint16_le(s, 5); /* title_size */
         out_uint8a(s, "title", 5); /* title */
         rwd->valid |= RWD_TITLE;
-        rwd->title[0] = 0;
+        rwd->title_crc = 0;
     }
     LOG(10, ("  set title info %d", title_size));
     flags |= WINDOW_ORDER_FIELD_TITLE;
@@ -1603,6 +1730,14 @@ rail_configure_window(XConfigureEvent *config)
 }
 
 /*****************************************************************************/
+static int
+rail_desktop_resize(lxevent)
+{
+    LOG(0, ("rail_desktop_resize:"));
+    return 0;
+}
+
+/*****************************************************************************/
 /* returns 0, event handled, 1 unhandled */
 int APP_CC
 rail_xevent(void *xevent)
@@ -1632,6 +1767,12 @@ rail_xevent(void *xevent)
             LOG(10, ("  got PropertyNotify window_id 0x%8.8x %s state new %d",
                      lxevent->xproperty.window, prop_name,
                      lxevent->xproperty.state == PropertyNewValue));
+            
+            if (list_index_of(g_window_list, lxevent->xproperty.window) < 0)
+            {
+                break;
+            }
+
             if (g_strcmp(prop_name, "WM_NAME") == 0 ||
                 g_strcmp(prop_name, "_NET_WM_NAME") == 0)
             {
@@ -1644,6 +1785,7 @@ rail_xevent(void *xevent)
             }
             XFree(prop_name);
             break;
+            
         case ConfigureRequest:
             LOG(10, ("  got ConfigureRequest window_id 0x%8.8x", lxevent->xconfigurerequest.window));
             g_memset(&xwc, 0, sizeof(xwc));
@@ -1667,12 +1809,17 @@ rail_xevent(void *xevent)
                      lxevent->xcreatewindow.window, lxevent->xcreatewindow.parent));
             XSelectInput(g_display, lxevent->xcreatewindow.window,
                          PropertyChangeMask | StructureNotifyMask |
-                         FocusChangeMask |
+                         SubstructureNotifyMask | FocusChangeMask |
                          EnterWindowMask | LeaveWindowMask);
             break;
 
         case DestroyNotify:
-            LOG(10, ("  got DestroyNotify 0x%8.8x", lxevent->xdestroywindow.window));
+            LOG(10, ("  got DestroyNotify window 0x%8.8x event 0x%8.8x",
+                     lxevent->xdestroywindow.window, lxevent->xdestroywindow.event));
+            if (lxevent->xdestroywindow.window != lxevent->xdestroywindow.event)
+            {
+                break;
+            }
             index = list_index_of(g_window_list, lxevent->xdestroywindow.window);
             if (index >= 0)
             {
@@ -1692,24 +1839,34 @@ rail_xevent(void *xevent)
                      lxevent->xmap.window, lxevent->xmap.event));
             if (lxevent->xmap.window != lxevent->xmap.event)
             {
-                XGetWindowAttributes(g_display, lxevent->xmap.window, &wnd_attributes);
-                if (wnd_attributes.map_state == IsViewable)
+                break;
+            }
+
+            if (!is_window_valid_child_of_root(lxevent->xmap.window))
+            {
+                break;
+            }
+
+            XGetWindowAttributes(g_display, lxevent->xmap.window, &wnd_attributes);
+            if (wnd_attributes.map_state == IsViewable)
+            {
+                rail_create_window(lxevent->xmap.window, lxevent->xmap.event);
+                if (!wnd_attributes.override_redirect)
                 {
-                    rail_create_window(lxevent->xmap.window, lxevent->xmap.event);
-                    if (!wnd_attributes.override_redirect)
-                    {
-                        rail_win_set_state(lxevent->xmap.window, 0x1); /* NormalState */
-                        rail_win_send_text(lxevent->xmap.window);
-                    }
-                    rv = 0;
+                    rail_win_set_state(lxevent->xmap.window, 0x1); /* NormalState */
+                    rail_win_send_text(lxevent->xmap.window);
                 }
+                rv = 0;
             }
             break;
 
         case UnmapNotify:
             LOG(10, ("  got UnmapNotify 0x%8.8x", lxevent->xunmap.event));
-            if (lxevent->xunmap.window != lxevent->xunmap.event &&
-                is_window_valid_child_of_root(lxevent->xunmap.window))
+            if (lxevent->xunmap.window != lxevent->xunmap.event)
+            {
+                break;
+            }
+            if (is_window_valid_child_of_root(lxevent->xunmap.window))
             {
                 index = list_index_of(g_window_list, lxevent->xunmap.window);
                 LOG(10, ("  window 0x%8.8x is unmapped", lxevent->xunmap.window));
@@ -1751,6 +1908,10 @@ rail_xevent(void *xevent)
             g_focus_win = lxevent->xfocus.window;
             break;
 
+        case FocusOut:
+            LOG(10, ("  got FocusOut"));
+            break;
+            
         case ButtonPress:
             LOG(10, ("  got ButtonPress"));
             break;
@@ -1770,6 +1931,10 @@ rail_xevent(void *xevent)
                      lxevent->xreparent.event, lxevent->xreparent.x,
                      lxevent->xreparent.y, lxevent->xreparent.override_redirect));
 
+            if (lxevent->xreparent.window != lxevent->xreparent.event)
+            {
+                break;
+            }
             if (lxevent->xreparent.parent != g_root_window)
             {
                 index = list_index_of(g_window_list, lxevent->xreparent.window);
@@ -1781,6 +1946,17 @@ rail_xevent(void *xevent)
             }
             rv = 0;
             break;
+            
+        default:
+            if (g_xrr_event_base > 0)
+            {
+                if (lxevent->type == g_xrr_event_base + RRScreenChangeNotify)
+                {
+                    rail_desktop_resize(lxevent);
+                    rv = 0;
+                    break;
+                }
+            }
     }
 
     return rv;