diff --git a/Apps/kvkbd/README b/Apps/kvkbd/README index 5f161c7..c7c4362 100644 --- a/Apps/kvkbd/README +++ b/Apps/kvkbd/README @@ -1,6 +1,24 @@ -There is an option in the configuration menu to change the colours of the keyboard/background and the keys/buttons. +The 14.0.9 build has been updated with a backport from the development version. The many enhancements include setting key and/or background colours, and displaying level 3 & 4 characters where the xkb/symbols definitions include using the AltGr [ralt] key. -The keyboard colour change is immediate, but a change of key colour requires a restart of Kvkbd after the new colour has been selected. +Build-time options to be hard-coded into the app are: -If you can supply a patch to make the key colour change immediate, please open a pull request, or attach it to an issue. +[1] Use Win keys + a] as modifier keys + The default use for the \Zb\Z6LWin\Zn and \Zb\Z6RWin\Zn keys on the \Zb\Z6Kvkbd\Zn keyboard is set as modifier keys to map a number of characters or functions and to 'lock' for the next key click - this is to simulate holding down the key on a physical keyboard. + + or b] for characters set with xmodmap. + Alternatively, using xmodmap they can map to characters set by a user - this will generate a keycode on a single click. + +[2] Alternative text on the num pad keys. + +For example: +|Ho| +|me| can be replaced with |H←|, which is a better fit on the keys. + +[3] Small icons can be shown on the buttons if the keyboard is to be used at the default size. + +[4] Show blank keys where AltGr doesn't produce a character. + +3rd and 4th level character sets on a keyboard generally don't cover the full set of keys. +Select this option to see only those characters which AltGr generates. diff --git a/Apps/kvkbd/backport.patch b/Apps/kvkbd/backport.patch new file mode 100644 index 0000000..921a231 --- /dev/null +++ b/Apps/kvkbd/backport.patch @@ -0,0 +1,2897 @@ +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -22,6 +22,7 @@ +- DragWidget.cpp +- MainWidget.cpp +- VButton.cpp +- main.cpp +- numpadvbutton.cpp +- resizabledragwidget.cpp ++ DragWidget.cpp ++ MainWidget.cpp ++ VButton.cpp ++ main.cpp ++ numpadvbutton.cpp ++ resizabledragwidget.cpp ++ Xutils.cpp +--- src/DragWidget.cpp ++++ src/DragWidget.cpp +@@ -7 +7 @@ +- ++ locked=false; +@@ -8,0 +9 @@ ++ +@@ -11 +11,0 @@ +- +@@ -17,0 +18,4 @@ ++ if (locked) ++ { ++ return; ++ } +@@ -19 +22,0 @@ +- +@@ -20,0 +24 @@ ++ +@@ -23 +26,0 @@ +- +@@ -25,0 +29 @@ ++ +@@ -28 +32,2 @@ +- if (!drag) { ++ if (!drag) ++ { +@@ -33 +37,0 @@ +- +--- src/DragWidget.h ++++ src/DragWidget.h +@@ -16 +15,0 @@ +- +@@ -25 +24 @@ +- ++ bool locked; +--- src/MainWidget.cpp ++++ src/MainWidget.cpp +@@ -22,0 +23 @@ ++#include "numpadvbutton.h" +@@ -27,2 +27,0 @@ +-#include +-#include +@@ -30 +28,0 @@ +-#include +@@ -40 +38 @@ +- ++#include +@@ -46 +44 @@ +-#define R4LEN 7 ++#define R4LEN 8 +@@ -52,2 +49,0 @@ +- +- +@@ -55 +50,0 @@ +- +@@ -57 +51,0 @@ +- +@@ -72,3 +66,3 @@ +- //TQString k4="zxcvbnm"; //,./"; +- //TQString k4s="ZXCVBNM"; +- unsigned int kc4[R4LEN] = {52,53,54,55,56,57,58};//59,60,61}; ++ //TQString k4="config(); ++ if (cfg) ++ { ++ extent_visible = cfg->readBoolEntry("numpad_visible", false); ++ TQString backgroundC = cfg->readEntry("keyboardBackgroundColor", "#cdc0b0"); ++ setPaletteBackgroundColor(TQColor(backgroundC)); ++ } +@@ -91 +90,0 @@ +- +@@ -97 +96 @@ +- f->move ( stx+esc->width() + ( 35*a ) +20,sty ); ++ f->move ( stx+esc->width() + ( 35*a ) +30,sty ); +@@ -107 +106 @@ +- f->move ( stx+esc->width() + ( 35*a ) +40+ ( 4*35 ),sty ); ++ f->move ( stx+esc->width() + ( 35*a ) +44+ ( 4*35 ),sty ); +@@ -118 +117 @@ +- f->move ( stx+esc->width() + ( 35*a ) +45+ ( 8*35 ) +10,sty ); ++ f->move ( stx+esc->width() + ( 35*a ) +58+ ( 8*35 ),sty ); +@@ -133 +131,0 @@ +- //caps_btns.append ( v ); +@@ -139 +137 @@ +- bksp->resize ( 46,30 ); ++ bksp->resize ( 48,30 ); +@@ -149 +147 @@ +- tab->resize ( 47,30 ); ++ tab->resize ( 48,30 ); +@@ -202 +200 @@ +- caps->res(); ++ connect ( caps,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleShiftCapsAltGr ( unsigned int ) ) ); +@@ -204,2 +202 @@ +- connect ( caps,TQT_SIGNAL ( clicked() ),this,TQT_SLOT ( toggleCaps() ) ); +- connect ( caps,TQT_SIGNAL ( keyClick ( unsigned int ) ),this,TQT_SLOT ( keyPress ( unsigned int ) ) ); ++ caps->res(); +@@ -246,9 +243,9 @@ +- lshft = new VButton ( this,"" ); +- lshft->setKeyCode ( 50 ); +- lshft->move ( stx,sty+ ( 4*35 ) ); +- lshft->resize ( 80,30 ); +- lshft->setText ( "Shift" ); +- lshft->setToggleButton ( true ); +- connect ( lshft,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleShift() ) ); +- mod_keys.append ( lshft ); +- lshft->res(); ++ lshift = new VButton ( this,"" ); ++ lshift->setKeyCode ( 50 ); ++ lshift->move ( stx,sty+ ( 4*35 ) ); ++ lshift->resize ( 45,30 ); ++ lshift->setText ( "Shift" ); ++ lshift->setToggleButton ( true ); ++ connect ( lshift,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleShiftCapsAltGr( unsigned int ) ) ); ++ mod_keys.append ( lshift ); ++ lshift->res(); +@@ -262 +259 @@ +- v->move ( stx+35+16+35+ ( 35*a ),sty+ ( 4*35 ) ); ++ v->move ( stx+lshift->width() +5+ ( 35*a ),sty+ ( 4*35 ) ); +@@ -270 +267 @@ +- sm->move ( stx+ ( R4LEN *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); ++ sm->move ( stx+ ( R4LEN *35 ) +lshift->width() +5,sty+ ( 4*35 ) ); +@@ -279 +276 @@ +- gr->move ( stx+ ( ( R4LEN +1 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); ++ gr->move ( stx+ ( ( R4LEN +1 ) *35 ) +lshift->width() +5,sty+ ( 4*35 ) ); +@@ -288 +285 @@ +- sl->move ( stx+ ( ( R4LEN +2 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); ++ sl->move ( stx+ ( ( R4LEN +2 ) *35 ) +lshift->width() +5,sty+ ( 4*35 ) ); +@@ -295,11 +292,9 @@ +- rshft = new VButton ( this,"" ); +- rshft->setKeyCode ( 50 ); +- rshft->move ( stx+ ( ( R4LEN +3 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); +- rshft->resize ( 68,30 ); +- rshft->setText ( "Shift" ); +- rshft->setToggleButton ( true ); +- connect ( rshft,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleShift() ) ); +- mod_keys.append ( rshft ); +- rshft->res(); +- +- ++ rshift = new VButton ( this,"" ); ++ rshift->setKeyCode ( 62 ); ++ rshift->move ( stx+ ( ( R4LEN +3 ) *35 ) +lshift->width() +5,sty+ ( 4*35 ) ); ++ rshift->resize ( 68,30 ); ++ rshift->setText ( "Shift" ); ++ rshift->setToggleButton ( true ); ++ connect ( rshift,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleShiftCapsAltGr( unsigned int ) ) ); ++ mod_keys.append ( rshift ); ++ rshift->res(); +@@ -306,0 +302 @@ ++ //ROW 5 +@@ -316,10 +312,8 @@ +- +- win = new VButton ( this,"" ); +- win->resize ( 45,30 ); +- win->move ( 5+lctrl->x() +lctrl->width(), sty+ ( 5*35 ) ); +- win->setText ( "Win" ); +- win->setKeyCode ( 115 ); +- win->setToggleButton ( true ); +- mod_keys.append ( win ); +- win->res(); +- ++ lwin = new VButton ( this,"" ); ++ lwin->resize ( 50,30 ); ++ lwin->move ( lctrl->x() +lctrl->width() +5, sty+ ( 5*35 ) ); ++ lwin->setText ( "LWin" ); ++ lwin->setKeyCode ( 133 ); ++ lwin->setToggleButton ( true ); ++ mod_keys.append ( lwin ); ++ lwin->res(); +@@ -329 +323 @@ +- lalt->move ( 5+win->x() +win->width(), sty+ ( 5*35 ) ); ++ lalt->move ( lwin->x() +lwin->width() +6, sty+ ( 5*35 ) ); +@@ -336 +329,0 @@ +- +@@ -339,2 +332,3 @@ +- space->resize ( 5*35+28,30 ); +- space->move ( 5+lalt->x() +lalt->width(),sty+ ( 5*35 ) ); ++ space->resize ( 133,30 ); ++ space->move ( lalt->x() +lalt->width() +5, sty+ ( 5*35 ) ); ++ +@@ -346 +340 @@ +- ralt->resize ( 45,30 ); ++ ralt->resize ( 48,30 ); +@@ -349 +343 @@ +- ralt->setKeyCode ( 113 ); ++ ralt->setKeyCode ( 108 ); +@@ -350,0 +345 @@ ++ connect ( ralt,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleShiftCapsAltGr ( unsigned int ) ) ); +@@ -353,0 +349,8 @@ ++ rwin = new VButton ( this,"" ); ++ rwin->resize ( 48,30 ); ++ rwin->move ( ralt->x() +ralt->width() +5, sty+ ( 5*35 ) ); ++ rwin->setText ( "RWin" ); ++ rwin->setKeyCode ( 134 ); ++ rwin->setToggleButton ( true ); ++ mod_keys.append ( rwin ); ++ rwin->res(); +@@ -356,2 +359,2 @@ +- mnu->resize ( 45,30 ); +- mnu->move ( 5+ralt->x() +ralt->width(), sty+ ( 5*35 ) ); ++ mnu->resize ( 49,30 ); ++ mnu->move ( rwin->x() +rwin->width() +5, sty+ ( 5*35 ) ); +@@ -359 +362 @@ +- mnu->setKeyCode ( 117 ); ++ mnu->setKeyCode ( 135 ); +@@ -365 +367,0 @@ +- +@@ -367 +369 @@ +- rctrl->resize ( 45,30 ); ++ rctrl->resize ( 49,30 ); +@@ -370 +372 @@ +- rctrl->setKeyCode ( 37 ); ++ rctrl->setKeyCode ( 105 ); +@@ -375,2 +376,0 @@ +- mappingNotify(NULL); +- +@@ -378,3 +378,4 @@ +- quit->resize ( 15,30 ); +- quit->move ( 525,15 ); +- quit->setPaletteBackgroundColor ( TQt::red ); ++ quit->resize ( 20,30 ); ++ quit->move ( 524,15 ); ++ quit->setPixmap(TQIconSet(SmallIcon("application-exit", TDEIcon::SizeMedium)).pixmap()); ++ TQToolTip::add( quit, i18n( "Hide keyboard" ) ); +@@ -386,3 +387,12 @@ +- extent->resize( 15,65 ); +- extent->move(525, 85 ); +- extent->setText(">>"); ++ extent->resize ( 20,65 ); ++ extent->move (524, 85 ); ++ if (extent_visible) ++ { ++ extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward", TDEIcon::SizeMedium)).pixmap()); ++ TQToolTip::add( extent, i18n( "Hide num pad" ) ); ++ } ++ else ++ { ++ extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward", TDEIcon::SizeMedium)).pixmap()); ++ TQToolTip::add( extent, i18n( "Show num pad" ) ); ++ } +@@ -397,5 +407 @@ +- setPaletteBackgroundColor ( TQt::black ); +- setFocusPolicy ( TQ_NoFocus ); +- +- +- int padx= 550; ++ int padx= 554; +@@ -407 +412,0 @@ +- int nval[9] = {16,17,18,13,14,15,10,11,12}; +@@ -414 +419 @@ +- v->setKeyCode(nval[val],cval[val]); ++ v->setKeyCode(cval[val]); +@@ -427 +432 @@ +- ins->setKeyCode(19,90); ++ ins->setKeyCode(90); +@@ -439 +444 @@ +- del->setKeyCode(60,91); ++ del->setKeyCode(91); +@@ -451,2 +456 @@ +- connect ( numl, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); +- connect ( numl, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( toggleNumlock() ) ); ++ connect ( numl, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleNumlock() ) ); +@@ -459 +463 @@ +- div->setKeyCode(112); ++ div->setKeyCode(106); +@@ -475,2 +479,2 @@ +- ent->setText("Ent"); +- ent->setKeyCode(36); ++ ent->setText("En\nter"); ++ ent->setKeyCode(104); +@@ -498 +502,4 @@ +- if (!stand_alone){ ++ mappingNotify(NULL); ++ ++ if (!stand_alone) ++ { +@@ -501 +508 @@ +- ++ +@@ -503 +510 @@ +- ++ +@@ -506 +513 @@ +- ++ +@@ -508 +515 @@ +- m->insertItem ( "Font ...", this, TQT_SLOT ( chooseFont() ) ); ++ m->insertItem ( i18n("Font ..."), this, TQT_SLOT ( chooseFont() ) ); +@@ -510 +517 @@ +- mnu_autores = m->insertItem( "Auto resize font",this, TQT_SLOT ( toggleFontAutoRes() ) ); ++ mnu_autores = m->insertItem( i18n("Auto resize font"),this, TQT_SLOT ( toggleFontAutoRes() ) ); +@@ -513 +519,0 @@ +- +@@ -515 +521,5 @@ +- mnu_dock = m->insertItem ( "Dock widget", this, TQT_SLOT ( showDock() ) ); ++ m->insertItem ( i18n ("Background color"), this, TQT_SLOT ( chooseBackgroundColor() ) ); ++ m->insertItem ( i18n ("Keys color"), this, TQT_SLOT ( chooseKeysColor() ) ); ++ ++ m->insertSeparator(); ++ mnu_dock = m->insertItem ( i18n("Dock widget"), this, TQT_SLOT ( showDock() ) ); +@@ -517 +526,0 @@ +- +@@ -519 +528,5 @@ +- ++ ++ mnu_lock = m->insertItem(i18n("Lock on screen"), this, TQT_SLOT(toggleLock())); ++ locked = cfg->readBoolEntry("locked", false); ++ m->setItemChecked(mnu_lock, locked); ++ +@@ -522 +535 @@ +- m->insertItem ( "Help", h->menu() ); ++ m->insertItem ( i18n("Help"), h->menu() ); +@@ -526,2 +539,7 @@ +- dock = new KbdDock ( this ); +- if (show_dock){ ++ TQFont fnt = cfg->readFontEntry("KvkbdFont"); ++ m->setItemChecked(mnu_autores, fnt_autores); ++ setFont(fnt); ++ ++ dock = new KbdDock(this); ++ if (show_dock) ++ { +@@ -529 +546,0 @@ +- +@@ -531 +548,2 @@ +- else{ ++ else ++ { +@@ -533 +550,0 @@ +- +@@ -535,3 +551,0 @@ +- +- TQFont fnt = cfg->readFontEntry("KvkbdFont"); +- m->setItemChecked(mnu_autores, fnt_autores); +@@ -539 +553 @@ +- setFont(fnt); ++ setLockState(locked); +@@ -542,2 +556,2 @@ +- popup_menu->resize ( 15,30 ); +- popup_menu->move ( 525,15+35 ); ++ popup_menu->resize ( 20,30 ); ++ popup_menu->move ( 524,15+35 ); +@@ -547,2 +561,2 @@ +- popup_menu->setPixmap(TQIconSet(SmallIcon("configure")).pixmap()); +- ++ popup_menu->setPixmap(TQIconSet(SmallIcon("configure", TDEIcon::SizeMedium)).pixmap()); ++ TQToolTip::add( popup_menu, i18n( "Configure" ) ); +@@ -551 +564,0 @@ +- +@@ -553 +566,2 @@ +- else{ ++ else ++ { +@@ -555 +568,0 @@ +- +@@ -557 +569,0 @@ +- +@@ -559,0 +572,41 @@ ++void MainWidget::chooseBackgroundColor() ++{ ++ TDEConfig *cfg = TDEApplication::kApplication()->config(); ++ TQString backgroundC = cfg->readEntry("keyboardBackgroundColor", "#cdc0b0"); ++ TQColor newBackgroundC = TQColorDialog::getColor(TQColor(backgroundC)); ++ if (newBackgroundC.isValid()) ++ { ++ cfg->writeEntry("keyboardBackgroundColor", newBackgroundC.name()); // save as #rrbbgg ++ cfg->sync(); ++ setPaletteBackgroundColor(newBackgroundC); ++ } ++} ++ ++void MainWidget::chooseKeysColor() ++{ ++ TDEConfig *cfg = TDEApplication::kApplication()->config(); ++ TQString keysC = cfg->readEntry("keysColor", "#f0f0f0"); ++ TQColor newkeysC = TQColorDialog::getColor(TQColor(keysC)); ++ if (newkeysC.isValid()) ++ { ++ cfg->writeEntry("keysColor", newkeysC.name()); // save as #rrbbgg ++ cfg->sync(); ++ ++ for (unsigned idx = 0; idx < btns.size(); ++idx) ++ { ++ btns[idx]->setColor(newkeysC); ++ } ++ for (unsigned idx = 0; idx < mod_keys.size(); ++idx) ++ { ++ mod_keys[idx]->setColor(newkeysC); ++ } ++ for (unsigned idx = 0; idx < other_keys.size(); ++idx) ++ { ++ other_keys[idx]->setColor(newkeysC); ++ } ++ for (unsigned idx = 0; idx < numl_keys.size(); ++idx) ++ { ++ numl_keys[idx]->setColor(newkeysC); ++ } ++ } ++} +@@ -571,0 +625 @@ ++ +@@ -584 +638 @@ +- int d_width=550; ++ int d_width=553; +@@ -586 +640 @@ +- TQRect dflt_geom(screen_geom.width()-d_width,screen_geom.height()-d_height,d_width,d_height); ++ TQRect dflt_geom(screen_geom.width()-d_width-150,screen_geom.height()-d_height-50,d_width,d_height); +@@ -597,0 +652 @@ ++ +@@ -613,0 +669 @@ ++ cfg->writeEntry("numpad_visible",extent_visible); +@@ -630,2 +686,2 @@ +- sdxs = width() - (width() * (150.0/700.0)); +- VButton::pw=700.0; ++ sdxs = width() - (width() * (150.0/703.0)); ++ VButton::pw=703.0; +@@ -633 +689 @@ +- setMinimumSize(700/3,235/3); ++ setMinimumSize(703/3,235/3); +@@ -637,2 +693,2 @@ +- sdxb = width() + (width() * (150.0/550.0)); +- VButton::pw=550.0; ++ sdxb = width() + (width() * (150.0/552.0)); ++ VButton::pw=552.0; +@@ -640 +696 @@ +- setMinimumSize(550/3,235/3); ++ setMinimumSize(552/3,235/3); +@@ -676 +732,5 @@ +- double rp = (8.0/600.0)*width(); ++ double rp = (11.0/600.0)*width(); ++ if (extent_visible) ++ { ++ rp *= (552.0/703.0); ++ } +@@ -687,0 +748,2 @@ ++ extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward", TDEIcon::SizeMedium)).pixmap()); ++ TQToolTip::add( extent, i18n( "Show num pad" ) ); +@@ -689 +750,0 @@ +- extent->setText(">>"); +@@ -693,2 +754,3 @@ +- extent->setText("<<"); +- TQWidget::resize ( (int)sdxb, height() ); ++ extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward", TDEIcon::SizeMedium)).pixmap()); ++ TQToolTip::add( extent, i18n( "Hide num pad" ) ); ++ TQWidget::resize ( (int)sdxb, height() ); +@@ -724,0 +787 @@ ++ +@@ -731,0 +795,17 @@ ++ ++void MainWidget::setLockState(bool lock) ++{ ++ locked = lock; ++ tray->contextMenu()->setItemChecked(mnu_lock, locked); ++ repaint(); // Force repainting to update the resize handle display ++} ++ ++void MainWidget::toggleLock() ++{ ++ setLockState(!locked); ++ ++ TDEConfig *cfg = TDEApplication::kApplication()->config(); ++ cfg->writeEntry("locked", locked); ++ cfg->sync(); ++} ++ +@@ -747,0 +828 @@ ++ +@@ -755,0 +837 @@ ++ +@@ -758,5 +840,2 @@ +- bool p=numl->isOn(); +- for ( unsigned a=0;anumlockPressed(p); +- } ++ send_key(numl->getKeyCode()); ++ updateNumlock(); +@@ -764 +843,2 @@ +-void MainWidget::toggleCaps() ++ ++void MainWidget::updateNumlock() +@@ -766,4 +846,4 @@ +- bool p=caps->isOn(); +- for ( unsigned a=0;acapsPressed(p); ++ bool state = numl->isOn(); ++ for (unsigned a = 0; a < numl_keys.size(); a++) ++ { ++ numl_keys[a]->numlockPressed(state); +@@ -773 +853 @@ +-void MainWidget::toggleShift() ++void MainWidget::toggleShiftCapsAltGr(unsigned int keycode) +@@ -775,8 +855,2 @@ +- bool p=false; +- if ( lshft->isOn() || rshft->isOn() ) p=true; +- +- for ( unsigned a=0;ashiftPressed ( p ); +- } +- ++ send_key(keycode); ++ updateShiftCapsAltGr(); +@@ -785 +859 @@ +-void MainWidget::keyPress ( unsigned int a ) ++void MainWidget::updateShiftCapsAltGr() +@@ -787,8 +861,6 @@ +- send_key ( a,true,true ); +- bool reverse = false; +- if (lshft->isOn() || rshft->isOn()) +- reverse=true; +- +- for ( unsigned a=0;asetOn ( false ); ++ bool shiftState = lshift->isOn() || rshift->isOn(); ++ bool capsState = caps->isOn(); ++ bool altGrState = ralt->isOn(); ++ for (unsigned a = 0; a < btns.size(); a++) ++ { ++ btns[a]->shiftCapsAltGrPressed(shiftState, capsState, altGrState); +@@ -795,0 +868 @@ ++} +@@ -797,13 +870,6 @@ +- if (caps->isOn()) { +- if (reverse) { +- for (unsigned a=0;acapsPressed(true); +- } +- } +- }else { +- for (unsigned a=0;acapsPressed(false); +- } ++void MainWidget::keyPress(unsigned int a) ++{ ++ send_key(a); ++ for (unsigned a = 0; a < mod_keys.size(); a++) ++ { ++ mod_keys[a]->setOn(false); +@@ -811 +877,2 @@ +- ++ // Make sure the key labels are correctly updated ++ updateShiftCapsAltGr(); +@@ -813 +880,2 @@ +-void MainWidget::send_key ( unsigned int keycode, bool press, bool release ) ++ ++void MainWidget::send_key(unsigned int keycode) +@@ -859,13 +927,5 @@ +- //printf("Scroll: %d\n",keyState(XK_Scroll_Lock,pDisplay)); +- //printf("Caps : %d\n",keyState(XK_Caps_Lock,pDisplay)); +- //printf("Num : %d\n",keyState(XK_Num_Lock,pDisplay)); +- bool caps_state = keyState ( XK_Caps_Lock); +- bool numl_state = keyState ( XK_Num_Lock); +- +- if ( caps_state!=caps->isOn() ) { +- caps->setOn ( caps_state ); +- toggleCaps(); +- } +- if ( numl_state!= numl->isOn() ) { +- numl->setOn(numl_state); +- toggleNumlock(); ++ bool caps_state = keyState(XK_Caps_Lock); ++ if (caps_state != caps->isOn()) ++ { ++ caps->setOn(caps_state); ++ updateShiftCapsAltGr(); +@@ -873 +932,0 @@ +-} +@@ -875,27 +934,5 @@ +-void MainWidget::setupText(VButton& v) +-{ +- +- KeyCode keycode=v.getKeyCode(); +- +- KeySym keysym_l = XkbKeycodeToKeysym(display, keycode, 0, 0); +- +- KeySym keysym_u = XkbKeycodeToKeysym(display, keycode, 0, 1); +- +- long ret = keysym2ucs(keysym_l); +- +- TQString btn_text(TQChar((uint)ret)); +- +- v.setText(btn_text); +- +- TQString btn_upper(btn_text.upper()); +- +- if (btn_upper==btn_text) { +- ret = keysym2ucs(keysym_u); +- TQChar c((uint)ret); +- if (c=='&') +- v.setShiftText("&&"); +- else +- v.setShiftText(c); +- } +- else { +- v.setShiftText(btn_upper); ++ bool numl_state = keyState(XK_Num_Lock); ++ if (numl_state != numl->isOn()) ++ { ++ numl->setOn(numl_state); ++ updateNumlock(); +@@ -907,14 +944,6 @@ +- //TQTimer::singleShot( 1000, this, TQT_SLOT(test()) ); +- //if (e)XRefreshKeyboardMapping(e); +- +- //int index=0; +- +- for (unsigned a=0;asetupTexts(display); ++ } ++ updateNumlock(); ++ updateShiftCapsAltGr(); +@@ -931 +960 @@ +- TQToolTip::add ( this, "Toggle keyboard visibility" ); ++ TQToolTip::add ( this, i18n ("Toggle keyboard visibility") ); +@@ -941 +970,2 @@ +-{} ++{ ++} +@@ -955,850 +984,0 @@ +- +-} +- +- +-/* $XFree86$ +- * This module converts keysym values into the corresponding ISO 10646 +- * (UCS, Unicode) values. +- * +- * The array keysymtab[] contains pairs of X11 keysym values for graphical +- * characters and the corresponding Unicode value. The function +- * keysym2ucs() maps a keysym onto a Unicode value using a binary search, +- * therefore keysymtab[] must remain SORTED by keysym value. +- * +- * The keysym -> UTF-8 conversion will hopefully one day be provided +- * by Xlib via XmbLookupString() and should ideally not have to be +- * done in X applications. But we are not there yet. +- * +- * We allow to represent any UCS character in the range U-00000000 to +- * U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff. +- * This admittedly does not cover the entire 31-bit space of UCS, but +- * it does cover all of the characters up to U-10FFFF, which can be +- * represented by UTF-16, and more, and it is very unlikely that higher +- * UCS codes will ever be assigned by ISO. So to get Unicode character +- * U+ABCD you can directly use keysym 0x0100abcd. +- * +- * NOTE: The comments in the table below contain the actual character +- * encoded in UTF-8, so for viewing and editing best use an editor in +- * UTF-8 mode. +- * +- * Author: Markus G. Kuhn , +- * University of Cambridge, April 2001 +- * +- * Special thanks to Richard Verhoeven for preparing +- * an initial draft of the mapping table. +- * +- * This software is in the public domain. Share and enjoy! +- * +- * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl) +- */ +- +- +-struct codepair { +- unsigned short keysym; +- unsigned short ucs; +-} keysymtab[] = { +- { 0x01a1, 0x0104 }, /* Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */ +- { 0x01a2, 0x02d8 }, /* breve ˘ BREVE */ +- { 0x01a3, 0x0141 }, /* Lstroke Ł LATIN CAPITAL LETTER L WITH STROKE */ +- { 0x01a5, 0x013d }, /* Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */ +- { 0x01a6, 0x015a }, /* Sacute Ś LATIN CAPITAL LETTER S WITH ACUTE */ +- { 0x01a9, 0x0160 }, /* Scaron Š LATIN CAPITAL LETTER S WITH CARON */ +- { 0x01aa, 0x015e }, /* Scedilla Ş LATIN CAPITAL LETTER S WITH CEDILLA */ +- { 0x01ab, 0x0164 }, /* Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */ +- { 0x01ac, 0x0179 }, /* Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */ +- { 0x01ae, 0x017d }, /* Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */ +- { 0x01af, 0x017b }, /* Zabovedot Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE */ +- { 0x01b1, 0x0105 }, /* aogonek ą LATIN SMALL LETTER A WITH OGONEK */ +- { 0x01b2, 0x02db }, /* ogonek ˛ OGONEK */ +- { 0x01b3, 0x0142 }, /* lstroke ł LATIN SMALL LETTER L WITH STROKE */ +- { 0x01b5, 0x013e }, /* lcaron ľ LATIN SMALL LETTER L WITH CARON */ +- { 0x01b6, 0x015b }, /* sacute ś LATIN SMALL LETTER S WITH ACUTE */ +- { 0x01b7, 0x02c7 }, /* caron ˇ CARON */ +- { 0x01b9, 0x0161 }, /* scaron š LATIN SMALL LETTER S WITH CARON */ +- { 0x01ba, 0x015f }, /* scedilla ş LATIN SMALL LETTER S WITH CEDILLA */ +- { 0x01bb, 0x0165 }, /* tcaron ť LATIN SMALL LETTER T WITH CARON */ +- { 0x01bc, 0x017a }, /* zacute ź LATIN SMALL LETTER Z WITH ACUTE */ +- { 0x01bd, 0x02dd }, /* doubleacute ˝ DOUBLE ACUTE ACCENT */ +- { 0x01be, 0x017e }, /* zcaron ž LATIN SMALL LETTER Z WITH CARON */ +- { 0x01bf, 0x017c }, /* zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */ +- { 0x01c0, 0x0154 }, /* Racute Ŕ LATIN CAPITAL LETTER R WITH ACUTE */ +- { 0x01c3, 0x0102 }, /* Abreve Ă LATIN CAPITAL LETTER A WITH BREVE */ +- { 0x01c5, 0x0139 }, /* Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */ +- { 0x01c6, 0x0106 }, /* Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */ +- { 0x01c8, 0x010c }, /* Ccaron Č LATIN CAPITAL LETTER C WITH CARON */ +- { 0x01ca, 0x0118 }, /* Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */ +- { 0x01cc, 0x011a }, /* Ecaron Ě LATIN CAPITAL LETTER E WITH CARON */ +- { 0x01cf, 0x010e }, /* Dcaron Ď LATIN CAPITAL LETTER D WITH CARON */ +- { 0x01d0, 0x0110 }, /* Dstroke Đ LATIN CAPITAL LETTER D WITH STROKE */ +- { 0x01d1, 0x0143 }, /* Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */ +- { 0x01d2, 0x0147 }, /* Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */ +- { 0x01d5, 0x0150 }, /* Odoubleacute Ő LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ +- { 0x01d8, 0x0158 }, /* Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */ +- { 0x01d9, 0x016e }, /* Uring Ů LATIN CAPITAL LETTER U WITH RING ABOVE */ +- { 0x01db, 0x0170 }, /* Udoubleacute Ű LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ +- { 0x01de, 0x0162 }, /* Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */ +- { 0x01e0, 0x0155 }, /* racute ŕ LATIN SMALL LETTER R WITH ACUTE */ +- { 0x01e3, 0x0103 }, /* abreve ă LATIN SMALL LETTER A WITH BREVE */ +- { 0x01e5, 0x013a }, /* lacute ĺ LATIN SMALL LETTER L WITH ACUTE */ +- { 0x01e6, 0x0107 }, /* cacute ć LATIN SMALL LETTER C WITH ACUTE */ +- { 0x01e8, 0x010d }, /* ccaron č LATIN SMALL LETTER C WITH CARON */ +- { 0x01ea, 0x0119 }, /* eogonek ę LATIN SMALL LETTER E WITH OGONEK */ +- { 0x01ec, 0x011b }, /* ecaron ě LATIN SMALL LETTER E WITH CARON */ +- { 0x01ef, 0x010f }, /* dcaron ď LATIN SMALL LETTER D WITH CARON */ +- { 0x01f0, 0x0111 }, /* dstroke đ LATIN SMALL LETTER D WITH STROKE */ +- { 0x01f1, 0x0144 }, /* nacute ń LATIN SMALL LETTER N WITH ACUTE */ +- { 0x01f2, 0x0148 }, /* ncaron ň LATIN SMALL LETTER N WITH CARON */ +- { 0x01f5, 0x0151 }, /* odoubleacute ő LATIN SMALL LETTER O WITH DOUBLE ACUTE */ +- { 0x01f8, 0x0159 }, /* rcaron ř LATIN SMALL LETTER R WITH CARON */ +- { 0x01f9, 0x016f }, /* uring ů LATIN SMALL LETTER U WITH RING ABOVE */ +- { 0x01fb, 0x0171 }, /* udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */ +- { 0x01fe, 0x0163 }, /* tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */ +- { 0x01ff, 0x02d9 }, /* abovedot ˙ DOT ABOVE */ +- { 0x02a1, 0x0126 }, /* Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */ +- { 0x02a6, 0x0124 }, /* Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */ +- { 0x02a9, 0x0130 }, /* Iabovedot İ LATIN CAPITAL LETTER I WITH DOT ABOVE */ +- { 0x02ab, 0x011e }, /* Gbreve Ğ LATIN CAPITAL LETTER G WITH BREVE */ +- { 0x02ac, 0x0134 }, /* Jcircumflex Ĵ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */ +- { 0x02b1, 0x0127 }, /* hstroke ħ LATIN SMALL LETTER H WITH STROKE */ +- { 0x02b6, 0x0125 }, /* hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */ +- { 0x02b9, 0x0131 }, /* idotless ı LATIN SMALL LETTER DOTLESS I */ +- { 0x02bb, 0x011f }, /* gbreve ğ LATIN SMALL LETTER G WITH BREVE */ +- { 0x02bc, 0x0135 }, /* jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */ +- { 0x02c5, 0x010a }, /* Cabovedot Ċ LATIN CAPITAL LETTER C WITH DOT ABOVE */ +- { 0x02c6, 0x0108 }, /* Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */ +- { 0x02d5, 0x0120 }, /* Gabovedot Ġ LATIN CAPITAL LETTER G WITH DOT ABOVE */ +- { 0x02d8, 0x011c }, /* Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */ +- { 0x02dd, 0x016c }, /* Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */ +- { 0x02de, 0x015c }, /* Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */ +- { 0x02e5, 0x010b }, /* cabovedot ċ LATIN SMALL LETTER C WITH DOT ABOVE */ +- { 0x02e6, 0x0109 }, /* ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */ +- { 0x02f5, 0x0121 }, /* gabovedot ġ LATIN SMALL LETTER G WITH DOT ABOVE */ +- { 0x02f8, 0x011d }, /* gcircumflex ĝ LATIN SMALL LETTER G WITH CIRCUMFLEX */ +- { 0x02fd, 0x016d }, /* ubreve ŭ LATIN SMALL LETTER U WITH BREVE */ +- { 0x02fe, 0x015d }, /* scircumflex ŝ LATIN SMALL LETTER S WITH CIRCUMFLEX */ +- { 0x03a2, 0x0138 }, /* kra ĸ LATIN SMALL LETTER KRA */ +- { 0x03a3, 0x0156 }, /* Rcedilla Ŗ LATIN CAPITAL LETTER R WITH CEDILLA */ +- { 0x03a5, 0x0128 }, /* Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */ +- { 0x03a6, 0x013b }, /* Lcedilla Ļ LATIN CAPITAL LETTER L WITH CEDILLA */ +- { 0x03aa, 0x0112 }, /* Emacron Ē LATIN CAPITAL LETTER E WITH MACRON */ +- { 0x03ab, 0x0122 }, /* Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */ +- { 0x03ac, 0x0166 }, /* Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */ +- { 0x03b3, 0x0157 }, /* rcedilla ŗ LATIN SMALL LETTER R WITH CEDILLA */ +- { 0x03b5, 0x0129 }, /* itilde ĩ LATIN SMALL LETTER I WITH TILDE */ +- { 0x03b6, 0x013c }, /* lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */ +- { 0x03ba, 0x0113 }, /* emacron ē LATIN SMALL LETTER E WITH MACRON */ +- { 0x03bb, 0x0123 }, /* gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */ +- { 0x03bc, 0x0167 }, /* tslash ŧ LATIN SMALL LETTER T WITH STROKE */ +- { 0x03bd, 0x014a }, /* ENG Ŋ LATIN CAPITAL LETTER ENG */ +- { 0x03bf, 0x014b }, /* eng ŋ LATIN SMALL LETTER ENG */ +- { 0x03c0, 0x0100 }, /* Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */ +- { 0x03c7, 0x012e }, /* Iogonek Į LATIN CAPITAL LETTER I WITH OGONEK */ +- { 0x03cc, 0x0116 }, /* Eabovedot Ė LATIN CAPITAL LETTER E WITH DOT ABOVE */ +- { 0x03cf, 0x012a }, /* Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */ +- { 0x03d1, 0x0145 }, /* Ncedilla Ņ LATIN CAPITAL LETTER N WITH CEDILLA */ +- { 0x03d2, 0x014c }, /* Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */ +- { 0x03d3, 0x0136 }, /* Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */ +- { 0x03d9, 0x0172 }, /* Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */ +- { 0x03dd, 0x0168 }, /* Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */ +- { 0x03de, 0x016a }, /* Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */ +- { 0x03e0, 0x0101 }, /* amacron ā LATIN SMALL LETTER A WITH MACRON */ +- { 0x03e7, 0x012f }, /* iogonek į LATIN SMALL LETTER I WITH OGONEK */ +- { 0x03ec, 0x0117 }, /* eabovedot ė LATIN SMALL LETTER E WITH DOT ABOVE */ +- { 0x03ef, 0x012b }, /* imacron ī LATIN SMALL LETTER I WITH MACRON */ +- { 0x03f1, 0x0146 }, /* ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */ +- { 0x03f2, 0x014d }, /* omacron ō LATIN SMALL LETTER O WITH MACRON */ +- { 0x03f3, 0x0137 }, /* kcedilla ķ LATIN SMALL LETTER K WITH CEDILLA */ +- { 0x03f9, 0x0173 }, /* uogonek ų LATIN SMALL LETTER U WITH OGONEK */ +- { 0x03fd, 0x0169 }, /* utilde ũ LATIN SMALL LETTER U WITH TILDE */ +- { 0x03fe, 0x016b }, /* umacron ū LATIN SMALL LETTER U WITH MACRON */ +- { 0x047e, 0x203e }, /* overline ‾ OVERLINE */ +- { 0x04a1, 0x3002 }, /* kana_fullstop 。 IDEOGRAPHIC FULL STOP */ +- { 0x04a2, 0x300c }, /* kana_openingbracket 「 LEFT CORNER BRACKET */ +- { 0x04a3, 0x300d }, /* kana_closingbracket 」 RIGHT CORNER BRACKET */ +- { 0x04a4, 0x3001 }, /* kana_comma 、 IDEOGRAPHIC COMMA */ +- { 0x04a5, 0x30fb }, /* kana_conjunctive ・ KATAKANA MIDDLE DOT */ +- { 0x04a6, 0x30f2 }, /* kana_WO ヲ KATAKANA LETTER WO */ +- { 0x04a7, 0x30a1 }, /* kana_a ァ KATAKANA LETTER SMALL A */ +- { 0x04a8, 0x30a3 }, /* kana_i ィ KATAKANA LETTER SMALL I */ +- { 0x04a9, 0x30a5 }, /* kana_u ゥ KATAKANA LETTER SMALL U */ +- { 0x04aa, 0x30a7 }, /* kana_e ェ KATAKANA LETTER SMALL E */ +- { 0x04ab, 0x30a9 }, /* kana_o ォ KATAKANA LETTER SMALL O */ +- { 0x04ac, 0x30e3 }, /* kana_ya ャ KATAKANA LETTER SMALL YA */ +- { 0x04ad, 0x30e5 }, /* kana_yu ュ KATAKANA LETTER SMALL YU */ +- { 0x04ae, 0x30e7 }, /* kana_yo ョ KATAKANA LETTER SMALL YO */ +- { 0x04af, 0x30c3 }, /* kana_tsu ッ KATAKANA LETTER SMALL TU */ +- { 0x04b0, 0x30fc }, /* prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */ +- { 0x04b1, 0x30a2 }, /* kana_A ア KATAKANA LETTER A */ +- { 0x04b2, 0x30a4 }, /* kana_I イ KATAKANA LETTER I */ +- { 0x04b3, 0x30a6 }, /* kana_U ウ KATAKANA LETTER U */ +- { 0x04b4, 0x30a8 }, /* kana_E エ KATAKANA LETTER E */ +- { 0x04b5, 0x30aa }, /* kana_O オ KATAKANA LETTER O */ +- { 0x04b6, 0x30ab }, /* kana_KA カ KATAKANA LETTER KA */ +- { 0x04b7, 0x30ad }, /* kana_KI キ KATAKANA LETTER KI */ +- { 0x04b8, 0x30af }, /* kana_KU ク KATAKANA LETTER KU */ +- { 0x04b9, 0x30b1 }, /* kana_KE ケ KATAKANA LETTER KE */ +- { 0x04ba, 0x30b3 }, /* kana_KO コ KATAKANA LETTER KO */ +- { 0x04bb, 0x30b5 }, /* kana_SA サ KATAKANA LETTER SA */ +- { 0x04bc, 0x30b7 }, /* kana_SHI シ KATAKANA LETTER SI */ +- { 0x04bd, 0x30b9 }, /* kana_SU ス KATAKANA LETTER SU */ +- { 0x04be, 0x30bb }, /* kana_SE セ KATAKANA LETTER SE */ +- { 0x04bf, 0x30bd }, /* kana_SO ソ KATAKANA LETTER SO */ +- { 0x04c0, 0x30bf }, /* kana_TA タ KATAKANA LETTER TA */ +- { 0x04c1, 0x30c1 }, /* kana_CHI チ KATAKANA LETTER TI */ +- { 0x04c2, 0x30c4 }, /* kana_TSU ツ KATAKANA LETTER TU */ +- { 0x04c3, 0x30c6 }, /* kana_TE テ KATAKANA LETTER TE */ +- { 0x04c4, 0x30c8 }, /* kana_TO ト KATAKANA LETTER TO */ +- { 0x04c5, 0x30ca }, /* kana_NA ナ KATAKANA LETTER NA */ +- { 0x04c6, 0x30cb }, /* kana_NI ニ KATAKANA LETTER NI */ +- { 0x04c7, 0x30cc }, /* kana_NU ヌ KATAKANA LETTER NU */ +- { 0x04c8, 0x30cd }, /* kana_NE ネ KATAKANA LETTER NE */ +- { 0x04c9, 0x30ce }, /* kana_NO ノ KATAKANA LETTER NO */ +- { 0x04ca, 0x30cf }, /* kana_HA ハ KATAKANA LETTER HA */ +- { 0x04cb, 0x30d2 }, /* kana_HI ヒ KATAKANA LETTER HI */ +- { 0x04cc, 0x30d5 }, /* kana_FU フ KATAKANA LETTER HU */ +- { 0x04cd, 0x30d8 }, /* kana_HE ヘ KATAKANA LETTER HE */ +- { 0x04ce, 0x30db }, /* kana_HO ホ KATAKANA LETTER HO */ +- { 0x04cf, 0x30de }, /* kana_MA マ KATAKANA LETTER MA */ +- { 0x04d0, 0x30df }, /* kana_MI ミ KATAKANA LETTER MI */ +- { 0x04d1, 0x30e0 }, /* kana_MU ム KATAKANA LETTER MU */ +- { 0x04d2, 0x30e1 }, /* kana_ME メ KATAKANA LETTER ME */ +- { 0x04d3, 0x30e2 }, /* kana_MO モ KATAKANA LETTER MO */ +- { 0x04d4, 0x30e4 }, /* kana_YA ヤ KATAKANA LETTER YA */ +- { 0x04d5, 0x30e6 }, /* kana_YU ユ KATAKANA LETTER YU */ +- { 0x04d6, 0x30e8 }, /* kana_YO ヨ KATAKANA LETTER YO */ +- { 0x04d7, 0x30e9 }, /* kana_RA ラ KATAKANA LETTER RA */ +- { 0x04d8, 0x30ea }, /* kana_RI リ KATAKANA LETTER RI */ +- { 0x04d9, 0x30eb }, /* kana_RU ル KATAKANA LETTER RU */ +- { 0x04da, 0x30ec }, /* kana_RE レ KATAKANA LETTER RE */ +- { 0x04db, 0x30ed }, /* kana_RO ロ KATAKANA LETTER RO */ +- { 0x04dc, 0x30ef }, /* kana_WA ワ KATAKANA LETTER WA */ +- { 0x04dd, 0x30f3 }, /* kana_N ン KATAKANA LETTER N */ +- { 0x04de, 0x309b }, /* voicedsound ゛ KATAKANA-HIRAGANA VOICED SOUND MARK */ +- { 0x04df, 0x309c }, /* semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */ +- { 0x05ac, 0x060c }, /* Arabic_comma ، ARABIC COMMA */ +- { 0x05bb, 0x061b }, /* Arabic_semicolon ؛ ARABIC SEMICOLON */ +- { 0x05bf, 0x061f }, /* Arabic_question_mark ؟ ARABIC QUESTION MARK */ +- { 0x05c1, 0x0621 }, /* Arabic_hamza ء ARABIC LETTER HAMZA */ +- { 0x05c2, 0x0622 }, /* Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */ +- { 0x05c3, 0x0623 }, /* Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */ +- { 0x05c4, 0x0624 }, /* Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */ +- { 0x05c5, 0x0625 }, /* Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */ +- { 0x05c6, 0x0626 }, /* Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */ +- { 0x05c7, 0x0627 }, /* Arabic_alef ا ARABIC LETTER ALEF */ +- { 0x05c8, 0x0628 }, /* Arabic_beh ب ARABIC LETTER BEH */ +- { 0x05c9, 0x0629 }, /* Arabic_tehmarbuta ة ARABIC LETTER TEH MARBUTA */ +- { 0x05ca, 0x062a }, /* Arabic_teh ت ARABIC LETTER TEH */ +- { 0x05cb, 0x062b }, /* Arabic_theh ث ARABIC LETTER THEH */ +- { 0x05cc, 0x062c }, /* Arabic_jeem ج ARABIC LETTER JEEM */ +- { 0x05cd, 0x062d }, /* Arabic_hah ح ARABIC LETTER HAH */ +- { 0x05ce, 0x062e }, /* Arabic_khah خ ARABIC LETTER KHAH */ +- { 0x05cf, 0x062f }, /* Arabic_dal د ARABIC LETTER DAL */ +- { 0x05d0, 0x0630 }, /* Arabic_thal ذ ARABIC LETTER THAL */ +- { 0x05d1, 0x0631 }, /* Arabic_ra ر ARABIC LETTER REH */ +- { 0x05d2, 0x0632 }, /* Arabic_zain ز ARABIC LETTER ZAIN */ +- { 0x05d3, 0x0633 }, /* Arabic_seen س ARABIC LETTER SEEN */ +- { 0x05d4, 0x0634 }, /* Arabic_sheen ش ARABIC LETTER SHEEN */ +- { 0x05d5, 0x0635 }, /* Arabic_sad ص ARABIC LETTER SAD */ +- { 0x05d6, 0x0636 }, /* Arabic_dad ض ARABIC LETTER DAD */ +- { 0x05d7, 0x0637 }, /* Arabic_tah ط ARABIC LETTER TAH */ +- { 0x05d8, 0x0638 }, /* Arabic_zah ظ ARABIC LETTER ZAH */ +- { 0x05d9, 0x0639 }, /* Arabic_ain ع ARABIC LETTER AIN */ +- { 0x05da, 0x063a }, /* Arabic_ghain غ ARABIC LETTER GHAIN */ +- { 0x05e0, 0x0640 }, /* Arabic_tatweel ـ ARABIC TATWEEL */ +- { 0x05e1, 0x0641 }, /* Arabic_feh ف ARABIC LETTER FEH */ +- { 0x05e2, 0x0642 }, /* Arabic_qaf ق ARABIC LETTER TQAF */ +- { 0x05e3, 0x0643 }, /* Arabic_kaf ك ARABIC LETTER KAF */ +- { 0x05e4, 0x0644 }, /* Arabic_lam ل ARABIC LETTER LAM */ +- { 0x05e5, 0x0645 }, /* Arabic_meem م ARABIC LETTER MEEM */ +- { 0x05e6, 0x0646 }, /* Arabic_noon ن ARABIC LETTER NOON */ +- { 0x05e7, 0x0647 }, /* Arabic_ha ه ARABIC LETTER HEH */ +- { 0x05e8, 0x0648 }, /* Arabic_waw و ARABIC LETTER WAW */ +- { 0x05e9, 0x0649 }, /* Arabic_alefmaksura ى ARABIC LETTER ALEF MAKSURA */ +- { 0x05ea, 0x064a }, /* Arabic_yeh ي ARABIC LETTER YEH */ +- { 0x05eb, 0x064b }, /* Arabic_fathatan ً ARABIC FATHATAN */ +- { 0x05ec, 0x064c }, /* Arabic_dammatan ٌ ARABIC DAMMATAN */ +- { 0x05ed, 0x064d }, /* Arabic_kasratan ٍ ARABIC KASRATAN */ +- { 0x05ee, 0x064e }, /* Arabic_fatha َ ARABIC FATHA */ +- { 0x05ef, 0x064f }, /* Arabic_damma ُ ARABIC DAMMA */ +- { 0x05f0, 0x0650 }, /* Arabic_kasra ِ ARABIC KASRA */ +- { 0x05f1, 0x0651 }, /* Arabic_shadda ّ ARABIC SHADDA */ +- { 0x05f2, 0x0652 }, /* Arabic_sukun ْ ARABIC SUKUN */ +- { 0x06a1, 0x0452 }, /* Serbian_dje ђ CYRILLIC SMALL LETTER DJE */ +- { 0x06a2, 0x0453 }, /* Macedonia_gje ѓ CYRILLIC SMALL LETTER GJE */ +- { 0x06a3, 0x0451 }, /* Cyrillic_io ё CYRILLIC SMALL LETTER IO */ +- { 0x06a4, 0x0454 }, /* Ukrainian_ie є CYRILLIC SMALL LETTER UKRAINIAN IE */ +- { 0x06a5, 0x0455 }, /* Macedonia_dse ѕ CYRILLIC SMALL LETTER DZE */ +- { 0x06a6, 0x0456 }, /* Ukrainian_i і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ +- { 0x06a7, 0x0457 }, /* Ukrainian_yi ї CYRILLIC SMALL LETTER YI */ +- { 0x06a8, 0x0458 }, /* Cyrillic_je ј CYRILLIC SMALL LETTER JE */ +- { 0x06a9, 0x0459 }, /* Cyrillic_lje љ CYRILLIC SMALL LETTER LJE */ +- { 0x06aa, 0x045a }, /* Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */ +- { 0x06ab, 0x045b }, /* Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */ +- { 0x06ac, 0x045c }, /* Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */ +- { 0x06ae, 0x045e }, /* Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */ +- { 0x06af, 0x045f }, /* Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */ +- { 0x06b0, 0x2116 }, /* numerosign № NUMERO SIGN */ +- { 0x06b1, 0x0402 }, /* Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */ +- { 0x06b2, 0x0403 }, /* Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */ +- { 0x06b3, 0x0401 }, /* Cyrillic_IO Ё CYRILLIC CAPITAL LETTER IO */ +- { 0x06b4, 0x0404 }, /* Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */ +- { 0x06b5, 0x0405 }, /* Macedonia_DSE Ѕ CYRILLIC CAPITAL LETTER DZE */ +- { 0x06b6, 0x0406 }, /* Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ +- { 0x06b7, 0x0407 }, /* Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */ +- { 0x06b8, 0x0408 }, /* Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */ +- { 0x06b9, 0x0409 }, /* Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */ +- { 0x06ba, 0x040a }, /* Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */ +- { 0x06bb, 0x040b }, /* Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */ +- { 0x06bc, 0x040c }, /* Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */ +- { 0x06be, 0x040e }, /* Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */ +- { 0x06bf, 0x040f }, /* Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */ +- { 0x06c0, 0x044e }, /* Cyrillic_yu ю CYRILLIC SMALL LETTER YU */ +- { 0x06c1, 0x0430 }, /* Cyrillic_a а CYRILLIC SMALL LETTER A */ +- { 0x06c2, 0x0431 }, /* Cyrillic_be б CYRILLIC SMALL LETTER BE */ +- { 0x06c3, 0x0446 }, /* Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */ +- { 0x06c4, 0x0434 }, /* Cyrillic_de д CYRILLIC SMALL LETTER DE */ +- { 0x06c5, 0x0435 }, /* Cyrillic_ie е CYRILLIC SMALL LETTER IE */ +- { 0x06c6, 0x0444 }, /* Cyrillic_ef ф CYRILLIC SMALL LETTER EF */ +- { 0x06c7, 0x0433 }, /* Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */ +- { 0x06c8, 0x0445 }, /* Cyrillic_ha х CYRILLIC SMALL LETTER HA */ +- { 0x06c9, 0x0438 }, /* Cyrillic_i и CYRILLIC SMALL LETTER I */ +- { 0x06ca, 0x0439 }, /* Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */ +- { 0x06cb, 0x043a }, /* Cyrillic_ka к CYRILLIC SMALL LETTER KA */ +- { 0x06cc, 0x043b }, /* Cyrillic_el л CYRILLIC SMALL LETTER EL */ +- { 0x06cd, 0x043c }, /* Cyrillic_em м CYRILLIC SMALL LETTER EM */ +- { 0x06ce, 0x043d }, /* Cyrillic_en н CYRILLIC SMALL LETTER EN */ +- { 0x06cf, 0x043e }, /* Cyrillic_o о CYRILLIC SMALL LETTER O */ +- { 0x06d0, 0x043f }, /* Cyrillic_pe п CYRILLIC SMALL LETTER PE */ +- { 0x06d1, 0x044f }, /* Cyrillic_ya я CYRILLIC SMALL LETTER YA */ +- { 0x06d2, 0x0440 }, /* Cyrillic_er р CYRILLIC SMALL LETTER ER */ +- { 0x06d3, 0x0441 }, /* Cyrillic_es с CYRILLIC SMALL LETTER ES */ +- { 0x06d4, 0x0442 }, /* Cyrillic_te т CYRILLIC SMALL LETTER TE */ +- { 0x06d5, 0x0443 }, /* Cyrillic_u у CYRILLIC SMALL LETTER U */ +- { 0x06d6, 0x0436 }, /* Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */ +- { 0x06d7, 0x0432 }, /* Cyrillic_ve в CYRILLIC SMALL LETTER VE */ +- { 0x06d8, 0x044c }, /* Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */ +- { 0x06d9, 0x044b }, /* Cyrillic_yeru ы CYRILLIC SMALL LETTER YERU */ +- { 0x06da, 0x0437 }, /* Cyrillic_ze з CYRILLIC SMALL LETTER ZE */ +- { 0x06db, 0x0448 }, /* Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */ +- { 0x06dc, 0x044d }, /* Cyrillic_e э CYRILLIC SMALL LETTER E */ +- { 0x06dd, 0x0449 }, /* Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */ +- { 0x06de, 0x0447 }, /* Cyrillic_che ч CYRILLIC SMALL LETTER CHE */ +- { 0x06df, 0x044a }, /* Cyrillic_hardsign ъ CYRILLIC SMALL LETTER HARD SIGN */ +- { 0x06e0, 0x042e }, /* Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */ +- { 0x06e1, 0x0410 }, /* Cyrillic_A А CYRILLIC CAPITAL LETTER A */ +- { 0x06e2, 0x0411 }, /* Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */ +- { 0x06e3, 0x0426 }, /* Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */ +- { 0x06e4, 0x0414 }, /* Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */ +- { 0x06e5, 0x0415 }, /* Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */ +- { 0x06e6, 0x0424 }, /* Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */ +- { 0x06e7, 0x0413 }, /* Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */ +- { 0x06e8, 0x0425 }, /* Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */ +- { 0x06e9, 0x0418 }, /* Cyrillic_I И CYRILLIC CAPITAL LETTER I */ +- { 0x06ea, 0x0419 }, /* Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */ +- { 0x06eb, 0x041a }, /* Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */ +- { 0x06ec, 0x041b }, /* Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */ +- { 0x06ed, 0x041c }, /* Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */ +- { 0x06ee, 0x041d }, /* Cyrillic_EN Н CYRILLIC CAPITAL LETTER EN */ +- { 0x06ef, 0x041e }, /* Cyrillic_O О CYRILLIC CAPITAL LETTER O */ +- { 0x06f0, 0x041f }, /* Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */ +- { 0x06f1, 0x042f }, /* Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */ +- { 0x06f2, 0x0420 }, /* Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */ +- { 0x06f3, 0x0421 }, /* Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */ +- { 0x06f4, 0x0422 }, /* Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */ +- { 0x06f5, 0x0423 }, /* Cyrillic_U У CYRILLIC CAPITAL LETTER U */ +- { 0x06f6, 0x0416 }, /* Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */ +- { 0x06f7, 0x0412 }, /* Cyrillic_VE В CYRILLIC CAPITAL LETTER VE */ +- { 0x06f8, 0x042c }, /* Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */ +- { 0x06f9, 0x042b }, /* Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */ +- { 0x06fa, 0x0417 }, /* Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */ +- { 0x06fb, 0x0428 }, /* Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */ +- { 0x06fc, 0x042d }, /* Cyrillic_E Э CYRILLIC CAPITAL LETTER E */ +- { 0x06fd, 0x0429 }, /* Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */ +- { 0x06fe, 0x0427 }, /* Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */ +- { 0x06ff, 0x042a }, /* Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */ +- { 0x07a1, 0x0386 }, /* Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */ +- { 0x07a2, 0x0388 }, /* Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */ +- { 0x07a3, 0x0389 }, /* Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */ +- { 0x07a4, 0x038a }, /* Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */ +- { 0x07a5, 0x03aa }, /* Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ +- { 0x07a7, 0x038c }, /* Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */ +- { 0x07a8, 0x038e }, /* Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */ +- { 0x07a9, 0x03ab }, /* Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ +- { 0x07ab, 0x038f }, /* Greek_OMEGAaccent Ώ GREEK CAPITAL LETTER OMEGA WITH TONOS */ +- { 0x07ae, 0x0385 }, /* Greek_accentdieresis ΅ GREEK DIALYTIKA TONOS */ +- { 0x07af, 0x2015 }, /* Greek_horizbar ― HORIZONTAL BAR */ +- { 0x07b1, 0x03ac }, /* Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */ +- { 0x07b2, 0x03ad }, /* Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */ +- { 0x07b3, 0x03ae }, /* Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */ +- { 0x07b4, 0x03af }, /* Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */ +- { 0x07b5, 0x03ca }, /* Greek_iotadieresis ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA */ +- { 0x07b6, 0x0390 }, /* Greek_iotaaccentdieresis ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */ +- { 0x07b7, 0x03cc }, /* Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */ +- { 0x07b8, 0x03cd }, /* Greek_upsilonaccent ύ GREEK SMALL LETTER UPSILON WITH TONOS */ +- { 0x07b9, 0x03cb }, /* Greek_upsilondieresis ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ +- { 0x07ba, 0x03b0 }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */ +- { 0x07bb, 0x03ce }, /* Greek_omegaaccent ώ GREEK SMALL LETTER OMEGA WITH TONOS */ +- { 0x07c1, 0x0391 }, /* Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */ +- { 0x07c2, 0x0392 }, /* Greek_BETA Β GREEK CAPITAL LETTER BETA */ +- { 0x07c3, 0x0393 }, /* Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */ +- { 0x07c4, 0x0394 }, /* Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */ +- { 0x07c5, 0x0395 }, /* Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */ +- { 0x07c6, 0x0396 }, /* Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */ +- { 0x07c7, 0x0397 }, /* Greek_ETA Η GREEK CAPITAL LETTER ETA */ +- { 0x07c8, 0x0398 }, /* Greek_THETA Θ GREEK CAPITAL LETTER THETA */ +- { 0x07c9, 0x0399 }, /* Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */ +- { 0x07ca, 0x039a }, /* Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */ +- { 0x07cb, 0x039b }, /* Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */ +- { 0x07cc, 0x039c }, /* Greek_MU Μ GREEK CAPITAL LETTER MU */ +- { 0x07cd, 0x039d }, /* Greek_NU Ν GREEK CAPITAL LETTER NU */ +- { 0x07ce, 0x039e }, /* Greek_XI Ξ GREEK CAPITAL LETTER XI */ +- { 0x07cf, 0x039f }, /* Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */ +- { 0x07d0, 0x03a0 }, /* Greek_PI Π GREEK CAPITAL LETTER PI */ +- { 0x07d1, 0x03a1 }, /* Greek_RHO Ρ GREEK CAPITAL LETTER RHO */ +- { 0x07d2, 0x03a3 }, /* Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */ +- { 0x07d4, 0x03a4 }, /* Greek_TAU Τ GREEK CAPITAL LETTER TAU */ +- { 0x07d5, 0x03a5 }, /* Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */ +- { 0x07d6, 0x03a6 }, /* Greek_PHI Φ GREEK CAPITAL LETTER PHI */ +- { 0x07d7, 0x03a7 }, /* Greek_CHI Χ GREEK CAPITAL LETTER CHI */ +- { 0x07d8, 0x03a8 }, /* Greek_PSI Ψ GREEK CAPITAL LETTER PSI */ +- { 0x07d9, 0x03a9 }, /* Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */ +- { 0x07e1, 0x03b1 }, /* Greek_alpha α GREEK SMALL LETTER ALPHA */ +- { 0x07e2, 0x03b2 }, /* Greek_beta β GREEK SMALL LETTER BETA */ +- { 0x07e3, 0x03b3 }, /* Greek_gamma γ GREEK SMALL LETTER GAMMA */ +- { 0x07e4, 0x03b4 }, /* Greek_delta δ GREEK SMALL LETTER DELTA */ +- { 0x07e5, 0x03b5 }, /* Greek_epsilon ε GREEK SMALL LETTER EPSILON */ +- { 0x07e6, 0x03b6 }, /* Greek_zeta ζ GREEK SMALL LETTER ZETA */ +- { 0x07e7, 0x03b7 }, /* Greek_eta η GREEK SMALL LETTER ETA */ +- { 0x07e8, 0x03b8 }, /* Greek_theta θ GREEK SMALL LETTER THETA */ +- { 0x07e9, 0x03b9 }, /* Greek_iota ι GREEK SMALL LETTER IOTA */ +- { 0x07ea, 0x03ba }, /* Greek_kappa κ GREEK SMALL LETTER KAPPA */ +- { 0x07eb, 0x03bb }, /* Greek_lambda λ GREEK SMALL LETTER LAMDA */ +- { 0x07ec, 0x03bc }, /* Greek_mu μ GREEK SMALL LETTER MU */ +- { 0x07ed, 0x03bd }, /* Greek_nu ν GREEK SMALL LETTER NU */ +- { 0x07ee, 0x03be }, /* Greek_xi ξ GREEK SMALL LETTER XI */ +- { 0x07ef, 0x03bf }, /* Greek_omicron ο GREEK SMALL LETTER OMICRON */ +- { 0x07f0, 0x03c0 }, /* Greek_pi π GREEK SMALL LETTER PI */ +- { 0x07f1, 0x03c1 }, /* Greek_rho ρ GREEK SMALL LETTER RHO */ +- { 0x07f2, 0x03c3 }, /* Greek_sigma σ GREEK SMALL LETTER SIGMA */ +- { 0x07f3, 0x03c2 }, /* Greek_finalsmallsigma ς GREEK SMALL LETTER FINAL SIGMA */ +- { 0x07f4, 0x03c4 }, /* Greek_tau τ GREEK SMALL LETTER TAU */ +- { 0x07f5, 0x03c5 }, /* Greek_upsilon υ GREEK SMALL LETTER UPSILON */ +- { 0x07f6, 0x03c6 }, /* Greek_phi φ GREEK SMALL LETTER PHI */ +- { 0x07f7, 0x03c7 }, /* Greek_chi χ GREEK SMALL LETTER CHI */ +- { 0x07f8, 0x03c8 }, /* Greek_psi ψ GREEK SMALL LETTER PSI */ +- { 0x07f9, 0x03c9 }, /* Greek_omega ω GREEK SMALL LETTER OMEGA */ +- { 0x08a1, 0x23b7 }, /* leftradical ⎷ ??? */ +- { 0x08a2, 0x250c }, /* topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ +- { 0x08a3, 0x2500 }, /* horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */ +- { 0x08a4, 0x2320 }, /* topintegral ⌠ TOP HALF INTEGRAL */ +- { 0x08a5, 0x2321 }, /* botintegral ⌡ BOTTOM HALF INTEGRAL */ +- { 0x08a6, 0x2502 }, /* vertconnector │ BOX DRAWINGS LIGHT VERTICAL */ +- { 0x08a7, 0x23a1 }, /* topleftsqbracket ⎡ ??? */ +- { 0x08a8, 0x23a3 }, /* botleftsqbracket ⎣ ??? */ +- { 0x08a9, 0x23a4 }, /* toprightsqbracket ⎤ ??? */ +- { 0x08aa, 0x23a6 }, /* botrightsqbracket ⎦ ??? */ +- { 0x08ab, 0x239b }, /* topleftparens ⎛ ??? */ +- { 0x08ac, 0x239d }, /* botleftparens ⎝ ??? */ +- { 0x08ad, 0x239e }, /* toprightparens ⎞ ??? */ +- { 0x08ae, 0x23a0 }, /* botrightparens ⎠ ??? */ +- { 0x08af, 0x23a8 }, /* leftmiddlecurlybrace ⎨ ??? */ +- { 0x08b0, 0x23ac }, /* rightmiddlecurlybrace ⎬ ??? */ +-/* 0x08b1 topleftsummation ? ??? */ +-/* 0x08b2 botleftsummation ? ??? */ +-/* 0x08b3 topvertsummationconnector ? ??? */ +-/* 0x08b4 botvertsummationconnector ? ??? */ +-/* 0x08b5 toprightsummation ? ??? */ +-/* 0x08b6 botrightsummation ? ??? */ +-/* 0x08b7 rightmiddlesummation ? ??? */ +- { 0x08bc, 0x2264 }, /* lessthanequal ≤ LESS-THAN OR EQUAL TO */ +- { 0x08bd, 0x2260 }, /* notequal ≠ NOT EQUAL TO */ +- { 0x08be, 0x2265 }, /* greaterthanequal ≥ GREATER-THAN OR EQUAL TO */ +- { 0x08bf, 0x222b }, /* integral ∫ INTEGRAL */ +- { 0x08c0, 0x2234 }, /* therefore ∴ THEREFORE */ +- { 0x08c1, 0x221d }, /* variation ∝ PROPORTIONAL TO */ +- { 0x08c2, 0x221e }, /* infinity ∞ INFINITY */ +- { 0x08c5, 0x2207 }, /* nabla ∇ NABLA */ +- { 0x08c8, 0x223c }, /* approximate ∼ TILDE OPERATOR */ +- { 0x08c9, 0x2243 }, /* similarequal ≃ ASYMPTOTICALLY EQUAL TO */ +- { 0x08cd, 0x21d4 }, /* ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */ +- { 0x08ce, 0x21d2 }, /* implies ⇒ RIGHTWARDS DOUBLE ARROW */ +- { 0x08cf, 0x2261 }, /* identical ≡ IDENTICAL TO */ +- { 0x08d6, 0x221a }, /* radical √ SQUARE ROOT */ +- { 0x08da, 0x2282 }, /* includedin ⊂ SUBSET OF */ +- { 0x08db, 0x2283 }, /* includes ⊃ SUPERSET OF */ +- { 0x08dc, 0x2229 }, /* intersection ∩ INTERSECTION */ +- { 0x08dd, 0x222a }, /* union ∪ UNION */ +- { 0x08de, 0x2227 }, /* logicaland ∧ LOGICAL AND */ +- { 0x08df, 0x2228 }, /* logicalor ∨ LOGICAL OR */ +- { 0x08ef, 0x2202 }, /* partialderivative ∂ PARTIAL DIFFERENTIAL */ +- { 0x08f6, 0x0192 }, /* function ƒ LATIN SMALL LETTER F WITH HOOK */ +- { 0x08fb, 0x2190 }, /* leftarrow ← LEFTWARDS ARROW */ +- { 0x08fc, 0x2191 }, /* uparrow ↑ UPWARDS ARROW */ +- { 0x08fd, 0x2192 }, /* rightarrow → RIGHTWARDS ARROW */ +- { 0x08fe, 0x2193 }, /* downarrow ↓ DOWNWARDS ARROW */ +-/* 0x09df blank ? ??? */ +- { 0x09e0, 0x25c6 }, /* soliddiamond ◆ BLACK DIAMOND */ +- { 0x09e1, 0x2592 }, /* checkerboard ▒ MEDIUM SHADE */ +- { 0x09e2, 0x2409 }, /* ht ␉ SYMBOL FOR HORIZONTAL TABULATION */ +- { 0x09e3, 0x240c }, /* ff ␌ SYMBOL FOR FORM FEED */ +- { 0x09e4, 0x240d }, /* cr ␍ SYMBOL FOR CARRIAGE RETURN */ +- { 0x09e5, 0x240a }, /* lf ␊ SYMBOL FOR LINE FEED */ +- { 0x09e8, 0x2424 }, /* nl ␤ SYMBOL FOR NEWLINE */ +- { 0x09e9, 0x240b }, /* vt ␋ SYMBOL FOR VERTICAL TABULATION */ +- { 0x09ea, 0x2518 }, /* lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */ +- { 0x09eb, 0x2510 }, /* uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */ +- { 0x09ec, 0x250c }, /* upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ +- { 0x09ed, 0x2514 }, /* lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */ +- { 0x09ee, 0x253c }, /* crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ +- { 0x09ef, 0x23ba }, /* horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */ +- { 0x09f0, 0x23bb }, /* horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */ +- { 0x09f1, 0x2500 }, /* horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */ +- { 0x09f2, 0x23bc }, /* horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */ +- { 0x09f3, 0x23bd }, /* horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */ +- { 0x09f4, 0x251c }, /* leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ +- { 0x09f5, 0x2524 }, /* rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */ +- { 0x09f6, 0x2534 }, /* bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */ +- { 0x09f7, 0x252c }, /* topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ +- { 0x09f8, 0x2502 }, /* vertbar │ BOX DRAWINGS LIGHT VERTICAL */ +- { 0x0aa1, 0x2003 }, /* emspace   EM SPACE */ +- { 0x0aa2, 0x2002 }, /* enspace   EN SPACE */ +- { 0x0aa3, 0x2004 }, /* em3space   THREE-PER-EM SPACE */ +- { 0x0aa4, 0x2005 }, /* em4space   FOUR-PER-EM SPACE */ +- { 0x0aa5, 0x2007 }, /* digitspace   FIGURE SPACE */ +- { 0x0aa6, 0x2008 }, /* punctspace   PUNCTUATION SPACE */ +- { 0x0aa7, 0x2009 }, /* thinspace   THIN SPACE */ +- { 0x0aa8, 0x200a }, /* hairspace   HAIR SPACE */ +- { 0x0aa9, 0x2014 }, /* emdash — EM DASH */ +- { 0x0aaa, 0x2013 }, /* endash – EN DASH */ +-/* 0x0aac signifblank ? ??? */ +- { 0x0aae, 0x2026 }, /* ellipsis … HORIZONTAL ELLIPSIS */ +- { 0x0aaf, 0x2025 }, /* doubbaselinedot ‥ TWO DOT LEADER */ +- { 0x0ab0, 0x2153 }, /* onethird ⅓ VULGAR FRACTION ONE THIRD */ +- { 0x0ab1, 0x2154 }, /* twothirds ⅔ VULGAR FRACTION TWO THIRDS */ +- { 0x0ab2, 0x2155 }, /* onefifth ⅕ VULGAR FRACTION ONE FIFTH */ +- { 0x0ab3, 0x2156 }, /* twofifths ⅖ VULGAR FRACTION TWO FIFTHS */ +- { 0x0ab4, 0x2157 }, /* threefifths ⅗ VULGAR FRACTION THREE FIFTHS */ +- { 0x0ab5, 0x2158 }, /* fourfifths ⅘ VULGAR FRACTION FOUR FIFTHS */ +- { 0x0ab6, 0x2159 }, /* onesixth ⅙ VULGAR FRACTION ONE SIXTH */ +- { 0x0ab7, 0x215a }, /* fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */ +- { 0x0ab8, 0x2105 }, /* careof ℅ CARE OF */ +- { 0x0abb, 0x2012 }, /* figdash ‒ FIGURE DASH */ +- { 0x0abc, 0x2329 }, /* leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */ +-/* 0x0abd decimalpoint ? ??? */ +- { 0x0abe, 0x232a }, /* rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */ +-/* 0x0abf marker ? ??? */ +- { 0x0ac3, 0x215b }, /* oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */ +- { 0x0ac4, 0x215c }, /* threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */ +- { 0x0ac5, 0x215d }, /* fiveeighths ⅝ VULGAR FRACTION FIVE EIGHTHS */ +- { 0x0ac6, 0x215e }, /* seveneighths ⅞ VULGAR FRACTION SEVEN EIGHTHS */ +- { 0x0ac9, 0x2122 }, /* trademark ™ TRADE MARK SIGN */ +- { 0x0aca, 0x2613 }, /* signaturemark ☓ SALTIRE */ +-/* 0x0acb trademarkincircle ? ??? */ +- { 0x0acc, 0x25c1 }, /* leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */ +- { 0x0acd, 0x25b7 }, /* rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */ +- { 0x0ace, 0x25cb }, /* emopencircle ○ WHITE CIRCLE */ +- { 0x0acf, 0x25af }, /* emopenrectangle ▯ WHITE VERTICAL RECTANGLE */ +- { 0x0ad0, 0x2018 }, /* leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */ +- { 0x0ad1, 0x2019 }, /* rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */ +- { 0x0ad2, 0x201c }, /* leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */ +- { 0x0ad3, 0x201d }, /* rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */ +- { 0x0ad4, 0x211e }, /* prescription ℞ PRESCRIPTION TAKE */ +- { 0x0ad6, 0x2032 }, /* minutes ′ PRIME */ +- { 0x0ad7, 0x2033 }, /* seconds ″ DOUBLE PRIME */ +- { 0x0ad9, 0x271d }, /* latincross ✝ LATIN CROSS */ +-/* 0x0ada hexagram ? ??? */ +- { 0x0adb, 0x25ac }, /* filledrectbullet ▬ BLACK RECTANGLE */ +- { 0x0adc, 0x25c0 }, /* filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */ +- { 0x0add, 0x25b6 }, /* filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */ +- { 0x0ade, 0x25cf }, /* emfilledcircle ● BLACK CIRCLE */ +- { 0x0adf, 0x25ae }, /* emfilledrect ▮ BLACK VERTICAL RECTANGLE */ +- { 0x0ae0, 0x25e6 }, /* enopencircbullet ◦ WHITE BULLET */ +- { 0x0ae1, 0x25ab }, /* enopensquarebullet ▫ WHITE SMALL SQUARE */ +- { 0x0ae2, 0x25ad }, /* openrectbullet ▭ WHITE RECTANGLE */ +- { 0x0ae3, 0x25b3 }, /* opentribulletup △ WHITE UP-POINTING TRIANGLE */ +- { 0x0ae4, 0x25bd }, /* opentribulletdown ▽ WHITE DOWN-POINTING TRIANGLE */ +- { 0x0ae5, 0x2606 }, /* openstar ☆ WHITE STAR */ +- { 0x0ae6, 0x2022 }, /* enfilledcircbullet • BULLET */ +- { 0x0ae7, 0x25aa }, /* enfilledsqbullet ▪ BLACK SMALL SQUARE */ +- { 0x0ae8, 0x25b2 }, /* filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */ +- { 0x0ae9, 0x25bc }, /* filledtribulletdown ▼ BLACK DOWN-POINTING TRIANGLE */ +- { 0x0aea, 0x261c }, /* leftpointer ☜ WHITE LEFT POINTING INDEX */ +- { 0x0aeb, 0x261e }, /* rightpointer ☞ WHITE RIGHT POINTING INDEX */ +- { 0x0aec, 0x2663 }, /* club ♣ BLACK CLUB SUIT */ +- { 0x0aed, 0x2666 }, /* diamond ♦ BLACK DIAMOND SUIT */ +- { 0x0aee, 0x2665 }, /* heart ♥ BLACK HEART SUIT */ +- { 0x0af0, 0x2720 }, /* maltesecross ✠ MALTESE CROSS */ +- { 0x0af1, 0x2020 }, /* dagger † DAGGER */ +- { 0x0af2, 0x2021 }, /* doubledagger ‡ DOUBLE DAGGER */ +- { 0x0af3, 0x2713 }, /* checkmark ✓ CHECK MARK */ +- { 0x0af4, 0x2717 }, /* ballotcross ✗ BALLOT X */ +- { 0x0af5, 0x266f }, /* musicalsharp ♯ MUSIC SHARP SIGN */ +- { 0x0af6, 0x266d }, /* musicalflat ♭ MUSIC FLAT SIGN */ +- { 0x0af7, 0x2642 }, /* malesymbol ♂ MALE SIGN */ +- { 0x0af8, 0x2640 }, /* femalesymbol ♀ FEMALE SIGN */ +- { 0x0af9, 0x260e }, /* telephone ☎ BLACK TELEPHONE */ +- { 0x0afa, 0x2315 }, /* telephonerecorder ⌕ TELEPHONE RECORDER */ +- { 0x0afb, 0x2117 }, /* phonographcopyright ℗ SOUND RECORDING COPYRIGHT */ +- { 0x0afc, 0x2038 }, /* caret ‸ CARET */ +- { 0x0afd, 0x201a }, /* singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */ +- { 0x0afe, 0x201e }, /* doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */ +-/* 0x0aff cursor ? ??? */ +- { 0x0ba3, 0x003c }, /* leftcaret < LESS-THAN SIGN */ +- { 0x0ba6, 0x003e }, /* rightcaret > GREATER-THAN SIGN */ +- { 0x0ba8, 0x2228 }, /* downcaret ∨ LOGICAL OR */ +- { 0x0ba9, 0x2227 }, /* upcaret ∧ LOGICAL AND */ +- { 0x0bc0, 0x00af }, /* overbar ¯ MACRON */ +- { 0x0bc2, 0x22a5 }, /* downtack ⊥ UP TACK */ +- { 0x0bc3, 0x2229 }, /* upshoe ∩ INTERSECTION */ +- { 0x0bc4, 0x230a }, /* downstile ⌊ LEFT FLOOR */ +- { 0x0bc6, 0x005f }, /* underbar _ LOW LINE */ +- { 0x0bca, 0x2218 }, /* jot ∘ RING OPERATOR */ +- { 0x0bcc, 0x2395 }, /* quad ⎕ APL FUNCTIONAL SYMBOL QUAD */ +- { 0x0bce, 0x22a4 }, /* uptack ⊤ DOWN TACK */ +- { 0x0bcf, 0x25cb }, /* circle ○ WHITE CIRCLE */ +- { 0x0bd3, 0x2308 }, /* upstile ⌈ LEFT CEILING */ +- { 0x0bd6, 0x222a }, /* downshoe ∪ UNION */ +- { 0x0bd8, 0x2283 }, /* rightshoe ⊃ SUPERSET OF */ +- { 0x0bda, 0x2282 }, /* leftshoe ⊂ SUBSET OF */ +- { 0x0bdc, 0x22a2 }, /* lefttack ⊢ RIGHT TACK */ +- { 0x0bfc, 0x22a3 }, /* righttack ⊣ LEFT TACK */ +- { 0x0cdf, 0x2017 }, /* hebrew_doublelowline ‗ DOUBLE LOW LINE */ +- { 0x0ce0, 0x05d0 }, /* hebrew_aleph א HEBREW LETTER ALEF */ +- { 0x0ce1, 0x05d1 }, /* hebrew_bet ב HEBREW LETTER BET */ +- { 0x0ce2, 0x05d2 }, /* hebrew_gimel ג HEBREW LETTER GIMEL */ +- { 0x0ce3, 0x05d3 }, /* hebrew_dalet ד HEBREW LETTER DALET */ +- { 0x0ce4, 0x05d4 }, /* hebrew_he ה HEBREW LETTER HE */ +- { 0x0ce5, 0x05d5 }, /* hebrew_waw ו HEBREW LETTER VAV */ +- { 0x0ce6, 0x05d6 }, /* hebrew_zain ז HEBREW LETTER ZAYIN */ +- { 0x0ce7, 0x05d7 }, /* hebrew_chet ח HEBREW LETTER HET */ +- { 0x0ce8, 0x05d8 }, /* hebrew_tet ט HEBREW LETTER TET */ +- { 0x0ce9, 0x05d9 }, /* hebrew_yod י HEBREW LETTER YOD */ +- { 0x0cea, 0x05da }, /* hebrew_finalkaph ך HEBREW LETTER FINAL KAF */ +- { 0x0ceb, 0x05db }, /* hebrew_kaph כ HEBREW LETTER KAF */ +- { 0x0cec, 0x05dc }, /* hebrew_lamed ל HEBREW LETTER LAMED */ +- { 0x0ced, 0x05dd }, /* hebrew_finalmem ם HEBREW LETTER FINAL MEM */ +- { 0x0cee, 0x05de }, /* hebrew_mem מ HEBREW LETTER MEM */ +- { 0x0cef, 0x05df }, /* hebrew_finalnun ן HEBREW LETTER FINAL NUN */ +- { 0x0cf0, 0x05e0 }, /* hebrew_nun נ HEBREW LETTER NUN */ +- { 0x0cf1, 0x05e1 }, /* hebrew_samech ס HEBREW LETTER SAMEKH */ +- { 0x0cf2, 0x05e2 }, /* hebrew_ayin ע HEBREW LETTER AYIN */ +- { 0x0cf3, 0x05e3 }, /* hebrew_finalpe ף HEBREW LETTER FINAL PE */ +- { 0x0cf4, 0x05e4 }, /* hebrew_pe פ HEBREW LETTER PE */ +- { 0x0cf5, 0x05e5 }, /* hebrew_finalzade ץ HEBREW LETTER FINAL TSADI */ +- { 0x0cf6, 0x05e6 }, /* hebrew_zade צ HEBREW LETTER TSADI */ +- { 0x0cf7, 0x05e7 }, /* hebrew_qoph ק HEBREW LETTER TQOF */ +- { 0x0cf8, 0x05e8 }, /* hebrew_resh ר HEBREW LETTER RESH */ +- { 0x0cf9, 0x05e9 }, /* hebrew_shin ש HEBREW LETTER SHIN */ +- { 0x0cfa, 0x05ea }, /* hebrew_taw ת HEBREW LETTER TAV */ +- { 0x0da1, 0x0e01 }, /* Thai_kokai ก THAI CHARACTER KO KAI */ +- { 0x0da2, 0x0e02 }, /* Thai_khokhai ข THAI CHARACTER KHO KHAI */ +- { 0x0da3, 0x0e03 }, /* Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */ +- { 0x0da4, 0x0e04 }, /* Thai_khokhwai ค THAI CHARACTER KHO KHWAI */ +- { 0x0da5, 0x0e05 }, /* Thai_khokhon ฅ THAI CHARACTER KHO KHON */ +- { 0x0da6, 0x0e06 }, /* Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */ +- { 0x0da7, 0x0e07 }, /* Thai_ngongu ง THAI CHARACTER NGO NGU */ +- { 0x0da8, 0x0e08 }, /* Thai_chochan จ THAI CHARACTER CHO CHAN */ +- { 0x0da9, 0x0e09 }, /* Thai_choching ฉ THAI CHARACTER CHO CHING */ +- { 0x0daa, 0x0e0a }, /* Thai_chochang ช THAI CHARACTER CHO CHANG */ +- { 0x0dab, 0x0e0b }, /* Thai_soso ซ THAI CHARACTER SO SO */ +- { 0x0dac, 0x0e0c }, /* Thai_chochoe ฌ THAI CHARACTER CHO CHOE */ +- { 0x0dad, 0x0e0d }, /* Thai_yoying ญ THAI CHARACTER YO YING */ +- { 0x0dae, 0x0e0e }, /* Thai_dochada ฎ THAI CHARACTER DO CHADA */ +- { 0x0daf, 0x0e0f }, /* Thai_topatak ฏ THAI CHARACTER TO PATAK */ +- { 0x0db0, 0x0e10 }, /* Thai_thothan ฐ THAI CHARACTER THO THAN */ +- { 0x0db1, 0x0e11 }, /* Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */ +- { 0x0db2, 0x0e12 }, /* Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */ +- { 0x0db3, 0x0e13 }, /* Thai_nonen ณ THAI CHARACTER NO NEN */ +- { 0x0db4, 0x0e14 }, /* Thai_dodek ด THAI CHARACTER DO DEK */ +- { 0x0db5, 0x0e15 }, /* Thai_totao ต THAI CHARACTER TO TAO */ +- { 0x0db6, 0x0e16 }, /* Thai_thothung ถ THAI CHARACTER THO THUNG */ +- { 0x0db7, 0x0e17 }, /* Thai_thothahan ท THAI CHARACTER THO THAHAN */ +- { 0x0db8, 0x0e18 }, /* Thai_thothong ธ THAI CHARACTER THO THONG */ +- { 0x0db9, 0x0e19 }, /* Thai_nonu น THAI CHARACTER NO NU */ +- { 0x0dba, 0x0e1a }, /* Thai_bobaimai บ THAI CHARACTER BO BAIMAI */ +- { 0x0dbb, 0x0e1b }, /* Thai_popla ป THAI CHARACTER PO PLA */ +- { 0x0dbc, 0x0e1c }, /* Thai_phophung ผ THAI CHARACTER PHO PHUNG */ +- { 0x0dbd, 0x0e1d }, /* Thai_fofa ฝ THAI CHARACTER FO FA */ +- { 0x0dbe, 0x0e1e }, /* Thai_phophan พ THAI CHARACTER PHO PHAN */ +- { 0x0dbf, 0x0e1f }, /* Thai_fofan ฟ THAI CHARACTER FO FAN */ +- { 0x0dc0, 0x0e20 }, /* Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */ +- { 0x0dc1, 0x0e21 }, /* Thai_moma ม THAI CHARACTER MO MA */ +- { 0x0dc2, 0x0e22 }, /* Thai_yoyak ย THAI CHARACTER YO YAK */ +- { 0x0dc3, 0x0e23 }, /* Thai_rorua ร THAI CHARACTER RO RUA */ +- { 0x0dc4, 0x0e24 }, /* Thai_ru ฤ THAI CHARACTER RU */ +- { 0x0dc5, 0x0e25 }, /* Thai_loling ล THAI CHARACTER LO LING */ +- { 0x0dc6, 0x0e26 }, /* Thai_lu ฦ THAI CHARACTER LU */ +- { 0x0dc7, 0x0e27 }, /* Thai_wowaen ว THAI CHARACTER WO WAEN */ +- { 0x0dc8, 0x0e28 }, /* Thai_sosala ศ THAI CHARACTER SO SALA */ +- { 0x0dc9, 0x0e29 }, /* Thai_sorusi ษ THAI CHARACTER SO RUSI */ +- { 0x0dca, 0x0e2a }, /* Thai_sosua ส THAI CHARACTER SO SUA */ +- { 0x0dcb, 0x0e2b }, /* Thai_hohip ห THAI CHARACTER HO HIP */ +- { 0x0dcc, 0x0e2c }, /* Thai_lochula ฬ THAI CHARACTER LO CHULA */ +- { 0x0dcd, 0x0e2d }, /* Thai_oang อ THAI CHARACTER O ANG */ +- { 0x0dce, 0x0e2e }, /* Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */ +- { 0x0dcf, 0x0e2f }, /* Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */ +- { 0x0dd0, 0x0e30 }, /* Thai_saraa ะ THAI CHARACTER SARA A */ +- { 0x0dd1, 0x0e31 }, /* Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */ +- { 0x0dd2, 0x0e32 }, /* Thai_saraaa า THAI CHARACTER SARA AA */ +- { 0x0dd3, 0x0e33 }, /* Thai_saraam ำ THAI CHARACTER SARA AM */ +- { 0x0dd4, 0x0e34 }, /* Thai_sarai ิ THAI CHARACTER SARA I */ +- { 0x0dd5, 0x0e35 }, /* Thai_saraii ี THAI CHARACTER SARA II */ +- { 0x0dd6, 0x0e36 }, /* Thai_saraue ึ THAI CHARACTER SARA UE */ +- { 0x0dd7, 0x0e37 }, /* Thai_sarauee ื THAI CHARACTER SARA UEE */ +- { 0x0dd8, 0x0e38 }, /* Thai_sarau ุ THAI CHARACTER SARA U */ +- { 0x0dd9, 0x0e39 }, /* Thai_sarauu ู THAI CHARACTER SARA UU */ +- { 0x0dda, 0x0e3a }, /* Thai_phinthu ฺ THAI CHARACTER PHINTHU */ +-/* 0x0dde Thai_maihanakat_maitho ? ??? */ +- { 0x0ddf, 0x0e3f }, /* Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */ +- { 0x0de0, 0x0e40 }, /* Thai_sarae เ THAI CHARACTER SARA E */ +- { 0x0de1, 0x0e41 }, /* Thai_saraae แ THAI CHARACTER SARA AE */ +- { 0x0de2, 0x0e42 }, /* Thai_sarao โ THAI CHARACTER SARA O */ +- { 0x0de3, 0x0e43 }, /* Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */ +- { 0x0de4, 0x0e44 }, /* Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */ +- { 0x0de5, 0x0e45 }, /* Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */ +- { 0x0de6, 0x0e46 }, /* Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */ +- { 0x0de7, 0x0e47 }, /* Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */ +- { 0x0de8, 0x0e48 }, /* Thai_maiek ่ THAI CHARACTER MAI EK */ +- { 0x0de9, 0x0e49 }, /* Thai_maitho ้ THAI CHARACTER MAI THO */ +- { 0x0dea, 0x0e4a }, /* Thai_maitri ๊ THAI CHARACTER MAI TRI */ +- { 0x0deb, 0x0e4b }, /* Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */ +- { 0x0dec, 0x0e4c }, /* Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */ +- { 0x0ded, 0x0e4d }, /* Thai_nikhahit ํ THAI CHARACTER NIKHAHIT */ +- { 0x0df0, 0x0e50 }, /* Thai_leksun ๐ THAI DIGIT ZERO */ +- { 0x0df1, 0x0e51 }, /* Thai_leknung ๑ THAI DIGIT ONE */ +- { 0x0df2, 0x0e52 }, /* Thai_leksong ๒ THAI DIGIT TWO */ +- { 0x0df3, 0x0e53 }, /* Thai_leksam ๓ THAI DIGIT THREE */ +- { 0x0df4, 0x0e54 }, /* Thai_leksi ๔ THAI DIGIT FOUR */ +- { 0x0df5, 0x0e55 }, /* Thai_lekha ๕ THAI DIGIT FIVE */ +- { 0x0df6, 0x0e56 }, /* Thai_lekhok ๖ THAI DIGIT SIX */ +- { 0x0df7, 0x0e57 }, /* Thai_lekchet ๗ THAI DIGIT SEVEN */ +- { 0x0df8, 0x0e58 }, /* Thai_lekpaet ๘ THAI DIGIT EIGHT */ +- { 0x0df9, 0x0e59 }, /* Thai_lekkao ๙ THAI DIGIT NINE */ +- { 0x0ea1, 0x3131 }, /* Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */ +- { 0x0ea2, 0x3132 }, /* Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */ +- { 0x0ea3, 0x3133 }, /* Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */ +- { 0x0ea4, 0x3134 }, /* Hangul_Nieun ㄴ HANGUL LETTER NIEUN */ +- { 0x0ea5, 0x3135 }, /* Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */ +- { 0x0ea6, 0x3136 }, /* Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */ +- { 0x0ea7, 0x3137 }, /* Hangul_Dikeud ㄷ HANGUL LETTER TIKEUT */ +- { 0x0ea8, 0x3138 }, /* Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */ +- { 0x0ea9, 0x3139 }, /* Hangul_Rieul ㄹ HANGUL LETTER RIEUL */ +- { 0x0eaa, 0x313a }, /* Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */ +- { 0x0eab, 0x313b }, /* Hangul_RieulMieum ㄻ HANGUL LETTER RIEUL-MIEUM */ +- { 0x0eac, 0x313c }, /* Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */ +- { 0x0ead, 0x313d }, /* Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */ +- { 0x0eae, 0x313e }, /* Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */ +- { 0x0eaf, 0x313f }, /* Hangul_RieulPhieuf ㄿ HANGUL LETTER RIEUL-PHIEUPH */ +- { 0x0eb0, 0x3140 }, /* Hangul_RieulHieuh ㅀ HANGUL LETTER RIEUL-HIEUH */ +- { 0x0eb1, 0x3141 }, /* Hangul_Mieum ㅁ HANGUL LETTER MIEUM */ +- { 0x0eb2, 0x3142 }, /* Hangul_Pieub ㅂ HANGUL LETTER PIEUP */ +- { 0x0eb3, 0x3143 }, /* Hangul_SsangPieub ㅃ HANGUL LETTER SSANGPIEUP */ +- { 0x0eb4, 0x3144 }, /* Hangul_PieubSios ㅄ HANGUL LETTER PIEUP-SIOS */ +- { 0x0eb5, 0x3145 }, /* Hangul_Sios ㅅ HANGUL LETTER SIOS */ +- { 0x0eb6, 0x3146 }, /* Hangul_SsangSios ㅆ HANGUL LETTER SSANGSIOS */ +- { 0x0eb7, 0x3147 }, /* Hangul_Ieung ㅇ HANGUL LETTER IEUNG */ +- { 0x0eb8, 0x3148 }, /* Hangul_Jieuj ㅈ HANGUL LETTER CIEUC */ +- { 0x0eb9, 0x3149 }, /* Hangul_SsangJieuj ㅉ HANGUL LETTER SSANGCIEUC */ +- { 0x0eba, 0x314a }, /* Hangul_Cieuc ㅊ HANGUL LETTER CHIEUCH */ +- { 0x0ebb, 0x314b }, /* Hangul_Khieuq ㅋ HANGUL LETTER KHIEUKH */ +- { 0x0ebc, 0x314c }, /* Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */ +- { 0x0ebd, 0x314d }, /* Hangul_Phieuf ㅍ HANGUL LETTER PHIEUPH */ +- { 0x0ebe, 0x314e }, /* Hangul_Hieuh ㅎ HANGUL LETTER HIEUH */ +- { 0x0ebf, 0x314f }, /* Hangul_A ㅏ HANGUL LETTER A */ +- { 0x0ec0, 0x3150 }, /* Hangul_AE ㅐ HANGUL LETTER AE */ +- { 0x0ec1, 0x3151 }, /* Hangul_YA ㅑ HANGUL LETTER YA */ +- { 0x0ec2, 0x3152 }, /* Hangul_YAE ㅒ HANGUL LETTER YAE */ +- { 0x0ec3, 0x3153 }, /* Hangul_EO ㅓ HANGUL LETTER EO */ +- { 0x0ec4, 0x3154 }, /* Hangul_E ㅔ HANGUL LETTER E */ +- { 0x0ec5, 0x3155 }, /* Hangul_YEO ㅕ HANGUL LETTER YEO */ +- { 0x0ec6, 0x3156 }, /* Hangul_YE ㅖ HANGUL LETTER YE */ +- { 0x0ec7, 0x3157 }, /* Hangul_O ㅗ HANGUL LETTER O */ +- { 0x0ec8, 0x3158 }, /* Hangul_WA ㅘ HANGUL LETTER WA */ +- { 0x0ec9, 0x3159 }, /* Hangul_WAE ㅙ HANGUL LETTER WAE */ +- { 0x0eca, 0x315a }, /* Hangul_OE ㅚ HANGUL LETTER OE */ +- { 0x0ecb, 0x315b }, /* Hangul_YO ㅛ HANGUL LETTER YO */ +- { 0x0ecc, 0x315c }, /* Hangul_U ㅜ HANGUL LETTER U */ +- { 0x0ecd, 0x315d }, /* Hangul_WEO ㅝ HANGUL LETTER WEO */ +- { 0x0ece, 0x315e }, /* Hangul_WE ㅞ HANGUL LETTER WE */ +- { 0x0ecf, 0x315f }, /* Hangul_WI ㅟ HANGUL LETTER WI */ +- { 0x0ed0, 0x3160 }, /* Hangul_YU ㅠ HANGUL LETTER YU */ +- { 0x0ed1, 0x3161 }, /* Hangul_EU ㅡ HANGUL LETTER EU */ +- { 0x0ed2, 0x3162 }, /* Hangul_YI ㅢ HANGUL LETTER YI */ +- { 0x0ed3, 0x3163 }, /* Hangul_I ㅣ HANGUL LETTER I */ +- { 0x0ed4, 0x11a8 }, /* Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */ +- { 0x0ed5, 0x11a9 }, /* Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */ +- { 0x0ed6, 0x11aa }, /* Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */ +- { 0x0ed7, 0x11ab }, /* Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */ +- { 0x0ed8, 0x11ac }, /* Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */ +- { 0x0ed9, 0x11ad }, /* Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */ +- { 0x0eda, 0x11ae }, /* Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */ +- { 0x0edb, 0x11af }, /* Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */ +- { 0x0edc, 0x11b0 }, /* Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */ +- { 0x0edd, 0x11b1 }, /* Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */ +- { 0x0ede, 0x11b2 }, /* Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */ +- { 0x0edf, 0x11b3 }, /* Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */ +- { 0x0ee0, 0x11b4 }, /* Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */ +- { 0x0ee1, 0x11b5 }, /* Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */ +- { 0x0ee2, 0x11b6 }, /* Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */ +- { 0x0ee3, 0x11b7 }, /* Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */ +- { 0x0ee4, 0x11b8 }, /* Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */ +- { 0x0ee5, 0x11b9 }, /* Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */ +- { 0x0ee6, 0x11ba }, /* Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */ +- { 0x0ee7, 0x11bb }, /* Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */ +- { 0x0ee8, 0x11bc }, /* Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */ +- { 0x0ee9, 0x11bd }, /* Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */ +- { 0x0eea, 0x11be }, /* Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */ +- { 0x0eeb, 0x11bf }, /* Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */ +- { 0x0eec, 0x11c0 }, /* Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */ +- { 0x0eed, 0x11c1 }, /* Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */ +- { 0x0eee, 0x11c2 }, /* Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */ +- { 0x0eef, 0x316d }, /* Hangul_RieulYeorinHieuh ㅭ HANGUL LETTER RIEUL-YEORINHIEUH */ +- { 0x0ef0, 0x3171 }, /* Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */ +- { 0x0ef1, 0x3178 }, /* Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */ +- { 0x0ef2, 0x317f }, /* Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */ +- { 0x0ef3, 0x3181 }, /* Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */ +- { 0x0ef4, 0x3184 }, /* Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */ +- { 0x0ef5, 0x3186 }, /* Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */ +- { 0x0ef6, 0x318d }, /* Hangul_AraeA ㆍ HANGUL LETTER ARAEA */ +- { 0x0ef7, 0x318e }, /* Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */ +- { 0x0ef8, 0x11eb }, /* Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */ +- { 0x0ef9, 0x11f0 }, /* Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */ +- { 0x0efa, 0x11f9 }, /* Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */ +- { 0x0eff, 0x20a9 }, /* Korean_Won ₩ WON SIGN */ +- { 0x13a4, 0x20ac }, /* Euro € EURO SIGN */ +- { 0x13bc, 0x0152 }, /* OE Œ LATIN CAPITAL LIGATURE OE */ +- { 0x13bd, 0x0153 }, /* oe œ LATIN SMALL LIGATURE OE */ +- { 0x13be, 0x0178 }, /* Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */ +- { 0x20ac, 0x20ac }, /* EuroSign € EURO SIGN */ +-}; +- +-long MainWidget::keysym2ucs(KeySym keysym) +-{ +- int min = 0; +- int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; +- int mid; +- +- /* first check for Latin-1 characters (1:1 mapping) */ +- if ((keysym >= 0x0020 && keysym <= 0x007e) || +- (keysym >= 0x00a0 && keysym <= 0x00ff)) +- return keysym; +- +- /* also check for directly encoded 24-bit UCS characters */ +- if ((keysym & 0xff000000) == 0x01000000) +- return keysym & 0x00ffffff; +- +- /* binary search in table */ +- while (max >= min) { +- mid = (min + max) / 2; +- if (keysymtab[mid].keysym < keysym) +- min = mid + 1; +- else if (keysymtab[mid].keysym > keysym) +- max = mid - 1; +- else { +- /* found it */ +- return keysymtab[mid].ucs; +- } +- } +- +- /* no matching Unicode value found */ +- return -1; +@@ -1809 +989 @@ +- ++ TQToolTip::add ( this, i18n ("Virtual keyboard") ); +@@ -1810,0 +991 @@ ++ +@@ -1830,10 +1010,0 @@ +- +- +- +- +- +- +- +- +- +- +--- src/MainWidget.h ++++ src/MainWidget.h +@@ -53,2 +52,0 @@ +- +- void toggleCaps(); +@@ -56,3 +54,4 @@ +- +- void toggleShift(); +- ++ void toggleShiftCapsAltGr(unsigned int keycode); ++ void toggleNumericPad(); ++ void toggleFontAutoRes(); ++ void toggleLock(); +@@ -61,2 +59,0 @@ +- +- void quitClicked(); +@@ -64,2 +61,2 @@ +- void toggleNumericPad(); +- void toggleFontAutoRes(); ++ void chooseBackgroundColor(); ++ void chooseKeysColor(); +@@ -68 +64,0 @@ +-// void shutDown(); +@@ -69,0 +66 @@ ++ void quitClicked(); +@@ -73,2 +70,2 @@ +- void hideEvent ( TQHideEvent *e ); +- ++ void hideEvent(TQHideEvent *e); ++ void setLockState(bool lock); +@@ -77,0 +75,2 @@ ++ void updateNumlock(); ++ void updateShiftCapsAltGr(); +@@ -83 +81,0 @@ +- void setupText(VButton &v); +@@ -87,2 +85,2 @@ +- VButton *lshft; +- VButton *rshft; ++ VButton *lshift; ++ VButton *rshift; +@@ -96 +94,2 @@ +- VButton *win; ++ VButton *lwin; ++ VButton *rwin; +@@ -114 +113 @@ +- void send_key(unsigned int keycode, bool press, bool release); ++ void send_key(unsigned int keycode); +@@ -121,2 +119,0 @@ +- long keysym2ucs(KeySym keysym); +- +@@ -131 +128 @@ +- ++ int mnu_lock; +--- src/VButton.cpp ++++ src/VButton.cpp +@@ -3,0 +4,4 @@ ++#include ++#include ++#include "Xutils.h" ++#include +@@ -5 +9,2 @@ +-double VButton::pw=550.0; ++ ++double VButton::pw=552.0; +@@ -10,2 +15,3 @@ +- +- //connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(sendKey())); ++ TDEConfig *cfg = TDEApplication::kApplication()->config(); ++ TQString keysC = cfg->readEntry("keysColor", "#f0f0f0"); ++ setColor(TQColor(keysC)); +@@ -15 +20,0 @@ +- +@@ -16,0 +22 @@ ++ +@@ -19 +24,0 @@ +- +@@ -21 +26,2 @@ +-void VButton::shiftPressed(bool press) ++ ++void VButton::setupTexts(Display *display) +@@ -23,9 +29,41 @@ +- if (press==true){ +- TQString tu=l.upper(); +- if (tu.compare(l)==0){ +- //TQPushButton::setText(tu); +- TQPushButton::setText(u); +- } +- else{ +- TQPushButton::setText(tu); +- } ++ // normal text ++ KeySym keysym_c = XkbKeycodeToKeysym(display, keycode, 0, 0); ++ TQChar nc((uint)keysym2ucs(keysym_c)); ++ if (nc == '&') ++ { ++ setText("&&"); ++ } ++ else ++ { ++ setText(nc); ++ } ++ ++ // shift text ++ keysym_c = XkbKeycodeToKeysym(display, keycode, 0, 1); ++ TQChar sc = (uint)keysym2ucs(keysym_c); ++ if (sc == '&') ++ { ++ setShiftText("&&"); ++ } ++ else ++ { ++ setShiftText(sc); ++ } ++ ++ // altGr text ++ keysym_c = XkbKeycodeToKeysym(display, keycode, 0, 2); ++ TQChar c = (uint)keysym2ucs(keysym_c); ++ if (c == " ") ++ { ++ // use normal text in case altGr does not provide extra characters. ++ // This is required at least on US keyboards, where altGr works as Alt. ++ c = nc; ++ } ++ if (c == '&') ++ { ++ altGrText = "&&"; ++ } ++ else ++ { ++ altGrText = c; ++ } +@@ -32,0 +71,12 @@ ++ // altGr + shift text ++ keysym_c = XkbKeycodeToKeysym(display, keycode, 0, 3); ++ c = (uint)keysym2ucs(keysym_c); ++ if (c == " ") ++ { ++ // use shift text in case altGr does not provide extra characters. ++ // This is required at least on US keyboards, where altGr works as Alt. ++ c = sc; ++ } ++ if (c == '&') ++ { ++ altGrShiftText = "&&"; +@@ -34,2 +84,3 @@ +- else{ +- TQPushButton::setText(l); ++ else ++ { ++ altGrShiftText = c; +@@ -38 +89,2 @@ +-void VButton::capsPressed(bool press) ++ ++void VButton::shiftCapsAltGrPressed(bool shift, bool caps, bool altGrState) +@@ -40,4 +92,6 @@ +- if (press==true){ +- TQString tu=l.upper(); +- if (tu.compare(l)==0){ +- TQPushButton::setText(tu); ++ if (altGrState) ++ { ++ // Caps does not seem to make any difference when AltGr is pressed ++ if (shift) ++ { ++ TQPushButton::setText(altGrShiftText); +@@ -45,2 +99,3 @@ +- else{ +- TQPushButton::setText(u); ++ else ++ { ++ TQPushButton::setText(altGrText); +@@ -49,2 +104,34 @@ +- else{ +- TQPushButton::setText(l); ++ else ++ { ++ if (isAlpha) ++ { ++ // Alpha button, both shift and caps affect its state ++ if (caps && shift) ++ { ++ TQPushButton::setText(capsShiftText); ++ } ++ else if (caps) ++ { ++ TQPushButton::setText(capsText); ++ } ++ else if (shift) ++ { ++ TQPushButton::setText(shiftText); ++ } ++ else ++ { ++ TQPushButton::setText(normalText); ++ } ++ } ++ else ++ { ++ // Non alpha button, only shift affects its state ++ if (shift) ++ { ++ TQPushButton::setText(shiftText); ++ } ++ else ++ { ++ TQPushButton::setText(normalText); ++ } ++ } +@@ -55,0 +143,2 @@ ++ // Need to set the pushbutton text to correctly handle those buttons which usually ++ // don't change (tab, shift, caps, Fn, ...) +@@ -57 +146,3 @@ +- l=text; ++ normalText = text; ++ capsText = text.upper(); ++ isAlpha = text.length() == 1 && capsText != normalText; +@@ -58,0 +150 @@ ++ +@@ -61 +153,24 @@ +- u=text; ++ shiftText = text; ++ // 'text' is normally uppercase here, so in most cases we need to set capsShiftText ++ // to text.lower() to handle caps+shift correctly. Special cases like ç and Ç are ++ // handled by using text.upper() ++ if (text.lower() != text) ++ { ++ capsShiftText = text.lower(); ++ } ++ else ++ { ++ capsShiftText = text.upper(); ++ } ++} ++ ++void VButton::setColor(const TQColor &color) ++{ ++ setPaletteBackgroundColor(color); ++ // Need to set TQColorGroup::Button color as well, otherwise the actual ++ // color of the key does not change until the next restart of the application. ++ TQPalette plt = palette(); ++ plt.setColor(TQPalette::Active, TQColorGroup::Button, color); ++ plt.setColor(TQPalette::Inactive, TQColorGroup::Button, color); ++ plt.setColor(TQPalette::Disabled, TQColorGroup::Button, color); ++ setPalette(plt); +@@ -67 +181,0 @@ +- +@@ -68,0 +183 @@ ++ +@@ -72,0 +188 @@ ++ +@@ -86 +201,0 @@ +- +@@ -87,0 +203 @@ ++ +@@ -93 +209,13 @@ +-void VButton::mousePressEvent(TQMouseEvent * e) ++void VButton::enterEvent(TQEvent *e) ++{ ++ TQPushButton::enterEvent(e); ++ inside = true; ++} ++ ++void VButton::leaveEvent(TQEvent *e) ++{ ++ TQPushButton::leaveEvent(e); ++ inside = false; ++} ++ ++void VButton::mousePressEvent(TQMouseEvent *e) +@@ -97,2 +225,6 @@ +- sendKey(); +- startTimer(500); ++ if (!isToggleButton()) ++ { ++ // non toggle buttons need to send the key here ++ sendKey(); ++ startTimer(500); ++ } +@@ -101 +233 @@ +-void VButton::mouseReleaseEvent(TQMouseEvent * e) ++void VButton::mouseReleaseEvent(TQMouseEvent *e) +@@ -105 +237,7 @@ +- TQT_TQOBJECT(this)->killTimers(); ++ if (hitButton(e->pos()) && isToggleButton()) ++ { ++ // toggle buttons need to send the key here because the underlying pushbutton state ++ // is only updated on mouse release ++ sendKey(); ++ } ++ killTimers(); +@@ -111 +249,2 @@ +- if (!press){ ++ if (!press) ++ { +@@ -115 +254,2 @@ +- if (press && !inrpt) { ++ if (press && !inrpt) ++ { +@@ -120 +260,5 @@ +- sendKey(); ++ if (inside) ++ { ++ // Send key only if the mouse is still inside the button rectangle ++ sendKey(); ++ } +--- src/VButton.h ++++ src/VButton.h +@@ -14 +14 @@ +- void setKeyCode(unsigned int keycode); ++ +@@ -16,5 +16,6 @@ +- void setText(const TQString& text); +- void setShiftText(const TQString& text); +- void capsPressed(bool press); +- +- ++ void setKeyCode(unsigned int keycode); ++ void setText(const TQString &text); ++ void setShiftText(const TQString &text); ++ void setColor(const TQColor &color); ++ void setupTexts(Display *display); ++ +@@ -22,0 +24 @@ ++ +@@ -26 +28 @@ +-private: ++protected: +@@ -29,2 +31,2 @@ +- +-protected: ++ bool inside; ++ bool isAlpha; +@@ -32,2 +34,6 @@ +- TQString u; +- TQString l; ++ TQString normalText; ++ TQString capsText; ++ TQString shiftText; ++ TQString altGrText; ++ TQString capsShiftText; ++ TQString altGrShiftText; +@@ -35 +41,2 @@ +- void timerEvent ( TQTimerEvent * ); ++ ++ void timerEvent ( TQTimerEvent * ); +@@ -39 +46 @@ +- void shiftPressed(bool press); ++ void shiftCapsAltGrPressed(bool shift, bool caps, bool altGrState); +@@ -41,0 +49,2 @@ ++ void enterEvent(TQEvent *e); ++ void leaveEvent(TQEvent *e); +@@ -47 +55,0 @@ +- +--- /dev/null ++++ src/Xutils.cpp 2021-04-02 13:11:26.000000000 +0100 +@@ -0,0 +1,916 @@ ++/* $XFree86$ ++ * This module converts keysym values into the corresponding ISO 10646 ++ * (UCS, Unicode) values. ++ * ++ * The array keysymtab[] contains pairs of X11 keysym values for graphical ++ * characters and the corresponding Unicode value. The function ++ * keysym2ucs() maps a keysym onto a Unicode value using a binary search, ++ * therefore keysymtab[] must remain SORTED by keysym value. ++ * ++ * The keysym -> UTF-8 conversion will hopefully one day be provided ++ * by Xlib via XmbLookupString() and should ideally not have to be ++ * done in X applications. But we are not there yet. ++ * ++ * We allow to represent any UCS character in the range U-00000000 to ++ * U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff. ++ * This admittedly does not cover the entire 31-bit space of UCS, but ++ * it does cover all of the characters up to U-10FFFF, which can be ++ * represented by UTF-16, and more, and it is very unlikely that higher ++ * UCS codes will ever be assigned by ISO. So to get Unicode character ++ * U+ABCD you can directly use keysym 0x0100abcd. ++ * ++ * NOTE: The comments in the table below contain the actual character ++ * encoded in UTF-8, so for viewing and editing best use an editor in ++ * UTF-8 mode. ++ * ++ * Author: Markus G. Kuhn , ++ * University of Cambridge, April 2001 ++ * ++ * Special thanks to Richard Verhoeven for preparing ++ * an initial draft of the mapping table. ++ * ++ * This software is in the public domain. Share and enjoy! ++ */ ++ ++#include "Xutils.h" ++ ++struct codepair { ++ KeySym keysym; ++ long ucs; ++} keysymtab[] = { ++ { 0x00000000L, 0x0020 }, /* NoSymbol -> <- space */ ++ { 0x000001a1L, 0x0104 }, /* Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */ ++ { 0x000001a2L, 0x02d8 }, /* breve ˘ BREVE */ ++ { 0x000001a3L, 0x0141 }, /* Lstroke Ł LATIN CAPITAL LETTER L WITH STROKE */ ++ { 0x000001a5L, 0x013d }, /* Lcaron Ľ LATIN CAPITAL LETTER L WITH CARON */ ++ { 0x000001a6L, 0x015a }, /* Sacute Ś LATIN CAPITAL LETTER S WITH ACUTE */ ++ { 0x000001a9L, 0x0160 }, /* Scaron Š LATIN CAPITAL LETTER S WITH CARON */ ++ { 0x000001aaL, 0x015e }, /* Scedilla Ş LATIN CAPITAL LETTER S WITH CEDILLA */ ++ { 0x000001abL, 0x0164 }, /* Tcaron Ť LATIN CAPITAL LETTER T WITH CARON */ ++ { 0x000001acL, 0x0179 }, /* Zacute Ź LATIN CAPITAL LETTER Z WITH ACUTE */ ++ { 0x000001aeL, 0x017d }, /* Zcaron Ž LATIN CAPITAL LETTER Z WITH CARON */ ++ { 0x000001afL, 0x017b }, /* Zabovedot Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE */ ++ { 0x000001b1L, 0x0105 }, /* aogonek ą LATIN SMALL LETTER A WITH OGONEK */ ++ { 0x000001b2L, 0x02db }, /* ogonek ˛ OGONEK */ ++ { 0x000001b3L, 0x0142 }, /* lstroke ł LATIN SMALL LETTER L WITH STROKE */ ++ { 0x000001b5L, 0x013e }, /* lcaron ľ LATIN SMALL LETTER L WITH CARON */ ++ { 0x000001b6L, 0x015b }, /* sacute ś LATIN SMALL LETTER S WITH ACUTE */ ++ { 0x000001b7L, 0x02c7 }, /* caron ˇ CARON */ ++ { 0x000001b9L, 0x0161 }, /* scaron š LATIN SMALL LETTER S WITH CARON */ ++ { 0x000001baL, 0x015f }, /* scedilla ş LATIN SMALL LETTER S WITH CEDILLA */ ++ { 0x000001bbL, 0x0165 }, /* tcaron ť LATIN SMALL LETTER T WITH CARON */ ++ { 0x000001bcL, 0x017a }, /* zacute ź LATIN SMALL LETTER Z WITH ACUTE */ ++ { 0x000001bdL, 0x02dd }, /* doubleacute ˝ DOUBLE ACUTE ACCENT */ ++ { 0x000001beL, 0x017e }, /* zcaron ž LATIN SMALL LETTER Z WITH CARON */ ++ { 0x000001bfL, 0x017c }, /* zabovedot ż LATIN SMALL LETTER Z WITH DOT ABOVE */ ++ { 0x000001c0L, 0x0154 }, /* Racute Ŕ LATIN CAPITAL LETTER R WITH ACUTE */ ++ { 0x000001c3L, 0x0102 }, /* Abreve Ă LATIN CAPITAL LETTER A WITH BREVE */ ++ { 0x000001c5L, 0x0139 }, /* Lacute Ĺ LATIN CAPITAL LETTER L WITH ACUTE */ ++ { 0x000001c6L, 0x0106 }, /* Cacute Ć LATIN CAPITAL LETTER C WITH ACUTE */ ++ { 0x000001c8L, 0x010c }, /* Ccaron Č LATIN CAPITAL LETTER C WITH CARON */ ++ { 0x000001caL, 0x0118 }, /* Eogonek Ę LATIN CAPITAL LETTER E WITH OGONEK */ ++ { 0x000001ccL, 0x011a }, /* Ecaron Ě LATIN CAPITAL LETTER E WITH CARON */ ++ { 0x000001cfL, 0x010e }, /* Dcaron Ď LATIN CAPITAL LETTER D WITH CARON */ ++ { 0x000001d0L, 0x0110 }, /* Dstroke Đ LATIN CAPITAL LETTER D WITH STROKE */ ++ { 0x000001d1L, 0x0143 }, /* Nacute Ń LATIN CAPITAL LETTER N WITH ACUTE */ ++ { 0x000001d2L, 0x0147 }, /* Ncaron Ň LATIN CAPITAL LETTER N WITH CARON */ ++ { 0x000001d5L, 0x0150 }, /* Odoubleacute Ő LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ ++ { 0x000001d8L, 0x0158 }, /* Rcaron Ř LATIN CAPITAL LETTER R WITH CARON */ ++ { 0x000001d9L, 0x016e }, /* Uring Ů LATIN CAPITAL LETTER U WITH RING ABOVE */ ++ { 0x000001dbL, 0x0170 }, /* Udoubleacute Ű LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ ++ { 0x000001deL, 0x0162 }, /* Tcedilla Ţ LATIN CAPITAL LETTER T WITH CEDILLA */ ++ { 0x000001e0L, 0x0155 }, /* racute ŕ LATIN SMALL LETTER R WITH ACUTE */ ++ { 0x000001e3L, 0x0103 }, /* abreve ă LATIN SMALL LETTER A WITH BREVE */ ++ { 0x000001e5L, 0x013a }, /* lacute ĺ LATIN SMALL LETTER L WITH ACUTE */ ++ { 0x000001e6L, 0x0107 }, /* cacute ć LATIN SMALL LETTER C WITH ACUTE */ ++ { 0x000001e8L, 0x010d }, /* ccaron č LATIN SMALL LETTER C WITH CARON */ ++ { 0x000001eaL, 0x0119 }, /* eogonek ę LATIN SMALL LETTER E WITH OGONEK */ ++ { 0x000001ecL, 0x011b }, /* ecaron ě LATIN SMALL LETTER E WITH CARON */ ++ { 0x000001efL, 0x010f }, /* dcaron ď LATIN SMALL LETTER D WITH CARON */ ++ { 0x000001f0L, 0x0111 }, /* dstroke đ LATIN SMALL LETTER D WITH STROKE */ ++ { 0x000001f1L, 0x0144 }, /* nacute ń LATIN SMALL LETTER N WITH ACUTE */ ++ { 0x000001f2L, 0x0148 }, /* ncaron ň LATIN SMALL LETTER N WITH CARON */ ++ { 0x000001f5L, 0x0151 }, /* odoubleacute ő LATIN SMALL LETTER O WITH DOUBLE ACUTE */ ++ { 0x000001f8L, 0x0159 }, /* rcaron ř LATIN SMALL LETTER R WITH CARON */ ++ { 0x000001f9L, 0x016f }, /* uring ů LATIN SMALL LETTER U WITH RING ABOVE */ ++ { 0x000001fbL, 0x0171 }, /* udoubleacute ű LATIN SMALL LETTER U WITH DOUBLE ACUTE */ ++ { 0x000001feL, 0x0163 }, /* tcedilla ţ LATIN SMALL LETTER T WITH CEDILLA */ ++ { 0x000001ffL, 0x02d9 }, /* abovedot ˙ DOT ABOVE */ ++ { 0x000002a1L, 0x0126 }, /* Hstroke Ħ LATIN CAPITAL LETTER H WITH STROKE */ ++ { 0x000002a6L, 0x0124 }, /* Hcircumflex Ĥ LATIN CAPITAL LETTER H WITH CIRCUMFLEX */ ++ { 0x000002a9L, 0x0130 }, /* Iabovedot İ LATIN CAPITAL LETTER I WITH DOT ABOVE */ ++ { 0x000002abL, 0x011e }, /* Gbreve Ğ LATIN CAPITAL LETTER G WITH BREVE */ ++ { 0x000002acL, 0x0134 }, /* Jcircumflex Ĵ LATIN CAPITAL LETTER J WITH CIRCUMFLEX */ ++ { 0x000002b1L, 0x0127 }, /* hstroke ħ LATIN SMALL LETTER H WITH STROKE */ ++ { 0x000002b6L, 0x0125 }, /* hcircumflex ĥ LATIN SMALL LETTER H WITH CIRCUMFLEX */ ++ { 0x000002b9L, 0x0131 }, /* idotless ı LATIN SMALL LETTER DOTLESS I */ ++ { 0x000002bbL, 0x011f }, /* gbreve ğ LATIN SMALL LETTER G WITH BREVE */ ++ { 0x000002bcL, 0x0135 }, /* jcircumflex ĵ LATIN SMALL LETTER J WITH CIRCUMFLEX */ ++ { 0x000002c5L, 0x010a }, /* Cabovedot Ċ LATIN CAPITAL LETTER C WITH DOT ABOVE */ ++ { 0x000002c6L, 0x0108 }, /* Ccircumflex Ĉ LATIN CAPITAL LETTER C WITH CIRCUMFLEX */ ++ { 0x000002d5L, 0x0120 }, /* Gabovedot Ġ LATIN CAPITAL LETTER G WITH DOT ABOVE */ ++ { 0x000002d8L, 0x011c }, /* Gcircumflex Ĝ LATIN CAPITAL LETTER G WITH CIRCUMFLEX */ ++ { 0x000002ddL, 0x016c }, /* Ubreve Ŭ LATIN CAPITAL LETTER U WITH BREVE */ ++ { 0x000002deL, 0x015c }, /* Scircumflex Ŝ LATIN CAPITAL LETTER S WITH CIRCUMFLEX */ ++ { 0x000002e5L, 0x010b }, /* cabovedot ċ LATIN SMALL LETTER C WITH DOT ABOVE */ ++ { 0x000002e6L, 0x0109 }, /* ccircumflex ĉ LATIN SMALL LETTER C WITH CIRCUMFLEX */ ++ { 0x000002f5L, 0x0121 }, /* gabovedot ġ LATIN SMALL LETTER G WITH DOT ABOVE */ ++ { 0x000002f8L, 0x011d }, /* gcircumflex ĝ LATIN SMALL LETTER G WITH CIRCUMFLEX */ ++ { 0x000002fdL, 0x016d }, /* ubreve ŭ LATIN SMALL LETTER U WITH BREVE */ ++ { 0x000002feL, 0x015d }, /* scircumflex ŝ LATIN SMALL LETTER S WITH CIRCUMFLEX */ ++ { 0x000003a2L, 0x0138 }, /* kra ĸ LATIN SMALL LETTER KRA */ ++ { 0x000003a3L, 0x0156 }, /* Rcedilla Ŗ LATIN CAPITAL LETTER R WITH CEDILLA */ ++ { 0x000003a5L, 0x0128 }, /* Itilde Ĩ LATIN CAPITAL LETTER I WITH TILDE */ ++ { 0x000003a6L, 0x013b }, /* Lcedilla Ļ LATIN CAPITAL LETTER L WITH CEDILLA */ ++ { 0x000003aaL, 0x0112 }, /* Emacron Ē LATIN CAPITAL LETTER E WITH MACRON */ ++ { 0x000003abL, 0x0122 }, /* Gcedilla Ģ LATIN CAPITAL LETTER G WITH CEDILLA */ ++ { 0x000003acL, 0x0166 }, /* Tslash Ŧ LATIN CAPITAL LETTER T WITH STROKE */ ++ { 0x000003b3L, 0x0157 }, /* rcedilla ŗ LATIN SMALL LETTER R WITH CEDILLA */ ++ { 0x000003b5L, 0x0129 }, /* itilde ĩ LATIN SMALL LETTER I WITH TILDE */ ++ { 0x000003b6L, 0x013c }, /* lcedilla ļ LATIN SMALL LETTER L WITH CEDILLA */ ++ { 0x000003baL, 0x0113 }, /* emacron ē LATIN SMALL LETTER E WITH MACRON */ ++ { 0x000003bbL, 0x0123 }, /* gcedilla ģ LATIN SMALL LETTER G WITH CEDILLA */ ++ { 0x000003bcL, 0x0167 }, /* tslash ŧ LATIN SMALL LETTER T WITH STROKE */ ++ { 0x000003bdL, 0x014a }, /* ENG Ŋ LATIN CAPITAL LETTER ENG */ ++ { 0x000003bfL, 0x014b }, /* eng ŋ LATIN SMALL LETTER ENG */ ++ { 0x000003c0L, 0x0100 }, /* Amacron Ā LATIN CAPITAL LETTER A WITH MACRON */ ++ { 0x000003c7L, 0x012e }, /* Iogonek Į LATIN CAPITAL LETTER I WITH OGONEK */ ++ { 0x000003ccL, 0x0116 }, /* Eabovedot Ė LATIN CAPITAL LETTER E WITH DOT ABOVE */ ++ { 0x000003cfL, 0x012a }, /* Imacron Ī LATIN CAPITAL LETTER I WITH MACRON */ ++ { 0x000003d1L, 0x0145 }, /* Ncedilla Ņ LATIN CAPITAL LETTER N WITH CEDILLA */ ++ { 0x000003d2L, 0x014c }, /* Omacron Ō LATIN CAPITAL LETTER O WITH MACRON */ ++ { 0x000003d3L, 0x0136 }, /* Kcedilla Ķ LATIN CAPITAL LETTER K WITH CEDILLA */ ++ { 0x000003d9L, 0x0172 }, /* Uogonek Ų LATIN CAPITAL LETTER U WITH OGONEK */ ++ { 0x000003ddL, 0x0168 }, /* Utilde Ũ LATIN CAPITAL LETTER U WITH TILDE */ ++ { 0x000003deL, 0x016a }, /* Umacron Ū LATIN CAPITAL LETTER U WITH MACRON */ ++ { 0x000003e0L, 0x0101 }, /* amacron ā LATIN SMALL LETTER A WITH MACRON */ ++ { 0x000003e7L, 0x012f }, /* iogonek į LATIN SMALL LETTER I WITH OGONEK */ ++ { 0x000003ecL, 0x0117 }, /* eabovedot ė LATIN SMALL LETTER E WITH DOT ABOVE */ ++ { 0x000003efL, 0x012b }, /* imacron ī LATIN SMALL LETTER I WITH MACRON */ ++ { 0x000003f1L, 0x0146 }, /* ncedilla ņ LATIN SMALL LETTER N WITH CEDILLA */ ++ { 0x000003f2L, 0x014d }, /* omacron ō LATIN SMALL LETTER O WITH MACRON */ ++ { 0x000003f3L, 0x0137 }, /* kcedilla ķ LATIN SMALL LETTER K WITH CEDILLA */ ++ { 0x000003f9L, 0x0173 }, /* uogonek ų LATIN SMALL LETTER U WITH OGONEK */ ++ { 0x000003fdL, 0x0169 }, /* utilde ũ LATIN SMALL LETTER U WITH TILDE */ ++ { 0x000003feL, 0x016b }, /* umacron ū LATIN SMALL LETTER U WITH MACRON */ ++ { 0x0000047eL, 0x203e }, /* overline ‾ OVERLINE */ ++ { 0x000004a1L, 0x3002 }, /* kana_fullstop 。 IDEOGRAPHIC FULL STOP */ ++ { 0x000004a2L, 0x300c }, /* kana_openingbracket 「 LEFT CORNER BRACKET */ ++ { 0x000004a3L, 0x300d }, /* kana_closingbracket 」 RIGHT CORNER BRACKET */ ++ { 0x000004a4L, 0x3001 }, /* kana_comma 、 IDEOGRAPHIC COMMA */ ++ { 0x000004a5L, 0x30fb }, /* kana_conjunctive ・ KATAKANA MIDDLE DOT */ ++ { 0x000004a6L, 0x30f2 }, /* kana_WO ヲ KATAKANA LETTER WO */ ++ { 0x000004a7L, 0x30a1 }, /* kana_a ァ KATAKANA LETTER SMALL A */ ++ { 0x000004a8L, 0x30a3 }, /* kana_i ィ KATAKANA LETTER SMALL I */ ++ { 0x000004a9L, 0x30a5 }, /* kana_u ゥ KATAKANA LETTER SMALL U */ ++ { 0x000004aaL, 0x30a7 }, /* kana_e ェ KATAKANA LETTER SMALL E */ ++ { 0x000004abL, 0x30a9 }, /* kana_o ォ KATAKANA LETTER SMALL O */ ++ { 0x000004acL, 0x30e3 }, /* kana_ya ャ KATAKANA LETTER SMALL YA */ ++ { 0x000004adL, 0x30e5 }, /* kana_yu ュ KATAKANA LETTER SMALL YU */ ++ { 0x000004aeL, 0x30e7 }, /* kana_yo ョ KATAKANA LETTER SMALL YO */ ++ { 0x000004afL, 0x30c3 }, /* kana_tsu ッ KATAKANA LETTER SMALL TU */ ++ { 0x000004b0L, 0x30fc }, /* prolongedsound ー KATAKANA-HIRAGANA PROLONGED SOUND MARK */ ++ { 0x000004b1L, 0x30a2 }, /* kana_A ア KATAKANA LETTER A */ ++ { 0x000004b2L, 0x30a4 }, /* kana_I イ KATAKANA LETTER I */ ++ { 0x000004b3L, 0x30a6 }, /* kana_U ウ KATAKANA LETTER U */ ++ { 0x000004b4L, 0x30a8 }, /* kana_E エ KATAKANA LETTER E */ ++ { 0x000004b5L, 0x30aa }, /* kana_O オ KATAKANA LETTER O */ ++ { 0x000004b6L, 0x30ab }, /* kana_KA カ KATAKANA LETTER KA */ ++ { 0x000004b7L, 0x30ad }, /* kana_KI キ KATAKANA LETTER KI */ ++ { 0x000004b8L, 0x30af }, /* kana_KU ク KATAKANA LETTER KU */ ++ { 0x000004b9L, 0x30b1 }, /* kana_KE ケ KATAKANA LETTER KE */ ++ { 0x000004baL, 0x30b3 }, /* kana_KO コ KATAKANA LETTER KO */ ++ { 0x000004bbL, 0x30b5 }, /* kana_SA サ KATAKANA LETTER SA */ ++ { 0x000004bcL, 0x30b7 }, /* kana_SHI シ KATAKANA LETTER SI */ ++ { 0x000004bdL, 0x30b9 }, /* kana_SU ス KATAKANA LETTER SU */ ++ { 0x000004beL, 0x30bb }, /* kana_SE セ KATAKANA LETTER SE */ ++ { 0x000004bfL, 0x30bd }, /* kana_SO ソ KATAKANA LETTER SO */ ++ { 0x000004c0L, 0x30bf }, /* kana_TA タ KATAKANA LETTER TA */ ++ { 0x000004c1L, 0x30c1 }, /* kana_CHI チ KATAKANA LETTER TI */ ++ { 0x000004c2L, 0x30c4 }, /* kana_TSU ツ KATAKANA LETTER TU */ ++ { 0x000004c3L, 0x30c6 }, /* kana_TE テ KATAKANA LETTER TE */ ++ { 0x000004c4L, 0x30c8 }, /* kana_TO ト KATAKANA LETTER TO */ ++ { 0x000004c5L, 0x30ca }, /* kana_NA ナ KATAKANA LETTER NA */ ++ { 0x000004c6L, 0x30cb }, /* kana_NI ニ KATAKANA LETTER NI */ ++ { 0x000004c7L, 0x30cc }, /* kana_NU ヌ KATAKANA LETTER NU */ ++ { 0x000004c8L, 0x30cd }, /* kana_NE ネ KATAKANA LETTER NE */ ++ { 0x000004c9L, 0x30ce }, /* kana_NO ノ KATAKANA LETTER NO */ ++ { 0x000004caL, 0x30cf }, /* kana_HA ハ KATAKANA LETTER HA */ ++ { 0x000004cbL, 0x30d2 }, /* kana_HI ヒ KATAKANA LETTER HI */ ++ { 0x000004ccL, 0x30d5 }, /* kana_FU フ KATAKANA LETTER HU */ ++ { 0x000004cdL, 0x30d8 }, /* kana_HE ヘ KATAKANA LETTER HE */ ++ { 0x000004ceL, 0x30db }, /* kana_HO ホ KATAKANA LETTER HO */ ++ { 0x000004cfL, 0x30de }, /* kana_MA マ KATAKANA LETTER MA */ ++ { 0x000004d0L, 0x30df }, /* kana_MI ミ KATAKANA LETTER MI */ ++ { 0x000004d1L, 0x30e0 }, /* kana_MU ム KATAKANA LETTER MU */ ++ { 0x000004d2L, 0x30e1 }, /* kana_ME メ KATAKANA LETTER ME */ ++ { 0x000004d3L, 0x30e2 }, /* kana_MO モ KATAKANA LETTER MO */ ++ { 0x000004d4L, 0x30e4 }, /* kana_YA ヤ KATAKANA LETTER YA */ ++ { 0x000004d5L, 0x30e6 }, /* kana_YU ユ KATAKANA LETTER YU */ ++ { 0x000004d6L, 0x30e8 }, /* kana_YO ヨ KATAKANA LETTER YO */ ++ { 0x000004d7L, 0x30e9 }, /* kana_RA ラ KATAKANA LETTER RA */ ++ { 0x000004d8L, 0x30ea }, /* kana_RI リ KATAKANA LETTER RI */ ++ { 0x000004d9L, 0x30eb }, /* kana_RU ル KATAKANA LETTER RU */ ++ { 0x000004daL, 0x30ec }, /* kana_RE レ KATAKANA LETTER RE */ ++ { 0x000004dbL, 0x30ed }, /* kana_RO ロ KATAKANA LETTER RO */ ++ { 0x000004dcL, 0x30ef }, /* kana_WA ワ KATAKANA LETTER WA */ ++ { 0x000004ddL, 0x30f3 }, /* kana_N ン KATAKANA LETTER N */ ++ { 0x000004deL, 0x309b }, /* voicedsound ゛ KATAKANA-HIRAGANA VOICED SOUND MARK */ ++ { 0x000004dfL, 0x309c }, /* semivoicedsound ゜ KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK */ ++ { 0x000005acL, 0x060c }, /* Arabic_comma ، ARABIC COMMA */ ++ { 0x000005bbL, 0x061b }, /* Arabic_semicolon ؛ ARABIC SEMICOLON */ ++ { 0x000005bfL, 0x061f }, /* Arabic_question_mark ؟ ARABIC QUESTION MARK */ ++ { 0x000005c1L, 0x0621 }, /* Arabic_hamza ء ARABIC LETTER HAMZA */ ++ { 0x000005c2L, 0x0622 }, /* Arabic_maddaonalef آ ARABIC LETTER ALEF WITH MADDA ABOVE */ ++ { 0x000005c3L, 0x0623 }, /* Arabic_hamzaonalef أ ARABIC LETTER ALEF WITH HAMZA ABOVE */ ++ { 0x000005c4L, 0x0624 }, /* Arabic_hamzaonwaw ؤ ARABIC LETTER WAW WITH HAMZA ABOVE */ ++ { 0x000005c5L, 0x0625 }, /* Arabic_hamzaunderalef إ ARABIC LETTER ALEF WITH HAMZA BELOW */ ++ { 0x000005c6L, 0x0626 }, /* Arabic_hamzaonyeh ئ ARABIC LETTER YEH WITH HAMZA ABOVE */ ++ { 0x000005c7L, 0x0627 }, /* Arabic_alef ا ARABIC LETTER ALEF */ ++ { 0x000005c8L, 0x0628 }, /* Arabic_beh ب ARABIC LETTER BEH */ ++ { 0x000005c9L, 0x0629 }, /* Arabic_tehmarbuta ة ARABIC LETTER TEH MARBUTA */ ++ { 0x000005caL, 0x062a }, /* Arabic_teh ت ARABIC LETTER TEH */ ++ { 0x000005cbL, 0x062b }, /* Arabic_theh ث ARABIC LETTER THEH */ ++ { 0x000005ccL, 0x062c }, /* Arabic_jeem ج ARABIC LETTER JEEM */ ++ { 0x000005cdL, 0x062d }, /* Arabic_hah ح ARABIC LETTER HAH */ ++ { 0x000005ceL, 0x062e }, /* Arabic_khah خ ARABIC LETTER KHAH */ ++ { 0x000005cfL, 0x062f }, /* Arabic_dal د ARABIC LETTER DAL */ ++ { 0x000005d0L, 0x0630 }, /* Arabic_thal ذ ARABIC LETTER THAL */ ++ { 0x000005d1L, 0x0631 }, /* Arabic_ra ر ARABIC LETTER REH */ ++ { 0x000005d2L, 0x0632 }, /* Arabic_zain ز ARABIC LETTER ZAIN */ ++ { 0x000005d3L, 0x0633 }, /* Arabic_seen س ARABIC LETTER SEEN */ ++ { 0x000005d4L, 0x0634 }, /* Arabic_sheen ش ARABIC LETTER SHEEN */ ++ { 0x000005d5L, 0x0635 }, /* Arabic_sad ص ARABIC LETTER SAD */ ++ { 0x000005d6L, 0x0636 }, /* Arabic_dad ض ARABIC LETTER DAD */ ++ { 0x000005d7L, 0x0637 }, /* Arabic_tah ط ARABIC LETTER TAH */ ++ { 0x000005d8L, 0x0638 }, /* Arabic_zah ظ ARABIC LETTER ZAH */ ++ { 0x000005d9L, 0x0639 }, /* Arabic_ain ع ARABIC LETTER AIN */ ++ { 0x000005daL, 0x063a }, /* Arabic_ghain غ ARABIC LETTER GHAIN */ ++ { 0x000005e0L, 0x0640 }, /* Arabic_tatweel ـ ARABIC TATWEEL */ ++ { 0x000005e1L, 0x0641 }, /* Arabic_feh ف ARABIC LETTER FEH */ ++ { 0x000005e2L, 0x0642 }, /* Arabic_qaf ق ARABIC LETTER TQAF */ ++ { 0x000005e3L, 0x0643 }, /* Arabic_kaf ك ARABIC LETTER KAF */ ++ { 0x000005e4L, 0x0644 }, /* Arabic_lam ل ARABIC LETTER LAM */ ++ { 0x000005e5L, 0x0645 }, /* Arabic_meem م ARABIC LETTER MEEM */ ++ { 0x000005e6L, 0x0646 }, /* Arabic_noon ن ARABIC LETTER NOON */ ++ { 0x000005e7L, 0x0647 }, /* Arabic_ha ه ARABIC LETTER HEH */ ++ { 0x000005e8L, 0x0648 }, /* Arabic_waw و ARABIC LETTER WAW */ ++ { 0x000005e9L, 0x0649 }, /* Arabic_alefmaksura ى ARABIC LETTER ALEF MAKSURA */ ++ { 0x000005eaL, 0x064a }, /* Arabic_yeh ي ARABIC LETTER YEH */ ++ { 0x000005ebL, 0x064b }, /* Arabic_fathatan ً ARABIC FATHATAN */ ++ { 0x000005ecL, 0x064c }, /* Arabic_dammatan ٌ ARABIC DAMMATAN */ ++ { 0x000005edL, 0x064d }, /* Arabic_kasratan ٍ ARABIC KASRATAN */ ++ { 0x000005eeL, 0x064e }, /* Arabic_fatha َ ARABIC FATHA */ ++ { 0x000005efL, 0x064f }, /* Arabic_damma ُ ARABIC DAMMA */ ++ { 0x000005f0L, 0x0650 }, /* Arabic_kasra ِ ARABIC KASRA */ ++ { 0x000005f1L, 0x0651 }, /* Arabic_shadda ّ ARABIC SHADDA */ ++ { 0x000005f2L, 0x0652 }, /* Arabic_sukun ْ ARABIC SUKUN */ ++ { 0x000006a1L, 0x0452 }, /* Serbian_dje ђ CYRILLIC SMALL LETTER DJE */ ++ { 0x000006a2L, 0x0453 }, /* Macedonia_gje ѓ CYRILLIC SMALL LETTER GJE */ ++ { 0x000006a3L, 0x0451 }, /* Cyrillic_io ё CYRILLIC SMALL LETTER IO */ ++ { 0x000006a4L, 0x0454 }, /* Ukrainian_ie є CYRILLIC SMALL LETTER UKRAINIAN IE */ ++ { 0x000006a5L, 0x0455 }, /* Macedonia_dse ѕ CYRILLIC SMALL LETTER DZE */ ++ { 0x000006a6L, 0x0456 }, /* Ukrainian_i і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ ++ { 0x000006a7L, 0x0457 }, /* Ukrainian_yi ї CYRILLIC SMALL LETTER YI */ ++ { 0x000006a8L, 0x0458 }, /* Cyrillic_je ј CYRILLIC SMALL LETTER JE */ ++ { 0x000006a9L, 0x0459 }, /* Cyrillic_lje љ CYRILLIC SMALL LETTER LJE */ ++ { 0x000006aaL, 0x045a }, /* Cyrillic_nje њ CYRILLIC SMALL LETTER NJE */ ++ { 0x000006abL, 0x045b }, /* Serbian_tshe ћ CYRILLIC SMALL LETTER TSHE */ ++ { 0x000006acL, 0x045c }, /* Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */ ++ { 0x000006adL, 0x0491 }, /* Ukrainian_ghe_with_upturn ґ CYRILLIC SMALL LETTER GHE WITH UPTURN */ ++ { 0x000006aeL, 0x045e }, /* Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */ ++ { 0x000006afL, 0x045f }, /* Cyrillic_dzhe џ CYRILLIC SMALL LETTER DZHE */ ++ { 0x000006b0L, 0x2116 }, /* numerosign № NUMERO SIGN */ ++ { 0x000006b1L, 0x0402 }, /* Serbian_DJE Ђ CYRILLIC CAPITAL LETTER DJE */ ++ { 0x000006b2L, 0x0403 }, /* Macedonia_GJE Ѓ CYRILLIC CAPITAL LETTER GJE */ ++ { 0x000006b3L, 0x0401 }, /* Cyrillic_IO Ё CYRILLIC CAPITAL LETTER IO */ ++ { 0x000006b4L, 0x0404 }, /* Ukrainian_IE Є CYRILLIC CAPITAL LETTER UKRAINIAN IE */ ++ { 0x000006b5L, 0x0405 }, /* Macedonia_DSE Ѕ CYRILLIC CAPITAL LETTER DZE */ ++ { 0x000006b6L, 0x0406 }, /* Ukrainian_I І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ ++ { 0x000006b7L, 0x0407 }, /* Ukrainian_YI Ї CYRILLIC CAPITAL LETTER YI */ ++ { 0x000006b8L, 0x0408 }, /* Cyrillic_JE Ј CYRILLIC CAPITAL LETTER JE */ ++ { 0x000006b9L, 0x0409 }, /* Cyrillic_LJE Љ CYRILLIC CAPITAL LETTER LJE */ ++ { 0x000006baL, 0x040a }, /* Cyrillic_NJE Њ CYRILLIC CAPITAL LETTER NJE */ ++ { 0x000006bbL, 0x040b }, /* Serbian_TSHE Ћ CYRILLIC CAPITAL LETTER TSHE */ ++ { 0x000006bcL, 0x040c }, /* Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */ ++ { 0x000006bdL, 0x0490 }, /* Ukrainian_GHE_WITH_UPTURN Ґ CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ ++ { 0x000006beL, 0x040e }, /* Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */ ++ { 0x000006bfL, 0x040f }, /* Cyrillic_DZHE Џ CYRILLIC CAPITAL LETTER DZHE */ ++ { 0x000006c0L, 0x044e }, /* Cyrillic_yu ю CYRILLIC SMALL LETTER YU */ ++ { 0x000006c1L, 0x0430 }, /* Cyrillic_a а CYRILLIC SMALL LETTER A */ ++ { 0x000006c2L, 0x0431 }, /* Cyrillic_be б CYRILLIC SMALL LETTER BE */ ++ { 0x000006c3L, 0x0446 }, /* Cyrillic_tse ц CYRILLIC SMALL LETTER TSE */ ++ { 0x000006c4L, 0x0434 }, /* Cyrillic_de д CYRILLIC SMALL LETTER DE */ ++ { 0x000006c5L, 0x0435 }, /* Cyrillic_ie е CYRILLIC SMALL LETTER IE */ ++ { 0x000006c6L, 0x0444 }, /* Cyrillic_ef ф CYRILLIC SMALL LETTER EF */ ++ { 0x000006c7L, 0x0433 }, /* Cyrillic_ghe г CYRILLIC SMALL LETTER GHE */ ++ { 0x000006c8L, 0x0445 }, /* Cyrillic_ha х CYRILLIC SMALL LETTER HA */ ++ { 0x000006c9L, 0x0438 }, /* Cyrillic_i и CYRILLIC SMALL LETTER I */ ++ { 0x000006caL, 0x0439 }, /* Cyrillic_shorti й CYRILLIC SMALL LETTER SHORT I */ ++ { 0x000006cbL, 0x043a }, /* Cyrillic_ka к CYRILLIC SMALL LETTER KA */ ++ { 0x000006ccL, 0x043b }, /* Cyrillic_el л CYRILLIC SMALL LETTER EL */ ++ { 0x000006cdL, 0x043c }, /* Cyrillic_em м CYRILLIC SMALL LETTER EM */ ++ { 0x000006ceL, 0x043d }, /* Cyrillic_en н CYRILLIC SMALL LETTER EN */ ++ { 0x000006cfL, 0x043e }, /* Cyrillic_o о CYRILLIC SMALL LETTER O */ ++ { 0x000006d0L, 0x043f }, /* Cyrillic_pe п CYRILLIC SMALL LETTER PE */ ++ { 0x000006d1L, 0x044f }, /* Cyrillic_ya я CYRILLIC SMALL LETTER YA */ ++ { 0x000006d2L, 0x0440 }, /* Cyrillic_er р CYRILLIC SMALL LETTER ER */ ++ { 0x000006d3L, 0x0441 }, /* Cyrillic_es с CYRILLIC SMALL LETTER ES */ ++ { 0x000006d4L, 0x0442 }, /* Cyrillic_te т CYRILLIC SMALL LETTER TE */ ++ { 0x000006d5L, 0x0443 }, /* Cyrillic_u у CYRILLIC SMALL LETTER U */ ++ { 0x000006d6L, 0x0436 }, /* Cyrillic_zhe ж CYRILLIC SMALL LETTER ZHE */ ++ { 0x000006d7L, 0x0432 }, /* Cyrillic_ve в CYRILLIC SMALL LETTER VE */ ++ { 0x000006d8L, 0x044c }, /* Cyrillic_softsign ь CYRILLIC SMALL LETTER SOFT SIGN */ ++ { 0x000006d9L, 0x044b }, /* Cyrillic_yeru ы CYRILLIC SMALL LETTER YERU */ ++ { 0x000006daL, 0x0437 }, /* Cyrillic_ze з CYRILLIC SMALL LETTER ZE */ ++ { 0x000006dbL, 0x0448 }, /* Cyrillic_sha ш CYRILLIC SMALL LETTER SHA */ ++ { 0x000006dcL, 0x044d }, /* Cyrillic_e э CYRILLIC SMALL LETTER E */ ++ { 0x000006ddL, 0x0449 }, /* Cyrillic_shcha щ CYRILLIC SMALL LETTER SHCHA */ ++ { 0x000006deL, 0x0447 }, /* Cyrillic_che ч CYRILLIC SMALL LETTER CHE */ ++ { 0x000006dfL, 0x044a }, /* Cyrillic_hardsign ъ CYRILLIC SMALL LETTER HARD SIGN */ ++ { 0x000006e0L, 0x042e }, /* Cyrillic_YU Ю CYRILLIC CAPITAL LETTER YU */ ++ { 0x000006e1L, 0x0410 }, /* Cyrillic_A А CYRILLIC CAPITAL LETTER A */ ++ { 0x000006e2L, 0x0411 }, /* Cyrillic_BE Б CYRILLIC CAPITAL LETTER BE */ ++ { 0x000006e3L, 0x0426 }, /* Cyrillic_TSE Ц CYRILLIC CAPITAL LETTER TSE */ ++ { 0x000006e4L, 0x0414 }, /* Cyrillic_DE Д CYRILLIC CAPITAL LETTER DE */ ++ { 0x000006e5L, 0x0415 }, /* Cyrillic_IE Е CYRILLIC CAPITAL LETTER IE */ ++ { 0x000006e6L, 0x0424 }, /* Cyrillic_EF Ф CYRILLIC CAPITAL LETTER EF */ ++ { 0x000006e7L, 0x0413 }, /* Cyrillic_GHE Г CYRILLIC CAPITAL LETTER GHE */ ++ { 0x000006e8L, 0x0425 }, /* Cyrillic_HA Х CYRILLIC CAPITAL LETTER HA */ ++ { 0x000006e9L, 0x0418 }, /* Cyrillic_I И CYRILLIC CAPITAL LETTER I */ ++ { 0x000006eaL, 0x0419 }, /* Cyrillic_SHORTI Й CYRILLIC CAPITAL LETTER SHORT I */ ++ { 0x000006ebL, 0x041a }, /* Cyrillic_KA К CYRILLIC CAPITAL LETTER KA */ ++ { 0x000006ecL, 0x041b }, /* Cyrillic_EL Л CYRILLIC CAPITAL LETTER EL */ ++ { 0x000006edL, 0x041c }, /* Cyrillic_EM М CYRILLIC CAPITAL LETTER EM */ ++ { 0x000006eeL, 0x041d }, /* Cyrillic_EN Н CYRILLIC CAPITAL LETTER EN */ ++ { 0x000006efL, 0x041e }, /* Cyrillic_O О CYRILLIC CAPITAL LETTER O */ ++ { 0x000006f0L, 0x041f }, /* Cyrillic_PE П CYRILLIC CAPITAL LETTER PE */ ++ { 0x000006f1L, 0x042f }, /* Cyrillic_YA Я CYRILLIC CAPITAL LETTER YA */ ++ { 0x000006f2L, 0x0420 }, /* Cyrillic_ER Р CYRILLIC CAPITAL LETTER ER */ ++ { 0x000006f3L, 0x0421 }, /* Cyrillic_ES С CYRILLIC CAPITAL LETTER ES */ ++ { 0x000006f4L, 0x0422 }, /* Cyrillic_TE Т CYRILLIC CAPITAL LETTER TE */ ++ { 0x000006f5L, 0x0423 }, /* Cyrillic_U У CYRILLIC CAPITAL LETTER U */ ++ { 0x000006f6L, 0x0416 }, /* Cyrillic_ZHE Ж CYRILLIC CAPITAL LETTER ZHE */ ++ { 0x000006f7L, 0x0412 }, /* Cyrillic_VE В CYRILLIC CAPITAL LETTER VE */ ++ { 0x000006f8L, 0x042c }, /* Cyrillic_SOFTSIGN Ь CYRILLIC CAPITAL LETTER SOFT SIGN */ ++ { 0x000006f9L, 0x042b }, /* Cyrillic_YERU Ы CYRILLIC CAPITAL LETTER YERU */ ++ { 0x000006faL, 0x0417 }, /* Cyrillic_ZE З CYRILLIC CAPITAL LETTER ZE */ ++ { 0x000006fbL, 0x0428 }, /* Cyrillic_SHA Ш CYRILLIC CAPITAL LETTER SHA */ ++ { 0x000006fcL, 0x042d }, /* Cyrillic_E Э CYRILLIC CAPITAL LETTER E */ ++ { 0x000006fdL, 0x0429 }, /* Cyrillic_SHCHA Щ CYRILLIC CAPITAL LETTER SHCHA */ ++ { 0x000006feL, 0x0427 }, /* Cyrillic_CHE Ч CYRILLIC CAPITAL LETTER CHE */ ++ { 0x000006ffL, 0x042a }, /* Cyrillic_HARDSIGN Ъ CYRILLIC CAPITAL LETTER HARD SIGN */ ++ { 0x000007a1L, 0x0386 }, /* Greek_ALPHAaccent Ά GREEK CAPITAL LETTER ALPHA WITH TONOS */ ++ { 0x000007a2L, 0x0388 }, /* Greek_EPSILONaccent Έ GREEK CAPITAL LETTER EPSILON WITH TONOS */ ++ { 0x000007a3L, 0x0389 }, /* Greek_ETAaccent Ή GREEK CAPITAL LETTER ETA WITH TONOS */ ++ { 0x000007a4L, 0x038a }, /* Greek_IOTAaccent Ί GREEK CAPITAL LETTER IOTA WITH TONOS */ ++ { 0x000007a5L, 0x03aa }, /* Greek_IOTAdiaeresis Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ ++ { 0x000007a7L, 0x038c }, /* Greek_OMICRONaccent Ό GREEK CAPITAL LETTER OMICRON WITH TONOS */ ++ { 0x000007a8L, 0x038e }, /* Greek_UPSILONaccent Ύ GREEK CAPITAL LETTER UPSILON WITH TONOS */ ++ { 0x000007a9L, 0x03ab }, /* Greek_UPSILONdieresis Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ ++ { 0x000007abL, 0x038f }, /* Greek_OMEGAaccent Ώ GREEK CAPITAL LETTER OMEGA WITH TONOS */ ++ { 0x000007aeL, 0x0385 }, /* Greek_accentdieresis ΅ GREEK DIALYTIKA TONOS */ ++ { 0x000007afL, 0x2015 }, /* Greek_horizbar ― HORIZONTAL BAR */ ++ { 0x000007b1L, 0x03ac }, /* Greek_alphaaccent ά GREEK SMALL LETTER ALPHA WITH TONOS */ ++ { 0x000007b2L, 0x03ad }, /* Greek_epsilonaccent έ GREEK SMALL LETTER EPSILON WITH TONOS */ ++ { 0x000007b3L, 0x03ae }, /* Greek_etaaccent ή GREEK SMALL LETTER ETA WITH TONOS */ ++ { 0x000007b4L, 0x03af }, /* Greek_iotaaccent ί GREEK SMALL LETTER IOTA WITH TONOS */ ++ { 0x000007b5L, 0x03ca }, /* Greek_iotadieresis ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA */ ++ { 0x000007b6L, 0x0390 }, /* Greek_iotaaccentdieresis ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */ ++ { 0x000007b7L, 0x03cc }, /* Greek_omicronaccent ό GREEK SMALL LETTER OMICRON WITH TONOS */ ++ { 0x000007b8L, 0x03cd }, /* Greek_upsilonaccent ύ GREEK SMALL LETTER UPSILON WITH TONOS */ ++ { 0x000007b9L, 0x03cb }, /* Greek_upsilondieresis ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ ++ { 0x000007baL, 0x03b0 }, /* Greek_upsilonaccentdieresis ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */ ++ { 0x000007bbL, 0x03ce }, /* Greek_omegaaccent ώ GREEK SMALL LETTER OMEGA WITH TONOS */ ++ { 0x000007c1L, 0x0391 }, /* Greek_ALPHA Α GREEK CAPITAL LETTER ALPHA */ ++ { 0x000007c2L, 0x0392 }, /* Greek_BETA Β GREEK CAPITAL LETTER BETA */ ++ { 0x000007c3L, 0x0393 }, /* Greek_GAMMA Γ GREEK CAPITAL LETTER GAMMA */ ++ { 0x000007c4L, 0x0394 }, /* Greek_DELTA Δ GREEK CAPITAL LETTER DELTA */ ++ { 0x000007c5L, 0x0395 }, /* Greek_EPSILON Ε GREEK CAPITAL LETTER EPSILON */ ++ { 0x000007c6L, 0x0396 }, /* Greek_ZETA Ζ GREEK CAPITAL LETTER ZETA */ ++ { 0x000007c7L, 0x0397 }, /* Greek_ETA Η GREEK CAPITAL LETTER ETA */ ++ { 0x000007c8L, 0x0398 }, /* Greek_THETA Θ GREEK CAPITAL LETTER THETA */ ++ { 0x000007c9L, 0x0399 }, /* Greek_IOTA Ι GREEK CAPITAL LETTER IOTA */ ++ { 0x000007caL, 0x039a }, /* Greek_KAPPA Κ GREEK CAPITAL LETTER KAPPA */ ++ { 0x000007cbL, 0x039b }, /* Greek_LAMBDA Λ GREEK CAPITAL LETTER LAMDA */ ++ { 0x000007ccL, 0x039c }, /* Greek_MU Μ GREEK CAPITAL LETTER MU */ ++ { 0x000007cdL, 0x039d }, /* Greek_NU Ν GREEK CAPITAL LETTER NU */ ++ { 0x000007ceL, 0x039e }, /* Greek_XI Ξ GREEK CAPITAL LETTER XI */ ++ { 0x000007cfL, 0x039f }, /* Greek_OMICRON Ο GREEK CAPITAL LETTER OMICRON */ ++ { 0x000007d0L, 0x03a0 }, /* Greek_PI Π GREEK CAPITAL LETTER PI */ ++ { 0x000007d1L, 0x03a1 }, /* Greek_RHO Ρ GREEK CAPITAL LETTER RHO */ ++ { 0x000007d2L, 0x03a3 }, /* Greek_SIGMA Σ GREEK CAPITAL LETTER SIGMA */ ++ { 0x000007d4L, 0x03a4 }, /* Greek_TAU Τ GREEK CAPITAL LETTER TAU */ ++ { 0x000007d5L, 0x03a5 }, /* Greek_UPSILON Υ GREEK CAPITAL LETTER UPSILON */ ++ { 0x000007d6L, 0x03a6 }, /* Greek_PHI Φ GREEK CAPITAL LETTER PHI */ ++ { 0x000007d7L, 0x03a7 }, /* Greek_CHI Χ GREEK CAPITAL LETTER CHI */ ++ { 0x000007d8L, 0x03a8 }, /* Greek_PSI Ψ GREEK CAPITAL LETTER PSI */ ++ { 0x000007d9L, 0x03a9 }, /* Greek_OMEGA Ω GREEK CAPITAL LETTER OMEGA */ ++ { 0x000007e1L, 0x03b1 }, /* Greek_alpha α GREEK SMALL LETTER ALPHA */ ++ { 0x000007e2L, 0x03b2 }, /* Greek_beta β GREEK SMALL LETTER BETA */ ++ { 0x000007e3L, 0x03b3 }, /* Greek_gamma γ GREEK SMALL LETTER GAMMA */ ++ { 0x000007e4L, 0x03b4 }, /* Greek_delta δ GREEK SMALL LETTER DELTA */ ++ { 0x000007e5L, 0x03b5 }, /* Greek_epsilon ε GREEK SMALL LETTER EPSILON */ ++ { 0x000007e6L, 0x03b6 }, /* Greek_zeta ζ GREEK SMALL LETTER ZETA */ ++ { 0x000007e7L, 0x03b7 }, /* Greek_eta η GREEK SMALL LETTER ETA */ ++ { 0x000007e8L, 0x03b8 }, /* Greek_theta θ GREEK SMALL LETTER THETA */ ++ { 0x000007e9L, 0x03b9 }, /* Greek_iota ι GREEK SMALL LETTER IOTA */ ++ { 0x000007eaL, 0x03ba }, /* Greek_kappa κ GREEK SMALL LETTER KAPPA */ ++ { 0x000007ebL, 0x03bb }, /* Greek_lambda λ GREEK SMALL LETTER LAMDA */ ++ { 0x000007ecL, 0x03bc }, /* Greek_mu μ GREEK SMALL LETTER MU */ ++ { 0x000007edL, 0x03bd }, /* Greek_nu ν GREEK SMALL LETTER NU */ ++ { 0x000007eeL, 0x03be }, /* Greek_xi ξ GREEK SMALL LETTER XI */ ++ { 0x000007efL, 0x03bf }, /* Greek_omicron ο GREEK SMALL LETTER OMICRON */ ++ { 0x000007f0L, 0x03c0 }, /* Greek_pi π GREEK SMALL LETTER PI */ ++ { 0x000007f1L, 0x03c1 }, /* Greek_rho ρ GREEK SMALL LETTER RHO */ ++ { 0x000007f2L, 0x03c3 }, /* Greek_sigma σ GREEK SMALL LETTER SIGMA */ ++ { 0x000007f3L, 0x03c2 }, /* Greek_finalsmallsigma ς GREEK SMALL LETTER FINAL SIGMA */ ++ { 0x000007f4L, 0x03c4 }, /* Greek_tau τ GREEK SMALL LETTER TAU */ ++ { 0x000007f5L, 0x03c5 }, /* Greek_upsilon υ GREEK SMALL LETTER UPSILON */ ++ { 0x000007f6L, 0x03c6 }, /* Greek_phi φ GREEK SMALL LETTER PHI */ ++ { 0x000007f7L, 0x03c7 }, /* Greek_chi χ GREEK SMALL LETTER CHI */ ++ { 0x000007f8L, 0x03c8 }, /* Greek_psi ψ GREEK SMALL LETTER PSI */ ++ { 0x000007f9L, 0x03c9 }, /* Greek_omega ω GREEK SMALL LETTER OMEGA */ ++ { 0x000008a1L, 0x23b7 }, /* leftradical ⎷ ??? */ ++ { 0x000008a2L, 0x250c }, /* topleftradical ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ ++ { 0x000008a3L, 0x2500 }, /* horizconnector ─ BOX DRAWINGS LIGHT HORIZONTAL */ ++ { 0x000008a4L, 0x2320 }, /* topintegral ⌠ TOP HALF INTEGRAL */ ++ { 0x000008a5L, 0x2321 }, /* botintegral ⌡ BOTTOM HALF INTEGRAL */ ++ { 0x000008a6L, 0x2502 }, /* vertconnector │ BOX DRAWINGS LIGHT VERTICAL */ ++ { 0x000008a7L, 0x23a1 }, /* topleftsqbracket ⎡ ??? */ ++ { 0x000008a8L, 0x23a3 }, /* botleftsqbracket ⎣ ??? */ ++ { 0x000008a9L, 0x23a4 }, /* toprightsqbracket ⎤ ??? */ ++ { 0x000008aaL, 0x23a6 }, /* botrightsqbracket ⎦ ??? */ ++ { 0x000008abL, 0x239b }, /* topleftparens ⎛ ??? */ ++ { 0x000008acL, 0x239d }, /* botleftparens ⎝ ??? */ ++ { 0x000008adL, 0x239e }, /* toprightparens ⎞ ??? */ ++ { 0x000008aeL, 0x23a0 }, /* botrightparens ⎠ ??? */ ++ { 0x000008afL, 0x23a8 }, /* leftmiddlecurlybrace ⎨ ??? */ ++ { 0x000008b0L, 0x23ac }, /* rightmiddlecurlybrace ⎬ ??? */ ++/* 0x000008b1L topleftsummation ? ??? */ ++/* 0x000008b2L botleftsummation ? ??? */ ++/* 0x000008b3L topvertsummationconnector ? ??? */ ++/* 0x000008b4L botvertsummationconnector ? ??? */ ++/* 0x000008b5L toprightsummation ? ??? */ ++/* 0x000008b6L botrightsummation ? ??? */ ++/* 0x000008b7L rightmiddlesummation ? ??? */ ++ { 0x000008bcL, 0x2264 }, /* lessthanequal ≤ LESS-THAN OR EQUAL TO */ ++ { 0x000008bdL, 0x2260 }, /* notequal ≠ NOT EQUAL TO */ ++ { 0x000008beL, 0x2265 }, /* greaterthanequal ≥ GREATER-THAN OR EQUAL TO */ ++ { 0x000008bfL, 0x222b }, /* integral ∫ INTEGRAL */ ++ { 0x000008c0L, 0x2234 }, /* therefore ∴ THEREFORE */ ++ { 0x000008c1L, 0x221d }, /* variation ∝ PROPORTIONAL TO */ ++ { 0x000008c2L, 0x221e }, /* infinity ∞ INFINITY */ ++ { 0x000008c5L, 0x2207 }, /* nabla ∇ NABLA */ ++ { 0x000008c8L, 0x223c }, /* approximate ∼ TILDE OPERATOR */ ++ { 0x000008c9L, 0x2243 }, /* similarequal ≃ ASYMPTOTICALLY EQUAL TO */ ++ { 0x000008cdL, 0x21d4 }, /* ifonlyif ⇔ LEFT RIGHT DOUBLE ARROW */ ++ { 0x000008ceL, 0x21d2 }, /* implies ⇒ RIGHTWARDS DOUBLE ARROW */ ++ { 0x000008cfL, 0x2261 }, /* identical ≡ IDENTICAL TO */ ++ { 0x000008d6L, 0x221a }, /* radical √ SQUARE ROOT */ ++ { 0x000008daL, 0x2282 }, /* includedin ⊂ SUBSET OF */ ++ { 0x000008dbL, 0x2283 }, /* includes ⊃ SUPERSET OF */ ++ { 0x000008dcL, 0x2229 }, /* intersection ∩ INTERSECTION */ ++ { 0x000008ddL, 0x222a }, /* union ∪ UNION */ ++ { 0x000008deL, 0x2227 }, /* logicaland ∧ LOGICAL AND */ ++ { 0x000008dfL, 0x2228 }, /* logicalor ∨ LOGICAL OR */ ++ { 0x000008efL, 0x2202 }, /* partialderivative ∂ PARTIAL DIFFERENTIAL */ ++ { 0x000008f6L, 0x0192 }, /* function ƒ LATIN SMALL LETTER F WITH HOOK */ ++ { 0x000008fbL, 0x2190 }, /* leftarrow ← LEFTWARDS ARROW */ ++ { 0x000008fcL, 0x2191 }, /* uparrow ↑ UPWARDS ARROW */ ++ { 0x000008fdL, 0x2192 }, /* rightarrow → RIGHTWARDS ARROW */ ++ { 0x000008feL, 0x2193 }, /* downarrow ↓ DOWNWARDS ARROW */ ++/* 0x000009dfL blank ? ??? */ ++ { 0x000009e0L, 0x25c6 }, /* soliddiamond ◆ BLACK DIAMOND */ ++ { 0x000009e1L, 0x2592 }, /* checkerboard ▒ MEDIUM SHADE */ ++ { 0x000009e2L, 0x2409 }, /* ht ␉ SYMBOL FOR HORIZONTAL TABULATION */ ++ { 0x000009e3L, 0x240c }, /* ff ␌ SYMBOL FOR FORM FEED */ ++ { 0x000009e4L, 0x240d }, /* cr ␍ SYMBOL FOR CARRIAGE RETURN */ ++ { 0x000009e5L, 0x240a }, /* lf ␊ SYMBOL FOR LINE FEED */ ++ { 0x000009e8L, 0x2424 }, /* nl ␤ SYMBOL FOR NEWLINE */ ++ { 0x000009e9L, 0x240b }, /* vt ␋ SYMBOL FOR VERTICAL TABULATION */ ++ { 0x000009eaL, 0x2518 }, /* lowrightcorner ┘ BOX DRAWINGS LIGHT UP AND LEFT */ ++ { 0x000009ebL, 0x2510 }, /* uprightcorner ┐ BOX DRAWINGS LIGHT DOWN AND LEFT */ ++ { 0x000009ecL, 0x250c }, /* upleftcorner ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT */ ++ { 0x000009edL, 0x2514 }, /* lowleftcorner └ BOX DRAWINGS LIGHT UP AND RIGHT */ ++ { 0x000009eeL, 0x253c }, /* crossinglines ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ ++ { 0x000009efL, 0x23ba }, /* horizlinescan1 ⎺ HORIZONTAL SCAN LINE-1 (Unicode 3.2 draft) */ ++ { 0x000009f0L, 0x23bb }, /* horizlinescan3 ⎻ HORIZONTAL SCAN LINE-3 (Unicode 3.2 draft) */ ++ { 0x000009f1L, 0x2500 }, /* horizlinescan5 ─ BOX DRAWINGS LIGHT HORIZONTAL */ ++ { 0x000009f2L, 0x23bc }, /* horizlinescan7 ⎼ HORIZONTAL SCAN LINE-7 (Unicode 3.2 draft) */ ++ { 0x000009f3L, 0x23bd }, /* horizlinescan9 ⎽ HORIZONTAL SCAN LINE-9 (Unicode 3.2 draft) */ ++ { 0x000009f4L, 0x251c }, /* leftt ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ ++ { 0x000009f5L, 0x2524 }, /* rightt ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT */ ++ { 0x000009f6L, 0x2534 }, /* bott ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL */ ++ { 0x000009f7L, 0x252c }, /* topt ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ ++ { 0x000009f8L, 0x2502 }, /* vertbar │ BOX DRAWINGS LIGHT VERTICAL */ ++ { 0x00000aa1L, 0x2003 }, /* emspace   EM SPACE */ ++ { 0x00000aa2L, 0x2002 }, /* enspace   EN SPACE */ ++ { 0x00000aa3L, 0x2004 }, /* em3space   THREE-PER-EM SPACE */ ++ { 0x00000aa4L, 0x2005 }, /* em4space   FOUR-PER-EM SPACE */ ++ { 0x00000aa5L, 0x2007 }, /* digitspace   FIGURE SPACE */ ++ { 0x00000aa6L, 0x2008 }, /* punctspace   PUNCTUATION SPACE */ ++ { 0x00000aa7L, 0x2009 }, /* thinspace   THIN SPACE */ ++ { 0x00000aa8L, 0x200a }, /* hairspace   HAIR SPACE */ ++ { 0x00000aa9L, 0x2014 }, /* emdash — EM DASH */ ++ { 0x00000aaaL, 0x2013 }, /* endash – EN DASH */ ++/* 0x00000aacL signifblank ? ??? */ ++ { 0x00000aaeL, 0x2026 }, /* ellipsis … HORIZONTAL ELLIPSIS */ ++ { 0x00000aafL, 0x2025 }, /* doubbaselinedot ‥ TWO DOT LEADER */ ++ { 0x00000ab0L, 0x2153 }, /* onethird ⅓ VULGAR FRACTION ONE THIRD */ ++ { 0x00000ab1L, 0x2154 }, /* twothirds ⅔ VULGAR FRACTION TWO THIRDS */ ++ { 0x00000ab2L, 0x2155 }, /* onefifth ⅕ VULGAR FRACTION ONE FIFTH */ ++ { 0x00000ab3L, 0x2156 }, /* twofifths ⅖ VULGAR FRACTION TWO FIFTHS */ ++ { 0x00000ab4L, 0x2157 }, /* threefifths ⅗ VULGAR FRACTION THREE FIFTHS */ ++ { 0x00000ab5L, 0x2158 }, /* fourfifths ⅘ VULGAR FRACTION FOUR FIFTHS */ ++ { 0x00000ab6L, 0x2159 }, /* onesixth ⅙ VULGAR FRACTION ONE SIXTH */ ++ { 0x00000ab7L, 0x215a }, /* fivesixths ⅚ VULGAR FRACTION FIVE SIXTHS */ ++ { 0x00000ab8L, 0x2105 }, /* careof ℅ CARE OF */ ++ { 0x00000abbL, 0x2012 }, /* figdash ‒ FIGURE DASH */ ++ { 0x00000abcL, 0x2329 }, /* leftanglebracket 〈 LEFT-POINTING ANGLE BRACKET */ ++/* 0x00000abdL decimalpoint ? ??? */ ++ { 0x00000abeL, 0x232a }, /* rightanglebracket 〉 RIGHT-POINTING ANGLE BRACKET */ ++/* 0x00000abfL marker ? ??? */ ++ { 0x00000ac3L, 0x215b }, /* oneeighth ⅛ VULGAR FRACTION ONE EIGHTH */ ++ { 0x00000ac4L, 0x215c }, /* threeeighths ⅜ VULGAR FRACTION THREE EIGHTHS */ ++ { 0x00000ac5L, 0x215d }, /* fiveeighths ⅝ VULGAR FRACTION FIVE EIGHTHS */ ++ { 0x00000ac6L, 0x215e }, /* seveneighths ⅞ VULGAR FRACTION SEVEN EIGHTHS */ ++ { 0x00000ac9L, 0x2122 }, /* trademark ™ TRADE MARK SIGN */ ++ { 0x00000acaL, 0x2613 }, /* signaturemark ☓ SALTIRE */ ++/* 0x00000acbL trademarkincircle ? ??? */ ++ { 0x00000accL, 0x25c1 }, /* leftopentriangle ◁ WHITE LEFT-POINTING TRIANGLE */ ++ { 0x00000acdL, 0x25b7 }, /* rightopentriangle ▷ WHITE RIGHT-POINTING TRIANGLE */ ++ { 0x00000aceL, 0x25cb }, /* emopencircle ○ WHITE CIRCLE */ ++ { 0x00000acfL, 0x25af }, /* emopenrectangle ▯ WHITE VERTICAL RECTANGLE */ ++ { 0x00000ad0L, 0x2018 }, /* leftsinglequotemark ‘ LEFT SINGLE QUOTATION MARK */ ++ { 0x00000ad1L, 0x2019 }, /* rightsinglequotemark ’ RIGHT SINGLE QUOTATION MARK */ ++ { 0x00000ad2L, 0x201c }, /* leftdoublequotemark “ LEFT DOUBLE QUOTATION MARK */ ++ { 0x00000ad3L, 0x201d }, /* rightdoublequotemark ” RIGHT DOUBLE QUOTATION MARK */ ++ { 0x00000ad4L, 0x211e }, /* prescription ℞ PRESCRIPTION TAKE */ ++ { 0x00000ad5L, 0x2030 }, /* permille ‰ */ ++ { 0x00000ad6L, 0x2032 }, /* minutes ′ PRIME */ ++ { 0x00000ad7L, 0x2033 }, /* seconds ″ DOUBLE PRIME */ ++ { 0x00000ad9L, 0x271d }, /* latincross ✝ LATIN CROSS */ ++/* 0x00000adaL hexagram ? ??? */ ++ { 0x00000adbL, 0x25ac }, /* filledrectbullet ▬ BLACK RECTANGLE */ ++ { 0x00000adcL, 0x25c0 }, /* filledlefttribullet ◀ BLACK LEFT-POINTING TRIANGLE */ ++ { 0x00000addL, 0x25b6 }, /* filledrighttribullet ▶ BLACK RIGHT-POINTING TRIANGLE */ ++ { 0x00000adeL, 0x25cf }, /* emfilledcircle ● BLACK CIRCLE */ ++ { 0x00000adfL, 0x25ae }, /* emfilledrect ▮ BLACK VERTICAL RECTANGLE */ ++ { 0x00000ae0L, 0x25e6 }, /* enopencircbullet ◦ WHITE BULLET */ ++ { 0x00000ae1L, 0x25ab }, /* enopensquarebullet ▫ WHITE SMALL SQUARE */ ++ { 0x00000ae2L, 0x25ad }, /* openrectbullet ▭ WHITE RECTANGLE */ ++ { 0x00000ae3L, 0x25b3 }, /* opentribulletup △ WHITE UP-POINTING TRIANGLE */ ++ { 0x00000ae4L, 0x25bd }, /* opentribulletdown ▽ WHITE DOWN-POINTING TRIANGLE */ ++ { 0x00000ae5L, 0x2606 }, /* openstar ☆ WHITE STAR */ ++ { 0x00000ae6L, 0x2022 }, /* enfilledcircbullet • BULLET */ ++ { 0x00000ae7L, 0x25aa }, /* enfilledsqbullet ▪ BLACK SMALL SQUARE */ ++ { 0x00000ae8L, 0x25b2 }, /* filledtribulletup ▲ BLACK UP-POINTING TRIANGLE */ ++ { 0x00000ae9L, 0x25bc }, /* filledtribulletdown ▼ BLACK DOWN-POINTING TRIANGLE */ ++ { 0x00000aeaL, 0x261c }, /* leftpointer ☜ WHITE LEFT POINTING INDEX */ ++ { 0x00000aebL, 0x261e }, /* rightpointer ☞ WHITE RIGHT POINTING INDEX */ ++ { 0x00000aecL, 0x2663 }, /* club ♣ BLACK CLUB SUIT */ ++ { 0x00000aedL, 0x2666 }, /* diamond ♦ BLACK DIAMOND SUIT */ ++ { 0x00000aeeL, 0x2665 }, /* heart ♥ BLACK HEART SUIT */ ++ { 0x00000af0L, 0x2720 }, /* maltesecross ✠ MALTESE CROSS */ ++ { 0x00000af1L, 0x2020 }, /* dagger † DAGGER */ ++ { 0x00000af2L, 0x2021 }, /* doubledagger ‡ DOUBLE DAGGER */ ++ { 0x00000af3L, 0x2713 }, /* checkmark ✓ CHECK MARK */ ++ { 0x00000af4L, 0x2717 }, /* ballotcross ✗ BALLOT X */ ++ { 0x00000af5L, 0x266f }, /* musicalsharp ♯ MUSIC SHARP SIGN */ ++ { 0x00000af6L, 0x266d }, /* musicalflat ♭ MUSIC FLAT SIGN */ ++ { 0x00000af7L, 0x2642 }, /* malesymbol ♂ MALE SIGN */ ++ { 0x00000af8L, 0x2640 }, /* femalesymbol ♀ FEMALE SIGN */ ++ { 0x00000af9L, 0x260e }, /* telephone ☎ BLACK TELEPHONE */ ++ { 0x00000afaL, 0x2315 }, /* telephonerecorder ⌕ TELEPHONE RECORDER */ ++ { 0x00000afbL, 0x2117 }, /* phonographcopyright ℗ SOUND RECORDING COPYRIGHT */ ++ { 0x00000afcL, 0x2038 }, /* caret ‸ CARET */ ++ { 0x00000afdL, 0x201a }, /* singlelowquotemark ‚ SINGLE LOW-9 QUOTATION MARK */ ++ { 0x00000afeL, 0x201e }, /* doublelowquotemark „ DOUBLE LOW-9 QUOTATION MARK */ ++/* 0x00000affL cursor ? ??? */ ++ { 0x00000ba3L, 0x003c }, /* leftcaret < LESS-THAN SIGN */ ++ { 0x00000ba6L, 0x003e }, /* rightcaret > GREATER-THAN SIGN */ ++ { 0x00000ba8L, 0x2228 }, /* downcaret ∨ LOGICAL OR */ ++ { 0x00000ba9L, 0x2227 }, /* upcaret ∧ LOGICAL AND */ ++ { 0x00000bc0L, 0x00af }, /* overbar ¯ MACRON */ ++ { 0x00000bc2L, 0x22a5 }, /* downtack ⊥ UP TACK */ ++ { 0x00000bc3L, 0x2229 }, /* upshoe ∩ INTERSECTION */ ++ { 0x00000bc4L, 0x230a }, /* downstile ⌊ LEFT FLOOR */ ++ { 0x00000bc6L, 0x005f }, /* underbar _ LOW LINE */ ++ { 0x00000bcaL, 0x2218 }, /* jot ∘ RING OPERATOR */ ++ { 0x00000bccL, 0x2395 }, /* quad ⎕ APL FUNCTIONAL SYMBOL QUAD */ ++ { 0x00000bceL, 0x22a4 }, /* uptack ⊤ DOWN TACK */ ++ { 0x00000bcfL, 0x25cb }, /* circle ○ WHITE CIRCLE */ ++ { 0x00000bd3L, 0x2308 }, /* upstile ⌈ LEFT CEILING */ ++ { 0x00000bd6L, 0x222a }, /* downshoe ∪ UNION */ ++ { 0x00000bd8L, 0x2283 }, /* rightshoe ⊃ SUPERSET OF */ ++ { 0x00000bdaL, 0x2282 }, /* leftshoe ⊂ SUBSET OF */ ++ { 0x00000bdcL, 0x22a2 }, /* lefttack ⊢ RIGHT TACK */ ++ { 0x00000bfcL, 0x22a3 }, /* righttack ⊣ LEFT TACK */ ++ { 0x00000cdfL, 0x2017 }, /* hebrew_doublelowline ‗ DOUBLE LOW LINE */ ++ { 0x00000ce0L, 0x05d0 }, /* hebrew_aleph א HEBREW LETTER ALEF */ ++ { 0x00000ce1L, 0x05d1 }, /* hebrew_bet ב HEBREW LETTER BET */ ++ { 0x00000ce2L, 0x05d2 }, /* hebrew_gimel ג HEBREW LETTER GIMEL */ ++ { 0x00000ce3L, 0x05d3 }, /* hebrew_dalet ד HEBREW LETTER DALET */ ++ { 0x00000ce4L, 0x05d4 }, /* hebrew_he ה HEBREW LETTER HE */ ++ { 0x00000ce5L, 0x05d5 }, /* hebrew_waw ו HEBREW LETTER VAV */ ++ { 0x00000ce6L, 0x05d6 }, /* hebrew_zain ז HEBREW LETTER ZAYIN */ ++ { 0x00000ce7L, 0x05d7 }, /* hebrew_chet ח HEBREW LETTER HET */ ++ { 0x00000ce8L, 0x05d8 }, /* hebrew_tet ט HEBREW LETTER TET */ ++ { 0x00000ce9L, 0x05d9 }, /* hebrew_yod י HEBREW LETTER YOD */ ++ { 0x00000ceaL, 0x05da }, /* hebrew_finalkaph ך HEBREW LETTER FINAL KAF */ ++ { 0x00000cebL, 0x05db }, /* hebrew_kaph כ HEBREW LETTER KAF */ ++ { 0x00000cecL, 0x05dc }, /* hebrew_lamed ל HEBREW LETTER LAMED */ ++ { 0x00000cedL, 0x05dd }, /* hebrew_finalmem ם HEBREW LETTER FINAL MEM */ ++ { 0x00000ceeL, 0x05de }, /* hebrew_mem מ HEBREW LETTER MEM */ ++ { 0x00000cefL, 0x05df }, /* hebrew_finalnun ן HEBREW LETTER FINAL NUN */ ++ { 0x00000cf0L, 0x05e0 }, /* hebrew_nun נ HEBREW LETTER NUN */ ++ { 0x00000cf1L, 0x05e1 }, /* hebrew_samech ס HEBREW LETTER SAMEKH */ ++ { 0x00000cf2L, 0x05e2 }, /* hebrew_ayin ע HEBREW LETTER AYIN */ ++ { 0x00000cf3L, 0x05e3 }, /* hebrew_finalpe ף HEBREW LETTER FINAL PE */ ++ { 0x00000cf4L, 0x05e4 }, /* hebrew_pe פ HEBREW LETTER PE */ ++ { 0x00000cf5L, 0x05e5 }, /* hebrew_finalzade ץ HEBREW LETTER FINAL TSADI */ ++ { 0x00000cf6L, 0x05e6 }, /* hebrew_zade צ HEBREW LETTER TSADI */ ++ { 0x00000cf7L, 0x05e7 }, /* hebrew_qoph ק HEBREW LETTER TQOF */ ++ { 0x00000cf8L, 0x05e8 }, /* hebrew_resh ר HEBREW LETTER RESH */ ++ { 0x00000cf9L, 0x05e9 }, /* hebrew_shin ש HEBREW LETTER SHIN */ ++ { 0x00000cfaL, 0x05ea }, /* hebrew_taw ת HEBREW LETTER TAV */ ++ { 0x00000da1L, 0x0e01 }, /* Thai_kokai ก THAI CHARACTER KO KAI */ ++ { 0x00000da2L, 0x0e02 }, /* Thai_khokhai ข THAI CHARACTER KHO KHAI */ ++ { 0x00000da3L, 0x0e03 }, /* Thai_khokhuat ฃ THAI CHARACTER KHO KHUAT */ ++ { 0x00000da4L, 0x0e04 }, /* Thai_khokhwai ค THAI CHARACTER KHO KHWAI */ ++ { 0x00000da5L, 0x0e05 }, /* Thai_khokhon ฅ THAI CHARACTER KHO KHON */ ++ { 0x00000da6L, 0x0e06 }, /* Thai_khorakhang ฆ THAI CHARACTER KHO RAKHANG */ ++ { 0x00000da7L, 0x0e07 }, /* Thai_ngongu ง THAI CHARACTER NGO NGU */ ++ { 0x00000da8L, 0x0e08 }, /* Thai_chochan จ THAI CHARACTER CHO CHAN */ ++ { 0x00000da9L, 0x0e09 }, /* Thai_choching ฉ THAI CHARACTER CHO CHING */ ++ { 0x00000daaL, 0x0e0a }, /* Thai_chochang ช THAI CHARACTER CHO CHANG */ ++ { 0x00000dabL, 0x0e0b }, /* Thai_soso ซ THAI CHARACTER SO SO */ ++ { 0x00000dacL, 0x0e0c }, /* Thai_chochoe ฌ THAI CHARACTER CHO CHOE */ ++ { 0x00000dadL, 0x0e0d }, /* Thai_yoying ญ THAI CHARACTER YO YING */ ++ { 0x00000daeL, 0x0e0e }, /* Thai_dochada ฎ THAI CHARACTER DO CHADA */ ++ { 0x00000dafL, 0x0e0f }, /* Thai_topatak ฏ THAI CHARACTER TO PATAK */ ++ { 0x00000db0L, 0x0e10 }, /* Thai_thothan ฐ THAI CHARACTER THO THAN */ ++ { 0x00000db1L, 0x0e11 }, /* Thai_thonangmontho ฑ THAI CHARACTER THO NANGMONTHO */ ++ { 0x00000db2L, 0x0e12 }, /* Thai_thophuthao ฒ THAI CHARACTER THO PHUTHAO */ ++ { 0x00000db3L, 0x0e13 }, /* Thai_nonen ณ THAI CHARACTER NO NEN */ ++ { 0x00000db4L, 0x0e14 }, /* Thai_dodek ด THAI CHARACTER DO DEK */ ++ { 0x00000db5L, 0x0e15 }, /* Thai_totao ต THAI CHARACTER TO TAO */ ++ { 0x00000db6L, 0x0e16 }, /* Thai_thothung ถ THAI CHARACTER THO THUNG */ ++ { 0x00000db7L, 0x0e17 }, /* Thai_thothahan ท THAI CHARACTER THO THAHAN */ ++ { 0x00000db8L, 0x0e18 }, /* Thai_thothong ธ THAI CHARACTER THO THONG */ ++ { 0x00000db9L, 0x0e19 }, /* Thai_nonu น THAI CHARACTER NO NU */ ++ { 0x00000dbaL, 0x0e1a }, /* Thai_bobaimai บ THAI CHARACTER BO BAIMAI */ ++ { 0x00000dbbL, 0x0e1b }, /* Thai_popla ป THAI CHARACTER PO PLA */ ++ { 0x00000dbcL, 0x0e1c }, /* Thai_phophung ผ THAI CHARACTER PHO PHUNG */ ++ { 0x00000dbdL, 0x0e1d }, /* Thai_fofa ฝ THAI CHARACTER FO FA */ ++ { 0x00000dbeL, 0x0e1e }, /* Thai_phophan พ THAI CHARACTER PHO PHAN */ ++ { 0x00000dbfL, 0x0e1f }, /* Thai_fofan ฟ THAI CHARACTER FO FAN */ ++ { 0x00000dc0L, 0x0e20 }, /* Thai_phosamphao ภ THAI CHARACTER PHO SAMPHAO */ ++ { 0x00000dc1L, 0x0e21 }, /* Thai_moma ม THAI CHARACTER MO MA */ ++ { 0x00000dc2L, 0x0e22 }, /* Thai_yoyak ย THAI CHARACTER YO YAK */ ++ { 0x00000dc3L, 0x0e23 }, /* Thai_rorua ร THAI CHARACTER RO RUA */ ++ { 0x00000dc4L, 0x0e24 }, /* Thai_ru ฤ THAI CHARACTER RU */ ++ { 0x00000dc5L, 0x0e25 }, /* Thai_loling ล THAI CHARACTER LO LING */ ++ { 0x00000dc6L, 0x0e26 }, /* Thai_lu ฦ THAI CHARACTER LU */ ++ { 0x00000dc7L, 0x0e27 }, /* Thai_wowaen ว THAI CHARACTER WO WAEN */ ++ { 0x00000dc8L, 0x0e28 }, /* Thai_sosala ศ THAI CHARACTER SO SALA */ ++ { 0x00000dc9L, 0x0e29 }, /* Thai_sorusi ษ THAI CHARACTER SO RUSI */ ++ { 0x00000dcaL, 0x0e2a }, /* Thai_sosua ส THAI CHARACTER SO SUA */ ++ { 0x00000dcbL, 0x0e2b }, /* Thai_hohip ห THAI CHARACTER HO HIP */ ++ { 0x00000dccL, 0x0e2c }, /* Thai_lochula ฬ THAI CHARACTER LO CHULA */ ++ { 0x00000dcdL, 0x0e2d }, /* Thai_oang อ THAI CHARACTER O ANG */ ++ { 0x00000dceL, 0x0e2e }, /* Thai_honokhuk ฮ THAI CHARACTER HO NOKHUK */ ++ { 0x00000dcfL, 0x0e2f }, /* Thai_paiyannoi ฯ THAI CHARACTER PAIYANNOI */ ++ { 0x00000dd0L, 0x0e30 }, /* Thai_saraa ะ THAI CHARACTER SARA A */ ++ { 0x00000dd1L, 0x0e31 }, /* Thai_maihanakat ั THAI CHARACTER MAI HAN-AKAT */ ++ { 0x00000dd2L, 0x0e32 }, /* Thai_saraaa า THAI CHARACTER SARA AA */ ++ { 0x00000dd3L, 0x0e33 }, /* Thai_saraam ำ THAI CHARACTER SARA AM */ ++ { 0x00000dd4L, 0x0e34 }, /* Thai_sarai ิ THAI CHARACTER SARA I */ ++ { 0x00000dd5L, 0x0e35 }, /* Thai_saraii ี THAI CHARACTER SARA II */ ++ { 0x00000dd6L, 0x0e36 }, /* Thai_saraue ึ THAI CHARACTER SARA UE */ ++ { 0x00000dd7L, 0x0e37 }, /* Thai_sarauee ื THAI CHARACTER SARA UEE */ ++ { 0x00000dd8L, 0x0e38 }, /* Thai_sarau ุ THAI CHARACTER SARA U */ ++ { 0x00000dd9L, 0x0e39 }, /* Thai_sarauu ู THAI CHARACTER SARA UU */ ++ { 0x00000ddaL, 0x0e3a }, /* Thai_phinthu ฺ THAI CHARACTER PHINTHU */ ++/* 0x00000ddeL Thai_maihanakat_maitho ? ??? */ ++ { 0x00000ddfL, 0x0e3f }, /* Thai_baht ฿ THAI CURRENCY SYMBOL BAHT */ ++ { 0x00000de0L, 0x0e40 }, /* Thai_sarae เ THAI CHARACTER SARA E */ ++ { 0x00000de1L, 0x0e41 }, /* Thai_saraae แ THAI CHARACTER SARA AE */ ++ { 0x00000de2L, 0x0e42 }, /* Thai_sarao โ THAI CHARACTER SARA O */ ++ { 0x00000de3L, 0x0e43 }, /* Thai_saraaimaimuan ใ THAI CHARACTER SARA AI MAIMUAN */ ++ { 0x00000de4L, 0x0e44 }, /* Thai_saraaimaimalai ไ THAI CHARACTER SARA AI MAIMALAI */ ++ { 0x00000de5L, 0x0e45 }, /* Thai_lakkhangyao ๅ THAI CHARACTER LAKKHANGYAO */ ++ { 0x00000de6L, 0x0e46 }, /* Thai_maiyamok ๆ THAI CHARACTER MAIYAMOK */ ++ { 0x00000de7L, 0x0e47 }, /* Thai_maitaikhu ็ THAI CHARACTER MAITAIKHU */ ++ { 0x00000de8L, 0x0e48 }, /* Thai_maiek ่ THAI CHARACTER MAI EK */ ++ { 0x00000de9L, 0x0e49 }, /* Thai_maitho ้ THAI CHARACTER MAI THO */ ++ { 0x00000deaL, 0x0e4a }, /* Thai_maitri ๊ THAI CHARACTER MAI TRI */ ++ { 0x00000debL, 0x0e4b }, /* Thai_maichattawa ๋ THAI CHARACTER MAI CHATTAWA */ ++ { 0x00000decL, 0x0e4c }, /* Thai_thanthakhat ์ THAI CHARACTER THANTHAKHAT */ ++ { 0x00000dedL, 0x0e4d }, /* Thai_nikhahit ํ THAI CHARACTER NIKHAHIT */ ++ { 0x00000df0L, 0x0e50 }, /* Thai_leksun ๐ THAI DIGIT ZERO */ ++ { 0x00000df1L, 0x0e51 }, /* Thai_leknung ๑ THAI DIGIT ONE */ ++ { 0x00000df2L, 0x0e52 }, /* Thai_leksong ๒ THAI DIGIT TWO */ ++ { 0x00000df3L, 0x0e53 }, /* Thai_leksam ๓ THAI DIGIT THREE */ ++ { 0x00000df4L, 0x0e54 }, /* Thai_leksi ๔ THAI DIGIT FOUR */ ++ { 0x00000df5L, 0x0e55 }, /* Thai_lekha ๕ THAI DIGIT FIVE */ ++ { 0x00000df6L, 0x0e56 }, /* Thai_lekhok ๖ THAI DIGIT SIX */ ++ { 0x00000df7L, 0x0e57 }, /* Thai_lekchet ๗ THAI DIGIT SEVEN */ ++ { 0x00000df8L, 0x0e58 }, /* Thai_lekpaet ๘ THAI DIGIT EIGHT */ ++ { 0x00000df9L, 0x0e59 }, /* Thai_lekkao ๙ THAI DIGIT NINE */ ++ { 0x00000ea1L, 0x3131 }, /* Hangul_Kiyeog ㄱ HANGUL LETTER KIYEOK */ ++ { 0x00000ea2L, 0x3132 }, /* Hangul_SsangKiyeog ㄲ HANGUL LETTER SSANGKIYEOK */ ++ { 0x00000ea3L, 0x3133 }, /* Hangul_KiyeogSios ㄳ HANGUL LETTER KIYEOK-SIOS */ ++ { 0x00000ea4L, 0x3134 }, /* Hangul_Nieun ㄴ HANGUL LETTER NIEUN */ ++ { 0x00000ea5L, 0x3135 }, /* Hangul_NieunJieuj ㄵ HANGUL LETTER NIEUN-CIEUC */ ++ { 0x00000ea6L, 0x3136 }, /* Hangul_NieunHieuh ㄶ HANGUL LETTER NIEUN-HIEUH */ ++ { 0x00000ea7L, 0x3137 }, /* Hangul_Dikeud ㄷ HANGUL LETTER TIKEUT */ ++ { 0x00000ea8L, 0x3138 }, /* Hangul_SsangDikeud ㄸ HANGUL LETTER SSANGTIKEUT */ ++ { 0x00000ea9L, 0x3139 }, /* Hangul_Rieul ㄹ HANGUL LETTER RIEUL */ ++ { 0x00000eaaL, 0x313a }, /* Hangul_RieulKiyeog ㄺ HANGUL LETTER RIEUL-KIYEOK */ ++ { 0x00000eabL, 0x313b }, /* Hangul_RieulMieum ㄻ HANGUL LETTER RIEUL-MIEUM */ ++ { 0x00000eacL, 0x313c }, /* Hangul_RieulPieub ㄼ HANGUL LETTER RIEUL-PIEUP */ ++ { 0x00000eadL, 0x313d }, /* Hangul_RieulSios ㄽ HANGUL LETTER RIEUL-SIOS */ ++ { 0x00000eaeL, 0x313e }, /* Hangul_RieulTieut ㄾ HANGUL LETTER RIEUL-THIEUTH */ ++ { 0x00000eafL, 0x313f }, /* Hangul_RieulPhieuf ㄿ HANGUL LETTER RIEUL-PHIEUPH */ ++ { 0x00000eb0L, 0x3140 }, /* Hangul_RieulHieuh ㅀ HANGUL LETTER RIEUL-HIEUH */ ++ { 0x00000eb1L, 0x3141 }, /* Hangul_Mieum ㅁ HANGUL LETTER MIEUM */ ++ { 0x00000eb2L, 0x3142 }, /* Hangul_Pieub ㅂ HANGUL LETTER PIEUP */ ++ { 0x00000eb3L, 0x3143 }, /* Hangul_SsangPieub ㅃ HANGUL LETTER SSANGPIEUP */ ++ { 0x00000eb4L, 0x3144 }, /* Hangul_PieubSios ㅄ HANGUL LETTER PIEUP-SIOS */ ++ { 0x00000eb5L, 0x3145 }, /* Hangul_Sios ㅅ HANGUL LETTER SIOS */ ++ { 0x00000eb6L, 0x3146 }, /* Hangul_SsangSios ㅆ HANGUL LETTER SSANGSIOS */ ++ { 0x00000eb7L, 0x3147 }, /* Hangul_Ieung ㅇ HANGUL LETTER IEUNG */ ++ { 0x00000eb8L, 0x3148 }, /* Hangul_Jieuj ㅈ HANGUL LETTER CIEUC */ ++ { 0x00000eb9L, 0x3149 }, /* Hangul_SsangJieuj ㅉ HANGUL LETTER SSANGCIEUC */ ++ { 0x00000ebaL, 0x314a }, /* Hangul_Cieuc ㅊ HANGUL LETTER CHIEUCH */ ++ { 0x00000ebbL, 0x314b }, /* Hangul_Khieuq ㅋ HANGUL LETTER KHIEUKH */ ++ { 0x00000ebcL, 0x314c }, /* Hangul_Tieut ㅌ HANGUL LETTER THIEUTH */ ++ { 0x00000ebdL, 0x314d }, /* Hangul_Phieuf ㅍ HANGUL LETTER PHIEUPH */ ++ { 0x00000ebeL, 0x314e }, /* Hangul_Hieuh ㅎ HANGUL LETTER HIEUH */ ++ { 0x00000ebfL, 0x314f }, /* Hangul_A ㅏ HANGUL LETTER A */ ++ { 0x00000ec0L, 0x3150 }, /* Hangul_AE ㅐ HANGUL LETTER AE */ ++ { 0x00000ec1L, 0x3151 }, /* Hangul_YA ㅑ HANGUL LETTER YA */ ++ { 0x00000ec2L, 0x3152 }, /* Hangul_YAE ㅒ HANGUL LETTER YAE */ ++ { 0x00000ec3L, 0x3153 }, /* Hangul_EO ㅓ HANGUL LETTER EO */ ++ { 0x00000ec4L, 0x3154 }, /* Hangul_E ㅔ HANGUL LETTER E */ ++ { 0x00000ec5L, 0x3155 }, /* Hangul_YEO ㅕ HANGUL LETTER YEO */ ++ { 0x00000ec6L, 0x3156 }, /* Hangul_YE ㅖ HANGUL LETTER YE */ ++ { 0x00000ec7L, 0x3157 }, /* Hangul_O ㅗ HANGUL LETTER O */ ++ { 0x00000ec8L, 0x3158 }, /* Hangul_WA ㅘ HANGUL LETTER WA */ ++ { 0x00000ec9L, 0x3159 }, /* Hangul_WAE ㅙ HANGUL LETTER WAE */ ++ { 0x00000ecaL, 0x315a }, /* Hangul_OE ㅚ HANGUL LETTER OE */ ++ { 0x00000ecbL, 0x315b }, /* Hangul_YO ㅛ HANGUL LETTER YO */ ++ { 0x00000eccL, 0x315c }, /* Hangul_U ㅜ HANGUL LETTER U */ ++ { 0x00000ecdL, 0x315d }, /* Hangul_WEO ㅝ HANGUL LETTER WEO */ ++ { 0x00000eceL, 0x315e }, /* Hangul_WE ㅞ HANGUL LETTER WE */ ++ { 0x00000ecfL, 0x315f }, /* Hangul_WI ㅟ HANGUL LETTER WI */ ++ { 0x00000ed0L, 0x3160 }, /* Hangul_YU ㅠ HANGUL LETTER YU */ ++ { 0x00000ed1L, 0x3161 }, /* Hangul_EU ㅡ HANGUL LETTER EU */ ++ { 0x00000ed2L, 0x3162 }, /* Hangul_YI ㅢ HANGUL LETTER YI */ ++ { 0x00000ed3L, 0x3163 }, /* Hangul_I ㅣ HANGUL LETTER I */ ++ { 0x00000ed4L, 0x11a8 }, /* Hangul_J_Kiyeog ᆨ HANGUL JONGSEONG KIYEOK */ ++ { 0x00000ed5L, 0x11a9 }, /* Hangul_J_SsangKiyeog ᆩ HANGUL JONGSEONG SSANGKIYEOK */ ++ { 0x00000ed6L, 0x11aa }, /* Hangul_J_KiyeogSios ᆪ HANGUL JONGSEONG KIYEOK-SIOS */ ++ { 0x00000ed7L, 0x11ab }, /* Hangul_J_Nieun ᆫ HANGUL JONGSEONG NIEUN */ ++ { 0x00000ed8L, 0x11ac }, /* Hangul_J_NieunJieuj ᆬ HANGUL JONGSEONG NIEUN-CIEUC */ ++ { 0x00000ed9L, 0x11ad }, /* Hangul_J_NieunHieuh ᆭ HANGUL JONGSEONG NIEUN-HIEUH */ ++ { 0x00000edaL, 0x11ae }, /* Hangul_J_Dikeud ᆮ HANGUL JONGSEONG TIKEUT */ ++ { 0x00000edbL, 0x11af }, /* Hangul_J_Rieul ᆯ HANGUL JONGSEONG RIEUL */ ++ { 0x00000edcL, 0x11b0 }, /* Hangul_J_RieulKiyeog ᆰ HANGUL JONGSEONG RIEUL-KIYEOK */ ++ { 0x00000eddL, 0x11b1 }, /* Hangul_J_RieulMieum ᆱ HANGUL JONGSEONG RIEUL-MIEUM */ ++ { 0x00000edeL, 0x11b2 }, /* Hangul_J_RieulPieub ᆲ HANGUL JONGSEONG RIEUL-PIEUP */ ++ { 0x00000edfL, 0x11b3 }, /* Hangul_J_RieulSios ᆳ HANGUL JONGSEONG RIEUL-SIOS */ ++ { 0x00000ee0L, 0x11b4 }, /* Hangul_J_RieulTieut ᆴ HANGUL JONGSEONG RIEUL-THIEUTH */ ++ { 0x00000ee1L, 0x11b5 }, /* Hangul_J_RieulPhieuf ᆵ HANGUL JONGSEONG RIEUL-PHIEUPH */ ++ { 0x00000ee2L, 0x11b6 }, /* Hangul_J_RieulHieuh ᆶ HANGUL JONGSEONG RIEUL-HIEUH */ ++ { 0x00000ee3L, 0x11b7 }, /* Hangul_J_Mieum ᆷ HANGUL JONGSEONG MIEUM */ ++ { 0x00000ee4L, 0x11b8 }, /* Hangul_J_Pieub ᆸ HANGUL JONGSEONG PIEUP */ ++ { 0x00000ee5L, 0x11b9 }, /* Hangul_J_PieubSios ᆹ HANGUL JONGSEONG PIEUP-SIOS */ ++ { 0x00000ee6L, 0x11ba }, /* Hangul_J_Sios ᆺ HANGUL JONGSEONG SIOS */ ++ { 0x00000ee7L, 0x11bb }, /* Hangul_J_SsangSios ᆻ HANGUL JONGSEONG SSANGSIOS */ ++ { 0x00000ee8L, 0x11bc }, /* Hangul_J_Ieung ᆼ HANGUL JONGSEONG IEUNG */ ++ { 0x00000ee9L, 0x11bd }, /* Hangul_J_Jieuj ᆽ HANGUL JONGSEONG CIEUC */ ++ { 0x00000eeaL, 0x11be }, /* Hangul_J_Cieuc ᆾ HANGUL JONGSEONG CHIEUCH */ ++ { 0x00000eebL, 0x11bf }, /* Hangul_J_Khieuq ᆿ HANGUL JONGSEONG KHIEUKH */ ++ { 0x00000eecL, 0x11c0 }, /* Hangul_J_Tieut ᇀ HANGUL JONGSEONG THIEUTH */ ++ { 0x00000eedL, 0x11c1 }, /* Hangul_J_Phieuf ᇁ HANGUL JONGSEONG PHIEUPH */ ++ { 0x00000eeeL, 0x11c2 }, /* Hangul_J_Hieuh ᇂ HANGUL JONGSEONG HIEUH */ ++ { 0x00000eefL, 0x316d }, /* Hangul_RieulYeorinHieuh ㅭ HANGUL LETTER RIEUL-YEORINHIEUH */ ++ { 0x00000ef0L, 0x3171 }, /* Hangul_SunkyeongeumMieum ㅱ HANGUL LETTER KAPYEOUNMIEUM */ ++ { 0x00000ef1L, 0x3178 }, /* Hangul_SunkyeongeumPieub ㅸ HANGUL LETTER KAPYEOUNPIEUP */ ++ { 0x00000ef2L, 0x317f }, /* Hangul_PanSios ㅿ HANGUL LETTER PANSIOS */ ++ { 0x00000ef3L, 0x3181 }, /* Hangul_KkogjiDalrinIeung ㆁ HANGUL LETTER YESIEUNG */ ++ { 0x00000ef4L, 0x3184 }, /* Hangul_SunkyeongeumPhieuf ㆄ HANGUL LETTER KAPYEOUNPHIEUPH */ ++ { 0x00000ef5L, 0x3186 }, /* Hangul_YeorinHieuh ㆆ HANGUL LETTER YEORINHIEUH */ ++ { 0x00000ef6L, 0x318d }, /* Hangul_AraeA ㆍ HANGUL LETTER ARAEA */ ++ { 0x00000ef7L, 0x318e }, /* Hangul_AraeAE ㆎ HANGUL LETTER ARAEAE */ ++ { 0x00000ef8L, 0x11eb }, /* Hangul_J_PanSios ᇫ HANGUL JONGSEONG PANSIOS */ ++ { 0x00000ef9L, 0x11f0 }, /* Hangul_J_KkogjiDalrinIeung ᇰ HANGUL JONGSEONG YESIEUNG */ ++ { 0x00000efaL, 0x11f9 }, /* Hangul_J_YeorinHieuh ᇹ HANGUL JONGSEONG YEORINHIEUH */ ++ { 0x00000effL, 0x20a9 }, /* Korean_Won ₩ WON SIGN */ ++ { 0x000013a4L, 0x20ac }, /* Euro € EURO SIGN */ ++ { 0x000013bcL, 0x0152 }, /* OE Œ LATIN CAPITAL LIGATURE OE */ ++ { 0x000013bdL, 0x0153 }, /* oe œ LATIN SMALL LIGATURE OE */ ++ { 0x000013beL, 0x0178 }, /* Ydiaeresis Ÿ LATIN CAPITAL LETTER Y WITH DIAERESIS */ ++ { 0x000020acL, 0x20ac }, /* EuroSign € EURO SIGN */ ++ { 0x0000fe50L, 0x0060 }, /* dead_grave ` */ ++ { 0x0000fe51L, 0x00b4 }, /* dead_acute ´ */ ++ { 0x0000fe52L, 0x02c6 }, /* dead_circumflex ˆ */ ++ { 0x0000fe53L, 0x02dc }, /* dead_tilde ˜ small tilde */ ++ { 0x0000fe54L, 0x00af }, /* dead_macron ¯ */ ++ { 0x0000fe55L, 0x02d8 }, /* dead_breve ˘ */ ++ { 0x0000fe56L, 0x02d9 }, /* dead_abovedot ˙ */ ++ { 0x0000fe57L, 0x00a8 }, /* dead_diaeresis ¨ */ ++ { 0x0000fe58L, 0x02da }, /* dead_abovering ° */ ++ { 0x0000fe59L, 0x02dd }, /* dead_doubleacute ˝ */ ++ { 0x0000fe5aL, 0x02c7 }, /* dead_caron ˇ */ ++ { 0x0000fe5bL, 0x00b8 }, /* dead_cedilla ¸ */ ++ { 0x0000fe5cL, 0x02db }, /* dead_ogonek ˛ */ ++ { 0x0000fe5dL, 0x0269 }, /* dead_iota ɩ Latin small iota */ ++ { 0x0000fe60L, 0x002e }, /* dead_belowdot . period */ ++ { 0x0000fe61L, 0x02c0 }, /* dead_hook ˀ modifier letter glottal stop - eg actual=ẻ */ ++ { 0x0000fe62L, 0x1fbf }, /* dead_horn ᾽ Greek Psili, eg actual=ư */ ++ { 0x0000fe63L, 0x2215 }, /* dead_stroke ∕ division slash, eg actual=ɇ */ ++ { 0x0000fe64L, 0x1fbf }, /* dead_abovecomma ᾽ Greek Psili */ ++ { 0x0000fe65L, 0x1ffe }, /* dead_abovereversedcomma ῾ Greek Dasia */ ++ { 0x0000fe68L, 0x02cd }, /* dead_belowmacron ˍ modifier letter low macron, eg actual=ṯ */ ++ { 0x0000fe6eL, 0x201a }, /* dead_belowcomma ‚ quotesinglbase, eg actual=ț */ ++ { 0x01000300L, 0x0060 }, /* combining grave ` */ ++ { 0x01000301L, 0x00b4 }, /* combining acute ´ */ ++ { 0x01000302L, 0x02c6 }, /* combining circumflex above ˆ */ ++ { 0x01000303L, 0x02dc }, /* combining tilde above ˜ small tilde */ ++ { 0x01000304L, 0x00af }, /* combining macron above ¯ */ ++ { 0x01000306L, 0x02d8 }, /* combining breve above ˘ */ ++ { 0x01000307L, 0x02d9 }, /* combining dot above ˙ */ ++ { 0x01000308L, 0x00a8 }, /* combining diaeresis above ¨ */ ++ { 0x0100030aL, 0x02da }, /* combining ring above ° */ ++ { 0x0100030bL, 0x02dd }, /* combining Double Acute ˝ */ ++ { 0x0100030cL, 0x02c7 }, /* comb Háček/caron above ˇ */ ++ { 0x0100030dL, 0x02c8 }, /* comb vertical line above ˈ modifier letter vertical line */ ++ { 0x0100030fL, 0xfffd }, /* combining Double Grave � replacement character, nothing similar */ ++ { 0x01000311L, 0x1d54 }, /* combining Inverted Breve ᵔ modifier letter small top half o */ ++ { 0x01000313L, 0x1fbf }, /* combining Comma Above ᾽ Greek Psili */ ++ { 0x01000323L, 0x002e }, /* combining dot below . period */ ++ { 0x01000324L, 0x28c0 }, /* combining diaeresis below ⣀ BRAILLE PATTERN DOTS-78 */ ++ { 0x01000325L, 0x02f3 }, /* combining ring below ˳ */ ++ { 0x01000327L, 0x00b8 }, /* combining cedilla ¸ */ ++ { 0x01000328L, 0x02db }, /* combining ogonek ˛ */ ++ { 0x0100032cL, 0x02ec }, /* combining Háček/caron below ˬ modifier letter voicing */ ++ { 0x0100032dL, 0x2038 }, /* combining circumflex below ‸ caret */ ++ { 0x0100032eL, 0x1d17 }, /* combining breve below ᴗ latin small letter bottom half o */ ++ { 0x0100032fL, 0x1d16 }, /* comb Inverted Breve Below ᴖ latin small letter top half o */ ++ { 0x01000330L, 0x02f7 }, /* combining tilde below ˷ modifier letter low tilde */ ++ { 0x01000331L, 0x02cd }, /* combining macron below ˍ modifier letter low macron */ ++ { 0x01000332L, 0x005f }, /* combining Low Line _ */ ++ { 0x01000333L, 0x2017 }, /* combining Double Low Line ‗ */ ++ { 0x01000335L, 0x002d }, /* comb short stroke overlay - hyphen */ ++ { 0x01000336L, 0x2500 }, /* comb long stroke overlay ─ box drawings light horizontal */ ++ { 0x0100033eL, 0x02e2 }, /* combining vertical tilde ˢ modifier letter small s */ ++ { 0x0100035cL, 0x203f }, /* comb Double Breve Below ‿ undertie */ ++ { 0x0100035dL, 0xfffd }, /* combining Double Breve � replacement character, nothing similar */ ++ { 0x0100035eL, 0x203e }, /* comb Yerok/Double Macron ‾ overline */ ++ { 0x0100035fL, 0x005f }, /* comb Double Macron Below _ Low Line */ ++ { 0x01000360L, 0x2053 }, /* combining Double Tilde ⁓ swung dash */ ++}; ++ ++long keysym2ucs(KeySym keysym) ++{ ++ // first check for Latin-1 characters (1:1 mapping) ++ if ((keysym >= 0x0020 && keysym <= 0x007e) || ++ (keysym >= 0x00a0 && keysym <= 0x00ff)) ++ { ++ return keysym; ++ } ++ ++ // binary search in table ++ int min = 0; ++ int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; ++ int mid; ++ while (max >= min) ++ { ++ mid = (min + max) / 2; ++ if (keysymtab[mid].keysym < keysym) ++ { ++ min = mid + 1; ++ } ++ else if (keysymtab[mid].keysym > keysym) ++ { ++ max = mid - 1; ++ } ++ else ++ { ++ return keysymtab[mid].ucs; // found it ++ } ++ } ++ ++ /* also check for directly encoded 24-bit UCS characters */ ++ if ((keysym & 0xff000000) == 0x01000000) ++ { ++ return keysym & 0x00ffffff; ++ } ++ ++ // no matching value found ++ return -1; ++} +--- /dev/null ++++ src/Xutils.h +@@ -0,0 +1,24 @@ ++/*************************************************************************** ++ * This program is free software; you can redistribute it and/or modify * ++ * it under the terms of the GNU General Public License as published by * ++ * the Free Software Foundation; either version 2 of the License, or * ++ * (at your option) any later version. * ++ * * ++ * This program is distributed in the hope that it will be useful, * ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++ * GNU General Public License for more details. * ++ * * ++ * You should have received a copy of the GNU General Public License * ++ * along with this program; if not, write to the * ++ * Free Software Foundation, Inc., * ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ++ ***************************************************************************/ ++#ifndef XUTILS_H ++#define XUTILS_H ++ ++#include ++ ++long keysym2ucs(KeySym keysym); ++ ++#endif +--- src/main.cpp ++++ src/main.cpp +@@ -187 +187 @@ +- TDEAboutData::License_GPL, "(C) 2007 Todor Gyumyushev", 0, 0, "yodor@developer.bg"); ++ TDEAboutData::License_GPL, "(C) 2007 Todor Gyumyushev", 0, 0, "http://bugs.trinitydesktop.org"); +@@ -215 +214,0 @@ +- +--- src/numpadvbutton.cpp ++++ src/numpadvbutton.cpp +@@ -36,2 +36 @@ +- TQPushButton::setText(u); +- VButton::setKeyCode(numlock_code); ++ TQPushButton::setText(shiftText); +@@ -40,2 +39 @@ +- TQPushButton::setText(l); +- VButton::setKeyCode(cursor_code); ++ TQPushButton::setText(normalText); +@@ -43,7 +40,0 @@ +-} +- +-void NumpadVButton::setKeyCode(unsigned int numpad_keycode, unsigned int cursor_keycode) +-{ +- cursor_code = cursor_keycode; +- numlock_code = numpad_keycode; +- VButton::setKeyCode(cursor_code); +--- src/numpadvbutton.h ++++ src/numpadvbutton.h +@@ -33,8 +33,2 @@ +- NumpadVButton(TQWidget *parent = 0, const char *name = 0); +- ~NumpadVButton(); +- void numlockPressed(bool press); +- void setKeyCode(unsigned int keycode, unsigned int n_keycode); +- +-private: +- unsigned int numlock_code; +- unsigned int cursor_code; ++ NumpadVButton(TQWidget *parent = 0, const char *name = 0); ++ ~NumpadVButton(); +@@ -41,0 +36 @@ ++ void numlockPressed(bool press); +--- src/resizabledragwidget.cpp ++++ src/resizabledragwidget.cpp +@@ -28,2 +28 @@ +-rsz=false; +- ++ rsz=false; +@@ -38,0 +38,4 @@ ++ if (locked) ++ { ++ return; ++ } +@@ -64 +66,0 @@ +- +@@ -78,0 +81,9 @@ ++ drawResizeHandle(); ++} ++ ++void ResizableDragWidget::drawResizeHandle() ++{ ++ if (locked) ++ { ++ return; ++ } +@@ -81,3 +92,2 @@ +- +- for (int a=0;a<20;a+=5){ +- ++ for (int a = 0; a < 20; a += 5) ++ { +@@ -89 +98,0 @@ +- +--- src/resizabledragwidget.h ++++ src/resizabledragwidget.h +@@ -34,0 +35,2 @@ ++ ++ void drawResizeHandle(); diff --git a/Apps/kvkbd/doc/en/config-menu.png b/Apps/kvkbd/doc/en/config-menu.png index 9224d66..e4a39f1 100644 Binary files a/Apps/kvkbd/doc/en/config-menu.png and b/Apps/kvkbd/doc/en/config-menu.png differ diff --git a/Apps/kvkbd/doc/en/index.docbook b/Apps/kvkbd/doc/en/index.docbook index 85105a8..7270dc3 100644 --- a/Apps/kvkbd/doc/en/index.docbook +++ b/Apps/kvkbd/doc/en/index.docbook @@ -2,6 +2,7 @@ Kvkbd"> xmodmap"> + Caps"> Alt Gr"> @@ -36,7 +37,7 @@ &FDLNotice; -2020 +2021 0.4.8 &tde; @@ -57,8 +58,8 @@ Introduction &kvkbd; is a simple virtual keyboard for &tde;. -It can be used instead of a physical keyboard or for devices with a touch screen but no keyboard. -It is also useful to quickly test a keyboard mapping to locate some keys. +It can be used with, or instead of, a physical keyboard or for devices with a touch screen but no keyboard. +It is also useful for displaying a keyboard mapping to identify what characters are defined. @@ -81,23 +82,31 @@ When first launched, &kvkbd; will appear in the bottom-right corner of the scree - + To use the numeric keypad, click the double arrow on the right. The Num pad display can be toggled by clicking on the Num Lock key №. - -To display and select the shift characters, use both &Shift; keys: - • Click either &Shift; key, which will 'lock', and then the other &Shift; key and the shift characters will be displayed. + +To display and select the shift characters: + • Click either &Shift; key, which will 'lock', and the shift characters will be displayed.  • Then click on the character to print it. -Otherwise, if you know which key the shift character is on, then the expected behaviour applies, and &Shift; 'key' will print it. Spanish keyboard shift characters: + +3rd & 4th level characters which are printed using &AltGr; & &AltGr;+&Shift; as modifier keys, can be displayed and printed in a similar way. + +There are therefore six sets of characters which can be displayed - + +Lower  &Shift;  &Caps;  &Caps;+&Shift;  &AltGr;  &AltGr;+&Shift; + +&Caps; can be used with &AltGr; & &AltGr;+&Shift; and mostly gives the correct display, but may not depending on how the unicode character has been defined. + @@ -107,11 +116,11 @@ The &kvkbd; configuration menu is accessible by clicking on the configuration bu -Select "Font" to choose the font used to display the characters on the keys. -Check "Auto Resize Font" to resize the font when &kvkbd; is resized. -Select "Keyboard color" to choose a colour for the keyboard [background]. +Select "Font" to choose the font used to display the characters and text on the keys. +Allows selection of the style and size. +Check "Auto Resize Font" for the font size to change as the keyboard is resized. +Select "Background color" to choose a colour for the keyboard background. Select "Key color" to choose a colour for the keys/buttons. -&kvkbd; needs to be restarted for the chosen colour to display. Check "Dock Widget" to display a small dock which can be placed anywhere on screen. Click on the dock to hide or show the virtual keyboard. Check "Lock on screen" to fix the position and size of the keyboard on the screen. @@ -121,11 +130,17 @@ Select "Font" to choose the font used to displa Keys -The &kvkbd; keyboard is based on the US layout with an extra key to the right of Left &Shift; for non-US keyboards - the extra key duplicates < and > characters on the US keyboard. +The &kvkbd; keyboard is based on the US layout with an extra key to the right of Left &Shift; for non-US keyboards - the extra key duplicates the '<' and '>' characters on the US keyboard. For non-US keyboards, the key which is normally lower left of the &Enter; key is placed above the &Enter; key. -Where set up in the keyboard mapping file, &AltGr; will enable selection of the character mapped to the lower right of any key, and &AltGr; &Shift; for any upper right character. +&AltGr; will enable selection of the character mapped to the lower right of any key, and &AltGr; &Shift; for any upper right character where they have been set up in the keyboard mapping file [<path_to>/X11/xkb/symbols/]. + +Note that there are two possible gotchas in displaying the &AltGr; characters: + +  • they tend to be less commonly used and might not have glyphs in the font being used, + +  • the keyboard mapping file needs to include "level3(ralt_switch)" for the variant being used. The &Shift;, &Ctrl;, Alt* keys 'lock' when clicked to simulate holding down a key on a physical keyboard. @@ -136,7 +151,7 @@ Whether the *Win keys 'lock' will depend on the build time opti Dead Keys Using &Shift; and/or &AltGr; which need press and hold on a physical keyboard will need click only for &kvkbd;. -For example, using the AD11 key [ ˆ ] on the oss variant of the French[fr]/azerty keyboard: +For example, using the AD11 key [ ˆ ] on the oss variant of the French keyboard: setxkbmap fr -variant oss @@ -149,16 +164,16 @@ Using &Shift; and/or &AltGr; which need press and hold on a physical keyboard wi K/B press: ˆ o - &Shift;+ˆ u + &Shift;+¨ u &AltGr;+ˆ e - &AltGr;+&Shift;+ˆ a + &AltGr;+&Shift;+¨ a &kvkbd; click:  ˆ o - &Shift; ˆ u  - &AltGr; ˆ e  - &AltGr; &Shift; ˆ a + &Shift; ¨ u  + &AltGr; ˜ e  + &AltGr; &Shift; ° a Printed: @@ -169,7 +184,7 @@ Using &Shift; and/or &AltGr; which need press and hold on a physical keyboard wi -Note that &kvkbd; is compiled for keycodes defined by evdev » /etc/X11/xkb/keycodes/evdev. +Note that &kvkbd; is compiled for keycodes defined by evdev » /etc/X11/xkb/keycodes/evdev. &kvkbd; will have reduced functionality in systems using another keycode definitions file which can be checked by: • running xev in a konsole • pressing or clicking Menu @@ -178,6 +193,45 @@ Using &Shift; and/or &AltGr; which need press and hold on a physical keyboard wi + +Combining Keys for diacritics + +A similar function to dead keys, but they follow the handwriting sequence of character+diacritic. +For example, using the AE12 key [ ´ ] on the ru-recom variant of the German keyboard: +setxkbmap de -variant ru-recom + + + Character: + combining acute  + combining grave + combining dot below + ́combining dot above + + + K/B press: + o ´ + u &Shift;+` + e &AltGr;+´ + a &AltGr;+&Shift;+` + + + &kvkbd; click:  + о ´ + у &Shift; `  + е &AltGr; .  + а &AltGr; &Shift; ˙ + + + Printed: + о́ + у̀ + е̣ + а̇ + + + + + @@ -202,7 +256,7 @@ and make the changes there from the configuration menu. Add kvkbd.desktop to the &tde; Autostart directory for &kvkbd; to run when &tde; starts. -For a specific keyboard layout: +For a specific keyboard layout: [§]  Exec=setxkbmap <xx>;kvkbd @@ -217,7 +271,7 @@ Add kvkbd.desktop to the &tde; Autostart directory for &kvk  Exec=setxkbmap -option compose:menu <xx>;xmodmap -e 'keycode 133=quotedbl';xmodmap -e 'keycode 134=asterisk';kvkbd - +[§] See /etc/X11/xkb/rules/evdev.lst for a list of layouts, variants, and options. @@ -225,7 +279,7 @@ Add kvkbd.desktop to the &tde; Autostart directory for &kvk Layout switching -&kvkbd; will dynamically switch keyboard layouts as they are changed, either through the command line or using the &tde; Keyboard Tool. +&kvkbd; will dynamically switch keyboard layouts as they are changed, either through the command line, with setxkbmap, or using the &tde; Keyboard Tool. Refer to the &kxkb; Handbook for details on keyboard layout switching. @@ -242,7 +296,7 @@ Refer to the &kxkb; Handbook for deta Key mapping -Using the compose option for setxkbmap, it could be useful for example to set the Menu key as the compose key to set up user specified characters or character strings. +Using the compose option for setxkbmap, it could be useful for example to set Menu as the compose key to set up user specified characters or character strings. Examples @@ -251,7 +305,7 @@ Using the compose option for setxkbmap, i Add the Euro symbol for a US keyboard [¹] • Add <Multi_key> <e> <r> : U20AC # "€" EuroSign to ~/.XCompose [²] • Run setxkbmap -option compose:menu us - • Start new konsole or editor + • Start a new konsole or editor • Click Menu e r .. and € should be displayed @@ -259,14 +313,14 @@ Using the compose option for setxkbmap, i Add a shortcut for a frequently used text string • Add <Multi_key> <t> <r> : "&tde; rocks" to ~/.XCompose • Run setxkbmap -option compose:menu <xx> - • Start new konsole or editor + • Start a new konsole or editor • Click Menu t r .. and &tde; rocks should be displayed Assign keycodes &xmmp; can be used to assign keycodes to any key. -If &kvkbd; has been built for the Win keys to function as non-control keys, they can conveniently be used for frequently used characters which might otherwise be more cumbersome to generate. +If &kvkbd; has been built for the Win keys not to function as modifier keys, they can conveniently be used for frequently used characters which might otherwise be more cumbersome to generate. For example, the " and * characters on a gb keyboard are &Shift;+2 and &Shift;+8, and they could be assigned to the Win keys: &xmmp; -e 'keycode 133=quotedbl' &xmmp; -e 'keycode 134=asterisk' @@ -286,7 +340,7 @@ Then LWin would print " and -As an example -- a-ogonek [U0105] + combining acute [U0301] -- ą́́ +As an example -- a-ogonek 'ą' [U0105] + combining acute '´' [U0301]́ Add the character and chosen key combination to the ~/.XCompose file: @@ -299,7 +353,7 @@ Test: • Start new editor - • Print the character:   Menu space a + • Print the character:   Menu space a → ą́ diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 501ff97..7df4dcc 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -33,16 +33,16 @@ getsource_fn untar_fn -# ### 2021-02-12 -## These changes are being merged piecemeal to git resulting in patches, and the build, failing. -## This script will be updated when all merges have been completed, but meanwhile, to build kvkbd with these patches, revert the repo to compatible revisions +# ### 2021-04-16 +## These patches could be broken by ongoing development. +## To build kvkbd with these patches, revert the repo to revisions known to work [[ $TDEVERSION != 14.0.9 ]] && { (cd $BUILD_TDE_ROOT/src/cgit/$PRGNAM/ git reset HEAD * rm -rf .git/worktrees/* ## don't need info about 'detached HEAD' state - only using the repo as a build source git config advice.detachedHead false -[[ $TDEVERSION == 14.1.0 ]] && git checkout -f 2a5540d || git checkout -f 2882ff6 +[[ $TDEVERSION == 14.1.0 ]] && git checkout -f 4c4e0c2 || git checkout -f df2b743 ## overwrite the files in the build area set up by untar_fn with the source now in 'detached HEAD' state .. echo -e "\n copying $PRGNAM 'detached HEAD' state sources to build area ... \n" (cd $BUILD_TDE_ROOT/src/cgit @@ -50,7 +50,7 @@ cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/ cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) ## and then switch back to master branch ready for the next pull .. -echo -e "\n ### Switching cgit source to master branch ### \n" +echo -e "\n ### Switching cgit source back to master branch ### \n" git checkout master echo ) @@ -68,925 +68,205 @@ sed -i '/CSS Color themes/d' README ## which I feel provides a better presentation. The help file displays as intended. sed -i 's|--check --cache index.cache.bz2|--cache index.cache.bz2|' cmake/modules/TDEMacros.cmake -## These patches are applied in chunks to identify the changes being made and allow any particular change to be easily identified and removed if required - -## Add a key, LSGT, between 'left shift' and 'z' for non-US keyboards. -## This duplicates '<' and '>' characters for US keyboards, but otherwise leaves the US keyboard fully functional. -## The key which is normally lower left of Enter on non-US keyboards is above the Enter key. -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -# -## add a key[code] to row 4 -@@ -46 +46 @@ --#define R4LEN 7 -+#define R4LEN 8 -# -## add keycode 94 key between l-shift and z key -## gb=\| fr=<> de=<>| [us=<>] etc -@@ -72,3 +72,3 @@ -- //TQString k4="zxcvbnm"; //,./"; -- //TQString k4s="ZXCVBNM"; -- unsigned int kc4[R4LEN] = {52,53,54,55,56,57,58};//59,60,61}; -+ //TQString k4="resize ( 80,30 ); -+ lshft->resize ( 45,30 ); -# -## remove one key space after left shift -## and fix spacing -@@ -262 +262 @@ -- v->move ( stx+35+16+35+ ( 35*a ),sty+ ( 4*35 ) ); -+ v->move ( stx+lshft->width() +5+ ( 35*a ),sty+ ( 4*35 ) ); -EOF - -## Add RWin button -patch -N -p0 << EOF || true -## new button added ---- src/MainWidget.h -+++ src/MainWidget.h -@@ -96,2 +96,3 @@ - VButton *win; -+ VButton *rwin; - VButton *mnu; ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -# -## RWin 'locks' with mouse click -@@ -353,2 +354,11 @@ - -+ rwin = new VButton ( this,"" ); -+ rwin->resize ( 50,30 ); -+ rwin->move ( ralt->x() +ralt->width() +5, sty+ ( 5*35 ) ); -+ rwin->setText ( "RWin" ); -+ rwin->setKeyCode ( 134 ); -+ rwin->setToggleButton ( true ); -+ mod_keys.append( rwin ); -+ rwin->res(); -+ - -# -## Menu now follows RWin not Alt Gr -@@ -355,4 +364,4 @@ - mnu = new VButton ( this,"" ); -- mnu->resize ( 45,30 ); -- mnu->move ( 5+ralt->x() +ralt->width(), sty+ ( 5*35 ) ); -+ mnu->resize ( 50,30 ); -+ mnu->move ( rwin->x() +rwin->width() +5, sty+ ( 5*35 ) ); - mnu->setText ( "Menu" ); -EOF - -## Fix keycodes for evdev mapping: -## Right shift, LWin, AltGr, Menu, Right Ctrl, Num pad divide, Num pad Enter -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -296 +296 @@ -- rshft->setKeyCode ( 50 ); -+ rshft->setKeyCode ( 62 ); -@@ -321 +321 @@ -- win->setKeyCode ( 115 ); -+ win->setKeyCode ( 133 ); -@@ -349 +349 @@ -- ralt->setKeyCode ( 113 ); -+ ralt->setKeyCode ( 108 ); -@@ -368 +368 @@ -- mnu->setKeyCode ( 117 ); -+ mnu->setKeyCode ( 135 ); -@@ -379 +379 @@ -- rctrl->setKeyCode ( 37 ); -+ rctrl->setKeyCode ( 105 ); -@@ -468 +468 @@ -- div->setKeyCode(112); -+ div->setKeyCode(106); -@@ -485 +485 @@ -- ent->setKeyCode(36); -+ ent->setKeyCode(104); -EOF - -## Cosmetic changes: -## Set F4-F5 spacing as per F8-F9 -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -97 +97 @@ -- f->move ( stx+esc->width() + ( 35*a ) +20,sty ); -+ f->move ( stx+esc->width() +30 + ( 35*a ),sty ); -@@ -107 +107 @@ -- f->move ( stx+esc->width() + ( 35*a ) +40+ ( 4*35 ),sty ); -+ f->move ( stx+esc->width() +30 + ( 4*35 ) +14 + ( 35*a ),sty ); -@@ -118 +118 @@ -- f->move ( stx+esc->width() + ( 35*a ) +45+ ( 8*35 ) +10,sty ); -+ f->move ( stx+esc->width() +30 + ( 8*35 ) +28 + ( 35*a ),sty ); -# -## resize keys for alignment on right side of keyboard -@@ -139 +139 @@ -- bksp->resize ( 46,30 ); -+ bksp->resize ( 48,30 ); -@@ -149 +149 @@ -- tab->resize ( 47,30 ); -+ tab->resize ( 48,30 ); -## reduce size of Dock image -@@ -938 +938 @@ -- resize ( 96,47 ); -+ resize ( 64,31 ); -EOF - -## Revise positions of keys and reformat code to represent the calculations left-to-right -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -219,3 +219,3 @@ - smcl->setKeyCode ( 47 ); -- smcl->move ( stx+ ( R3LEN *35 ) +caps->width() +5,sty+ ( 3*35 ) ); -+ smcl->move ( stx+caps->width() +5+ ( R3LEN *35 ) ,sty+ ( 3*35 ) ); - //smcl->setText ( ";" ); -@@ -228,3 +228,3 @@ - sngq->setKeyCode ( 48 ); -- sngq->move ( stx+ ( ( R3LEN +1 ) *35 ) +caps->width() +5,sty+ ( 3*35 ) ); -+ sngq->move ( stx+caps->width() +5+ ( ( R3LEN +1 ) *35 ) ,sty+ ( 3*35 ) ); - //sngq->setText ( "'" ); -@@ -237,3 +237,3 @@ - enter->setKeyCode ( 36 ); -- enter->move ( stx+ ( ( R3LEN +2 ) *35 ) +caps->width() +5,sty+ ( 3*35 ) ); -+ enter->move ( stx+caps->width() +5+ ( ( R3LEN +2 ) *35 ) ,sty+ ( 3*35 ) ); - enter->resize ( 50,30 ); -@@ -269,3 +269,3 @@ - sm->setKeyCode ( 59 ); -- sm->move ( stx+ ( R4LEN *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); -+ sm->move ( stx+lshft->width() +5+ ( R4LEN *35 ) ,sty+ ( 4*35 ) ); - //sm->setText ( "," ); -@@ -278,3 +278,3 @@ - gr->setKeyCode ( 60 ); -- gr->move ( stx+ ( ( R4LEN +1 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); -+ gr->move ( stx+lshft->width() +5+ ( ( R4LEN +1 ) *35 ) ,sty+ ( 4*35 ) ); - //gr->setText ( "." ); -@@ -287,3 +287,3 @@ - sl->setKeyCode ( 61 ); -- sl->move ( stx+ ( ( R4LEN +2 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); -+ sl->move ( stx+lshft->width() +5+ ( ( R4LEN +2 ) *35 ) ,sty+ ( 4*35 ) ); - //sl->setText ( "/" ); -@@ -296,3 +296,3 @@ - rshft->setKeyCode ( 62 ); -- rshft->move ( stx+ ( ( R4LEN +3 ) *35 ) +lshft->width() +5,sty+ ( 4*35 ) ); -+ rshft->move ( stx+lshft->width() +5+ ( ( R4LEN +3 ) *35 ) ,sty+ ( 4*35 ) ); - rshft->resize ( 68,30 ); -@@ -305,3 +305,3 @@ - -- -+ //ROW 5 - lctrl = new VButton ( this,"" ); -@@ -317,5 +317,5 @@ - win = new VButton ( this,"" ); -- win->resize ( 45,30 ); -- win->move ( 5+lctrl->x() +lctrl->width(), sty+ ( 5*35 ) ); -- win->setText ( "Win" ); -+ win->resize ( 50,30 ); -+ win->move ( lctrl->x() +lctrl->width() +5, sty+ ( 5*35 ) ); -+ win->setText ( "LWin" ); - win->setKeyCode ( 133 ); -@@ -328,3 +328,3 @@ - lalt->resize ( 45,30 ); -- lalt->move ( 5+win->x() +win->width(), sty+ ( 5*35 ) ); -+ lalt->move ( win->x() +win->width() +5, sty+ ( 5*35 ) ); - lalt->setText ( "Alt" ); -@@ -338,4 +338,4 @@ - space->setKeyCode ( 65 ); -- space->resize ( 5*35+28,30 ); -- space->move ( 5+lalt->x() +lalt->width(),sty+ ( 5*35 ) ); -+ space->resize ( 133,30 ); -+ space->move ( lalt->x() +lalt->width() +5, sty+ ( 5*35 ) ); - connect ( space, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); -@@ -345,4 +345,4 @@ - ralt = new VButton ( this,"" ); -- ralt->resize ( 45,30 ); -- ralt->move ( 5+space->x() +space->width(), sty+ ( 5*35 ) ); -+ ralt->resize ( 50,30 ); -+ ralt->move ( space->x() +space->width() +5, sty+ ( 5*35 ) ); - ralt->setText ( "AltGr" ); -@@ -376,3 +376,3 @@ - rctrl->resize ( 45,30 ); -- rctrl->move ( 5+mnu->x() +mnu->width(), sty+ ( 5*35 ) ); -+ rctrl->move ( mnu->x() +mnu->width() +5, sty+ ( 5*35 ) ); - rctrl->setText ( "Ctrl" ); -EOF +## Update 14.0.9 to development known working revision +[[ $TDEVERSION == 14.0.9 ]] && { +patch -p0 < $SRCDIR/backport.patch +} -## Replace text on Num pad keys for a better fit +## development build changes .. +## change num-pad keys text +[[ $(cat $TMPVARS/Kvkbd_OPTS) == *numpad* ]] && { +echo -e "\033[36;1m"'patching for num-pad text ..'"\033[0m" patch -N -p0 << EOF || true --- src/MainWidget.cpp +++ src/MainWidget.cpp -@@ -411 +411 @@ +@@ -408 +408 @@ - TQString txt[9] = { "Ho\nme", TQString::fromUtf8("▲"), "Pg\nUp", + TQString txt[9] = { TQString::fromUtf8("H\u2190"), TQString::fromUtf8("▲"), TQString::fromUtf8("P\u2191"), -@@ -413 +413 @@ +@@ -410 +410 @@ - "End", TQString::fromUtf8("▼"), "Pg\nDn" }; + TQString::fromUtf8("E\u2192"), TQString::fromUtf8("▼"), TQString::fromUtf8("P\u2193") }; -@@ -457 +457 @@ +@@ -453 +453 @@ - numl->setText("Num\nLock"); + numl->setText(TQString::fromUtf8("\u2116")); +@@ -479 +479 @@ +- ent->setText("En\nter"); ++ ent->setText("Ent"); EOF +} - -## dead_* characters don't display on keys, so add single click printable character equivalents -## to display on keys - the printed character remains as dead_ -## Only needed for levels 0 and 1 - higher levels don't show on keys -## NoSymbol shows as an outline square [.notdef] on keys - replace with space=blank -## Re: MainWidget.cpp "* therefore keysymtab[] must remain SORTED by keysym value." -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -1008,2 +1030,3 @@ - } keysymtab[] = { -+ { 0x0000, 0x0020 }, /* NoSymbol -> <- space */ - { 0x01a1, 0x0104 }, /* Aogonek Ą LATIN CAPITAL LETTER A WITH OGONEK */ -@@ -1781,2 +1782,18 @@ - { 0x20ac, 0x20ac }, /* EuroSign € EURO SIGN */ -+ { 0xfe50, 0x0060 }, /* dead_grave \` */ -+ { 0xfe51, 0x00b4 }, /* dead_acute ´ */ -+ { 0xfe52, 0x02c6 }, /* dead_circumflex ˆ */ -+ { 0xfe53, 0x02dc }, /* dead_tilde ˜ small tilde */ -+ { 0xfe54, 0x00af }, /* dead_macron ¯ */ -+ { 0xfe55, 0x02d8 }, /* dead_breve ˘ */ -+ { 0xfe56, 0x02d9 }, /* dead_abovedot ˙ */ -+ { 0xfe57, 0x00a8 }, /* dead_diaeresis ¨ */ -+ { 0xfe58, 0x02da }, /* dead_abovering ° */ -+ { 0xfe59, 0x02dd }, /* dead_doubleacute ˝ */ -+ { 0xfe5a, 0x02c7 }, /* dead_caron ˇ */ -+ { 0xfe5b, 0x00b8 }, /* dead_cedilla ¸ */ -+ { 0xfe5c, 0x02db }, /* dead_ogonek ˛ */ -+ { 0xfe5d, 0x0269 }, /* dead_iota ɩ Latin small iota */ -+ { 0xfe64, 0x1fbf }, /* dead_abovecomma ᾽ Greek Psili */ -+ { 0xfe65, 0x1ffe }, /* dead_abovereversedcomma ῾ Greek Dasia */ - }; -EOF - -## add a tooltip for the panel icon -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -1834,3 +1834,3 @@ - { -- -+ TQToolTip::add ( this, "Virtual keyboard" ); - } -EOF - -## Fix Num pad numbers where 0-9 aren't the non-shift characters on the keyboard -## E.g. for fr, the num pad '1' [KP_1 keycode 87] appears as '&' [keycode 10] when Num Lock is on -## And fix Del keycode so that KP_Separator prints correctly, eg for gr = comma -## This is a quick-and-dirty fix because it effectively means that this routine is redundant. -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -416 +416 @@ -- int nval[9] = {16,17,18,13,14,15,10,11,12}; -+ int nval[9] = {79,80,81,83,84,85,87,88,89}; -@@ -436 +436 @@ -- ins->setKeyCode(19,90); -+ ins->setKeyCode(90,90); -@@ -448 +448 @@ -- del->setKeyCode(60,91); -+ del->setKeyCode(91,91); -EOF - - -## kvkbd --background doesn't work, so -## set a default keyboard background colour -## Changeable from configuration menu -# -## for the plastik and keramik styles which have a key boundary within the key 30x30 footprint, -## setting the button/key background colour will bleed through outside that boundary -## except for the configuration button and the num pad keys, which follow these two lines. -## Moving these settings to the beginning of MainWidget::MainWidget enables all keys to be displayed correctly. -# -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -79,2 +79,5 @@ - -+ setPaletteBackgroundColor ( TQColor("#cdc0b0") ); -+ setFocusPolicy ( TQ_NoFocus ); -+ - // resize ( 550,235 ); -@@ -405,5 +408,2 @@ - -- setPaletteBackgroundColor ( TQt::black ); -- setFocusPolicy ( TQ_NoFocus ); -- - -EOF - - -## use icons for quit and num pad show/hide buttons -## these are the 16x16/actions icons used for the system selected icon set +## set small icons to better fit on buttons for keyboard used at default size +[[ $(cat $TMPVARS/Kvkbd_OPTS) == *icons* ]] && { +echo -e "\033[36;1m"'patching for small icons ..'"\033[0m" patch -N -p0 << EOF || true --- src/MainWidget.cpp +++ src/MainWidget.cpp -# -## num pad show button -@@ -400 +400 @@ -- extent->setText(">>"); -+ extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap()); -@@ -698 +698 @@ -- extent->setText(">>"); +@@ -380 +380 @@ +- quit->setPixmap(TQIconSet(SmallIcon("application-exit", TDEIcon::SizeMedium)).pixmap()); ++ quit->setPixmap(TQIconSet(SmallIcon("application-exit")).pixmap()); +@@ -391 +391 @@ +- extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward", TDEIcon::SizeMedium)).pixmap()); ++ extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward")).pixmap()); +@@ -396 +396 @@ +- extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward", TDEIcon::SizeMedium)).pixmap()); + extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap()); -# -## num pad hide button -@@ -702 +702 @@ -- extent->setText("<<"); +@@ -561 +561 @@ +- popup_menu->setPixmap(TQIconSet(SmallIcon("configure", TDEIcon::SizeMedium)).pixmap()); ++ popup_menu->setPixmap(TQIconSet(SmallIcon("configure")).pixmap()); +@@ -748 +748 @@ +- extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward", TDEIcon::SizeMedium)).pixmap()); ++ extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap()); +@@ -754 +754 @@ +- extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward", TDEIcon::SizeMedium)).pixmap()); + extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward")).pixmap()); -# -## quit button ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -392 +392 @@ -- quit->setPaletteBackgroundColor ( TQt::red ); -+ quit->setPixmap(TQIconSet(SmallIcon("application-exit")).pixmap()); EOF +} -## Display '&' where it is the lower key character on the key -## E.g. fr be azerty keyboards +## configuration menu patch -N -p0 << EOF || true --- src/MainWidget.cpp +++ src/MainWidget.cpp -@@ -895,5 +897,9 @@ - TQString btn_text(TQChar((uint)ret)); - -- v.setText(btn_text); -+ TQChar c((uint)ret); -+ if (c=='&') -+ v.setText("&&"); -+ else -+ v.setText(btn_text); - - TQString btn_upper(btn_text.upper()); +@@ -515 +515 @@ +- m->insertItem ( i18n("Font ..."), this, TQT_SLOT ( chooseFont() ) ); ++ m->insertItem ( i18n("Font"), this, TQT_SLOT ( chooseFont() ) ); +@@ -520,0 +521 @@ ++ m->insertSeparator(); +@@ -522 +523 @@ +- m->insertItem ( i18n ("Keys color"), this, TQT_SLOT ( chooseKeysColor() ) ); ++ m->insertItem ( i18n ("Key color"), this, TQT_SLOT ( chooseKeysColor() ) ); EOF -## resize quit, num pad show/hide, configure buttons to see the icons better at reduced size of keyboard +## key spacing & sizing patch -N -p0 << EOF || true --- src/MainWidget.cpp +++ src/MainWidget.cpp -@@ -390,2 +390,2 @@ -- quit->resize ( 15,30 ); -- quit->move ( 525,15 ); -+ quit->resize ( 20,30 ); +@@ -323 +323 @@ +- lalt->move ( lwin->x() +lwin->width() +6, sty+ ( 5*35 ) ); ++ lalt->move ( lwin->x() +lwin->width() +5, sty+ ( 5*35 ) ); +@@ -340 +340 @@ +- ralt->resize ( 48,30 ); ++ ralt->resize ( 50,30 ); +@@ -350 +350 @@ +- rwin->resize ( 48,30 ); ++ rwin->resize ( 50,30 ); +@@ -359 +359 @@ +- mnu->resize ( 49,30 ); ++ mnu->resize ( 50,30 ); +@@ -369 +369 @@ +- rctrl->resize ( 49,30 ); ++ rctrl->resize ( 45,30 ); +@@ -379 +379 @@ +- quit->move ( 524,15 ); + quit->move ( 526,15 ); -@@ -398,2 +398,2 @@ -- extent->resize( 15,65 ); -- extent->move(525, 85 ); -+ extent->resize ( 20,65 ); -+ extent->move(526, 85 ); -@@ -551,2 +551,2 @@ -- popup_menu->resize ( 15,30 ); -- popup_menu->move ( 525,15+35 ); -+ popup_menu->resize ( 20,30 ); +@@ -388 +388 @@ +- extent->move (524, 85 ); ++ extent->move (526, 85 ); +@@ -558 +558 @@ +- popup_menu->move ( 524,15+35 ); + popup_menu->move ( 526,15+35 ); -# -## move numpad after resizing buttons ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -410 +410 @@ -- int padx= 550; -+ int padx= 554; -# -## move and resize keyboard ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -593 +593 @@ -- int d_width=550; -+ int d_width=553; -@@ -639,2 +639,2 @@ -- sdxs = width() - (width() * (150.0/700.0)); -- VButton::pw=700.0; -+ sdxs = width() - (width() * (150.0/703.0)); -+ VButton::pw=703.0; -@@ -642 +642 @@ -- setMinimumSize(700/3,235/3); -+ setMinimumSize(703/3,235/3); -@@ -646,2 +646,2 @@ -- sdxb = width() + (width() * (150.0/550.0)); -- VButton::pw=550.0; -+ sdxb = width() + (width() * (150.0/552.0)); -+ VButton::pw=552.0; -@@ -649 +649 @@ -- setMinimumSize(550/3,235/3); -+ setMinimumSize(552/3,235/3); +@@ -959 +959 @@ +- resize ( 96,47 ); ++ resize ( 64,31 ); +EOF + +## Caps+AltGr[+Shift] displayed characters should be toggled from the non-Caps state +patch -N -p0 << EOF || true --- src/VButton.cpp +++ src/VButton.cpp -@@ -5 +5 @@ --double VButton::pw=550.0; -+double VButton::pw=552.0; +@@ -94,2 +94,13 @@ +- // Caps does not seem to make any difference when AltGr is pressed +- if (shift) ++ // If Caps is on, displayed alpha characters should be toggled from the AltGr case ++ if (caps) ++ { ++ if (shift) ++ { ++ TQPushButton::setText(altGrShiftText.lower()); ++ } ++ else ++ { ++ TQPushButton::setText(altGrText.upper()); ++ } ++ } ++ else if (shift) EOF -## missing characters in keysymtab[] - for AC12 -> AD13 key on ua keyboard +## blank character display where AltGr does not provide extra characters +[[ $(cat $TMPVARS/Kvkbd_OPTS) == *blank* ]] && { +echo -e "\033[36;1m"'patching for blank keys ..'"\033[0m" patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -1251,2 +1251,3 @@ - { 0x06ac, 0x045c }, /* Macedonia_kje ќ CYRILLIC SMALL LETTER KJE */ -+ { 0x06ad, 0x0491 }, /* Ukrainian_ghe_with_upturn ґ CYRILLIC SMALL LETTER GHE WITH UPTURN */ - { 0x06ae, 0x045e }, /* Byelorussian_shortu ў CYRILLIC SMALL LETTER SHORT U */ -@@ -1266,2 +1267,3 @@ - { 0x06bc, 0x040c }, /* Macedonia_KJE Ќ CYRILLIC CAPITAL LETTER KJE */ -+ { 0x06bd, 0x0490 }, /* Ukrainian_GHE_WITH_UPTURN Ґ CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ - { 0x06be, 0x040e }, /* Byelorussian_SHORTU Ў CYRILLIC CAPITAL LETTER SHORT U */ +--- src/VButton.cpp ++++ src/VButton.cpp +@@ -56,6 +56,6 @@ +- if (c == " ") +- { +- // use normal text in case altGr does not provide extra characters. +- // This is required at least on US keyboards, where altGr works as Alt. +- c = nc; +- } ++// if (c == " ") ++// { ++// // use normal text in case altGr does not provide extra characters. ++// // This is required at least on US keyboards, where altGr works as Alt. ++// c = nc; ++// } +@@ -74,6 +74,6 @@ +- if (c == " ") +- { +- // use shift text in case altGr does not provide extra characters. +- // This is required at least on US keyboards, where altGr works as Alt. +- c = sc; +- } ++// if (c == " ") ++// { ++// // use shift text in case altGr does not provide extra characters. ++// // This is required at least on US keyboards, where altGr works as Alt. ++// c = sc; ++// } +# +## substitute the .notdef, VoidSymbol, with a space +--- src/Xutils.cpp ++++ src/Xutils.cpp +@@ -839,0 +840 @@ ++ { 0x00ffffffL, 0x0020 }, /* VoidSymbol -> <- space */ EOF +} ## generate keycode for Win keys with single click so that they can be used for xmodmap -## User option, set in ./BUILD-TDE.sh -[[ $WinLock != 1 ]] && { -echo -e "\033[36;1m"'patching for Win keys no-lock ..'"\033[0m" +[[ $(cat $TMPVARS/Kvkbd_OPTS) != *Winlock* ]] && { +echo -e "\033[36;1m"'patching for no-lock Win keys ..'"\033[0m" patch -N -p0 << EOF || true --- src/MainWidget.cpp +++ src/MainWidget.cpp # ## don't lock the LWin button -@@ -325 +325 @@ -- win->setToggleButton ( true ); -+ win->setToggleButton ( false ); +@@ -317 +317 @@ +- lwin->setToggleButton ( true ); ++ lwin->setToggleButton ( false ); +## generate keycode on click rather than wait for next key-click +@@ -318 +318,2 @@ +- mod_keys.append ( lwin ); ++ connect ( lwin, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); ++ other_keys.append( lwin ); +# ## don't lock the RWin button -@@ -362 +362 @@ +@@ -354 +355 @@ - rwin->setToggleButton ( true ); + rwin->setToggleButton ( false ); -# -## generate keycode on click rather than wait for next key-click for keycode ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -# -## for LWin -@@ -326 +326,2 @@ -- mod_keys.append ( win ); -+ connect ( win, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); -+ other_keys.append( win ); -# -## for RWin -@@ -363 +364,2 @@ -- mod_keys.append( rwin ); +## generate keycode on click rather than wait for next key-click +@@ -355 +356,2 @@ +- mod_keys.append ( rwin ); + connect ( rwin, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); + other_keys.append( rwin ); EOF } -## add 'Lock on screen' feature from v0.5 -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -529,4 +529,8 @@ - m->setItemChecked(mnu_dock, show_dock); - -+ mnu_lock = m->insertItem("Lock on screen", this, TQT_SLOT(toggleLock())); -+ bool is_locked = cfg->readBoolEntry("locked",false); -+ m->setItemChecked(mnu_lock,is_locked); -+ - //m->insertItem("Configure", this, TQT_SLOT(config())); - m->insertSeparator(); -@@ -742,2 +746,14 @@ - } -+void MainWidget::toggleLock() -+{ -+ bool c = isLocked(); -+ -+ tray->contextMenu()->setItemChecked ( mnu_lock, !c ); -+ setLocked(!c); -+ -+ TDEConfig *cfg = TDEApplication::kApplication()->config(); -+ cfg->writeEntry ("locked", !c); -+ cfg->sync(); -+ -+} - void MainWidget::showDock() -# -## ---- src/MainWidget.h -+++ src/MainWidget.h -@@ -69,2 +69,3 @@ - void saveState(); -+ void toggleLock(); - -@@ -131,2 +131,3 @@ - int mnu_autores; -+ int mnu_lock; - -# -## ---- src/DragWidget.cpp -+++ src/DragWidget.cpp -@@ -6,3 +6,3 @@ - drag=false; -- -+ locked=false; - } -@@ -17,2 +17,3 @@ - gpress=e->globalPos(); -+ if (locked)return; - drag=true; -@@ -34,2 +35,12 @@ - } -+ -+void DragWidget::setLocked(bool mode) -+{ -+ locked=mode; -+} -+ -+const bool DragWidget::isLocked() const -+{ -+ return locked; -+} - -# -## ---- src/DragWidget.h -+++ src/DragWidget.h -@@ -14,2 +14,5 @@ - -+ void setLocked(bool mode); -+ const bool isLocked() const; -+ - private: -@@ -24,2 +27,3 @@ - TQPoint gpress; -+ bool locked; - -# -## ---- src/resizabledragwidget.cpp -+++ src/resizabledragwidget.cpp -@@ -38,2 +38,3 @@ - { -+ if (locked)return; - -EOF - -## fix azerty keyboards shift keys showing caps -## simplify the algorithm and use s for shift characters, leave u for upper case -# * if shift is on, set text as shift character, else use lower character -# * if caps is on, set text as l.upper(), which will be upper case for alpha characters, or lower level for non-alpha characters, else use lower character -# * for lower level or shift characters, set ampersand as a special case -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -905,30 +905,22 @@ - KeyCode keycode=v.getKeyCode(); -- -+// first level character keysym - KeySym keysym_l = XkbKeycodeToKeysym(display, keycode, 0, 0); -+// second level, ie shift, character keysym -+ KeySym keysym_s = XkbKeycodeToKeysym(display, keycode, 0, 1); - -- KeySym keysym_u = XkbKeycodeToKeysym(display, keycode, 0, 1); -- -- long ret = keysym2ucs(keysym_l); -- -- TQString btn_text(TQChar((uint)ret)); -+ long retl = keysym2ucs(keysym_l); - -- TQChar c((uint)ret); -- if (c=='&') -+ TQChar l((uint)retl); -+ if (l=='&') - v.setText("&&"); - else -- v.setText(btn_text); -+ v.setText(l); - -- TQString btn_upper(btn_text.upper()); -+ long rets = keysym2ucs(keysym_s); - -- if (btn_upper==btn_text) { -- ret = keysym2ucs(keysym_u); -- TQChar c((uint)ret); -- if (c=='&') -+ TQChar s((uint)rets); -+ if (s=='&') - v.setShiftText("&&"); - else -- v.setShiftText(c); -- } -- else { -- v.setShiftText(btn_upper); -- } -+ v.setShiftText(s); - } -EOF -# -patch -N -p0 << EOF || true ---- src/VButton.cpp -+++ src/VButton.cpp -@@ -22,16 +22,6 @@ - { -- if (press==true){ -- TQString tu=l.upper(); -- if (tu.compare(l)==0){ -- //TQPushButton::setText(tu); -- TQPushButton::setText(u); -- } -- else{ -- TQPushButton::setText(tu); -- } -- -- } -- else{ -+ if (press==true) -+ TQPushButton::setText(s); -+ else - TQPushButton::setText(l); -- } - } -@@ -39,14 +29,7 @@ - { -- if (press==true){ -+ if (press==true) { - TQString tu=l.upper(); -- if (tu.compare(l)==0){ -- TQPushButton::setText(tu); -- } -- else{ -- TQPushButton::setText(u); -- } -- } -- else{ -+ TQPushButton::setText(tu); } -+ else - TQPushButton::setText(l); -- } - } -@@ -60,3 +43,3 @@ - { -- u=text; -+ s=text; - } -EOF -# -patch -N -p0 << EOF || true ---- src/VButton.h -+++ src/VButton.h -@@ -31,3 +31,3 @@ - unsigned int keycode; -- TQString u; -+ TQString s; - TQString l; -EOF -# -patch -N -p0 << EOF || true ---- src/numpadvbutton.cpp -+++ src/numpadvbutton.cpp -@@ -35,3 +35,3 @@ - if (press==true){ -- TQPushButton::setText(u); -+ TQPushButton::setText(s); - VButton::setKeyCode(numlock_code); -EOF - -## kvkbd --button doesn't work, so -## set a default button background colour which otherwise defaults to system colour -## Changeable from configuration menu -patch -N -p0 << EOF || true ---- src/VButton.cpp -+++ src/VButton.cpp -@@ -11,2 +11,3 @@ - //connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(sendKey())); -+ setPaletteBackgroundColor ( TQColor("#f0f0f0") ); - setFocusPolicy(TQ_NoFocus); -EOF - -## base auto font size on main board size otherwise when the num pad is brought into view -## the font size immediately increases in proportion, ie by 703/552. -## and set a more realistic initial font size -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -690,3 +690,6 @@ - //double rs = (100.0/700.0)*width(); -- double rp = (8.0/600.0)*width(); -+ if (extent_visible) { -+ rp = (11.0/600.0)*width() * (552.0/703.0); } -+ else { -+ rp = (11.0/600.0)*width(); } - //fnt.setStretch(rs); -EOF -# -patch -N -p0 << EOF || true ---- src/MainWidget.h -+++ src/MainWidget.h -@@ -130,2 +130,3 @@ - double sdxb; -+ double rp; - int mnu_dock; -EOF - -########### i18n start ################### -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -519 +519 @@ -- m->insertItem ( "Font ...", this, TQT_SLOT ( chooseFont() ) ); -+ m->insertItem ( i18n ("Font"), this, TQT_SLOT ( chooseFont() ) ); -@@ -521 +521 @@ -- mnu_autores = m->insertItem( "Auto resize font",this, TQT_SLOT ( toggleFontAutoRes() ) ); -+ mnu_autores = m->insertItem( i18n ("Auto resize font"),this, TQT_SLOT ( toggleFontAutoRes() ) ); -@@ -524 +524,0 @@ -- -@@ -526 +525 @@ -- mnu_dock = m->insertItem ( "Dock widget", this, TQT_SLOT ( showDock() ) ); -+ mnu_dock = m->insertItem ( i18n ("Dock widget"), this, TQT_SLOT ( showDock() ) ); -@@ -531 +530 @@ -- mnu_lock = m->insertItem("Lock on screen", this, TQT_SLOT(toggleLock())); -+ mnu_lock = m->insertItem( i18n ("Lock on screen"), this, TQT_SLOT(toggleLock())); -@@ -537 +536 @@ -- m->insertItem ( "Help", h->menu() ); -+ m->insertItem ( i18n ("Help"), h->menu() ); -@@ -1854 +1853 @@ -- TQToolTip::add ( this, "Virtual keyboard" ); -+ TQToolTip::add ( this, i18n ("Virtual keyboard") ); -EOF -########### i18n end ################### - -## it seems that TQColorDialog::getColor() defaults to rrr,ggg,bbb format and -## cfg->readEntry adds double quotes to the string retrieved because -## if the kvkbdrc entry is kbColor=rrr,ggg,bbb, then TQColor(bc) will be invalid [TQColor("rrr,ggg,bbb")] but -## if the kvkbdrc entry is kbColor=#rrggbb then TQColor(bc) will be valid [TQColor("#rrggbb")] -## so name() is used to store the colour in #rrggbb format - -## keyboard colour defaults to #cdc0b0 - -## key/button colour defaults to #f0f0f0 - +## another combining character to display patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -39,4 +39,3 @@ - #include -- -- -+#include - -## load any existing chosen colours for the keyboard, otherwise default to #cdc0b0 -@@ -79,3 +78,7 @@ - -- setPaletteBackgroundColor ( TQColor("#cdc0b0") ); -+ TDEConfig *cfg = TDEApplication::kApplication()->config(); -+// if "kbColor" entry doesn't exist - either because it hasn't been saved -+// or kvkbdrc doesn't exist, default to "#cdc0b0" -+ TQColor bc = cfg->readEntry ("kbColor","#cdc0b0"); -+ setPaletteBackgroundColor ( TQColor(bc) ); - setFocusPolicy ( TQ_NoFocus ); -## new configuration menu entries -@@ -524,2 +527,8 @@ - -+ m->insertSeparator(); -+ m->insertItem ( i18n ("Keyboard color"), this, TQT_SLOT ( Colorb() ) ); -+ -+ m->insertItem ( i18n ("Key color (restart if changed)"), this, TQT_SLOT ( Colork() ) ); -+ -+ m->insertSeparator(); - mnu_dock = m->insertItem ( i18n ("Dock widget"), this, TQT_SLOT ( showDock() ) ); -## open ColorDialog and save chosen colours -@@ -573,3 +582,26 @@ - -- -+void MainWidget::Colorb() // keyboard colour chosen through the configuration menu -+{ -+ TDEConfig *cfg = TDEApplication::kApplication()->config(); -+// if "kbColor" entry exists, start with that, otherwise start with the default "#cdc0b0" -+ TQColor bc = cfg->readEntry ("kbColor","#cdc0b0"); -+ TQColor b = TQColorDialog::getColor( TQColor( bc ) ); -+// if the selection of the new colour is cancelled, b will be invalid -+// otherwise the new value is written to kvkbdrc - this must be in the #rrggbb format -+// and as writeEntry produces rrr,ggg,bbb format, .name() is required to convert to #rrggbb -+ if ( b.isValid() ) { -+ cfg->writeEntry ("kbColor", b.name() ); -+ cfg->sync(); -+ setPaletteBackgroundColor ( TQColor( b ) ); } -+} -+void MainWidget::Colork() // key/button colour chosen through the configuration menu -+{ -+ TDEConfig *cfg = TDEApplication::kApplication()->config(); -+ TQColor kc = cfg->readEntry ("keyColor","#f0f0f0"); -+ TQColor k = TQColorDialog::getColor( TQColor( kc ) ); -+ if ( k.isValid() ) { -+ cfg->writeEntry ("keyColor", k.name() ); -+ cfg->sync(); } -+// can't set PaletteBackgroundColor because it's in VButton::VButton - needs restart to read configuration entry -+} - void MainWidget::finishInit() -## set initially 150 from the RH edge of the screen to allow for the num pad -## and set 50 from the bottom edge to allow for the panel -@@ -599,3 +631,3 @@ - int d_height=235; -- TQRect dflt_geom(screen_geom.width()-d_width,screen_geom.height()-d_height,d_width,d_height); -+ TQRect dflt_geom(screen_geom.width()-d_width-150,screen_geom.height()-d_height-50,d_width,d_height); - ---- src/MainWidget.h -+++ src/MainWidget.h -@@ -70,2 +70,4 @@ - void toggleLock(); -+ void Colorb(); -+ void Colork(); - ---- src/VButton.cpp -+++ src/VButton.cpp -@@ -3,2 +3,4 @@ - #include -+#include -+#include - -## load any existing chosen colours for the keys/buttons, otherwise default to #f0f0f0 -@@ -11,4 +13,10 @@ - //connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(sendKey())); -- setPaletteBackgroundColor ( TQColor("#f0f0f0") ); -+ TDEConfig *cfg = TDEApplication::kApplication()->config(); -+// if "keyColor" entry doesn't exist - either because it hasn't been saved -+// or kvkbdrc doesn't exist, default to "#f0f0f0" -+ TQColor kc = cfg->readEntry ("keyColor","#f0f0f0"); -+ setPaletteBackgroundColor ( TQColor(kc) ); -+ - setFocusPolicy(TQ_NoFocus); -+ - resize(30,30); -EOF - -<<'comment' -The keyboard geometry is saved when either of the Quit options is selected. -If the num pad is visible [extent_visible=true] when Kvkbd is closed down - ie Quit from the configuration menu - then when it is run again, with the default being extent_visible=false, the keyboard will display without the numpad but at an x-axis size which includes the num pad, ie elongated. - -To fix this, add the state of extent_visible to the configuration file and start with that when Kvkbd is re-started. -comment -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -76,5 +76,6 @@ - int sty=15; -- extent_visible=false; - - TDEConfig *cfg = TDEApplication::kApplication()->config(); -+// if the num pad was visible when Kvkbd was 'Quit', the geometry includes it, so start with the num pad in the same state -+ extent_visible = cfg->readBoolEntry("numpad_visible",false); - // if "kbColor" entry doesn't exist - either because it hasn't been saved -@@ -659,2 +660,3 @@ - cfg->writeEntry("geometry",geometry()); -+ cfg->writeEntry("numpad_visible",extent_visible); - cfg->sync(); -EOF - -## add tooltips to buttons -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -398,2 +398,3 @@ - quit->setPixmap(TQIconSet(SmallIcon("application-exit")).pixmap()); -+ TQToolTip::add( quit, i18n( "Hide keyboard" ) ); - quit->res(); -@@ -406,2 +407,3 @@ - extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap()); -+ TQToolTip::add( extent, i18n( "Show num pad" ) ); - extent->res(); -@@ -571,3 +573,3 @@ - popup_menu->setPixmap(TQIconSet(SmallIcon("configure")).pixmap()); -- -+ TQToolTip::add( popup_menu, i18n( "Configure" ) ); - other_keys.append(popup_menu); -@@ -989,3 +991,3 @@ - -- TQToolTip::add ( this, "Toggle keyboard visibility" ); -+ TQToolTip::add ( this, i18n ("Toggle keyboard visibility") ); - } -EOF - -## more add tooltips to buttons -## if the num pad was visible, the tooltip continued to show 'Show num pad' -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -742,2 +742,3 @@ - extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap()); -+ TQToolTip::add( extent, i18n( "Show num pad" ) ); - } -@@ -747,2 +748,3 @@ - TQWidget::resize ( (int)sdxb, height() ); -+ TQToolTip::add( extent, i18n( "Hide num pad" ) ); - } -EOF - -## yet more add tooltips to buttons -## if Kvkbd was 'Quit' with the num pad visible, on restart the double arrow was indicating 'Show num pad' -patch -N -p0 << EOF || true ---- src/MainWidget.cpp -+++ src/MainWidget.cpp -@@ -406,4 +406,8 @@ - extent->move(526, 85 ); -- extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap()); -- TQToolTip::add( extent, i18n( "Show num pad" ) ); -+ if (extent_visible) { -+ extent->setPixmap(TQIconSet(SmallIcon("media-seek-backward")).pixmap()); -+ TQToolTip::add( extent, i18n( "Hide num pad" ) ); } -+ else { -+ extent->setPixmap(TQIconSet(SmallIcon("media-seek-forward")).pixmap()); -+ TQToolTip::add( extent, i18n( "Show num pad" ) ); } - extent->res(); +--- src/Xutils.cpp ++++ src/Xutils.cpp +@@ -871,0 +872 @@ ++ { 0x01000358L, 0x02d9 }, /* combining dot above right ˙ dot above */ EOF ## for slack-desc diff --git a/Apps/kvkbd/translations/messages/de.po b/Apps/kvkbd/translations/messages/de.po index 4291ee1..6e2e84d 100644 --- a/Apps/kvkbd/translations/messages/de.po +++ b/Apps/kvkbd/translations/messages/de.po @@ -59,11 +59,11 @@ msgid "Auto resize font" msgstr "" #: MainWidget.cpp:536 -msgid "Keyboard color" +msgid "Background color" msgstr "" #: MainWidget.cpp:538 -msgid "Key color (restart if changed)" +msgid "Key color" msgstr "" #: MainWidget.cpp:541 diff --git a/Apps/kvkbd/translations/messages/en_GB.po b/Apps/kvkbd/translations/messages/en_GB.po index 04a2b69..172c73a 100644 --- a/Apps/kvkbd/translations/messages/en_GB.po +++ b/Apps/kvkbd/translations/messages/en_GB.po @@ -61,12 +61,12 @@ msgid "Auto resize font" msgstr "" #: MainWidget.cpp:536 -msgid "Keyboard color" -msgstr "Keyboard colour" +msgid "Background color" +msgstr "Background colour" #: MainWidget.cpp:538 -msgid "Key color (restart if changed)" -msgstr "Key colour (restart if changed)" +msgid "Key color" +msgstr "Key colour" #: MainWidget.cpp:541 msgid "Dock widget" diff --git a/Apps/kvkbd/translations/messages/kvkbd.pot b/Apps/kvkbd/translations/messages/kvkbd.pot index 04fb0cb..eb78221 100644 --- a/Apps/kvkbd/translations/messages/kvkbd.pot +++ b/Apps/kvkbd/translations/messages/kvkbd.pot @@ -61,11 +61,11 @@ msgid "Auto resize font" msgstr "" #: MainWidget.cpp:536 -msgid "Keyboard color" +msgid "Background color" msgstr "" #: MainWidget.cpp:538 -msgid "Key color (restart if changed)" +msgid "Key color" msgstr "" #: MainWidget.cpp:541 diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 53e5e38..37eac50 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -438,6 +438,35 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD sed -i 's|$| |;s|" M|M|g;s|"||g' $TMPVARS/TDEbuilds +## this dialog will only run if any of the selected packages has a README +rm -f $TMPVARS/READMEs +## generate list of READMEs .. +RM_LIST=$(find [ACDLM][a-z]* -name "README" | grep -vE "tdebase|kvkbd") +for package in $(cat $TMPVARS/TDEbuilds) +do +[[ $RM_LIST == *$package* ]] && { +echo "\Zb\Z6\Zu$package\ZU\Zn + +$(cat $package/README) +" >> $TMPVARS/READMEs +} +done +## .. if there is a list, run dialog +[[ $(cat $TMPVARS/READMEs) ]] && { +dialog --cr-wrap --defaultno --no-shadow --colors --title " READMEs " --yesno \ +" +Some of the selected packages have READMEs in their SlackBuilds directories. + +Do you want to read them? + " \ +10 75 +[[ $? == 0 ]] && dialog --no-collapse --cr-wrap --no-shadow --colors --ok-label "Close" --msgbox \ +" +$(cat $TMPVARS/READMEs)" \ +30 75 +} + + ## only run this if tqt3 has been selected rm -f $TMPVARS/TQT_OPTS rm -f $TMPVARS/PKG_CONFIG_PATH_MOD @@ -451,7 +480,7 @@ If you select minimal packaging and intend to build any of those at any time, se TQt html documentation is ~21M, and can be excluded from the package. -mkspecs is only required for linux-g++ +The only mkspecs required is the one for linux-g++ " \ 25 75 6 \ @@ -551,26 +580,42 @@ PNG_VERSION=$(grep VERSION:- $BUILD_TDE_ROOT/Misc/libpng/libpng.SlackBuild|cut - sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds } - ## only run this if kvkbd has been selected -rm -f $TMPVARS/WinLock -rm -f $TMPVARS/kvkbd-bg -rm -f $TMPVARS/kvkbd-keycolr +rm -f $TMPVARS/Kvkbd_OPTS [[ $(grep -o kvkbd $TMPVARS/TDEbuilds) ]] && { -dialog --cr-wrap --no-shadow --yes-label "No Lock" --no-label "Lock" --colors --defaultno --title " Kvkbd Win Keys " --yesno \ +## the default exit status for the extra button is 3 - exit 2 from a help button is needed for Kvkbd_OPTS +EXITVAL=3 +until [[ $EXITVAL -lt 2 ]] ; do +dialog --cr-wrap --nocancel --no-shadow --extra-button --extra-label "README" --colors --title " Kvkbd options " --checklist \ " -The \Zb\Z6LWin\Zn and \Zb\Z6RWin\Zn keys on the \Zb\Z6Kvkbd\Zn keyboard are set to 'lock' for the next key click. +See the README for further details .. -If they're to be used as control keys to map a number of characters or functions, then they need to be set to \Zr\Z4\ZbLock\Zn while the next key is clicked - this is to simulate holding down the key on a physical keyboard. +[1] Use Win keys either as modifier keys, + or for characters set with xmodmap. -If they will only be used as alternatively mapped keys using xmodmap, then they will need to be set to generate a keycode on a single click - \Z1N\Zb\Z0o Lock\Zn. +[2] Alternative text on the num pad keys. + +[3] Show small icons on the buttons. + +[4] Show blank keys where AltGr doesn't produce a character. + " \ -17 75 -[[ $? == 0 ]] && 2> $TMPVARS/WinLock -[[ $? == 1 ]] && echo 1 > $TMPVARS/WinLock +23 75 4 \ +" Winlock" "Win keys as modifier keys" off \ +" numpad" "replace default text" on \ +" icons" "use small icons" on \ +" blank" "blank keys" on \ +2> $TMPVARS/Kvkbd_OPTS +EXITVAL=$? +[[ $EXITVAL == 3 ]] && dialog --cr-wrap --no-shadow --colors --ok-label "Return" --title " Kvkbd options " --msgbox \ +" +$(cat Apps/kvkbd/README) +" \ +30 75 +#} +done } - ## option to prefix some package names ## get a list of packages that have SlackBuilds set up to use the prefix 'tde' grep TDEPFX [ACDL]???/*/*SlackBuild | grep PKGNAM | cut -d/ -f2 > $TMPVARS/TDEPFX_packages @@ -596,35 +641,6 @@ to avoid confusion with identical packages which might be installed for KDE. } -## this dialog will only run if any of the selected packages has a README -rm -f $TMPVARS/READMEs -## generate list of READMEs .. -RM_LIST=$(find [ACDLM][a-z]* -name "README" | grep -v tdebase) -for package in $(cat $TMPVARS/TDEbuilds) -do -[[ $RM_LIST == *$package* ]] && { -echo "\Zb\Z6\Zu$package\ZU\Zn - -$(cat $package/README) -" >> $TMPVARS/READMEs -} -done -## .. if there is a list, run dialog -[[ $(cat $TMPVARS/READMEs) ]] && { -dialog --cr-wrap --defaultno --no-shadow --colors --title " READMEs " --yesno \ -" -Some of the selected packages have READMEs in their SlackBuilds directories. - -Do you want to read them? - " \ -10 75 -[[ $? == 0 ]] && dialog --no-collapse --cr-wrap --no-shadow --colors --ok-label "Close" --msgbox \ -" -$(cat $TMPVARS/READMEs)" \ -30 75 -} - - rm -f $TMPVARS/DL_CGIT # place this here to facilitate testing for summary screen [[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && \ [[ $(grep -o [ACDLM][a-z]*/ $TMPVARS/TDEbuilds | sort | head -n1) != Misc/ ]] && {