Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets/epplets
Modified Files:
E-Cpu.c E-Exec.c E-LoadMeter.c E-Mountbox.c E-Mountbox.h
E-NetFlame.c E-NetGraph.c E-PlayCD.c E-Power.c E-SD.c
E-Slides.c E-Wireless.c Emix.c Makefile.am cloak.c esdcloak.c
Log Message:
Move to Imlib2. Build for e16.8.
- This is a quick and dirty port to imlib2. It's posible to clean/speed up
things considerably here and there.
- It's not unlikely that I missed some spots that require fixups.
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Cpu.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- E-Cpu.c 11 Dec 2003 22:06:44 -0000 1.20
+++ E-Cpu.c 31 Mar 2006 22:56:17 -0000 1.21
@@ -189,14 +189,14 @@
for (y = 0; y < 40; y++)
{
ptr = flame + (y * 40);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
val1 = ptr[x] & 0xff;
rptr[0] = rm[val1];
rptr[1] = gm[val1];
rptr[2] = bm[val1];
- rptr += 3;
+ rptr += 4;
}
}
}
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Exec.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- E-Exec.c 24 Aug 2000 17:05:14 -0000 1.24
+++ E-Exec.c 31 Mar 2006 22:56:17 -0000 1.25
@@ -32,7 +32,6 @@
static void
cb_close(void *data)
{
- Epplet_cleanup();
Epplet_unremember();
exit(0);
data = NULL;
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-LoadMeter.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- E-LoadMeter.c 3 Aug 2000 01:57:32 -0000 1.1
+++ E-LoadMeter.c 31 Mar 2006 22:56:17 -0000 1.2
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: E-LoadMeter.c,v 1.1 2000/08/03 01:57:32
mej Exp $";
+static const char cvs_ident[] = "$Id: E-LoadMeter.c,v 1.2 2006/03/31 22:56:17
kwo Exp $";
#include <stdio.h>
#include <sys/time.h>
@@ -86,7 +86,6 @@
{
Epplet_unremember();
Esync();
- Epplet_cleanup();
data = NULL;
exit(0);
}
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Mountbox.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- E-Mountbox.c 3 Apr 2000 00:08:16 -0000 1.24
+++ E-Mountbox.c 31 Mar 2006 22:56:17 -0000 1.25
@@ -494,7 +494,10 @@
int i, j, linear, linear_w;
double ratio;
+ unsigned char *current_tile_data;
+ imlib_context_set_image(current_tile->image);
+ current_tile_data = (unsigned char*)imlib_image_get_data();
if (k < M_PI)
{
if (mode.anim_mount)
@@ -508,20 +511,20 @@
{
if (!IsTransparent(current_tile->image, j, i))
{
- linear = 3*(i * 44 + j);
- linear_w = (i*44*3*num_tiles) + (current_tile_index*44*3) +
3*j;
- window_buf->im->rgb_data[linear] =
- widescreen_buf->im->rgb_data[linear_w] =
- ratio * (widescreen_canvas_buf->im->rgb_data[linear_w])
- + (1.0-ratio) * (current_tile->image->rgb_data[linear]);
- window_buf->im->rgb_data[linear+1] =
- widescreen_buf->im->rgb_data[linear_w+1] =
- ratio * (widescreen_canvas_buf->im->rgb_data[linear_w+1])
- + (1.0-ratio) * (current_tile->image->rgb_data[linear+1]);
- window_buf->im->rgb_data[linear+2] =
- widescreen_buf->im->rgb_data[linear_w+2] =
- ratio * (widescreen_canvas_buf->im->rgb_data[linear_w+2])
- + (1.0-ratio) * (current_tile->image->rgb_data[linear+2]);
+ linear = 4*(i * 44 + j);
+ linear_w = (i*44*4*num_tiles) + (current_tile_index*44*4) +
4*j;
+ Epplet_get_rgb_pointer(window_buf)[linear] =
+ Epplet_get_rgb_pointer(widescreen_buf)[linear_w] =
+ ratio *
(Epplet_get_rgb_pointer(widescreen_canvas_buf)[linear_w])
+ + (1.0-ratio) * (current_tile_data[linear]);
+ Epplet_get_rgb_pointer(window_buf)[linear+1] =
+ Epplet_get_rgb_pointer(widescreen_buf)[linear_w+1] =
+ ratio *
(Epplet_get_rgb_pointer(widescreen_canvas_buf)[linear_w+1])
+ + (1.0-ratio) * (current_tile_data[linear+1]);
+ Epplet_get_rgb_pointer(window_buf)[linear+2] =
+ Epplet_get_rgb_pointer(widescreen_buf)[linear_w+2] =
+ ratio *
(Epplet_get_rgb_pointer(widescreen_canvas_buf)[linear_w+2])
+ + (1.0-ratio) * (current_tile_data[linear+2]);
}
}
}
@@ -548,9 +551,9 @@
{
for (i=0; i<32; i++)
{
- memcpy(window_buf->im->rgb_data + i * 44 * 3,
- widescreen_buf->im->rgb_data + (i*44*3*num_tiles) +
(current_tile_index*44*3),
- 44*3*sizeof(unsigned char));
+ memcpy(Epplet_get_rgb_pointer(window_buf) + i * 44 * 4,
+ Epplet_get_rgb_pointer(widescreen_buf) + (i*44*4*num_tiles) +
(current_tile_index*44*4),
+ 44*4*sizeof(unsigned char));
}
Epplet_paste_buf(window_buf, Epplet_get_drawingarea_window(action_area),
-2, -2);
}
@@ -566,9 +569,9 @@
}
for (i=0; i<32; i++)
{
- memcpy(window_buf->im->rgb_data + i * 44 * 3,
- widescreen_buf->im->rgb_data + (i*44*3*num_tiles) +
(current_tile_index*44*3) + (dir)*j*3,
- 44*3*sizeof(unsigned char));
+ memcpy(Epplet_get_rgb_pointer(window_buf) + i * 44 * 4,
+ Epplet_get_rgb_pointer(widescreen_buf) +
(i*44*4*num_tiles) + (current_tile_index*44*4) + (dir)*j*4,
+ 44*4*sizeof(unsigned char));
}
Epplet_paste_buf(window_buf,
Epplet_get_drawingarea_window(action_area), -2, -2);
}
@@ -577,24 +580,23 @@
int
-IsTransparent(ImlibImage *im, int x, int y)
+IsTransparent(Imlib_Image *im, int x, int y)
{
int linear;
- ImlibColor ic;
+ unsigned char *data;
- if (!im || x < 0 || y < 0 || x >= im->rgb_width || y >= im->rgb_height)
+ if (!im || x < 0 || y < 0)
return 0;
- Imlib_get_image_shape(id, im, &ic);
- if ((ic.r == -1) && (ic.g == -1) && (ic.b == -1))
+ imlib_context_set_image(im);
+ if (x >= imlib_image_get_width() || y >= imlib_image_get_height())
return 0;
- linear = 3*(y * im->rgb_width + x);
+ linear = 4*(y * imlib_image_get_width() + x);
- if ((im->rgb_data[linear] == ic.r)
- && (im->rgb_data[linear+1] == ic.g)
- && (im->rgb_data[linear+2] == ic.b))
- return 1;
+ data = (unsigned char*)imlib_image_get_data();
+ if (data[linear+3] != 0xff);
+ return 0; /* FIXME - Should return 1 but blending needs to be fixed */
return 0;
}
@@ -642,7 +644,7 @@
int i;
MountPointType *type = NULL;
char *s = NULL;
- ImlibImage *tmp_image = NULL;
+ Imlib_Image *tmp_image = NULL;
static Tile *tail_tile = NULL;
@@ -714,17 +716,18 @@
if (!default_image)
{
- tmp_image = Imlib_load_image(id, s);
+ tmp_image = imlib_load_image(s);
if (!tmp_image)
- tmp_image = Imlib_load_image(id, __DEFAULT);
+ tmp_image = imlib_load_image(__DEFAULT);
if (!tmp_image)
{
Epplet_dialog_ok(" E-Mountbox could not load a
default icon\n "
" for the mountpoints. Check your
installation. ");
error_exit();
}
- default_image = Imlib_clone_scaled_image(id, tmp_image,
44, 32);
- Imlib_destroy_image(id, tmp_image);
+ imlib_context_set_image(tmp_image);
+ default_image = imlib_create_cropped_scaled_image(0, 0,
imlib_image_get_width(), imlib_image_get_height(), 44, 32);
+ imlib_free_image();
}
tail_tile->image = default_image;
}
@@ -741,7 +744,7 @@
AddMountPointType(char *key, char *image)
{
MountPointType *newtype = NULL;
- ImlibImage *tmp_image = NULL;
+ Imlib_Image *tmp_image = NULL;
if (!types)
{
@@ -773,11 +776,12 @@
types->key = strdup(key);
if (image)
types->imagefile = strdup(image);
- tmp_image = Imlib_load_image(id, image);
+ tmp_image = imlib_load_image(image);
if (tmp_image)
{
- types->image = Imlib_clone_scaled_image(id, tmp_image, 44, 32);
- Imlib_destroy_image(id, tmp_image);
+ imlib_context_set_image(tmp_image);
+ types->image = imlib_create_cropped_scaled_image(0, 0,
imlib_image_get_width(), imlib_image_get_height(), 44, 32);
+ imlib_free_image();
}
}
}
@@ -846,7 +850,8 @@
}
if (mpt->image)
{
- Imlib_destroy_image(id, mpt->image);
+ imlib_context_set_image(mpt->image);
+ imlib_free_image();
mpt->image = NULL;
}
free(mpt);
@@ -859,12 +864,14 @@
{
if (bg_image)
{
- Imlib_destroy_image(id, bg_image);
+ imlib_context_set_image(bg_image);
+ imlib_free_image();
bg_image = NULL;
}
if (default_image)
{
- Imlib_destroy_image(id, default_image);
+ imlib_context_set_image(default_image);
+ imlib_free_image();
default_image = NULL;
}
}
@@ -914,7 +921,8 @@
}
if (current->image)
{
- Imlib_destroy_image(id, current->image);
+ imlib_context_set_image(current->image);
+ imlib_free_image();
current->image = NULL;
}
tmp = current;
@@ -1206,6 +1214,7 @@
{
Tile *tile;
int i,j,k, linear, linear_w, status=0;
+ unsigned char *widescreen_data, *widescreen_canvas_data, *tile_data;
if (current_tile->mountpoint)
{
@@ -1230,30 +1239,37 @@
/* build new image */
tile = tiles;
+ imlib_context_set_image(widescreen_buf->im);
+ widescreen_data = (unsigned char*)imlib_image_get_data();
+ imlib_context_set_image(widescreen_canvas_buf->im);
+ widescreen_canvas_data = (unsigned char*)imlib_image_get_data();
+
for (k=0; k<num_tiles; k++, tile = tile->next)
{
+ imlib_context_set_image(tile->image);
+ tile_data = (unsigned char*)imlib_image_get_data();
for (i=0; i<32; i++)
{
for (j=0; j<44; j++)
{
if (!IsTransparent(tile->image, j, i))
{
- linear = 3*(i * 44 + j);
- linear_w = (i*44*3*num_tiles) + (k*44*3) + 3*j;
+ linear = 4*(i * 44 + j);
+ linear_w = (i*44*4*num_tiles) + (k*44*4) + 4*j;
if (tile->mountpoint->mounted)
{
- widescreen_buf->im->rgb_data[linear_w] =
tile->image->rgb_data[linear];
- widescreen_buf->im->rgb_data[linear_w+1] =
tile->image->rgb_data[linear+1];
- widescreen_buf->im->rgb_data[linear_w+2] =
tile->image->rgb_data[linear+2];
+ widescreen_data[linear_w] = tile_data[linear];
+ widescreen_data[linear_w+1] = tile_data[linear+1];
+ widescreen_data[linear_w+2] = tile_data[linear+2];
}
else
{
- widescreen_buf->im->rgb_data[linear_w] =
- 0.65 * widescreen_canvas_buf->im->rgb_data[linear_w] +
0.35 * tile->image->rgb_data[linear];
- widescreen_buf->im->rgb_data[linear_w+1] =
- 0.65 * widescreen_canvas_buf->im->rgb_data[linear_w+1]
+ 0.35 * tile->image->rgb_data[linear+1];
- widescreen_buf->im->rgb_data[linear_w+2] =
- 0.65 * widescreen_canvas_buf->im->rgb_data[linear_w+2]
+ 0.35 * tile->image->rgb_data[linear+2];
+ widescreen_data[linear_w] =
+ 0.65 * widescreen_canvas_data[linear_w] + 0.35 *
tile_data[linear];
+ widescreen_data[linear_w+1] =
+ 0.65 * widescreen_canvas_data[linear_w+1] + 0.35 *
tile_data[linear+1];
+ widescreen_data[linear_w+2] =
+ 0.65 * widescreen_canvas_data[linear_w+2] + 0.35 *
tile_data[linear+2];
}
}
}
@@ -1285,7 +1301,6 @@
FreeImages();
Epplet_unremember();
Esync();
- Epplet_cleanup();
exit(0);
}
@@ -1452,15 +1467,16 @@
{
static int first_time = 1;
int i, j, k, linear, linear_w;
- ImlibImage *tmp = NULL;
+ Imlib_Image *tmp = NULL;
Tile *tile;
char *s = NULL;
+ unsigned char *widescreen_data, *widescreen_canvas_data, *tile_data,
*bg_data;
s = Epplet_query_config("BG_IMAGE");
- tmp = Imlib_load_image(id, s);
+ tmp = imlib_load_image(s);
if (!tmp)
- tmp = Imlib_load_image(id, __BG_IMAGE);
+ tmp = imlib_load_image(__BG_IMAGE);
if (!tmp)
{
/* Even the fallbacks didn't work. If we don't exit
@@ -1474,8 +1490,9 @@
&(border.left), &(border.right), &(border.top), &(border.bottom));
Imlib_set_image_border(id, tmp, &border);
*/
- bg_image = Imlib_clone_scaled_image(id, tmp, 44 * num_tiles, 32);
- Imlib_destroy_image(id, tmp);
+ imlib_context_set_image(tmp);
+ bg_image = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(),
imlib_image_get_height(), 44 * num_tiles, 32);
+ imlib_free_image();
/* setup widescreen according to current mounts */
if (!window_buf)
@@ -1487,36 +1504,45 @@
Epplet_free_rgb_buf(widescreen_canvas_buf);
widescreen_canvas_buf = Epplet_make_rgb_buf((44 * num_tiles), 32);
- memcpy(widescreen_buf->im->rgb_data, bg_image->rgb_data,
- sizeof(unsigned char) * 44 * 3 * num_tiles * 32);
- memcpy(widescreen_canvas_buf->im->rgb_data, bg_image->rgb_data,
- sizeof(unsigned char) * 44 * 3 * num_tiles * 32);
+ imlib_context_set_image(widescreen_buf->im);
+ widescreen_data = (unsigned char*)imlib_image_get_data();
+ imlib_context_set_image(widescreen_canvas_buf->im);
+ widescreen_canvas_data = (unsigned char*)imlib_image_get_data();
+ imlib_context_set_image(bg_image);
+ bg_data = (unsigned char*)imlib_image_get_data();
+
+ memcpy(widescreen_data, bg_data,
+ sizeof(unsigned char) * 44 * 4 * num_tiles * 32);
+ memcpy(widescreen_canvas_data, bg_data,
+ sizeof(unsigned char) * 44 * 4 * num_tiles * 32);
tile = tiles;
for (k=0; k<num_tiles; k++, tile = tile->next)
{
+ imlib_context_set_image(tile->image);
+ tile_data = (unsigned char*)imlib_image_get_data();
for (i=0; i<32; i++)
{
for (j=0; j<44; j++)
{
if (!IsTransparent(tile->image, j, i))
{
- linear = 3*(i * 44 + j);
- linear_w = (i*44*3*num_tiles) + (k*44*3) + 3*j;
+ linear = 4*(i * 44 + j);
+ linear_w = (i*44*4*num_tiles) + (k*44*4) + 4*j;
if (tile->mountpoint->mounted)
{
- widescreen_buf->im->rgb_data[linear_w] =
tile->image->rgb_data[linear];
- widescreen_buf->im->rgb_data[linear_w+1] =
tile->image->rgb_data[linear+1];
- widescreen_buf->im->rgb_data[linear_w+2] =
tile->image->rgb_data[linear+2];
+ widescreen_data[linear_w] = tile_data[linear];
+ widescreen_data[linear_w+1] = tile_data[linear+1];
+ widescreen_data[linear_w+2] = tile_data[linear+2];
}
else
{
- widescreen_buf->im->rgb_data[linear_w] =
- 0.65 * widescreen_buf->im->rgb_data[linear_w] + 0.35 *
tile->image->rgb_data[linear];
- widescreen_buf->im->rgb_data[linear_w+1] =
- 0.65 * widescreen_buf->im->rgb_data[linear_w+1] + 0.35
* tile->image->rgb_data[linear+1];
- widescreen_buf->im->rgb_data[linear_w+2] =
- 0.65 * widescreen_buf->im->rgb_data[linear_w+2] + 0.35
* tile->image->rgb_data[linear+2];
+ widescreen_data[linear_w] =
+ 0.65 * widescreen_data[linear_w] + 0.35 *
tile_data[linear];
+ widescreen_data[linear_w+1] =
+ 0.65 * widescreen_data[linear_w+1] + 0.35 *
tile_data[linear+1];
+ widescreen_data[linear_w+2] =
+ 0.65 * widescreen_data[linear_w+2] + 0.35 *
tile_data[linear+2];
}
}
}
@@ -1612,7 +1638,6 @@
Epplet_Init("E-Mountbox", "0.1", "Enlightenment Mount Epplet",
3, 3, argc, argv, 0);
Epplet_load_config();
- id = Epplet_get_imlib_data();
SetupDefaults();
SetupMounts();
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Mountbox.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- E-Mountbox.h 21 Mar 2000 22:47:13 -0000 1.14
+++ E-Mountbox.h 31 Mar 2006 22:56:17 -0000 1.15
@@ -72,7 +72,7 @@
{
char *key;
char *imagefile;
- ImlibImage *image;
+ Imlib_Image *image;
MountPointType *next;
MountPointType *prev;
};
@@ -87,7 +87,7 @@
struct _tile
{
- ImlibImage *image;
+ Imlib_Image *image;
MountPoint *mountpoint;
Tile *prev;
Tile *next;
@@ -100,9 +100,8 @@
int num_tiles = 0;
MountPointType *types = NULL;
int num_types = 0;
-ImlibData *id = NULL;
-ImlibImage *bg_image = NULL;
-ImlibImage *default_image = NULL;
+Imlib_Image *bg_image = NULL;
+Imlib_Image *default_image = NULL;
Epplet_gadget action_area, button_close, button_config, button_help;
/* stuff for the config win */
@@ -118,7 +117,7 @@
RGB_buf widescreen_canvas_buf = NULL; /* only the background */
/* graphx handling */
-int IsTransparent(ImlibImage * im, int x, int y);
+int IsTransparent(Imlib_Image * im, int x, int y);
void UpdateView(int dir, int fast);
void FreeImages(void);
void UpdateGraphics(void);
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-NetFlame.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- E-NetFlame.c 11 Mar 2000 02:33:57 -0000 1.11
+++ E-NetFlame.c 31 Mar 2006 22:56:17 -0000 1.12
@@ -229,13 +229,13 @@
rgb = Epplet_get_rgb_pointer(buf);
for (y = 0; y < HEIGHT; y++) {
ptr = flame + (y * WIDTH) + 1;
- rptr = rgb + (y * WIDTH * 3);
+ rptr = rgb + (y * WIDTH * 4);
for (x = 0; x < WIDTH; x++) {
val1 = ptr[x] & 0xff;
rptr[0] = rm[val1];
rptr[1] = gm[val1];
rptr[2] = bm[val1];
- rptr += 3;
+ rptr += 4;
}
}
}
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-NetGraph.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- E-NetGraph.c 11 Mar 2000 02:33:57 -0000 1.11
+++ E-NetGraph.c 31 Mar 2006 22:56:17 -0000 1.12
@@ -113,12 +113,12 @@
/* whee.. shift the buffer one pixel to the left */
for (i = 0; i <= 39; i++)
{
- for (rgb_pointer_dynamic = rgb_pointer_start + (i * 120);
- rgb_pointer_dynamic <= rgb_pointer_start + (i * 120) + 114;
- rgb_pointer_dynamic += 3)
+ for (rgb_pointer_dynamic = rgb_pointer_start + (i * 4*40);
+ rgb_pointer_dynamic <= rgb_pointer_start + (i * 4*40) + 4*38;
+ rgb_pointer_dynamic += 4)
{
for (j = 0; j <= 2; j++)
- rgb_pointer_dynamic[j] = rgb_pointer_dynamic[j + 3];
+ rgb_pointer_dynamic[j] = rgb_pointer_dynamic[j + 4];
}
}
@@ -126,7 +126,7 @@
for (i = 1; i <= 38; i++)
{
rgb_pointer_dynamic = rgb_pointer_start
- + (i * 120) + 114;
+ + (i * 4*40) + 4*38;
for (j = 0; j <= 2; j++)
rgb_pointer_dynamic[j] = bg_color[j];
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-PlayCD.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- E-PlayCD.c 15 Jan 2000 02:31:47 -0000 1.2
+++ E-PlayCD.c 31 Mar 2006 22:56:17 -0000 1.3
@@ -148,7 +148,6 @@
cb_close (void *data)
{
Epplet_unremember ();
- Epplet_cleanup ();
cd_finish (cd_desc);
exit (0);
return;
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Power.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- E-Power.c 3 Jan 2005 19:40:50 -0000 1.19
+++ E-Power.c 31 Mar 2006 22:56:17 -0000 1.20
@@ -313,7 +313,6 @@
{
Epplet_unremember();
Esync();
- Epplet_cleanup();
data = NULL;
exit(0);
}
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-SD.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- E-SD.c 27 Jun 2002 18:35:52 -0000 1.18
+++ E-SD.c 31 Mar 2006 22:56:17 -0000 1.19
@@ -23,6 +23,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/socket.h>
+#include <fcntl.h>
#include <unistd.h>
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Slides.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- E-Slides.c 27 Jan 2001 20:22:43 -0000 1.28
+++ E-Slides.c 31 Mar 2006 22:56:17 -0000 1.29
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: E-Slides.c,v 1.28 2001/01/27 20:22:43
gilbertt Exp $";
+static const char cvs_ident[] = "$Id: E-Slides.c,v 1.29 2006/03/31 22:56:17
kwo Exp $";
#include <stdio.h>
#include <sys/time.h>
@@ -233,7 +233,7 @@
change_image(void *data)
{
- ImlibImage *im = NULL;
+ Imlib_Image *im = NULL;
double ratio = 0.0;
unsigned long first = idx;
int new_w = 0, new_h = 0, new_x = 3, new_y = 3;
@@ -242,7 +242,7 @@
return;
/* Test-load each image to make sure it's a valid image file. */
- for (; ((filenames[idx] == NULL) || ((im =
Imlib_load_image(Epplet_get_imlib_data(), filenames[idx])) == NULL));) {
+ for (; ((filenames[idx] == NULL) || ((im = imlib_load_image(filenames[idx]))
== NULL));) {
/* It isn't, so NULL out its name. */
filenames[idx] = NULL;
INC_PIC();
@@ -259,15 +259,16 @@
}
new_w = (w * 16 - 6);
new_h = (h * 16 - 6);
+ imlib_context_set_image(im);
if (maintain_aspect) {
- ratio = ((double) im->rgb_width / im->rgb_height) / ((double) new_w /
new_h);
+ ratio = ((double) imlib_image_get_width() / imlib_image_get_height()) /
((double) new_w / new_h);
if (ratio > 1.0) {
new_h /= ratio;
} else if (ratio != 1.0) {
new_w *= ratio;
}
}
- Imlib_destroy_image(Epplet_get_imlib_data(), im); /* Destroy the image,
but keep it in cache. */
+ imlib_free_image(); /* Destroy the image, but keep it in cache. */
new_x = ((w * 16) / 2) - (new_w / 2);
new_y = ((h * 16) / 2) - (new_h / 2);
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/E-Wireless.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- E-Wireless.c 25 Aug 2003 16:08:05 -0000 1.1
+++ E-Wireless.c 31 Mar 2006 22:56:17 -0000 1.2
@@ -70,9 +70,9 @@
for(i=0;i<dx;i++) {
if(steep) {
- rptr=rgb+(((x1*WIDTH)+y1)*3);
+ rptr=rgb+(((x1*WIDTH)+y1)*4);
} else {
- rptr=rgb+(((y1*WIDTH)+x1)*3);
+ rptr=rgb+(((y1*WIDTH)+x1)*4);
}
rptr[0]=clr[0];
rptr[1]=clr[1];
@@ -85,7 +85,7 @@
e+=2*dy;
}
- rptr=rgb+(((y2*WIDTH)+x2)*3);
+ rptr=rgb+(((y2*WIDTH)+x2)*4);
rptr[0]=clr[0];
rptr[1]=clr[1];
rptr[2]=clr[2];
@@ -99,12 +99,12 @@
rgb=Epplet_get_rgb_pointer(buf);
for(y=0;y<HEIGHT;y++) {
- rptr=rgb+(y*WIDTH*3);
+ rptr=rgb+(y*WIDTH*4);
for(x=0;x<WIDTH;x++) {
rptr[0]=colors[color][0][0];
rptr[1]=colors[color][0][1];
rptr[2]=colors[color][0][2];
- rptr+=3;
+ rptr+=4;
}
}
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/Emix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Emix.c 12 Sep 2000 23:24:16 -0000 1.9
+++ Emix.c 31 Mar 2006 22:56:17 -0000 1.10
@@ -6,6 +6,7 @@
#include "epplet.h"
#include <sys/ioctl.h>
+#include <fcntl.h>
#ifdef __FreeBSD__
#include <machine/soundcard.h>
#else
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/Makefile.am,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- Makefile.am 6 Jul 2004 16:53:32 -0000 1.93
+++ Makefile.am 31 Mar 2006 22:56:17 -0000 1.94
@@ -1,6 +1,6 @@
-# $Id: Makefile.am,v 1.93 2004/07/06 16:53:32 mej Exp $
+# $Id: Makefile.am,v 1.94 2006/03/31 22:56:17 kwo Exp $
-bindir = $(EBIN)
+#bindir = $(EBIN)
edatadir = $(EROOT)
bin_PROGRAMS = E-Load.epplet E-Clock.epplet E-Time.epplet E-Net.epplet \
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/cloak.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- cloak.c 19 Nov 1999 23:01:40 -0000 1.11
+++ cloak.c 31 Mar 2006 22:56:17 -0000 1.12
@@ -115,11 +115,11 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
rptr[0] = rptr[1] = rptr[2] = 0;
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -134,13 +134,13 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
rptr[0] = rr;
rptr[1] = gg;
rptr[2] = bb;
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -156,13 +156,13 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
rptr[0] = rptr[0] * percentage / 100;
rptr[1] = rptr[1] * percentage / 100;
rptr[2] = rptr[2] * percentage / 100;
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -177,13 +177,13 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 39; x++)
{
- rptr[0] = rptr[3];
- rptr[1] = rptr[4];
- rptr[2] = rptr[5];
- rptr += 3;
+ rptr[0] = rptr[4];
+ rptr[1] = rptr[5];
+ rptr[2] = rptr[6];
+ rptr += 4;
}
rptr[0] = 0;
rptr[1] = 0;
@@ -254,14 +254,14 @@
for (y = 0; y < 40; y++)
{
ptr = flame + (y * 40) + 1;
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
val1 = ptr[x] & 0xff;
rptr[0] = rm[val1];
rptr[1] = gm[val1];
rptr[2] = bm[val1];
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -1218,7 +1218,8 @@
if ((((int) c) == 0) || (x < 0) || (y < 0) || (x > 39) || (y > 39))
return;
- ptr = (buf)->im->rgb_data + ((buf)->im->rgb_width * 3 * (y)) + (3 * x);
+ ptr = Epplet_get_rgb_pointer(buf);
+ ptr += (imlib_image_get_width() * 4 * (y)) + (4 * x);
ptr[0] = ((double) rrr / 255 * (double) c);
ptr[1] = ((double) ggg / 255 * (double) c);
ptr[2] = ((double) bbb / 255 * (double) c);
===================================================================
RCS file: /cvs/e/e16/epplets/epplets/esdcloak.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- esdcloak.c 19 Nov 1999 23:01:40 -0000 1.4
+++ esdcloak.c 31 Mar 2006 22:56:17 -0000 1.5
@@ -125,11 +125,11 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
rptr[0] = rptr[1] = rptr[2] = 0;
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -144,13 +144,13 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
rptr[0] = rr;
rptr[1] = gg;
rptr[2] = bb;
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -166,13 +166,13 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
rptr[0] = rptr[0] * percentage / 100;
rptr[1] = rptr[1] * percentage / 100;
rptr[2] = rptr[2] * percentage / 100;
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -187,13 +187,13 @@
for (y = 0; y < 40; y++)
{
rgb = Epplet_get_rgb_pointer (buf);
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 39; x++)
{
- rptr[0] = rptr[3];
- rptr[1] = rptr[4];
- rptr[2] = rptr[5];
- rptr += 3;
+ rptr[0] = rptr[4];
+ rptr[1] = rptr[5];
+ rptr[2] = rptr[6];
+ rptr += 4;
}
rptr[0] = 0;
rptr[1] = 0;
@@ -289,14 +289,14 @@
for (y = 0; y < 40; y++)
{
ptr = flame + (y * 40) + 1;
- rptr = rgb + (y * 40 * 3);
+ rptr = rgb + (y * 40 * 4);
for (x = 0; x < 40; x++)
{
val1 = ptr[x] & 0xff;
rptr[0] = rm[val1];
rptr[1] = gm[val1];
rptr[2] = bm[val1];
- rptr += 3;
+ rptr += 4;
}
}
}
@@ -838,7 +838,8 @@
if ((((int) c) == 0) || (x < 0) || (y < 0) || (x > 39) || (y > 39))
return;
- ptr = (buf)->im->rgb_data + ((buf)->im->rgb_width * 3 * (y)) + (3 * x);
+ ptr = Epplet_get_rgb_pointer(buf);
+ ptr += (imlib_image_get_width() * 4 * (y)) + (4 * x);
ptr[0] = ((double) rrr / 255 * (double) c);
ptr[1] = ((double) ggg / 255 * (double) c);
ptr[2] = ((double) bbb / 255 * (double) c);
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
