mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- update patch so it applies cleanly

This commit is contained in:
Bryce Denney 2001-06-25 13:32:52 +00:00
parent 547cb604b9
commit 87cb58f15f
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bochs/patches/patch.kbd-dieter
View File

@ -2,6 +2,8 @@
Patch name: patch.kbd-dieter
Author: Dieter Mittelmaier <dieter.mittelmaier@freenet.de>
Date: Thu, 21 Jun 2001 23:07:37 +0200
Patch Updated: Mon Jun 25 09:32:07 EDT 2001
by Bryce to make it apply cleanly
Detailed description:
I mapped your BX_KEY-defines in gui.h to values from XFree
@ -26,15 +28,14 @@ Instructions:
To patch, go to main bochs directory.
Type "patch -p0 < THIS_PATCH_FILE".
----------------------------------------------------------------------
Index: gui/gui.h
===================================================================
RCS file: /cvsroot/bochs/bochs/gui/gui.h,v
retrieving revision 1.4
diff -u -r1.4 gui.h
--- gui/gui.h 2001/05/15 14:49:56 1.4
+++ gui/gui.h 2001/06/22 04:45:07
@@ -93,114 +93,114 @@
retrieving revision 1.7
diff -u -r1.7 gui.h
--- gui/gui.h 2001/06/23 03:18:14 1.7
+++ gui/gui.h 2001/06/25 13:23:05
@@ -92,114 +92,114 @@
#define BX_KEY_PRESSED 0x00000000
#define BX_KEY_RELEASED 0x80000000
@ -255,10 +256,10 @@ diff -u -r1.4 gui.h
Index: gui/x.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/gui/x.cc,v
retrieving revision 1.7
diff -u -r1.7 x.cc
--- gui/x.cc 2001/05/24 14:08:54 1.7
+++ gui/x.cc 2001/06/22 04:45:09
retrieving revision 1.13
diff -u -r1.13 x.cc
--- gui/x.cc 2001/06/23 03:18:14 1.13
+++ gui/x.cc 2001/06/25 13:23:05
@@ -102,137 +102,11 @@
static void headerbar_click(int x, int y);
static void send_keyboard_mouse_status(void);
@ -398,7 +399,7 @@ diff -u -r1.7 x.cc
// extern "C" void select_visual(void);
#define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad)-1)) / (pad)) * ((pad)>>3))
@@ -533,6 +407,7 @@
@@ -555,6 +429,7 @@
XEvent report;
XKeyEvent *key_event;
KeySym keysym;
@ -406,7 +407,7 @@ diff -u -r1.7 x.cc
XComposeStatus compose;
char buffer[MAX_MAPPED_STRING_LENGTH];
int bufsize = MAX_MAPPED_STRING_LENGTH;
@@ -680,13 +555,15 @@
@@ -690,13 +565,15 @@
case KeyPress:
key_event = (XKeyEvent *) &report;
charcount = XLookupString(key_event, buffer, bufsize, &keysym, &compose);
@ -424,7 +425,7 @@ diff -u -r1.7 x.cc
break;
case MotionNotify:
@@ -780,137 +657,13 @@
@@ -790,137 +667,11 @@
void
@ -476,7 +477,7 @@ diff -u -r1.7 x.cc
- case XK_KP_Right:
-#endif
- key_event = BX_KEY_KP_RIGHT; break;
-
- case XK_KP_7:
-#ifdef XK_KP_Home
- case XK_KP_Home:
@ -556,13 +557,12 @@ diff -u -r1.7 x.cc
- case XK_Page_Down: key_event = BX_KEY_PAGE_DOWN; break;
-
- default:
- BX_ERROR(( "xkeypress(): keysym %x unhandled!\n", (unsigned) keysym ));
- BX_ERROR(( "xkeypress(): keysym %x unhandled!", (unsigned) keysym ));
- return;
- break;
- }
+ //dieter
+ key_event = (unsigned) keycode;
+// BX_INFO(("keycode: %d\n", (unsigned) keycode));
+ BX_DEBUG (("keycode: %d\n", (unsigned) keycode));
if (press_release)
key_event |= BX_KEY_RELEASED;