Platon Technologies
not logged in Login Registration
EnglishSlovak
open source software development celebrating 10 years of open source development! Saturday, October 17, 2026

Diff for tucniak/cuchar/cc_extra.c between version 1.6 and 1.7

version 1.6, 2005/12/01 18:52:28 version 1.7, 2005/12/02 17:15:00
Line 12  void settextparams(WIN *win,PUNION *para
Line 12  void settextparams(WIN *win,PUNION *para
   TEXT *text=&win->extra->text;    TEXT *text=&win->extra->text;
   PTEXT *ptext=&params->text;    PTEXT *ptext=&params->text;
   win->cback=ptext->cback!=C_DEFAULT?ptext->cback:    win->cback=ptext->cback!=C_DEFAULT?ptext->cback:
     (!(win->style&ST_TE_DOWNTEXT_COLORS)?C_BLUE:C_WHITE);      (!(win->style&CC_ST_TE_DOWNTEXT_COLORS)?C_BLUE:C_WHITE);
   text->text=ptext->text;    text->text=ptext->text;
   text->ctext=ptext->ctext!=C_DEFAULT?ptext->ctext:    text->ctext=ptext->ctext!=C_DEFAULT?ptext->ctext:
     (!(win->style&ST_TE_DOWNTEXT_COLORS)?C_WHITE:C_BLACK);      (!(win->style&CC_ST_TE_DOWNTEXT_COLORS)?C_WHITE:C_BLACK);
 }  }
   
 void seteditparams(WIN *win,PUNION *params)  void seteditparams(WIN *win,PUNION *params)
