Significantly modified WWDisplay_DrawScreen () algorithm.

It did not get much faster.  When the X server drawing is a hot spot
Since it seems, efforts to reduce drawing amount are necessary.

Version 0.0.6 alpha - from wonx-a06.tar.gz

HISTORY

@@ -1,3 +1,29 @@
+2000/10/4(<28><>)
+
+wonx-a06 <20><><EFBFBD><EFBFBD>
+
+WWDisplay_DrawScreen() <20>Υ<EFBFBD><CEA5>르<EFBFBD>ꥺ<EFBFBD><EAA5BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˽<EFBFBD><CBBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƹ<EFBFBD>®<EFBFBD>ˤʤ<EFBFBD><EFBFBD>ʤ<EFBFBD><EFBFBD>ä<EFBFBD><EFBFBD><EFBFBD>X <20><><EFBFBD><EFBFBD><EFBFBD>Ф<EFBFBD><D0A4><EFBFBD><EFBFBD>褬<EFBFBD>ۥåȥ<C3A5><C8A5>ݥåȤˤʤäƤ<C3A4><C6A4><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD>פ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τǡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̤򸺤餹<EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD>ɬ<EFBFBD>ס<EFBFBD>
+
+
+
+
+2000/10/3(<28><>)
+
+wonx-a05 <20><><EFBFBD><EFBFBD>
+
+XDisplay_DrawLCDWindow() <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD>̤ʷ׻<CAB7><D7BB><EFBFBD><EFBFBD>롼<EFBFBD>׳<EFBFBD><D7B3>˽Ф<CBBD><D0A4><EFBFBD><EFBFBD><EFBFBD>
+
+WWDisplay_DrawScreen() <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD>̤ʷ׻<CAB7><D7BB><EFBFBD><EFBFBD>롼<EFBFBD>׳<EFBFBD><D7B3>˽Ф<CBBD><D0A4><EFBFBD><EFBFBD><EFBFBD>
+
+<EFBFBD>ۥåȥ<EFBFBD><EFBFBD>ݥåȤ<EFBFBD>Ĵ<EFBFBD>٤<EFBFBD><EFBFBD>顤X<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʬ(XDisplay.c <20><> XDisplay_DrawLCDWindow()<29><>
+<EFBFBD>롼<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʬ)<29><><EFBFBD>ۥåȥ<C3A5><C8A5>ݥåȤˤʤäƤ<C3A4><C6A4><EFBFBD><EFBFBD>Τǡ<CEA4><C7A1>ԥ<EFBFBD><D4A5><EFBFBD><EFBFBD>뤴<EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>äơ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>®<EFBFBD>٤<EFBFBD><EFBFBD>夲<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+
+
+
 2000/9/30(<28><>)
 
 wonx-a04 <20><><EFBFBD><EFBFBD>

Makefile

@@ -2,8 +2,8 @@ XINCLUDEDIR = /usr/X11R6/include
 INCLUDEDIR = .
 XLIBDIR = /usr/X11R6/lib
 
-VERSION = Wonx-a04
-PKGNAME = wonx-a04
+VERSION = Wonx-a06
+PKGNAME = wonx-a06
 
 OBJS = WWCharacter.o WWColorMap.o WWDisplay.o WWLCDPanel.o WWPalette.o WWScreen.o WWSprite.o WonxDisplay.o XDisplay.o bank.o comm.o disp.o text.o key.o sound.o system.o timer.o etc.o wonx.o
 

WWDisplay.c

@@ -195,22 +195,14 @@ WWDisplay WWDisplay_Destroy(WWDisplay display)
 /* LCD<43>ѥͥ<D1A5><CDA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                                                           */
 /*===========================================================================*/
 
