bucket_7E/xorg-driver-input-keyboard

   1 # Buildsheet autogenerated by ravenadm tool -- Do not edit.
   2
   3 NAMEBASE=               xorg-driver-input-keyboard
   4 VERSION=                1.9.0
   5 KEYWORDS=               x11_drivers
   6 VARIANTS=               standard
   7 SDESC[standard]=        X.org keyboard input driver
   8 HOMEPAGE=               https://www.x.org/
   9 CONTACT=                nobody
  10
  11 DOWNLOAD_GROUPS=        main
  12 SITES[main]=            XORG/individual/driver
  13 DISTFILE[1]=            xf86-input-keyboard-1.9.0.tar.bz2:main
  14 DF_INDEX=               1
  15 SPKGS[standard]=        single
  16
  17 OPTIONS_AVAILABLE=      none
  18 OPTIONS_STANDARD=       none
  19
  20 BUILDRUN_DEPENDS=       xorg-server:single:standard
  21
  22 USES=                   libtool
  23 XORG_COMPONENTS=        xorgproto
  24
  25 DISTNAME=               xf86-input-keyboard-1.9.0
  26
  27 LICENSE=                MIT:single
  28 LICENSE_FILE=           MIT:{{WRKSRC}}/COPYING
  29 LICENSE_SCHEME=         solo
  30
  31 FPC_EQUIVALENT=         x11-drivers/xf86-input-keyboard
  32
  33 MUST_CONFIGURE=         gnu
  34
  35 INSTALL_TARGET=         install-strip
  36
  37 VAR_OPSYS[sunos]=       CFLAGS=-D__EXTENSIONS__
  38
  39 [FILE:60:descriptions/desc.single]
  40 This package contains the X.Org xf86-input-keyboard driver.
  41
  42
  43 [FILE:112:distinfo]
  44 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388       341693 xf86-input-keyboard-1.9.0.tar.bz2
  45
  46
  47 [FILE:58:manifests/plist.single]
  48 lib/xorg/modules/input/kbd_drv.so
  49 share/man/man4/kbd.4.gz
  50
  51
  52 [FILE:998:patches/patch-configure]
  53 --- configure.orig      2016-11-17 04:22:05 UTC
  54 +++ configure
  55 @@ -18159,7 +18159,6 @@ fi
  56  if test x$FILE_MAN_SUFFIX = x    ; then
  57      case $host_os in
  58         # Solaris 2.0 - 11 use SysV man page sections
  59 -       solaris2.?|solaris2.1[01])      FILE_MAN_SUFFIX=4  ;;
  60         *)                              FILE_MAN_SUFFIX=5  ;;
  61      esac
  62  fi
  63 @@ -18170,7 +18169,6 @@ fi
  64  if test x$MISC_MAN_SUFFIX = x    ; then
  65      case $host_os in
  66         # Solaris 2.0 - 11 use SysV man page sections
  67 -       solaris2.?|solaris2.1[01])      MISC_MAN_SUFFIX=5  ;;
  68         *)                              MISC_MAN_SUFFIX=7  ;;
  69      esac
  70  fi
  71 @@ -18181,7 +18179,6 @@ fi
  72  if test x$DRIVER_MAN_SUFFIX = x    ; then
  73      case $host_os in
  74         # Solaris 2.0 - 11 use SysV man page sections
  75 -       solaris2.?|solaris2.1[01])      DRIVER_MAN_SUFFIX=7  ;;
  76         *)                              DRIVER_MAN_SUFFIX=4  ;;
  77      esac
  78  fi
  79 @@ -18192,7 +18189,6 @@ fi
  80  if test x$ADMIN_MAN_SUFFIX = x    ; then
  81      case $host_os in
  82         # Solaris 2.0 - 11 use SysV man page sections
  83 -       solaris2.?|solaris2.1[01])      ADMIN_MAN_SUFFIX=1m ;;
  84         *)                              ADMIN_MAN_SUFFIX=8  ;;
  85      esac
  86  fi
  87
  88
  89 [FILE:2114:patches/patch-src_at__scancode.c]
  90 --- src/at_scancode.c.orig      2014-02-10 22:04:31 UTC
  91 +++ src/at_scancode.c
  92 @@ -82,6 +82,10 @@ ATScancode(InputInfoPtr pInfo, int *scan
  93         case KEY_Prefix0:
  94            pKbd->scanPrefix = 0;
  95            switch (*scanCode) {
  96 +            case 0x1e:            *scanCode = KEY_AudioRaise;break;
  97 +            case 0x1f:            *scanCode = KEY_AudioLower;break;
  98 +            case 0x20:            *scanCode = KEY_Power;     break;
  99 +            case 0x25:            *scanCode = KEY_Mute;      break;
 100              case KEY_KP_7:        *scanCode = KEY_Home;      break;  /* curs home */
 101              case KEY_KP_8:        *scanCode = KEY_Up;        break;  /* curs up */
 102              case KEY_KP_9:        *scanCode = KEY_PgUp;      break;  /* curs pgup */
 103 @@ -102,6 +106,17 @@ ATScancode(InputInfoPtr pInfo, int *scan
 104              case 0x5b:            *scanCode = KEY_LMeta;     break;
 105              case 0x5c:            *scanCode = KEY_RMeta;     break;
 106              case 0x5d:            *scanCode = KEY_Menu;      break;
 107 +            case 0x5e:            *scanCode = KEY_L1;        break;  /* stop */
 108 +            case 0x5f:            *scanCode = KEY_L2;        break;  /* again */
 109 +            case 0x60:            *scanCode = KEY_L3;        break;  /* props */
 110 +            case 0x61:            *scanCode = KEY_L4;        break;  /* undo */
 111 +            case 0x62:            *scanCode = KEY_L5;        break;  /* front */
 112 +            case 0x63:            *scanCode = KEY_L6;        break;  /* copy */
 113 +            case 0x64:            *scanCode = KEY_L7;        break;  /* open */
 114 +            case 0x65:            *scanCode = KEY_L8;        break;  /* paste */
 115 +            case 0x66:            *scanCode = KEY_L9;        break;  /* find */
 116 +            case 0x67:            *scanCode = KEY_L10;       break;  /* cut */
 117 +            case 0x68:            *scanCode = KEY_Help;      break;
 118              case KEY_F3:          *scanCode = KEY_F13;       break;
 119              case KEY_F4:          *scanCode = KEY_F14;       break;
 120              case KEY_F5:          *scanCode = KEY_F15;       break;
 121
 122
 123 [FILE:8979:patches/patch-src_bsd__KbdMap.c]
 124 Don't query console keymap
 125
 126 This seems to be useless and doesn't work anymore with vt(4), due to the
 127 use of Unicode codepoints in vt(4). So remove the related code. This fixes
 128 a segmentation fault during X.Org server startup.
 129
 130 PR:             191459
 131 Submitted by:   Claude Buisson <clbuisson@orange.fr> (earlier version)
 132
 133 --- src/bsd_KbdMap.c.orig       2015-08-07 03:16:08 UTC
 134 +++ src/bsd_KbdMap.c
 135 @@ -27,168 +27,6 @@
 136  #include "xf86Keymap.h"
 137  #include "bsd_kbd.h"
 138
 139 -#if (defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT)) && defined(GIO_KEYMAP)
 140 -#define KD_GET_ENTRY(i,n) \
 141 -  eascii_to_x[((keymap.key[i].spcl << (n+1)) & 0x100) + keymap.key[i].map[n]]
 142 -
 143 -static unsigned char remap[NUM_KEYCODES] = {
 144 -     0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,   /* 0x00 - 0x07 */
 145 -  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,   /* 0x08 - 0x0f */
 146 -  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,   /* 0x10 - 0x17 */
 147 -  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,   /* 0x18 - 0x1f */
 148 -  0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,   /* 0x20 - 0x27 */
 149 -  0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,   /* 0x28 - 0x2f */
 150 -  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,    0,   /* 0x30 - 0x37 */
 151 -  0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,   /* 0x38 - 0x3f */
 152 -  0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,    0,   /* 0x40 - 0x47 */
 153 -     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x48 - 0x4f */
 154 -     0,    0,    0,    0,    0,    0, 0x56, 0x57,   /* 0x50 - 0x57 */
 155 -  0x58,    0,    0,    0,    0,    0,    0,    0,   /* 0x58 - 0x5f */
 156 -     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x60 - 0x67 */
 157 -     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x68 - 0x6f */
 158 -     0,    0, 0x69, 0x65,    0,    0,    0,    0,   /* 0x70 - 0x77 */
 159 -     0,    0,    0,    0,    0,    0,    0,    0,   /* 0x78 - 0x7f */
 160 -};
 161 -
 162 -/* This table assumes the ibm code page 437 coding for characters
 163 - * > 0x80. They are returned in this form by PCVT */
 164 -static KeySym eascii_to_x[512] = {
 165 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 166 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 167 -       XK_BackSpace,   XK_Tab,         XK_Linefeed,    NoSymbol,
 168 -       NoSymbol,       XK_Return,      NoSymbol,       NoSymbol,
 169 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 170 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 171 -       NoSymbol,       NoSymbol,       NoSymbol,       XK_Escape,
 172 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 173 -       XK_space,       XK_exclam,      XK_quotedbl,    XK_numbersign,
 174 -       XK_dollar,      XK_percent,     XK_ampersand,   XK_apostrophe,
 175 -       XK_parenleft,   XK_parenright,  XK_asterisk,    XK_plus,
 176 -       XK_comma,       XK_minus,       XK_period,      XK_slash,
 177 -       XK_0,           XK_1,           XK_2,           XK_3,
 178 -       XK_4,           XK_5,           XK_6,           XK_7,
 179 -       XK_8,           XK_9,           XK_colon,       XK_semicolon,
 180 -       XK_less,        XK_equal,       XK_greater,     XK_question,
 181 -       XK_at,          XK_A,           XK_B,           XK_C,
 182 -       XK_D,           XK_E,           XK_F,           XK_G,
 183 -       XK_H,           XK_I,           XK_J,           XK_K,
 184 -       XK_L,           XK_M,           XK_N,           XK_O,
 185 -       XK_P,           XK_Q,           XK_R,           XK_S,
 186 -       XK_T,           XK_U,           XK_V,           XK_W,
 187 -       XK_X,           XK_Y,           XK_Z,           XK_bracketleft,
 188 -       XK_backslash,   XK_bracketright,XK_asciicircum, XK_underscore,
 189 -       XK_grave,       XK_a,           XK_b,           XK_c,
 190 -       XK_d,           XK_e,           XK_f,           XK_g,
 191 -       XK_h,           XK_i,           XK_j,           XK_k,
 192 -       XK_l,           XK_m,           XK_n,           XK_o,
 193 -       XK_p,           XK_q,           XK_r,           XK_s,
 194 -       XK_t,           XK_u,           XK_v,           XK_w,
 195 -       XK_x,           XK_y,           XK_z,           XK_braceleft,
 196 -       XK_bar,         XK_braceright,  XK_asciitilde,  XK_Delete,
 197 -       XK_Ccedilla,    XK_udiaeresis,  XK_eacute,      XK_acircumflex,
 198 -       XK_adiaeresis,  XK_agrave,      XK_aring,       XK_ccedilla,
 199 -       XK_ecircumflex, XK_ediaeresis,  XK_egrave,      XK_idiaeresis,
 200 -       XK_icircumflex, XK_igrave,      XK_Adiaeresis,  XK_Aring,
 201 -       XK_Eacute,      XK_ae,          XK_AE,          XK_ocircumflex,
 202 -       XK_odiaeresis,  XK_ograve,      XK_ucircumflex, XK_ugrave,
 203 -       XK_ydiaeresis,  XK_Odiaeresis,  XK_Udiaeresis,  XK_cent,
 204 -       XK_sterling,    XK_yen,         XK_paragraph,   XK_section,
 205 -       XK_aacute,      XK_iacute,      XK_oacute,      XK_uacute,
 206 -       XK_ntilde,      XK_Ntilde,      XK_ordfeminine, XK_masculine,
 207 -       XK_questiondown,XK_hyphen,      XK_notsign,     XK_onehalf,
 208 -       XK_onequarter,  XK_exclamdown,  XK_guillemotleft,XK_guillemotright,
 209 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 210 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 211 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 212 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 213 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 214 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 215 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 216 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 217 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 218 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 219 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 220 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 221 -       XK_Greek_alpha, XK_ssharp,      XK_Greek_GAMMA, XK_Greek_pi,
 222 -       XK_Greek_SIGMA, XK_Greek_sigma, XK_mu,          XK_Greek_tau,
 223 -       XK_Greek_PHI,   XK_Greek_THETA, XK_Greek_OMEGA, XK_Greek_delta,
 224 -       XK_infinity,    XK_Ooblique,    XK_Greek_epsilon, XK_intersection,
 225 -       XK_identical,   XK_plusminus,   XK_greaterthanequal, XK_lessthanequal,
 226 -       XK_topintegral, XK_botintegral, XK_division,    XK_similarequal,
 227 -       XK_degree,      NoSymbol,       NoSymbol,       XK_radical,
 228 -       XK_Greek_eta,   XK_twosuperior, XK_periodcentered, NoSymbol,
 229 -
 230 -       /*
 231 -        * special marked entries (256 + x)
 232 -        */
 233 -
 234 -       /* This has been checked against what syscons actually does */
 235 -       NoSymbol,       NoSymbol,       XK_Shift_L,     XK_Shift_R,
 236 -       XK_Caps_Lock,   XK_Num_Lock,    XK_Scroll_Lock, XK_Alt_L,
 237 -       XK_ISO_Left_Tab,XK_Control_L,   NoSymbol,       NoSymbol,
 238 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 239 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 240 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 241 -       NoSymbol,       NoSymbol,       NoSymbol,       XK_F1,
 242 -       XK_F2,          XK_F3,          XK_F4,          XK_F5,
 243 -       XK_F6,          XK_F7,          XK_F8,          XK_F9,
 244 -       XK_F10,         XK_F11,         XK_F12,         NoSymbol,
 245 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 246 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 247 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 248 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 249 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 250 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 251 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 252 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 253 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 254 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 255 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 256 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 257 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 258 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 259 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 260 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 261 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 262 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 263 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 264 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 265 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 266 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 267 -       XK_Control_R,   XK_Alt_R,       NoSymbol,       NoSymbol,
 268 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 269 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 270 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 271 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 272 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 273 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 274 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 275 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 276 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 277 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 278 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 279 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 280 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 281 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 282 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 283 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 284 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 285 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 286 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 287 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 288 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 289 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 290 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 291 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 292 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 293 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 294 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 295 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 296 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 297 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol,
 298 -       NoSymbol,       NoSymbol,       NoSymbol,       NoSymbol
 299 -};
 300 -
 301  #ifdef SYSCONS_SUPPORT
 302  static
 303  unsigned char sysconsCODEMap[] = {
 304 @@ -205,7 +43,6 @@ TransMapRec sysconsCODE = {
 305      sysconsCODEMap
 306  };
 307  #endif
 308 -#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
 309
 310  #ifdef WSCONS_SUPPORT
 311
 312 @@ -1261,40 +1098,6 @@ KbdGetMapping (InputInfoPtr pInfo, KeySy
 313    KeySym        *k;
 314    int           i;
 315
 316 -#ifndef __bsdi__
 317 -  switch (pKbd->consType) {
 318 -
 319 -/*
 320 - * XXX wscons has no GIO_KEYMAP
 321 - */
 322 -#if (defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)) && defined(GIO_KEYMAP)
 323 -  case SYSCONS:
 324 -  case PCVT:
 325 -    {
 326 -      keymap_t keymap;
 327 -
 328 -      if (ioctl(pInfo->fd, GIO_KEYMAP, &keymap) != -1) {
 329 -       for (i = 0; i < keymap.n_keys && i < NUM_KEYCODES; i++)
 330 -         if (remap[i]) {
 331 -           k = map + (remap[i] << 2);
 332 -           k[0] = KD_GET_ENTRY(i,0);           /* non-shifed */
 333 -           k[1] = KD_GET_ENTRY(i,1);         /* shifted */
 334 -           k[2] = KD_GET_ENTRY(i,4);         /* alt */
 335 -           k[3] = KD_GET_ENTRY(i,5);         /* alt - shifted */
 336 -           if (k[3] == k[2]) k[3] = NoSymbol;
 337 -           if (k[2] == k[1]) k[2] = NoSymbol;
 338 -           if (k[1] == k[0]) k[1] = NoSymbol;
 339 -           if (k[0] == k[2] && k[1] == k[3])
 340 -             k[2] = k[3] = NoSymbol;
 341 -         }
 342 -      }
 343 -    }
 344 -    break;
 345 -#endif /* SYSCONS || PCVT */
 346 -
 347 -  }
 348 -#endif /* !bsdi */
 349 -
 350    /*
 351     * compute the modifier map
 352     */
 353
 354
 355 [FILE:346:patches/patch-src_bsd__kbd.c]
 356 --- src/bsd_kbd.c.orig  2013-10-28 00:44:23 UTC
 357 +++ src/bsd_kbd.c
 358 @@ -237,6 +237,12 @@ KbdOn(InputInfoPtr pInfo, int what)
 359  #endif
 360         }
 361      }
 362 +/*
 363 + * Switch keyboards which are not attached to console in RAW mode
 364 + */
 365 +#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 366 +       ioctl(pInfo->fd, KDSKBMODE, K_RAW);
 367 +#endif
 368      return Success;
 369  }
 370
 371
 372
 373 [FILE:665:patches/patch-src_kdb.c]
 374 --- src/kbd.c.orig      2016-05-30 21:35:35 UTC
 375 +++ src/kbd.c
 376 @@ -25,6 +25,7 @@
 377
 378  #include "xf86.h"
 379  #include "atKeynames.h"
 380 +#include "xf86Priv.h"
 381  #include "xf86Privstr.h"
 382
 383  #include <X11/extensions/XI.h>
 384 @@ -382,6 +383,14 @@ KbdProc(DeviceIntPtr device, int what)
 385      }
 386      pKbd->KbdOff(pInfo, what);
 387      device->public.on = FALSE;
 388 +       /*
 389 +        * Close device file for keyboards which are not attached
 390 +        * to console, otherwise they can't be opened again after
 391 +        * relogin when using session manager like xdm.
 392 +        * X server will take care about console attached keyboards.
 393 +        */
 394 +       if (pInfo->fd != xf86Info.consoleFd)
 395 +               close(pInfo->fd);
 396      break;
 397
 398    default:
 399