Line 34  void setbuttonparams(WIN *win,PUNION *pa
Line 34  void setbuttonparams(WIN *win,PUNION *pa
 {  {
   BUTTON *button=&win->extra->button;    BUTTON *button=&win->extra->button;
   PBUTTON *pbutton=&params->button;    PBUTTON *pbutton=&params->button;
   if(pbutton->style==BT_NORMAL)    if(pbutton->style==CC_BT_NORMAL)
   {    {
     win->cback=pbutton->cback[0]!=C_DEFAULT?pbutton->cback[0]:C_GREEN;      win->cback=pbutton->cback[0]!=C_DEFAULT?pbutton->cback[0]:C_GREEN;
   }    }
Line 45  void setbuttonparams(WIN *win,PUNION *pa
Line 45  void setbuttonparams(WIN *win,PUNION *pa
   button->text=pbutton->text;    button->text=pbutton->text;
   button->style=pbutton->style;    button->style=pbutton->style;
   button->checked=pbutton->checked;    button->checked=pbutton->checked;
   if(pbutton->style==BT_NORMAL)    if(pbutton->style==CC_BT_NORMAL)
   {    {
     button->cback[0]=pbutton->cback[1]!=C_DEFAULT?pbutton->cback[1]:C_BLACK;      button->cback[0]=pbutton->cback[1]!=C_DEFAULT?pbutton->cback[1]:C_BLACK;
     button->cback[1]=pbutton->cback[2]!=C_DEFAULT?pbutton->cback[2]:C_GREEN;      button->cback[1]=pbutton->cback[2]!=C_DEFAULT?pbutton->cback[2]:C_GREEN;
Line 111  void setcomboparams(WIN *win,PUNION *par
Line 111  void setcomboparams(WIN *win,PUNION *par
   combo->cbutfront[1]=pcombo->cbutfront[1]!=C_DEFAULT?pcombo->cbutfront[1]:C_LGREEN;    combo->cbutfront[1]=pcombo->cbutfront[1]!=C_DEFAULT?pcombo->cbutfront[1]:C_LGREEN;
   combo->change=pcombo->change;    combo->change=pcombo->change;
   combo->maxvisitems=pcombo->maxvisitems;    combo->maxvisitems=pcombo->maxvisitems;
   combo->lstvy=pcombo->lstvy;move_win(combo->list,NOCHANGE,NOCHANGE,NOCHANGE,pcombo->lstvy,NOCHANGE);    combo->lstvy=pcombo->lstvy;move_win(combo->list,CC_NOCHANGE,CC_NOCHANGE,CC_NOCHANGE,pcombo->lstvy,CC_NOCHANGE);
   combo->list->cback=pcombo->lstcback!=C_DEFAULT?pcombo->lstcback:C_GREEN;    combo->list->cback=pcombo->lstcback!=C_DEFAULT?pcombo->lstcback:C_GREEN;
   list->cborder=pcombo->lstcborder!=C_DEFAULT?pcombo->lstcborder:C_LWHITE;    list->cborder=pcombo->lstcborder!=C_DEFAULT?pcombo->lstcborder:C_LWHITE;
   list->ctext=pcombo->lstctext!=C_DEFAULT?pcombo->lstctext:C_LWHITE;    list->ctext=pcombo->lstctext!=C_DEFAULT?pcombo->lstctext:C_LWHITE;
Line 460  void checkwincombo(WIN *win)
Line 460  void checkwincombo(WIN *win)
     LIST *list=&combo->list->extra->list;      LIST *list=&combo->list->extra->list;
     long len=list->numlines;      long len=list->numlines;
     if(len<=combo->maxvisitems)      if(len<=combo->maxvisitems)
       combo->list->style|=ST_AUTOYSIZE;        combo->list->style|=CC_ST_AUTOYSIZE;
     else      else
     {      {
       combo->list->style&=~ST_AUTOYSIZE;        combo->list->style&=~CC_ST_AUTOYSIZE;
       combo->lstvy=combo->maxvisitems+2;        combo->lstvy=combo->maxvisitems+2;
     }      }
   }    }
Line 615  void checkwindialog(WIN *win)
Line 615  void checkwindialog(WIN *win)
   dialog->bclose->x=win->vx-n;    dialog->bclose->x=win->vx-n;
   dialog->bclose->y=0;    dialog->bclose->y=0;
   n++;    n++;
   if((dialog->style&ST_DI_HASMAXIMIZE)==ST_DI_HASMAXIMIZE)    if((dialog->style&CC_ST_DI_HASMAXIMIZE)==CC_ST_DI_HASMAXIMIZE)
   {    {
     dialog->bmaximize->x=win->vx-n;      dialog->bmaximize->x=win->vx-n;
     dialog->bmaximize->y=0;      dialog->bmaximize->y=0;
     n++;      n++;
   }    }
   if((dialog->style&ST_DI_HASMINIMIZE)==ST_DI_HASMINIMIZE)    if((dialog->style&CC_ST_DI_HASMINIMIZE)==CC_ST_DI_HASMINIMIZE)
   {    {
     dialog->bminimize->x=win->vx-n;      dialog->bminimize->x=win->vx-n;
     dialog->bminimize->y=0;      dialog->bminimize->y=0;
Line 676  void drawwinedit(WIN *win)
Line 676  void drawwinedit(WIN *win)
   if(edit->scroll>len)edit->scroll=len;    if(edit->scroll>len)edit->scroll=len;
   windowinitdraw(win,edit->ctext,win->cback,hascolors?true:2);    windowinitdraw(win,edit->ctext,win->cback,hascolors?true:2);
   if(!hascolors)for(i=0;i<win->vx;i++)addchar(win,0,i,'_');    if(!hascolors)for(i=0;i<win->vx;i++)addchar(win,0,i,'_');
   if(edit->style!=ED_PASSWORD)    if(edit->style!=CC_ED_PASSWORD)
   {    {
     mprintw(win,0,-edit->scroll,"%s",edit->text);      mprintw(win,0,-edit->scroll,"%s",edit->text);
   }    }
Line 710  void drawwinbutton(WIN *win,long wx)
Line 710  void drawwinbutton(WIN *win,long wx)
   if((stav==TS_PUSH)||(stav==TS_EXPUSH))set_timer(win,BUTTONCLICK,0,buttontimer);    if((stav==TS_PUSH)||(stav==TS_EXPUSH))set_timer(win,BUTTONCLICK,0,buttontimer);
   if(stav==TS_PUSH){button->status=TS_UP;stav=TS_DOWN;}    if(stav==TS_PUSH){button->status=TS_UP;stav=TS_DOWN;}
   if(stav==TS_EXPUSH){button->status=TS_HIGH;stav=TS_DOWN;}    if(stav==TS_EXPUSH){button->status=TS_HIGH;stav=TS_DOWN;}
   if((button->style==BT_NORMAL)&&button->checked)stav=TS_DOWN;    if((button->style==CC_BT_NORMAL)&&button->checked)stav=TS_DOWN;
   cf=button->ctext[stav];    cf=button->ctext[stav];
   cfu=button->cutext[stav];    cfu=button->cutext[stav];
   if(stav==0)cb=win->cback;else cb=button->cback[stav-1];    if(stav==0)cb=win->cback;else cb=button->cback[stav-1];
   char mode=(!hascolors&&    char mode=(!hascolors&&
             ((button->style==BT_NORMAL)||((button->style!=BT_NORMAL)&&(win==focuswin)))&&              ((button->style==CC_BT_NORMAL)||((button->style!=CC_BT_NORMAL)&&(win==focuswin)))&&
             ((button->style!=BT_NORMAL)||              ((button->style!=CC_BT_NORMAL)||
             ((button->hasfocus&&(stav!=TS_DOWN))||(!button->hasfocus&&(stav==TS_DOWN)))))?3:true;              ((button->hasfocus&&(stav!=TS_DOWN))||(!button->hasfocus&&(stav==TS_DOWN)))))?3:true;
   if(mode==3)attrplus|=A_REVERSE;    if(mode==3)attrplus|=A_REVERSE;
   windowinitdraw(win,cf,cb,mode);    windowinitdraw(win,cf,cb,mode);
   if(button->style==BT_NORMAL)    if(button->style==CC_BT_NORMAL)
   {    {
     if(win->vy>=3)      if(win->vy>=3)
     {      {
Line 738  void drawwinbutton(WIN *win,long wx)
Line 738  void drawwinbutton(WIN *win,long wx)
       attrplus|=A_REVERSE;        attrplus|=A_REVERSE;
       win->attr|=attrplus;        win->attr|=attrplus;
     }      }
     if(button->style==BT_NORMAL)      if(button->style==CC_BT_NORMAL)
     {      {
       addchar(win,y,x,'<');        addchar(win,y,x,'<');
       addchar(win,y,win->vx-1-x,'>');        addchar(win,y,win->vx-1-x,'>');
       x++;vx-=2;wx-=2;        x++;vx-=2;wx-=2;
     }      }
   }    }
   if(button->style==BT_CHECK1)    if(button->style==CC_BT_CHECK1)
   {    {
     addchar(win,y,x,'[');      addchar(win,y,x,'[');
     addchar(win,y,x+2,']');      addchar(win,y,x+2,']');
   }    }
   else if(button->style==BT_CHECK2)    else if(button->style==CC_BT_CHECK2)
   {    {
     addchar(win,y,x,'(');      addchar(win,y,x,'(');
     addchar(win,y,x+2,')');      addchar(win,y,x+2,')');
Line 764  void drawwinbutton(WIN *win,long wx)
Line 764  void drawwinbutton(WIN *win,long wx)
       win->attr|=attrplus;        win->attr|=attrplus;
     }      }
   }    }
   if((button->style==BT_CHECK1)&&(button->checked))addchar(win,y,x+1,'x');    if((button->style==CC_BT_CHECK1)&&(button->checked))addchar(win,y,x+1,'x');
   if((button->style==BT_CHECK2)&&(button->checked))addchar(win,y,x+1,'*');    if((button->style==CC_BT_CHECK2)&&(button->checked))addchar(win,y,x+1,'*');
   if(button->style==BT_NORMAL)x+=(vx-strlenmenu(button->text))/2;    if(button->style==CC_BT_NORMAL)x+=(vx-strlenmenu(button->text))/2;
   else    else
   {    {
     x+=4;      x+=4;
Line 940  void drawwinlist(WIN *win,long wx)
Line 940  void drawwinlist(WIN *win,long wx)
   long poz,actline,scrpos,hpos,i,numlines,x,bx;    long poz,actline,scrpos,hpos,i,numlines,x,bx;
   char cf,cb;    char cf,cb;
   bool isfocus;    bool isfocus;
   if((list->combotyp==CT_COMBO)&&(capturewin==NULL)&&isactive(win))capturewin=win;    if((list->combotyp==CC_LI_COMBO)&&(capturewin==NULL)&&isactive(win))capturewin=win;
   vscroll=&list->vscroll->extra->scroll;    vscroll=&list->vscroll->extra->scroll;
   hscroll=&list->hscroll->extra->scroll;    hscroll=&list->hscroll->extra->scroll;
   if(vscroll->pos<vscroll->minpos)vscroll->pos=vscroll->minpos;    if(vscroll->pos<vscroll->minpos)vscroll->pos=vscroll->minpos;
Line 961  void drawwinlist(WIN *win,long wx)
Line 961  void drawwinlist(WIN *win,long wx)
   mbox(win,0,0,win->vx,win->vy);    mbox(win,0,0,win->vx,win->vy);
   if((poz>=0)&&(poz<=win->vy-1-2))    if((poz>=0)&&(poz<=win->vy-1-2))
   {    {
     if((!hascolors)&&(list->combotyp!=CT_COMBO))addsymbol(win,0,poz+1,mapsymbol[LTEE]);      if((!hascolors)&&(list->combotyp!=CC_LI_COMBO))addsymbol(win,0,poz+1,mapsymbol[LTEE]);
     cf=isfocus?list->cactivetext:list->cseltext;      cf=isfocus?list->cactivetext:list->cseltext;
     cb=isfocus?list->cactive:list->cselected;      cb=isfocus?list->cactive:list->cselected;
     windowinitdraw(win,cf,cb,false);      windowinitdraw(win,cf,cb,false);
Line 969  void drawwinlist(WIN *win,long wx)
Line 969  void drawwinlist(WIN *win,long wx)
     for(i=0;i<win->vx-2;i++)addchar(win,poz+1,i+1,' ');      for(i=0;i<win->vx-2;i++)addchar(win,poz+1,i+1,' ');
   }    }
   if(wx<win->vx)wx++;    if(wx<win->vx)wx++;
   if(list->combotyp==CT_TABLE)    if(list->combotyp==CC_LI_TABLE)
   {    {
     windowinitdraw(win,list->ccells,win->cback,false);      windowinitdraw(win,list->ccells,win->cback,false);
     sc=list->lencells;      sc=list->lencells;
Line 1004  void drawwinlist(WIN *win,long wx)
Line 1004  void drawwinlist(WIN *win,long wx)
       cb=(i!=actline)?win->cback:(isfocus?list->cactive:list->cselected);        cb=(i!=actline)?win->cback:(isfocus?list->cactive:list->cselected);
       windowinitdraw(win,cf,cb,false);        windowinitdraw(win,cf,cb,false);
       if((!hascolors)&&(i==actline))if(isfocus)win->attr|=A_REVERSE;        if((!hascolors)&&(i==actline))if(isfocus)win->attr|=A_REVERSE;
       if(list->combotyp!=CT_TABLE)        if(list->combotyp!=CC_LI_TABLE)
       {        {
         if(strlen(lines->data)>hpos)          if(strlen(lines->data)>hpos)
         {          {
Line 1153  void drawwinstatus(WIN *win)
Line 1153  void drawwinstatus(WIN *win)
 void drawwinpaint(WIN *win)  void drawwinpaint(WIN *win)
 {  {
   PAINT *paint=(PAINT*)win->extra;    PAINT *paint=(PAINT*)win->extra;
   if(paint->style==PA_SOLID)    if(paint->style==CC_PA_SOLID)
   {    {
     windowinitdraw(win,paint->color,win->cback,true);      windowinitdraw(win,paint->color,win->cback,true);
   }    }
   else if(paint->style==PA_PATTERN)    else if(paint->style==CC_PA_PATTERN)
   {    {
     windowinitdraw(win,paint->color,win->cback,4);      windowinitdraw(win,paint->color,win->cback,4);
   }    }
   else if(paint->style==PA_BORDER)    else if(paint->style==CC_PA_BORDER)
   {    {
     windowinitdraw(win,paint->color,win->cback,true);      windowinitdraw(win,paint->color,win->cback,true);
     if((win->vx==1)&&(win->vy>1))mvline(win,0,0,win->vy);      if((win->vx==1)&&(win->vy>1))mvline(win,0,0,win->vy);
Line 1296  void drawwindialog(WIN *win,long wx)
Line 1296  void drawwindialog(WIN *win,long wx)
   char c;    char c;
   long n,olen;    long n,olen;
   n=8;    n=8;
   if((dialog->style&ST_DI_HASMAXIMIZE)==ST_DI_HASMAXIMIZE)n++;    if((dialog->style&CC_ST_DI_HASMAXIMIZE)==CC_ST_DI_HASMAXIMIZE)n++;
   if((dialog->style&ST_DI_HASMINIMIZE)==ST_DI_HASMINIMIZE)n++;    if((dialog->style&CC_ST_DI_HASMINIMIZE)==CC_ST_DI_HASMINIMIZE)n++;
   if(isfocused(win))c=dialog->cbactive;else c=dialog->cbinactive;    if(isfocused(win))c=dialog->cbactive;else c=dialog->cbinactive;
   windowinitdraw(win,c,win->cback,true);    windowinitdraw(win,c,win->cback,true);
   if(win->vy!=1)mbox(win,0,0,win->vx,win->vy);else mhline(win,0,0,win->vx);    if(win->vy!=1)mbox(win,0,0,win->vx,win->vy);else mhline(win,0,0,win->vx);

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

Platon Group <platon@platon.org> http://platon.org/
Copyright © 2002-2006 Platon Group
Site powered by Metafox CMS
Go to Top