Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h pager.c
Log Message:
Assorted cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -3 -r1.193 -r1.194
--- E.h 2 Feb 2004 19:42:35 -0000 1.193
+++ E.h 4 Feb 2004 20:17:30 -0000 1.194
@@ -200,12 +200,6 @@
/* long's on 64bit machines... thus well the CARD32's Im unsing shoudl be.. */
#define CARD32 long
-#if (WITH_TARTY_WARP == 1)
-#define WITH_TARTY_WARP 1
-#else
-#undef WITH_TARTY_WARP
-#endif /* !WITH_TARTY_WARP */
-
#define RESET_ALERT \
AssignTitleText(_("Enlightenment Message Dialog")); \
AssignIgnoreText(_("Ignore this")); \
@@ -249,11 +243,6 @@
#endif
#endif
-/* shut warnings up
- * pid_t wait3(int *status, int options, struct rusage *rusage);
- * int setenv(const char *name, const char *value, int overwrite);
- */
-
#define FILEPATH_LEN_MAX 4096
/* This turns on E's internal stack tracking system for coarse debugging */
/* and being able to trace E for profiling/optimisation purposes (which */
@@ -364,16 +353,6 @@
#define SPANS_COMMON(x1, w1, x2, w2) \
(!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
-#define EERR_NONE 0
-#define EERR_OUT_OF_MEMORY 1
-#define EERR_FILE_NOT_EXIST 2
-#define EERR_PERMISSION_DENIED 3
-#define EERR_FILING_SYSTEM_FULL 4
-
-#ifndef ENLIGHTENMENT_ROOT
-#define ENLIGHTENMENT_ROOT "/usr/local/enlightenment"
-#endif
-
#define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32
/* the cast is so -1 will == UINT_MAX */
#define DESKTOPS_WRAP_NUM(x) \
@@ -1549,28 +1528,6 @@
};
#endif /* DECLARE_STRUCT_ICONBOX */
-#ifdef DECLARE_STRUCT_PAGER
-struct _pager
-{
- char *name;
- Window win;
- Pixmap pmap;
- Pixmap bgpmap;
- int desktop;
- int w, h;
- int dw, dh;
- char visible;
- int update_phase;
- EWin *ewin;
- char *border_name;
- Window sel_win;
- char hi_visible;
- Window hi_win;
- EWin *hi_ewin;
- int hi_win_w, hi_win_h;
-};
-#endif /* DECLARE_STRUCT_PAGER */
-
typedef struct _drawqueue
{
Window win;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- pager.c 2 Feb 2004 19:32:25 -0000 1.62
+++ pager.c 4 Feb 2004 20:17:31 -0000 1.63
@@ -20,12 +20,31 @@
* 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.
*/
-#define DECLARE_STRUCT_PAGER
#include "E.h"
+struct _pager
+{
+ char *name;
+ Window win;
+ Pixmap pmap;
+ Pixmap bgpmap;
+ int desktop;
+ int w, h;
+ int dw, dh;
+ char visible;
+ int update_phase;
+ EWin *ewin;
+ char *border_name;
+ Window sel_win;
+ char hi_visible;
+ Window hi_win;
+ EWin *hi_ewin;
+ int hi_win_w, hi_win_h;
+};
+
#define PAGER_EVENT_MOUSE_OUT -1
-#define PAGER_EVENT_MOTION 0
-#define PAGER_EVENT_MOUSE_IN 1
+#define PAGER_EVENT_MOTION 0
+#define PAGER_EVENT_MOUSE_IN 1
static void PagerUpdateTimeout(int val, void *data);
static void PagerEwinUpdateMini(Pager * p, EWin * ewin);
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
