resolution set: remove references to old "guest dict" code.

In the process, re-organize the headers a little bit to avoid duplication
of code and definitions.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolution.h b/open-vm-tools/services/plugins/resolutionSet/resolution.h
deleted file mode 100644 (file)
index f72534a..0000000
--- a/open-vm-tools/services/plugins/resolutionSet/resolution.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*********************************************************
- * Copyright (C) 2008 VMware, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation version 2.1 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
- *
- *********************************************************/
-
-/*
- * resolution.h --
- *
- *    Library for the guest resolution and topology fit/resize capabilities.
- *    This library handles its own RPC callbacks, and it's intended to more
- *    or less operate independently of the client application.
- *
- *    Client applications are expected to do (roughly) the following:
- *      // Init library.
- *      Resolution_Init();
- *
- *      // Register RpcIn callbacks.
- *      Resolution_InitBackdoor();
- *
- *      // Call this in response to getting a/ capreg message from the host.
- *      Resolution_RegisterCaps();
- *
- *      // Call this when you're finished with the library and wish to reclaim
- *      // resources.
- *      Resolution_Cleanup();
- *
- *    In response to a TCLO reset or to otherwise (temporarily) disable the
- *    library, one can also call Resolution_UnregisterCaps().  (This routine
- *    is also called implicitly by Resolution_Cleanup().)
- */
-
-#ifndef _LIB_RESOLUTION_H_
-#define _LIB_RESOLUTION_H_
-
-#define INCLUDE_ALLOW_USERLEVEL
-#define INCLUDE_ALLOW_DISTRIBUTE
-#include "includeCheck.h"
-
-#include "vmware.h"
-
-
-/*
- * Data types
- */
-
-/*
- * Argument to be passed to Resolution_Init().  Users of the X11 backend
- * should provide a Display *.  Not sure what users of Mac OS X will need
- * to provide, if anything.
- */
-#if defined(RESOLUTION_X11)
-#   include <X11/Xlib.h>
-#   undef Bool
-typedef Display *       InitHandle;
-
-#elif defined(__APPLE__) || defined(RESOLUTION_WIN32)
-typedef void *          InitHandle;
-#else
-#   error Unknown display backend
-#endif
-
-/*
- * Arguments to VMwareResolutionSet.exe
- */
-#define RESOLUTION_SET_APP_NAME "VMwareResolutionSet.exe"
-typedef enum {
-   RESOLUTION_SET_NORESET   = 0,
-   RESOLUTION_SET_RESET     = 1,
-   RESOLUTION_SET_ARBITRARY = 2,
-} ResolutionSetDisplayReset;
-
-
-/*
- * Global functions
- */
-
-#if !defined(VMTOOLS_USE_GLIB)
-
-#include "rpcin.h"
-
-Bool Resolution_Init(const char *tcloChannel, InitHandle handle);
-void Resolution_Cleanup(void);
-
-void Resolution_InitBackdoor(RpcIn *rpcIn);
-void Resolution_CleanupBackdoor(void);
-
-Bool Resolution_RegisterCaps(void);
-Bool Resolution_UnregisterCaps(void);
-
-#endif
-
-#endif // ifndef _LIB_RESOLUTION_H_

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h b/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h
index d7b2998c45587161ff08a9e2b26c8c45c97dd524..a69abaf9029748be29e2d2a99b1d49a72c71a6ea 100644 (file)
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionInt.h
@@ -28,13 +28,20 @@
 #define INCLUDE_ALLOW_USERLEVEL
 #define INCLUDE_ALLOW_DISTRIBUTE
 #include "includeCheck.h"
+#include "vmware.h"
 
-#include "resolution.h"
-
-/*
- * Data types
- */
+#if defined(_WIN32)
+#  include "resolutionWinCommon.h"
+#endif
 
+#if defined(RESOLUTION_X11)
+#  include <X11/Xlib.h>
+typedef Display *       InitHandle;
+#elif defined(__APPLE__) || defined(RESOLUTION_WIN32)
+typedef void *          InitHandle;
+#else
+#  error Unknown display backend
+#endif
 
 /*
  * Describes internal state of the resolution library.  I.e., tracks whether
@@ -46,10 +53,12 @@ typedef struct {
    Bool canSetTopology;                 // TRUE if back-end supports DisplayTopology_Set.
 } ResolutionInfoType;
 
-
+#if !defined(_WIN32)
 /*
  * Describes the size and offset of a display.  An array of these
- * structures describes the entire topology of the guest desktop
+ * structures describes the entire topology of the guest desktop.
+ *
+ * XXX: For Win32, this is already defined in resolutionWinCommon.h.
  */
 typedef struct {
    int x;
@@ -57,7 +66,7 @@ typedef struct {
    int width;
    int height;
 } DisplayTopologyInfo;
-
+#endif
 
 /*
  * Global variables

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c
index 315fad88b8214cf9a32454aa7e86ab875f6d30a1..86041a21b2674f7ae54c0029305decbcb8695560 100644 (file)
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionRandR12.c
@@ -62,24 +62,17 @@
 
 #ifndef NO_MULTIMON
 
+#include "resolutionInt.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include "resolutionInt.h"
-#include "resolutionRandR12.h"
-#include <X11/extensions/Xrandr.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/extensions/panoramiXproto.h>
+#include <X11/extensions/Xrandr.h>
 
-#include <X11/Xlib.h>
-#undef Bool
-
-#include "vmware.h"
-#include "resolution.h"
-#include "debug.h"
-
+#include "resolutionRandR12.h"
 #include "str.h"
 #include "strutil.h"
 #include "util.h"

diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c b/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c
index 67c2c14fb7506a0fcdadbcbd207f65676470e726..50a1a27634e5b9936b7c3da500bdf3ca523f40ec 100644 (file)
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionX11.c
@@ -29,20 +29,14 @@
 #include "resolutionInt.h"
 #include "resolutionRandR12.h"
 
-#include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #ifndef NO_MULTIMON
 #include <X11/extensions/Xinerama.h>
 #endif
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#undef Bool
 
 #include "vmware.h"
-
-#include "resolution.h"
-
 #include "debug.h"
 #include "fileIO.h"
 #include "libvmwarectrl.h"