summaryrefslogtreecommitdiffstats
path: root/sesman
diff options
context:
space:
mode:
Diffstat (limited to 'sesman')
-rw-r--r--sesman/chansrv/Makefile.am2
-rw-r--r--sesman/chansrv/chansrv.c94
-rw-r--r--sesman/chansrv/chansrv.h1
-rw-r--r--sesman/chansrv/clipboard.c65
-rw-r--r--sesman/chansrv/rail.c1354
-rw-r--r--sesman/chansrv/rail.h2
-rw-r--r--sesman/chansrv/xcommon.c10
7 files changed, 1471 insertions, 57 deletions
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am
index 29ef902b..2d73f05c 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -61,5 +61,5 @@ xrdp_chansrv_LDFLAGS = \
xrdp_chansrv_LDADD = \
-L/usr/X11R6/lib \
$(top_builddir)/common/libcommon.la \
- -lX11 -lXfixes \
+ -lX11 -lXfixes -lXrandr \
$(EXTRA_LIBS)
diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
index 86c50960..01c6a43d 100644
--- a/sesman/chansrv/chansrv.c
+++ b/sesman/chansrv/chansrv.c
@@ -72,16 +72,18 @@ tbus g_exec_mutex;
tbus g_exec_sem;
int g_exec_pid = 0;
+#define ARRAYSIZE(x) (sizeof(x)/sizeof(*(x)))
+
/* each time we create a DVC we need a unique DVC channel id */
/* this variable gets bumped up once per DVC we create */
tui32 g_dvc_chan_id = 100;
struct timeout_obj
{
- tui32 mstime;
- void* data;
- void (*callback)(void* data);
- struct timeout_obj* next;
+ tui32 mstime;
+ void *data;
+ void (*callback)(void *data);
+ struct timeout_obj *next;
};
static struct timeout_obj *g_timeout_head = 0;
@@ -93,7 +95,7 @@ add_timeout(int msoffset, void (*callback)(void *data), void *data)
{
struct timeout_obj *tobj;
tui32 now;
-
+
LOG(10, ("add_timeout:"));
now = g_time3();
tobj = g_malloc(sizeof(struct timeout_obj), 1);
@@ -374,6 +376,31 @@ send_channel_data(int chan_id, char *data, int size)
/*****************************************************************************/
/* returns error */
+int APP_CC
+send_rail_drawing_orders(char* data, int size)
+{
+ LOGM((LOG_LEVEL_DEBUG, "chansrv::send_rail_drawing_orders: size %d", size));
+
+ struct stream* s;
+ int error;
+
+ s = trans_get_out_s(g_con_trans, 8192);
+ out_uint32_le(s, 0); /* version */
+ out_uint32_le(s, 8 + 8 + size); /* size */
+ out_uint32_le(s, 10); /* msg id */
+ out_uint32_le(s, 8 + size); /* size */
+ out_uint8a(s, data, size);
+ s_mark_end(s);
+ error = trans_force_write(g_con_trans);
+ if (error != 0)
+ {
+ return 1;
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+/* returns error */
static int APP_CC
send_init_response_message(void)
{
@@ -1326,6 +1353,47 @@ read_ini(void)
}
/*****************************************************************************/
+static char* APP_CC
+get_log_path()
+{
+ char* log_path = 0;
+
+ log_path = g_getenv("CHANSRV_LOG_PATH");
+ if (log_path == 0)
+ {
+ log_path = g_getenv("HOME");
+ }
+ return log_path;
+}
+
+/*****************************************************************************/
+static unsigned int APP_CC
+get_log_level(const char* level_str, unsigned int default_level)
+{
+ static const char* levels[] = {
+ "LOG_LEVEL_ALWAYS",
+ "LOG_LEVEL_ERROR",
+ "LOG_LEVEL_WARNING",
+ "LOG_LEVEL_INFO",
+ "LOG_LEVEL_DEBUG"
+ };
+ unsigned int i;
+
+ if (level_str == NULL || level_str[0] == 0)
+ {
+ return default_level;
+ }
+ for (i = 0; i < ARRAYSIZE(levels); ++i)
+ {
+ if (g_strcasecmp(levels[i], level_str) == 0)
+ {
+ return i;
+ }
+ }
+ return default_level;
+}
+
+/*****************************************************************************/
static int APP_CC
run_exec(void)
{
@@ -1359,19 +1427,19 @@ main(int argc, char **argv)
tbus waiters[4];
int pid = 0;
char text[256];
- char *home_text;
+ char* log_path;
char *display_text;
char log_file[256];
enum logReturns error;
struct log_config logconfig;
+ unsigned int log_level;
g_init("xrdp-chansrv"); /* os_calls */
- home_text = g_getenv("HOME");
-
- if (home_text == 0)
+ log_path = get_log_path();
+ if (log_path == 0)
{
- g_writeln("error reading HOME environment variable");
+ g_writeln("error reading CHANSRV_LOG_PATH and HOME environment variable");
g_deinit();
return 1;
}
@@ -1379,10 +1447,12 @@ main(int argc, char **argv)
read_ini();
pid = g_getpid();
+ log_level = get_log_level(g_getenv("CHANSRV_LOG_LEVEL"), LOG_LEVEL_ERROR);
+
/* starting logging subsystem */
g_memset(&logconfig, 0, sizeof(struct log_config));
logconfig.program_name = "XRDP-Chansrv";
- g_snprintf(log_file, 255, "%s/xrdp-chansrv.log", home_text);
+ g_snprintf(log_file, 255, "%s/xrdp-chansrv.log", log_path);
g_writeln("chansrv::main: using log file [%s]", log_file);
if (g_file_exist(log_file))
@@ -1392,7 +1462,7 @@ main(int argc, char **argv)
logconfig.log_file = log_file;
logconfig.fd = -1;
- logconfig.log_level = LOG_LEVEL_ERROR;
+ logconfig.log_level = log_level;
logconfig.enable_syslog = 0;
logconfig.syslog_level = 0;
error = log_start_from_param(&logconfig);
diff --git a/sesman/chansrv/chansrv.h b/sesman/chansrv/chansrv.h
index 06ecdc07..a3e8ed51 100644
--- a/sesman/chansrv/chansrv.h
+++ b/sesman/chansrv/chansrv.h
@@ -58,6 +58,7 @@ int DEFAULT_CC
g_is_term(void);
int APP_CC send_channel_data(int chan_id, char *data, int size);
+int APP_CC send_rail_drawing_orders(char* data, int size);
int APP_CC main_cleanup(void);
int APP_CC add_timeout(int msoffset, void (*callback)(void* data), void* data);
int APP_CC find_empty_slot_in_dvc_channels();
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c
index c2062605..25775f3b 100644
--- a/sesman/chansrv/clipboard.c
+++ b/sesman/chansrv/clipboard.c
@@ -277,6 +277,39 @@ static int g_num_formatIds = 0;
static int g_file_format_id = -1;
+static char g_last_atom_name[256] = "";
+
+/*****************************************************************************/
+static char* APP_CC
+get_atom_text(Atom atom)
+{
+ char* name;
+ int failed;
+
+ failed = 0;
+ /* sanity check */
+ if ((atom < 1) || (atom > 512))
+ {
+ failed = 1;
+ }
+ if (!failed)
+ {
+ name = XGetAtomName(g_display, atom);
+ if (name == 0)
+ {
+ failed = 1;
+ }
+ }
+ if (failed)
+ {
+ g_snprintf(g_last_atom_name, 255, "unknown atom 0x%8.8x", (int)atom);
+ return g_last_atom_name;
+ }
+ g_strncpy(g_last_atom_name, name, 255);
+ XFree(name);
+ return g_last_atom_name;
+}
+
/*****************************************************************************/
/* this is one way to get the current time from the x server */
static Time APP_CC
@@ -895,8 +928,8 @@ clipboard_provide_selection_c2s(XSelectionRequestEvent *req, Atom type)
g_clip_c2s.property = req->property;
g_clip_c2s.window = req->requestor;
log_debug("clipboard_provide_selection_c2s: start INCR property %s "
- "type %s", XGetAtomName(g_display, req->property),
- XGetAtomName(g_display, type));
+ "type %s", get_atom_text(req->property),
+ get_atom_text(type));
val1[0] = g_clip_c2s.total_bytes;
val1[1] = 0;
XChangeProperty(g_display, req->requestor, req->property,
@@ -1697,7 +1730,7 @@ clipboard_get_window_property(Window wnd, Atom prop, Atom *type, int *fmt,
Atom ltype;
log_debug("clipboard_get_window_property:");
- log_debug(" prop %d name %s", prop, XGetAtomName(g_display, prop));
+ log_debug(" prop %d name %s", prop, get_atom_text(prop));
lxdata = 0;
ltype = 0;
XGetWindowProperty(g_display, wnd, prop, 0, 0, 0,
@@ -1837,7 +1870,7 @@ clipboard_event_selection_notify(XEvent *xevent)
{
log_debug("clipboard_event_selection_notify: wnd %p prop %s",
lxevent->requestor,
- XGetAtomName(g_display, lxevent->property));
+ get_atom_text(lxevent->property));
rv = clipboard_get_window_property(lxevent->requestor, lxevent->property,
&type, &fmt,
&n_items, &data, &data_size);
@@ -1855,8 +1888,8 @@ clipboard_event_selection_notify(XEvent *xevent)
PropertyNotify */
log_debug("clipboard_event_selection_notify: type is INCR "
"data_size %d property name %s type %s", data_size,
- XGetAtomName(g_display, lxevent->property),
- XGetAtomName(g_display, lxevent->type));
+ get_atom_text(lxevent->property),
+ get_atom_text(lxevent->type));
g_clip_s2c.incr_in_progress = 1;
g_clip_s2c.property = lxevent->property;
g_clip_s2c.type = lxevent->target;
@@ -1882,10 +1915,10 @@ clipboard_event_selection_notify(XEvent *xevent)
for (index = 0; index < n_items; index++)
{
atom = atoms[index];
- log_debug("clipboard_event_selection_notify: %d %s %d",
- atom, XGetAtomName(g_display, atom), XA_STRING);
+ LOGM((LOG_LEVEL_DEBUG, "clipboard_event_selection_notify: %d %s %d",
+ atom, get_atom_text(atom), XA_STRING));
log_debug("clipboard_event_selection_notify: 0x%x %s",
- atom, XGetAtomName(g_display, atom));
+ atom, get_atom_text(atom));
if (atom == g_utf8_atom)
{
got_utf8 = 1;
@@ -2091,7 +2124,6 @@ static int APP_CC
clipboard_event_selection_request(XEvent *xevent)
{
XSelectionRequestEvent *lxev;
- XEvent xev;
Atom atom_buf[10];
Atom type;
int atom_count;
@@ -2105,7 +2137,7 @@ clipboard_event_selection_request(XEvent *xevent)
log_debug("clipboard_event_selection_request: g_wnd %d, "
".requestor %d .owner %d .selection %d '%s' .target %d .property %d",
g_wnd, lxev->requestor, lxev->owner, lxev->selection,
- XGetAtomName(g_display, lxev->selection),
+ get_atom_text(lxev->selection),
lxev->target, lxev->property);
if (lxev->property == None)
@@ -2164,8 +2196,7 @@ clipboard_event_selection_request(XEvent *xevent)
"g_multiple_atom");
xdata = 0;
- if (clipboard_get_window_property(xev.xselection.requestor,
- xev.xselection.property,
+ if (clipboard_get_window_property(lxev->requestor, lxev->property,
&type, &fmt, &n_items, &xdata,
&xdata_size) == 0)
{
@@ -2235,9 +2266,9 @@ clipboard_event_selection_request(XEvent *xevent)
else
{
log_debug("clipboard_event_selection_request: unknown "
- "target %s", XGetAtomName(g_display, lxev->target));
- log_error("clipboard_event_selection_request: unknown "
- "target %s", XGetAtomName(g_display, lxev->target));
+ "target %s", get_atom_text(lxev->target));
+ LOGM((LOG_LEVEL_ERROR, "clipboard_event_selection_request: unknown "
+ "target %s", get_atom_text(lxev->target)));
}
clipboard_refuse_selection(lxev);
@@ -2293,7 +2324,7 @@ clipboard_event_property_notify(XEvent *xevent)
log_debug("clipboard_event_property_notify: PropertyNotify .window %d "
".state %d .atom %d %s", xevent->xproperty.window,
xevent->xproperty.state, xevent->xproperty.atom,
- XGetAtomName(g_display, xevent->xproperty.atom));
+ get_atom_text(xevent->xproperty.atom));
if (g_clip_c2s.incr_in_progress &&
(xevent->xproperty.window == g_clip_c2s.window) &&
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c
index cfa3c5de..fb1075c6 100644
--- a/sesman/chansrv/rail.c
+++ b/sesman/chansrv/rail.c
@@ -19,15 +19,24 @@
/*
window manager info
http://www.freedesktop.org/wiki/Specifications/wm-spec
+
+ rail
+ [MS-RDPERP]: Remote Desktop Protocol:
+ Remote Programs Virtual Channel Extension
+ http://msdn.microsoft.com/en-us/library/cc242568(v=prot.20).aspx
*/
#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"
#include "log.h"
#include "os_calls.h"
#include "thread_calls.h"
+#include "list.h"
extern int g_rail_chan_id; /* in chansrv.c */
extern int g_display_num; /* in chansrv.c */
@@ -41,11 +50,43 @@ extern Screen *g_screen; /* in xcommon.c */
extern Window g_root_window; /* in xcommon.c */
extern Atom g_wm_delete_window_atom; /* in xcommon.c */
extern Atom g_wm_protocols_atom; /* in xcommon.c */
+extern Atom g_utf8_string; /* in xcommon.c */
+extern Atom g_net_wm_name; /* in xcommon.c */
+extern Atom g_wm_state; /* in xcommon.c */
+
+static Atom g_rwd_atom = 0;
int g_rail_up = 0;
/* for rail_is_another_wm_running */
static int g_rail_running = 1;
+/* list of valid rail windows */
+static struct list* g_window_list = 0;
+
+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 */
+
+static Cursor g_default_cursor = 0;
+
+/* used in valid field of struct rail_window_data */
+#define RWD_X (1 << 0)
+#define RWD_Y (1 << 1)
+#define RWD_WIDTH (1 << 2)
+#define RWD_HEIGHT (1 << 3)
+#define RWD_TITLE (1 << 4)
+
+struct rail_window_data
+{
+ int valid; /* bits for which fields are valid */
+ int x;
+ int y;
+ int width;
+ int height;
+ int title_crc; /* crc of title for compare */
+};
/* Indicates a Client Execute PDU from client to server. */
#define TS_RAIL_ORDER_EXEC 0x0001
@@ -101,6 +142,133 @@ static int g_rail_running = 1;
/* Perform the default action of the window's system menu. */
#define SC_DEFAULT 0xF160
+/* for tooltips */
+#define RAIL_STYLE_TOOLTIP (0x80000000)
+#define RAIL_EXT_STYLE_TOOLTIP (0x00000080 | 0x00000008)
+
+/* for normal desktop windows */
+#define RAIL_STYLE_NORMAL (0x00C00000 | 0x00080000 | 0x00040000 | 0x00010000 | 0x00020000)
+#define RAIL_EXT_STYLE_NORMAL (0x00040000)
+
+/* for dialogs */
+#define RAIL_STYLE_DIALOG (0x80000000)
+#define RAIL_EXT_STYLE_DIALOG (0x00040000)
+
+static int APP_CC rail_win_get_state(Window win);
+static int APP_CC rail_create_window(Window window_id, Window owner_id);
+static int APP_CC rail_win_set_state(Window win, unsigned long state);
+static int APP_CC rail_show_window(Window window_id, int show_state);
+static int APP_CC rail_win_send_text(Window win);
+
+/*****************************************************************************/
+static int APP_CC
+rail_send_key_esc(int window_id)
+{
+ XEvent event;
+
+ g_memset(&event, 0, sizeof(event));
+ event.type = KeyPress;
+ event.xkey.same_screen = True;
+ event.xkey.root = g_root_window;
+ event.xkey.window = window_id;
+ event.xkey.keycode = 9;
+ XSendEvent(g_display, window_id, True, 0xfff, &event);
+ event.type = KeyRelease;
+ XSendEvent(g_display, window_id, True, 0xfff, &event);
+ return 0;
+}
+
+/*****************************************************************************/
+static struct rail_window_data* APP_CC
+rail_get_window_data(Window window)
+{
+ int bytes;
+ Atom actual_type_return;
+ int actual_format_return;
+ unsigned long nitems_return;
+ unsigned long bytes_after_return;
+ unsigned char* prop_return;
+ struct rail_window_data* rv;
+
+ LOG(10, ("chansrv::rail_get_window_data:"));
+ rv = 0;
+ actual_type_return = 0;
+ actual_format_return = 0;
+ nitems_return = 0;
+ prop_return = 0;
+ bytes = sizeof(struct rail_window_data);
+ XGetWindowProperty(g_display, window, g_rwd_atom, 0, bytes, 0,
+ XA_STRING, &actual_type_return,
+ &actual_format_return, &nitems_return,
+ &bytes_after_return, &prop_return);
+ if (prop_return == 0)
+ {
+ return 0;
+ }
+ if (nitems_return == bytes)
+ {
+ rv = (struct rail_window_data*)prop_return;
+ }
+ return rv;
+}
+
+/*****************************************************************************/
+static int APP_CC
+rail_set_window_data(Window window, struct rail_window_data* rwd)
+{
+ int bytes;
+
+ bytes = sizeof(struct rail_window_data);
+ XChangeProperty(g_display, window, g_rwd_atom, XA_STRING, 8,
+ PropModeReplace, (unsigned char*)rwd, bytes);
+ return 0;
+}
+
+/*****************************************************************************/
+/* get the rail window data, if not exist, try to create it and return */
+static struct rail_window_data* APP_CC
+rail_get_window_data_safe(Window window)
+{
+ struct rail_window_data* rv;
+
+ rv = rail_get_window_data(window);
+ if (rv != 0)
+ {
+ return rv;
+ }
+ rv = g_malloc(sizeof(struct rail_window_data), 1);
+ rail_set_window_data(window, rv);
+ g_free(rv);
+ return rail_get_window_data(window);
+}
+
+/******************************************************************************/
+static int APP_CC
+is_window_valid_child_of_root(unsigned int window_id)
+{
+ int found;
+ unsigned int i;
+ unsigned int nchild;
+ Window r;
+ Window p;
+ Window *children;
+
+ found = 0;
+ XQueryTree(g_display, g_root_window, &r, &p, &children, &nchild);
+
+ for (i = 0; i < nchild; i++)
+ {
+ if (window_id == children[i])
+ {
+ found = 1;
+ break;
+ }
+ }
+
+ XFree(children);
+ return found;
+}
+
/*****************************************************************************/
static int APP_CC
rail_send_init(void)
@@ -163,6 +331,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();
@@ -171,9 +344,34 @@ rail_init(void)
log_message(LOG_LEVEL_ERROR, "rail_init: another window manager "
"is running");
}
-
+ list_delete(g_window_list);
+ g_window_list = list_create();
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;
}
@@ -183,6 +381,8 @@ rail_deinit(void)
{
if (g_rail_up)
{
+ list_delete(g_window_list);
+ g_window_list = 0;
/* no longer window manager */
XSelectInput(g_display, g_root_window, 0);
g_rail_up = 0;
@@ -270,26 +470,173 @@ rail_process_exec(struct stream *s, int size)
return 0;
}
+/******************************************************************************/
+static int APP_CC
+rail_win_popdown(void)
+{
+ int rv = 0;
+ int i;
+ unsigned int nchild;
+ Window r;
+ Window p;
+ Window* children;
+ XWindowAttributes window_attributes;
+
+ /*
+ * Check the tree of current existing X windows and dismiss
+ * the managed rail popups by simulating a esc key, so
+ * that the requested window can be closed properly.
+ */
+
+ XQueryTree(g_display, g_root_window, &r, &p, &children, &nchild);
+ for (i = nchild - 1; i >= 0; i--)
+ {
+ XGetWindowAttributes(g_display, children[i], &window_attributes);
+ if (window_attributes.override_redirect &&
+ window_attributes.map_state == IsViewable &&
+ list_index_of(g_window_list, children[i]) >= 0)
+ {
+ LOG(10, (" dismiss pop up 0x%8.8x", children[i]));
+ rail_send_key_esc(children[i]);
+ rv = 1;
+ }
+ }
+
+ XFree(children);
+ return rv;
+}
+
+/******************************************************************************/
+static int APP_CC
+rail_close_window(int window_id)
+{
+ XEvent ce;
+
+ LOG(0, ("chansrv::rail_close_window:"));
+
+ rail_win_popdown();
+
+ g_memset(&ce, 0, sizeof(ce));
+ ce.xclient.type = ClientMessage;
+ ce.xclient.message_type = g_wm_protocols_atom;
+ ce.xclient.display = g_display;
+ ce.xclient.window = window_id;
+ ce.xclient.format = 32;
+ ce.xclient.data.l[0] = g_wm_delete_window_atom;
+ ce.xclient.data.l[1] = CurrentTime;
+ XSendEvent(g_display, window_id, False, NoEventMask, &ce);
+
+ return 0;
+}
+
+/*****************************************************************************/
+void DEFAULT_CC
+my_timoeut(void* data)
+{
+ LOG(10, ("my_timoeut: g_got_focus %d", g_got_focus));
+ if (g_focus_counter == (int)(long)data)
+ {
+ LOG(10, ("my_timoeut: g_focus_counter %d", g_focus_counter));
+ rail_win_popdown();
+ }
+}
+
/*****************************************************************************/
static int APP_CC
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));
+ XGetWindowAttributes(g_display, window_id, &window_attributes);
+
if (enabled)
{
+ if (g_focus_win == window_id)
+ {
+ /* In case that window is unmapped upon minimization and not yet mapped*/
+ XMapWindow(g_display, window_id);
+ }
+ else
+ {
+ rail_win_popdown();
+ if (window_attributes.map_state != IsViewable)
+ {
+ /* In case that window is unmapped upon minimization and not yet mapped */
+ XMapWindow(g_display, window_id);
+ }
+ XGetTransientForHint(g_display, window_id, &transient_for);
+ if (transient_for > 0)
+ {
+ /* Owner window should be raised up as well */
+ XRaiseWindow(g_display, transient_for);
+ }
+ LOG(10, ("chansrv::rail_process_activate: calling XRaiseWindow 0x%8.8x", window_id));
+ XRaiseWindow(g_display, window_id);
+ LOG(10, ("chansrv::rail_process_activate: calling XSetInputFocus 0x%8.8x", window_id));
+ XSetInputFocus(g_display, window_id, RevertToParent, CurrentTime);
+ }
LOG(10, ("chansrv::rail_process_activate: calling XRaiseWindow 0x%8.8x", window_id));
XRaiseWindow(g_display, window_id);
LOG(10, ("chansrv::rail_process_activate: calling XSetInputFocus 0x%8.8x", window_id));
XSetInputFocus(g_display, window_id, RevertToParent, CurrentTime);
+ } else {
+ XWindowAttributes window_attributes;
+ XGetWindowAttributes(g_display, window_id, &window_attributes);
+
+ LOG(10, (" window attributes: override_redirect %d",
+ window_attributes.override_redirect));
+ add_timeout(200, my_timoeut, (void*)(long)g_focus_counter);
}
+ return 0;
+}
+/*****************************************************************************/
+static int APP_CC
+rail_restore_windows(void)
+{
+ unsigned int i;
+ unsigned int nchild;
+ Window r;
+ Window p;
+ Window* children;
+
+ XQueryTree(g_display, g_root_window, &r, &p, &children, &nchild);
+ for (i = 0; i < nchild; i++)
+ {
+ XWindowAttributes window_attributes;
+ XGetWindowAttributes(g_display, children[i], &window_attributes);
+ if (!window_attributes.override_redirect)
+ {
+ if (window_attributes.map_state == IsViewable)
+ {
+ rail_win_set_state(children[i], 0x0); /* WithdrawnState */
+ rail_create_window(children[i], g_root_window);
+ rail_win_set_state(children[i], 0x1); /* NormalState */
+ rail_win_send_text(children[i]);
+ }
+ }
+ }
+ XFree(children);
return 0;
}
@@ -302,25 +649,173 @@ rail_process_system_param(struct stream *s, int size)
LOG(10, ("chansrv::rail_process_system_param:"));
in_uint32_le(s, system_param);
LOG(10, (" system_param 0x%8.8x", system_param));
+ /*
+ * Ask client to re-create the existing rail windows. This is supposed
+ * to be done after handshake and client is initialised properly, we
+ * consider client is ready when it sends "SET_WORKAREA" sysparam.
+ */
+ if (system_param == 0x0000002F) /*SPI_SET_WORK_AREA*/
+ {
+ LOG(10, (" restore rail windows"));
+ rail_restore_windows();
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+rail_get_property(Display* display, Window target, Atom type, Atom property,
+ unsigned char** data, unsigned long* count)
+{
+ Atom atom_return;
+ int size;
+ unsigned long nitems, bytes_left;
+ char* prop_name;
+
+ int ret = XGetWindowProperty(display, target, property,
+ 0l, 1l, False,
+ type, &atom_return, &size,
+ &nitems, &bytes_left, data);
+ if ((ret != Success || nitems < 1) && atom_return == None)
+ {
+ prop_name = XGetAtomName(g_display, property);
+ LOG(10, (" rail_get_property %s: failed", prop_name));
+ XFree(prop_name);
+ return 1;
+ }
+
+ if (bytes_left != 0)
+ {
+ XFree(*data);
+ unsigned long remain = ((size / 8) * nitems) + bytes_left;
+ ret = XGetWindowProperty(g_display, target,
+ property, 0l, remain, False,
+ atom_return, &atom_return, &size,
+ &nitems, &bytes_left, data);
+ if (ret != Success)
+ {
+ return 1;
+ }
+ }
+
+ *count = nitems;
return 0;
}
+/*****************************************************************************/
+static int APP_CC
+rail_win_get_state(Window win)
+{
+ unsigned long nitems = 0;
+ int rv = -1;
+ char* data = 0;
+
+ rail_get_property(g_display, win, g_wm_state, g_wm_state,
+ (unsigned char **)&data,
+ &nitems);
+
+ if (data || nitems > 0)
+ {
+ rv = *(unsigned long *)data;
+ XFree(data);
+ LOG(10, (" rail_win_get_state: %d", rv));
+ }
+
+ return rv;
+}
+
+/*****************************************************************************/
+static int APP_CC
+rail_win_set_state(Window win, unsigned long state)
+{
+ int old_state;
+ unsigned long data[2] = { state, None };
+
+ LOG(10, (" rail_win_set_state: %d", state));
+ /* check whether WM_STATE exists */
+ old_state = rail_win_get_state(win);
+ if (old_state == -1)
+ {
+ /* create WM_STATE property */
+ XChangeProperty(g_display, win, g_wm_state, g_wm_state, 32, PropModeAppend,
+ (unsigned char *)data, 2);
+ LOG(10, (" rail_win_set_state: create WM_STATE property"));
+ }
+ else
+ {
+ XChangeProperty(g_display, win, g_wm_state, g_wm_state, 32, PropModeReplace,
+ (unsigned char *)data, 2);
+ }
+ return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+rail_win_get_text(Window win, char **data)
+{
+ int ret = 0;
+ int i = 0;
+ unsigned long nitems = 0;
+
+ ret = rail_get_property(g_display, win, g_utf8_string, g_net_wm_name,
+ (unsigned char **)data, &nitems);
+ if (ret != 0)
+ {
+ /* _NET_WM_NAME isn't set, use WM_NAME (XFetchName) instead */
+ XFetchName(g_display, win, data);
+ }
+
+ if (data)
+ {
+ char *ptr = *data;
+ for (; ptr != NULL; i++)
+ {
+ if (ptr[i] == '\0')
+ {
+ break;
+ }
+ }
+ }
+
+ return i;
+}
+
/******************************************************************************/
static int APP_CC
-rail_close_window(int window_id)
+rail_minmax_window(int window_id, int max)
{
- XEvent ce;
+ LOG(10, ("chansrv::rail_minmax_window 0x%8.8x:", window_id));
+ if (max)
+ {
+
+ } else {
+ XUnmapWindow(g_display, window_id);
+ /* change window state to IconicState (3) */
+ rail_win_set_state(window_id, 0x3);
+ /*
+ * TODO dismiss popups opened so far
+ */
+ }
+ return 0;
+}
- LOG(0, ("chansrv::rail_close_window:"));
- g_memset(&ce, 0, sizeof(ce));
- ce.xclient.type = ClientMessage;
- ce.xclient.message_type = g_wm_protocols_atom;
- ce.xclient.display = g_display;
- ce.xclient.window = window_id;
- ce.xclient.format = 32;
- ce.xclient.data.l[0] = g_wm_delete_window_atom;
- ce.xclient.data.l[1] = CurrentTime;
- XSendEvent(g_display, window_id, False, NoEventMask, &ce);
+/*****************************************************************************/
+static int APP_CC
+rail_restore_window(int window_id)
+{
+ XWindowAttributes window_attributes;
+
+ LOG(10, ("chansrv::rail_restore_window 0x%8.8x:", window_id));
+ XGetWindowAttributes(g_display, window_id, &window_attributes);
+ if (window_attributes.map_state != IsViewable)
+ {
+ XMapWindow(g_display, window_id);
+ }
+ LOG(10, ("chansrv::rail_process_activate: calling XRaiseWindow 0x%8.8x", window_id));
+ XRaiseWindow(g_display, window_id);
+ LOG(10, ("chansrv::rail_process_activate: calling XSetInputFocus 0x%8.8x", window_id));
+ XSetInputFocus(g_display, window_id, RevertToParent, CurrentTime);
+
return 0;
}
@@ -330,11 +825,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:
@@ -345,6 +849,7 @@ rail_process_system_command(struct stream *s, int size)
break;
case SC_MINIMIZE:
LOG(10, (" window_id 0x%8.8x SC_MINIMIZE", window_id));
+ rail_minmax_window(window_id, 0);
break;
case SC_MAXIMIZE:
LOG(10, (" window_id 0x%8.8x SC_MAXIMIZE", window_id));
@@ -358,6 +863,7 @@ rail_process_system_command(struct stream *s, int size)
break;
case SC_RESTORE:
LOG(10, (" window_id 0x%8.8x SC_RESTORE", window_id));
+ rail_restore_window(window_id);
break;
case SC_DEFAULT:
LOG(10, (" window_id 0x%8.8x SC_DEFAULT", window_id));
@@ -409,16 +915,30 @@ rail_process_window_move(struct stream *s, int size)
int top;
int right;
int bottom;
+ tsi16 si16;
+ struct rail_window_data* rwd;
LOG(10, ("chansrv::rail_process_window_move:"));
in_uint32_le(s, window_id);
- in_uint16_le(s, left);
- in_uint16_le(s, top);
- in_uint16_le(s, right);
- in_uint16_le(s, bottom);
+ in_uint16_le(s, si16);
+ left = si16;
+ in_uint16_le(s, si16);
+ top = si16;
+ in_uint16_le(s, si16);
+ right = si16;
+ in_uint16_le(s, si16);
+ bottom = si16;
LOG(10, (" window_id 0x%8.8x left %d top %d right %d bottom %d width %d height %d",
window_id, left, top, right, bottom, right - left, bottom - top));
XMoveResizeWindow(g_display, window_id, left, top, right - left, bottom - top);
+ rwd = (struct rail_window_data*)
+ g_malloc(sizeof(struct rail_window_data), 1);
+ rwd->x = left;
+ rwd->y = top;
+ rwd->width = right - left;
+ rwd->height = bottom - top;
+ rail_set_window_data(window_id, rwd);
+ g_free(rwd);
return 0;
}
@@ -431,13 +951,16 @@ rail_process_local_move_size(struct stream *s, int size)
int move_size_type;
int pos_x;
int pos_y;
+ tsi16 si16;
LOG(10, ("chansrv::rail_process_local_move_size:"));
in_uint32_le(s, window_id);
in_uint16_le(s, is_move_size_start);
in_uint16_le(s, move_size_type);
- in_uint16_le(s, pos_x);
- in_uint16_le(s, pos_y);
+ in_uint16_le(s, si16);
+ pos_x = si16;
+ in_uint16_le(s, si16);
+ pos_y = si16;
LOG(10, (" window_id 0x%8.8x is_move_size_start %d move_size_type %d "
"pos_x %d pos_y %d", window_id, is_move_size_start, move_size_type,
pos_x, pos_y));
@@ -472,11 +995,14 @@ rail_process_sys_menu(struct stream *s, int size)
int window_id;
int left;
int top;
+ tsi16 si16;
LOG(10, ("chansrv::rail_process_sys_menu:"));
in_uint32_le(s, window_id);
- in_uint16_le(s, left);
- in_uint16_le(s, top);
+ in_uint16_le(s, si16);
+ left = si16;
+ in_uint16_le(s, si16);
+ top = si16;
LOG(10, (" window_id 0x%8.8x left %d top %d", window_id, left, top));
return 0;
}
@@ -588,14 +1114,646 @@ 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
+rail_win_send_text(Window win)
+{
+ char* data = 0;
+ struct stream* s;
+ int len = 0;
+ int flags;
+ int crc;
+ struct rail_window_data* rwd;
+
+ len = rail_win_get_text(win, &data);
+ rwd = rail_get_window_data_safe(win);
+ if (rwd != 0)
+ {
+ if (data != 0)
+ {
+ if (rwd->valid & RWD_TITLE)
+ {
+ crc = get_string_crc(data);
+ if (rwd->title_crc == crc)
+ {
+ LOG(10, ("chansrv::rail_win_send_text: skipping, title not changed"));
+ XFree(data);
+ XFree(rwd);
+ return 0;
+ }
+ }
+ }
+ }
+ else
+ {
+ LOG(0, ("chansrv::rail_win_send_text: error rail_get_window_data_safe failed"));
+ return 1;
+ }
+ if (data && len > 0) {
+ LOG(10, ("chansrv::rail_win_send_text: 0x%8.8x text %s length %d",
+ win, data, len));
+ make_stream(s);
+ init_stream(s, 1024);
+ flags = WINDOW_ORDER_TYPE_WINDOW | WINDOW_ORDER_FIELD_TITLE;
+ out_uint32_le(s, 8); /* update title info */
+ out_uint32_le(s, win); /* window id */
+ out_uint32_le(s, flags); /* flags */
+ out_uint32_le(s, len); /* title size */
+ out_uint8a(s, data, len); /* title */
+ s_mark_end(s);
+ send_rail_drawing_orders(s->data, (int)(s->end - s->data));
+ free_stream(s);
+ /* update rail window data */
+ rwd->valid |= RWD_TITLE;
+ crc = get_string_crc(data);
+ rwd->title_crc = crc;
+ rail_set_window_data(win, rwd);
+ }
+ if (data != 0)
+ {
+ XFree(data);
+ }
+ XFree(rwd);
+ return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+rail_destroy_window(Window window_id)
+{
+ struct stream *s;
+
+ LOG(10, ("chansrv::rail_destroy_window 0x%8.8x", window_id));
+ make_stream(s);
+ init_stream(s, 1024);
+
+ out_uint32_le(s, 4); /* destroy_window */
+ out_uint32_le(s, window_id);
+ s_mark_end(s);
+ send_rail_drawing_orders(s->data, (int)(s->end - s->data));
+ free_stream(s);
+
+ return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+rail_show_window(Window window_id, int show_state)
+{
+ int flags;
+ struct stream* s;
+
+ LOG(10, ("chansrv::rail_show_window 0x%8.8x 0x%x", window_id, show_state));
+ make_stream(s);
+ init_stream(s, 1024);
+
+ flags = WINDOW_ORDER_TYPE_WINDOW | WINDOW_ORDER_FIELD_SHOW;
+ out_uint32_le(s, 6); /* show_window */
+ out_uint32_le(s, window_id); /* window_id */
+ out_uint32_le(s, flags); /* flags */
+ out_uint32_le(s, show_state); /* show_state */
+ s_mark_end(s);
+ send_rail_drawing_orders(s->data, (int)(s->end - s->data));
+ free_stream(s);
+ return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+rail_create_window(Window window_id, Window owner_id)
+{
+ int x;
+ int y;
+ tui32 width;
+ tui32 height;
+ tui32 border;
+ Window root;
+ tui32 depth;
+ char* title_bytes = 0;
+ int title_size = 0;
+ XWindowAttributes attributes;
+ int style;
+ int ext_style;
+ int num_window_rects = 1;
+ int num_visibility_rects = 1;
+ int i = 0;
+
+ int flags;
+ int index;
+ int crc;
+ Window transient_for = 0;
+ struct rail_window_data* rwd;
+ struct stream* s;
+
+ LOG(10, ("chansrv::rail_create_window 0x%8.8x", window_id));
+
+ rwd = rail_get_window_data_safe(window_id);
+ if (rwd == 0)
+ {
+ LOG(0, ("chansrv::rail_create_window: error rail_get_window_data_safe failed"));
+ return 0;
+ }
+ XGetGeometry(g_display, window_id, &root, &x, &y, &width, &height,
+ &border, &depth);
+ XGetWindowAttributes(g_display, window_id, &attributes);
+
+ LOG(10, (" x %d y %d width %d height %d border_width %d", x, y, width,
+ height, border));
+
+ index = list_index_of(g_window_list, window_id);
+ if (index == -1)
+ {
+ LOG(10, (" create new window"));
+ flags = WINDOW_ORDER_TYPE_WINDOW | WINDOW_ORDER_STATE_NEW;
+ list_add_item(g_window_list, window_id);
+ }
+ else
+ {
+ LOG(10, (" update existing window"));
+ flags = WINDOW_ORDER_TYPE_WINDOW;
+ }
+
+ title_size = rail_win_get_text(window_id, &title_bytes);
+
+ XGetTransientForHint(g_display, window_id, &transient_for);
+
+ if (attributes.override_redirect)
+ {
+ style = RAIL_STYLE_TOOLTIP;
+ ext_style = RAIL_EXT_STYLE_TOOLTIP;
+ }
+ else if (transient_for > 0)
+ {
+ style = RAIL_STYLE_DIALOG;
+ ext_style = RAIL_EXT_STYLE_DIALOG;
+ owner_id = transient_for;
+ }
+ else
+ {
+ style = RAIL_STYLE_NORMAL;
+ ext_style = RAIL_EXT_STYLE_NORMAL;
+ }
+
+ make_stream(s);
+ init_stream(s, 1024);
+
+ out_uint32_le(s, 2); /* create_window */
+ out_uint32_le(s, window_id); /* window_id */
+ out_uint32_le(s, owner_id); /* owner_window_id */
+ flags |= WINDOW_ORDER_FIELD_OWNER;
+ out_uint32_le(s, style); /* style */
+ out_uint32_le(s, ext_style); /* extended_style */
+ flags |= WINDOW_ORDER_FIELD_STYLE;
+ out_uint32_le(s, 0x05); /* show_state */
+ flags |= WINDOW_ORDER_FIELD_SHOW;
+ if (title_size > 0)
+ {
+ out_uint16_le(s, title_size); /* title_size */
+ out_uint8a(s, title_bytes, title_size); /* title */
+ rwd->valid |= RWD_TITLE;
+ 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_crc = 0;
+ }
+ LOG(10, (" set title info %d", title_size));
+ flags |= WINDOW_ORDER_FIELD_TITLE;
+ out_uint32_le(s, 0); /* client_offset_x */
+ out_uint32_le(s, 0); /* client_offset_y */
+ flags |= WINDOW_ORDER_FIELD_CLIENT_AREA_OFFSET;
+ out_uint32_le(s, width); /* client_area_width */
+ out_uint32_le(s, height); /* client_area_height */
+ flags |= WINDOW_ORDER_FIELD_CLIENT_AREA_SIZE;
+ out_uint32_le(s, 0); /* rp_content */
+ out_uint32_le(s, g_root_window); /* root_parent_handle */
+ flags |= WINDOW_ORDER_FIELD_ROOT_PARENT;
+ out_uint32_le(s, x); /* window_offset_x */
+ out_uint32_le(s, y); /* window_offset_y */
+ flags |= WINDOW_ORDER_FIELD_WND_OFFSET;
+ out_uint32_le(s, 0); /* window_client_delta_x */
+ out_uint32_le(s, 0); /* window_client_delta_y */
+ flags |= WINDOW_ORDER_FIELD_WND_CLIENT_DELTA;
+ out_uint32_le(s, width); /* window_width */
+ out_uint32_le(s, height); /* window_height */
+ flags |= WINDOW_ORDER_FIELD_WND_SIZE;
+ out_uint16_le(s, num_window_rects); /* num_window_rects */
+ for (i = 0; i < num_window_rects; i++)
+ {
+ out_uint16_le(s, 0); /* left */
+ out_uint16_le(s, 0); /* top */
+ out_uint16_le(s, width); /* right */
+ out_uint16_le(s, height); /* bottom */
+ }
+ flags |= WINDOW_ORDER_FIELD_WND_RECTS;
+ out_uint32_le(s, x); /* visible_offset_x */
+ out_uint32_le(s, y); /* visible_offset_y */
+ flags |= WINDOW_ORDER_FIELD_VIS_OFFSET;
+ out_uint16_le(s, num_visibility_rects); /* num_visibility_rects */
+ for (i = 0; i < num_visibility_rects; i++)
+ {
+ out_uint16_le(s, 0); /* left */
+ out_uint16_le(s, 0); /* top */
+ out_uint16_le(s, width); /* right */
+ out_uint16_le(s, height); /* bottom */
+ }
+ flags |= WINDOW_ORDER_FIELD_VISIBILITY;
+ out_uint32_le(s, flags); /*flags*/
+
+ s_mark_end(s);
+ send_rail_drawing_orders(s->data, (int)(s->end - s->data));
+ free_stream(s);
+ XFree(title_bytes);
+ rail_set_window_data(window_id, rwd);
+ XFree(rwd);
+ return 0;
+}
+
+/*****************************************************************************/
+/* returns 0, event handled, 1 unhandled */
+int APP_CC
+rail_configure_request_window(XConfigureRequestEvent* config)
+{
+ int num_window_rects = 1;
+ int num_visibility_rects = 1;
+ int i = 0;
+ int flags;
+ int index;
+ int window_id;
+ int mask;
+ int resized = 0;
+ struct rail_window_data* rwd;
+
+ struct stream* s;
+
+ window_id = config->window;
+ mask = config->value_mask;
+ LOG(10, ("chansrv::rail_configure_request_window: mask %d", mask));
+ if (mask & CWStackMode)
+ {
+ LOG(10, ("chansrv::rail_configure_request_window: CWStackMode "
+ "detail 0x%8.8x above 0x%8.8x", config->detail, config->above));
+ if (config->detail == Above)
+ {
+ LOG(10, ("chansrv::rail_configure_request_window: bring to front "
+ "window_id 0x%8.8x", window_id));
+ /* 0x05 - Show the window in its current size and position. */
+ rail_show_window(window_id, 5);
+ }
+ }
+ rwd = rail_get_window_data(window_id);
+ if (rwd == 0)
+ {
+ rwd = (struct rail_window_data*)g_malloc(sizeof(struct rail_window_data), 1);
+ rwd->x = config->x;
+ rwd->y = config->y;
+ rwd->width = config->width;
+ rwd->height = config->height;
+ rwd->valid |= RWD_X | RWD_Y | RWD_WIDTH | RWD_HEIGHT;
+ rail_set_window_data(window_id, rwd);
+ g_free(rwd);
+ return 0;
+ }
+ if (!resized)
+ {
+ if (mask & CWX)
+ {
+ if (rwd->valid & RWD_X)
+ {
+ if (rwd->x != config->x)
+ {
+ resized = 1;
+ rwd->x = config->x;
+ }
+ }
+ else
+ {
+ resized = 1;
+ rwd->x = config->x;
+ rwd->valid |= RWD_X;
+ }
+ }
+ }
+ if (!resized)
+ {
+ if (mask & CWY)
+ {
+ if (rwd->valid & RWD_Y)
+ {
+ if (rwd->y != config->y)
+ {
+ resized = 1;
+ rwd->y = config->y;
+ }
+ }
+ else
+ {
+ resized = 1;
+ rwd->y = config->y;
+ rwd->valid |= RWD_Y;
+ }
+ }
+ }
+ if (!resized)
+ {
+ if (mask & CWWidth)
+ {
+ if (rwd->valid & RWD_WIDTH)
+ {
+ if (rwd->width != config->width)
+ {
+ resized = 1;
+ rwd->width = config->width;
+ }
+ }
+ else
+ {
+ resized = 1;
+ rwd->width = config->width;
+ rwd->valid |= RWD_WIDTH;
+ }
+ }
+ }
+ if (!resized)
+ {
+ if (mask & CWHeight)
+ {
+ if (rwd->valid & RWD_HEIGHT)
+ {
+ if (rwd->height != config->height)
+ {
+ resized = 1;
+ rwd->height = config->height;
+ }
+ }
+ else
+ {
+ resized = 1;
+ rwd->height = config->height;
+ rwd->valid |= RWD_HEIGHT;
+ }
+ }
+ }
+ if (resized)
+ {
+ rail_set_window_data(window_id, rwd);
+ XFree(rwd);
+ }
+ else
+ {
+ XFree(rwd);
+ return 0;
+ }
+
+ LOG(10, ("chansrv::rail_configure_request_window: 0x%8.8x", window_id));
+
+
+ LOG(10, (" x %d y %d width %d height %d border_width %d", config->x,
+ config->y, config->width, config->height, config->border_width));
+
+ index = list_index_of(g_window_list, window_id);
+ if (index == -1)
+ {
+ /* window isn't mapped yet */
+ LOG(0, ("chansrv::rail_configure_request_window: window not mapped"));
+ return 0;
+ }
+
+ flags = WINDOW_ORDER_TYPE_WINDOW;
+
+ make_stream(s);
+ init_stream(s, 1024);
+
+ out_uint32_le(s, 10); /* configure_window */
+ out_uint32_le(s, window_id); /* window_id */
+
+ out_uint32_le(s, 0); /* client_offset_x */
+ out_uint32_le(s, 0); /* client_offset_y */
+ flags |= WINDOW_ORDER_FIELD_CLIENT_AREA_OFFSET;
+ out_uint32_le(s, config->width); /* client_area_width */
+ out_uint32_le(s, config->height); /* client_area_height */
+ flags |= WINDOW_ORDER_FIELD_CLIENT_AREA_SIZE;
+ out_uint32_le(s, 0); /* rp_content */
+ out_uint32_le(s, g_root_window); /* root_parent_handle */
+ flags |= WINDOW_ORDER_FIELD_ROOT_PARENT;
+ out_uint32_le(s, config->x); /* window_offset_x */
+ out_uint32_le(s, config->y); /* window_offset_y */
+ flags |= WINDOW_ORDER_FIELD_WND_OFFSET;
+ out_uint32_le(s, 0); /* window_client_delta_x */
+ out_uint32_le(s, 0); /* window_client_delta_y */
+ flags |= WINDOW_ORDER_FIELD_WND_CLIENT_DELTA;
+ out_uint32_le(s, config->width); /* window_width */
+ out_uint32_le(s, config->height); /* window_height */
+ flags |= WINDOW_ORDER_FIELD_WND_SIZE;
+ out_uint16_le(s, num_window_rects); /* num_window_rects */
+ for (i = 0; i < num_window_rects; i++)
+ {
+ out_uint16_le(s, 0); /* left */
+ out_uint16_le(s, 0); /* top */
+ out_uint16_le(s, config->width); /* right */
+ out_uint16_le(s, config->height); /* bottom */
+ }
+ flags |= WINDOW_ORDER_FIELD_WND_RECTS;
+ out_uint32_le(s, config->x); /* visible_offset_x */
+ out_uint32_le(s, config->y); /* visible_offset_y */
+ flags |= WINDOW_ORDER_FIELD_VIS_OFFSET;
+ out_uint16_le(s, num_visibility_rects); /* num_visibility_rects */
+ for (i = 0; i < num_visibility_rects; i++)
+ {
+ out_uint16_le(s, 0); /* left */
+ out_uint16_le(s, 0); /* top */
+ out_uint16_le(s, config->width); /* right */
+ out_uint16_le(s, config->height); /* bottom */
+ }
+ flags |= WINDOW_ORDER_FIELD_VISIBILITY;
+ out_uint32_le(s, flags); /*flags*/
+
+ s_mark_end(s);
+ send_rail_drawing_orders(s->data, (int)(s->end - s->data));
+ free_stream(s);
+ return 0;
+}
+
+/*****************************************************************************/
+/* returns 0, event handled, 1 unhandled */
+int APP_CC
+rail_configure_window(XConfigureEvent *config)
+{
+ int num_window_rects = 1;
+ int num_visibility_rects = 1;
+ int i = 0;
+ int flags;
+ int index;
+ int window_id;
+
+ struct stream* s;
+
+ window_id = config->window;
+
+ LOG(10, ("chansrv::rail_configure_window 0x%8.8x", window_id));
+
+
+ LOG(10, (" x %d y %d width %d height %d border_width %d", config->x,
+ config->y, config->width, config->height, config->border_width));
+
+ index = list_index_of(g_window_list, window_id);
+ if (index == -1)
+ {
+ /* window isn't mapped yet */
+ return 0;
+ }
+
+ flags = WINDOW_ORDER_TYPE_WINDOW;
+
+ make_stream(s);
+ init_stream(s, 1024);
+
+ out_uint32_le(s, 10); /* configure_window */
+ out_uint32_le(s, window_id); /* window_id */
+
+ out_uint32_le(s, 0); /* client_offset_x */
+ out_uint32_le(s, 0); /* client_offset_y */
+ flags |= WINDOW_ORDER_FIELD_CLIENT_AREA_OFFSET;
+ out_uint32_le(s, config->width); /* client_area_width */
+ out_uint32_le(s, config->height); /* client_area_height */
+ flags |= WINDOW_ORDER_FIELD_CLIENT_AREA_SIZE;
+ out_uint32_le(s, 0); /* rp_content */
+ out_uint32_le(s, g_root_window); /* root_parent_handle */
+ flags |= WINDOW_ORDER_FIELD_ROOT_PARENT;
+ out_uint32_le(s, config->x); /* window_offset_x */
+ out_uint32_le(s, config->y); /* window_offset_y */
+ flags |= WINDOW_ORDER_FIELD_WND_OFFSET;
+ out_uint32_le(s, 0); /* window_client_delta_x */
+ out_uint32_le(s, 0); /* window_client_delta_y */
+ flags |= WINDOW_ORDER_FIELD_WND_CLIENT_DELTA;
+ out_uint32_le(s, config->width); /* window_width */
+ out_uint32_le(s, config->height); /* window_height */
+ flags |= WINDOW_ORDER_FIELD_WND_SIZE;
+ out_uint16_le(s, num_window_rects); /* num_window_rects */
+ for (i = 0; i < num_window_rects; i++)
+ {
+ out_uint16_le(s, 0); /* left */
+ out_uint16_le(s, 0); /* top */
+ out_uint16_le(s, config->width); /* right */
+ out_uint16_le(s, config->height); /* bottom */
+ }
+ flags |= WINDOW_ORDER_FIELD_WND_RECTS;
+ out_uint32_le(s, config->x); /* visible_offset_x */
+ out_uint32_le(s, config->y); /* visible_offset_y */
+ flags |= WINDOW_ORDER_FIELD_VIS_OFFSET;
+ out_uint16_le(s, num_visibility_rects); /* num_visibility_rects */
+ for (i = 0; i < num_visibility_rects; i++)
+ {
+ out_uint16_le(s, 0); /* left */
+ out_uint16_le(s, 0); /* top */
+ out_uint16_le(s, config->width); /* right */
+ out_uint16_le(s, config->height); /* bottom */
+ }
+ flags |= WINDOW_ORDER_FIELD_VISIBILITY;
+ out_uint32_le(s, flags); /*flags*/
+
+ s_mark_end(s);
+ send_rail_drawing_orders(s->data, (int)(s->end - s->data));
+ free_stream(s);
+ return 0;
+}
+
+/*****************************************************************************/
+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)
{
XEvent *lxevent;
+ XEvent lastevent;
XWindowChanges xwc;
int rv;
+ int index;
+ XWindowAttributes wnd_attributes;
+ char* prop_name;
LOG(10, ("chansrv::rail_xevent:"));
@@ -609,6 +1767,30 @@ rail_xevent(void *xevent)
switch (lxevent->type)
{
+ case PropertyNotify:
+ prop_name = XGetAtomName(g_display, lxevent->xproperty.atom);
+ 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)
+ {
+ XGetWindowAttributes(g_display, lxevent->xproperty.window, &wnd_attributes);
+ if (wnd_attributes.map_state == IsViewable)
+ {
+ rail_win_send_text(lxevent->xproperty.window);
+ rv = 0;
+ }
+ }
+ XFree(prop_name);
+ break;
+
case ConfigureRequest:
LOG(10, (" got ConfigureRequest window_id 0x%8.8x", lxevent->xconfigurerequest.window));
g_memset(&xwc, 0, sizeof(xwc));
@@ -623,31 +1805,118 @@ rail_xevent(void *xevent)
lxevent->xconfigurerequest.window,
lxevent->xconfigurerequest.value_mask,
&xwc);
+ rail_configure_request_window(&(lxevent->xconfigurerequest));
rv = 0;
break;
+ case CreateNotify:
+ LOG(10, (" got CreateNotify window 0x%8.8x parent 0x%8.8x",
+ lxevent->xcreatewindow.window, lxevent->xcreatewindow.parent));
+ XSelectInput(g_display, lxevent->xcreatewindow.window,
+ PropertyChangeMask | StructureNotifyMask |
+ SubstructureNotifyMask | FocusChangeMask |
+ EnterWindowMask | LeaveWindowMask);
+ break;
+
+ case DestroyNotify:
+ 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)
+ {
+ rail_destroy_window(lxevent->xdestroywindow.window);
+ list_remove_item(g_window_list, index);
+ }
+ rv = 0;
+ break;
+
case MapRequest:
- LOG(10, (" got MapRequest"));
+ LOG(10, (" got MapRequest window 0x%8.8x", lxevent->xmaprequest.window));
XMapWindow(g_display, lxevent->xmaprequest.window);
- rv = 0;
break;
case MapNotify:
- LOG(10, (" got MapNotify"));
+ LOG(10, (" got MapNotify window 0x%8.8x event 0x%8.8x",
+ lxevent->xmap.window, lxevent->xmap.event));
+ if (lxevent->xmap.window != lxevent->xmap.event)
+ {
+ 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_win_set_state(lxevent->xmap.window, 0x1); /* NormalState */
+ rail_win_send_text(lxevent->xmap.window);
+ }
+ rv = 0;
+ }
break;
case UnmapNotify:
- LOG(10, (" got UnmapNotify"));
+ LOG(10, (" got UnmapNotify 0x%8.8x", lxevent->xunmap.event));
+ 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));
+ if (index >= 0)
+ {
+ rail_show_window(lxevent->xunmap.window, 0x0);
+ rv = 0;
+ }
+ }
break;
case ConfigureNotify:
- LOG(10, (" got ConfigureNotify"));
+ LOG(10, (" got ConfigureNotify 0x%8.8x event 0x%8.8x", lxevent->xconfigure.window,
+ lxevent->xconfigure.event));
+ rv = 0;
+ if (lxevent->xconfigure.event != lxevent->xconfigure.window ||
+ lxevent->xconfigure.override_redirect)
+ {
+ break;
+ }
+ /* skip dup ConfigureNotify */
+ while (XCheckTypedWindowEvent(g_display,
+ lxevent->xconfigure.window,
+ ConfigureNotify, &lastevent))
+ {
+ if (lastevent.xconfigure.event == lastevent.xconfigure.window &&
+ lxevent->xconfigure.override_redirect == 0)
+ {
+ lxevent = &lastevent;
+ }
+ }
+#if 0
+ rail_configure_window(&(lxevent->xconfigure));
+#endif
break;
case FocusIn:
LOG(10, (" got FocusIn"));
+ g_focus_win = lxevent->xfocus.window;
break;
+ case FocusOut:
+ LOG(10, (" got FocusOut"));
+ break;
+
case ButtonPress:
LOG(10, (" got ButtonPress"));
break;
@@ -660,6 +1929,39 @@ rail_xevent(void *xevent)
LOG(10, (" got LeaveNotify"));
break;
+ case ReparentNotify:
+ LOG(10, (" got ReparentNotify window 0x%8.8x parent 0x%8.8x "
+ "event 0x%8.8x x %d y %d overrider redirect %d",
+ lxevent->xreparent.window, lxevent->xreparent.parent,
+ 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);
+ if (index >= 0)
+ {
+ rail_destroy_window(lxevent->xreparent.window);
+ list_remove_item(g_window_list, index);
+ }
+ }
+ 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;
diff --git a/sesman/chansrv/rail.h b/sesman/chansrv/rail.h
index 7dbcbc5a..3be3a15d 100644
--- a/sesman/chansrv/rail.h
+++ b/sesman/chansrv/rail.h
@@ -19,6 +19,7 @@
#ifndef _RAIL_H_
#define _RAIL_H_
+#include "../../common/rail.h"
#include "arch.h"
#include "parse.h"
@@ -31,5 +32,6 @@ rail_data_in(struct stream* s, int chan_id, int chan_flags,
int length, int total_length);
int APP_CC
rail_xevent(void* xevent);
+int APP_CC rail_request_title(int window_id);
#endif
diff --git a/sesman/chansrv/xcommon.c b/sesman/chansrv/xcommon.c
index c5a91cae..919bc41b 100644
--- a/sesman/chansrv/xcommon.c
+++ b/sesman/chansrv/xcommon.c
@@ -25,8 +25,10 @@
#include "clipboard.h"
#include "rail.h"
+/*
#undef LOG_LEVEL
#define LOG_LEVEL 11
+*/
extern int g_clip_up; /* in clipboard.c */
@@ -40,6 +42,9 @@ int g_screen_num = 0;
Window g_root_window = 0;
Atom g_wm_delete_window_atom = 0;
Atom g_wm_protocols_atom = 0;
+Atom g_utf8_string = 0;
+Atom g_net_wm_name = 0;
+Atom g_wm_state = 0;
/*****************************************************************************/
static int DEFAULT_CC
@@ -117,7 +122,10 @@ xcommon_init(void)
g_wm_delete_window_atom = XInternAtom(g_display, "WM_DELETE_WINDOW", 0);
g_wm_protocols_atom = XInternAtom(g_display, "WM_PROTOCOLS", 0);
-
+ g_utf8_string = XInternAtom(g_display, "UTF8_STRING", 0);
+ g_net_wm_name = XInternAtom(g_display, "_NET_WM_NAME", 0);
+ g_wm_state = XInternAtom(g_display, "WM_STATE", 0);
+
return 0;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 06:09:03 +0000