Changeset 822

Timestamp:

06/27/07 17:20:02 (17 months ago)

Author:

volker

Message:

indentation with ./indent.sh; short circuit evaluation modified

Location:

branches/volker_dev

Files:

• drv_X11.c (modified) (8 diffs)
• drv_generic_graphic.c (modified) (1 diff)
• evaluator.c (modified) (19 diffs)
• lcd4linux.c (modified) (1 diff)

branches/volker_dev/drv_X11.c

@@ -140 +140 @@
     int i;
     float dim;
-    
+
     /* -1 is used to query the current brightness */
     if (brightness == -1)
   return Brightness;
-    
+
     if (brightness < 0)
   brightness = 0;
     if (brightness > 255)
   brightness = 255;
-    
+
     if (Brightness != brightness) {
-        Brightness = brightness;
-        dim = Brightness / 255.0;
-        col.R *= dim;
-        col.G *= dim;
-        col.B *= dim;
-        
-        debug("%s: set backlight to %d%%, original backlight color: 0x%02x%02x%02x%02x, dimmed: 0x%02x%02x%02x%02x",
-              Name, (int)(dim * 100), BL_COL.R, BL_COL.G, BL_COL.B, BL_COL.A, col.R, col.G, col.B, col.A);
-        for (i = 0; i < DCOLS * DROWS; i++) {
-            drv_X11_FB[i] = col;
-        }
-        
-        drv_X11_color(col);
-        
-        XFillRectangle(dp, pm, gc, 0, 0, dimx + 2 * border + btnwidth, dimy + 2 * border);
-        XSetWindowBackground(dp, w, xc.pixel);
-        XClearWindow(dp, w);
-        
-        /* redraw every LCD pixel */
-        drv_X11_blit(0, 0, LROWS, LCOLS);
+  Brightness = brightness;
+  dim = Brightness / 255.0;
+  col.R *= dim;
+  col.G *= dim;
+  col.B *= dim;
+
+  debug("%s: set backlight to %d%%, original backlight color: 0x%02x%02x%02x%02x, dimmed: 0x%02x%02x%02x%02x",
+        Name, (int) (dim * 100), BL_COL.R, BL_COL.G, BL_COL.B, BL_COL.A, col.R, col.G, col.B, col.A);
+  for (i = 0; i < DCOLS * DROWS; i++) {
+      drv_X11_FB[i] = col;
+  }
+
+  drv_X11_color(col);
+
+  XFillRectangle(dp, pm, gc, 0, 0, dimx + 2 * border + btnwidth, dimy + 2 * border);
+  XSetWindowBackground(dp, w, xc.pixel);
+  XClearWindow(dp, w);
+
+  /* redraw every LCD pixel */
+  drv_X11_blit(0, 0, LROWS, LCOLS);
     }
 
@@ -180 +180 @@
 {
     int val = WIDGET_KEY_PRESSED;
-    
+
     switch (num) {
-        case 1:
-            val += WIDGET_KEY_UP;
-            break;
-        case 2:
-            val += WIDGET_KEY_DOWN;
-            break;
-        case 3:
-            val += WIDGET_KEY_LEFT;
-            break;
-        case 4:
-            val += WIDGET_KEY_RIGHT;
-            break;
-        case 5:
-            val += WIDGET_KEY_CONFIRM;
-            break;
-        case 6:
-            val += WIDGET_KEY_CANCEL;
-            break;
-        default:
-            error("%s: unknown keypad value %d", Name, num);
-    }
-    
+    case 1:
+  val += WIDGET_KEY_UP;
+  break;
+    case 2:
+  val += WIDGET_KEY_DOWN;
+  break;
+    case 3:
+  val += WIDGET_KEY_LEFT;
+  break;
+    case 4:
+  val += WIDGET_KEY_RIGHT;
+  break;
+    case 5:
+  val += WIDGET_KEY_CONFIRM;
+  break;
+    case 6:
+  val += WIDGET_KEY_CANCEL;
+  break;
+    default:
+  error("%s: unknown keypad value %d", Name, num);
+    }
+
     debug("%s: key %c (0x%x) pressed", Name, num, num);
     return val;
@@ -228 +228 @@
     char *s;
     char unknownTxt[10];
-    
+
     x0 = x - pixel;
     x1 = x + pixel + width;
@@ -246 +246 @@
   }
     }
