fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make use of calendar window attributes instead of constants.

Browse Source
This commit is contained in:
Frederic Culot 2009-08-25 14:51:05 +00:00
parent 2cfafe8a89
commit 700ecefc3a
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/wins.c
View File

@ -1,4 +1,4 @@
/* $calcurse: wins.c,v 1.26 2009/07/12 16:22:03 culot Exp $ */ /* $calcurse: wins.c,v 1.27 2009/08/25 14:51:05 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -264,19 +264,22 @@ wins_get_config (void)
win[NOT].x = 0; win[NOT].x = 0;
} }
win[CAL].w = CALWIDTH;
win[CAL].h = CALHEIGHT;
if (layout <= 4) if (layout <= 4)
{ /* APPOINTMENT is the biggest panel */ { /* APPOINTMENT is the biggest panel */
win[APP].w = col - CALWIDTH; win[APP].w = col - win[CAL].w;
win[APP].h = row - (win[STA].h + win[NOT].h); win[APP].h = row - (win[STA].h + win[NOT].h);
win[TOD].w = CALWIDTH; win[TOD].w = win[CAL].w;
win[TOD].h = row - (CALHEIGHT + win[STA].h + win[NOT].h); win[TOD].h = row - (win[CAL].h + win[STA].h + win[NOT].h);
} }
else else
{ /* TODO is the biggest panel */ { /* TODO is the biggest panel */
win[TOD].w = col - CALWIDTH; win[TOD].w = col - win[CAL].w;
win[TOD].h = row - (win[STA].h + win[NOT].h); win[TOD].h = row - (win[STA].h + win[NOT].h);
win[APP].w = CALWIDTH; win[APP].w = win[CAL].w;
win[APP].h = row - (CALHEIGHT + win[STA].h + win[NOT].h); win[APP].h = row - (win[CAL].h + win[STA].h + win[NOT].h);
} }
/* defining the layout */ /* defining the layout */
@ -287,7 +290,7 @@ wins_get_config (void)
win[APP].x = 0; win[APP].x = 0;
win[CAL].y = 0; win[CAL].y = 0;
win[TOD].x = win[APP].w; win[TOD].x = win[APP].w;
win[TOD].y = CALHEIGHT; win[TOD].y = win[CAL].h;
win[CAL].x = win[APP].w; win[CAL].x = win[APP].w;
break; break;
case 2: case 2:
@ -303,22 +306,22 @@ wins_get_config (void)
win[TOD].x = 0; win[TOD].x = 0;
win[CAL].x = 0; win[CAL].x = 0;
win[CAL].y = 0; win[CAL].y = 0;
win[APP].x = CALWIDTH; win[APP].x = win[CAL].w;
win[TOD].y = CALHEIGHT; win[TOD].y = win[CAL].h;
break; break;
case 4: case 4:
win[APP].y = 0; win[APP].y = 0;
win[TOD].x = 0; win[TOD].x = 0;
win[TOD].y = 0; win[TOD].y = 0;
win[CAL].x = 0; win[CAL].x = 0;
win[APP].x = CALWIDTH; win[APP].x = win[CAL].w;
win[CAL].y = win[TOD].h; win[CAL].y = win[TOD].h;
break; break;
case 5: case 5:
win[TOD].y = 0; win[TOD].y = 0;
win[TOD].x = 0; win[TOD].x = 0;
win[CAL].y = 0; win[CAL].y = 0;
win[APP].y = CALHEIGHT; win[APP].y = win[CAL].h;
win[APP].x = win[TOD].w; win[APP].x = win[TOD].w;
win[CAL].x = win[TOD].w; win[CAL].x = win[TOD].w;
break; break;
@ -335,15 +338,15 @@ wins_get_config (void)
win[APP].x = 0; win[APP].x = 0;
win[CAL].x = 0; win[CAL].x = 0;
win[CAL].y = 0; win[CAL].y = 0;
win[TOD].x = CALWIDTH; win[TOD].x = win[CAL].w;
win[APP].y = CALHEIGHT; win[APP].y = win[CAL].h;
break; break;
case 8: case 8:
win[TOD].y = 0; win[TOD].y = 0;
win[APP].x = 0; win[APP].x = 0;
win[CAL].x = 0; win[CAL].x = 0;
win[APP].y = 0; win[APP].y = 0;
win[TOD].x = CALWIDTH; win[TOD].x = win[CAL].w;
win[CAL].y = win[APP].h; win[CAL].y = win[APP].h;
break; break;
} }
@ -435,7 +438,7 @@ wins_update (void)
apoint_update_panel (slctd_win); apoint_update_panel (slctd_win);
todo_update_panel (slctd_win); todo_update_panel (slctd_win);
calendar_update_panel (win[CAL].p); calendar_update_panel (&win[CAL]);
wins_status_bar (); wins_status_bar ();
if (notify_bar ()) if (notify_bar ())
notify_update_bar (); notify_update_bar ();