len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-15 08:02:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extensive code policing (indentation levels, tab characters).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6199 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-03-18 00:03:22 +00:00
parent f89087df4b
commit 31b28f523a
4 changed files with 302 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

125
uisimulator/x11/button-x11.c
View file

@ -60,109 +60,109 @@ static int get_raw_button (void)
int ev=screenhack_handle_events(&release, &repeat); int ev=screenhack_handle_events(&release, &repeat);
switch(ev) switch(ev)
{ {
case XK_KP_Left: case XK_KP_Left:
case XK_Left: case XK_Left:
case XK_KP_4: case XK_KP_4:
k = BUTTON_LEFT; k = BUTTON_LEFT;
break; break;
case XK_KP_Right: case XK_KP_Right:
case XK_Right: case XK_Right:
case XK_KP_6: case XK_KP_6:
k = BUTTON_RIGHT; k = BUTTON_RIGHT;
break; break;
case XK_KP_Up: case XK_KP_Up:
case XK_Up: case XK_Up:
case XK_KP_8: case XK_KP_8:
#ifdef BUTTON_UP #ifdef BUTTON_UP
k = BUTTON_UP; k = BUTTON_UP;
#elif defined BUTTON_PLAY #elif defined BUTTON_PLAY
k = BUTTON_PLAY; k = BUTTON_PLAY;
#endif #endif
break; break;
case XK_KP_Down: case XK_KP_Down:
case XK_Down: case XK_Down:
case XK_KP_2: case XK_KP_2:
#ifdef BUTTON_DOWN #ifdef BUTTON_DOWN
k = BUTTON_DOWN; k = BUTTON_DOWN;
#elif defined BUTTON_STOP #elif defined BUTTON_STOP
k = BUTTON_STOP; k = BUTTON_STOP;
#endif #endif
break; break;
#ifdef BUTTON_ON #ifdef BUTTON_ON
case XK_KP_Add: case XK_KP_Add:
case XK_Q: case XK_Q:
case XK_q: case XK_q:
k = BUTTON_ON; k = BUTTON_ON;
break; break;
#endif #endif
#ifdef BUTTON_OFF #ifdef BUTTON_OFF
case XK_KP_Enter: case XK_KP_Enter:
case XK_A: case XK_A:
case XK_a: case XK_a:
k = BUTTON_OFF; k = BUTTON_OFF;
break; break;
#endif #endif
#ifdef BUTTON_F1 #ifdef BUTTON_F1
case XK_KP_Divide: case XK_KP_Divide:
case XK_1: case XK_1:
k = BUTTON_F1; k = BUTTON_F1;
break; break;
case XK_KP_Multiply: case XK_KP_Multiply:
case XK_2: case XK_2:
k = BUTTON_F2; k = BUTTON_F2;
break; break;
case XK_KP_Subtract: case XK_KP_Subtract:
case XK_3: case XK_3:
k = BUTTON_F3; k = BUTTON_F3;
break; break;
#elif defined(BUTTON_REC) #elif defined(BUTTON_REC)
case XK_KP_Divide: case XK_KP_Divide:
case XK_1: case XK_1:
k = BUTTON_REC; k = BUTTON_REC;
break; break;
#endif #endif
case XK_KP_Space: case XK_KP_Space:
case XK_KP_5: case XK_KP_5:
case XK_KP_Begin: case XK_KP_Begin:
case XK_space: case XK_space:
#ifdef BUTTON_PLAY #ifdef BUTTON_PLAY
k = BUTTON_PLAY; k = BUTTON_PLAY;
#elif defined(BUTTON_SELECT) #elif defined(BUTTON_SELECT)
k = BUTTON_SELECT; k = BUTTON_SELECT;
#endif #endif
break; break;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
case XK_5: case XK_5:
if(!release) if(!release)
{ {
screen_dump(); screen_dump();
return 0; return 0;
} }
break; break;
#endif #endif
case XK_KP_Separator: case XK_KP_Separator:
case XK_KP_Insert: case XK_KP_Insert:
case XK_Insert: case XK_Insert:
#ifdef BUTTON_MENU #ifdef BUTTON_MENU
k = BUTTON_MENU; k = BUTTON_MENU;
#elif defined(BUTTON_MODE) #elif defined(BUTTON_MODE)
k = BUTTON_MODE; k = BUTTON_MODE;
#endif #endif
break; break;
default: default:
k = 0; k = 0;
if(ev) if(ev)
DEBUGF("received ev %d\n", ev); DEBUGF("received ev %d\n", ev);
break; break;
@ -172,7 +172,8 @@ static int get_raw_button (void)
/* return a release event */ /* return a release event */
button_state &= ~k; button_state &= ~k;
k |= BUTTON_REL; k |= BUTTON_REL;
} else { }
else {
if(k) { if(k) {
button_state |= k; button_state |= k;
k = button_state; k = button_state;
@ -222,8 +223,8 @@ long button_get(bool block)
} while(1); } while(1);
if(!block) if(!block)
/* delay a bit */ /* delay a bit */
sim_sleep(1); sim_sleep(1);
return bits; return bits;
} }

