Commit 5b2ecaba authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20161028-1' into staging 



braille fixes and improvements.
curses fix, switch to cursesw.
gtk bugfixes.

# gpg: Signature made Fri 28 Oct 2016 13:05:12 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-ui-20161028-1:
  curses: Use cursesw instead of curses
  curses: fix left/right arrow translation
  ui/gtk: Fix non-working DELETE key
  gtk: fix compilation warning with gtk 3.22.2
  Defer BrlAPI tty acquisition to when guest starts using device
  Add dots keypresses support to the baum braille device

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents eb540e2c 8ddc5bf9

backends/baum.c

+179 −136
Original line number Diff line number Diff line 
/*

 * QEMU Baum Braille Device

 *

 * Copyright (c) 2008 Samuel Thibault

 * Copyright (c) 2008, 2010-2011, 2016 Samuel Thibault

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal
@@ -92,6 +92,7 @@ typedef struct { 
    brlapi_handle_t *brlapi;

    int brlapi_fd;

    unsigned int x, y;

    bool deferred_init;



    uint8_t in_buf[BUF_SIZE];

    uint8_t in_buf_used;
@@ -102,8 +103,11 @@ typedef struct { 
} BaumDriverState;



/* Let's assume NABCC by default */

static const uint8_t nabcc_translation[256] = {

    [0] = ' ',

enum way {

    DOTS2ASCII,

    ASCII2DOTS

};

static const uint8_t nabcc_translation[2][256] = {

#ifndef BRLAPI_DOTS

#define BRLAPI_DOTS(d1,d2,d3,d4,d5,d6,d7,d8) \

    ((d1?BRLAPI_DOT1:0)|\
@@ -115,107 +119,154 @@ static const uint8_t nabcc_translation[256] = { 
     (d7?BRLAPI_DOT7:0)|\

     (d8?BRLAPI_DOT8:0))

#endif

    [BRLAPI_DOTS(1,0,0,0,0,0,0,0)] = 'a',

    [BRLAPI_DOTS(1,1,0,0,0,0,0,0)] = 'b',

    [BRLAPI_DOTS(1,0,0,1,0,0,0,0)] = 'c',

    [BRLAPI_DOTS(1,0,0,1,1,0,0,0)] = 'd',

    [BRLAPI_DOTS(1,0,0,0,1,0,0,0)] = 'e',

    [BRLAPI_DOTS(1,1,0,1,0,0,0,0)] = 'f',

    [BRLAPI_DOTS(1,1,0,1,1,0,0,0)] = 'g',

    [BRLAPI_DOTS(1,1,0,0,1,0,0,0)] = 'h',

    [BRLAPI_DOTS(0,1,0,1,0,0,0,0)] = 'i',

    [BRLAPI_DOTS(0,1,0,1,1,0,0,0)] = 'j',

    [BRLAPI_DOTS(1,0,1,0,0,0,0,0)] = 'k',

    [BRLAPI_DOTS(1,1,1,0,0,0,0,0)] = 'l',

    [BRLAPI_DOTS(1,0,1,1,0,0,0,0)] = 'm',

    [BRLAPI_DOTS(1,0,1,1,1,0,0,0)] = 'n',

    [BRLAPI_DOTS(1,0,1,0,1,0,0,0)] = 'o',

    [BRLAPI_DOTS(1,1,1,1,0,0,0,0)] = 'p',

    [BRLAPI_DOTS(1,1,1,1,1,0,0,0)] = 'q',

    [BRLAPI_DOTS(1,1,1,0,1,0,0,0)] = 'r',

    [BRLAPI_DOTS(0,1,1,1,0,0,0,0)] = 's',

    [BRLAPI_DOTS(0,1,1,1,1,0,0,0)] = 't',

    [BRLAPI_DOTS(1,0,1,0,0,1,0,0)] = 'u',

    [BRLAPI_DOTS(1,1,1,0,0,1,0,0)] = 'v',

    [BRLAPI_DOTS(0,1,0,1,1,1,0,0)] = 'w',

    [BRLAPI_DOTS(1,0,1,1,0,1,0,0)] = 'x',

    [BRLAPI_DOTS(1,0,1,1,1,1,0,0)] = 'y',

    [BRLAPI_DOTS(1,0,1,0,1,1,0,0)] = 'z',



    [BRLAPI_DOTS(1,0,0,0,0,0,1,0)] = 'A',

    [BRLAPI_DOTS(1,1,0,0,0,0,1,0)] = 'B',

    [BRLAPI_DOTS(1,0,0,1,0,0,1,0)] = 'C',

    [BRLAPI_DOTS(1,0,0,1,1,0,1,0)] = 'D',

    [BRLAPI_DOTS(1,0,0,0,1,0,1,0)] = 'E',

    [BRLAPI_DOTS(1,1,0,1,0,0,1,0)] = 'F',

    [BRLAPI_DOTS(1,1,0,1,1,0,1,0)] = 'G',

    [BRLAPI_DOTS(1,1,0,0,1,0,1,0)] = 'H',

    [BRLAPI_DOTS(0,1,0,1,0,0,1,0)] = 'I',

    [BRLAPI_DOTS(0,1,0,1,1,0,1,0)] = 'J',

    [BRLAPI_DOTS(1,0,1,0,0,0,1,0)] = 'K',

    [BRLAPI_DOTS(1,1,1,0,0,0,1,0)] = 'L',

    [BRLAPI_DOTS(1,0,1,1,0,0,1,0)] = 'M',

    [BRLAPI_DOTS(1,0,1,1,1,0,1,0)] = 'N',

    [BRLAPI_DOTS(1,0,1,0,1,0,1,0)] = 'O',

    [BRLAPI_DOTS(1,1,1,1,0,0,1,0)] = 'P',

    [BRLAPI_DOTS(1,1,1,1,1,0,1,0)] = 'Q',

    [BRLAPI_DOTS(1,1,1,0,1,0,1,0)] = 'R',

    [BRLAPI_DOTS(0,1,1,1,0,0,1,0)] = 'S',

    [BRLAPI_DOTS(0,1,1,1,1,0,1,0)] = 'T',

    [BRLAPI_DOTS(1,0,1,0,0,1,1,0)] = 'U',

    [BRLAPI_DOTS(1,1,1,0,0,1,1,0)] = 'V',

    [BRLAPI_DOTS(0,1,0,1,1,1,1,0)] = 'W',

    [BRLAPI_DOTS(1,0,1,1,0,1,1,0)] = 'X',

    [BRLAPI_DOTS(1,0,1,1,1,1,1,0)] = 'Y',

    [BRLAPI_DOTS(1,0,1,0,1,1,1,0)] = 'Z',



    [BRLAPI_DOTS(0,0,1,0,1,1,0,0)] = '0',

    [BRLAPI_DOTS(0,1,0,0,0,0,0,0)] = '1',

    [BRLAPI_DOTS(0,1,1,0,0,0,0,0)] = '2',

    [BRLAPI_DOTS(0,1,0,0,1,0,0,0)] = '3',

    [BRLAPI_DOTS(0,1,0,0,1,1,0,0)] = '4',

    [BRLAPI_DOTS(0,1,0,0,0,1,0,0)] = '5',

    [BRLAPI_DOTS(0,1,1,0,1,0,0,0)] = '6',

    [BRLAPI_DOTS(0,1,1,0,1,1,0,0)] = '7',

    [BRLAPI_DOTS(0,1,1,0,0,1,0,0)] = '8',

    [BRLAPI_DOTS(0,0,1,0,1,0,0,0)] = '9',



    [BRLAPI_DOTS(0,0,0,1,0,1,0,0)] = '.',

    [BRLAPI_DOTS(0,0,1,1,0,1,0,0)] = '+',

    [BRLAPI_DOTS(0,0,1,0,0,1,0,0)] = '-',

    [BRLAPI_DOTS(1,0,0,0,0,1,0,0)] = '*',

    [BRLAPI_DOTS(0,0,1,1,0,0,0,0)] = '/',

    [BRLAPI_DOTS(1,1,1,0,1,1,0,0)] = '(',

    [BRLAPI_DOTS(0,1,1,1,1,1,0,0)] = ')',



    [BRLAPI_DOTS(1,1,1,1,0,1,0,0)] = '&',

    [BRLAPI_DOTS(0,0,1,1,1,1,0,0)] = '#',



    [BRLAPI_DOTS(0,0,0,0,0,1,0,0)] = ',',

    [BRLAPI_DOTS(0,0,0,0,1,1,0,0)] = ';',

    [BRLAPI_DOTS(1,0,0,0,1,1,0,0)] = ':',

    [BRLAPI_DOTS(0,1,1,1,0,1,0,0)] = '!',

    [BRLAPI_DOTS(1,0,0,1,1,1,0,0)] = '?',

    [BRLAPI_DOTS(0,0,0,0,1,0,0,0)] = '"',

    [BRLAPI_DOTS(0,0,1,0,0,0,0,0)] ='\'',

    [BRLAPI_DOTS(0,0,0,1,0,0,0,0)] = '`',

    [BRLAPI_DOTS(0,0,0,1,1,0,1,0)] = '^',

    [BRLAPI_DOTS(0,0,0,1,1,0,0,0)] = '~',

    [BRLAPI_DOTS(0,1,0,1,0,1,1,0)] = '[',

    [BRLAPI_DOTS(1,1,0,1,1,1,1,0)] = ']',

    [BRLAPI_DOTS(0,1,0,1,0,1,0,0)] = '{',

    [BRLAPI_DOTS(1,1,0,1,1,1,0,0)] = '}',

    [BRLAPI_DOTS(1,1,1,1,1,1,0,0)] = '=',

    [BRLAPI_DOTS(1,1,0,0,0,1,0,0)] = '<',

    [BRLAPI_DOTS(0,0,1,1,1,0,0,0)] = '>',

    [BRLAPI_DOTS(1,1,0,1,0,1,0,0)] = '$',

    [BRLAPI_DOTS(1,0,0,1,0,1,0,0)] = '%',

    [BRLAPI_DOTS(0,0,0,1,0,0,1,0)] = '@',

    [BRLAPI_DOTS(1,1,0,0,1,1,0,0)] = '|',

    [BRLAPI_DOTS(1,1,0,0,1,1,1,0)] ='\\',

    [BRLAPI_DOTS(0,0,0,1,1,1,0,0)] = '_',

#define DO(dots, ascii) \

    [DOTS2ASCII][dots] = ascii, \

    [ASCII2DOTS][ascii] = dots

    DO(0, ' '),

    DO(BRLAPI_DOTS(1, 0, 0, 0, 0, 0, 0, 0), 'a'),

    DO(BRLAPI_DOTS(1, 1, 0, 0, 0, 0, 0, 0), 'b'),

    DO(BRLAPI_DOTS(1, 0, 0, 1, 0, 0, 0, 0), 'c'),

    DO(BRLAPI_DOTS(1, 0, 0, 1, 1, 0, 0, 0), 'd'),

    DO(BRLAPI_DOTS(1, 0, 0, 0, 1, 0, 0, 0), 'e'),

    DO(BRLAPI_DOTS(1, 1, 0, 1, 0, 0, 0, 0), 'f'),

    DO(BRLAPI_DOTS(1, 1, 0, 1, 1, 0, 0, 0), 'g'),

    DO(BRLAPI_DOTS(1, 1, 0, 0, 1, 0, 0, 0), 'h'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 0, 0, 0, 0), 'i'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 1, 0, 0, 0), 'j'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 0, 0, 0, 0), 'k'),

    DO(BRLAPI_DOTS(1, 1, 1, 0, 0, 0, 0, 0), 'l'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 0, 0, 0, 0), 'm'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 1, 0, 0, 0), 'n'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 1, 0, 0, 0), 'o'),

    DO(BRLAPI_DOTS(1, 1, 1, 1, 0, 0, 0, 0), 'p'),

    DO(BRLAPI_DOTS(1, 1, 1, 1, 1, 0, 0, 0), 'q'),

    DO(BRLAPI_DOTS(1, 1, 1, 0, 1, 0, 0, 0), 'r'),

    DO(BRLAPI_DOTS(0, 1, 1, 1, 0, 0, 0, 0), 's'),

    DO(BRLAPI_DOTS(0, 1, 1, 1, 1, 0, 0, 0), 't'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 0, 1, 0, 0), 'u'),

    DO(BRLAPI_DOTS(1, 1, 1, 0, 0, 1, 0, 0), 'v'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 1, 1, 0, 0), 'w'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 0, 1, 0, 0), 'x'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 1, 1, 0, 0), 'y'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 1, 1, 0, 0), 'z'),



    DO(BRLAPI_DOTS(1, 0, 0, 0, 0, 0, 1, 0), 'A'),

    DO(BRLAPI_DOTS(1, 1, 0, 0, 0, 0, 1, 0), 'B'),

    DO(BRLAPI_DOTS(1, 0, 0, 1, 0, 0, 1, 0), 'C'),

    DO(BRLAPI_DOTS(1, 0, 0, 1, 1, 0, 1, 0), 'D'),

    DO(BRLAPI_DOTS(1, 0, 0, 0, 1, 0, 1, 0), 'E'),

    DO(BRLAPI_DOTS(1, 1, 0, 1, 0, 0, 1, 0), 'F'),

    DO(BRLAPI_DOTS(1, 1, 0, 1, 1, 0, 1, 0), 'G'),

    DO(BRLAPI_DOTS(1, 1, 0, 0, 1, 0, 1, 0), 'H'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 0, 0, 1, 0), 'I'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 1, 0, 1, 0), 'J'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 0, 0, 1, 0), 'K'),

    DO(BRLAPI_DOTS(1, 1, 1, 0, 0, 0, 1, 0), 'L'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 0, 0, 1, 0), 'M'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 1, 0, 1, 0), 'N'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 1, 0, 1, 0), 'O'),

    DO(BRLAPI_DOTS(1, 1, 1, 1, 0, 0, 1, 0), 'P'),

    DO(BRLAPI_DOTS(1, 1, 1, 1, 1, 0, 1, 0), 'Q'),

    DO(BRLAPI_DOTS(1, 1, 1, 0, 1, 0, 1, 0), 'R'),

    DO(BRLAPI_DOTS(0, 1, 1, 1, 0, 0, 1, 0), 'S'),

    DO(BRLAPI_DOTS(0, 1, 1, 1, 1, 0, 1, 0), 'T'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 0, 1, 1, 0), 'U'),

    DO(BRLAPI_DOTS(1, 1, 1, 0, 0, 1, 1, 0), 'V'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 1, 1, 1, 0), 'W'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 0, 1, 1, 0), 'X'),

    DO(BRLAPI_DOTS(1, 0, 1, 1, 1, 1, 1, 0), 'Y'),

    DO(BRLAPI_DOTS(1, 0, 1, 0, 1, 1, 1, 0), 'Z'),



    DO(BRLAPI_DOTS(0, 0, 1, 0, 1, 1, 0, 0), '0'),

    DO(BRLAPI_DOTS(0, 1, 0, 0, 0, 0, 0, 0), '1'),

    DO(BRLAPI_DOTS(0, 1, 1, 0, 0, 0, 0, 0), '2'),

    DO(BRLAPI_DOTS(0, 1, 0, 0, 1, 0, 0, 0), '3'),

    DO(BRLAPI_DOTS(0, 1, 0, 0, 1, 1, 0, 0), '4'),

    DO(BRLAPI_DOTS(0, 1, 0, 0, 0, 1, 0, 0), '5'),

    DO(BRLAPI_DOTS(0, 1, 1, 0, 1, 0, 0, 0), '6'),

    DO(BRLAPI_DOTS(0, 1, 1, 0, 1, 1, 0, 0), '7'),

    DO(BRLAPI_DOTS(0, 1, 1, 0, 0, 1, 0, 0), '8'),

    DO(BRLAPI_DOTS(0, 0, 1, 0, 1, 0, 0, 0), '9'),



    DO(BRLAPI_DOTS(0, 0, 0, 1, 0, 1, 0, 0), '.'),

    DO(BRLAPI_DOTS(0, 0, 1, 1, 0, 1, 0, 0), '+'),

    DO(BRLAPI_DOTS(0, 0, 1, 0, 0, 1, 0, 0), '-'),

    DO(BRLAPI_DOTS(1, 0, 0, 0, 0, 1, 0, 0), '*'),

    DO(BRLAPI_DOTS(0, 0, 1, 1, 0, 0, 0, 0), '/'),

    DO(BRLAPI_DOTS(1, 1, 1, 0, 1, 1, 0, 0), '('),

    DO(BRLAPI_DOTS(0, 1, 1, 1, 1, 1, 0, 0), ')'),



    DO(BRLAPI_DOTS(1, 1, 1, 1, 0, 1, 0, 0), '&'),

    DO(BRLAPI_DOTS(0, 0, 1, 1, 1, 1, 0, 0), '#'),



    DO(BRLAPI_DOTS(0, 0, 0, 0, 0, 1, 0, 0), ','),

    DO(BRLAPI_DOTS(0, 0, 0, 0, 1, 1, 0, 0), ';'),

    DO(BRLAPI_DOTS(1, 0, 0, 0, 1, 1, 0, 0), ':'),

    DO(BRLAPI_DOTS(0, 1, 1, 1, 0, 1, 0, 0), '!'),

    DO(BRLAPI_DOTS(1, 0, 0, 1, 1, 1, 0, 0), '?'),

    DO(BRLAPI_DOTS(0, 0, 0, 0, 1, 0, 0, 0), '"'),

    DO(BRLAPI_DOTS(0, 0, 1, 0, 0, 0, 0, 0), '\''),

    DO(BRLAPI_DOTS(0, 0, 0, 1, 0, 0, 0, 0), '`'),

    DO(BRLAPI_DOTS(0, 0, 0, 1, 1, 0, 1, 0), '^'),

    DO(BRLAPI_DOTS(0, 0, 0, 1, 1, 0, 0, 0), '~'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 0, 1, 1, 0), '['),

    DO(BRLAPI_DOTS(1, 1, 0, 1, 1, 1, 1, 0), ']'),

    DO(BRLAPI_DOTS(0, 1, 0, 1, 0, 1, 0, 0), '{'),

    DO(BRLAPI_DOTS(1, 1, 0, 1, 1, 1, 0, 0), '}'),

    DO(BRLAPI_DOTS(1, 1, 1, 1, 1, 1, 0, 0), '='),

    DO(BRLAPI_DOTS(1, 1, 0, 0, 0, 1, 0, 0), '<'),

    DO(BRLAPI_DOTS(0, 0, 1, 1, 1, 0, 0, 0), '>'),

    DO(BRLAPI_DOTS(1, 1, 0, 1, 0, 1, 0, 0), '$'),

    DO(BRLAPI_DOTS(1, 0, 0, 1, 0, 1, 0, 0), '%'),

    DO(BRLAPI_DOTS(0, 0, 0, 1, 0, 0, 1, 0), '@'),

    DO(BRLAPI_DOTS(1, 1, 0, 0, 1, 1, 0, 0), '|'),

    DO(BRLAPI_DOTS(1, 1, 0, 0, 1, 1, 1, 0), '\\'),

    DO(BRLAPI_DOTS(0, 0, 0, 1, 1, 1, 0, 0), '_'),

};