-    
+
     /* Keypad on the right side */
     if (x1 >= xoffset) {
-        xfs = XQueryFont(dp, XGContextFromGC(DefaultGC(dp, 0)));
-        if (drv_X11_brightness(-1) > 127) {
-            drv_X11_color(FG_COL);
-        } else {
-            drv_X11_color(BG_COL);
-        }
-        for (r = 0; r < buttons; r++) {
-            yk = yoffset + r * (btnheight + pgap);
-            switch(r) {
-                case 0:
-                    s = "Up";
-                    break;
-                case 1:
-                    s = "Down";
-                    break;
-                case 2:
-                    s = "Left";
-                    break;
-                case 3:
-                    s = "Right";
-                    break;
-                case 4:
-                    s = "Confirm";
-                    break;
-                case 5:
-                    s = "Cancel";
-                    break;
-                default:
-                    snprintf(unknownTxt, sizeof(unknownTxt), "#%d??", r);
-                    s = unknownTxt;
-            }
-            XDrawRectangle(dp, w, gc, xoffset, yk, btnwidth, btnheight - 2);
-            XDrawString(dp, w, gc,
-                        xoffset + btnwidth / 2 - (xfs->max_bounds.width * strlen(s)) / 2, yk + btnheight / 2 + xfs->max_bounds.ascent / 2,
-                        s, strlen(s));      
-        }
-    }
-        //XSync(dp, False);
+  xfs = XQueryFont(dp, XGContextFromGC(DefaultGC(dp, 0)));
+  if (drv_X11_brightness(-1) > 127) {
+      drv_X11_color(FG_COL);
+  } else {
+      drv_X11_color(BG_COL);
+  }
+  for (r = 0; r < buttons; r++) {
+      yk = yoffset + r * (btnheight + pgap);
+      switch (r) {
+      case 0:
+    s = "Up";
+    break;
+      case 1:
+    s = "Down";
+    break;
+      case 2:
+    s = "Left";
+    break;
+      case 3:
+    s = "Right";
+    break;
+      case 4:
+    s = "Confirm";
+    break;
+      case 5:
+    s = "Cancel";
+    break;
+      default:
+    snprintf(unknownTxt, sizeof(unknownTxt), "#%d??", r);
+    s = unknownTxt;
+      }
+      XDrawRectangle(dp, w, gc, xoffset, yk, btnwidth, btnheight - 2);
+      XDrawString(dp, w, gc,
+      xoffset + btnwidth / 2 - (xfs->max_bounds.width * strlen(s)) / 2,
+      yk + btnheight / 2 + xfs->max_bounds.ascent / 2, s, strlen(s));
+  }
+    }
+    //XSync(dp, False);
 }
 
@@ -297 +297 @@
     int yoffset = border + (DROWS / YRES) * rgap;
     static int btn = 0;
- 
+
     if (XCheckWindowEvent(dp, w, ExposureMask | ButtonPressMask | ButtonReleaseMask, &ev) == 0)
   return;
-    switch(ev.type) {
-        case Expose:
-            drv_X11_expose(ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height);
-            break;
-        case ButtonPress:
-            if ( ev.xbutton.x >= xoffset && ev.xbutton.x <= xoffset + btnwidth
-                 && ev.xbutton.y >= yoffset && ev.xbutton.y <= yoffset + buttons * btnheight + (buttons -1 ) *pgap ) {
-                btn = (ev.xbutton.y - yoffset) / (btnheight + pgap) + 1;    /* btn 0 is unused */
-                drv_X11_color(BG_COL);
-                XFillRectangle(dp, w, gc, xoffset + 1, yoffset + (btn - 1) * (btnheight + pgap) + 1, btnwidth - 1, btnheight - 2 - 1);
-                drv_generic_keypad_press(btn);
-            }
-            break;
-        case ButtonRelease:
-            if ( ev.xbutton.x >= xoffset && ev.xbutton.x <= xoffset + btnwidth
-     && ev.xbutton.y >= yoffset && ev.xbutton.y <= yoffset + buttons * btnheight + (buttons -1 ) *pgap ) {
-                XClearArea(dp, w, xoffset, yoffset + (btn - 1) * (btnheight + pgap), btnwidth, btnheight - 2, 1 /* true */);
-                btn = (ev.xbutton.y - yoffset) / (btnheight + pgap) + 1;    /* btn 0 is unused */
-                info("%s: Button %d released", Name, btn);
-            }
-            break;
-        default:
-            debug("%s: unknown XEvent %d", Name, ev.type);
+    switch (ev.type) {
+    case Expose:
+  drv_X11_expose(ev.xexpose.x, ev.xexpose.y, ev.xexpose.width, ev.xexpose.height);
+  break;
+    case ButtonPress:
+  if (ev.xbutton.x >= xoffset && ev.xbutton.x <= xoffset + btnwidth
+      && ev.xbutton.y >= yoffset && ev.xbutton.y <= yoffset + buttons * btnheight + (buttons - 1) * pgap) {
+      btn = (ev.xbutton.y - yoffset) / (btnheight + pgap) + 1;  /* btn 0 is unused */
+      drv_X11_color(BG_COL);
+      XFillRectangle(dp, w, gc, xoffset + 1, yoffset + (btn - 1) * (btnheight + pgap) + 1, btnwidth - 1,
+         btnheight - 2 - 1);
+      drv_generic_keypad_press(btn);
+  }
+  break;
+    case ButtonRelease:
+  if (ev.xbutton.x >= xoffset && ev.xbutton.x <= xoffset + btnwidth
+      && ev.xbutton.y >= yoffset && ev.xbutton.y <= yoffset + buttons * btnheight + (buttons - 1) * pgap) {
+      XClearArea(dp, w, xoffset, yoffset + (btn - 1) * (btnheight + pgap), btnwidth, btnheight - 2,
+           1 /* true */ );
+      btn = (ev.xbutton.y - yoffset) / (btnheight + pgap) + 1;  /* btn 0 is unused */
+      info("%s: Button %d released", Name, btn);
+  }
+  break;
+    default:
+  debug("%s: unknown XEvent %d", Name, ev.type);
     }
 }
