diff -r -N -u server/configscript/lxdialog/checklist.c server_svn/configscript/lxdialog/checklist.c --- server/configscript/lxdialog/checklist.c 2005-11-22 02:07:16.000000000 +0800 +++ server_svn/configscript/lxdialog/checklist.c 2005-12-03 00:05:24.000000000 +0800 @@ -51,6 +51,10 @@ mvwaddch(win, choice, item_x, item[0]); wattrset (win, selected ? item_selected_attr : item_attr); waddstr (win, (char *)item+1); + if (selected) { + wmove (win, choice, check_x+1); + wrefresh (win); + } } /* @@ -207,13 +211,15 @@ status[i+scroll], i, i == choice); } - wnoutrefresh (list); - print_arrows(dialog, choice, item_no, scroll, box_y, box_x + check_x + 5, list_height); print_buttons(dialog, height, width, 0); + wnoutrefresh (list); + wnoutrefresh (dialog); + doupdate (); + while (key != ESC) { key = wgetch (dialog); @@ -351,7 +357,11 @@ case ESC: break; } + + /* Now, update everything... */ + doupdate (); } + delwin (dialog); free (status); diff -r -N -u server/configscript/lxdialog/lxdialog.c server_svn/configscript/lxdialog/lxdialog.c --- server/configscript/lxdialog/lxdialog.c 2005-11-22 02:07:16.000000000 +0800 +++ server_svn/configscript/lxdialog/lxdialog.c 2005-12-03 00:05:24.000000000 +0800 @@ -19,7 +19,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include "dialog.h" static void Usage (const char *name); diff -r -N -u server/configscript/lxdialog/menubox.c server_svn/configscript/lxdialog/menubox.c --- server/configscript/lxdialog/menubox.c 2005-11-22 02:07:16.000000000 +0800 +++ server_svn/configscript/lxdialog/menubox.c 2005-12-03 00:05:24.000000000 +0800 @@ -91,6 +91,10 @@ wattrset (win, selected ? tag_key_selected_attr : tag_key_attr); mvwaddch(win, choice, item_x+j, menu_item[j]); } + if (selected) { + wmove (win, choice, item_x+1); + wrefresh (win); + } } /* @@ -267,9 +271,11 @@ box_y, box_x+item_x+1, menu_height); print_buttons (dialog, height, width, 0); + wmove (menu, choice, item_x+1); + wrefresh (menu); while (key != ESC) { - key = wgetch(dialog); + key = wgetch(menu); if (key < 256 && isalpha(key)) key = tolower(key); @@ -372,8 +378,8 @@ print_arrows(dialog, item_no, scroll, box_y, box_x+item_x+1, menu_height); - wnoutrefresh (menu); - wrefresh (dialog); + wnoutrefresh (dialog); + wrefresh (menu); continue; /* wait for another key press */ } @@ -386,7 +392,7 @@ ? 2 : (button > 2 ? 0 : button); print_buttons(dialog, height, width, button); - wrefresh (dialog); + wrefresh (menu); break; case ' ': case 's': diff -r -N -u server/configscript/lxdialog/util.c server_svn/configscript/lxdialog/util.c --- server/configscript/lxdialog/util.c 2005-11-22 02:07:16.000000000 +0800 +++ server_svn/configscript/lxdialog/util.c 2005-12-03 00:05:24.000000000 +0800 @@ -20,10 +20,7 @@ */ #include "dialog.h" - -#ifndef index -#define index strchr -#endif + /* use colors by default? */ bool use_colors = 1; diff -r -N -u server/configure.in server_svn/configure.in --- server/configure.in 2005-12-03 00:22:00.000000000 +0800 +++ server_svn/configure.in 2005-12-03 00:35:54.000000000 +0800 @@ -180,7 +180,7 @@ dnl DirectFB AM_PGUI_CONFIG($CONFIG_FILE, DRIVER_DIRECTFB, [ - PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.19) + AC_CHECK_LIB(DIRECTFB, directfb) DRIVER_CFLAGS="$DRIVER_CFLAGS ${DIRECTFB_CFLAGS}" DRIVER_LIBS="$DRIVER_LIBS ${DIRECTFB_LIBS}" ]) diff -r -N -u server/input/sdlinput.c server_svn/input/sdlinput.c --- server/input/sdlinput.c 2005-12-03 00:22:00.000000000 +0800 +++ server_svn/input/sdlinput.c 2005-12-03 00:16:12.000000000 +0800 @@ -36,7 +36,8 @@ #include #include -#include +/* Quote: "The portable way of including SDL is #include "SDL.h" */ +#include "SDL.h" /* This is the SDL video driver */ /* I have tried various methods for this SDL input driver. For quite a * while it was threaded. This offered fast response and no CPU overhead, diff -r -N -u server/os/Makefile.am server_svn/os/Makefile.am --- server/os/Makefile.am 2005-11-29 22:43:42.000000000 +0800 +++ server_svn/os/Makefile.am 2005-12-02 23:44:30.000000000 +0800 @@ -2,8 +2,7 @@ noinst_LTLIBRARIES = libos.la -libos_la_SOURCES = \ - $(OS) +libos_la_SOURCES = EXTRA_libos_la_SOURCES = \ posix.c \ diff -r -N -u server/os/mingw_commandline.c server_svn/os/mingw_commandline.c --- server/os/mingw_commandline.c 2005-11-22 02:05:42.000000000 +0800 +++ server_svn/os/mingw_commandline.c 2005-12-03 00:12:50.000000000 +0800 @@ -40,7 +40,7 @@ #include #endif -#include "getopt.c" +//#include "getopt.c" g_error commandline_help(void); g_error commandline_list(void); diff -r -N -u server/vidbase/Makefile.am server_svn/vidbase/Makefile.am --- server/vidbase/Makefile.am 2005-11-25 01:13:58.000000000 +0800 +++ server_svn/vidbase/Makefile.am 2005-12-02 23:48:32.000000000 +0800 @@ -10,8 +10,7 @@ dvbl_lgop.c \ dvbl_sprite.c \ dvbl_font.c \ - font_base.c \ - $(VIDBASE) + font_base.c EXTRA_libvidbase_la_SOURCES = \ linear1.c \ diff -r -N -u server/video/Makefile.am server_svn/video/Makefile.am --- server/video/Makefile.am 2005-11-25 01:14:06.000000000 +0800 +++ server_svn/video/Makefile.am 2005-12-02 23:45:22.000000000 +0800 @@ -5,8 +5,7 @@ noinst_LTLIBRARIES = libvideo.la libvideo_la_SOURCES = \ - video_drivers.c \ - $(DRIVER) + video_drivers.c EXTRA_libvideo_la_SOURCES = \ ez328.c \ diff -r -N -u server/video/sdlfb.c server_svn/video/sdlfb.c --- server/video/sdlfb.c 2005-12-03 00:22:00.000000000 +0800 +++ server_svn/video/sdlfb.c 2005-12-03 00:15:42.000000000 +0800 @@ -35,8 +35,8 @@ #include /* For data types like 'quad' */ #include /* For loading our corresponding input lib */ #include /* For loading our configuration */ - -#include /* This is the SDL video driver */ +/* Quote: "The portable way of including SDL is #include "SDL.h" */ +#include "SDL.h" /* This is the SDL video driver */ #ifdef DEBUG_VIDEO #define DEBUG_FILE diff -r -N -u server/video/sdlgl.c server_svn/video/sdlgl.c --- server/video/sdlgl.c 2005-12-03 00:22:00.000000000 +0800 +++ server_svn/video/sdlgl.c 2005-12-03 00:16:04.000000000 +0800 @@ -30,7 +30,8 @@ #include #include #include -#include +/* Quote: "The portable way of including SDL is #include "SDL.h" */ +#include "SDL.h" /* This is the SDL video driver */ #ifdef CONFIG_SDLSKIN extern s16 sdlfb_display_x; diff -r -N -u server/widget/Makefile.am server_svn/widget/Makefile.am --- server/widget/Makefile.am 2005-11-25 01:14:02.000000000 +0800 +++ server_svn/widget/Makefile.am 2005-12-02 23:45:02.000000000 +0800 @@ -4,8 +4,7 @@ libwidget_la_SOURCES = \ widget.c \ - widget_table.c \ - $(WIDGET) + widget_table.c EXTRA_libwidget_la_SOURCES = \ terminal_frontend.c \