aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Options.h194
1 files changed, 57 insertions, 137 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index 02e1890b3..d791d2294 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -94,346 +94,267 @@ typedef enum _KeycodeConversion
typedef struct _AgentOptions
{
/*
- * Link type of the NX connection or none,
- * if this is a direct X11 connection.
+ * Link type of the NX connection or none, if this is a direct X11
+ * connection.
*/
-
int LinkType;
/*
- * Is agent running in desktop mode? This
- * is presently the default.
+ * Is agent running in desktop mode? This is presently the default.
*/
-
int Desktop;
/*
* True if user activated rootless mode.
*/
-
int Rootless;
/*
* True for shadow mode.
*/
-
int Shadow;
/*
* True if user activated persistent mode.
*/
-
int Persistent;
/*
* True if user activated fullscreen mode.
*/
-
int Fullscreen;
/*
- * True if the fullscreen NX session will
- * extend on all available screens.
+ * True if the fullscreen NX session will extend on all available
+ * screens.
*/
-
int AllScreens;
/*
- * Set to the auto-disconnect timeout, if
- * the user activated this feature.
+ * Set to the auto-disconnect timeout, if the user activated this
+ * feature.
*/
-
int Timeout;
/*
* Geometry of the agent's window.
*/
-
- int X;
- int Y;
- int Width;
- int Height;
+ int X, Y, Width, Height;
int BorderWidth;
/*
- * Geometry of the agent's window in window
- * mode. Used to restore window size when
- * switching back to window mode from full-
- * screen.
+ * Geometry of the agent's window in window mode. Used to restore
+ * window size when switching back to window mode from fullscreen.
*/
-
int WMBorderWidth;
int WMTitleHeight;
- int SavedX;
- int SavedY;
- int SavedWidth;
- int SavedHeight;
+ int SavedX, SavedY, SavedWidth, SavedHeight;
- int SavedRootWidth;
- int SavedRootHeight;
+ int SavedRootWidth, SavedRootHeight;
/*
- * Set if agent is running nested in another
- * agent X server.
+ * Set if agent is running nested in another agent X server.
*/
-
int Nested;
/*
* Selected backing-store mode.
*/
-
BackingStoreMode BackingStore;
/*
* Selected clipboard mode.
*/
-
ClipboardMode Clipboard;
/*
- * Enable agent to use the MITSHM extension in
- * path from remote proxy to the real X server.
+ * Enable agent to use the MITSHM extension in path from remote
+ * proxy to the real X server.
*/
-
int SharedMemory;
/*
* Enable agent to use shared Pixmaps
*/
-
int SharedPixmaps;
/*
- * Enable agent to propagate keyboard and pointer
- * device configuration to the remote X server.
+ * Enable agent to propagate keyboard and pointer device
+ * configuration to the remote X server.
*/
-
int DeviceControl;
/*
* Explicitly asked config propagation.
*/
-
int DeviceControlUserDefined;
/*
- * Resuming keyboard device corrects keymap if session
- * migrates across platforms with different keycode
- * layout.
+ * Resuming keyboard device corrects keymap if session migrates
+ * across platforms with different keycode layout.
*/
-
int ResetKeyboardAtResume;
/*
* Reset server when the last client disconnects.
*/
-
int Reset;
/*
- * Geometry of the agent root window, relative to
- * the agent default window.
+ * Geometry of the agent root window, relative to the agent default
+ * window.
*/
-
- int RootX;
- int RootY;
- int RootWidth;
- int RootHeight;
+ int RootX, RootY, RootWidth, RootHeight;
/*
- * Horizontal and vertical span of the
- * agent viewport.
+ * Horizontal and vertical span of the agent viewport.
*/
-
- int ViewportXSpan;
- int ViewportYSpan;
+ int ViewportXSpan, ViewportYSpan;
/*
- * True if the user can resize the desktop
- * by dragging the window border.
+ * True if the user can resize the desktop by dragging the window
+ * border.
*/
-
int DesktopResize;
/*
* The scaling ratio of the shadow agent.
*/
+ int Ratio, XRatio, YRatio;
- int Ratio;
-
- int XRatio;
-
- int YRatio;
-
- float FloatRatio;
-
- float FloatXRatio;
-
- float FloatYRatio;
+ float FloatRatio, FloatXRatio, FloatYRatio;
/*
* The shadow agent uses the Damage extension.
*/
-
int UseDamage;
/*
* Was the agent run with the -B option?
*/
-
int Binder;
-
char *BinderOptions;
/*
- * Set if the agent has to connect to a
- * desktop manager to start the session.
+ * Set if the agent has to connect to a desktop manager to start the
+ * session.
*/
-
int Xdmcp;
/*
- * Size of the Xlib display buffer. The
- * default is set according to the link
- * type.
+ * Size of the Xlib display buffer. The default is set according to
+ * the link type.
*/
-
int DisplayBuffer;
/*
* Buffer coalescence timeout.
*/
-
int DisplayCoalescence;
/*
- * Use the composite extension when
- * available on the remote display.
+ * Use the composite extension when available on the remote display.
*/
-
int Composite;
/*
- * If set, don't skip internal operations
- * when the agent window is not fully visible.
+ * If set, don't skip internal operations when the agent window is
+ * not fully visible.
*/
-
int IgnoreVisibility;
/*
- * If set, prevent the shadow session to
- * interact with master display.
+ * If set, prevent the shadow session to interact with master
+ * display.
*/
-
int ViewOnly;
/*
- * If true select a lossy or lossless comp-
- * ression method based on the characterist-
- * ics of the image.
+ * If true select a lossy or lossless compression method based on
+ * the characteristics of the image.
*/
-
int Adaptive;
/*
- * Stream the images and update the display
- * when the image has been completely trans-
- * ferred.
+ * Stream the images and update the display when the image has been
+ * completely transerred.
*/
-
int Streaming;
/*
- * Use a lazy approach in updating the remote
- * display. This means delaying the bandwidth
- * consuming graphic operations and synchroniz-
- * ing the screen at idle time.
+ * Use a lazy approach in updating the remote display. This means
+ * delaying the bandwidth consuming graphic operations and
+ * synchronizing the screen at idle time.
*/
-
int DeferLevel;
/*
- * Maximum elapsed time before a new full
- * synchronization.
+ * Maximum elapsed time before a new full synchronization.
*/
-
unsigned long DeferTimeout;
/*
- * Maximum size of the tile used when sending
- * an image to the remote display.
+ * Maximum size of the tile used when sending an image to the remote
+ * display.
*/
-
- int TileWidth;
- int TileHeight;
+ int TileWidth, TileHeight;
/*
* Enabling/disabling the pulldown menu.
*/
-
int Menu;
/*
* Enabling/disabling the magic pixel.
*/
-
int MagicPixel;
/*
* Specify the Operative System of the client.
*/
-
int ClientOs;
/*
* Inhibit some XKEYBOARD requests.
*/
-
int InhibitXkb;
/*
- * Maximum number of bytes that can be pasted from
- * an NX session into an external application.
+ * Maximum number of bytes that can be pasted from an NX session
+ * into an external application.
*/
-
int CopyBufferSize;
/*
* Max image data rate to the encoder input.
*/
-
int ImageRateLimit;
/*
- * True if agent should not exit if there are no
- * clients in rootless mode
+ * True if agent should not exit if there are no clients in rootless
+ * mode
*/
-
int NoRootlessExit;
/*
* Store if the user wants Xinerama. There are variables called
* noPanoramiXExtension and noRRXineramaExtensison in os/utils.c but
* we cannot rely on them because RandR and PanoramiX change their
- * values when trying to initialize. So we use this variable to
- * save the user preference provided by the -/+(rr)xinerama parameter(s)
+ * values when trying to initialize. So we use this variable to save
+ * the user preference provided by the -/+(rr)xinerama parameter(s)
* before initializing those extensions.
*/
-
int Xinerama;
/*
* Sleep delay in microseconds.
*/
-
unsigned int SleepTime;
/*
* Tolerance - tightens or loosens reconnect checks.
*/
-
ToleranceChecksMode ReconnectTolerance;
/*
@@ -473,8 +394,7 @@ extern AgentOptionsPtr nxagentOptionsPtr;
extern void nxagentInitOptions(void);
/*
- * Initialize some options to the default values
- * at reconnection.
+ * Initialize some options to the default values at reconnection.
*/
extern void nxagentResetOptions(void);
@@ -486,8 +406,8 @@ extern void nxagentResetOptions(void);
extern void nxagentSaveOptions(void);
/*
- * Restore the options reset by nxagentResetOptions
- * to their backup value.
+ * Restore the options reset by nxagentResetOptions to their backup
+ * value.
*/
extern void nxagentRestoreOptions(void);