Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h Makefile.am aclass.c alert.c areas.c arrange.c 
        backgrounds.c borders.c buttons.c comms.c coords.c cursors.c 
        desktops.c dialog.c dock.c draw.c ecompmgr.c econfig.c edge.c 
        emodule.c eobj.c events.c ewin-ops.c ewins.c ewmh.c 
        extinitwin.c finders.c focus.c fx.c gnome.c groups.c 
        handlers.c hints.c icccm.c iclass.c iconify.c icons.c ipc.c 
        main.c menus-misc.c menus.c misc.c mod-misc.c mod-trans.c 
        moveresize.c mwm.c pager.c progress.c screen.c session.c 
        setup.c size.c slideout.c snaps.c sound.c stacking.c startup.c 
        tclass.c text.c theme.c tooltips.c ttfont.c warp.c 
        windowmatch.c x.c zoom.c 
Added Files:
        eobj.h ewins.h xwin.h 


Log Message:
Split up E.h a bit.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -3 -r1.470 -r1.471
--- E.h 16 Jul 2005 16:35:38 -0000      1.470
+++ E.h 16 Jul 2005 16:57:32 -0000      1.471
@@ -157,6 +157,8 @@
 #define N_(String) (String)
 #endif
 
+#include "eobj.h"
+
 #ifndef MAX
 #define MAX(a,b)  ((a)>(b)?(a):(b))
 #endif
@@ -322,7 +324,6 @@
  * Types
  */
 
-typedef struct _eobj EObj;
 typedef struct _ewin EWin;
 typedef struct _menu Menu;
 typedef struct _menuitem MenuItem;
@@ -484,78 +485,6 @@
    unsigned int        ref_count;
 };
 
-struct _eobj
-{
-   Window              win;    /* The top level window */
-   short               type;   /* Ewin, button, other, ... */
-   short               ilayer; /* Internal stacking layer */
-   short               layer;  /* Stacking layer */
-   short               desk;   /* Belongs on desk */
-   int                 x, y;
-   int                 w, h;
-   signed char         stacked;
-   char                sticky;
-   char                floating;
-   char                shown;
-   char                gone;
-#if USE_COMPOSITE
-   char                shadow; /* Enable shadows */
-   unsigned int        opacity;
-   void               *cmhook;
-#endif
-   char               *name;
-};
-
-#define EOBJ_TYPE_EWIN      0
-#define EOBJ_TYPE_BUTTON    1
-#define EOBJ_TYPE_DESK      2
-#define EOBJ_TYPE_MISC      3
-#define EOBJ_TYPE_EVENT     4
-#define EOBJ_TYPE_EXT       5
-
-#define EoObj(eo)               (&((eo)->o))
-#define EoGetWin(eo)            ((eo)->o.win)
-#define EoGetName(eo)           ((eo)->o.name)
-#define EoGetType(eo)           ((eo)->o.type)
-#define EoGetX(eo)              ((eo)->o.x)
-#define EoGetY(eo)              ((eo)->o.y)
-#define EoGetW(eo)              ((eo)->o.w)
-#define EoGetH(eo)              ((eo)->o.h)
-#define EoIsSticky(eo)          ((eo)->o.sticky)
-#define EoIsFloating(eo)        ((eo)->o.floating)
-#define EoIsShown(eo)           ((eo)->o.shown)
-#define EoGetDesk(eo)           ((eo)->o.desk)
-#define EoGetLayer(eo)          ((eo)->o.layer)
-#define EoGetPixmap(eo)         EobjGetPixmap(EoObj(eo))
-
-#define EoSetName(eo, _x)       (eo)->o.name = (_x)
-#define EoSetSticky(eo, _x)     (eo)->o.sticky = ((_x)?1:0)
-#define EoSetFloating(eo, _f)   EobjSetFloating(EoObj(eo), (_f))
-#define EoSetDesk(eo, _d)       EobjSetDesk(EoObj(eo), (_d))
-#define EoSetLayer(eo, _l)      EobjSetLayer(EoObj(eo), (_l))
-#if USE_COMPOSITE
-#define EoSetOpacity(eo, _o)    (eo)->o.opacity = (_o)
-#define EoGetOpacity(eo)        ((eo)->o.opacity)
-#define EoChangeOpacity(eo, _o) EobjChangeOpacity(EoObj(eo), _o)
-#define EoSetShadow(eo, _x)     (eo)->o.shadow = (_x)
-#define EoGetShadow(eo)         ((eo)->o.shadow)
-#else
-#define EoSetOpacity(eo, _o)
-#define EoChangeOpacity(eo, _o)
-#define EoSetShadow(eo, _x)
-#define EoGetShadow(eo)         0
-#endif
-
-#define EoMap(eo, raise)                EobjMap(EoObj(eo), raise)
-#define EoUnmap(eo)                     EobjUnmap(EoObj(eo))
-#define EoMove(eo, x, y)                EobjMove(EoObj(eo), x, y)
-#define EoResize(eo, w, h)              EobjResize(EoObj(eo), w, h)
-#define EoMoveResize(eo, x, y, w, h)    EobjMoveResize(EoObj(eo), x, y, w, h)
-#define EoReparent(eo, d, x, y)         EobjReparent(EoObj(eo), d, x, y)
-#define EoRaise(eo)                     EobjRaise(EoObj(eo))
-#define EoLower(eo)                     EobjLower(EoObj(eo))
-#define EoChangeShape(eo)               EobjChangeShape(EoObj(eo))
-
 typedef struct
 {
    EObj                o;
@@ -637,181 +566,6 @@
 }
 EWinBit;
 
