]> git.webhop.me Git - shellexec.git/commitdiff
- shellexec: fix indent; no binary changes
authorsvenhoefer <svenhoefer@svenhoefer.com>
Fri, 23 Sep 2016 06:39:02 +0000 (08:39 +0200)
committersvenhoefer <svenhoefer@svenhoefer.com>
Fri, 23 Sep 2016 06:39:02 +0000 (08:39 +0200)
shellexec.c
text.c

index e4511d28e96547f5c4d1dcb4602d1e0851aeddf4..9bf21bfc2f4eef856c801e46746a55198a9983f0 100644 (file)
@@ -75,7 +75,6 @@ int AddListEntry(MENU *m, char *line, int pos);
 int Get_Menu(int showwait);
 static void ShowInfo(MENU *m, int knew);
 
-
 uint32_t *lfb = NULL, *lbb = NULL;
 char title[256];
 char VFD[256]="";
@@ -1135,7 +1134,6 @@ int AddListEntry(MENU *m, char *line, int pos)
        }
        free(wstr);
        return !found;
-
 }
 
 int Get_Menu(int showwait)
diff --git a/text.c b/text.c
index afb737c43947269fa4223ff59bd148b992a9889f..94f5a6ce8b019f79c0a6c5a003a8b7dcca173b87 100644 (file)
--- a/text.c
+++ b/text.c
@@ -9,7 +9,7 @@ int TABULATOR=72;
 
 //extern void blit();
 
-static char    *sc = "aouAOUzd",
+static char    *sc = "aouAOUzd",
                *su = "\xA4\xB6\xBC\x84\x96\x9C\x9F",
                *tc = "\xE4\xF6\xFC\xC4\xD6\xDC\xDF\xB0";
 
@@ -369,69 +369,69 @@ void RenderString(char *string, int sx, int sy, int maxwidth, int layout, int si
        if(strstr(rstr,"~c"))
                layout=CENTER;
 
-               //set size
-               switch (size)
-               {
-                       case SMALL: desc.width = desc.height = FSIZE_SMALL; break;
-                       case MED:   desc.width = desc.height = FSIZE_MED; break;
-                       case BIG:   desc.width = desc.height = FSIZE_BIG; break;
-                       default:    desc.width = desc.height = size; break;
-               }
+       //set size
+       switch (size)
+       {
+               case SMALL: desc.width = desc.height = FSIZE_SMALL; break;
+               case MED:   desc.width = desc.height = FSIZE_MED; break;
+               case BIG:   desc.width = desc.height = FSIZE_BIG; break;
+               default:    desc.width = desc.height = size; break;
+       }
 
-               //set alignment
-               if(layout != LEFT)
-               {
-                       stringlen = GetStringLen(sx, string, size);
+       //set alignment
+       if(layout != LEFT)
+       {
+               stringlen = GetStringLen(sx, string, size);
 
-                       switch(layout)
-                       {
-                               case CENTER:    if(stringlen < maxwidth) sx += (maxwidth - stringlen)/2;
-                                               break;
+               switch(layout)
+               {
+                       case CENTER:    if(stringlen < maxwidth) sx += (maxwidth - stringlen)/2;
+                                       break;
 
-                               case RIGHT:     if(stringlen < maxwidth) sx += maxwidth - stringlen;
-                       }
+                       case RIGHT:     if(stringlen < maxwidth) sx += maxwidth - stringlen;
                }
+       }
 
-               //reset kerning
-               prev_glyphindex = 0;
+       //reset kerning
+       prev_glyphindex = 0;
 
-               //render string
-               ex = sx + maxwidth;
+       ex = sx + maxwidth;
 
-               while(*rptr != '\0')
+       //render string
+       while(*rptr != '\0')
+       {
+               if(*rptr=='~')
                {
-                       if(*rptr=='~')
+                       ++rptr;
+                       switch(*rptr)
                        {
-                               ++rptr;
-                               switch(*rptr)
-                               {
-                                       case 'R': varcolor=RED; break;
-                                       case 'G': varcolor=GREEN; break;
-                                       case 'Y': varcolor=YELLOW; break;
-                                       case 'B': varcolor=BLUE0; break;
-                                       case 'S': varcolor=color; break;
-                                       case 't': sx=((sx/TABULATOR)+1)*TABULATOR; break;
-                                       case 'T':
-                                               if(sscanf(rptr+1,"%4d",&i)==1)
-                                               {
-                                                       rptr+=4;
-                                                       sx=i;
-                                               }
-                                               else
-                                               {
-                                                       sx=((sx/TABULATOR)+1)*TABULATOR;
-                                               }
-                                       break;
-                               }
-                               rptr++;
-                       }
-                       else
-                       {
-                               if ((charwidth = RenderChar(UTF8ToUnicode(&rptr, 1), sx, sy, ex, ((color!=CMCIT) && (color!=CMCST)) ? varcolor : color)) == -1)
-                                       return; /* string > maxwidth */
-                               sx += charwidth;
+                               case 'R': varcolor=RED; break;
+                               case 'G': varcolor=GREEN; break;
+                               case 'Y': varcolor=YELLOW; break;
+                               case 'B': varcolor=BLUE0; break;
+                               case 'S': varcolor=color; break;
+                               case 't': sx=((sx/TABULATOR)+1)*TABULATOR; break;
+                               case 'T':
+                                       if(sscanf(rptr+1,"%4d",&i)==1)
+                                       {
+                                               rptr+=4;
+                                               sx=i;
+                                       }
+                                       else
+                                       {
+                                               sx=((sx/TABULATOR)+1)*TABULATOR;
+                                       }
+                               break;
                        }
+                       rptr++;
                }
+               else
+               {
+                       if ((charwidth = RenderChar(UTF8ToUnicode(&rptr, 1), sx, sy, ex, ((color!=CMCIT) && (color!=CMCST)) ? varcolor : color)) == -1)
+                               return; /* string > maxwidth */
+                       sx += charwidth;
+               }
+       }
 }
 
 /******************************************************************************
@@ -520,5 +520,4 @@ void ShowMessage(char *mtitle, char *message, int wait)
 
        startx=lx;
        //starty=ly;
-
 }