@@ -378 +380 @@
     }
     free(s);
-    
+
     /* virtual keyboard: number of buttons (0..6) */
     if (cfg_number(section, "buttons", 0, 0, 6, &buttons) < 0)
-      return -1;
+  return -1;
 
     drv_X11_FB = malloc(DCOLS * DROWS * sizeof(*drv_X11_FB));
@@ -462 +464 @@
 {
     double brightness;
-    
+
     switch (argc) {
-        case 0:
-            brightness = drv_X11_brightness(-1);
-            SetResult(&result, R_NUMBER, &brightness);
-            break;
-        case 1:
-            brightness = drv_X11_brightness(R2N(argv[0]));
-            SetResult(&result, R_NUMBER, &brightness);
-            break;
-        default:
-            error("%s.brightness(): wrong number of parameters", Name);
-            SetResult(&result, R_STRING, "");
+    case 0:
+  brightness = drv_X11_brightness(-1);
+  SetResult(&result, R_NUMBER, &brightness);
+  break;
+    case 1:
+  brightness = drv_X11_brightness(R2N(argv[0]));
+  SetResult(&result, R_NUMBER, &brightness);
+  break;
+    default:
+  error("%s.brightness(): wrong number of parameters", Name);
+  SetResult(&result, R_STRING, "");
     }
 }
@@ -514 +516 @@
     if ((ret = drv_generic_keypad_init(section, Name)) != 0)
   return ret;
-    
+
     drv_generic_graphic_clear();
 

branches/volker_dev/drv_generic_graphic.c

@@ -189 +189 @@
     /* Layer 0 is topmost: Find lowest opaque layer */
     for (l = 0; l < LAYERS; l++) {
-        if (drv_generic_graphic_FB[l][row * LCOLS + col].A >= 255) {
-            /* Layers below are fully covered */
-            opaqueBottomLayer = l;
-            break;
-        }
+  if (drv_generic_graphic_FB[l][row * LCOLS + col].A >= 255) {
+      /* Layers below are fully covered */
+      opaqueBottomLayer = l;
+      break;
+  }
     }
     for (l = opaqueBottomLayer; l >= 0; l--) {

branches/volker_dev/evaluator.c

@@ -989 +989 @@
   argc = Root->Children;
   if (argc > 10) {
-            error("evaluator: more than 10 children (operands) not supported!");
+      error("evaluator: more than 10 children (operands) not supported!");
       argc = 10;
-        }
+  }
   for (i = 0; i < argc; i++) {
-            EvalTree(Root->Child[i]);
+      EvalTree(Root->Child[i]);
       param[i] = Root->Child[i]->Result;
   }
@@ -1011 +1011 @@
   case O_LST:   /* expression list: result is last expression */
       i = Root->Children - 1;
-            EvalTree(Root->Child[i]);
+      EvalTree(Root->Child[i]);
       type = Root->Child[i]->Result->type;
       number = Root->Child[i]->Result->number;
@@ -1018 +1018 @@
 
   case O_SET:   /* variable assignment */
