From 48f5c3b794e32606c52ea58fe4380f6242302988 Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Wed, 15 Jun 2011 15:35:22 +0000 Subject: [PATCH] merged patch: Ctrl-Break support for the X11 gui by Nikolay Nikolov --- bochs/CHANGES | 2 ++ bochs/gui/x.cc | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bochs/CHANGES b/bochs/CHANGES index 810bd1ba4..b1742c233 100644 --- a/bochs/CHANGES +++ b/bochs/CHANGES @@ -64,6 +64,7 @@ Bochs repository moved to the SVN version control ! from the "clock" setting) - SF patches applied + [3316785] Ctrl-Break support for the X11 gui by Nikolay Nikolov [3298173] Breakpoint on VMEXIT event by Jianan Hao [3295737] Fix CopyHost*WordLittleEndian macros by Heikki Lindholm [3289448] optimized powerpc byte swapping by Heikki Lindholm @@ -75,6 +76,7 @@ Bochs repository moved to the SVN version control ! [3190995] add eth backend based on Slirp by Heikki Lindholm - these S.F. bugs were closed/fixed + [3303818] wrong memory size is reported to GRUB (e820 probelm?) [3297475] trace cache disabled mode will miss SMC [3170157] BIOS32 PCI service wrong length [3025030] PIT mistakenly connected to IRQ0 IOAPIC instead of IRQ2 diff --git a/bochs/gui/x.cc b/bochs/gui/x.cc index 7d5ed5bee..1b9d48952 100644 --- a/bochs/gui/x.cc +++ b/bochs/gui/x.cc @@ -1158,7 +1158,9 @@ void xkeypress(KeySym keysym, int press_release) #ifdef XK_Pause case XK_Pause: key_event = BX_KEY_PAUSE; break; #endif - +#ifdef XK_Break + case XK_Break: key_event = BX_KEY_CTRL_BREAK; break; +#endif case XK_Insert: key_event = BX_KEY_INSERT; break; case XK_Home: key_event = BX_KEY_HOME; break; case XK_End: key_event = BX_KEY_END; break;