/* The guest OS has started discussing with us, finish initializing BrlAPI */

static int baum_deferred_init(BaumDriverState *baum)

{

#if defined(CONFIG_SDL)

#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)

    SDL_SysWMinfo info;

#endif

#endif

    int tty;



    if (baum->deferred_init) {

        return 1;

    }



    if (brlapi__getDisplaySize(baum->brlapi, &baum->x, &baum->y) == -1) {

        brlapi_perror("baum: brlapi__getDisplaySize");

        return 0;

    }



#if defined(CONFIG_SDL)

#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)

    memset(&info, 0, sizeof(info));

    SDL_VERSION(&info.version);

    if (SDL_GetWMInfo(&info)) {

        tty = info.info.x11.wmwindow;

    } else {

#endif

#endif

        tty = BRLAPI_TTY_DEFAULT;

#if defined(CONFIG_SDL)

#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)

    }

#endif

#endif



    if (brlapi__enterTtyMode(baum->brlapi, tty, NULL) == -1) {

        brlapi_perror("baum: brlapi__enterTtyMode");

        return 0;

    }

    baum->deferred_init = 1;

    return 1;

}



/* The serial port can receive more of our data */

static void baum_accept_input(struct CharDriverState *chr)

{
@@ -346,8 +397,10 @@ static int baum_eat_packet(BaumDriverState *baum, const uint8_t *buf, int len) 
                cursor = i + 1;

                c &= ~(BRLAPI_DOT7|BRLAPI_DOT8);

            }

            if (!(c = nabcc_translation[c]))

            c = nabcc_translation[DOTS2ASCII][c];

            if (!c) {

                c = '?';

            }

            text[i] = c;

        }

        timer_del(baum->cellCount_timer);
