ensure con_xres,con_yres multiples of font size

avoids an unwritten right/bottom edge that's not part of a complete tile
this caused graphical issues and inconsistencies between Init and InitEx
document in the function doxygen comment
make values in __console_vipostcb only computed once
ptr directly from the global equal to destbuffer, less indirection

Author: LiquidFenrir

gc/ogc/console.h

@@ -56,7 +56,7 @@
  *
  * \param[in] framebuffer pointer to the framebuffer used for drawing the characters
  * \param[in] xstart,ystart start position of the console output in pixels
- * \param[in] xres,yres size of the console in pixels
+ * \param[in] xres,yres size of the console in pixels. Truncated to a multiple of font size if not already one
  * \param[in] stride size of one line of the framebuffer in bytes
  *
  * \return none
@@ -69,8 +69,8 @@ void CON_Init(void *framebuffer,int xstart,int ystart,int xres,int yres,int stri
  * \param[in] rmode pointer to the video/render mode configuration
  * \param[in] conXOrigin starting pixel in X direction of the console output on the external framebuffer
  * \param[in] conYOrigin starting pixel in Y direction of the console output on the external framebuffer
- * \param[in] conWidth width of the console output 'window' to be drawn in pixels
- * \param[in] conHeight height of the console output 'window' to be drawn in pixels
+ * \param[in] conWidth width of the console output 'window' to be drawn in pixels. Truncated to a multiple of font width if not already one
+ * \param[in] conHeight height of the console output 'window' to be drawn in pixels. Truncated to a multiple of font height if not already one
  *
  * \return 0 on success, <0 on error
  */

libogc/console.c

@@ -213,13 +213,16 @@ void __console_vipostcb(u32 retraceCnt)
 	u8 *fb,*ptr;
 
 	do_xfb_copy = true;
-	ptr = currentConsole->destbuffer;
+	ptr = _console_buffer;
 	fb = __console_offset_by_pixels(VIDEO_GetCurrentFramebuffer(), currentConsole->target_y, currentConsole->tgt_stride, currentConsole->target_x);
 
+	const u32 line_count = currentConsole->con_yres;
+	const u32 bytes_per_line = currentConsole->con_xres * VI_DISPLAY_PIX_SZ;
+
 	// Copies 1 line of pixels at a time
-	for(u16 ycnt = 0; ycnt < currentConsole->con_yres; ycnt++)
+	for(u16 ycnt = 0; ycnt < line_count; ycnt++)
 	{
-		memcpy(fb, ptr, currentConsole->con_xres * VI_DISPLAY_PIX_SZ);
+		memcpy(fb, ptr, bytes_per_line);
 		ptr += currentConsole->con_stride;
 		fb += currentConsole->tgt_stride;
 	}
@@ -1059,6 +1062,9 @@ ssize_t __console_write(struct _reent *r,void *fd,const char *ptr, size_t len)
 
 void CON_Init(void *framebuffer,int xstart,int ystart,int xres,int yres,int stride)
 {
+	// force xres, yres to be multiples of font size
+	xres = (xres / FONT_XSIZE) * FONT_XSIZE;
+	yres = (yres / FONT_YSIZE) * FONT_YSIZE;
 	__console_init(framebuffer,xstart,ystart,xres,yres,stride);
 }
 
@@ -1068,6 +1074,9 @@ s32 CON_InitEx(GXRModeObj *rmode, s32 conXOrigin,s32 conYOrigin,s32 conWidth,s32
 	if(_console_buffer)
 		free(_console_buffer);
 
+	// force conWidth, conHeight to be multiples of font size
+	conWidth = (conWidth / FONT_XSIZE) * FONT_XSIZE;
+	conHeight = (conHeight / FONT_YSIZE) * FONT_YSIZE;
 	_console_buffer = malloc(conWidth*conHeight*VI_DISPLAY_PIX_SZ);
 	if(!_console_buffer) return -1;