28
uisimulator/x11/lcd-x11.c
View file

@ -173,21 +173,21 @@ static unsigned char lcd_buffer_copy[11][2];
void lcd_update (void) void lcd_update (void)
{ {
bool changed=false; bool changed=false;
int x, y; int x, y;
for (y=0; y<2; y++) { for (y=0; y<2; y++) {
for (x=0; x<11; x++) { for (x=0; x<11; x++) {
if (lcd_display_redraw || if (lcd_display_redraw ||
lcd_buffer_copy[x][y] != hardware_buffer_lcd[x][y]) { lcd_buffer_copy[x][y] != hardware_buffer_lcd[x][y]) {
lcd_buffer_copy[x][y] = hardware_buffer_lcd[x][y]; lcd_buffer_copy[x][y] = hardware_buffer_lcd[x][y];
lcd_print_char(x, y); lcd_print_char(x, y);
changed=true; changed=true;
} }
}
} }
} if (changed)
if (changed) XSync(dpy,False);
XSync(dpy,False); lcd_display_redraw=false;
lcd_display_redraw=false;
} }
#endif #endif

236
uisimulator/x11/screenhack.c
View file

@ -41,7 +41,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#ifdef __sgi #ifdef __sgi
# include <X11/SGIScheme.h> /* for SgiUseSchemes() */ # include <X11/SGIScheme.h> /* for SgiUseSchemes() */
#endif /* __sgi */ #endif /* __sgi */
#ifdef HAVE_XMU #ifdef HAVE_XMU
@ -128,31 +128,31 @@ XtAppContext app;
Bool mono_p; Bool mono_p;
static XrmOptionDescRec default_options [] = { static XrmOptionDescRec default_options [] = {
{ "-root", ".root", XrmoptionNoArg, "True" }, { "-root", ".root", XrmoptionNoArg, "True" },
{ "-window", ".root", XrmoptionNoArg, "False" }, { "-window", ".root", XrmoptionNoArg, "False" },
{ "-mono", ".mono", XrmoptionNoArg, "True" }, { "-mono", ".mono", XrmoptionNoArg, "True" },
{ "-install", ".installColormap", XrmoptionNoArg, "True" }, { "-install", ".installColormap", XrmoptionNoArg, "True" },
{ "-noinstall",".installColormap", XrmoptionNoArg, "False" }, { "-noinstall", ".installColormap", XrmoptionNoArg, "False" },
{ "-visual", ".visualID", XrmoptionSepArg, 0 }, { "-visual", ".visualID", XrmoptionSepArg, 0 },
{ "-window-id", ".windowID", XrmoptionSepArg, 0 }, { "-window-id", ".windowID", XrmoptionSepArg, 0 },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
static char *default_defaults[] = { static char *default_defaults[] = {
".root: false", ".root: false",
#define GEOMETRY_POSITION 1 #define GEOMETRY_POSITION 1
"*geometry: " "*geometry: "
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
"120x68" "120x68"
#else #else
"280x132" /* A bit larger that necessary */ "280x132" /* A bit larger that necessary */
#endif #endif
, /* this should be .geometry, but nooooo... */ , /* this should be .geometry, but nooooo... */
"*mono: false", "*mono: false",
"*installColormap: false", "*installColormap: false",
"*visualID: default", "*visualID: default",
"*windowID: ", "*windowID: ",
0 0
}; };
extern Display* dpy; extern Display* dpy;
@ -261,71 +261,70 @@ int screenhack_handle_event(Display *dpy, XEvent *event,
*repeat = false; *repeat = false;
switch (event->xany.type) { switch (event->xany.type) {
case KeyPress: case KeyPress:
{ {
KeySym keysym; KeySym keysym;
unsigned char c = 0; unsigned char c = 0;
XLookupString (&event->xkey, &c, 1, &keysym, 0); XLookupString (&event->xkey, &c, 1, &keysym, 0);
key = keysym; key = keysym;
#if 0 #if 0
DEBUGF("Got keypress: %02x %x, time %lx\n", c, DEBUGF("Got keypress: %02x %x, time %lx\n", c,
event->xkey.keycode, event->xkey.keycode,
event->xkey.time); event->xkey.time);
#endif #endif
if(lastkeycode == event->xkey.keycode) if(lastkeycode == event->xkey.keycode)
*repeat = checkrepeat(lasttime, event->xkey.time); *repeat = checkrepeat(lasttime, event->xkey.time);
lasttime = event->xkey.time; lasttime = event->xkey.time;
lastkeycode = event->xkey.keycode; lastkeycode = event->xkey.keycode;
} }
break; break;
case KeyRelease: case KeyRelease:
{ {
KeySym keysym; KeySym keysym;
unsigned char c = 0; unsigned char c = 0;
XLookupString (&event->xkey, &c, 1, &keysym, 0); XLookupString (&event->xkey, &c, 1, &keysym, 0);
key = keysym; key = keysym;
#if 0 #if 0
DEBUGF("Got keyrelease: %c (%02x) %x\n", c, c, DEBUGF("Got keyrelease: %c (%02x) %x\n", c, c,
event->xkey.keycode); event->xkey.keycode);
#endif #endif
if(lastkeycode == event->xkey.keycode) if(lastkeycode == event->xkey.keycode)
*repeat = checkrepeat(lasttime, event->xkey.time); *repeat = checkrepeat(lasttime, event->xkey.time);
lasttime = event->xkey.time; lasttime = event->xkey.time;
lastkeycode = event->xkey.keycode; lastkeycode = event->xkey.keycode;
if(*repeat) if(*repeat)
return 0; /* on repeats, return nothing on release */ return 0; /* on repeats, return nothing on release */
*release = TRUE; *release = TRUE;
} }
break; break;
case Expose: case Expose:
{ screen_redraw();
screen_redraw(); break;
} case ClientMessage:
break; if (event->xclient.message_type != XA_WM_PROTOCOLS) {
default: char *s = XGetAtomName(dpy, event->xclient.message_type);
break; if (!s)
case ClientMessage: s = "(null)";
{ fprintf (stderr, "%s: unknown ClientMessage %s received!\n",
if (event->xclient.message_type != XA_WM_PROTOCOLS) { progname, s);
char *s = XGetAtomName(dpy, event->xclient.message_type); }
if (!s) s = "(null)"; else if (event->xclient.data.l[0] != (int)XA_WM_DELETE_WINDOW) {
fprintf (stderr, "%s: unknown ClientMessage %s received!\n", char *s1 = XGetAtomName(dpy, event->xclient.message_type);
progname, s); char *s2 = XGetAtomName(dpy, event->xclient.data.l[0]);
} if (!s1)
else if (event->xclient.data.l[0] != (int)XA_WM_DELETE_WINDOW) { s1 = "(null)";
char *s1 = XGetAtomName(dpy, event->xclient.message_type); if (!s2)
char *s2 = XGetAtomName(dpy, event->xclient.data.l[0]); s2 = "(null)";
if (!s1) s1 = "(null)"; fprintf (stderr, "%s: unknown ClientMessage %s[%s] received!\n",
if (!s2) s2 = "(null)"; progname, s1, s2);
fprintf (stderr, "%s: unknown ClientMessage %s[%s] received!\n", }
progname, s1, s2); else {
} exit (0);
else { }
exit (0); break;
} default:
} break;
break;
} }
return key; return key;
} }
@ -344,8 +343,7 @@ int screenhack_handle_events(bool *release, bool *repeat)
} }
static Visual * static Visual *pick_visual (Screen *screen)
pick_visual (Screen *screen)
{ {
#ifdef USE_GL #ifdef USE_GL
/* If we're linking against GL (that is, this is the version of /* If we're linking against GL (that is, this is the version of
@ -367,7 +365,7 @@ pick_visual (Screen *screen)
!strcmp (string, "best") || !strcmp (string, "best") ||
!strcmp (string, "color") || !strcmp (string, "color") ||
!strcmp (string, "default")) !strcmp (string, "default"))
v = get_gl_visual (screen); /* from ../utils/visual-gl.c */ v = get_gl_visual (screen); /* from ../utils/visual-gl.c */
if (string) if (string)
free (string); free (string);
@ -393,64 +391,64 @@ int main (int argc, char **argv)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
display_zoom=2; display_zoom=2;
{ {
char *env=getenv("RECORDER_ZOOM"); char *env=getenv("RECORDER_ZOOM");
if (env) { if (env) {
display_zoom=atoi(env); display_zoom=atoi(env);
} }
} }
#else #else
display_zoom=1; display_zoom=1;
{ {
char *env=getenv("PLAYER_ZOOM"); char *env=getenv("PLAYER_ZOOM");
if (env) { if (env) {
display_zoom=atoi(env); display_zoom=atoi(env);
} }
} }
#endif #endif
if (argc > 1) if (argc > 1)
{ {
int x; int x;
for (x=1; x<argc; x++) { for (x=1; x<argc; x++) {
if (!strcmp("--old_lcd", argv[x])) { if (!strcmp("--old_lcd", argv[x])) {
having_new_lcd=FALSE; having_new_lcd=FALSE;
printf("Using old LCD layout.\n"); printf("Using old LCD layout.\n");
} else if (!strcmp("--recorder_zoom", argv[x])) { } else if (!strcmp("--recorder_zoom", argv[x])) {
x++; x++;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
display_zoom=atoi(argv[x]); display_zoom=atoi(argv[x]);
printf("Window zoom is %d\n", display_zoom); printf("Window zoom is %d\n", display_zoom);
#endif #endif
} else if (!strcmp("--player_zoom", argv[x])) { } else if (!strcmp("--player_zoom", argv[x])) {
x++; x++;
#ifndef HAVE_LCD_BITMAP #ifndef HAVE_LCD_BITMAP
display_zoom=atoi(argv[x]); display_zoom=atoi(argv[x]);
printf("Window zoom is %d\n", display_zoom); printf("Window zoom is %d\n", display_zoom);
#endif #endif
} else { } else {
printf("rockboxui\n"); printf("rockboxui\n");
printf("Arguments:\n"); printf("Arguments:\n");
printf(" --old_lcd \t [Player] simulate old playermodel (ROM version<4.51)\n"); printf(" --old_lcd \t [Player] simulate old playermodel (ROM version<4.51)\n");
printf(" --player_zoom \t [Player] window zoom\n"); printf(" --player_zoom \t [Player] window zoom\n");
printf(" --recorder_zoom \t [Recorder] window zoom\n"); printf(" --recorder_zoom \t [Recorder] window zoom\n");
printf(KEYBOARD_GENERIC KEYBOARD_SPECIFIC); printf(KEYBOARD_GENERIC KEYBOARD_SPECIFIC);
exit(0); exit(0);
} }
} }
} }
{ {
static char geometry[40]; static char geometry[40];
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
snprintf(geometry, 40, "*geometry: %dx%d", snprintf(geometry, 40, "*geometry: %dx%d",
LCD_WIDTH*display_zoom+14, LCD_HEIGHT*display_zoom+8); LCD_WIDTH*display_zoom+14, LCD_HEIGHT*display_zoom+8);
#else #else
snprintf(geometry, 40, "*geometry: %dx%d", 280*display_zoom, 132*display_zoom); snprintf(geometry, 40, "*geometry: %dx%d", 280*display_zoom,
132*display_zoom);
#endif #endif
default_defaults[GEOMETRY_POSITION]=geometry; default_defaults[GEOMETRY_POSITION]=geometry;
} }
printf(KEYBOARD_GENERIC KEYBOARD_SPECIFIC); printf(KEYBOARD_GENERIC KEYBOARD_SPECIFIC);
merge_options (); merge_options ();
#ifdef __sgi #ifdef __sgi

223
uisimulator/x11/uibasic.c
View file

@ -54,158 +54,151 @@ Window window;
bool lcd_display_redraw=true; bool lcd_display_redraw=true;
XrmOptionDescRec options [] = { XrmOptionDescRec options [] = {
/* { "-subtractive", ".additive", XrmoptionNoArg, "false" }, */ /* { "-subtractive", ".additive", XrmoptionNoArg, "false" }, */
{ "-server", ".server", XrmoptionSepArg, 0 }, { "-server", ".server", XrmoptionSepArg, 0 },
{ "-help", ".help", XrmoptionNoArg, "false" }, { "-help", ".help", XrmoptionNoArg, "false" },
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
char *progclass = "rockboxui"; char *progclass = "rockboxui";
char *defaults [] = { char *defaults [] = {
#ifdef IRIVER_H100 #ifdef IRIVER_H100
".background: lightblue", ".background: lightblue",
#elif defined ARCHOS_GMINI120 #elif defined ARCHOS_GMINI120
".background: royalblue", ".background: royalblue",
#else #else
".background: lightgreen", ".background: lightgreen",
#endif #endif
".foreground: black", ".foreground: black",
"*help: false", "*help: false",
0 0
}; };
void init_window () void init_window ()
{ {
XGCValues gcv; XGCValues gcv;
XWindowAttributes xgwa; XWindowAttributes xgwa;
XGetWindowAttributes (dpy, window, &xgwa); XGetWindowAttributes (dpy, window, &xgwa);
cmap = xgwa.colormap; cmap = xgwa.colormap;
gcv.function = GXxor; gcv.function = GXxor;
gcv.foreground = gcv.foreground = get_pixel_resource("foreground", "Foreground", dpy, cmap);
get_pixel_resource ("foreground", "Foreground", dpy, cmap); draw_gc = XCreateGC (dpy, window, GCForeground, &gcv);
draw_gc = XCreateGC (dpy, window, GCForeground, &gcv);
screen_resized(LCD_WIDTH, LCD_HEIGHT); screen_resized(LCD_WIDTH, LCD_HEIGHT);
} }
void screen_resized(int width, int height) void screen_resized(int width, int height)
{ {
int maxx, maxy; int maxx, maxy;
maxx = width; maxx = width;
maxy = height; maxy = height;
XSetForeground (dpy, draw_gc, get_pixel_resource ("background", "Background", XSetForeground(dpy, draw_gc,
dpy, cmap)); get_pixel_resource("background", "Background", dpy, cmap));
XFillRectangle(dpy, window, draw_gc, 0, 0, width*display_zoom, height*display_zoom); XFillRectangle(dpy, window, draw_gc, 0, 0, width*display_zoom,
lcd_display_redraw=true; height*display_zoom);
screen_redraw(); lcd_display_redraw=true;
screen_redraw();
} }
void drawrect(int color, int x1, int y1, int x2, int y2) void drawrect(int color, int x1, int y1, int x2, int y2)
{ {
if (color==0) { if (color==0)
XSetForeground(dpy, draw_gc, XSetForeground(dpy, draw_gc,
get_pixel_resource("background", "Background", dpy, cmap)); get_pixel_resource("background", "Background", dpy, cmap));
} else
else XSetForeground(dpy, draw_gc,
XSetForeground(dpy, draw_gc, get_pixel_resource("foreground", "Foreground", dpy, cmap));
get_pixel_resource("foreground", "Foreground", dpy, cmap));
XFillRectangle(dpy, window, draw_gc, x1*display_zoom, y1*display_zoom,
x2*display_zoom, y2*display_zoom);
XFillRectangle(dpy, window, draw_gc, x1*display_zoom, y1*display_zoom,
x2*display_zoom, y2*display_zoom);
} }
static void help(void) static void help(void)
{ {
printf(PROGNAME " " ROCKBOXUI_VERSION " " __DATE__ "\n" printf(PROGNAME " " ROCKBOXUI_VERSION " " __DATE__ "\n"
"usage: " PROGNAME "\n" "usage: " PROGNAME "\n");
);
} }
void drawline(int color, int x1, int y1, int x2, int y2) void drawline(int color, int x1, int y1, int x2, int y2)
{ {
if (color==0) { if (color==0)
XSetForeground(dpy, draw_gc, XSetForeground(dpy, draw_gc,
get_pixel_resource("background", "Background", dpy, cmap)); get_pixel_resource("background", "Background", dpy, cmap));
} else
else XSetForeground(dpy, draw_gc,
XSetForeground(dpy, draw_gc, get_pixel_resource("foreground", "Foreground", dpy, cmap));
get_pixel_resource("foreground", "Foreground", dpy, cmap));
XDrawLine(dpy, window, draw_gc, XDrawLine(dpy, window, draw_gc,
(int)(x1*display_zoom), (int)(x1*display_zoom),
(int)(y1*display_zoom), (int)(y1*display_zoom),
(int)(x2*display_zoom), (int)(x2*display_zoom),
(int)(y2*display_zoom)); (int)(y2*display_zoom));
} }
void drawdot(int color, int x, int y) void drawdot(int color, int x, int y)
{ {
if (color==0) { if (color==0)
XSetForeground(dpy, draw_gc, XSetForeground(dpy, draw_gc,
get_pixel_resource("background", "Background", dpy, cmap)); get_pixel_resource("background", "Background", dpy, cmap));
} else
else XSetForeground(dpy, draw_gc,
XSetForeground(dpy, draw_gc, get_pixel_resource("foreground", "Foreground", dpy, cmap));
get_pixel_resource("foreground", "Foreground", dpy, cmap));
XFillRectangle(dpy, window, draw_gc, x*display_zoom, y*display_zoom, XFillRectangle(dpy, window, draw_gc, x*display_zoom, y*display_zoom,
display_zoom, display_zoom); display_zoom, display_zoom);
} }
void drawdots(int color, struct coordinate *points, int count) void drawdots(int color, struct coordinate *points, int count)
{ {
if (color==0) { if (color==0)
XSetForeground(dpy, draw_gc, XSetForeground(dpy, draw_gc,
get_pixel_resource("background", "Background", dpy, cmap)); get_pixel_resource("background", "Background", dpy, cmap));
} else
else XSetForeground(dpy, draw_gc,
XSetForeground(dpy, draw_gc, get_pixel_resource("foreground", "Foreground", dpy, cmap));
get_pixel_resource("foreground", "Foreground", dpy, cmap));
while (count--) { while (count--) {
XFillRectangle(dpy, window, draw_gc, XFillRectangle(dpy, window, draw_gc,
points[count].x*display_zoom, points[count].x*display_zoom,
points[count].y*display_zoom, points[count].y*display_zoom,
display_zoom, display_zoom,
display_zoom); display_zoom);
} }
} }
void drawrectangles(int color, struct rectangle *points, int count) void drawrectangles(int color, struct rectangle *points, int count)
{ {
if (color==0) { if (color==0)
XSetForeground(dpy, draw_gc, XSetForeground(dpy, draw_gc,
get_pixel_resource("background", "Background", dpy, cmap)); get_pixel_resource("background", "Background", dpy, cmap));
} else
else XSetForeground(dpy, draw_gc,
XSetForeground(dpy, draw_gc, get_pixel_resource("foreground", "Foreground", dpy, cmap));
get_pixel_resource("foreground", "Foreground", dpy, cmap));
while (count--) { while (count--) {
XFillRectangle(dpy, window, draw_gc, XFillRectangle(dpy, window, draw_gc,
points[count].x*display_zoom, points[count].x*display_zoom,
points[count].y*display_zoom, points[count].y*display_zoom,
points[count].width*display_zoom, points[count].width*display_zoom,
points[count].height*display_zoom); points[count].height*display_zoom);
}
}
} }
void drawtext(int color, int x, int y, char *text) void drawtext(int color, int x, int y, char *text)
{ {
if (color==0) { if (color==0)
XSetForeground(dpy, draw_gc, XSetForeground(dpy, draw_gc,
get_pixel_resource("background", "Background", dpy, cmap)); get_pixel_resource("background", "Background", dpy, cmap));
} else
else XSetForeground(dpy, draw_gc,
XSetForeground(dpy, draw_gc, get_pixel_resource("foreground", "Foreground", dpy, cmap));
get_pixel_resource("foreground", "Foreground", dpy, cmap));
XDrawString(dpy, window, draw_gc, x*display_zoom, y*display_zoom, text, strlen(text)); XDrawString(dpy, window, draw_gc, x*display_zoom, y*display_zoom, text,
strlen(text));
} }
/* this is where the applicaton starts */ /* this is where the applicaton starts */
@ -214,36 +207,36 @@ extern void app_main(void);
void void
screenhack (Display *the_dpy, Window the_window) screenhack (Display *the_dpy, Window the_window)
{ {
Bool helpme; Bool helpme;
/* This doesn't work, but I don't know why (Daniel 1999-12-01) */ /* This doesn't work, but I don't know why (Daniel 1999-12-01) */
helpme = get_boolean_resource ("help", "Boolean"); helpme = get_boolean_resource ("help", "Boolean");
if(helpme) { if(helpme)
help(); help();
}
printf(PROGNAME " " ROCKBOXUI_VERSION " (" __DATE__ ")\n");
dpy=the_dpy; printf(PROGNAME " " ROCKBOXUI_VERSION " (" __DATE__ ")\n");
window=the_window;
init_window(); dpy=the_dpy;
window=the_window;
screen_redraw(); init_window();
app_main(); screen_redraw();
app_main();
} }
void screen_redraw() void screen_redraw()
{ {
/* draw a border around the "Recorder" screen */ /* draw a border around the "Recorder" screen */
#define X1 0 #define X1 0
#define Y1 0 #define Y1 0
#define X2 (LCD_WIDTH + MARGIN_X*2) #define X2 (LCD_WIDTH + MARGIN_X*2)
#define Y2 (LCD_HEIGHT + MARGIN_Y) #define Y2 (LCD_HEIGHT + MARGIN_Y)
drawline(1, X1, Y1, X2, Y1); drawline(1, X1, Y1, X2, Y1);
drawline(1, X2, Y1, X2, Y2); drawline(1, X2, Y1, X2, Y2);
drawline(1, X1, Y2, X2, Y2); drawline(1, X1, Y2, X2, Y2);
drawline(1, X1, Y1, X1, Y2); drawline(1, X1, Y1, X1, Y2);
lcd_update(); lcd_update();
} }