-static int WWDisplay_DrawScreen(WWDisplay display, WWScreen screen)
+static int WWDisplay_DrawScreen(WWDisplay display, WWScreen screen,
+				int lcd_x, int lcd_y)
 {
-  WWLCDPanel lcd_panel;
-  int lcd_panel_width;
-  int lcd_panel_height;
-
   int pixel;
-  int x, y, px, py;
+  int px, py;
   int sx, sy, ex, ey;
-  int mode;
 
-  if (!WWScreen_GetEnable(screen)) return (0);
-
-  lcd_panel = WWDisplay_GetLCDPanel(display);
-  lcd_panel_width  = WWLCDPanel_GetWidth( lcd_panel);
-  lcd_panel_height = WWLCDPanel_GetHeight(lcd_panel);
+  if (!WWScreen_GetEnable(screen)) return (-1);
 
   if ( (WWScreen_GetMode(screen) == WWSCREEN_INSIDE_ONLY) ||
        (WWScreen_GetMode(screen) == WWSCREEN_OUTSIDE_ONLY) ) {
@@ -237,46 +229,35 @@ static int WWDisplay_DrawScreen(WWDisplay display, WWScreen screen)
 #endif
   }
 
-  mode = WWScreen_GetMode(screen);
-
-  /* <20>ʲ<EFBFBD><CAB2>ϥۥåȥ<C3A5><C8A5>ݥåȤˤʤ<CBA4><CAA4>Τǡ<CEA4><C7A1><EFBFBD><EFBFBD>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD>롼<EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
-  /* <20><><EFBFBD><EFBFBD><EFBFBD>ۤ<EFBFBD><DBA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                                           */
-
-  for (y = 0; y < lcd_panel_height; y++) {
-    for (x = 0; x < lcd_panel_width; x++) {
-      px = x + WWScreen_GetRollX(screen);
-      py = y + WWScreen_GetRollY(screen);
-
-      if (mode == WWSCREEN_INSIDE_ONLY) {
-	if (y > ey) {
-	  x = lcd_panel_width - 1; y = lcd_panel_height - 1; continue;
-	}
-	if (y < sy) { x = lcd_panel_width - 1; y = sy - 1; continue; }
-	if (x > ex) { x = lcd_panel_width - 1; continue; }
-	if (x < sx) { x = sx - 1; continue; }
-      } else if (mode == WWSCREEN_OUTSIDE_ONLY) {
-	if ( (x >= sx) && (x <= ex) && (y >= sy) && (y <= ey) ) {
-	  x = ex;
-	  continue;
-	}
-      }
-
-      pixel = WWScreen_GetPixel(screen, px, py);
-
-      /* Ʃ<><C6A9><EFBFBD><EFBFBD><EFBFBD>ξ<EFBFBD><CEBE><EFBFBD> */
-      if (pixel == -1) continue;
-
-      pixel = WWColorMap_GetLCDColor(WWDisplay_GetColorMap(display), pixel);
-      WWLCDPanel_SetPixel(lcd_panel, x, y, pixel);
-    }
+  switch (WWScreen_GetMode(screen)) {
+  case WWSCREEN_INSIDE_ONLY:
+    if ( (lcd_x < sx) || (lcd_x > ex) || (lcd_y < sy) || (lcd_y > ey) )
+      return (-1);
+    break;
+  case WWSCREEN_OUTSIDE_ONLY:
+    if ( !( (lcd_x < sx) || (lcd_x > ex) || (lcd_y < sy) || (lcd_y > ey) ) )
+      return (-1);
+    break;
   }
 
-  return (0);
+  px = lcd_x + WWScreen_GetRollX(screen);
+  py = lcd_y + WWScreen_GetRollY(screen);
+
+  pixel = WWScreen_GetPixel(screen, px, py);
+
+  /* Ʃ<><C6A9><EFBFBD><EFBFBD><EFBFBD>ξ<EFBFBD><CEBE><EFBFBD> */
+  if (pixel == -1) return (-1);
+
+  pixel = WWColorMap_GetLCDColor(WWDisplay_GetColorMap(display), pixel);
+  WWLCDPanel_SetPixel(WWDisplay_GetLCDPanel(display), lcd_x, lcd_y, pixel);
+
+  return (pixel);
 }
 
-static int WWDisplay_DrawSprite(WWDisplay display, WWSprite sprite)
+static int WWDisplay_DrawSprite(WWDisplay display, WWSprite sprite,
+				int lcd_x, int lcd_y)
 {
-  int x, y, lcd_x, lcd_y;
+  int x, y, sprite_x, sprite_y;
   int sx, sy, ex, ey;
   int pixel, outside;
 
@@ -292,35 +273,38 @@ static int WWDisplay_DrawSprite(WWDisplay display, WWSprite sprite)
   ey = sy + WWDisplay_GetSpriteWindowHeight(display);
 #endif
 
-  for (y = 0; y < 8; y++) {
-    for (x = 0; x < 8; x++) {
-      pixel = WWSprite_GetPixel(sprite, x, y);
+  sprite_x = WWSprite_GetX(sprite);
+  sprite_y = WWSprite_GetY(sprite);
 
-      /* Ʃ<><C6A9><EFBFBD><EFBFBD><EFBFBD>ξ<EFBFBD><CEBE><EFBFBD> */
-      if (pixel == -1) continue;
+  if ( (lcd_x < sprite_x) || (lcd_x > sprite_x + 7) ||
+       (lcd_y < sprite_y) || (lcd_y > sprite_y + 7) )
+    return (-1);
 
-      lcd_x = WWSprite_GetX(sprite) + x;
-      lcd_y = WWSprite_GetY(sprite) + y;
+  x = lcd_x - sprite_x;
+  y = lcd_y - sprite_y;
 
-      if (WWDisplay_GetSpriteWindowEnable(display)) {
-	if ( (lcd_x < sx) || (lcd_y < sy) || (lcd_x > ex) || (lcd_y > ey) )
-	  outside = 1;
-	else
-	  outside = 0;
+  pixel = WWSprite_GetPixel(sprite, x, y);
 
-	if (WWSprite_GetClipping(sprite)) { /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>γ<EFBFBD>¦<EFBFBD><C2A6>ʬ<EFBFBD><CAAC>ɽ<EFBFBD><EFBFBD> */
-	  if (!outside) continue;
-	} else {                            /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD>¦<EFBFBD><C2A6>ʬ<EFBFBD><CAAC>ɽ<EFBFBD><C9BD> */
-	  if (outside) continue;
-	}
-      }
+  /* Ʃ<><C6A9><EFBFBD><EFBFBD><EFBFBD>ξ<EFBFBD><EFBFBD><EFBFBD> */
+  if (pixel == -1) return (-1);
 
-      pixel = WWColorMap_GetLCDColor(WWDisplay_GetColorMap(display), pixel);
-      WWLCDPanel_SetPixel(WWDisplay_GetLCDPanel(display), lcd_x, lcd_y, pixel);
+  if (WWDisplay_GetSpriteWindowEnable(display)) {
+    if ( (lcd_x < sx) || (lcd_y < sy) || (lcd_x > ex) || (lcd_y > ey) )
+      outside = 1;
+    else
+      outside = 0;
+
+    if (WWSprite_GetClipping(sprite)) { /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>γ<EFBFBD>¦<EFBFBD><C2A6>ʬ<EFBFBD><CAAC>ɽ<EFBFBD><C9BD> */
+      if (!outside) return (-1);
+    } else {                            /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD>¦<EFBFBD><C2A6>ʬ<EFBFBD><CAAC>ɽ<EFBFBD><C9BD> */
+      if (outside) return (-1);
     }
   }
 
-  return (0);
+  pixel = WWColorMap_GetLCDColor(WWDisplay_GetColorMap(display), pixel);
+  WWLCDPanel_SetPixel(WWDisplay_GetLCDPanel(display), lcd_x, lcd_y, pixel);
+
+  return (pixel);
 }
 
 int WWDisplay_DrawLCDPanel(WWDisplay display)
@@ -333,51 +317,63 @@ int WWDisplay_DrawLCDPanel(WWDisplay display)
   WWColorMap color_map;
   int border;
   WWSprite sprite;
+  int ret;
 
   lcd_panel = WWDisplay_GetLCDPanel(display);
-  lcd_panel_width = WWLCDPanel_GetWidth(lcd_panel);
+  lcd_panel_width  = WWLCDPanel_GetWidth( lcd_panel);
   lcd_panel_height = WWLCDPanel_GetHeight(lcd_panel);
   color_map = WWDisplay_GetColorMap(display);
   border = WWDisplay_GetBorder(display);
 
-  /* <20>ܡ<EFBFBD><DCA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顼<EFBFBD><E9A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
   for (x = 0; x < lcd_panel_width; x++) {
     for (y = 0; y < lcd_panel_height; y++) {
+
+      /* <20><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD>󣲤<EFBFBD><F3A3B2A4><EFBFBD>ͥ<EFBFBD><CDA5><EFBFBD>Υ<EFBFBD><CEA5>ץ饤<D7A5>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD> */
+      /* <20>Ťʤä<CAA4><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1>ֹ<EFBFBD><D6B9>μ㤤<CEBC><E3A4A4><EFBFBD>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
+      ret = -1;
+      if (WWDisplay_GetSpriteEnable(display)) {
+	for (i = 0; i < WWDisplay_GetSpriteCount(display); i++) {
+	  sprite = WWDisplay_GetSprite(display,
+				       i + WWDisplay_GetSpriteStart(display));
+	  if (WWSprite_GetPriority(sprite)) {
+	    ret = WWDisplay_DrawSprite(display, sprite, x, y);
+	    if (ret != -1) break;
+	  }
+	}
+      }
+      if (ret != -1) continue;
+
+      /* <20><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD>󣲤<EFBFBD><F3A3B2A4><EFBFBD><EFBFBD><EFBFBD> */
+      ret = WWDisplay_DrawScreen(display, WWDisplay_GetScreen(display, 1),
+				 x, y);
+      if (ret != -1) continue;
+
+      /* <20><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD>󣲤<EFBFBD><F3A3B2A4><EFBFBD>ͥ<EFBFBD><CDA5><EFBFBD>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD>ץ饤<D7A5>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD> */
+      /* <20>Ťʤä<CAA4><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1>ֹ<EFBFBD><D6B9>μ㤤<CEBC><E3A4A4><EFBFBD>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
+      ret = -1;
+      if (WWDisplay_GetSpriteEnable(display)) {
+	for (i = 0; i < WWDisplay_GetSpriteCount(display); i++) {
+	  sprite = WWDisplay_GetSprite(display,
+				       i + WWDisplay_GetSpriteStart(display));
+	  if (!WWSprite_GetPriority(sprite)) {
+	    ret = WWDisplay_DrawSprite(display, sprite, x, y);
+	    if (ret != -1) break;
+	  }
+	}
+      }
+      if (ret != -1) continue;
+
+      /* <20><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD>󣱤<EFBFBD><F3A3B1A4><EFBFBD><EFBFBD><EFBFBD> */
+      ret = WWDisplay_DrawScreen(display, WWDisplay_GetScreen(display, 0),
+				 x, y);
+      if (ret != -1) continue;
+
+      /* <20>ܡ<EFBFBD><DCA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顼<EFBFBD><E9A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
       WWLCDPanel_SetPixel(lcd_panel, x, y,
 			  WWColorMap_GetLCDColor(color_map, border));
     }
   }
 
-  /* <20><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD><EAA1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
-  WWDisplay_DrawScreen(display, WWDisplay_GetScreen(display, 0));
-
-  /* <20><><EFBFBD>ץ饤<D7A5><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD>󣲤<EFBFBD><F3A3B2A4><EFBFBD>ͥ<EFBFBD><CDA5><EFBFBD>Ǥʤ<C7A4><CAA4><EFBFBD><EFBFBD><EFBFBD>) */
-  /* <20>Ťʤä<CAA4><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1>ֹ<EFBFBD><D6B9>μ㤤<CEBC><E3A4A4><EFBFBD>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
-  if (WWDisplay_GetSpriteEnable(display)) {
-    for (i = WWDisplay_GetSpriteCount(display) - 1; i >= 0; i--) {
-      sprite = WWDisplay_GetSprite(display,
-				   i + WWDisplay_GetSpriteStart(display));
-      if (!WWSprite_GetPriority(sprite)) {
-	WWDisplay_DrawSprite(display, sprite);
-      }
-    }
-  }
-
-  /* <20><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD><EAA1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
-  WWDisplay_DrawScreen(display, WWDisplay_GetScreen(display, 1));
-
-  /* <20><><EFBFBD>ץ饤<D7A5><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD>꡼<EFBFBD>󣲤<EFBFBD><F3A3B2A4><EFBFBD>ͥ<EFBFBD><CDA5><EFBFBD>ʤ<EFBFBD><CAA4><EFBFBD>) */
-  /* <20>Ťʤä<CAA4><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1>ֹ<EFBFBD><D6B9>μ㤤<CEBC><E3A4A4><EFBFBD>Τ<EFBFBD><CEA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
-  if (WWDisplay_GetSpriteEnable(display)) {
-    for (i = WWDisplay_GetSpriteCount(display) - 1; i >= 0; i--) {
-      sprite = WWDisplay_GetSprite(display,
-				   i + WWDisplay_GetSpriteStart(display));
-      if (WWSprite_GetPriority(sprite)) {
-	WWDisplay_DrawSprite(display, sprite);
-      }
-    }
-  }
-
   return (0);
 }
 

XDisplay.c

@@ -358,16 +358,23 @@ int XDisplay_Sync(XDisplay x_display)
 
 int XDisplay_DrawLCDWindow(XDisplay x_display, WWLCDPanel ww_lcd_panel)
 {
-  int x, y, n;
-  int px, py;
+  int x, y;
+  int px, py, ph;
   int num;
-  XRectangle * rectangles;
+  int n[16];
+  XRectangle * rectangles[16];
   int pixel;
   int ww_lcd_width, ww_lcd_height;
 
+  /* <20><><EFBFBD>ܤ<EFBFBD><DCA4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD>ԥ<EFBFBD><D4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϤޤȤ<DEA4><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>褹<EFBFBD><E8A4B9><EFBFBD>Τǡ<CEA4><C7A1>ԥ<EFBFBD><D4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD><CEBA><EFBFBD><EFBFBD>ͤ<EFBFBD> */
+  /* <20>ǰ<EFBFBD><C7B0>ξ<EFBFBD><CEBE><EFBFBD>(<28>ʡ<EFBFBD><CAA1><EFBFBD><EFBFBD>ͤΤȤ<CEA4>)<29>ǡ<EFBFBD>width * height / 2 <20>ˤʤ롥        */
   num =
-    WWLCDPanel_GetHeight(ww_lcd_panel) * WWLCDPanel_GetWidth(ww_lcd_panel);
-  rectangles = (XRectangle *)malloc(sizeof(XRectangle) * num);
+    WWLCDPanel_GetHeight(ww_lcd_panel) * WWLCDPanel_GetWidth(ww_lcd_panel) / 2;
+
+  for (pixel = 0; pixel < 16; pixel++) {
+    n[pixel] = 0;
+    rectangles[pixel] = (XRectangle *)malloc(sizeof(XRectangle) * num);
+  }
   if (rectangles == NULL)
     Error("XDisplay_DrawLCDWindow", "Cannot allocate memory.");
 
@@ -376,37 +383,38 @@ int XDisplay_DrawLCDWindow(XDisplay x_display, WWLCDPanel ww_lcd_panel)
 
   /* <20><><EFBFBD><EFBFBD><EFBFBD>ν<EFBFBD><CEBD><EFBFBD><EFBFBD>ϥۥåȥ<C3A5><C8A5>ݥåȤˤʤ<CBA4><CAA4>Τǡ<CEA4><C7A1>Τ<EFBFBD><CEA4>Τ<EFBFBD><CEA4>˥<EFBFBD><CBA5>塼<EFBFBD>˥󥰤<CBA5><F3A5B0A4>뤳<EFBFBD><EBA4B3> */
 
-  for (pixel = 0; pixel < 16; pixel++) {
-    n = 0;
-    for (y = 0; y < ww_lcd_height; y++) {
-      for (x = 0; x < ww_lcd_width; x++) {
-	if (pixel == WWLCDPanel_GetPixel(ww_lcd_panel, x, y)) {
-	  px = (x * x_display->width ) / ww_lcd_width;
-	  py = (y * x_display->height) / ww_lcd_height;
-	  rectangles[n].x = px;
-	  rectangles[n].y = py;
-	  rectangles[n].width  = (x+1) * x_display->width  / ww_lcd_width - px;
-	  rectangles[n].height = (y+1) * x_display->height / ww_lcd_height- py;
+  for (y = 0; y < ww_lcd_height; y++) {
+    py = (y * x_display->height) / ww_lcd_height;
+    ph = (y+1) * x_display->height / ww_lcd_height- py;
+    for (x = 0; x < ww_lcd_width; x++) {
+      pixel = WWLCDPanel_GetPixel(ww_lcd_panel, x, y);
+      px = (x * x_display->width ) / ww_lcd_width;
+      rectangles[pixel][n[pixel]].x = px;
+      rectangles[pixel][n[pixel]].y = py;
+      rectangles[pixel][n[pixel]].width  =
+	(x+1) * x_display->width  / ww_lcd_width - px;
+      rectangles[pixel][n[pixel]].height = ph;
 
-	  /* <20><><EFBFBD>ܤ<EFBFBD><DCA4>Ƥ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD>Υԥ<CEA5><D4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4>ä<EFBFBD><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>褹<EFBFBD><E8A4B9> */
-	  x++;
-	  while ( (x < ww_lcd_width) &&
-		  (pixel == WWLCDPanel_GetPixel(ww_lcd_panel, x, y)) ) {
-	    rectangles[n].width = (x+1) * x_display->width / ww_lcd_width - px;
-	    x++;
-	  }
-	  x--;
-
-	  n++;
-	}
+      /* <20><><EFBFBD>ܤ<EFBFBD><DCA4>Ƥ<EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD>Υԥ<CEA5><D4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD><CFA1><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4>ä<EFBFBD><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>褹<EFBFBD><E8A4B9> */
+      x++;
+      while ( (x < ww_lcd_width) &&
+	      (pixel == WWLCDPanel_GetPixel(ww_lcd_panel, x, y)) ) {
+	rectangles[pixel][n[pixel]].width =
+	  (x+1) * x_display->width / ww_lcd_width - px;
+	x++;
       }
-    }
+      x--;
 
-    if (n > 0) {
+      n[pixel]++;
+    }
+  }
+
+  for (pixel = 0; pixel < 16; pixel++) {
+    if (n[pixel] > 0) {
       XFillRectangles(x_display->display,
 		      x_display->lcd_pixmap,
 		      x_display->color_gc[pixel],
-		      rectangles, n);
+		      rectangles[pixel], n[pixel]);
     }
   }
 
@@ -416,7 +424,9 @@ int XDisplay_DrawLCDWindow(XDisplay x_display, WWLCDPanel ww_lcd_panel)
 
   XDisplay_Sync(x_display);
 
-  free(rectangles);
+  for (pixel = 0; pixel < 16; pixel++) {
+    free(rectangles[pixel]);
+  }
 
   return (0);
 }