 @@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.71 2015/01/29 12:31:07 jmcneill Exp $
+$NetBSD: distinfo,v 1.72 2015/01/30 12:02:49 wiz Exp $
 SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
 RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
 Size (SDL-1.2.15.tar.gz) = 3920622 bytes
 SHA1 (patch-aa) = 00fb7a85caf8fc9f08298d0a07a4587757fdffb0
 SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563
 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 4ea0136f231729129b82e5f7ee4b9eaf68a13876
 SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8
-SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 216a07cbfb99e1f3d6fe2da191922be76cb09759
+SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = 1c874c46edb325907eda3bfa7580c788294f6d21
 SHA1 (patch-src_video_wscons_SDL__wsconsevents__c.h) = 97206e2aca0b620005217d9d07ad1177516cac92
 SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 17e048ccb201ae961e820ab880d5a588b2db2639
 SHA1 (patch-src_video_wscons_SDL__wsconsvideo.h) = efc75da910cfe370b7361a0b9d2b90837c6b9aa9
 SHA1 (patch-src_video_x11_SDL_x11video.c) = 624fbb7e701d6de6ec93096beea7c085125934aa

 @@ -1,18 +1,26 @@
-$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.9 2015/01/29 12:31:08 jmcneill Exp $
+$NetBSD: patch-src_video_wscons_SDL__wsconsevents.c,v 1.10 2015/01/30 12:02:49 wiz Exp $
 --- src/video/wscons/SDL_wsconsevents.c.orig	2012-01-19 06:30:06.000000000 +0000
 +++ src/video/wscons/SDL_wsconsevents.c
-@@ -47,14 +47,31 @@ int WSCONS_InitKeyboard(_THIS)
+@@ -25,6 +25,7 @@
  #include <dev/wscons/wsdisplay_usl_io.h>
  #include <sys/ioctl.h>
  #include <fcntl.h>
 +#include <limits.h>
  #include <unistd.h>
  #include <termios.h>
  #include <errno.h>
@@ -47,14 +48,31 @@ int WSCONS_InitKeyboard(_THIS)
      return -1;
+   }
 +#if defined(__NetBSD__)
 +  if (private->kbdType == 0) {
 +    /* wsmux with no keyboard attached, assumed USB */
 +    private->kbdType = WSKBD_TYPE_USB;
 +  }
 +#endif
++
    if (tcgetattr(private->fd, &private->saved_tty) == -1) {
      WSCONS_ReportError("cannot get terminal attributes: %s", strerror(errno));
      return -1;
 @@ -25,53 +33,53 @@ $NetBSD: patch-src_video_wscons_SDL__wsc
++
 +  if (ioctl(private->fd, KDSKBMODE, K_RAW) == -1) {
 +    WSCONS_ReportError("cannot set raw keyboard mode: %s", strerror(errno));
 +    return -1;
 +  }
++
    tty = private->saved_tty;
    tty.c_iflag = IGNPAR | IGNBRK;
 -  tty.c_oflag = 0;
 +  //tty.c_oflag = 0;
    tty.c_cflag = CREAD | CS8;
    tty.c_lflag = 0;
    tty.c_cc[VTIME] = 0;
-@@ -65,8 +82,12 @@ int WSCONS_InitKeyboard(_THIS)
+@@ -65,8 +83,12 @@ int WSCONS_InitKeyboard(_THIS)
      WSCONS_ReportError("cannot set terminal attributes: %s", strerror(errno));
      return -1;
+   }
 -  if (ioctl(private->fd, KDSKBMODE, K_RAW) == -1) {
 -    WSCONS_ReportError("cannot set raw keyboard mode: %s", strerror(errno));
++
 +  struct wskbd_keyrepeat_data repeat;
 +  repeat.which = WSKBD_KEYREPEAT_DOALL;
 +  repeat.del1 = repeat.delN = UINT_MAX;
 +  if (ioctl(private->fd, WSKBDIO_SETKEYREPEAT, &repeat) == -1) {
 +    WSCONS_ReportError("cannot set repeat settings: %s", strerror(errno));
      return -1;
+   }
-@@ -81,6 +102,10 @@ void WSCONS_ReleaseKeyboard(_THIS)
+@@ -81,6 +103,10 @@ void WSCONS_ReleaseKeyboard(_THIS)
  			 strerror(errno));
