E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_intl.c Log Message: spanish - for now it'll be the generic spanish until we have multipel spanish translations... :) === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_intl.c14 Apr 2005 09:09:21 - 1.15 +++ e_intl.c15 Apr 2005 06:29:43 - 1.16 @@ -42,6 +42,7 @@ ADD_LANG(en); ADD_LANG(ja); ADD_LANG(fr); + ADD_LANG(es); /* FIXME: NULL == use LANG. make this read a config value if it exists */ e_intl_language_set(getenv(LANG)); @@ -103,6 +104,7 @@ IFL(de) German; IFL(el) Greek; IFL(en) English; + IFL(es) Spanish; IFL(eu) Basque; IFL(fa) Persian; IFL(fr) French; @@ -123,7 +125,6 @@ IFL(nn) Norwegian Nynorsk; IFL(pl) Polish; IFL(pt) Portuguese; - IFL(pt_BR) Portuguese (Brazil); IFL(ro) Romanian; IFL(ru) Russian; IFL(sk) Slovak; @@ -134,6 +135,7 @@ IFL(tr) Tuirkish; IFL(uk) Ukrainian; IFL(vi) Vietnamese; + /* must keep both - politically sensitive */ IFL(zh) Chinese (Simplified); IFL(zh_TW) Chinese (Traditional); return Unknown; @@ -162,6 +164,9 @@ return ja; if (ISL(fr) || ISL(fr_FR) || ISL(FR) || ISL([EMAIL PROTECTED])) return fr; + if (ISL(es) || ISL(es_ES) || ISL(ES) || ISL([EMAIL PROTECTED]) || + ISL(es_AR)) + return es; /* this is the default fallback - we have no special cases for this lang * so just strip off anything after and including the _ for country region * and just return the language encoding --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: Makefile.am Added Files: es.po Log Message: spanish - for now it'll be the generic spanish until we have multipel spanish translations... :) === RCS file: /cvsroot/enlightenment/e17/apps/e/po/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 15 Apr 2005 00:59:40 - 1.6 +++ Makefile.am 15 Apr 2005 06:29:43 - 1.7 @@ -5,21 +5,26 @@ podir = po_DATA = \ fr.mo \ -ja.mo +ja.mo \ +es.mo LANGS = \ fr \ -ja +ja \ +es EXTRA_DIST = \ enlightenment.pot \ fr.po \ -ja.po +ja.po \ +es.po ja.mo: $(MSGFMT) -f -o $@ ja.po fr.mo: $(MSGFMT) -f -o $@ fr.po +es.mo: + $(MSGFMT) -f -o $@ es.po install-poDATA: uninstall-poDATA: --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/imlib2 raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: John Slaten's amd64 mmx patch === RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.97 retrieving revision 1.98 diff -u -3 -r1.97 -r1.98 --- configure.in9 Apr 2005 00:08:57 - 1.97 +++ configure.in15 Apr 2005 07:00:39 - 1.98 @@ -104,6 +104,8 @@ [ if test x$enableval = xyes; then mmx=yes +# Cannot compile with both options enabled +amd64=no AC_MSG_RESULT(enabling mmx support) else mmx=no --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/imlib2 raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
Makefile.am blend.c blend.h
Added Files:
amd64_blend_cmod.S
Log Message:
John Slaten's amd64 mmx patch
===
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 9 Apr 2005 00:08:58 - 1.4
+++ Makefile.am 15 Apr 2005 07:00:39 - 1.5
@@ -75,7 +75,8 @@
asm_scale.S
AMD64_SRCS = \
-amd64_blend.S
+amd64_blend.S \
+amd64_blend_cmod.S
MMX_OBJS = $(MMX_SRCS:.S=.lo)
AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
===
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/blend.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- blend.c 9 Apr 2005 00:08:58 - 1.2
+++ blend.c 15 Apr 2005 07:00:40 - 1.3
@@ -1402,6 +1402,7 @@
#define __imlib_amd64_blend_rgb_to_rgba
__imlib_amd64_copy_rgb_to_rgba
#define __imlib_CopyRGBToRGBCmod __imlib_CopyRGBAToRGBCmod
#define __imlib_mmx_copy_rgb_to_rgb_cmod
__imlib_mmx_copy_rgba_to_rgb_cmod
+#define __imlib_amd64_copy_rgb_to_rgb_cmod
__imlib_amd64_copy_rgba_to_rgb_cmod
#define __imlib_AddCopyRGBToRGB__imlib_AddCopyRGBAToRGB
#define __imlib_AddBlendRGBToRGB __imlib_AddCopyRGBToRGB
@@ -1414,6 +1415,7 @@
#define __imlib_amd64_add_blend_rgb_to_rgba
__imlib_amd64_add_copy_rgb_to_rgba
#define __imlib_AddCopyRGBToRGBCmod__imlib_AddCopyRGBAToRGBCmod
#define __imlib_mmx_add_copy_rgb_to_rgb_cmod
__imlib_mmx_add_copy_rgb_to_rgba_cmod
+#define __imlib_amd64_add_copy_rgb_to_rgb_cmod
__imlib_amd64_add_copy_rgb_to_rgba_cmod
#define __imlib_SubCopyRGBToRGB__imlib_SubCopyRGBAToRGB
#define __imlib_SubBlendRGBToRGB __imlib_SubCopyRGBToRGB
@@ -1427,6 +1429,7 @@
#define __imlib_amd64_subtract_blend_rgb_to_rgba
__imlib_amd64_subtract_copy_rgb_to_rgba
#define __imlib_SubCopyRGBToRGBCmod__imlib_SubCopyRGBAToRGBCmod
#define __imlib_mmx_subtract_copy_rgb_to_rgb_cmod
__imlib_mmx_subtract_copy_rgb_to_rgba_cmod
+#define __imlib_amd64_subtract_copy_rgb_to_rgb_cmod
__imlib_amd64_subtract_copy_rgb_to_rgba_cmod
#define __imlib_ReCopyRGBToRGB __imlib_ReCopyRGBAToRGB
#define __imlib_ReBlendRGBToRGB__imlib_ReCopyRGBToRGB
@@ -1440,6 +1443,7 @@
#define __imlib_amd64_reshade_blend_rgb_to_rgba
__imlib_amd64_reshade_copy_rgb_to_rgba
#define __imlib_ReCopyRGBToRGBCmod __imlib_ReCopyRGBAToRGBCmod
#define __imlib_mmx_reshade_copy_rgb_to_rgb_cmod
__imlib_mmx_reshade_copy_rgb_to_rgba_cmod
+#define __imlib_amd64_reshade_copy_rgb_to_rgb_cmod
__imlib_amd64_reshade_copy_rgb_to_rgba_cmod
ImlibBlendFunction
@@ -1570,10 +1574,14 @@
{{__imlib_amd64_copy_rgba_to_rgba, __imlib_amd64_blend_rgba_to_rgba },
{__imlib_amd64_copy_rgb_to_rgba, __imlib_amd64_blend_rgb_to_rgba}}},
-{{{__imlib_CopyRGBAToRGBCmod, __imlib_BlendRGBAToRGBCmod},
- {__imlib_CopyRGBToRGBCmod, __imlib_BlendRGBToRGBCmod}},
- {{__imlib_CopyRGBAToRGBACmod, __imlib_BlendRGBAToRGBACmod},
-{__imlib_CopyRGBToRGBACmod, __imlib_BlendRGBToRGBACmod,
+{{{__imlib_amd64_copy_rgba_to_rgb_cmod,
+ __imlib_amd64_blend_rgba_to_rgb_cmod},
+ {__imlib_amd64_copy_rgb_to_rgb_cmod,
+ __imlib_amd64_blend_rgb_to_rgb_cmod}},
+ {{__imlib_amd64_copy_rgba_to_rgba_cmod,
+ __imlib_amd64_blend_rgba_to_rgba_cmod},
+ {__imlib_amd64_copy_rgb_to_rgba_cmod,
+ __imlib_amd64_blend_rgb_to_rgba_cmod,
/*\ OP_ADD \ */
__imlib_amd64_add_copy_rgba_to_rgb,
__imlib_amd64_add_blend_rgba_to_rgb},
@@ -1584,10 +1592,14 @@
{__imlib_amd64_add_copy_rgb_to_rgba,
__imlib_amd64_add_blend_rgb_to_rgba}}},
-{{{__imlib_AddCopyRGBAToRGBCmod, __imlib_AddBlendRGBAToRGBCmod},
- {__imlib_AddCopyRGBToRGBCmod, __imlib_AddBlendRGBToRGBCmod}},
- {{__imlib_AddCopyRGBAToRGBACmod, __imlib_AddBlendRGBAToRGBACmod},
- {__imlib_AddCopyRGBToRGBACmod, __imlib_AddBlendRGBToRGBACmod,
+{{{__imlib_amd64_add_copy_rgba_to_rgb_cmod,
+ __imlib_amd64_add_blend_rgba_to_rgb_cmod},
+ {__imlib_amd64_add_copy_rgb_to_rgb_cmod,
+ __imlib_amd64_add_blend_rgb_to_rgb_cmod}},
+ {{__imlib_amd64_add_copy_rgba_to_rgba_cmod,
+ __imlib_amd64_add_blend_rgba_to_rgba_cmod},
+ {__imlib_amd64_add_copy_rgb_to_rgba_cmod,
+ __imlib_amd64_add_blend_rgb_to_rgba_cmod,
/*\ OP_SUBTRACT \ */
__imlib_amd64_subtract_copy_rgba_to_rgb,
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_private.h emotion_smart.c
Log Message:
simon treney's emotion patches - THANKs :o)
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emotion_private.h 24 Jul 2004 09:53:00 - 1.3
+++ emotion_private.h 15 Apr 2005 07:27:02 - 1.4
@@ -19,9 +19,9 @@
struct _Emotion_Video_Module
{
- int (*init) (void);
- int (*shutdown) (void);
- void * (*file_open) (const char *file, Evas_Object *obj);
+ unsigned char (*init) (Evas_Object *obj, void **video);
+ int (*shutdown) (void *video);
+ unsigned char (*file_open) (const char *file, Evas_Object *obj, void
*video);
void (*file_close) (void *ef);
void (*play) (void *ef, double pos);
void (*stop) (void *ef);
@@ -75,6 +75,7 @@
void _emotion_video_pos_update(Evas_Object *obj, double pos, double len);
void _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio);
void _emotion_decode_stop(Evas_Object *obj);
+void _emotion_playback_finished(Evas_Object *obj);
void _emotion_channels_change(Evas_Object *obj);
void _emotion_title_set(Evas_Object *obj, char *title);
void _emotion_progress_set(Evas_Object *obj, char *info, double stat);
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emotion_smart.c 24 Jul 2004 09:53:00 - 1.8
+++ emotion_smart.c 15 Apr 2005 07:27:02 - 1.9
@@ -88,8 +88,8 @@
/**/
static Evas_Smart *smart = NULL;
-static Emotion_Video_Module *
-_emotion_module_open(const char *name)
+static unsigned char
+_emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module
**mod, void **video)
{
void *handle;
char buf[4096];
@@ -98,34 +98,31 @@
handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
if (handle)
{
- Emotion_Video_Module *(*func_module_open) (void);
+ unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module
**, void **);
func_module_open = dlsym(handle, module_open);
if (func_module_open)
{
-Emotion_Video_Module *mod;
-
-mod = func_module_open();
-if (mod)
+if (func_module_open(obj, mod, video))
{
- mod-handle = handle;
- return mod;
+ (*mod)-handle = handle;
+ return 1;
}
}
dlclose(handle);
}
- return NULL;
+ return 0;
}
static void
-_emotion_module_close(Emotion_Video_Module *mod)
+_emotion_module_close(Emotion_Video_Module *mod, void *video)
{
void *handle;
- void (*module_close) (Emotion_Video_Module *module);
+ void (*module_close) (Emotion_Video_Module *module, void *);
handle = mod-handle;
module_close = dlsym(handle, module_close);
- if (module_close) module_close(mod);
+ if (module_close) module_close(mod, video);
dlclose(handle);
}
@@ -168,24 +165,23 @@
int w, h;
sd-file = strdup(file);
- if ((sd-video) (sd-module))
+ if (sd-module)
{
sd-module-file_close(sd-video);
-sd-video = NULL;
evas_object_image_size_set(sd-obj, 0, 0);
}
- if (sd-module) _emotion_module_close(sd-module);
- sd-module = _emotion_module_open(emotion_decoder_xine.so);
- if (!sd-module) return;
- sd-video = sd-module-file_open(sd-file, obj);
- if (sd-video)
- {
-sd-module-size_get(sd-video, w, h);
-evas_object_image_size_set(sd-obj, w, h);
-sd-ratio = sd-module-ratio_get(sd-video);
-sd-pos = 0.0;
-if (sd-play) sd-module-play(sd-video, 0.0);
- }
+ if (!sd-module || !sd-video)
+ {
+ if (!_emotion_module_open(emotion_decoder_xine.so, obj, sd-module,
sd-video))
+ return;
+ }
+ if (!sd-module-file_open(sd-file, obj, sd-video))
+ return;
+ sd-module-size_get(sd-video, w, h);
+ evas_object_image_size_set(sd-obj, w, h);
+ sd-ratio = sd-module-ratio_get(sd-video);
+ sd-pos = 0.0;
+ if (sd-play) sd-module-play(sd-video, 0.0);
}
else
{
@@ -195,8 +191,6 @@
sd-video = NULL;
evas_object_image_size_set(sd-obj, 0, 0);
}
- if (sd-module) _emotion_module_close(sd-module);
- sd-module = NULL;
}
}
@@ -811,6 +805,12 @@
}
void
+_emotion_playback_finished(Evas_Object *obj)
+{
+
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c emotion_xine.h
Log Message:
simon treney's emotion patches - THANKs :o)
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- emotion_xine.c 2 Apr 2005 15:40:35 - 1.14
+++ emotion_xine.c 15 Apr 2005 07:27:02 - 1.15
@@ -2,11 +2,9 @@
#include emotion_private.h
#include emotion_xine.h
-static intinit_count = 0;
-
-static int em_init(void);
-static int em_shutdown(void);
-static void *em_file_open(const char *file, Evas_Object *obj);
+static unsigned char em_init(Evas_Object *obj, void **emotion_video);
+static int em_shutdown(void *video);
+static unsigned char em_file_open(const char *file, Evas_Object *obj, void
*video);
static void em_file_close(void *ef);
static void em_play(void *ef, double pos);
static void em_stop(void *ef);
@@ -60,42 +58,27 @@
static void *_em_get_pos_len_th(void *par);
static void _em_get_pos_len (Emotion_Xine_Video *ev);
-static int
-em_init(void)
-{
- init_count++;
- if (init_count 1) return init_count;
- return init_count;
-}
-
-static int
-em_shutdown(void)
-{
- init_count--;
- if (init_count 0) return init_count;
- return 0;
-}
-
-static void *
-em_file_open(const char *file, Evas_Object *obj)
+static unsigned char
+em_init(Evas_Object *obj, void **emotion_video)
{
Emotion_Xine_Video *ev;
- int pos_stream = 0;
- int pos_time = 0;
- int length_time = 0;
- uint32_t v;
+ int fds[2];
+
+ if (!emotion_video)
+ return;
ev = calloc(1, sizeof(Emotion_Xine_Video));
- if (!ev) return NULL;
+ if (!ev) return 0;
ev-obj = obj;
ev-decoder = xine_new();
if (!ev-decoder)
- {
- free(ev);
- return NULL;
- }
+ {
+ free(ev);
+ return 0;
+ }
xine_init(ev-decoder);
+ xine_init(ev-decoder);
if (1)
{
xine_cfg_entry_t cf;
@@ -222,39 +205,25 @@
printf(MRL: %s\n, auto_play_mrls[i]);
}
}
+
+ if (pipe(fds) == 0)
{
- int fds[2];
-
- if (pipe(fds) == 0)
- {
-ev-fd_read = fds[0];
-ev-fd_write = fds[1];
-fcntl(ev-fd_read, F_SETFL, O_NONBLOCK);
-ev-fd_handler = ecore_main_fd_handler_add(ev-fd_read,
- ECORE_FD_READ,
- _em_fd_active,
- ev,
- NULL,
- NULL);
-ecore_main_fd_handler_active_set(ev-fd_handler, ECORE_FD_READ);
- }
- }
- {
- int fds[2];
-
- if (pipe(fds) == 0)
- {
-ev-fd_ev_read = fds[0];
-ev-fd_ev_write = fds[1];
-fcntl(ev-fd_ev_read, F_SETFL, O_NONBLOCK);
-ev-fd_ev_handler = ecore_main_fd_handler_add(ev-fd_ev_read,
- ECORE_FD_READ,
- _em_fd_ev_active,
- ev,
- NULL,
- NULL);
-ecore_main_fd_handler_active_set(ev-fd_ev_handler, ECORE_FD_READ);
- }
+ ev-fd_read = fds[0];
+ ev-fd_write = fds[1];
+ fcntl(ev-fd_read, F_SETFL, O_NONBLOCK);
+ ev-fd_handler = ecore_main_fd_handler_add(ev-fd_read,
+ ECORE_FD_READ,
_em_fd_active, ev, NULL, NULL);
+ ecore_main_fd_handler_active_set(ev-fd_handler, ECORE_FD_READ);
+ }
+
+ if (pipe(fds) == 0)
+ {
+ ev-fd_ev_read = fds[0];
+ ev-fd_ev_write = fds[1];
+ fcntl(ev-fd_ev_read, F_SETFL, O_NONBLOCK);
+ ev-fd_ev_handler = ecore_main_fd_handler_add(ev-fd_ev_read,
+ ECORE_FD_READ,
_em_fd_ev_active, ev, NULL, NULL);
+ ecore_main_fd_handler_active_set(ev-fd_ev_handler, ECORE_FD_READ);
}
ev-fd = ev-fd_write;
@@ -266,21 +235,51 @@
ev-stream = xine_stream_new(ev-decoder, ev-audio, ev-video);
ev-queue = xine_event_new_queue(ev-stream);
xine_event_create_listener_thread(ev-queue, _em_event, ev);
+ *emotion_video = ev;
+
+ return 1;
+}
+
+static int
+em_shutdown(void *video)
+{
+ Emotion_Xine_Video *ev;
+
+ ev = (Emotion_Xine_Video *)video;
+
+ printf(EX dispose\n);
+ xine_dispose(ev-stream);
+ printf(EX dispose evq\n);
+ xine_event_dispose_queue(ev-queue);
+ printf(EX
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c
Log Message:
init once!
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- emotion_xine.c 15 Apr 2005 07:27:02 - 1.15
+++ emotion_xine.c 15 Apr 2005 07:36:10 - 1.16
@@ -78,7 +78,6 @@
return 0;
}
xine_init(ev-decoder);
- xine_init(ev-decoder);
if (1)
{
xine_cfg_entry_t cf;
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: borders.c Log Message: Fix cruft left some times after non-opaque resizing. === RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v retrieving revision 1.254 retrieving revision 1.255 diff -u -3 -r1.254 -r1.255 --- borders.c 31 Mar 2005 23:22:01 - 1.254 +++ borders.c 15 Apr 2005 18:41:04 - 1.255 @@ -889,10 +889,10 @@ #endif BorderWinpartChange(ewin, part, 0); + FocusHandleClick(ewin, wbit-win); + if (ewin-border-part[part].aclass) EventAclass(ev, ewin, ewin-border-part[part].aclass); - - FocusHandleClick(ewin, wbit-win); } static void --- SF email is sponsored by - The IT Product Guide Read honest candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595alloc_id=14396op=click ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c cursors.c desktops.c ewins.c file.c handlers.c
pager.c theme.c
Log Message:
Trivial cleanups.
===
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -3 -r1.404 -r1.405
--- E.h 12 Apr 2005 16:43:32 - 1.404
+++ E.h 15 Apr 2005 21:07:39 - 1.405
@@ -60,9 +60,6 @@
#include Imlib2.h
-#define EAllocColor(pxc) \
- XAllocColor(disp, VRoot.cmap, pxc)
-
#define ENABLE_TRANSPARENCY 1
#define ENABLE_THEME_TRANSPARENCY 1
@@ -1067,9 +1064,6 @@
Colormapcurrent_cmap;
Slideout *slideout;
Window context_win;
-#if 1 /* Should be removed */
- int context_w, context_h;
-#endif
charconstrained;
charnogroup;
charkeybinds_changed;
@@ -1735,7 +1729,6 @@
int fillfield(char *s, int fieldno, char *buf);
voidfword(char *s, int num, char *wd);
int findLocalizedFile(char *fname);
-voidrmrf(const char *s);
/* finders.c */
EWin *FindEwinByBase(Window win);
@@ -2297,6 +2290,8 @@
GC ECreateGC(Drawable d, unsigned long mask, XGCValues * val);
int EFreeGC(GC gc);
+#define EAllocColor(pxc) \
+ XAllocColor(disp, VRoot.cmap, pxc)
voidESetColor(XColor * pxc, int r, int g, int b);
voidEGetColor(const XColor * pxc, int *pr, int *pg, int *pb);
===
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -3 -r1.255 -r1.256
--- borders.c 15 Apr 2005 18:41:04 - 1.255
+++ borders.c 15 Apr 2005 21:07:42 - 1.256
@@ -110,20 +110,9 @@
ewb-is = is;
ewb-ts = ts;
-#if 0 /* FIXME - Remove? */
- ImageclassApply(ewin-border-part[i].iclass, ewb-win,
- ewb-w, ewb-h, ewin-active,
- EoIsSticky(ewin), ewb-state, ewb-expose, ST_BORDER);
- if (ts)
- TextclassApply(ewin-border-part[i].iclass, ewb-win,
-ewb-w, ewb-h, ewin-active,
-EoIsSticky(ewin), ewb-state, ewb-expose,
-ewin-border-part[i].tclass, txt);
-#else
ITApply(ewb-win, ewin-border-part[i].iclass, is, ewb-w, ewb-h,
ewb-state, ewin-active, EoIsSticky(ewin), ewb-expose, ST_BORDER,
ewin-border-part[i].tclass, ts, txt);
-#endif
}
static int
@@ -961,32 +950,6 @@
}
}
-#if 0 /* FIXME */
-/* This was in HandleMouseUp() */
-
-{
-
-#if 0
- if ((Mode.last_bpress) (Mode.last_bpress != win))
- {
- ev-xbutton.window = Mode.last_bpress;
- BordersEventMouseOut2(ev);
- ev-xbutton.window = win;
- }
-#endif
-}
-
-static void
-BorderWinpartEventLeave2(EWinBit * wbit, XEvent * ev, EWin * ewin, int j)
-{
- ewin-bits[j].left = 0;
- ewin-bits[j].state = STATE_NORMAL;
- BorderWinpartChange(ewin, j, 0);
- return;
- ev = NULL;
-}
-#endif
-
static void
BorderFrameHandleEvents(XEvent * ev, void *prm)
{
@@ -1009,10 +972,6 @@
switch (ev-type)
{
-#if 0
- case KeyPress:
- break;
-#endif
case ButtonPress:
BorderWinpartEventMouseDown(wbit, ev);
break;
===
RCS file: /cvsroot/enlightenment/e16/e/src/cursors.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- cursors.c 19 Mar 2005 16:40:00 - 1.25
+++ cursors.c 15 Apr 2005 21:07:44 - 1.26
@@ -28,9 +28,6 @@
struct _ecursor
{
char *name;
-#if 0 /* Not used */
- Imlib_Color fg, bg;
-#endif
char *file;
Cursor cursor;
unsigned intref_count;
@@ -92,10 +89,6 @@
ec = Emalloc(sizeof(ECursor));
ec-name = Estrdup(name);
ec-file = Estrdup(image);
-#if 0 /* Not used */
- ec-fg = *fg;
- ec-bg = *bg;
-#endif
ec-cursor = curs;
ec-ref_count = 0;
#if 0 /* Not used */
===
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- desktops.c 30 Mar 2005 22:51:01 - 1.135
+++ desktops.c 15 Apr 2005 21:07:44 - 1.136
@@ -692,14 +692,6 @@
for (i = 0; i Conf.desks.num; i++)
DeskControlsDestroy(_DeskGet(i));
-#if 0
- while ((b = RemoveItem(_DESKTOP_DRAG_CONTROL, 0,
- LIST_FINDBY_NAME, LIST_TYPE_BUTTON)))
-
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h backgrounds.c cmclass.c config.c iclass.c
Log Message:
Disable colormodifier stuff (non-functional).
===
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -3 -r1.405 -r1.406
--- E.h 15 Apr 2005 21:07:39 - 1.405
+++ E.h 15 Apr 2005 23:59:56 - 1.406
@@ -60,6 +60,8 @@
#include Imlib2.h
+#define ENABLE_COLOR_MODIFIERS 0 /* Not functional */
+
#define ENABLE_TRANSPARENCY 1
#define ENABLE_THEME_TRANSPARENCY 1
@@ -393,6 +395,7 @@
}
VirtRoot;
+#if ENABLE_COLOR_MODIFIERS
typedef struct _modcurve
{
int num;
@@ -409,6 +412,7 @@
unsigned intref_count;
}
ColorModifierClass;
+#endif
typedef struct _imagestate
{
@@ -421,7 +425,9 @@
int pixmapfillstyle;
XColor bg, hi, lo, hihi, lolo;
int bevelstyle;
+#if ENABLE_COLOR_MODIFIERS
ColorModifierClass *colmod;
+#endif
}
ImageState;
@@ -439,7 +445,9 @@
char *name;
ImageStateArray norm, active, sticky, sticky_active;
Imlib_Borderpadding;
+#if ENABLE_COLOR_MODIFIERS
ColorModifierClass *colmod;
+#endif
unsigned intref_count;
}
ImageClass;
@@ -1318,6 +1326,7 @@
Window WindowToEmbed);
/* cmclass.c */
+#if ENABLE_COLOR_MODIFIERS
voidCreateCurve(ModCurve * c);
voidFreeModCurve(ModCurve * c);
voidFreeCMClass(ColorModifierClass * cm);
@@ -1332,6 +1341,7 @@
int bnum, unsigned char *bpx,
unsigned char *bpy);
int ColorModifierConfigLoad(FILE * fs);
+#endif
/* comms.c */
voidCommsInit(void);
===
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- backgrounds.c 30 Mar 2005 22:51:01 - 1.23
+++ backgrounds.c 15 Apr 2005 23:59:58 - 1.24
@@ -43,7 +43,9 @@
charbg_tile;
BgPart bg;
BgPart top;
+#if ENABLE_COLOR_MODIFIERS
ColorModifierClass *cmclass;
+#endif
charkeepim;
unsigned intref_count;
};
@@ -298,7 +300,9 @@
bg-top.xperc = txperc;
bg-top.yperc = typerc;
+#if ENABLE_COLOR_MODIFIERS
bg-cmclass = NULL;
+#endif
bg-keepim = 0;
bg-ref_count = 0;
@@ -394,12 +398,14 @@
return updated;
}
+#if ENABLE_COLOR_MODIFIERS
static void
BackgroundSetColorMofifier(Background * bg, ColorModifierClass * cm)
{
cm-ref_count++;
bg-cmclass = cm;
}
+#endif
static void
BgFindImageSize(BgPart * bgp, int rw, int rh, int *pw, int *ph)
@@ -480,7 +486,10 @@
unsigned intw, h, x, y;
charhasbg, hasfg;
Pixmap pmap, mask;
+
+#if ENABLE_COLOR_MODIFIERS
ColorModifierClass *cm;
+#endif
if (bg-bg.file !bg-bg.im)
{
@@ -496,6 +505,7 @@
bg-top.im = ELoadImage(bg-top.real_file);
}
+#if ENABLE_COLOR_MODIFIERS
cm = bg-cmclass;
if (cm)
cm-ref_count--;
@@ -528,6 +538,7 @@
}
#endif
}
+#endif
hasbg = hasfg = 0;
if (bg-top.im)
@@ -893,9 +904,12 @@
char *bg2 = 0;
char *name = 0;
charignore = 0;
- ColorModifierClass *cm = NULL;
int fields;
+#if ENABLE_COLOR_MODIFIERS
+ ColorModifierClass *cm = NULL;
+#endif
+
ESetColor(xclr, 0, 0, 0);
while (GetLine(s, sizeof(s), fs))
@@ -965,8 +979,10 @@
bg = BackgroundCreate(name, xclr, bg1, i1, i2, i3,
i4, i5, i6, bg2, j1, j2, j3,
j4, j5);
+#if ENABLE_COLOR_MODIFIERS
if (cm)
BackgroundSetColorMofifier(bg, cm);
+#endif
}
}
}
@@ -974,7 +990,9 @@
case CONFIG_COLORMOD:
case ICLASS_COLORMOD:
+#if ENABLE_COLOR_MODIFIERS
cm = FindItem(s2, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
+#endif
break;
case CONFIG_CLASSNAME:
@@ -1176,10 +1194,12 @@
bglist[i]-top.xperc, bglist[i]-top.yperc);
}
+#if ENABLE_COLOR_MODIFIERS
if (bglist[i]-cmclass)
{
fprintf(fs, 370 %s\n, bglist[i]-cmclass-name);
}
+#endif
for (j = 0; j (DesksGetNumber()); j++)
{
@@ -2668,7 +2688,7 @@
autosave();
}
-#if 0