@@ -440,6 +493,8 @@ static int baum_write(CharDriverState *chr, const uint8_t *buf, int len) 
        return 0;

    if (!baum->brlapi)

        return len;

    if (!baum_deferred_init(baum))

        return len;



    while (len) {

        /* Complete our buffer as much as possible */
@@ -476,6 +531,13 @@ static void baum_send_key(BaumDriverState *baum, uint8_t type, uint8_t value) { 
    baum_write_packet(baum, packet, sizeof(packet));

}



static void baum_send_key2(BaumDriverState *baum, uint8_t type, uint8_t value,

                           uint8_t value2) {

    uint8_t packet[] = { type, value, value2 };

    DPRINTF("writing key %x %x\n", type, value);

    baum_write_packet(baum, packet, sizeof(packet));

}



/* We got some data on the BrlAPI socket */

static void baum_chr_read(void *opaque)

{
@@ -484,6 +546,8 @@ static void baum_chr_read(void *opaque) 
    int ret;

    if (!baum->brlapi)

        return;

    if (!baum_deferred_init(baum))

        return;

    while ((ret = brlapi__readKey(baum->brlapi, 0, &code)) == 1) {

        DPRINTF("got key %"BRLAPI_PRIxKEYCODE"\n", code);

        /* Emulate */
@@ -540,9 +604,19 @@ static void baum_chr_read(void *opaque) 
            }

            break;

        case BRLAPI_KEY_TYPE_SYM:

            {

                brlapi_keyCode_t keysym = code & BRLAPI_KEY_CODE_MASK;

                if (keysym < 0x100) {

                    uint8_t dots = nabcc_translation[ASCII2DOTS][keysym];

                    if (dots) {

                        baum_send_key2(baum, BAUM_RSP_EntryKeys, 0, dots);

                        baum_send_key2(baum, BAUM_RSP_EntryKeys, 0, 0);

                    }

                }

                break;

            }

        }

    }

    if (ret == -1 && (brlapi_errno != BRLAPI_ERROR_LIBCERR || errno != EINTR)) {

        brlapi_perror("baum: brlapi_readKey");

        brlapi__closeConnection(baum->brlapi);
@@ -573,12 +647,6 @@ static CharDriverState *chr_baum_init(const char *id, 
    BaumDriverState *baum;

    CharDriverState *chr;

    brlapi_handle_t *handle;

#if defined(CONFIG_SDL)

#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)

    SDL_SysWMinfo info;

#endif

#endif

    int tty;



    chr = qemu_chr_alloc(common, errp);

    if (!chr) {
@@ -601,39 +669,14 @@ static CharDriverState *chr_baum_init(const char *id, 
                   brlapi_strerror(brlapi_error_location()));

        goto fail_handle;

    }

    baum->deferred_init = 0;



    baum->cellCount_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, baum_cellCount_timer_cb, baum);



    if (brlapi__getDisplaySize(handle, &baum->x, &baum->y) == -1) {

        error_setg(errp, "brlapi__getDisplaySize: %s",

                   brlapi_strerror(brlapi_error_location()));

        goto fail;

    }



#if defined(CONFIG_SDL)

#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)

    memset(&info, 0, sizeof(info));

    SDL_VERSION(&info.version);

    if (SDL_GetWMInfo(&info))

        tty = info.info.x11.wmwindow;

    else

#endif

#endif

        tty = BRLAPI_TTY_DEFAULT;



    if (brlapi__enterTtyMode(handle, tty, NULL) == -1) {

        error_setg(errp, "brlapi__enterTtyMode: %s",

                   brlapi_strerror(brlapi_error_location()));

        goto fail;

    }



    qemu_set_fd_handler(baum->brlapi_fd, baum_chr_read, NULL, baum);



    return chr;



fail:

    timer_free(baum->cellCount_timer);

    brlapi__closeConnection(handle);

fail_handle:

    g_free(handle);

    g_free(chr);

configure

+20 −9
Original line number Diff line number Diff line
@@ -2917,28 +2917,39 @@ fi 
# curses probe

if test "$curses" != "no" ; then

  if test "$mingw32" = "yes" ; then

    curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"

    curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"

    curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"

  else

    curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lncurses:-lcurses"

    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):"

    curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"

  fi

  curses_found=no

  cat > $TMPC << EOF