+     }
      if (private->did_save_tty) {
 +      if (ioctl(private->fd, WSKBDIO_SETKEYREPEAT, &private->saved_repeat) == -1) {
 +        WSCONS_ReportError("cannot restore repeat settings: %s",
 +			   strerror(errno));
 +      }
        if (tcsetattr(private->fd, TCSANOW, &private->saved_tty) < 0) {
  	WSCONS_ReportError("cannot restore keynoard attributes: %s",
  			   strerror(errno));
-@@ -89,8 +114,65 @@ void WSCONS_ReleaseKeyboard(_THIS)
+@@ -89,8 +115,65 @@ void WSCONS_ReleaseKeyboard(_THIS)
+   }
+ }
 -static void updateMouse()
 +int WSCONS_InitMouse(_THIS)
+ {
 +  if (private->mouseFd != -1) {
 +#if defined(WSMOUSEIO_SETVERSION)
 +    int version = WSMOUSE_EVENT_VERSION;
 +    if (ioctl(private->mouseFd, WSMOUSEIO_SETVERSION, &version) == -1) {
 +      WSCONS_ReportError("cannot set mouse API version: %s", strerror(errno));
 +      return -1;
 +    }
 @@ -118,39 +126,39 @@ $NetBSD: patch-src_video_wscons_SDL__wsc
 +    case WSCONS_EVENT_MOUSE_DELTA_Z:
 +      posted += SDL_PrivateMouseButton(SDL_PRESSED,
 +                    ev->value > 0 ? SDL_BUTTON_WHEELUP : SDL_BUTTON_WHEELDOWN,
 +                    0, 0);
 +      posted += SDL_PrivateMouseButton(SDL_RELEASED,
 +                    ev->value > 0 ? SDL_BUTTON_WHEELUP : SDL_BUTTON_WHEELDOWN,
 +                    0, 0);
 +      break;
 +    }
 +  }
+ }
  static SDLKey keymap[128];
-@@ -107,6 +189,11 @@ static SDL_keysym *TranslateKey(int scan
+@@ -107,6 +190,11 @@ static SDL_keysym *TranslateKey(int scan
    if (keysym->sym == SDLK_UNKNOWN)
      printf("Unknown mapping for scancode %d\n", scancode);
 +  keysym->unicode = 0;
 +  if (SDL_TranslateUNICODE) {
 +    keysym->unicode = keysym->sym;
 +  }
++
    return keysym;
+ }
-@@ -120,19 +207,42 @@ static void updateKeyboard(_THIS)
+@@ -120,19 +208,42 @@ static void updateKeyboard(_THIS)
      for (i = 0; i < n; i++) {
        unsigned char c = buf[i] & 0x7f;
        if (c == 224) // special key prefix -- what should we do with it?
 -	continue;
 +       continue;
        posted += SDL_PrivateKeyboard((buf[i] & 0x80) ? SDL_RELEASED : SDL_PRESSED,
 -				    TranslateKey(c, &keysym));
 +                                   TranslateKey(c, &keysym));
+     }
+   }
+ }
  void WSCONS_PumpEvents(_THIS)
 @@ -177,33 +185,33 @@ $NetBSD: patch-src_video_wscons_SDL__wsc
 +      FD_SET(private->mouseFd, &fds);
++
 +    if (select(maxfd+1, &fds, NULL, NULL, &zero) > 0) {
 +      if (private->mouseFd != -1 && FD_ISSET(private->mouseFd, &fds)) {
 +        updateMouse(this);
 +      }
 +      if (private->fd != -1 && FD_ISSET(private->fd, &fds)) {
 +        updateKeyboard(this);
 +      }
 +    }
    } while (posted);
+ }
-@@ -146,8 +256,10 @@ void WSCONS_InitOSKeymap(_THIS)
+@@ -146,8 +257,10 @@ void WSCONS_InitOSKeymap(_THIS)
+   }
    switch (private->kbdType) {
 -#ifdef WSKBD_TYPE_ZAURUS
 +#if defined(WSKBD_TYPE_ZAURUS)
    case WSKBD_TYPE_ZAURUS:
 +#endif
 +  case WSKBD_TYPE_USB:
      /* top row */
      keymap[2] = SDLK_1;
      keymap[3] = SDLK_2;
-@@ -220,7 +332,6 @@ void WSCONS_InitOSKeymap(_THIS)
+@@ -220,7 +333,6 @@ void WSCONS_InitOSKeymap(_THIS)
      keymap[77] = SDLK_RIGHT;
      keymap[80] = SDLK_DOWN;
      break;
 -#endif /* WSKBD_TYPE_ZAURUS */
    default:
      WSCONS_ReportError("Unable to map keys for keyboard type %u",