kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gadman uses xy ints AT a res. 

SVN revision: 14849
This commit is contained in:
Carsten Haitzler 2005-05-19 02:46:50 +00:00
parent 44c9b74f7f
commit c91c891cb5
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TODO
View File

@ -57,8 +57,9 @@ These are in no particular order:
* start module needs to have an way to alert users to "click here" and back * start module needs to have an way to alert users to "click here" and back
off alerting users as they learn what it is (over time) off alerting users as they learn what it is (over time)
* ctrl-d in xterms (or clising of windows) doesnt always close the window. * (closing of windows) doesn't always close the window. sometimes it loses
sometimes it loses its dropshadow, but the window border is still there. its dropshadow, but the window border is still there. i suspect excess
references - but why? we need to be careful to not leak windows here.
* fix action delete (can segv if action is stored for "long runing actions" * fix action delete (can segv if action is stored for "long runing actions"
like move/resize) like move/resize)
* multiple zones and a pager per zone doesnt flip desktops in that zone alone * multiple zones and a pager per zone doesnt flip desktops in that zone alone

47
src/bin/e_gadman.c
View File

@ -13,7 +13,10 @@ typedef struct _Gadman_Client_Config Gadman_Client_Config;
struct _Gadman_Client_Config struct _Gadman_Client_Config
{ {
double ax, ay; // double ax, ay;
struct {
int x, y, w, h;
} pos;
int w, h; int w, h;
int edge; int edge;
int zone; int zone;
@ -78,8 +81,12 @@ e_gadman_init(void)
#undef D #undef D
#define T Gadman_Client_Config #define T Gadman_Client_Config
#define D gadman_config_edd #define D gadman_config_edd
E_CONFIG_VAL(D, T, ax, DOUBLE); // E_CONFIG_VAL(D, T, ax, DOUBLE);
E_CONFIG_VAL(D, T, ay, DOUBLE); // E_CONFIG_VAL(D, T, ay, DOUBLE);
E_CONFIG_VAL(D, T, pos.x, INT);
E_CONFIG_VAL(D, T, pos.y, INT);
E_CONFIG_VAL(D, T, pos.w, INT);
E_CONFIG_VAL(D, T, pos.h, INT);
E_CONFIG_VAL(D, T, w, INT); E_CONFIG_VAL(D, T, w, INT);
E_CONFIG_VAL(D, T, h, INT); E_CONFIG_VAL(D, T, h, INT);
E_CONFIG_VAL(D, T, edge, INT); E_CONFIG_VAL(D, T, edge, INT);
@ -201,8 +208,10 @@ e_gadman_client_save(E_Gadman_Client *gmc)
E_OBJECT_CHECK(gmc); E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE); E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
/* save all values */ /* save all values */
cf.ax = gmc->ax; cf.pos.x = gmc->x - gmc->zone->x;
cf.ay = gmc->ay; cf.pos.y = gmc->y - gmc->zone->y;
cf.pos.w = gmc->zone->w;
cf.pos.h = gmc->zone->h;
cf.w = gmc->w; cf.w = gmc->w;
cf.h = gmc->h; cf.h = gmc->h;
cf.edge = gmc->edge; cf.edge = gmc->edge;
@ -227,13 +236,21 @@ e_gadman_client_load(E_Gadman_Client *gmc)
{ {
E_Zone *zone; E_Zone *zone;
E_CONFIG_LIMIT(cf->ax, 0.0, 1.0); E_CONFIG_LIMIT(cf->pos.x, 0, 10000);
E_CONFIG_LIMIT(cf->ay, 0.0, 1.0); E_CONFIG_LIMIT(cf->pos.y, 0, 10000);
E_CONFIG_LIMIT(cf->pos.w, 1, 10000);
E_CONFIG_LIMIT(cf->pos.h, 1, 10000);
E_CONFIG_LIMIT(cf->w, 0, 10000); E_CONFIG_LIMIT(cf->w, 0, 10000);
E_CONFIG_LIMIT(cf->h, 0, 10000); E_CONFIG_LIMIT(cf->h, 0, 10000);
E_CONFIG_LIMIT(cf->edge, E_GADMAN_EDGE_LEFT, E_GADMAN_EDGE_BOTTOM); E_CONFIG_LIMIT(cf->edge, E_GADMAN_EDGE_LEFT, E_GADMAN_EDGE_BOTTOM);
gmc->ax = cf->ax; if (cf->pos.w != cf->w)
gmc->ay = cf->ay; gmc->ax = (double)(cf->pos.x - cf->w) / (double)(cf->pos.w - cf->w);
else
gmc->ax = 0.0;
if (cf->pos.h != cf->h)
gmc->ay = (double)(cf->pos.y - cf->h) / (double)(cf->pos.h - cf->h);
else
gmc->ay = 0.0;
gmc->w = cf->w; gmc->w = cf->w;
gmc->h = cf->h; gmc->h = cf->h;
gmc->edge = cf->edge; gmc->edge = cf->edge;
@ -253,8 +270,16 @@ e_gadman_client_load(E_Gadman_Client *gmc)
} }
if (gmc->w > gmc->zone->w) gmc->w = gmc->zone->w; if (gmc->w > gmc->zone->w) gmc->w = gmc->zone->w;
if (gmc->h > gmc->zone->h) gmc->h = gmc->zone->h; if (gmc->h > gmc->zone->h) gmc->h = gmc->zone->h;
gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax); // gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax);
gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay); // gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay);
if (cf->pos.w != cf->w)
gmc->x = gmc->zone->x + ((cf->pos.x * (gmc->zone->w - gmc->w)) / (cf->pos.w - gmc->w));
else
gmc->x = gmc->zone->x;
if (cf->pos.h != cf->h)
gmc->y = gmc->zone->y + ((cf->pos.y * (gmc->zone->h - gmc->h)) / (cf->pos.h - gmc->h));
else
gmc->y = gmc->zone->y;
free(cf); free(cf);
} }
_e_gadman_client_overlap_deny(gmc); _e_gadman_client_overlap_deny(gmc);