Menu
▾
▴
enlightenment-cvs
|
From: Enlightenment C. <no...@cv...> - 2008-08-07 06:45:09
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
oops. missed case.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -3 -r1.651 -r1.652
--- e_border.c 7 Aug 2008 06:16:35 -0000 1.651
+++ e_border.c 7 Aug 2008 06:45:02 -0000 1.652
@@ -1473,7 +1473,7 @@
if ((bd->want_focus) && (set) && (!focus))
bd->want_focus = 0;
}
- if (!bd->visible)
+ if ((!bd->visible) && (focus))
{
e_border_focus_latest_set(bd);
bd->want_focus = 1;
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-07 07:08:17
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
remove debugging! works!
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -3 -r1.652 -r1.653
--- e_border.c 7 Aug 2008 06:45:02 -0000 1.652
+++ e_border.c 7 Aug 2008 07:08:16 -0000 1.653
@@ -1411,26 +1411,18 @@
// if (!bd->client.icccm.accepts_focus) return;
if ((!bd->client.icccm.accepts_focus) &&
(!bd->client.icccm.take_focus))
- {
- printf(" - SKIP I F %p %i %i\n", bd, focus, set);
return;
- }
/* dont focus an iconified window. that's silly! */
if ((focus) && (bd->iconic))
- {
- printf(" - SKIP H F %p %i %i\n", bd, focus, set);
- return;
- }
+ return;
if ((bd->modal) && (bd->modal != bd))
{
e_border_focus_set(bd->modal, focus, set);
- printf(" - SKIP G F %p %i %i\n", bd, focus, set);
return;
}
else if ((bd->leader) && (bd->leader->modal) && (bd->leader->modal != bd))
{
e_border_focus_set(bd->leader->modal, focus, set);
- printf(" - SKIP F F %p %i %i\n", bd, focus, set);
return;
}
@@ -1444,11 +1436,9 @@
e_border_focus_latest_set(bd);
bd->want_focus = 1;
bd->changed = 1;
- printf(" - SKIP E F %p %i %i\n", bd, focus, set);
return;
}
e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
- printf(" - SKIP D F %p %i %i\n", bd, focus, set);
return;
}
else if ((!bd->client.icccm.accepts_focus) &&
@@ -1459,11 +1449,9 @@
e_border_focus_latest_set(bd);
bd->want_focus = 1;
bd->changed = 1;
- printf(" - SKIP C F %p %i %i\n", bd, focus, set);
return;
}
e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
- printf(" - SKIP B F %p %i %i\n", bd, focus, set);
return;
}
}
@@ -1478,7 +1466,6 @@
e_border_focus_latest_set(bd);
bd->want_focus = 1;
bd->changed = 1;
- printf(" - SKIP AA F %p %i %i\n", bd, focus, set);
return;
}
if ((focus) && (!bd->focused))
@@ -1488,7 +1475,6 @@
e_border_focus_latest_set(bd);
bd->want_focus = 1;
bd->changed = 1;
- printf(" - SKIP A F %p %i %i\n", bd, focus, set);
return;
}
// if (bd->visible)
@@ -1564,7 +1550,6 @@
{
E_Event_Border_Focus_Out *ev;
- printf("unfocus previous\n");
edje_object_signal_emit(focused->bg_object, "e,state,unfocused", "e");
if (focused->icon_object)
edje_object_signal_emit(focused->icon_object, "e,state,unfocused", "e");
@@ -1576,7 +1561,6 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
_e_border_event_border_focus_out_free, NULL);
- printf("FOUT %s\n", bd->client.netwm.name);
/* FIXME: Sometimes we should leave the window fullscreen! */
// if (focused->fullscreen) e_border_unfullscreen(focused);
@@ -1620,14 +1604,12 @@
}
*/
#endif
- printf("- F=%i, S=%i V=%i, W=%i\n", focus, set, bd->visible, bd->want_focus);
if (focus_changed)
{
if (bd->focused)
{
E_Event_Border_Focus_In *ev;
- printf(" - focused = %p\n", focused);
focused = bd;
//printf("set focused to %p\n", focused);
@@ -1639,7 +1621,6 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
_e_border_event_border_focus_in_free, NULL);
- printf("FIN %s\n", bd->client.netwm.name);
}
else
{
@@ -1656,7 +1637,6 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
_e_border_event_border_focus_out_free, NULL);
- printf("FOUT %s\n", bd->client.netwm.name);
}
}
}
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-07 23:37:16
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
batget.c
Log Message:
handle other states for "state" - not charging is an... interesting one...
(as a replacement for discharging)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- batget.c 19 Jun 2008 12:18:59 -0000 1.13
+++ batget.c 7 Aug 2008 23:37:14 -0000 1.14
@@ -712,6 +712,8 @@
{
full = 0;
if (!strncasecmp("discharging", tmp, 11)) charging = 0;
+ else if (!strncasecmp("unknown", tmp, 7)) charging = 0;
+ else if (!strncasecmp("not charging", tmp, 12)) charging = 0;
else if (!strncasecmp("charging", tmp, 8)) charging = 1;
else if (!strncasecmp("full", tmp, 4))
{
@@ -1058,7 +1060,7 @@
tmp = str_get(buf);
if (tmp)
{
- if (!strcmp(tmp, "yes")) have_battery = 1;
+ if (!strcasecmp(tmp, "yes")) have_battery = 1;
free(tmp);
}
/* capacity state: ok/? */
@@ -1070,7 +1072,7 @@
{
if (have_power == 0)
{
- if (!strcmp(tmp, "charging")) have_power = 1;
+ if (!strcasecmp(tmp, "charging")) have_power = 1;
}
free(tmp);
}
@@ -1079,7 +1081,7 @@
tmp = str_get(buf);
if (tmp)
{
- if (strcmp(tmp, "unknown")) rate += atoi(tmp);
+ if (strcasecmp(tmp, "unknown")) rate += atoi(tmp);
free(tmp);
}
/* remaining capacity: NNN */
@@ -1087,7 +1089,7 @@
tmp = str_get(buf);
if (tmp)
{
- if (strcmp(tmp, "unknown")) capacity += atoi(tmp);
+ if (strcasecmp(tmp, "unknown")) capacity += atoi(tmp);
free(tmp);
}
fclose(f);
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-10 01:56:28
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_manager.c
Log Message:
notes
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_manager.c 9 Jul 2008 15:25:20 -0000 1.72
+++ e_manager.c 10 Aug 2008 01:56:24 -0000 1.73
@@ -811,6 +811,20 @@
bd = e_border_find_by_client_window(e->win);
if ((bd) && (!bd->focused))
{
+#if 0 /* notes */
+ if (e->data.l[0] == 0 /* 0 == old, 1 == client, 2 == pager */)
+ {
+ // FIXME: need config for the below - what to do given each
+ // request (either do nothng, make app look urgent/want
+ // attention or actiually flip to app as below is the
+ // current default)
+ // if 0 == just make app demand attention somehow
+ // if 1 == just make app demand attention somehow
+ // if 2 == activate window as below
+ }
+ timestamp = e->data.l[1];
+ requestor_id e->data.l[2];
+#endif
if (bd->iconic)
{
if (e_config->clientlist_warp_to_iconified_desktop == 1)
@@ -828,13 +842,6 @@
bd->x + (bd->w / 2), bd->y + (bd->h / 2));
e_border_focus_set(bd, 1, 1);
}
-#if 0 /* notes */
- if (e->data.l[0] == 0 /* 0 == old, 1 == client, 2 == pager */)
- {
- }
- timestamp = e->data.l[1];
- requestor_id e->data.l[2];
-#endif
}
}
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-11 01:22:36
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_border.c e_desk.c e_int_menus.c
Log Message:
and respect focus lock out flag more
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_actions.c 8 Jul 2008 14:00:53 -0000 1.118
+++ e_actions.c 11 Aug 2008 01:22:33 -0000 1.119
@@ -984,7 +984,8 @@
e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
/* send the border to the required desktop. */
e_border_desk_set(bd, desk);
- e_border_focus_set(bd, 1, 1);
+ if (!bd->lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
}
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -3 -r1.653 -r1.654
--- e_border.c 7 Aug 2008 07:08:16 -0000 1.653
+++ e_border.c 11 Aug 2008 01:22:33 -0000 1.654
@@ -1371,7 +1371,8 @@
// printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
if ((!bd->client.icccm.accepts_focus) &&
(!bd->client.icccm.take_focus)) return;
-
+ if (bd->lock_focus_out) return;
+
/* Try to grab the pointer to make sure it's not "in use" */
if (!ecore_x_pointer_grab(bd->zone->container->win))
return;
@@ -1412,6 +1413,7 @@
if ((!bd->client.icccm.accepts_focus) &&
(!bd->client.icccm.take_focus))
return;
+ if ((set) && (focus) && (bd->lock_focus_out)) return;
/* dont focus an iconified window. that's silly! */
if ((focus) && (bd->iconic))
return;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_desk.c 7 Jul 2008 01:03:33 -0000 1.73
+++ e_desk.c 11 Aug 2008 01:22:33 -0000 1.74
@@ -367,7 +367,8 @@
if ((!bd->iconic) && (bd->visible) && (bd->desk == desk))
{
/* this was the window last focused in this desktop */
- e_border_focus_set(bd, 1, 1);
+ if (!bd->lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
break;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -3 -r1.233 -r1.234
--- e_int_menus.c 25 Mar 2008 16:48:14 -0000 1.233
+++ e_int_menus.c 11 Aug 2008 01:22:33 -0000 1.234
@@ -1461,7 +1461,8 @@
e_border_move(bd, bd->zone->x + ((bd->zone->w - bd->w) / 2),
bd->zone->y + ((bd->zone->h - bd->h) / 2));
e_border_raise(bd);
- e_border_focus_set(bd, 1, 1);
+ if (!bd->lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
}
static void
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 01:16:29
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e
Modified Files:
configure.in
Log Message:
build! fix breaks!
===================================================================
RCS file: /cvs/e/e17/apps/e/configure.in,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -3 -r1.212 -r1.213
--- configure.in 13 Aug 2008 19:22:01 -0000 1.212
+++ configure.in 14 Aug 2008 01:16:26 -0000 1.213
@@ -209,14 +209,24 @@
ecore-txt
], [
have_temp="yes"
- # This test will succeed as these modules are also checked before
+ have_bat="yes"
+], [ have_temp="no"])
+
+AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes")
+if test x$have_temp = "xyes"; then
PKG_CHECK_MODULES(TEMPERATURE, [
ecore
ecore-file
])
-], [ have_temp="no"])
-AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = "xyes")
+fi
AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = "xyes")
+if test x$have_bat = "xyes"; then
+ PKG_CHECK_MODULES(BATTERY, [
+ ecore
+ ecore-file
+ ecore-con
+ ])
+fi
PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no)
PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no)
@@ -232,8 +242,8 @@
fi
fi
-e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "
-e_cflags="-DUSE_E_CONFIG_H "$define_e_dbus" "$E_CFLAGS" "$E_DBUS_CFLAGS" "
+e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS" "
+e_cflags="-DUSE_E_CONFIG_H "$define_e_dbus" "$E_CFLAGS" "$E_DBUS_CFLAGS" "$ECORE_IMF_CFLAGS" "
e_configflags="-DUSE_E_CONFIG_H "$define_e_dbus" "
AC_SUBST(e_libs)
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 01:16:30
|
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_main.c Log Message: build! fix breaks! =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.244 retrieving revision 1.245 diff -u -3 -r1.244 -r1.245 --- e_main.c 13 Aug 2008 19:22:01 -0000 1.244 +++ e_main.c 14 Aug 2008 01:16:27 -0000 1.245 @@ -3,7 +3,9 @@ */ #include "e.h" +#ifdef HAVE_ECORE_IMF #include <Ecore_IMF.h> +#endif EAPI int e_precache_end = 0; |
|
From: Enlightenment C. <no...@cv...> - 2008-08-14 01:29:04
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_theme
Modified Files:
e_int_config_theme.c
Log Message:
and use the right.... func.. that exists!
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_theme.c 13 Aug 2008 18:31:15 -0000 1.14
+++ e_int_config_theme.c 14 Aug 2008 01:29:02 -0000 1.15
@@ -264,7 +264,7 @@
cfdata = data1;
if (cfdata->dia_web)
- e_dialog_raise(cfdata->dia_web);
+ e_win_raise(cfdata->dia_web->win);
else
cfdata->dia_web = e_int_config_theme_web(cfdata->cfd);
}
|
Thanks for helping keep SourceForge clean.
X