-typedef struct _winclient
-{
-   Window              win;
-   int                 x, y, w, h, bw;
-   Colormap            cmap;
-   Window              icon_win;
-   Pixmap              icon_pmap, icon_mask;
-   Window              group;
-   Window              client_leader;
-   char                start_iconified;
-   char                need_input;
-   char                urgency;
-   char                take_focus;
-   char                delete_window;
-   signed char         transient;
-   Window              transient_for;
-   char                is_group_leader;
-   char                no_resize_h;
-   char                no_resize_v;
-   Constraints         width, height;
-   int                 base_w, base_h;
-   int                 w_inc, h_inc;
-   int                 grav;
-   double              aspect_min, aspect_max;
-   long                event_mask;
-}
-WinClient;
-
-#define EWIN_STATE_NEW          0      /* New */
-#define EWIN_STATE_STARTUP      1      /* New - during startup */
-#define EWIN_STATE_WITHDRAWN    2
-#define EWIN_STATE_ICONIC       3
-#define EWIN_STATE_MAPPED       4
-
-#define EWIN_TYPE_NORMAL        0x00
-#define EWIN_TYPE_DIALOG        0x01
-#define EWIN_TYPE_MENU          0x02
-#define EWIN_TYPE_ICONBOX       0x04
-#define EWIN_TYPE_PAGER         0x08
-
-#define EwinIsMapped(ewin) (ewin->state.state >= EWIN_STATE_MAPPED)
-#define EwinIsInternal(ewin) (ewin->type != EWIN_TYPE_NORMAL)
-
-struct _ewin
-{
-   EObj                o;
-   char                type;
-   int                 vx, vy; /* Position in virtual root */
-   int                 lx, ly; /* Last pos */
-   int                 lw, lh; /* Last size */
-   int                 ll;     /* Last layer */
-   char                toggle;
-   Window              win_container;
-   WinClient           client;
-   const Border       *border;
-   const Border       *normal_border;
-   const Border       *previous_border;
-   EWinBit            *bits;
-   struct
-   {
-      char                state;
-      char                shaped;
-      char                docked;
-      char                visibility;
-      char                iconified;
-      char                shaded;
-      char                active;
-
-      unsigned            placed:1;
-      unsigned            maximized_horz:1;
-      unsigned            maximized_vert:1;
-      unsigned            fullscreen:1;
-      unsigned            showingdesk:1;       /* Iconified by show desktop */
-      unsigned            attention:1;
-      unsigned            animated:1;
-
-      /* Derived state flags. Change only in EwinStateUpdate() */
-      unsigned            no_border:1;
-
-      unsigned            inhibit_move:1;
-      unsigned            inhibit_resize:1;
-      unsigned            inhibit_iconify:1;
-      unsigned            inhibit_shade:1;
-      unsigned            inhibit_stick:1;
-      unsigned            inhibit_max_hor:1;
-      unsigned            inhibit_max_ver:1;
-      unsigned            inhibit_fullscreeen:1;
-      unsigned            inhibit_change_desk:1;
-      unsigned            inhibit_close:1;
-
-      unsigned            inhibit_actions:1;
-      unsigned            inhibit_focus:1;
-   } state;
-   struct
-   {
-      char                fixedpos;
-      char                never_use_area;
-      char                ignorearrange;
-      char                skip_ext_task;
-      char                skip_ext_pager;
-      char                skip_focuslist;
-      char                skip_winlist;
-      char                focusclick;  /* Click to focus */
-      char                never_focus; /* Never focus */
-      char                no_button_grabs;
-      char                no_actions;
-      unsigned            donthide:1;  /* Don't hide on show desktop */
-      unsigned            vroot:1;     /* Virtual root window */
-      unsigned            autosave:1;
-      unsigned            no_border:1; /* Never apply border */
-      unsigned            never_iconify:1;     /* Never iconify */
-   } props;
-   struct
-   {
-      char               *wm_name;
-      char               *wm_icon_name;
-      char               *wm_res_name;
-      char               *wm_res_class;
-      char               *wm_role;
-      char               *wm_command;
-      char               *wm_machine;
-   } icccm;
-   struct
-   {
-      unsigned            valid:1;
-      unsigned            decor_border:1;
-      unsigned            decor_resizeh:1;
-      unsigned            decor_title:1;
-      unsigned            decor_menu:1;
-      unsigned            decor_minimize:1;
-      unsigned            decor_maximize:1;
-      unsigned            func_resize:1;
-      unsigned            func_move:1;
-      unsigned            func_minimize:1;
-      unsigned            func_maximize:1;
-      unsigned            func_close:1;
-   } mwm;
-   struct
-   {
-      char               *wm_name;
-      char               *wm_icon_name;
-      unsigned int       *wm_icon, wm_icon_len;
-      unsigned int        opacity;
-   } ewmh;
-   struct
-   {
-      int                 left, right, top, bottom;
-   } strut;
-   struct
-   {
-      char                shape;
-      char                border;
-   } update;
-
-   int                 num_groups;
-   Group             **groups;
-   int                 area_x, area_y;
-   char               *session_id;
-   int                 has_transients;
-   PmapMask            mini_pmm;
-   int                 mini_w, mini_h;
-
-   int                 shape_x, shape_y, shape_w, shape_h;
-   int                 req_x, req_y;
-
-   Snapshot           *snap;
-   int                 head;   /* Unused? */
-
-   void               *data;   /* Data hook for internal windows */
-   void                (*Layout) (EWin * ewin, int *px, int *py, int *pw,
-                                 int *ph);
-   void                (*MoveResize) (EWin * ewin, int resize);
-   void                (*Close) (EWin * ewin);
-};
-
 typedef struct _groupconfig
 {
    char                iconify;
@@ -1516,45 +1270,6 @@
 void                EdgeWindowsShow(void);
 void                EdgeWindowsHide(void);
 
-/* eobj.c */
-void                EobjInit(EObj * eo, int type, Window win, int x, int y,
-                            int w, int h, int su, const char *name);
-void                EobjFini(EObj * eo);
-void                EobjDestroy(EObj * eo);
-EObj               *EobjWindowCreate(int type, int x, int y, int w, int h,
-                                    int su, const char *name);
-void                EobjWindowDestroy(EObj * eo);
-
-EObj               *EobjRegister(Window win, int type);
-void                EobjUnregister(EObj * eo);
-void                EobjMap(EObj * eo, int raise);
-void                EobjUnmap(EObj * eo);
-void                EobjMove(EObj * eo, int x, int y);
-void                EobjResize(EObj * eo, int w, int h);
-void                EobjMoveResize(EObj * eo, int x, int y, int w, int h);
-void                EobjReparent(EObj * eo, EObj * dst, int x, int y);
-int                 EobjRaise(EObj * eo);
-int                 EobjLower(EObj * eo);
-void                EobjChangeShape(EObj * eo);
-void                EobjsRepaint(void);
-Pixmap              EobjGetPixmap(const EObj * eo);
-
-#if USE_COMPOSITE
-void                EobjChangeOpacity(EObj * eo, unsigned int opacity);
-#else
-#define             EobjChangeOpacity(eo, opacity)
-#endif
-void                EobjSetDesk(EObj * eo, int desk);
-void                EobjSetLayer(EObj * eo, int layer);
-void                EobjSetFloating(EObj * eo, int floating);
-int                 EobjIsShaped(const EObj * eo);
-void                EobjSlideTo(EObj * eo, int fx, int fy, int tx, int ty,
-                               int speed);
-void                EobjsSlideBy(EObj ** peo, int num, int dx, int dy,
-                                int speed);
-void                EobjSlideSizeTo(EObj * eo, int fx, int fy, int tx, int ty,
-                                   int fw, int fh, int tw, int th, int speed);
-
 /* events.c */
 /* Re-mapped X-events */
 #define EX_EVENT_SHAPE_NOTIFY            64
@@ -1592,95 +1307,6 @@
 void                EventDebugInit(const char *s);
 void                EventShow(const XEvent * ev);
 
-/* ewins.c */
-#define EWIN_CHANGE_NAME        (1<<0)
-#define EWIN_CHANGE_ICON_NAME   (1<<1)
-#define EWIN_CHANGE_ICON_PMAP   (1<<2)
-#define EWIN_CHANGE_DESKTOP     (1<<3)
-#define EWIN_CHANGE_LAYER       (1<<4)
-#define EWIN_CHANGE_OPACITY     (1<<5)
-#define EWIN_CHANGE_ATTENTION   (1<<6)
-
-void                EwinShapeSet(EWin * ewin);
-void                EwinFloatAt(EWin * ewin, int x, int y);
-void                EwinUnfloatAt(EWin * ewin, int desk, int x, int y);
-void                RaiseEwin(EWin * ewin);
-void                LowerEwin(EWin * ewin);
-void                ShowEwin(EWin * ewin);
-void                HideEwin(EWin * ewin);
-void                DetermineEwinFloat(EWin * ewin, int dx, int dy);
-EWin               *GetEwinPointerInClient(void);
-EWin               *GetEwinByCurrentPointer(void);
-EWin               *GetFocusEwin(void);
-EWin               *GetContextEwin(void);
-void                SetContextEwin(EWin * ewin);
-void                EwinGetPosition(const EWin * ewin, int x, int y, int bw,
-                                   int grav, int *px, int *py);
-void                EwinUpdateShapeInfo(EWin * ewin);
-void                EwinPropagateShapes(EWin * ewin);
-void                EwinStateUpdate(EWin * ewin);
-void                AddToFamily(EWin * ewin, Window win);
-EWin               *AddInternalToFamily(Window win, const char *bname, int 
type,
-                                       void *ptr,
-                                       void (*init) (EWin * ewin, void *ptr));
-void                EwinReparent(EWin * ewin, Window parent);
-Window              EwinGetClientWin(const EWin * ewin);
-const char         *EwinGetName(const EWin * ewin);
-const char         *EwinGetIconName(const EWin * ewin);
-int                 EwinIsOnScreen(EWin * ewin);
-void                EwinRememberPositionSet(EWin * ewin);
-void                EwinRememberPositionGet(EWin * ewin, int *px, int *py);
-
-void                EwinChange(EWin * ewin, unsigned int flag);
-
-void                EwinsEventsConfigure(int mode);
-void                EwinsSetFree(void);
-void                EwinsShowDesktop(int on);
-
-/* ewin-ops.c */
-void                SlideEwinTo(EWin * ewin, int fx, int fy, int tx, int ty,
-                               int speed);
-void                SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx,
-                                int *ty, int num_wins, int speed);
-void                EwinFixPosition(EWin * ewin);
-void                EwinMove(EWin * ewin, int x, int y);
-void                EwinResize(EWin * ewin, int w, int h);
-void                EwinMoveResize(EWin * ewin, int x, int y, int w, int h);
-void                EwinMoveResizeWithGravity(EWin * ewin, int x, int y, int w,
-                                             int h, int grav);
-void                EwinIconify(EWin * ewin);
-void                EwinDeIconify(EWin * ewin);
-void                EwinStick(EWin * ewin);
-void                EwinUnStick(EWin * ewin);
-void                EwinInstantShade(EWin * ewin, int force);
-void                EwinInstantUnShade(EWin * ewin);
-void                EwinShade(EWin * ewin);
-void                EwinUnShade(EWin * ewin);
-void                EwinSetFullscreen(EWin * ewin, int on);
-void                EwinMoveToArea(EWin * ewin, int ax, int ay);
-void                EwinMoveToDesktop(EWin * ewin, int num);
-void                EwinMoveToDesktopAt(EWin * ewin, int num, int x, int y);
-
-unsigned int        OpacityExt(int op);
-void                EwinOpClose(EWin * ewin);
-void                EwinOpKill(EWin * ewin);
-void                EwinOpRaise(EWin * ewin);
-void                EwinOpLower(EWin * ewin);
-void                EwinOpRaiseLower(EWin * ewin);
-void                EwinOpStick(EWin * ewin, int on);
-void                EwinOpSkipLists(EWin * ewin, int skip);
-void                EwinOpSkipTask(EWin * ewin, int skip);
-void                EwinOpSkipFocus(EWin * ewin, int skip);
-void                EwinOpSkipWinlist(EWin * ewin, int skip);
-void                EwinOpNeverFocus(EWin * ewin, int on);
-void                EwinOpIconify(EWin * ewin, int on);
-void                EwinOpShade(EWin * ewin, int on);
-void                EwinOpSetLayer(EWin * ewin, int layer);
-void                EwinOpSetBorder(EWin * ewin, const char *name);
-void                EwinOpSetOpacity(EWin * ewin, int opacity);
-void                EwinOpMoveToDesk(EWin * ewin, int desk);
-void                EwinOpMoveToArea(EWin * ewin, int x, int y);
-
 #if ENABLE_EWMH
 /* ewmh.c */
 void                EWMH_Init(Window win_wm_check);
