Changeset 23811 for titan/titan

Timestamp:

09/21/13 12:05:47 (11 years ago)

Author:

nit

Message:

optimize

File:

• titan/titan/skin.h (modified) (22 diffs)

titan/titan/skin.h

@@ -1533 +1533 @@
         {
                 if(halign == CENTER)
-                        posx += mwidth / 2 - scalewidth / 2;
+                        posx += (mwidth >> 1) - (scalewidth >> 1);
                 else if(halign == RIGHT)
                         posx += mwidth - scalewidth;
                 if(valign == MIDDLE)
-                        posy += mheight / 2 - scaleheight / 2;
+                        posy += (mheight >> 1) - (scaleheight >> 1);
                 else if(valign == BOTTOM)
                         posy += mheight - scaleheight;
@@ -1646 +1646 @@
 
                 if(halign == CENTER)
-                        posx += mwidth / 2 - width / 2;
+                        posx += (mwidth >> 1) - (width >> 1);
                 else if(halign == RIGHT)
                         posx += mwidth - width;
                 if(valign == MIDDLE)
-                        posy += mheight / 2 - height / 2;
+                        posy += (mheight >> 1) - (height >> 1);
                 else if(valign == BOTTOM)
                         posy += mheight - height;
@@ -1998 +1998 @@
 
                 if(halign == CENTER)
-                        posx += mwidth / 2 - width / 2;
+                        posx += (mwidth >> 1) - (width >> 1);
                 else if(halign == RIGHT)
                         posx += mwidth - width;
                 if(valign == MIDDLE)
-                        posy += mheight / 2 - height / 2;
+                        posy += (mheight >> 1) - (height >> 1);
                 else if(valign == BOTTOM)
                         posy += mheight - height;
@@ -2333 +2333 @@
                 case CENTER:
                         getstringwh(aktfont, string, &stringwidth, &stringheight, charspace);
-                        if(stringwidth < mwidth) posx += (mwidth - stringwidth) / 2;
+                        if(stringwidth < mwidth) posx += ((mwidth - stringwidth) >> 1);
                         break;
                 case TEXTRIGHT:
@@ -2352 +2352 @@
                 case TEXTMIDDLE:
                 case MIDDLE:
-                        posy += mheight / 2 - (fontsize * linecount) / 2;
+                        posy += (mheight >> 1) - ((fontsize * linecount) >> 1);
                         if(posy < oldposy) posy = oldposy;
                         break;
@@ -2541 +2541 @@
 char* savescreen(struct skin* node)
 {
-        return saverect(node->rposx - node->shadowsize, node->rposy - node->shadowsize, node->rwidth + (node->shadowsize * 2), node->rheight + (node->shadowsize * 2));
+        return saverect(node->rposx - node->shadowsize, node->rposy - node->shadowsize, node->rwidth + (node->shadowsize << 1), node->rheight + (node->shadowsize << 1));
 }
 
@@ -2570 +2570 @@
 void restorescreen(char* buf, struct skin* node)
 {
-        restorerectcheck(buf, node->rposx - node->shadowsize, node->rposy - node->shadowsize, node->rwidth + (node->shadowsize * 2), node->rheight + (node->shadowsize * 2), 1);
+        restorerectcheck(buf, node->rposx - node->shadowsize, node->rposy - node->shadowsize, node->rwidth + (node->shadowsize << 1), node->rheight + (node->shadowsize << 1), 1);
 }
 
 void restorescreennofree(char* buf, struct skin* node)
 {
-        restorerectcheck(buf, node->rposx - node->shadowsize, node->rposy - node->shadowsize, node->rwidth + (node->shadowsize * 2), node->rheight + (node->shadowsize * 2), 0);
+        restorerectcheck(buf, node->rposx - node->shadowsize, node->rposy - node->shadowsize, node->rwidth + (node->shadowsize << 1), node->rheight + (node->shadowsize << 1), 0);
 }
 
@@ -2690 +2690 @@
         if(flag == LEFTRIGHT || flag == LEFTMIDDLE)
         {
-                if(flag == LEFTMIDDLE) width = width / 2;
+                if(flag == LEFTMIDDLE) width = (width >> 1);
                 if(width < 10)
                         steps = width;
                 if(width < 100)
-                        steps = width / 2;
+                        steps = (width >> 1);
                 else
                         steps = width / 5;
@@ -2702 +2702 @@
         else
         {
-                if(flag == TOPMIDDLE) height = height / 2;
+                if(flag == TOPMIDDLE) height = (height >> 1);
                 if(height < 10)
                         steps = height;
                 else if(height < 100)
-                        steps = height / 2;
+                        steps = (height >> 1);
                 else
                         steps = height / 5;
@@ -2807 +2807 @@
 {
         if(status.picbordersize > 0)
-                drawgradient(node->rposx + status.picbordersize, node->rposy + status.picbordersize, node->rwidth - (status.picbordersize * 2), node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->titlebgcol2, node->transparent, node->titlegradient);
+                drawgradient(node->rposx + status.picbordersize, node->rposy + status.picbordersize, node->rwidth - (status.picbordersize << 1), node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->titlebgcol2, node->transparent, node->titlegradient);
         else
                 drawgradient(node->rposx, node->rposy, node->rwidth, node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->titlebgcol2, node->transparent, node->titlegradient);
@@ -2820 +2820 @@
 {
         if(status.picbordersize > 0)
-                fillrect(node->rposx + status.picbordersize, node->rposy + status.picbordersize, node->rwidth - (status.picbordersize * 2), node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->transparent);
+                fillrect(node->rposx + status.picbordersize, node->rposy + status.picbordersize, node->rwidth - (status.picbordersize << 1), node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->transparent);
         else
                 fillrect(node->rposx, node->rposy, node->rwidth, node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->transparent);
@@ -2827 +2827 @@
 void drawbginnercol(struct skin* node)
 {
-        fillrect(node->rposx + node->bordersize, node->rposy + node->bordersize, node->rwidth - node->bordersize * 2, node->rheight - node->bordersize * 2, node->bgcol, node->transparent);
+        fillrect(node->rposx + node->bordersize, node->rposy + node->bordersize, node->rwidth - (node->bordersize << 1), node->rheight - (node->bordersize << 1), node->bgcol, node->transparent);
 }
 
 void drawbgcol(struct skin* node)
 {
-        fillrect(node->rposx + node->bgspace, node->rposy + node->bgspace, node->rwidth - (node->bgspace * 2), node->rheight - (node->bgspace * 2), node->bgcol, node->transparent);
+        fillrect(node->rposx + node->bgspace, node->rposy + node->bgspace, node->rwidth - (node->bgspace << 1), node->rheight - (node->bgspace << 1), node->bgcol, node->transparent);
 }
 
@@ -2870 +2870 @@
 
                 if(val2 > val1)
-                        fillrect(node->rposx + node->bordersize + node->bgspace + val1, node->rposy + node->bgspace + node->bordersize, val2 - val1 + (node->bgspace * 2), node->iheight + (node->bgspace * 2), node->progresscol, node->transparent);
+                        fillrect(node->rposx + node->bordersize + node->bgspace + val1, node->rposy + node->bgspace + node->bordersize, val2 - val1 + (node->bgspace << 1), node->iheight + (node->bgspace << 1), node->progresscol, node->transparent);
                 epgrecord = epgrecord->next;
         }
@@ -2880 +2880 @@
 
         if(node->borderradius > 0) rad = node->borderradius;
-        if(rad > node->rheight / 2) rad = node->rheight / 2;
+        if(rad > (node->rheight >> 1)) rad = (node->rheight >> 1);
         int tmpbordersize = rad - node->bordersize;
 
@@ -2917 +2917 @@
 
         //top
-        //drawpic("/home/nit/titan/skin/bs_t.png", node->rposx + node->bordersize, node->rposy + node->bordersize - borderheight, node->rwidth - (node->bordersize * 2), 0, node->rwidth - (node->bordersize * 2), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
-        drawpic("/home/nit/titan/skin/bs_t.png", node->rposx + borderwidth, node->rposy, node->rwidth - (borderwidth * 2), 0, node->rwidth - (borderwidth * 2), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        //drawpic("/home/nit/titan/skin/bs_t.png", node->rposx + node->bordersize, node->rposy + node->bordersize - borderheight, node->rwidth - (node->bordersize << 1), 0, node->rwidth - (node->bordersize << 1), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        drawpic("/home/nit/titan/skin/bs_t.png", node->rposx + borderwidth, node->rposy, node->rwidth - (borderwidth << 1), 0, node->rwidth - (borderwidth << 1), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
         //bottom
-        //drawpic("/home/nit/titan/skin/bs_b.png", node->rposx + node->bordersize, node->rposy - node->bordersize + node->rheight, node->rwidth - (node->bordersize * 2), 0, node->rwidth - (node->bordersize * 2), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
-        drawpic("/home/nit/titan/skin/bs_b.png", node->rposx + borderwidth, node->rposy + node->rheight - borderheight, node->rwidth - (borderwidth * 2), 0, node->rwidth - (node->bordersize * 2), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        //drawpic("/home/nit/titan/skin/bs_b.png", node->rposx + node->bordersize, node->rposy - node->bordersize + node->rheight, node->rwidth - (node->bordersize << 1), 0, node->rwidth - (node->bordersize << 1), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        drawpic("/home/nit/titan/skin/bs_b.png", node->rposx + borderwidth, node->rposy + node->rheight - borderheight, node->rwidth - (borderwidth << 1), 0, node->rwidth - (node->bordersize << 1), borderheight, LEFT, TOP, node->transparent, node->picquality, node->picmem);
         //left
-        //drawpic("/home/nit/titan/skin/bs_l.png", node->rposx + node->bordersize - borderwidth, node->rposy + node->bordersize, 0, node->rheight - (node->bordersize * 2), borderwidth, node->rheight - (node->bordersize * 2), LEFT, TOP, node->transparent, node->picquality, node->picmem);
-        drawpic("/home/nit/titan/skin/bs_l.png", node->rposx, node->rposy + borderheight, 0, node->rheight - (borderheight * 2), borderwidth, node->rheight - (borderheight * 2), LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        //drawpic("/home/nit/titan/skin/bs_l.png", node->rposx + node->bordersize - borderwidth, node->rposy + node->bordersize, 0, node->rheight - (node->bordersize << 1), borderwidth, node->rheight - (node->bordersize << 1), LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        drawpic("/home/nit/titan/skin/bs_l.png", node->rposx, node->rposy + borderheight, 0, node->rheight - (borderheight << 1), borderwidth, node->rheight - (borderheight << 1), LEFT, TOP, node->transparent, node->picquality, node->picmem);
         //right
-        //drawpic("/home/nit/titan/skin/bs_r.png", node->rposx - node->bordersize + node->rwidth, node->rposy + node->bordersize, 0, node->rheight - (node->bordersize * 2), borderwidth, node->rheight - (node->bordersize * 2), LEFT, TOP, node->transparent, node->picquality, node->picmem);
-        drawpic("/home/nit/titan/skin/bs_r.png", node->rposx + node->rwidth - borderwidth, node->rposy + borderheight, 0, node->rheight - (borderheight * 2), borderwidth, node->rheight - (borderheight * 2), LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        //drawpic("/home/nit/titan/skin/bs_r.png", node->rposx - node->bordersize + node->rwidth, node->rposy + node->bordersize, 0, node->rheight - (node->bordersize << 1), borderwidth, node->rheight - (node->bordersize << 1), LEFT, TOP, node->transparent, node->picquality, node->picmem);
+        drawpic("/home/nit/titan/skin/bs_r.png", node->rposx + node->rwidth - borderwidth, node->rposy + borderheight, 0, node->rheight - (borderheight << 1), borderwidth, node->rheight - (borderheight << 1), LEFT, TOP, node->transparent, node->picquality, node->picmem);
 }
 
@@ -3023 +3023 @@
 
                         if(node->borderradius > 0) rad = node->borderradius;
-                        if(rad > node->rheight / 2) rad = node->rheight / 2;
+                        if(rad > (node->rheight >> 1)) rad = (node->rheight >> 1);
 
                         bglt = saverect(node->rposx, node->rposy, rad, rad);
@@ -3036 +3036 @@
                 if(node->child != NULL && status.picbordersize > 0)
                 {
-                        clearrect(node->rposx + node->bordersize, node->rposy + node->bordersize, node->rwidth - node->bordersize * 2, node->rheight - node->bordersize * 2);
+                        clearrect(node->rposx + node->bordersize, node->rposy + node->bordersize, node->rwidth - (node->bordersize << 1), node->rheight - (node->bordersize << 1));
                 }
                 else
@@ -3441 +3441 @@
         if(node->scrollbar == YES || node->scrollbar == AUTOYES || node->scrollbar == AUTONO) scrollbarwidth = SCROLLBARWIDTH;
 
-        if(node->rwidth < (node->bordersize * 2) + scrollbarwidth) node->rwidth = (node->bordersize * 2) + scrollbarwidth;
+        if(node->rwidth < (node->bordersize << 1) + scrollbarwidth) node->rwidth = (node->bordersize << 1) + scrollbarwidth;
 
         return 0;
@@ -3458 +3458 @@
         }
 
-        if(node->rheight < (node->bordersize * 2) + node->titlesize) node->rheight = (node->bordersize * 2) + node->titlesize;
+        if(node->rheight < (node->bordersize << 1) + node->titlesize) node->rheight = (node->bordersize << 1) + node->titlesize;
 
         return 0;
@@ -3471 +3471 @@
 
         if(node->posx == CENTER || (node->posx == 0 && parent->halign == CENTER))
-                node->rposx = parent->iposx + parent->iwidth / 2 - node->rwidth / 2;
+                node->rposx = parent->iposx + (parent->iwidth >> 1) - (node->rwidth >> 1);
         else if(node->posx == LEFT)
                 node->rposx = parent->iposx;
@@ -3493 +3493 @@
 
         if(node->posy == MIDDLE || (node->posy == 0 && parent->valign == MIDDLE))
-                node->rposy = parent->iposy + parent->iheight / 2 - node->rheight / 2;
+                node->rposy = parent->iposy + (parent->iheight >> 1) - (node->rheight >> 1);
         else if(node->posy == TOP)
                 node->rposy = parent->iposy;
@@ -3565 +3565 @@
         node->iposx = node->rposx + node->bordersize + node->hspace;
         node->iposy = node->rposy + node->bordersize + node->titlesize + node->vspace;
-        node->iwidth = node->rwidth - node->bordersize * 2 - node->hspace * 2;
-        node->iheight = node->rheight - node->bordersize * 2 - node->titlesize - node->vspace * 2;
+        node->iwidth = node->rwidth - (node->bordersize << 1) - (node->hspace << 1);
+        node->iheight = node->rheight - (node->bordersize << 1) - node->titlesize - (node->vspace << 1);
 
         switch(node->shadowpos)