Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: E.h aclass.h borders.h buttons.h container.h eimage.c eimage.h extinitwin.c focus.h hints.h hiwin.h main.c xwin.h Log Message: Header file tweaks. =================================================================== RCS file: /cvs/e/e16/e/src/E.h,v retrieving revision 1.608 retrieving revision 1.609 diff -u -3 -r1.608 -r1.609 --- E.h 23 Mar 2008 11:54:22 -0000 1.608 +++ E.h 24 Mar 2008 08:57:50 -0000 1.609 @@ -37,8 +37,7 @@ #define USE_EXT_INIT_WIN 1 -#include <X11/Xlib.h> -#include <X11/extensions/shape.h> +#include <X11/X.h> #ifdef HAVE_SM #define USE_SM 1 =================================================================== RCS file: /cvs/e/e16/e/src/aclass.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- aclass.h 23 Feb 2008 12:13:28 -0000 1.8 +++ aclass.h 24 Mar 2008 08:57:50 -0000 1.9 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2007 Kim Woelders + * Copyright (C) 2004-2008 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -24,6 +24,7 @@ #ifndef _ACLASS_H #define _ACLASS_H +#include <X11/Xlib.h> #include "etypes.h" /* aclass.c */ =================================================================== RCS file: /cvs/e/e16/e/src/borders.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- borders.h 23 Mar 2008 11:54:22 -0000 1.12 +++ borders.h 24 Mar 2008 08:57:50 -0000 1.13 @@ -24,6 +24,7 @@ #ifndef _BORDERS_H_ #define _BORDERS_H_ +#include <X11/Xlib.h> #include "eimage.h" #include "etypes.h" =================================================================== RCS file: /cvs/e/e16/e/src/buttons.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- buttons.h 27 Jul 2007 16:59:49 -0000 1.12 +++ buttons.h 24 Mar 2008 08:57:50 -0000 1.13 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2007 Kim Woelders + * Copyright (C) 2004-2008 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -24,6 +24,7 @@ #ifndef _BUTTONS_H_ #define _BUTTONS_H_ +#include <X11/Xlib.h> #include "eobj.h" #include "etypes.h" =================================================================== RCS file: /cvs/e/e16/e/src/container.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- container.h 23 Mar 2008 11:54:22 -0000 1.5 +++ container.h 24 Mar 2008 08:57:50 -0000 1.6 @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2007 Kim Woelders + * Copyright (C) 2004-2008 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -24,6 +24,7 @@ #ifndef _CONTAINER_H_ #define _CONTAINER_H_ +#include <X11/Xlib.h> #include "eimage.h" typedef struct _container Container; =================================================================== RCS file: /cvs/e/e16/e/src/eimage.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- eimage.c 24 Jan 2008 18:37:45 -0000 1.24 +++ eimage.c 24 Mar 2008 08:57:50 -0000 1.25 @@ -33,8 +33,10 @@ static Colormap _default_cmap; void -EImageInit(Display * dpy) +EImageInit(void) { + Display *dpy = disp; + imlib_set_cache_size(2048 * 1024); imlib_set_font_cache_size(512 * 1024); =================================================================== RCS file: /cvs/e/e16/e/src/eimage.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- eimage.h 23 Mar 2008 11:54:23 -0000 1.17 +++ eimage.h 24 Mar 2008 08:57:50 -0000 1.18 @@ -23,7 +23,7 @@ #ifndef _EIMAGE_H_ #define _EIMAGE_H_ -#include <X11/Xlib.h> +#include <X11/X.h> #include "xwin.h" typedef void EImage; @@ -38,7 +38,7 @@ #define EIMAGE_HIGH_MASK_THR 0x0004 #define EIMAGE_ISCALE 0x0f00 /* Intermediate scaling */ -void EImageInit(Display * dpy); +void EImageInit(void); int EImageSetCacheSize(int size); EImage *EImageCreate(int w, int h); =================================================================== RCS file: /cvs/e/e16/e/src/extinitwin.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- extinitwin.c 22 Mar 2008 14:46:38 -0000 1.25 +++ extinitwin.c 24 Mar 2008 08:57:50 -0000 1.26 @@ -45,7 +45,7 @@ EGrabServer(); - EImageInit(disp); + EImageInit(); attr.backing_store = NotUseful; attr.override_redirect = True; =================================================================== RCS file: /cvs/e/e16/e/src/focus.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- focus.h 11 Jul 2007 09:30:58 -0000 1.3 +++ focus.h 24 Mar 2008 08:57:50 -0000 1.4 @@ -23,6 +23,8 @@ #ifndef _FOCUS_H_ #define _FOCUS_H_ +#include <X11/Xlib.h> + /* focus.c */ #define FOCUS_NOP 0 #define FOCUS_INIT 1 =================================================================== RCS file: /cvs/e/e16/e/src/hints.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- hints.h 22 Mar 2008 15:00:07 -0000 1.19 +++ hints.h 24 Mar 2008 08:57:50 -0000 1.20 @@ -24,6 +24,7 @@ #ifndef _HINTS_H_ #define _HINTS_H_ +#include <X11/Xlib.h> #include "etypes.h" #include "xwin.h" =================================================================== RCS file: /cvs/e/e16/e/src/hiwin.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- hiwin.h 13 Jan 2007 19:14:28 -0000 1.4 +++ hiwin.h 24 Mar 2008 08:57:50 -0000 1.5 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2007 Kim Woelders + * Copyright (C) 2005-2008 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -22,6 +22,8 @@ */ #ifndef _HIWIN_H_ #define _HIWIN_H_ + +#include <X11/Xlib.h> typedef struct _hiwin Hiwin; =================================================================== RCS file: /cvs/e/e16/e/src/main.c,v retrieving revision 1.167 retrieving revision 1.168 diff -u -3 -r1.167 -r1.168 --- main.c 23 Mar 2008 11:54:24 -0000 1.167 +++ main.c 24 Mar 2008 08:57:50 -0000 1.168 @@ -247,7 +247,7 @@ Esetenv("ETHEME", Mode.theme.path); /* Move elsewhere? */ - EImageInit(disp); + EImageInit(); HintsInit(); CommsInit(); SessionInit(); =================================================================== RCS file: /cvs/e/e16/e/src/xwin.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- xwin.h 23 Mar 2008 11:54:24 -0000 1.39 +++ xwin.h 24 Mar 2008 08:57:50 -0000 1.40 @@ -24,6 +24,9 @@ #ifndef _XWIN_H_ #define _XWIN_H_ +#include <X11/Xlib.h> +#include <X11/extensions/shape.h> + Display *EDisplayOpen(const char *dstr, int scr); void EDisplayClose(void); void EDisplayDisconnect(void); ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs