aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-10-10 17:58:56 +0200
committerReinhard Tartler <siretart@tauware.de>2011-10-10 17:58:56 +0200
commit45b970f25634519dac302a5691a7a2d45f8db49f (patch)
treef4d55bce7b5701a154f4f61d64cbcf461312a357 /nx-X11/programs/Xserver/hw/nxagent/Rootless.c
parent22914447019845ba3ba238e5814b59939e744f19 (diff)
downloadnx-libs-45b970f25634519dac302a5691a7a2d45f8db49f.tar.gz
nx-libs-45b970f25634519dac302a5691a7a2d45f8db49f.tar.bz2
nx-libs-45b970f25634519dac302a5691a7a2d45f8db49f.zip
Imported nxagent-3.3.0-6.tar.gznxagent/3.3.0-6
Summary: Imported nxagent-3.3.0-6.tar.gz Keywords: Imported nxagent-3.3.0-6.tar.gz into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Rootless.c64
1 files changed, 14 insertions, 50 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index e192cd2c4..79cb74efa 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -60,27 +60,6 @@ typedef struct
}
nxagentWMHints;
-/*
- * This structure is compatible with 32
- * and 64 bit library interface. It has
- * been copied from Xatomtype.h and it's
- * a parameter of XChangeProperty().
- */
-
-typedef struct
-{
- unsigned long flags;
- long input;
- long initialState;
- unsigned long iconPixmap;
- unsigned long iconWindow;
- long iconX;
- long iconY;
- unsigned long iconMask;
- unsigned long windowGroup;
-}
-nxagentPropWMHints;
-
WindowPtr nxagentRootlessWindow = NULL;
#define TOP_LEVEL_TABLE_UNIT 100
@@ -450,7 +429,6 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
Atom propertyX, typeX;
char *output = NULL;
nxagentWMHints wmHints;
- nxagentPropWMHints propHints;
Bool export = False;
Bool freeMem = False;
@@ -511,22 +489,8 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
wmHints.flags |= InputHint;
wmHints.input = True;
- /*
- * Initialize the structure used in XChangeProperty().
- */
-
- propHints.flags = wmHints.flags;
- propHints.input = (wmHints.input == True ? 1 : 0);
- propHints.initialState = wmHints.initial_state;
- propHints.iconPixmap = wmHints.icon_pixmap;
- propHints.iconWindow = wmHints.icon_window;
- propHints.iconX = wmHints.icon_x;
- propHints.iconY = wmHints.icon_y;
- propHints.iconMask = wmHints.icon_mask;
- propHints.windowGroup = wmHints.window_group;
-
- output = (char*) &propHints;
- export = True;
+ output = (char*) &wmHints;
+ export = True;
if ((wmHints.flags & IconPixmapHint) && (wmHints.icon_pixmap != None))
{
@@ -540,17 +504,17 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
nxagentSynchronizeRegion((DrawablePtr) icon, NullRegion, NEVER_BREAK, NULL);
}
- propHints.iconPixmap = nxagentPixmap(icon);
+ wmHints.icon_pixmap = nxagentPixmap(icon);
}
else
{
- propHints.flags &= ~IconPixmapHint;
+ wmHints.flags &= ~IconPixmapHint;
#ifdef WARNING
fprintf(stderr, "nxagentExportProperty: WARNING! Failed to look up icon pixmap %x from hint "
"exporting property %s type %s on window %p.\n",
(unsigned int) wmHints.icon_pixmap, propertyS, typeS,
- (void *) pWin);
+ (void*)pWin);
#endif
}
}
@@ -562,17 +526,17 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
if (icon)
{
- propHints.iconWindow = nxagentWindow(icon);
+ wmHints.icon_window = nxagentWindow(icon);
}
else
{
- propHints.flags &= ~IconWindowHint;
+ wmHints.flags &= ~IconWindowHint;
#ifdef WARNING
fprintf(stderr, "nxagentExportProperty: WARNING! Failed to look up icon window %x from hint "
"exporting property %s type %s on window %p.\n",
(unsigned int) wmHints.icon_window, propertyS, typeS,
- (void *) pWin);
+ (void*)pWin);
#endif
}
}
@@ -584,17 +548,17 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
if (icon)
{
- propHints.iconMask = nxagentPixmap(icon);
+ wmHints.icon_mask = nxagentPixmap(icon);
}
else
{
- propHints.flags &= ~IconMaskHint;
+ wmHints.flags &= ~IconMaskHint;
#ifdef WARNING
fprintf(stderr, "nxagentExportProperty: WARNING! Failed to look up icon mask %x from hint "
"exporting property %s type %s on window %p.\n",
(unsigned int) wmHints.icon_mask, propertyS, typeS,
- (void *) pWin);
+ (void*)pWin);
#endif
}
}
@@ -606,17 +570,17 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
if (window)
{
- propHints.windowGroup = nxagentWindow(window);
+ wmHints.window_group = nxagentWindow(window);
}
else
{
- propHints.flags &= ~WindowGroupHint;
+ wmHints.flags &= ~WindowGroupHint;
#ifdef WARNING
fprintf(stderr, "nxagentExportProperty: WARNING! Failed to look up window group %x from hint "
"exporting property %s type %s on window %p.\n",
(unsigned int) wmHints.window_group, propertyS, typeS,
- (void *) pWin);
+ (void*)pWin);
#endif
}
}