|
[-]
[+]
|
Changed |
libguac-client-rdp.changes
|
|
|
|
[-]
[+]
|
Changed |
libguac-client-rdp.spec
^
|
|
|
|
[-]
[+]
|
Changed |
libguac-client-rdp-0.6.2.tar.bz2/ChangeLog
^
|
| @@ -1,3 +1,11 @@
+2012-08-31 Laurent Meunier <laurent@deltalima.net>
+
+ * Use configured color depth
+
+2012-08-11 Michael Jumper <zhangmaike@users.sourceforge.net>
+
+ * Fix m4/ autoreconf error
+
2012-05-23 David Pham-Van <d.pham-van@ulteo.com>
* Add SetNull and SetDefault handlers (fixes #148)
|
|
[-]
[+]
|
Changed |
libguac-client-rdp-0.6.2.tar.bz2/configure
^
|
| @@ -2815,7 +2815,7 @@
# Define the identity of the package.
PACKAGE=libguac-client-rdp
- VERSION=0.6.1
+ VERSION=0.6.2
cat >>confdefs.h <<_ACEOF
|
|
[-]
[+]
|
Changed |
libguac-client-rdp-0.6.2.tar.bz2/configure.in
^
|
| @@ -35,7 +35,7 @@
# ***** END LICENSE BLOCK *****
AC_INIT(src/client.c)
-AM_INIT_AUTOMAKE([libguac-client-rdp], 0.6.1)
+AM_INIT_AUTOMAKE([libguac-client-rdp], 0.6.2)
AC_CONFIG_MACRO_DIR([m4])
# Checks for programs.
|
|
[-]
[+]
|
Changed |
libguac-client-rdp-0.6.2.tar.bz2/include/client.h
^
|
| @@ -51,6 +51,21 @@
#define RDP_DEFAULT_PORT 3389
/**
+ * Default screen width, in pixels.
+ */
+#define RDP_DEFAULT_WIDTH 1024
+
+/**
+ * Default screen height, in pixels.
+ */
+#define RDP_DEFAULT_HEIGHT 768
+
+/**
+ * Default color depth, in bits.
+ */
+#define RDP_DEFAULT_DEPTH 16
+
+/**
* Client data that will remain accessible through the guac_client.
* This should generally include data commonly used by Guacamole handlers.
*/
|
|
[-]
[+]
|
Changed |
libguac-client-rdp-0.6.2.tar.bz2/src/client.c
^
|
| @@ -22,6 +22,7 @@
* Contributor(s):
* Matt Hortman
* David PHAM-VAN <d.pham-van@ulteo.com> Ulteo SAS - http://www.ulteo.com
+ * Laurent Meunier <laurent@deltalima.net>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -321,19 +322,31 @@
settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- /* session width */
- settings->width = 1024;
+ /* Session width */
+ settings->width = RDP_DEFAULT_WIDTH;
if (argv[IDX_WIDTH][0] != '\0')
settings->width = atoi(argv[IDX_WIDTH]);
- if (settings->width == 0)
- settings->width = 1024;
- /* session height */
- settings->height = 768;
+ /* Use default width if given width is invalid. */
+ if (settings->width == 0) {
+ settings->width = RDP_DEFAULT_WIDTH;
+ guac_client_log_error(client,
+ "Invalid width: \"%s\". Using default of %i.",
+ argv[IDX_WIDTH], settings->width);
+ }
+
+ /* Session height */
+ settings->height = RDP_DEFAULT_HEIGHT;
if (argv[IDX_HEIGHT][0] != '\0')
settings->height = atoi(argv[IDX_HEIGHT]);
- if (settings->height == 0)
- settings->height = 768;
+
+ /* Use default height if given height is invalid. */
+ if (settings->height == 0) {
+ settings->height = RDP_DEFAULT_HEIGHT;
+ guac_client_log_error(client,
+ "Invalid height: \"%s\". Using default of %i.",
+ argv[IDX_WIDTH], settings->height);
+ }
/* Set hostname */
settings->hostname = strdup(hostname);
@@ -358,6 +371,19 @@
if (argv[IDX_INITIAL_PROGRAM][0] != '\0')
settings->shell = strdup(argv[IDX_INITIAL_PROGRAM]);
+ /* Session color depth */
+ settings->color_depth = RDP_DEFAULT_DEPTH;
+ if (argv[IDX_COLOR_DEPTH][0] != '\0')
+ settings->color_depth = atoi(argv[IDX_COLOR_DEPTH]);
+
+ /* Use default depth if given depth is invalid. */
+ if (settings->color_depth == 0) {
+ settings->color_depth = RDP_DEFAULT_DEPTH;
+ guac_client_log_error(client,
+ "Invalid color-depth: \"%s\". Using default of %i.",
+ argv[IDX_WIDTH], settings->color_depth);
+ }
+
/* Order support */
bitmap_cache = settings->bitmap_cache;
settings->os_major_type = OSMAJORTYPE_UNSPECIFIED;
|
