hugok
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages 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

76
data/themes/default_icons.edc
View File

@ -26,10 +26,12 @@ 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 {
group {
name: "icons/enlightenment/e";
max: 64 64;
parts {
@ -88,8 +90,8 @@ images {
target: "e_glow";
}
}
}
group {
}
group {
name: "icons/enlightenment/exit";
max: 64 64;
parts {
@ -148,8 +150,8 @@ images {
target: "power_button_glow";
}
}
}
group {
}
group {
name: "icons/enlightenment/reset";
max: 64 64;
parts {
@ -208,8 +210,8 @@ images {
target: "reset_button_glow";
}
}
}
group {
}
group {
name: "icons/enlightenment/themes";
max: 64 64;
parts {
@ -268,8 +270,8 @@ images {
target: "theme_button_glow";
}
}
}
group {
}
group {
name: "icons/enlightenment/windows";
max: 64 64;
parts {
@ -286,8 +288,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/lost_windows";
max: 64 64;
parts {
@ -304,8 +306,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/modules";
max: 64 64;
parts {
@ -322,8 +324,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/favorites";
max: 64 64;
parts {
@ -340,8 +342,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/desktops";
max: 64 64;
parts {
@ -358,8 +360,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/gadgets";
max: 64 64;
parts {
@ -376,8 +378,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/configuration";
max: 64 64;
parts {
@ -394,8 +396,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/run";
max: 64 64;
parts {
@ -412,9 +414,8 @@ images {
}
}
}
}
group {
}
group {
name: "icons/enlightenment/fileman";
max: 64 64;
parts {
@ -473,8 +474,26 @@ images {
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 {
}
}
}
}
group {
name: "icons/widget/new_dialog";
parts {
part {
@ -490,4 +509,5 @@ images {
}
}
}
}
}

29
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", "");
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);