@@ -2246,108 +1872,6 @@
 const char         *WindowMatchEwinIcon(const EWin * ewin);
 void                WindowMatchEwinOps(EWin * ewin);
 
-/* x.c */
-Display            *EDisplayOpen(const char *dstr, int scr);
-void                EDisplayClose(void);
-void                EDisplayDisconnect(void);
-void                EGrabServer(void);
-void                EUngrabServer(void);
-int                 EServerIsGrabbed(void);
-void                EFlush(void);
-void                ESync(void);
-Time                EGetTimestamp(void);
-
-void                ERegisterWindow(Window win);
-void                EUnregisterWindow(Window win);
-typedef void        (EventCallbackFunc) (XEvent * ev, void *prm);
-void                EventCallbackRegister(Window win, int type,
-                                         EventCallbackFunc * func, void *prm);
-void                EventCallbackUnregister(Window win, int type,
-                                           EventCallbackFunc * func,
-                                           void *prm);
-void                EventCallbacksProcess(XEvent * ev);
-
-Window              ECreateWindow(Window parent, int x, int y, int w, int h,
-                                 int saveunder);
-Window              ECreateVisualWindow(Window parent, int x, int y, int w,
-                                       int h, int saveunder,
-                                       XWindowAttributes * child_attr);
-Window              ECreateEventWindow(Window parent, int x, int y, int w,
-                                      int h);
-Window              ECreateFocusWindow(Window parent, int x, int y, int w,
-                                      int h);
-void                EWindowSync(Window win);
-void                EWindowSetMapped(Window win, int mapped);
-Window              EWindowGetParent(Window win);
-void                ESelectInputAdd(Window win, long mask);
-
-void                EMoveWindow(Window win, int x, int y);
-void                EResizeWindow(Window win, int w, int h);
-void                EMoveResizeWindow(Window win, int x, int y, int w, int h);
-void                EDestroyWindow(Window win);
-void                EMapWindow(Window win);
-void                EMapRaised(Window win);
-void                EUnmapWindow(Window win);
-void                EReparentWindow(Window win, Window parent, int x, int y);
-int                 EGetGeometry(Window win, Window * root_return,
-                                int *x, int *y, int *w, int *h, int *bw,
-                                int *depth);
-void                EConfigureWindow(Window win, unsigned int mask,
-                                    XWindowChanges * wc);
-void                ESetWindowBackgroundPixmap(Window win, Pixmap pmap);
-void                ESetWindowBackground(Window win, int col);
-int                 ETranslateCoordinates(Window src_w, Window dst_w,
-                                         int src_x, int src_y,
-                                         int *dest_x_return,
-                                         int *dest_y_return,
-                                         Window * child_return);
-
-#define ESelectInput(win, mask) XSelectInput(disp, win, mask)
-#define EGetWindowAttributes(win, attr) XGetWindowAttributes(disp, win, attr)
-#define EChangeWindowAttributes(win, mask, attr) XChangeWindowAttributes(disp, 
win, mask, attr)
-#define ERaiseWindow(win) XRaiseWindow(disp, win)
-#define ELowerWindow(win) XLowerWindow(disp, win)
-#define EClearWindow(win) XClearWindow(disp, win)
-#define EClearArea(win, x, y, w, h, exp) XClearArea(disp, win, x, y, w, h, exp)
-#define ECreatePixmap(draw, w, h, dep) XCreatePixmap(disp, draw, w, h, dep)
-#define EFreePixmap(pmap) XFreePixmap(disp, pmap)
-
-void                EShapeCombineMask(Window win, int dest, int x, int y,
-                                     Pixmap pmap, int op);
-void                EShapeCombineMaskTiled(Window win, int dest, int x, int y,
-                                          Pixmap pmap, int op, int w, int h);
-void                EShapeCombineRectangles(Window win, int dest, int x, int y,
-                                           XRectangle * rect, int n_rects,
-                                           int op, int ordering);
-void                EShapeCombineShape(Window win, int dest, int x, int y,
-                                      Window src_win, int src_kind, int op);
-XRectangle         *EShapeGetRectangles(Window win, int dest, int *rn,
-                                       int *ord);
-int                 EShapeCopy(Window dst, Window src);
-void                EShapePropagate(Window win);
-Pixmap              EWindowGetShapePixmap(Window win);
-
-GC                  ECreateGC(Drawable d, unsigned long mask, XGCValues * val);
-int                 EFreeGC(GC gc);
-
-#define EAllocColor(pxc) \
-       XAllocColor(disp, VRoot.cmap, pxc)
-void                ESetColor(XColor * pxc, int r, int g, int b);
-void                EGetColor(const XColor * pxc, int *pr, int *pg, int *pb);
-
-Window              WindowAtXY_0(Window base, int bx, int by, int x, int y);
-Window              WindowAtXY(int x, int y);
-Bool                PointerAt(int *x, int *y);
-void                EDrawableDumpImage(Drawable draw, const char *txt);
-
-/* zoom.c */
-EWin               *GetZoomEWin(void);
-void                ReZoom(EWin * ewin);
-char                InZoom(void);
-char                CanZoom(void);
-void                ZoomInit(void);
-void                Zoom(EWin * ewin);
-
 /*
  * Global vars
  */
