Grouped XLib Window members in dockapp structure

[dockapps/wmnotify.git] / src / dockapp.h

diff --git a/src/dockapp.h b/src/dockapp.h
index 32c44ae..07573de 100644 (file)
--- a/src/dockapp.h
+++ b/src/dockapp.h
@@ -23,36 +23,34 @@
 
 #include <X11/xpm.h>
 
-typedef struct XpmIcon
-{
-  XpmAttributes attributes;
-  Pixmap shapemask;
-  Pixmap image;
-} XpmIcon;
+struct XpmIcon {
+       XpmAttributes attributes;
+       Pixmap shapemask;
+       Pixmap image;
+};
 
-typedef struct dockapp_t
-{
-  Display *display;
-  Window  root_win;
-  int     screen;
-  int     d_depth;
-  Pixel   back_pix;
-  Pixel   fore_pix;
-  Window  iconwin;
-  Window  win;
-  GC      NormalGC;
-  XpmIcon xpm_icon;
-} dockapp_t;
+struct dockapp_t {
+       Display *display;
+       Window root_win;
+       Window win;
+       Window iconwin;
+       int screen;
+       int d_depth;
+       Pixel back_pix;
+       Pixel fore_pix;
+       GC NormalGC;
+       struct XpmIcon xpm_icon;
+};
 
 void
-InitDockAppWindow( int argc, char *argv[], char *pixmap_data[],
-                  char *display_arg, char *geometry_arg );
+InitDockAppWindow(int argc, char *argv[], char *pixmap_data[],
+                 char *display_arg, char *geometry_arg);
 
-void
-RedrawWindow( void );
+void RedrawWindow(void);
 
 void
-copyXPMArea( int x, int y, unsigned int sx, unsigned int sy, int dx, int dy );
+copyXPMArea(int x, int y, unsigned int sx, unsigned int sy, int dx,
+           int dy);
 
 /* Exported variables */
 #undef _SCOPE_
@@ -62,6 +60,6 @@ copyXPMArea( int x, int y, unsigned int sx, unsigned int sy, int dx, int dy );
 #define _SCOPE_ extern
 #endif
 
-_SCOPE_ dockapp_t dockapp;
+_SCOPE_ struct dockapp_t dockapp;
 
-#endif /* DOCKAPP_H */
+#endif                         /* DOCKAPP_H */