#include <locale.h>

#include <curses.h>

#include <wchar.h>

int main(void) {

  const char *s = curses_version();

  wchar_t wch = L'w';

  setlocale(LC_ALL, "");

  resize_term(0, 0);

  addwstr(L"wide chars\n");

  addnwstr(&wch, 1);

  return s != 0;

}

EOF

  IFS=:

  for curses_lib in $curses_list; do

  for curses_inc in $curses_inc_list; do

    for curses_lib in $curses_lib_list; do

      unset IFS

    if compile_prog "" "$curses_lib" ; then

      if compile_prog "$curses_inc" "$curses_lib" ; then

        curses_found=yes

        QEMU_CFLAGS="$curses_inc $QEMU_CFLAGS"

        libs_softmmu="$curses_lib $libs_softmmu"

        break

      fi

    done

  done

  unset IFS

  if test "$curses_found" = "yes" ; then

    curses=yes

ui/curses.c

+2 −2
Original line number Diff line number Diff line
@@ -369,10 +369,10 @@ static void curses_setup(void) 
    /* ACS_* is not constant. So, we can't initialize statically. */

    vga_to_curses['\0'] = ' ';

    vga_to_curses[0x04] = ACS_DIAMOND;

    vga_to_curses[0x0a] = ACS_RARROW;

    vga_to_curses[0x0b] = ACS_LARROW;

    vga_to_curses[0x18] = ACS_UARROW;

    vga_to_curses[0x19] = ACS_DARROW;

    vga_to_curses[0x1a] = ACS_RARROW;

    vga_to_curses[0x1b] = ACS_LARROW;

    vga_to_curses[0x9c] = ACS_STERLING;

    vga_to_curses[0xb0] = ACS_BOARD;

    vga_to_curses[0xb1] = ACS_CKBOARD;

