kwo pushed a commit to branch master.
http://git.enlightenment.org/e16/e16.git/commit/?id=6bd90781c10dc77466ee85b64c95349a2ceb6b81
commit 6bd90781c10dc77466ee85b64c95349a2ceb6b81
Author: Kim Woelders <k...@woelders.dk>
Date: Mon Apr 21 09:09:57 2014 +0200
Move shape window stuff to separate header file.
---
src/Makefile.am | 6 +++---
src/draw.c | 3 ++-
src/ewins.h | 19 +------------------
src/shapewin.c | 3 ++-
src/shapewin.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
src/warp.c | 3 ++-
6 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9eeeb18..2b670ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ e16_SOURCES = \
aclass.c aclass.h \
actions.c \
alert.c alert.h \
+ animation.c animation.h \
arrange.c \
backgrounds.c backgrounds.h \
borders.c borders.h \
@@ -41,7 +42,6 @@ e16_SOURCES = \
dialog.c dialog.h \
dock.c \
draw.c \
- list.c list.h \
econfig.c econfig.h \
edebug.h \
edge.c \
@@ -70,6 +70,7 @@ e16_SOURCES = \
icons.c icons.h \
ipc.c ipc.h \
lang.c lang.h \
+ list.c list.h \
main.c \
memory.c \
menus.c menus.h \
@@ -87,7 +88,7 @@ e16_SOURCES = \
session.c session.h \
settings.c settings.h \
setup.c \
- shapewin.c \
+ shapewin.c shapewin.h \
size.c \
slide.c slide.h \
slideout.c \
@@ -102,7 +103,6 @@ e16_SOURCES = \
text.c \
theme.c \
time.c \
- animation.c animation.h \
timers.c timers.h \
tooltips.c tooltips.h \
user.c user.h \
diff --git a/src/draw.c b/src/draw.c
index eb52dff..1b9c1e1 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2007-2013 Kim Woelders
+ * Copyright (C) 2007-2014 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
@@ -25,6 +25,7 @@
#include "desktops.h"
#include "eobj.h"
#include "ewins.h"
+#include "shapewin.h"
#include "xwin.h"
#define MR_MODES_MOVE 0x47 /* MR_OPAQUE through MR_BOX and
MR_TECH_OPAQUE */
diff --git a/src/ewins.h b/src/ewins.h
index d18593a..ea62155 100644
--- a/src/ewins.h
+++ b/src/ewins.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2013 Kim Woelders
+ * Copyright (C) 2004-2014 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
@@ -500,21 +500,4 @@ void ReZoom(EWin * ewin);
#define Zoom(ewin, on) do {} while(0)
#endif
-typedef struct _ShapeWin ShapeWin;
-struct _ShapeWin {
- EObj o;
- Pixmap mask;
- GC gc;
-};
-
-ShapeWin *ShapewinCreate(int md);
-void ShapewinDestroy(ShapeWin * sw);
-void ShapewinShapeSet(ShapeWin * sw, int md, int x, int y, int
w,
- int h, int bl, int br, int bt, int bb,
- int seqno);
-
-void do_draw_technical(Drawable dr, GC gc,
- int a, int b, int c, int d, int bl,
- int br, int bt, int bb);
-
#endif /* _EWIN_H_ */
diff --git a/src/shapewin.c b/src/shapewin.c
index fc4a599..c7247a6 100644
--- a/src/shapewin.c
+++ b/src/shapewin.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2013 Kim Woelders
+ * Copyright (C) 2007-2014 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,7 @@
*/
#include "E.h"
#include "ewins.h"
+#include "shapewin.h"
#include "xwin.h"
#define _SHAPE_SET_RECT(rl, _x, _y, _w, _h) \
diff --git a/src/shapewin.h b/src/shapewin.h
new file mode 100644
index 0000000..1777650
--- /dev/null
+++ b/src/shapewin.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2014 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
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies of the Software, its documentation and marketing & publicity
+ * materials, and acknowledgment shall be given in the documentation, materials
+ * and software packages that this Software was used.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * 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.
+ */
+#ifndef _SHAPEWIN_H_
+#define _SHAPEWIN_H_
+
+#include "config.h"
+
+#include "eobj.h"
+#include "xwin.h"
+
+typedef struct _ShapeWin ShapeWin;
+struct _ShapeWin {
+ EObj o;
+ Pixmap mask;
+ GC gc;
+};
+
+ShapeWin *ShapewinCreate(int md);
+void ShapewinDestroy(ShapeWin * sw);
+void ShapewinShapeSet(ShapeWin * sw, int md, int x, int y, int
w,
+ int h, int bl, int br, int bt, int bb,
+ int seqno);
+
+void do_draw_technical(Drawable dr, GC gc,
+ int a, int b, int c, int d, int bl,
+ int br, int bt, int bb);
+
+#endif /* _SHAPEWIN_H_ */
diff --git a/src/warp.c b/src/warp.c
index fc44d81..34f0d1a 100644
--- a/src/warp.c
+++ b/src/warp.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2013 Kim Woelders
+ * Copyright (C) 2004-2014 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
@@ -40,6 +40,7 @@
#include "iclass.h"
#include "icons.h"
#include "screen.h"
+#include "shapewin.h"
#include "tclass.h"
#include "tooltips.h"
#include "xwin.h"
--
