Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e.h e_bindings.c e_main.c e_menu.c e_zone.c
Log Message:
pagers, desktops and zones seem to work just fine on first start. though
"primary zone" is not known so it keeps querying the mouse - fix that and
only use the first zone when startng the first time.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e.h 20 May 2005 03:09:43 -0000 1.17
+++ e.h 20 May 2005 06:30:25 -0000 1.18
@@ -97,5 +97,8 @@
extern EAPI E_Path *path_modules;
extern EAPI E_Path *path_backgrounds;
extern EAPI int restart;
+extern EAPI int good;
+extern EAPI int evil;
+extern EAPI int starting;
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_bindings.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_bindings.c 10 May 2005 10:34:19 -0000 1.11
+++ e_bindings.c 20 May 2005 06:30:25 -0000 1.12
@@ -315,7 +315,6 @@
{
Evas_List *l;
- printf("GRAB KEYS %p\n", key_bindings);
for (l = key_bindings; l; l = l->next)
{
E_Binding_Key *bind;
@@ -330,7 +329,6 @@
if (bind->mod & E_BINDING_MODIFIER_CTRL) mod |=
ECORE_X_MODIFIER_CTRL;
if (bind->mod & E_BINDING_MODIFIER_ALT) mod |=
ECORE_X_MODIFIER_ALT;
if (bind->mod & E_BINDING_MODIFIER_WIN) mod |=
ECORE_X_MODIFIER_WIN;
- printf("BIND %x %s %x %i\n", win, bind->key, mod, bind->any_mod);
ecore_x_window_key_grab(win, bind->key,
mod, bind->any_mod);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_main.c 20 May 2005 03:09:44 -0000 1.82
+++ e_main.c 20 May 2005 06:30:26 -0000 1.83
@@ -38,6 +38,7 @@
int restart = 0;
int good = 0;
int evil = 0;
+int starting = 1;
/* local subsystem globals */
#define MAX_LEVEL 32
@@ -443,6 +444,8 @@
/* run any testing code now we are set up */
e_test();
+ /* no longer starting up */
+ starting = 0;
/* start our main loop */
ecore_main_loop_begin();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_menu.c 20 May 2005 03:09:44 -0000 1.31
+++ e_menu.c 20 May 2005 06:30:26 -0000 1.32
@@ -2056,14 +2056,14 @@
*
* quadrants... which one
*/
- if (w != m->zone->container->w)
- xr = (double)(x - m->zone->container->x) /
- (double)(m->zone->container->w - w);
+ if (w != m->zone->w)
+ xr = (double)(x - m->zone->x) /
+ (double)(m->zone->w - w);
else
xr = 0.0;
- if (h != m->zone->container->h)
- yr = (double)(y - m->zone->container->y) /
- (double)(m->zone->container->h - h);
+ if (h != m->zone->h)
+ yr = (double)(y - m->zone->y) /
+ (double)(m->zone->h - h);
else
yr = 0.0;
if ((xr + yr) < 0.99) /* top or left */
@@ -2072,9 +2072,9 @@
/* L */
{
m->cur.x = x + w;
- if (y < (m->zone->container->y + ((m->zone->container->h * 1) /
3)))
+ if (y < (m->zone->y + ((m->zone->h * 1) / 3)))
m->cur.y = y;
- else if (y < (m->zone->container->y + ((m->zone->container->h * 2)
/ 3)))
+ else if (y < (m->zone->y + ((m->zone->h * 2) / 3)))
m->cur.y = y + ((h - m->cur.h) / 2);
else
m->cur.y = y + h - m->cur.h;
@@ -2084,9 +2084,9 @@
/* T */
{
m->cur.y = y + h;
- if (x < (m->zone->container->x + ((m->zone->container->w * 1) /
3)))
+ if (x < (m->zone->x + ((m->zone->w * 1) / 3)))
m->cur.x = x;
- else if (x < (m->zone->container->x + ((m->zone->container->w * 2)
/ 3)))
+ else if (x < (m->zone->x + ((m->zone->w * 2) / 3)))
m->cur.x = x + ((w - m->cur.w) / 2);
else
m->cur.x = x + w - m->cur.w;
@@ -2099,9 +2099,9 @@
/* B */
{
m->cur.y = y - m->cur.h;
- if (x < (m->zone->container->x + ((m->zone->container->w * 1) /
3)))
+ if (x < (m->zone->x + ((m->zone->w * 1) / 3)))
m->cur.x = x;
- else if (x < (m->zone->container->x + ((m->zone->container->w * 2)
/ 3)))
+ else if (x < (m->zone->x + ((m->zone->w * 2) / 3)))
m->cur.x = x + ((w - m->cur.w) / 2);
else
m->cur.x = x + w - m->cur.w;
@@ -2111,9 +2111,9 @@
/* R */
{
m->cur.x = x - m->cur.w;
- if (y < (m->zone->container->y + ((m->zone->container->h * 1) /
3)))
+ if (y < (m->zone->y + ((m->zone->h * 1) / 3)))
m->cur.y = y;
- else if (y < (m->zone->container->y + ((m->zone->container->h * 2)
/ 3)))
+ else if (y < (m->zone->y + ((m->zone->h * 2) / 3)))
m->cur.y = y + ((h - m->cur.h) / 2);
else
m->cur.y = y + h - m->cur.h;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_zone.c 13 May 2005 10:09:55 -0000 1.51
+++ e_zone.c 20 May 2005 06:30:26 -0000 1.52
@@ -212,7 +212,7 @@
/* the current zone is whatever zone has the focused window */
return bd->zone;
}
- else
+ else if (!starting)
{
int x, y;
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