ui/gtk.c

+24 −3
Original line number Diff line number Diff line
@@ -912,9 +912,28 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, 


    if (!qemu_input_is_absolute() && s->ptr_owner == vc) {

        GdkScreen *screen = gtk_widget_get_screen(vc->gfx.drawing_area);

        int screen_width, screen_height;



        int x = (int)motion->x_root;

        int y = (int)motion->y_root;



#if GTK_CHECK_VERSION(3, 22, 0)

        {

            GdkDisplay *dpy = gtk_widget_get_display(widget);

            GdkWindow *win = gtk_widget_get_window(widget);

            GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);

            GdkRectangle geometry;

            gdk_monitor_get_geometry(monitor, &geometry);

            screen_width = geometry.width;

            screen_height = geometry.height;

        }

#else

        {

            screen_width = gdk_screen_get_width(screen);

            screen_height = gdk_screen_get_height(screen);

        }

#endif



        /* In relative mode check to see if client pointer hit

         * one of the screen edges, and if so move it back by

         * 200 pixels. This is important because the pointer
@@ -928,10 +947,10 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, 
        if (y == 0) {

            y += 200;

        }

        if (x == (gdk_screen_get_width(screen) - 1)) {

        if (x == (screen_width - 1)) {

            x -= 200;

        }

        if (y == (gdk_screen_get_height(screen) - 1)) {

        if (y == (screen_height - 1)) {

            y -= 200;

        }
@@ -1051,7 +1070,9 @@ static gboolean gd_text_key_down(GtkWidget *widget, 
    VirtualConsole *vc = opaque;

    QemuConsole *con = vc->gfx.dcl.con;



    if (key->length) {

    if (key->keyval == GDK_KEY_Delete) {

        kbd_put_qcode_console(con, Q_KEY_CODE_DELETE);

    } else if (key->length) {

        kbd_put_string_console(con, key->string, key->length);

    } else {

        int num = gd_map_keycode(vc->s, gtk_widget_get_display(widget),