On Tue, Nov 30, 2010 at 08:12:24PM +0500, Alexandr Shadchin wrote: > In OpenBSD removed support PCCONS in 2002 year > http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2
Nack. As per <http://mail-index.netbsd.org/tech-x11/2010/11/30/msg000927.html> NetBSD wants to keep the PCCONS code around. So ok to remove OpenBSD specific parts of PCCONS support, but keep the rest. > > Signed-off-by: Alexandr Shadchin <[email protected]> > --- > src/bsd_KbdMap.c | 198 > ------------------------------------------------------ > 1 files changed, 0 insertions(+), 198 deletions(-) > > diff --git a/src/bsd_KbdMap.c b/src/bsd_KbdMap.c > index 6cfdbe4..1b5cc3e 100644 > --- a/src/bsd_KbdMap.c > +++ b/src/bsd_KbdMap.c > @@ -189,98 +189,6 @@ static KeySym eascii_to_x[512] = { > NoSymbol, NoSymbol, NoSymbol, NoSymbol > }; > > -#ifdef __OpenBSD__ > -/* don't mark AltR and CtrlR for remapping, since they > - * cannot be remapped by pccons */ > -static unsigned char pccons_remap[128] = { > - 0, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00 - 0x07 */ > - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08 - 0x0f */ > - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10 - 0x17 */ > - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /* 0x18 - 0x1f */ > - 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, /* 0x20 - 0x27 */ > - 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, /* 0x28 - 0x2f */ > - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0, /* 0x30 - 0x37 */ > - 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, /* 0x38 - 0x3f */ > - 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0, /* 0x40 - 0x47 */ > - 0, 0, 0, 0, 0, 0, 0, 0, /* 0x48 - 0x4f */ > - 0, 0, 0, 0, 0, 0, 0x56, 0x57, /* 0x50 - 0x57 */ > - 0x58, 0, 0, 0, 0, 0, 0, 0, /* 0x58 - 0x5f */ > - 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 - 0x67 */ > - 0, 0, 0, 0, 0, 0, 0, 0, /* 0x68 - 0x6f */ > - 0, 0, 0, 0, 0, 0, 0, 0, /* 0x70 - 0x77 */ > - 0, 0, 0, 0, 0, 0, 0, 0, /* 0x78 - 0x7f */ > -}; > - > -/* This table assumes an iso8859_1 encoding for the characters > - * > 80, as returned by pccons */ > -static KeySym latin1_to_x[256] = { > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - XK_BackSpace, XK_Tab, XK_Linefeed, NoSymbol, > - NoSymbol, XK_Return, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, XK_Escape, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - XK_space, XK_exclam, XK_quotedbl, XK_numbersign, > - XK_dollar, XK_percent, XK_ampersand, XK_apostrophe, > - XK_parenleft, XK_parenright, XK_asterisk, XK_plus, > - XK_comma, XK_minus, XK_period, XK_slash, > - XK_0, XK_1, XK_2, XK_3, > - XK_4, XK_5, XK_6, XK_7, > - XK_8, XK_9, XK_colon, XK_semicolon, > - XK_less, XK_equal, XK_greater, XK_question, > - XK_at, XK_A, XK_B, XK_C, > - XK_D, XK_E, XK_F, XK_G, > - XK_H, XK_I, XK_J, XK_K, > - XK_L, XK_M, XK_N, XK_O, > - XK_P, XK_Q, XK_R, XK_S, > - XK_T, XK_U, XK_V, XK_W, > - XK_X, XK_Y, XK_Z, XK_bracketleft, > - XK_backslash, XK_bracketright,XK_asciicircum, XK_underscore, > - XK_grave, XK_a, XK_b, XK_c, > - XK_d, XK_e, XK_f, XK_g, > - XK_h, XK_i, XK_j, XK_k, > - XK_l, XK_m, XK_n, XK_o, > - XK_p, XK_q, XK_r, XK_s, > - XK_t, XK_u, XK_v, XK_w, > - XK_x, XK_y, XK_z, XK_braceleft, > - XK_bar, XK_braceright, XK_asciitilde, XK_Delete, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - NoSymbol, NoSymbol, NoSymbol, NoSymbol, > - XK_nobreakspace,XK_exclamdown, XK_cent, XK_sterling, > - XK_currency, XK_yen, XK_brokenbar, XK_section, > - XK_diaeresis, XK_copyright, XK_ordfeminine, XK_guillemotleft, > - XK_notsign, XK_hyphen, XK_registered, XK_macron, > - XK_degree, XK_plusminus, XK_twosuperior, XK_threesuperior, > - XK_acute, XK_mu, XK_paragraph, XK_periodcentered, > - XK_cedilla, XK_onesuperior, XK_masculine, XK_guillemotright, > - XK_onequarter, XK_onehalf, XK_threequarters,XK_questiondown, > - XK_Agrave, XK_Aacute, XK_Acircumflex, XK_Atilde, > - XK_Adiaeresis, XK_Aring, XK_AE, XK_Ccedilla, > - XK_Egrave, XK_Eacute, XK_Ecircumflex, XK_Ediaeresis, > - XK_Igrave, XK_Iacute, XK_Icircumflex, XK_Idiaeresis, > - XK_ETH, XK_Ntilde, XK_Ograve, XK_Oacute, > - XK_Ocircumflex, XK_Otilde, XK_Odiaeresis, XK_multiply, > - XK_Ooblique, XK_Ugrave, XK_Uacute, XK_Ucircumflex, > - XK_Udiaeresis, XK_Yacute, XK_THORN, XK_ssharp, > - XK_agrave, XK_aacute, XK_acircumflex, XK_atilde, > - XK_adiaeresis, XK_aring, XK_ae, XK_ccedilla, > - XK_egrave, XK_eacute, XK_ecircumflex, XK_ediaeresis, > - XK_igrave, XK_iacute, XK_icircumflex, XK_idiaeresis, > - XK_eth, XK_ntilde, XK_ograve, XK_oacute, > - XK_ocircumflex, XK_otilde, XK_odiaeresis, XK_division, > - XK_oslash, XK_ugrave, XK_uacute, XK_ucircumflex, > - XK_udiaeresis, XK_yacute, XK_thorn, XK_ydiaeresis > - }; > -#endif > - > #ifdef SYSCONS_SUPPORT > static > unsigned char sysconsCODEMap[] = { > @@ -838,112 +746,6 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, > CARD8 *pModMap) > #ifndef __bsdi__ > switch (pKbd->consType) { > > -#ifdef PCCONS_SUPPORT > - case PCCONS: > -#if defined(__OpenBSD__) > - /* > - * on OpenBSD, the pccons keymap is programmable, too > - */ > - { > - pccons_keymap_t keymap[KB_NUM_KEYS]; > - if (ioctl(pInfo->fd, CONSOLE_GET_KEYMAP, &keymap) != -1) { > - for (i = 0; i < KB_NUM_KEYS; i++) > - if (pccons_remap[i]) { > - k = map + (pccons_remap[i] << 2); > - switch (keymap[i].type) { > - case KB_ASCII: > - /* For ASCII keys, there is only one char in the keymap */ > - k[0] = latin1_to_x[(unsigned char)keymap[i].unshift[0]]; > - k[1] = latin1_to_x[(unsigned char)keymap[i].shift[0]]; > - k[2] = latin1_to_x[(unsigned char)keymap[i].altgr[0]]; > - k[3] = latin1_to_x[(unsigned char)keymap[i].shift_altgr[0]]; > - break; > - case KB_SCROLL: > - k[0] = XK_Scroll_Lock; > - goto special; > - case KB_NUM: > - k[0] = XK_Num_Lock; > - goto special; > - case KB_CAPS: > - k[0] = XK_Caps_Lock; > - goto special; > - case KB_SHIFT: > - switch (keymap[i].unshift[0]) { > - case 1: > - /* left shift */ > - k[0] = XK_Shift_L; > - break; > - case 2: > - /* right shift */ > - k[0] = XK_Shift_R; > - break; > - default: > - k[0] = NoSymbol; > - } > - goto special; > - case KB_CTL: > - k[0] = XK_Control_L; > - goto special; > - case KB_ALT: > - k[0] = XK_Alt_L; > - goto special; > - case KB_FUNC: > - switch (keymap[i].unshift[2]) { > - case 'M': > - k[0] = XK_F1; > - break; > - case 'N': > - k[0] = XK_F2; > - break; > - case 'O': > - k[0] = XK_F3; > - break; > - case 'P': > - k[0] = XK_F4; > - break; > - case 'Q': > - k[0] = XK_F5; > - break; > - case 'R': > - k[0] = XK_F6; > - break; > - case 'S': > - k[0] = XK_F7; > - break; > - case 'T': > - k[0] = XK_F8; > - break; > - case 'U': > - k[0] = XK_F9; > - break; > - case 'V': > - k[0] = XK_F10; > - break; > - case 'W': > - k[0] = XK_F11; > - break; > - case 'X': > - k[0] = XK_F12; > - break; > - default: > - k[0] = NoSymbol; > - break; > - } > - goto special; > - default: > - k[0] = NoSymbol; > - special: > - k[1] = k[2] = k[3] = NoSymbol; > - } > - } > - } else { > - ErrorF("Can't read pccons keymap\n"); > - } > - } > -#endif /* __OpenBSD__ */ > - break; > -#endif > - > /* > * XXX wscons has no GIO_KEYMAP > */ > -- > 1.7.3.2 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel -- Matthieu Herrb _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
