Merge branch 'master' of github.com:thepowersgang/acess2

Conflicts:
	KernelLand/Kernel/arch/x86/acpica.c

diff --cc RunQemu
index db5306a,db5306a..c34d963
--- 1/RunQemu
--- 2/RunQemu
+++ b/RunQemu
@@@ -13,6 -13,6 +13,8 @@@ QEMU_PARAMS=$QEMU_PARAMS" -net nic
  
  _NETTYPE="user"
  
++_EVAL=eval
++
  while [ $# -ne 0 ]; do
        case $1 in
        -gdb)
@@@ -47,6 -47,6 +49,9 @@@
                shift
                QEMU_PARAMS=$QEMU_PARAMS" "$1
                ;;
++      -n)
++              _EVAL=echo
++              ;;
        -fwd)
                _NETTYPE=$_NETTYPE",hostfwd=tcp::10023-10.0.2.10:23"
                ;;
@@@ -80,13 -80,13 +85,13 @@@ f
  #     qemu-system-x86_64 $QEMU_PARAMS -serial stdio | tee QemuLog.txt
  #echo $QEMU $BOOTOPT $QEMU_PARAMS
  if [ "x$_NOGRAPHIC" = "xyes" ] ; then
--      eval $QEMU $BOOTOPT $QEMU_PARAMS -nographic | tee QemuLog.txt
++      $_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic | tee QemuLog.txt
        exit
  fi
  
  if [ "x$_NOTEE" = "xyes" ] ; then
--      eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
++      $_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
        exit
  fi
  
--eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
++$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt

diff --cc Usermode/Applications/axwin3_src/Interface/main.c
index a098614,a098614..5f323e4
--- 1/Usermode/Applications/axwin3_src/Interface/main.c
--- 2/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@@ -22,6 -22,6 +22,7 @@@ void  create_run_dialog(void)
  void  mainmenu_run_dialog(void *unused);
  void  mainmenu_app_terminal(void *unused);
  void  mainmenu_app_textedit(void *unused);
++void  update_time(void);
  
  // === GLOBALS ===
  tHWND gSidebar;
@@@ -29,6 -29,6 +30,7 @@@ tAxWin3_Widget        *gSidebarRoot
  tHWND gSystemMenu;
  tHWND gRunDialog;
  tAxWin3_Widget        *gRunInput;
++tAxWin3_Widget        *gTimeDisplay;
   int  giScreenWidth;
   int  giScreenHeight;
  char  **gEnvion;
@@@ -97,9 -97,9 +99,10 @@@ void create_sidebar(void
                ELEFLAG_VERTICAL|ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH,
                "Version/Time"
                );
--      txt = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Version String");
--      AxWin3_Widget_SetSize(txt, 20);
--      AxWin3_Widget_SetText(txt, "3.0");
++      gTimeDisplay = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Time");
++      AxWin3_Widget_SetSize(gTimeDisplay, 20);
++      //AxWin3_Widget_SetText(gTimeDisplay, "--:--");
++      update_time();
  
        // Turn off decorations
        AxWin3_DecorateWindow(gSidebar, 0);
@@@ -109,6 -109,6 +112,13 @@@
        
  }
  
++void update_time(void)
++{
++      char    tmpbuf[2+1+2+1] = "--:--";
++      //strftime(tmpbuf, sizeof(tmpbuf), "%H:%M", NULL);
++      AxWin3_Widget_SetText(gTimeDisplay, tmpbuf);
++}
++
  void mainmenu_app_textedit(void *unused)
  {
  //    _SysDebug("TODO: Launch text editor");