ba3cef7ac6
- Respect CC - Install fonts PR: ports/104032 Submitted by: trasz <trasz@pin.if.uz.zgora.pl>
74 lines
2.2 KiB
C
74 lines
2.2 KiB
C
--- lib/libxview/win/win_input.c.orig Thu Oct 5 19:18:09 2006
|
|
+++ lib/libxview/win/win_input.c Thu Oct 5 20:10:42 2006
|
|
@@ -87,6 +87,8 @@
|
|
static int process_wm_pushpin_state();
|
|
Pkg_private int win_handle_compose();
|
|
|
|
+static int xevent_to_event();
|
|
+
|
|
struct _XKeytrans {
|
|
struct _XKeytrans *next;/* next on list */
|
|
char *string; /* string to return when the time comes */
|
|
@@ -853,7 +855,9 @@
|
|
#ifdef X11R6
|
|
/* lumpi@dobag.in-berlin.de */
|
|
int ksym_pcc;
|
|
- XGetKeyboardMapping(display,NoSymbol,0,&ksym_pcc);
|
|
+ int tc_min_keycode, tc_max_keycode;
|
|
+ XDisplayKeycodes(display, &tc_min_keycode, &tc_max_keycode);
|
|
+ XGetKeyboardMapping(display,tc_min_keycode,tc_max_keycode-tc_min_keycode-1,&ksym_pcc);
|
|
for (index = 0; index < ksym_pcc; index++) {
|
|
#else
|
|
for (index = 0; index < display->keysyms_per_keycode; index++) {
|
|
@@ -861,7 +865,7 @@
|
|
if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
|
|
if (IsKeypadKey(ksym)) {
|
|
/* See if key has been rebound. */
|
|
- if (!translate_key(display, ksym, ek->state,
|
|
+ if (translate_key(display, ksym, ek->state,
|
|
buffer, BUFFERSIZE)) {
|
|
(void)win_translate_KP_keysym(ksym, buffer);
|
|
}
|
|
@@ -2311,7 +2315,7 @@
|
|
XButtonEvent *bEvent;
|
|
int timeout;
|
|
{
|
|
- XEvent xevent;
|
|
+ XEvent *xevent;
|
|
|
|
/* XView does a passive grab on the SELECT button! */
|
|
window_x_allow_events(display);
|
|
@@ -2720,8 +2724,10 @@
|
|
* Xlib's.
|
|
*/
|
|
|
|
-#ifdef X11R6
|
|
-/* lumpi@dobag.in-berlin.de */
|
|
+#ifdef X11R6
|
|
+/* lumpi@dobag.in-berlin.de
|
|
+ tom@sees.bangor.ac.uk this replacement for X11R6 doesn't work. At least
|
|
+ it should now return sensible values though. */
|
|
static int
|
|
translate_key(dpy, symbol, modifiers, buffer, nbytes)
|
|
Display *dpy;
|
|
@@ -2731,11 +2737,18 @@
|
|
int nbytes;
|
|
{
|
|
/* This is _very_ rude ! */
|
|
- strcpy(buffer,XKeysymToString(symbol));
|
|
+ char *string;
|
|
+ string = XKeysymToString(symbol);
|
|
+ if (string) {
|
|
+ strncpy(buffer,XKeysymToString(symbol),nbytes);
|
|
+ return(strlen(buffer));
|
|
+ }
|
|
+ else
|
|
+ return 0;
|
|
}
|
|
|
|
-#else
|
|
|
|
+#else
|
|
static int
|
|
translate_key(dpy, symbol, modifiers, buffer, nbytes)
|
|
Display *dpy;
|