summaryrefslogtreecommitdiffstats
path: root/uisimulator/common
diff options
context:
space:
mode:
authorRobert Hak <adiamas@rockbox.org>2002-08-13 09:32:56 +0000
committerRobert Hak <adiamas@rockbox.org>2002-08-13 09:32:56 +0000
commite7a6a8267d14419137be16a86b671ffd472f8f64 (patch)
tree4ef4b1416f43c37ff08c6f2fb8ae9fc68af3c723 /uisimulator/common
parent4db2ded56f1ebf5a617e82458ab5526541b92943 (diff)
downloadrockbox-e7a6a8267d14419137be16a86b671ffd472f8f64.tar.gz
rockbox-e7a6a8267d14419137be16a86b671ffd472f8f64.tar.bz2
rockbox-e7a6a8267d14419137be16a86b671ffd472f8f64.zip
cleaned up
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1708 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/common')
-rw-r--r--uisimulator/common/lcd-common.c139
-rw-r--r--uisimulator/common/lcd-common.h36
2 files changed, 5 insertions, 170 deletions
diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c
index d55cd0baa8..52a98eec58 100644
--- a/uisimulator/common/lcd-common.c
+++ b/uisimulator/common/lcd-common.c
@@ -22,141 +22,10 @@
#include "lcd-common.h"
-/*** Define our #includes ***/
-#ifdef WIN32
- #include <windows.h>
- #include <process.h>
- #include "uisw32.h"
-#else
- /* X11 */
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-
- #include <errno.h>
- #include <ctype.h>
- #include <time.h>
-
- #include "screenhack.h"
-#endif
-/**** End #includes ****/
-
-
-/*** Start global variables ***/
-#ifdef WIN32
-
-/* Simulate the target ui display */
-char bitmap[LCD_HEIGHT][LCD_WIDTH];
-
-BITMAPINFO2 bmi =
-{
- { sizeof (BITMAPINFOHEADER),
- LCD_WIDTH, -LCD_HEIGHT, 1, 8,
- BI_RGB, 0, 0, 0, 2, 2, },
- {
- /* green background color */
- {UI_LCD_BGCOLOR, 0},
- /* black color */
- {UI_LCD_BLACK, 0}
- }
-
-};
-
-#else
-extern Display *dpy;
-unsigned char lcd_framebuffer_copy[LCD_WIDTH][LCD_HEIGHT/8];
-#endif
-
-/* Both X11 and WIN32 use this */
-extern unsigned char lcd_framebuffer[LCD_WIDTH][LCD_HEIGHT/8];
-
-/*** End Global variables ***/
-
+#include "lcd.h"
-/*** Externed functions ***/
-#ifndef WIN32
-extern void screen_resized(int width, int height);
-
-/* From uibasic.c */
-extern void drawdots(int color, XPoint *points, int count);
-#endif
-
-/*** End Externed functions ***/
-
-
-
-/*** Begin Functions ***/
-void lcd_update()
-{
-#ifdef WIN32
- int x, y;
- if(hGUIWnd == NULL)
- _endthread ();
-
- for(x = 0; x < LCD_WIDTH; x++)
- for(y = 0; y < LCD_HEIGHT; y++)
- bitmap[y][x] = ((lcd_framebuffer[x][y/8] >> (y & 7)) & 1);
-
- InvalidateRect (hGUIWnd, NULL, FALSE);
-
- Sleep (50);
+#ifdef WIN32
+ #include "lcd-win32.h"
#else
- int x, y, bit;
- int p=0, cp=0;
-
- XPoint points[LCD_WIDTH * LCD_HEIGHT];
- XPoint clearpoints[LCD_WIDTH * LCD_HEIGHT];
-
- for(y=0; y<LCD_HEIGHT; y+=8) {
- for(x=0; x<LCD_WIDTH; x++) {
- if(lcd_framebuffer[x][y/8] || lcd_framebuffer_copy[x][y/8]) {
- /* one or more bits/pixels are changed */
- unsigned char diff =
- lcd_framebuffer[x][y/8] ^ lcd_framebuffer_copy[x][y/8];
-
- for(bit=0; bit<8; bit++) {
- if(lcd_framebuffer[x][y/8]&(1<<bit)) {
- /* set a dot */
- points[p].x = x + MARGIN_X;
- points[p].y = y+bit + MARGIN_Y;
- p++;
- }
- else if(diff &(1<<bit)) {
- /* clear a dot */
- clearpoints[cp].x = x + MARGIN_X;
- clearpoints[cp].y = y+bit + MARGIN_Y;
- cp++; /* increase the point counter */
- }
- }
- }
- }
- }
-
- /* copy a huge block */
- memcpy(lcd_framebuffer_copy, lcd_framebuffer, sizeof(lcd_framebuffer));
-
- drawdots(0, &clearpoints[0], cp);
- drawdots(1, &points[0], p);
- XSync(dpy,False);
-
-#endif /* end WIN32*/
-}
-
-#ifdef WIN32
-void lcd_backlight(bool on)
-{
- if(on) {
- RGBQUAD blon = {UI_LCD_BGCOLORLIGHT, 0};
- bmi.bmiColors[0] = blon;
- } else {
- RGBQUAD blon = {UI_LCD_BGCOLOR, 0};
- bmi.bmiColors[0] = blon;
- }
- InvalidateRect (hGUIWnd, NULL, FALSE);
-}
+ #include "lcd-x11.h"
#endif
diff --git a/uisimulator/common/lcd-common.h b/uisimulator/common/lcd-common.h
index 08a5bbd3bb..8b78d8b85a 100644
--- a/uisimulator/common/lcd-common.h
+++ b/uisimulator/common/lcd-common.h
@@ -20,41 +20,7 @@
*
****************************************************************************/
-#include "lcd.h"
-
-#ifdef WIN32
- #ifndef __LCDWIN32_H__
- #define __LCDWIN32_H__
-
- #include "uisw32.h"
- #include "lcd.h"
-
- typedef struct
- {
- BITMAPINFOHEADER bmiHeader;
- RGBQUAD bmiColors[2];
- } BITMAPINFO2;
-
- #ifdef HAVE_LCD_BITMAP
- /* the display */
- extern unsigned char display[LCD_WIDTH][LCD_HEIGHT/8];
- #else
- #define DISP_X 112
- #define DISP_Y 64
- #endif /* HAVE_LCD_BITMAP */
-
- /* the ui display */
- extern char bitmap[LCD_HEIGHT][LCD_WIDTH];
- /* bitmap information */
- extern BITMAPINFO2 bmi;
- #endif /* __LCDWIN32_H__ */
-
-#else
- /* X11 */
- #define MARGIN_X 3
- #define MARGIN_Y 3
-
-#endif /* WIN32 */
+