Mercurial > kinput2.yaz

comparison lib/Canna.c @ 8:8b176cdf6319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imported patch 10_kinput2-v3.1-jp106_xfer.patch
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 08 Mar 2010 20:07:06 +0900
parents 56c98768f86b
children
comparison
equal deleted inserted replaced
7:7280b0ea4b46 8:8b176cdf6319
1316 *buffer_return = CANNA_KEY_Shift_Nfer; 1316 *buffer_return = CANNA_KEY_Shift_Nfer;
1317 else 1317 else
1318 *buffer_return = CANNA_KEY_Nfer; 1318 *buffer_return = CANNA_KEY_Nfer;
1319 functionalChar = 1; 1319 functionalChar = 1;
1320 break; 1320 break;
1321 case XK_Henkan_Mode:
1322 if (event_struct->state & 4 /* control-shifted */)
1323 *buffer_return = CANNA_KEY_Cntrl_Xfer;
1324 else if (event_struct->state & 1 /* shifted */)
1325 *buffer_return = CANNA_KEY_Shift_Xfer;
1326 else
1327 *buffer_return = CANNA_KEY_Xfer;
1328 functionalChar = 1;
1329 break;
1321 case XK_Kanji: 1330 case XK_Kanji:
1322 if (event_struct->state & 4 /* control-shifted */) 1331 if (event_struct->state & 4 /* control-shifted */)
1323 *buffer_return = CANNA_KEY_Cntrl_Xfer; 1332 *buffer_return = CANNA_KEY_Cntrl_Xfer;
1324 else if (event_struct->state & 1 /* shifted */) 1333 else if (event_struct->state & 1 /* shifted */)
1325 *buffer_return = CANNA_KEY_Shift_Xfer; 1334 *buffer_return = CANNA_KEY_Shift_Xfer;
1606 {(unsigned char)'\r', XK_Return, 0}, 1615 {(unsigned char)'\r', XK_Return, 0},
1607 {(unsigned char)'\023', XK_Pause, 0}, 1616 {(unsigned char)'\023', XK_Pause, 0},
1608 {(unsigned char)'\024', XK_Scroll_Lock, 0}, 1617 {(unsigned char)'\024', XK_Scroll_Lock, 0},
1609 {(unsigned char)'\e', XK_Escape, 0}, 1618 {(unsigned char)'\e', XK_Escape, 0},
1610 {(unsigned char)CANNA_KEY_Nfer, XK_Muhenkan, 0}, 1619 {(unsigned char)CANNA_KEY_Nfer, XK_Muhenkan, 0},
1611 {(unsigned char)CANNA_KEY_Xfer, XK_Kanji, 0}, 1620 {(unsigned char)CANNA_KEY_Xfer, XK_Henkan_Mode, 0},
1612 {(unsigned char)CANNA_KEY_Up, XK_Up, 0}, 1621 {(unsigned char)CANNA_KEY_Up, XK_Up, 0},
1613 {(unsigned char)CANNA_KEY_Left, XK_Left, 0}, 1622 {(unsigned char)CANNA_KEY_Left, XK_Left, 0},
1614 {(unsigned char)CANNA_KEY_Right, XK_Right, 0}, 1623 {(unsigned char)CANNA_KEY_Right, XK_Right, 0},
1615 {(unsigned char)CANNA_KEY_Down, XK_Down, 0}, 1624 {(unsigned char)CANNA_KEY_Down, XK_Down, 0},
1616 {(unsigned char)CANNA_KEY_Insert, XK_Insert, 0}, 1625 {(unsigned char)CANNA_KEY_Insert, XK_Insert, 0},
1618 {(unsigned char)CANNA_KEY_Rolldown, XK_Next, 0}, 1627 {(unsigned char)CANNA_KEY_Rolldown, XK_Next, 0},
1619 {(unsigned char)CANNA_KEY_Home, XK_Home, 0}, 1628 {(unsigned char)CANNA_KEY_Home, XK_Home, 0},
1620 {(unsigned char)CANNA_KEY_Help, XK_Help, 0}, 1629 {(unsigned char)CANNA_KEY_Help, XK_Help, 0},
1621 {(unsigned char)CANNA_KEY_KP_Key, XK_KP_Space, 0}, /* ? */ 1630 {(unsigned char)CANNA_KEY_KP_Key, XK_KP_Space, 0}, /* ? */
1622 {(unsigned char)CANNA_KEY_Shift_Nfer, XK_Muhenkan, ShiftMask}, 1631 {(unsigned char)CANNA_KEY_Shift_Nfer, XK_Muhenkan, ShiftMask},
1623 {(unsigned char)CANNA_KEY_Shift_Xfer, XK_Kanji, ShiftMask}, 1632 {(unsigned char)CANNA_KEY_Shift_Xfer, XK_Henkan_Mode, ShiftMask},
1624 {(unsigned char)CANNA_KEY_Shift_Up, XK_Up, ShiftMask}, 1633 {(unsigned char)CANNA_KEY_Shift_Up, XK_Up, ShiftMask},
1625 {(unsigned char)CANNA_KEY_Shift_Left, XK_Left, ShiftMask}, 1634 {(unsigned char)CANNA_KEY_Shift_Left, XK_Left, ShiftMask},
1626 {(unsigned char)CANNA_KEY_Shift_Right, XK_Right, ShiftMask}, 1635 {(unsigned char)CANNA_KEY_Shift_Right, XK_Right, ShiftMask},
1627 {(unsigned char)CANNA_KEY_Shift_Down, XK_Down, ShiftMask}, 1636 {(unsigned char)CANNA_KEY_Shift_Down, XK_Down, ShiftMask},
1628 {(unsigned char)CANNA_KEY_Cntrl_Nfer, XK_Muhenkan, ControlMask}, 1637 {(unsigned char)CANNA_KEY_Cntrl_Nfer, XK_Muhenkan, ControlMask},
1629 {(unsigned char)CANNA_KEY_Cntrl_Xfer, XK_Kanji, ControlMask}, 1638 {(unsigned char)CANNA_KEY_Cntrl_Xfer, XK_Henkan_Mode, ControlMask},
1630 {(unsigned char)CANNA_KEY_Cntrl_Up, XK_Up, ControlMask}, 1639 {(unsigned char)CANNA_KEY_Cntrl_Up, XK_Up, ControlMask},
1631 {(unsigned char)CANNA_KEY_Cntrl_Left, XK_Left, ControlMask}, 1640 {(unsigned char)CANNA_KEY_Cntrl_Left, XK_Left, ControlMask},
1632 {(unsigned char)CANNA_KEY_Cntrl_Right, XK_Right, ControlMask}, 1641 {(unsigned char)CANNA_KEY_Cntrl_Right, XK_Right, ControlMask},
1633 {(unsigned char)CANNA_KEY_Cntrl_Down, XK_Down, ControlMask}, 1642 {(unsigned char)CANNA_KEY_Cntrl_Down, XK_Down, ControlMask},
1634 {(unsigned char)CANNA_KEY_F1, XK_F1, 0}, 1643 {(unsigned char)CANNA_KEY_F1, XK_F1, 0},