@@ -2361,5 +1885,3 @@
 extern EMode        Mode;
 
 #define FILEPATH_LEN_MAX 4096
-
-#include "emodule.h"
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- Makefile.am 25 May 2005 21:42:58 -0000      1.49
+++ Makefile.am 16 Jul 2005 16:57:35 -0000      1.50
@@ -21,10 +21,13 @@
        econfig.h               \
        ecore-e16.h             \
        emodule.h               \
+       eobj.h                  \
+       ewins.h                 \
        ewin-ops.h              \
        icons.h                 \
        snaps.h                 \
        timestamp.h             \
+       xwin.h                  \
        aclass.c                \
        actions.c               \
        alert.c                 \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/aclass.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- aclass.c    8 Jul 2005 16:48:05 -0000       1.17
+++ aclass.c    16 Jul 2005 16:57:35 -0000      1.18
@@ -23,6 +23,8 @@
  */
 #include "E.h"
 #include "conf.h"
+#include "emodule.h"
+#include "ewins.h"
 
 typedef struct _actiontype
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/alert.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- alert.c     3 Apr 2005 13:42:04 -0000       1.44
+++ alert.c     16 Jul 2005 16:57:35 -0000      1.45
@@ -26,6 +26,11 @@
 #define ExTextExtents XmbTextExtents
 #define ExDrawString XmbDrawString
 