-            EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[0]);
       CopyResult(&Root->Variable->value, Root->Child[0]->Result);
       type = Root->Child[0]->Result->type;
@@ -1026 +1026 @@
 
   case O_CND:   /* conditional expression */
-            EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[0]);
       i = 1 + (R2N(Root->Child[0]->Result) == 0.0);
-            EvalTree(Root->Child[i]);
+      EvalTree(Root->Child[i]);
       type = Root->Child[i]->Result->type;
       number = Root->Child[i]->Result->number;
@@ -1036 +1036 @@
   case O_OR:    /* logical OR */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            if (R2N(Root->Child[0]->Result) == 0.0) {
-                /* calculate 2nd operator only, if 1st operator is false */
-                EvalTree(Root->Child[1]);
-            }
-      number = ((R2N(Root->Child[0]->Result) != 0.0) || (R2N(Root->Child[1]->Result) != 0.0));
+      EvalTree(Child[0]);
+      if (R2N(Root->Child[0]->Result) == 0.0) {
+    EvalTree(Child[1])
+        number = (Child[1]->Result != 0.0);
+      } else {
+    number = 1.0;
+      }
       break;
 
   case O_AND:   /* logical AND */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            if (R2N(Root->Child[0]->Result) != 0.0) {
-                /* calculate 2nd operator only, if 1st operator is true */
-                EvalTree(Root->Child[1]);
-            }
-      number = ((R2N(Root->Child[0]->Result) != 0.0) && (R2N(Root->Child[1]->Result) != 0.0));
+      EvalTree(Root->Child[0]);
+      if (R2N(Root->Child[0]->Result) != 0.0) {
+    EvalTree(Child[1])
+        number = (Child[1]->Result != 0.0);
+      } else {
+    number = 0.0;
+      }
       break;
 
   case O_EQ:    /* numeric equal */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) == R2N(Root->Child[1]->Result));
       break;
@@ -1063 +1065 @@
   case O_NE:    /* numeric not equal */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) != R2N(Root->Child[1]->Result));
       break;
@@ -1070 +1072 @@
   case O_LT:    /* numeric less than */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) < R2N(Root->Child[1]->Result));
       break;
@@ -1077 +1079 @@
   case O_LE:    /* numeric less equal */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) <= R2N(Root->Child[1]->Result));
       break;
@@ -1084 +1086 @@
   case O_GT:    /* numeric greater than */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) > R2N(Root->Child[1]->Result));
       break;
@@ -1091 +1093 @@
   case O_GE:    /* numeric greater equal */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) >= R2N(Root->Child[1]->Result));
       break;
@@ -1098 +1100 @@
   case O_ADD:   /* addition */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = R2N(Root->Child[0]->Result) + R2N(Root->Child[1]->Result);
       break;
@@ -1105 +1107 @@
   case O_SUB:   /* subtraction */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = R2N(Root->Child[0]->Result) - R2N(Root->Child[1]->Result);
       break;
@@ -1112 +1114 @@
   case O_SGN:   /* sign */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[0]);
       number = -R2N(Root->Child[0]->Result);
       break;
@@ -1118 +1120 @@
   case O_CAT:   /* string concatenation */
       type = R_STRING;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       s1 = R2S(Root->Child[0]->Result);
       s2 = R2S(Root->Child[1]->Result);
@@ -1130 +1132 @@
   case O_MUL:   /* multiplication */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = R2N(Root->Child[0]->Result) * R2N(Root->Child[1]->Result);
       break;
@@ -1137 +1139 @@
   case O_DIV:   /* division */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       dummy = R2N(Root->Child[1]->Result);
       if (dummy == 0) {
@@ -1150 +1152 @@
   case O_MOD:   /* modulo */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       dummy = R2N(Root->Child[1]->Result);
       if (dummy == 0) {
@@ -1163 +1165 @@
   case O_POW:   /* x^y */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
-            EvalTree(Root->Child[1]);
+      EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[1]);
       number = pow(R2N(Root->Child[0]->Result), R2N(Root->Child[1]->Result));
       break;
@@ -1170 +1172 @@
   case O_NOT:   /* logical NOT */
       type = R_NUMBER;
-            EvalTree(Root->Child[0]);
+      EvalTree(Root->Child[0]);
       number = (R2N(Root->Child[0]->Result) == 0.0);
       break;

branches/volker_dev/lcd4linux.c

@@ -245 +245 @@
       printf("%s\n", copyright);
       drv_list();
-            printf("\n");
-            plugin_list();
+      printf("\n");
+      plugin_list();
       exit(0);
   case 'o':