← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to curses.c

  • Committer: Bazaar Package Importer
  • Author(s): Riku Voipio, Josh Triplett, Riku Voipio
  • Date: 2009-07-29 13:28:05 UTC
  • mfrom: (1.4.1 upstream)
  • mto: (12.1.1 sid) (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20090729132805-cau7rfexh7dawyb8
Tags: 0.10.50+git20090729-1
[ Josh Triplett ]
* Remove myself from Uploaders.

[ Riku Voipio ]
* new upstream RC version
* nuke all linux-user patches (applied upstream)
  06_exit_segfault
  12_signal_powerpc_support
  21_net_soopts
  30_syscall_ipc
  32_syscall_sysctl
  35_syscall_sockaddr
  48_signal_terminate
  55_unmux_socketcall
* nuke all other applied-upstream patches
  01_nostrip (better version upstream)
  07_i386_exec_name (can be reintroduced in debian/rules)
  50_linuxbios_isa_bios_ram (shouldn't be needed anymore)
  51_linuxbios_piix_ram_size (applied)
  56_dhcp (crap)
  60_ppc_ld (reintroduce if needed)
  64_ppc_asm_constraints (ditto)
  66_tls_ld.patch (ditto)
  81_compile_dtb.patch (applied upstream)
  82_qemu-img_decimal (ditto)
* move to git
* simplify build rules
* Correct my email address

Show diffs side-by-side

added added

removed removed

Lines of Context:
curses.c
21
21
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
22
 * THE SOFTWARE.
23
23
 */
24
 
 
25
 
#include "qemu-common.h"
26
 
#include "console.h"
27
 
#include "sysemu.h"
28
 
 
29
24
#include <curses.h>
30
25
 
31
26
#ifndef _WIN32
38
33
#define resize_term resizeterm
39
34
#endif
40
35
 
 
36
#include "qemu-common.h"
 
37
#include "console.h"
 
38
#include "sysemu.h"
 
39
 
41
40
#define FONT_HEIGHT 16
42
41
#define FONT_WIDTH 8
43
42
 
158
157
/* generic keyboard conversion */
159
158
 
160
159
#include "curses_keys.h"
161
 
#include "keymaps.c"
162
160
 
163
161
static kbd_layout_t *kbd_layout = 0;
164
162
static int keycode2keysym[CURSES_KEYS];
311
309
        keyboard_layout = "en-us";
312
310
#endif
313
311
    if(keyboard_layout) {
314
 
        kbd_layout = init_keyboard_layout(keyboard_layout);
 
312
        kbd_layout = init_keyboard_layout(name2keysym, keyboard_layout);
315
313
        if (!kbd_layout)
316
314
            exit(1);
317
315
    }
366
364
    dcl->dpy_refresh = curses_refresh;
367
365
    dcl->dpy_text_cursor = curses_cursor_position;
368
366
    register_displaychangelistener(ds, dcl);
369
 
    qemu_free_displaysurface(ds->surface);
 
367
    qemu_free_displaysurface(ds);
370
368
    ds->surface = qemu_create_displaysurface_from(640, 400, 0, 0, (uint8_t*) screen);
371
369
 
372
370
    invalidate = 1;