mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- moved mouse parameter handling to the keyboard parameter handler

Browse Source
This commit is contained in:
Volker Ruppert 2011-01-20 16:54:42 +00:00
parent fbc9b8b190
commit adb8359bb0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bochs/config.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.221 2011-01-18 21:04:43 vruppert Exp $
// $Id: config.cc,v 1.222 2011-01-20 16:54:41 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002-2009 The Bochs Project
@ -108,11 +108,6 @@ static Bit64s bx_param_handler(bx_param_c *param, int set, Bit64s val)
SIM->get_param_enum("devtype", base)->set(device);
}
}
} else if (!strcmp(pname, BXPN_MOUSE_ENABLED)) {
if ((set) && (SIM->get_init_done())) {
bx_gui->mouse_enabled_changed(val!=0);
DEV_mouse_enabled_changed(val!=0);
}
} else {
BX_PANIC(("bx_param_handler called with unknown parameter '%s'", pname));
return -1;
@ -831,12 +826,10 @@ void bx_init_options()
BX_MOUSE_TYPE_NONE);
type->set_ask_format("Choose the type of mouse [%s] ");
enabled = new bx_param_bool_c(mouse,
new bx_param_bool_c(mouse,
"enabled", "Enable mouse capture",
"Controls whether the mouse sends events to the guest. The hardware emulation is always enabled.",
0);
enabled->set_handler(bx_param_handler);
enabled->set_runtime_param(1);
static const char *mouse_toggle_list[] = {
"ctrl+mbutton",

11
bochs/iodev/keyboard.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: keyboard.cc,v 1.146 2009-12-04 19:50:28 sshwarts Exp $
// $Id: keyboard.cc,v 1.147 2011-01-20 16:54:42 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002-2009 The Bochs Project
@ -120,7 +120,7 @@ void bx_keyb_c::resetinternals(bx_bool powerup)
void bx_keyb_c::init(void)
{
BX_DEBUG(("Init $Id: keyboard.cc,v 1.146 2009-12-04 19:50:28 sshwarts Exp $"));
BX_DEBUG(("Init $Id: keyboard.cc,v 1.147 2011-01-20 16:54:42 vruppert Exp $"));
Bit32u i;
DEV_register_irq(1, "8042 Keyboard controller");
@ -261,6 +261,8 @@ void bx_keyb_c::init(void)
// init runtime parameter
SIM->get_param_num(BXPN_KBD_PASTE_DELAY)->set_handler(kbd_param_handler);
SIM->get_param_num(BXPN_KBD_PASTE_DELAY)->set_runtime_param(1);
SIM->get_param_num(BXPN_MOUSE_ENABLED)->set_handler(kbd_param_handler);
SIM->get_param_num(BXPN_MOUSE_ENABLED)->set_runtime_param(1);
}
void bx_keyb_c::reset(unsigned type)
@ -362,6 +364,11 @@ Bit64s bx_keyb_c::kbd_param_handler(bx_param_c *param, int set, Bit64s val)
param->get_param_path(pname, BX_PATHNAME_LEN);
if (!strcmp(pname, BXPN_KBD_PASTE_DELAY)) {
BX_KEY_THIS paste_delay_changed((Bit32u)val);
} else if (!strcmp(pname, BXPN_MOUSE_ENABLED)) {
if (set) {
bx_gui->mouse_enabled_changed(val!=0);
DEV_mouse_enabled_changed(val!=0);
}
} else {
BX_PANIC(("kbd_param_handler called with unexpected parameter '%s'", pname));
}