Diff for /qemu/curses.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2018/04/24 16:51:01 version 1.1.1.2, 2018/04/24 17:21:25
Line 21 Line 21
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.   * THE SOFTWARE.
  */   */
   
 #include "qemu-common.h"  
 #include "console.h"  
 #include "sysemu.h"  
   
 #include <curses.h>  #include <curses.h>
   
 #ifndef _WIN32  #ifndef _WIN32
Line 38 Line 33
 #define resize_term resizeterm  #define resize_term resizeterm
 #endif  #endif
   
   #include "qemu-common.h"
   #include "console.h"
   #include "sysemu.h"
   
 #define FONT_HEIGHT 16  #define FONT_HEIGHT 16
 #define FONT_WIDTH 8  #define FONT_WIDTH 8
   
Line 158  static void curses_cursor_position(Displ Line 157  static void curses_cursor_position(Displ
 /* generic keyboard conversion */  /* generic keyboard conversion */
   
 #include "curses_keys.h"  #include "curses_keys.h"
 #include "keymaps.c"  
   
 static kbd_layout_t *kbd_layout = 0;  static kbd_layout_t *kbd_layout = NULL;
 static int keycode2keysym[CURSES_KEYS];  static int keycode2keysym[CURSES_KEYS];
   
 static void curses_refresh(DisplayState *ds)  static void curses_refresh(DisplayState *ds)
Line 311  static void curses_keyboard_setup(void) Line 309  static void curses_keyboard_setup(void)
         keyboard_layout = "en-us";          keyboard_layout = "en-us";
 #endif  #endif
     if(keyboard_layout) {      if(keyboard_layout) {
         kbd_layout = init_keyboard_layout(keyboard_layout);          kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);
         if (!kbd_layout)          if (!kbd_layout)
             exit(1);              exit(1);
     }      }
Line 366  void curses_display_init(DisplayState *d Line 364  void curses_display_init(DisplayState *d
     dcl->dpy_refresh = curses_refresh;      dcl->dpy_refresh = curses_refresh;
     dcl->dpy_text_cursor = curses_cursor_position;      dcl->dpy_text_cursor = curses_cursor_position;
     register_displaychangelistener(ds, dcl);      register_displaychangelistener(ds, dcl);
     qemu_free_displaysurface(ds->surface);      qemu_free_displaysurface(ds);
     ds->surface = qemu_create_displaysurface_from(640, 400, 0, 0, (uint8_t*) screen);      ds->surface = qemu_create_displaysurface_from(640, 400, 0, 0, (uint8_t*) screen);
   
     invalidate = 1;      invalidate = 1;
   
     /* Standard VGA initial text mode dimensions */  
     curses_resize(ds);  
 }  }

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


unix.superglobalmegacorp.com