+#define ExSetColor(pxc, r, g, b) \
+  do { \
+    (pxc)->red = (r << 8) | r; (pxc)->green = (g << 8) | g; (pxc)->blue = (b 
<< 8) | b; \
+  } while (0)
+
 static void         ShowAlert(char *text);
 
 static char        *TitleText = NULL;
@@ -197,23 +202,23 @@
    colorful = 0;
    if (DefaultDepth(dd, DefaultScreen(dd)) > 4)
      {
-       ESetColor(&xcl, 220, 220, 220);
+       ExSetColor(&xcl, 220, 220, 220);
        if (!XAllocColor(dd, cmap, &xcl))
           goto CN;
        cols[cnum++] = xcl.pixel;
-       ESetColor(&xcl, 160, 160, 160);
+       ExSetColor(&xcl, 160, 160, 160);
        if (!XAllocColor(dd, cmap, &xcl))
           goto CN;
        cols[cnum++] = xcl.pixel;
-       ESetColor(&xcl, 100, 100, 100);
+       ExSetColor(&xcl, 100, 100, 100);
        if (!XAllocColor(dd, cmap, &xcl))
           goto CN;
        cols[cnum++] = xcl.pixel;
-       ESetColor(&xcl, 0, 0, 0);
+       ExSetColor(&xcl, 0, 0, 0);
        if (!XAllocColor(dd, cmap, &xcl))
           goto CN;
        cols[cnum++] = xcl.pixel;
-       ESetColor(&xcl, 255, 255, 255);
+       ExSetColor(&xcl, 255, 255, 255);
        if (!XAllocColor(dd, cmap, &xcl))
           goto CN;
        cols[cnum++] = xcl.pixel;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/areas.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- areas.c     10 Jul 2005 08:31:03 -0000      1.90
+++ areas.c     16 Jul 2005 16:57:35 -0000      1.91
@@ -21,6 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
 
 static int          area_w = 3;
 static int          area_h = 3;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/arrange.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- arrange.c   10 Jul 2005 08:31:03 -0000      1.77
+++ arrange.c   16 Jul 2005 16:57:36 -0000      1.78
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 
 static int
 ArrangeAddToList(int **array, int current_size, int value)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- backgrounds.c       30 Jun 2005 12:50:34 -0000      1.32
+++ backgrounds.c       16 Jul 2005 16:57:38 -0000      1.33
@@ -23,6 +23,8 @@
  */
 #include <time.h>
 #include "E.h"
+#include "emodule.h"
+#include "xwin.h"
 
 typedef struct
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -3 -r1.269 -r1.270
--- borders.c   10 Jul 2005 13:14:15 -0000      1.269
+++ borders.c   16 Jul 2005 16:57:38 -0000      1.270
@@ -22,7 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 #include "snaps.h"
+#include "xwin.h"
 #include <sys/time.h>
 
 #define EWIN_BORDER_PART_EVENT_MASK \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- buttons.c   30 Jun 2005 12:37:25 -0000      1.67
+++ buttons.c   16 Jul 2005 16:57:38 -0000      1.68
@@ -22,6 +22,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "xwin.h"
 
 #define BUTTON_EVENT_MASK \
   (KeyPressMask | KeyReleaseMask | \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- comms.c     16 Jul 2005 15:53:53 -0000      1.71
+++ comms.c     16 Jul 2005 16:57:39 -0000      1.72
@@ -23,6 +23,7 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "xwin.h"
 
 struct _client
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/coords.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- coords.c    7 May 2005 11:19:56 -0000       1.29
+++ coords.c    16 Jul 2005 16:57:39 -0000      1.30
@@ -21,6 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
+#include "xwin.h"
 
 static EObj        *coord_eo = NULL;
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/cursors.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- cursors.c   15 Apr 2005 21:07:44 -0000      1.26
+++ cursors.c   16 Jul 2005 16:57:39 -0000      1.27
@@ -24,6 +24,8 @@
 #include "E.h"
 #include "X11/cursorfont.h"
 #include "conf.h"
+#include "emodule.h"
+#include "xwin.h"
 
 struct _ecursor
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -3 -r1.156 -r1.157
--- desktops.c  11 Jul 2005 18:02:54 -0000      1.156
+++ desktops.c  16 Jul 2005 16:57:39 -0000      1.157
@@ -23,6 +23,9 @@
  */
 #include "E.h"
 #include <time.h>
+#include "emodule.h"
+#include "ewins.h"
+#include "xwin.h"
 
 #define EDESK_EVENT_MASK \
   (ButtonPressMask | ButtonReleaseMask | \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- dialog.c    10 Jul 2005 08:31:07 -0000      1.122
+++ dialog.c    16 Jul 2005 16:57:40 -0000      1.123
@@ -22,6 +22,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
+#include "xwin.h"
 
 typedef struct
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dock.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- dock.c      8 Jul 2005 16:48:05 -0000       1.27
+++ dock.c      16 Jul 2005 16:57:40 -0000      1.28
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 
 static void
 DockappFindEmptySpotFor(EWin * eapp)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- draw.c      10 Jul 2005 08:31:08 -0000      1.78
+++ draw.c      16 Jul 2005 16:57:40 -0000      1.79
@@ -21,6 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
+#include "xwin.h"
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ecompmgr.c  12 Jul 2005 20:59:39 -0000      1.43
+++ ecompmgr.c  16 Jul 2005 16:57:40 -0000      1.44
@@ -30,6 +30,8 @@
 #include "E.h"
 #if USE_COMPOSITE
 #include "ecompmgr.h"
+#include "emodule.h"
+#include "xwin.h"
 
 #include <stdlib.h>
 #include <stdio.h>
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/econfig.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- econfig.c   24 Mar 2005 08:37:27 -0000      1.5
+++ econfig.c   16 Jul 2005 16:57:40 -0000      1.6
@@ -22,6 +22,7 @@
  */
 #include "E.h"
 #include "econfig.h"
+#include "emodule.h"
 #include <ctype.h>
 
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/edge.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edge.c      8 Jul 2005 16:48:06 -0000       1.17
+++ edge.c      16 Jul 2005 16:57:40 -0000      1.18
@@ -22,6 +22,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
+#include "xwin.h"
 
 /* FIXME: Screen resizing not handled. */
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/emodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emodule.c   19 Mar 2005 16:40:01 -0000      1.3
+++ emodule.c   16 Jul 2005 16:57:40 -0000      1.4
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
 
 #if 0                          /* No dynamic registration yet */
 void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- eobj.c      10 Jul 2005 20:16:47 -0000      1.39
+++ eobj.c      16 Jul 2005 16:57:40 -0000      1.40
@@ -23,6 +23,8 @@
 #include "E.h"
 #include "ecompmgr.h"
 #include "ecore-e16.h"
+#include "ewins.h"             /* FIXME - Should not be here */
+#include "xwin.h"
 
 void
 EobjSetDesk(EObj * eo, int desk)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- events.c    30 Jun 2005 12:37:26 -0000      1.94
+++ events.c    16 Jul 2005 16:57:40 -0000      1.95
@@ -22,6 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"             /* FIXME - Should not be here */
+#include "xwin.h"
 #include <errno.h>
 #include <sys/time.h>
 #if USE_XRANDR
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewin-ops.c  10 Jul 2005 13:14:16 -0000      1.54
+++ ewin-ops.c  16 Jul 2005 16:57:40 -0000      1.55
@@ -22,8 +22,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
 #include "ewin-ops.h"
 #include "snaps.h"
+#include "xwin.h"
 #include <math.h>
 #include <sys/time.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- ewins.c     15 Jul 2005 16:48:06 -0000      1.87
+++ ewins.c     16 Jul 2005 16:57:40 -0000      1.88
@@ -23,8 +23,11 @@
  */
 #include "E.h"
 #include "ecompmgr.h"
+#include "emodule.h"
+#include "ewins.h"
 #include "icons.h"
 #include "snaps.h"
+#include "xwin.h"
 #include <sys/time.h>
 
 #define EWIN_TOP_EVENT_MASK \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- ewmh.c      10 Jul 2005 08:31:09 -0000      1.80
+++ ewmh.c      16 Jul 2005 16:57:40 -0000      1.81
@@ -25,6 +25,7 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "ewins.h"
 
 /*
  * _NET_WM_MOVERESIZE client message actions
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/extinitwin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- extinitwin.c        7 May 2005 11:19:57 -0000       1.9
+++ extinitwin.c        16 Jul 2005 16:57:40 -0000      1.10
@@ -23,6 +23,7 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "xwin.h"
 #include <X11/keysym.h>
 #include <sys/time.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/finders.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- finders.c   30 Jun 2005 12:50:42 -0000      1.36
+++ finders.c   16 Jul 2005 16:57:40 -0000      1.37
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 
 EWin               *
 EwinFindByPtr(const EWin * ewin)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- focus.c     13 Jul 2005 19:39:22 -0000      1.110
+++ focus.c     16 Jul 2005 16:57:40 -0000      1.111
@@ -22,6 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
+#include "xwin.h"
 
 #define EwinListFocusRaise(ewin) EobjListFocusRaise(EoObj(ewin))
 #define EwinListFocusLower(ewin) EobjListFocusLower(EoObj(ewin))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- fx.c        29 May 2005 09:34:57 -0000      1.48
+++ fx.c        16 Jul 2005 16:57:40 -0000      1.49
@@ -21,6 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "xwin.h"
 #include <math.h>
 
 /* FIXME - Needs cleaning up */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/gnome.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- gnome.c     8 Jul 2005 16:48:07 -0000       1.51
+++ gnome.c     16 Jul 2005 16:57:41 -0000      1.52
@@ -23,6 +23,8 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "ewins.h"
+#include "xwin.h"
 
 /* WIN_WM_NAME STRING - contains a string identifier for the WM's name */
 #define XA_WIN_WM_NAME                     "_WIN_WM_NAME"
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/groups.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- groups.c    30 Jun 2005 12:50:43 -0000      1.67
+++ groups.c    16 Jul 2005 16:57:41 -0000      1.68
@@ -22,6 +22,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
 #include "snaps.h"
 #include <math.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/handlers.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- handlers.c  4 Jun 2005 08:33:52 -0000       1.48
+++ handlers.c  16 Jul 2005 16:57:41 -0000      1.49
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "xwin.h"
 #include <sys/wait.h>
 #include <signal.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hints.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- hints.c     8 Jul 2005 16:48:07 -0000       1.45
+++ hints.c     16 Jul 2005 16:57:41 -0000      1.46
@@ -25,6 +25,8 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "ewins.h"
+#include "xwin.h"
 
 /*
  * Functions that set X11-properties from E-internals
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- icccm.c     16 Jul 2005 15:53:53 -0000      1.104
+++ icccm.c     16 Jul 2005 16:57:41 -0000      1.105
@@ -23,6 +23,8 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "ewins.h"
+#include "xwin.h"
 
 void
 ICCCM_Init(void)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- iclass.c    30 Jun 2005 12:50:43 -0000      1.69
+++ iclass.c    16 Jul 2005 16:57:41 -0000      1.70
@@ -23,6 +23,8 @@
  */
 #include "E.h"
 #include "conf.h"
+#include "emodule.h"
+#include "xwin.h"
 
 #ifdef ENABLE_THEME_TRANSPARENCY
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- iconify.c   14 Jul 2005 18:03:42 -0000      1.166
+++ iconify.c   16 Jul 2005 16:57:41 -0000      1.167
@@ -23,7 +23,10 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "emodule.h"
+#include "ewins.h"
 #include "icons.h"
+#include "xwin.h"
 #include <math.h>
 
 typedef struct _iconbox Iconbox;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icons.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- icons.c     10 Jul 2005 20:16:47 -0000      1.6
+++ icons.c     16 Jul 2005 16:57:42 -0000      1.7
@@ -22,7 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 #include "icons.h"
+#include "xwin.h"
 
 static int
 NetwmIconFindBestSize(unsigned int *val, unsigned int len, int size)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -3 -r1.221 -r1.222
--- ipc.c       10 Jul 2005 08:31:11 -0000      1.221
+++ ipc.c       16 Jul 2005 16:57:42 -0000      1.222
@@ -21,9 +21,12 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <ctype.h>
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
 #include "ewin-ops.h"
+#include "xwin.h"
+#include <ctype.h>
 
 #define SS(s) ((s) ? (s) : NoText)
 static const char   NoText[] = "-NONE-";
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- main.c      5 Jun 2005 15:15:59 -0000       1.129
+++ main.c      16 Jul 2005 16:57:43 -0000      1.130
@@ -22,7 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
 #include "timestamp.h"
+#include "xwin.h"
 #include <sys/utsname.h>
 #include <signal.h>
 #include <time.h>
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus-misc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- menus-misc.c        16 Jul 2005 15:53:53 -0000      1.14
+++ menus-misc.c        16 Jul 2005 16:57:43 -0000      1.15
@@ -23,6 +23,8 @@
  */
 #include "E.h"
 #include "conf.h"
+#include "ewins.h"
+#include "xwin.h"
 #include <errno.h>
 #include <sys/stat.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- menus.c     10 Jul 2005 08:31:13 -0000      1.204
+++ menus.c     16 Jul 2005 16:57:43 -0000      1.205
@@ -22,6 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
+#include "xwin.h"
 #include <X11/keysym.h>
 
 #define DEBUG_MENU_EVENTS 0
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/misc.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- misc.c      14 May 2005 09:19:54 -0000      1.66
+++ misc.c      16 Jul 2005 16:57:43 -0000      1.67
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "xwin.h"
 #include <sys/time.h>
 #include <time.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mod-misc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- mod-misc.c  11 Jun 2005 13:00:23 -0000      1.19
+++ mod-misc.c  16 Jul 2005 16:57:43 -0000      1.20
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
 
 /***********************************************************************
  * *** should all go elsewhere ***
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mod-trans.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- mod-trans.c 11 Jun 2005 13:00:23 -0000      1.6
+++ mod-trans.c 16 Jul 2005 16:57:43 -0000      1.7
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
 
 #ifdef ENABLE_THEME_TRANSPARENCY
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- moveresize.c        10 Jul 2005 08:31:15 -0000      1.44
+++ moveresize.c        16 Jul 2005 16:57:43 -0000      1.45
@@ -22,6 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
+#include "xwin.h"
 
 static EWin        *mode_moveresize_ewin = NULL;
 static int          move_swapcoord_x = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mwm.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- mwm.c       8 Jul 2005 16:48:09 -0000       1.25
+++ mwm.c       16 Jul 2005 16:57:43 -0000      1.26
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 
 /* Motif window hints */
 #define MWM_HINTS_FUNCTIONS           (1L << 0)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- pager.c     14 Jul 2005 18:05:26 -0000      1.159
+++ pager.c     16 Jul 2005 16:57:43 -0000      1.160
@@ -22,6 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
+#include "xwin.h"
 
 #define DEBUG_PAGER 0
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/progress.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- progress.c  7 May 2005 11:19:59 -0000       1.23
+++ progress.c  16 Jul 2005 16:57:43 -0000      1.24
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "xwin.h"
 
 struct _progressbar
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/screen.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- screen.c    19 Mar 2005 16:40:07 -0000      1.10
+++ screen.c    16 Jul 2005 16:57:43 -0000      1.11
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 
 #ifdef HAS_XINERAMA
 static XineramaScreenInfo *screens = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- session.c   8 Jul 2005 16:48:09 -0000       1.101
+++ session.c   16 Jul 2005 16:57:43 -0000      1.102
@@ -23,6 +23,9 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "emodule.h"
+#include "ewins.h"
+#include "xwin.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- setup.c     4 Jun 2005 08:33:52 -0000       1.164
+++ setup.c     16 Jul 2005 16:57:43 -0000      1.165
@@ -22,6 +22,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
+#include "xwin.h"
 #include <signal.h>
 #include <X11/keysym.h>
 #include <signal.h>
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/size.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- size.c      10 Jul 2005 08:31:15 -0000      1.42
+++ size.c      16 Jul 2005 16:57:43 -0000      1.43
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 
 #define MAX_HOR 0x1
 #define MAX_VER 0x2
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- slideout.c  30 Jun 2005 12:50:47 -0000      1.35
+++ slideout.c  16 Jul 2005 16:57:44 -0000      1.36
@@ -22,6 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
+#include "xwin.h"
 
 typedef struct
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/snaps.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- snaps.c     8 Jul 2005 16:48:18 -0000       1.93
+++ snaps.c     16 Jul 2005 16:57:44 -0000      1.94
@@ -22,7 +22,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 #include "snaps.h"
+#include "xwin.h"
 
 struct _snapshot
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/sound.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- sound.c     19 Mar 2005 16:40:17 -0000      1.31
+++ sound.c     16 Jul 2005 16:57:44 -0000      1.32
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
 
 #ifdef HAVE_LIBESD
 #include <esd.h>
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/stacking.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- stacking.c  23 Apr 2005 07:31:17 -0000      1.21
+++ stacking.c  16 Jul 2005 16:57:44 -0000      1.22
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
 
 #define ENABLE_DEBUG_STACKING 1
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- startup.c   23 Apr 2005 08:07:32 -0000      1.54
+++ startup.c   16 Jul 2005 16:57:44 -0000      1.55
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "xwin.h"
 #include <time.h>
 
 static EObj        *init_win1 = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tclass.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- tclass.c    14 May 2005 19:40:35 -0000      1.33
+++ tclass.c    16 Jul 2005 16:57:44 -0000      1.34
@@ -23,6 +23,8 @@
  */
 #include "E.h"
 #include "conf.h"
+#include "emodule.h"
+#include "xwin.h"
 
 static char        *
 TextstateFontLookup(const char *name)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/text.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- text.c      16 Jul 2005 16:35:39 -0000      1.56
+++ text.c      16 Jul 2005 16:57:44 -0000      1.57
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "xwin.h"
 
 #define ExTextExtents XmbTextExtents
 #define ExDrawString XmbDrawString
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/theme.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- theme.c     16 Jul 2005 16:35:39 -0000      1.50
+++ theme.c     16 Jul 2005 16:57:44 -0000      1.51
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "emodule.h"
 
 #define ENABLE_THEME_SANITY_CHECKING 0
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- tooltips.c  7 May 2005 11:20:00 -0000       1.77
+++ tooltips.c  16 Jul 2005 16:57:44 -0000      1.78
@@ -23,6 +23,9 @@
  */
 #include "E.h"
 #include "conf.h"
+#include "emodule.h"
+#include "ewins.h"             /* FIXME - Should not be here */
+#include "xwin.h"
 
 static struct
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ttfont.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ttfont.c    16 Jul 2005 16:35:39 -0000      1.44
+++ ttfont.c    16 Jul 2005 16:57:44 -0000      1.45
@@ -22,6 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "xwin.h"
 
 struct _efont
 {
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- warp.c      13 Jul 2005 19:39:22 -0000      1.73
+++ warp.c      16 Jul 2005 16:57:44 -0000      1.74
@@ -32,7 +32,10 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 #include "E.h"
+#include "emodule.h"
+#include "ewins.h"
 #include "icons.h"
+#include "xwin.h"
 #include <X11/keysym.h>
 
 typedef struct
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/windowmatch.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- windowmatch.c       10 Jul 2005 08:31:15 -0000      1.32
+++ windowmatch.c       16 Jul 2005 16:57:44 -0000      1.33
@@ -23,6 +23,8 @@
  */
 #include "E.h"
 #include "conf.h"
+#include "emodule.h"
+#include "ewins.h"
 #include "ewin-ops.h"
 
 static int          WindowMatchEwinOpsParse(EWin * ewin, const char *ops);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- x.c 10 Jul 2005 14:05:25 -0000      1.100
+++ x.c 16 Jul 2005 16:57:44 -0000      1.101
@@ -23,6 +23,7 @@
  */
 #include "E.h"
 #include "ecore-e16.h"
+#include "xwin.h"
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/zoom.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- zoom.c      10 Jul 2005 08:31:15 -0000      1.28
+++ zoom.c      16 Jul 2005 16:57:45 -0000      1.29
@@ -22,6 +22,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "E.h"
+#include "ewins.h"
+#include "xwin.h"
 
 #ifdef WITH_ZOOM
 #include <X11/extensions/xf86vmode.h>




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to