Date: Thu, 21 Oct 2004 20:39:44 +0200 (CEST) From: Matt Douhan <mdouhan@fruitsalad.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72975: update net/rdesktop Message-ID: <200410211839.i9LIdi2s043047@mandarin.internal.hasta.se> Resent-Message-ID: <200410211840.i9LIeJ2k083408@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72975 >Category: ports >Synopsis: update net/rdesktop >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Oct 21 18:40:19 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Matt Douhan >Release: FreeBSD 4.10-STABLE i386 >Organization: fruitsalad.org >Environment: System: FreeBSD mandarin.internal.hasta.se 4.10-STABLE FreeBSD 4.10-STABLE #3: Fri Jun 25 20:58:27 CEST 2004 root@mandarin.internal.hasta.se:/usr/obj/usr/src/sys/MANDARIN i386 >Description: updates net/rdesktop to a version that works with KDE 3.3 krdc >How-To-Repeat: >Fix: put the following as patch-rdesktop in net/rdesktop/files --- rdesktop.c.orig 2004-03-08 18:02:58.000000000 +0100 +++ rdesktop.c 2004-03-09 22:32:19.000000000 +0100 @@ -27,6 +27,7 @@ #include <sys/time.h> /* gettimeofday */ #include <sys/times.h> /* times */ #include <errno.h> +#include <X11/Xlib.h> /* Window */ #include "rdesktop.h" #ifdef EGD_SOCKET @@ -68,6 +69,7 @@ BOOL g_console_session = False; BOOL g_numlock_sync = False; extern BOOL g_owncolmap; +extern Window g_embed_wnd; #ifdef WITH_RDPSND BOOL g_rdpsnd = False; @@ -112,6 +114,7 @@ fprintf(stderr, " -S: caption button size (single application mode)\n"); fprintf(stderr, " -T: window title\n"); fprintf(stderr, " -N: enable numlock synchronisation\n"); + fprintf(stderr, " -X: embed into another window with a given id.\n"); fprintf(stderr, " -a: connection colour depth\n"); fprintf(stderr, " -r: enable specified device redirection (currently: sound)\n"); fprintf(stderr, " -0: attach to console\n"); @@ -224,6 +227,7 @@ prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "en-us"); + g_embed_wnd = 0; #ifdef RDP2VNC #define VNCOPT "V:Q:" @@ -231,7 +235,7 @@ #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1) + while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:NX:a:r:045h?")) != -1) { switch (c) { @@ -374,6 +378,10 @@ g_numlock_sync = True; break; + case 'X': + g_embed_wnd = strtod(optarg, NULL); + break; + case 'a': g_server_bpp = strtol(optarg, NULL, 10); if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15 --- xwin.c.orig 2004-03-08 18:02:58.000000000 +0100 +++ xwin.c 2004-03-10 16:17:59.000000000 +0100 @@ -41,6 +41,7 @@ static int g_x_socket; static Screen *g_screen; Window g_wnd; +Window g_embed_wnd; BOOL g_enable_compose = False; static GC g_gc; static BOOL g_gc_initialized = False; @@ -929,6 +930,11 @@ XFree(sizehints); } + if ( g_embed_wnd ) + { + XReparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0); + } + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | VisibilityChangeMask | FocusChangeMask; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410211839.i9LIdi2s043047>