enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

asparagus time! :) 

SVN revision: 18427
This commit is contained in:
Carsten Haitzler 2005-11-11 08:03:49 +00:00
parent b5be31c1c5
commit b44dc02703
4 changed files with 456 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -7,7 +7,7 @@ AC_INIT(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
AM_INIT_AUTOMAKE(enlightenment, 0.16.999.018)
AM_INIT_AUTOMAKE(enlightenment, 0.16.999.019)
AM_CONFIG_HEADER(config.h)
AC_C_BIGENDIAN

8
data/themes/default_fileman.edc
View File

@ -29,7 +29,7 @@ group { \
part { \
name: "icon"; \
mouse_events: 0; \
description { \
description { \
state: "default" 0.0; \
aspect: 1.0 1.0; \
align: 0.5 0.0; \
@ -37,7 +37,7 @@ group { \
normal: "e17_icon_fileman_"TYPE".png"; \
} \
} \
description { \
description { \
state: "disabled" 0.0; \
inherit: "default" 0.0; \
color: 128 128 128 255; \
@ -87,11 +87,11 @@ group { \
normal: "e17_icon_fileman_"TYPE"_clicked.png"; \
} \
} \
description { \
description { \
state: "disabled" 0.0; \
inherit: "default" 0.0; \
color: 128 128 128 255; \
} \
} \
} \
} \
programs { \

824
data/themes/default_icons.edc
View File

@ -26,468 +26,488 @@ images {
image: "e17_icon_configuration.png" LOSSY 90;
image: "e17_icon_run.png" LOSSY 90;
image: "e17_pager_window.png" COMP;
image: "e17_icon_right_arrow.png" COMP;
}
group {
name: "icons/enlightenment/e";
max: 64 64;
parts {
part {
name: "e";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_e_0.png";
}
}
}
part {
name: "e_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "e";
}
rel2 {
to: "e";
}
color: 255 255 255 0;
image {
normal: "e17_icon_e_glow_0.png";
}
}
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
group {
name: "icons/enlightenment/e";
max: 64 64;
parts {
part {
name: "e";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_e_0.png";
}
}
}
programs {
program {
name: "e_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "e_glow";
part {
name: "e_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "e";
}
rel2 {
to: "e";
}
color: 255 255 255 0;
image {
normal: "e17_icon_e_glow_0.png";
}
}
program {
name: "e_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "e_glow";
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
}
group {
name: "icons/enlightenment/exit";
max: 64 64;
parts {
part {
name: "power_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_power_button_0.png";
}
}
}
part {
name: "power_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "power_button";
}
rel2 {
to: "power_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_power_button_glow_0.png";
}
}
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
programs {
program {
name: "e_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "e_glow";
}
program {
name: "e_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "e_glow";
}
}
}
group {
name: "icons/enlightenment/exit";
max: 64 64;
parts {
part {
name: "power_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_power_button_0.png";
}
}
}
programs {
program {
name: "power_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "power_button_glow";
part {
name: "power_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "power_button";
}
rel2 {
to: "power_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_power_button_glow_0.png";
}
}
program {
name: "power_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "power_button_glow";
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
}
group {
name: "icons/enlightenment/reset";
max: 64 64;
parts {
part {
name: "reset_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_reset_button_0.png";
}
}
}
part {
name: "reset_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "reset_button";
}
rel2 {
to: "reset_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_reset_button_glow_0.png";
}
}
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
programs {
program {
name: "power_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "power_button_glow";
}
program {
name: "power_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "power_button_glow";
}
}
}
group {
name: "icons/enlightenment/reset";
max: 64 64;
parts {
part {
name: "reset_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_reset_button_0.png";
}
}
}
programs {
program {
name: "reset_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "reset_button_glow";
part {
name: "reset_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "reset_button";
}
rel2 {
to: "reset_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_reset_button_glow_0.png";
}
}
program {
name: "reset_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "reset_button_glow";
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
}
group {
name: "icons/enlightenment/themes";
max: 64 64;
parts {
part {
name: "theme_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_theme_0.png";
}
}
}
part {
name: "theme_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "theme_button";
}
rel2 {
to: "theme_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_theme_glow_0.png";
}
}
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
programs {
program {
name: "reset_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "reset_button_glow";
}
program {
name: "reset_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "reset_button_glow";
}
}
}
group {
name: "icons/enlightenment/themes";
max: 64 64;
parts {
part {
name: "theme_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_theme_0.png";
}
}
}
programs {
program {
name: "theme_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "theme_button_glow";
part {
name: "theme_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "theme_button";
}
rel2 {
to: "theme_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_theme_glow_0.png";
}
}
program {
name: "theme_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "theme_button_glow";
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
}
group {
name: "icons/enlightenment/windows";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_windows.png";
}
}
programs {
program {
name: "theme_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "theme_button_glow";
}
program {
name: "theme_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "theme_button_glow";
}
}
}
group {
name: "icons/enlightenment/windows";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_windows.png";
}
}
}
}
group {
name: "icons/enlightenment/lost_windows";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_lost_windows.png";
}
}
group {
name: "icons/enlightenment/lost_windows";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_lost_windows.png";
}
}
}
}
group {
name: "icons/enlightenment/modules";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_module.png";
}
}
group {
name: "icons/enlightenment/modules";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_module.png";
}
}
}
}
group {
name: "icons/enlightenment/favorites";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_favorites.png";
}
}
group {
name: "icons/enlightenment/favorites";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_favorites.png";
}
}
}
}
group {
name: "icons/enlightenment/desktops";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_desktop.png";
}
}
group {
name: "icons/enlightenment/desktops";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_desktop.png";
}
}
}
}
group {
name: "icons/enlightenment/gadgets";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_gadget.png";
}
}
group {
name: "icons/enlightenment/gadgets";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_gadget.png";
}
}
}
}
group {
name: "icons/enlightenment/configuration";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_configuration.png";
}
}
group {
name: "icons/enlightenment/configuration";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_configuration.png";
}
}
}
}
group {
name: "icons/enlightenment/run";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_run.png";
}
}
group {
name: "icons/enlightenment/run";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_run.png";
}
}
}
}
}
group {
name: "icons/enlightenment/fileman";
max: 64 64;
parts {
part {
name: "fileman_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_fileman_folder.png";
}
}
}
part {
name: "fileman_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "fileman_button";
}
rel2 {
to: "fileman_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_fileman_folder_clicked.png";
}
}
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
}
programs {
program {
name: "fileman_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "fileman_button_glow";
}
program {
name: "fileman_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "fileman_button_glow";
}
}
}
group {
name: "icons/enlightenment/unknown";
max: 64 64;
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 28 28;
image {
normal: "e17_pager_window.png";
}
}
}
}
}
group {
name: "icons/widget/new_dialog";
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 0.83333333333 0.83333333333;
max: 10 12;
image {
normal: "e17_icon_right_arrow.png";
}
}
}
}
}
group {
name: "icons/enlightenment/fileman";
max: 64 64;
parts {
part {
name: "fileman_button";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 1.0 1.0;
max: 64 64;
image {
normal: "e17_icon_fileman_folder.png";
}
}
}
part {
name: "fileman_button_glow";
mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to: "fileman_button";
}
rel2 {
to: "fileman_button";
}
color: 255 255 255 0;
image {
normal: "e17_icon_fileman_folder_clicked.png";
}
}
description {
state: "hilited" 0.0;
inherit: "default" 0.0;
visible: 1;
color: 255 255 255 255;
}
}
}
programs {
program {
name: "fileman_button_in";
signal: "active";
source: "";
action: STATE_SET "hilited" 0.0;
transition: LINEAR 0.5;
target: "fileman_button_glow";
}
program {
name: "fileman_button_out";
signal: "passive";
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
target: "fileman_button_glow";
}
}
}
group {
name: "icons/widget/new_dialog";
parts {
part {
name: "icon";
mouse_events: 0;
description {
state: "default" 0.0;
aspect: 0.83333333333 0.83333333333;
max: 10 12;
image {
normal: "e17_icon_right_arrow.png";
}
}
}
}
}

