--- np2/x11/np2.c 2003/11/26 14:55:01 1.3 +++ np2/x11/np2.c 2003/11/28 16:29:57 1.5 @@ -35,7 +35,7 @@ #include "timing.h" #include "toolkit.h" -#include "keydisp.h" +#include "kdispwin.h" #include "toolwin.h" #include "commng.h" @@ -96,12 +96,7 @@ NP2OSCFG np2oscfg = { #endif MMXFLAG_DISABLE, /* disablemmx */ - -#if defined(MITSHM) /* shared_pixmap */ - TRUE, -#else - FALSE, -#endif + FALSE, /* shared_pixmap */ }; BOOL np2running = FALSE; @@ -224,7 +219,7 @@ changescreen(BYTE newmode) if (renewal) { if (renewal & SCRNMODE_FULLSCREEN) { toolwin_destroy(); - keydisp_destroy(); + kdispwin_destroy(); } soundmng_stop(); mouse_running(MOUSE_STOP); @@ -244,7 +239,7 @@ changescreen(BYTE newmode) toolwin_create(); } if (np2oscfg.keydisp) { - keydisp_create(); + kdispwin_create(); } } } @@ -261,7 +256,7 @@ framereset(UINT cnt) framecnt = 0; scrnmng_dispclock(); - keydisp_draw((BYTE)cnt); + kdispwin_draw((BYTE)cnt); toolwin_draw((BYTE)cnt); if (np2oscfg.DISPCLK & 3) { if (sysmng_workclockrenewal()) {