31
src/bin/e_border.c
View File

@ -1129,12 +1129,16 @@ e_border_focus_set(E_Border *bd, int focus, int set)
e_border_focus_latest_set(bd);
// printf("EMIT 0x%x activeve\n", bd->client.win);
edje_object_signal_emit(bd->bg_object, "active", "");
if (bd->icon_object)
edje_object_signal_emit(bd->icon_object, "active", "");
e_focus_event_focus_in(bd);
}
else if ((!focus) && (bd->focused))
{
// printf("EMIT 0x%x passive\n", bd->client.win);
edje_object_signal_emit(bd->bg_object, "passive", "");
if (bd->icon_object)
edje_object_signal_emit(bd->icon_object, "passive", "");
e_focus_event_focus_out(bd);
/* FIXME: Sometimes we should leave the window fullscreen! */
if (bd->fullscreen)
@ -1183,6 +1187,8 @@ e_border_focus_set(E_Border *bd, int focus, int set)
{
// printf("unfocus previous\n");
edje_object_signal_emit(focused->bg_object, "passive", "");
if (focused->icon_object)
edje_object_signal_emit(focused->icon_object, "passive", "");
e_focus_event_focus_out(focused);
/* FIXME: Sometimes we should leave the window fullscreen! */
if (focused->fullscreen) e_border_unfullscreen(focused);
@ -1206,6 +1212,8 @@ e_border_focus_set(E_Border *bd, int focus, int set)
{
// printf("unfocus previous 2\n");
edje_object_signal_emit(focused->bg_object, "passive", "");
if (focused->icon_object)
edje_object_signal_emit(focused->icon_object, "passive", "");
e_focus_event_focus_out(focused);
/* FIXME: Sometimes we should leave the window fullscreen! */
if (focused->fullscreen) e_border_unfullscreen(focused);
@ -2156,6 +2164,12 @@ e_border_icon_add(E_Border *bd, Evas *evas)
}
o = NULL;
if (bd->internal)
{
o = edje_object_add(evas);
e_util_edje_icon_set(o, "enlightenment/e");
return o;
}
if ((bd->client.icccm.name) && (bd->client.icccm.class))
{
char *title = "";
@ -2181,15 +2195,22 @@ e_border_icon_add(E_Border *bd, Evas *evas)
bd->app = a;
e_object_ref(E_OBJECT(bd->app));
}
return o;
}
else if (bd->client.netwm.icons)
{
/* TODO: Use the right icon */
o = e_icon_add(evas);
e_icon_data_set(o, bd->client.netwm.icons[0].data,
bd->client.netwm.icons[0].width,
bd->client.netwm.icons[0].height);
e_icon_alpha_set(o, 1);
return o;
}
if (!o)
{
o = edje_object_add(evas);
e_util_edje_icon_set(o, "enlightenment/unknown");
return o;
}
return o;
}
@ -4883,7 +4904,11 @@ _e_border_eval(E_Border *bd)
edje_object_signal_callback_add(bd->bg_object, "*", "*",
_e_border_cb_signal_bind, bd);
if (bd->focused)
edje_object_signal_emit(bd->bg_object, "active", "");
{
edje_object_signal_emit(bd->bg_object, "active", "");
if (bd->icon_object)
edje_object_signal_emit(bd->icon_object, "active", "");
}
if (bd->shaded)
edje_object_signal_emit(bd->bg_object, "shaded", "");
if (bd->maximized == E_MAXIMIZE_FULLSCREEN)
@ -5557,6 +5582,8 @@ _e_border_eval(E_Border *bd)
bd->icon_object = NULL;
}
bd->icon_object = e_border_icon_add(bd, bd->bg_evas);
if ((bd->focused) && (bd->icon_object))
edje_object_signal_emit(bd->icon_object, "active", "");
if (bd->bg_object)
{
evas_object_show(bd->icon_object);