Git commit 30f4b266dd1df9ab2a922177eed48a224dd206c1 by Andriy Rysin. Committed on 07/11/2012 at 01:25. Pushed by rysin into branch 'master'.
Allow the user to preview keyboard layout REVIEW: 107202 GUI: M +8 -0 kcontrol/keyboard/CMakeLists.txt M +1 -1 kcontrol/keyboard/Messages.sh M +15 -4 kcontrol/keyboard/kcm_add_layout_dialog.cpp M +3 -0 kcontrol/keyboard/kcm_add_layout_dialog.h M +32 -25 kcontrol/keyboard/kcm_add_layout_dialog.ui M +10 -0 kcontrol/keyboard/kcm_keyboard.ui M +30 -0 kcontrol/keyboard/kcm_keyboard_widget.cpp M +1 -0 kcontrol/keyboard/kcm_keyboard_widget.h A +10 -0 kcontrol/keyboard/preview/TODO A +367 -0 kcontrol/keyboard/preview/kbpreviewframe.cpp [License: GPL (v2+)] A +55 -0 kcontrol/keyboard/preview/kbpreviewframe.h [License: GPL (v2+)] A +127 -0 kcontrol/keyboard/preview/keyaliases.cpp [License: GPL (v2+)] C +13 -33 kcontrol/keyboard/preview/keyaliases.h [from: kcontrol/keyboard/kcm_add_layout_dialog.h - 050% similarity] A +186 -0 kcontrol/keyboard/preview/keyboardlayout.cpp [License: GPL (v2+)] C +27 -32 kcontrol/keyboard/preview/keyboardlayout.h [from: kcontrol/keyboard/kcm_add_layout_dialog.h - 050% similarity] A +52 -0 kcontrol/keyboard/preview/keyboardpainter.cpp [License: GPL (v2+)] C +16 -27 kcontrol/keyboard/preview/keyboardpainter.h [from: kcontrol/keyboard/kcm_add_layout_dialog.h - 052% similarity] A +899 -0 kcontrol/keyboard/preview/keysym2ucs.cpp [License: GPL (v2+)] A +27 -0 kcontrol/keyboard/preview/keysym2ucs.h [License: GPL (v2+)] C +31 -32 kcontrol/keyboard/preview/keysymbols.cpp [from: kcontrol/keyboard/kcm_add_layout_dialog.h - 050% similarity] C +12 -30 kcontrol/keyboard/preview/keysymbols.h [from: kcontrol/keyboard/kcm_add_layout_dialog.h - 050% similarity] A +78 -0 kcontrol/keyboard/preview/keysymhelper.cpp [License: GPL (v2+)] C +15 -30 kcontrol/keyboard/preview/keysymhelper.h [from: kcontrol/keyboard/kcm_add_layout_dialog.h - 051% similarity] M +1 -1 kcontrol/keyboard/x11_helper.cpp http://commits.kde.org/kde-workspace/30f4b266dd1df9ab2a922177eed48a224dd206c1 diff --git a/kcontrol/keyboard/CMakeLists.txt b/kcontrol/keyboard/CMakeLists.txt index 29de717..973a39d 100644 --- a/kcontrol/keyboard/CMakeLists.txt +++ b/kcontrol/keyboard/CMakeLists.txt @@ -98,6 +98,7 @@ install( TARGETS keyboard_layout_widget DESTINATION ${PLUGIN_INSTALL_DIR} ) ### kcm keyboard ### +include_directories("preview") set(kcm_keyboard_PART_SRCS kcm_keyboard.cpp @@ -112,6 +113,13 @@ set(kcm_keyboard_PART_SRCS iso_codes.cpp kcmmisc.cpp bindings.cpp + preview/keyaliases.cpp + preview/keyboardlayout.cpp + preview/keyboardpainter.cpp + preview/keysymbols.cpp + preview/keysymhelper.cpp + preview/kbpreviewframe.cpp + preview/keysym2ucs.cpp ) diff --git a/kcontrol/keyboard/Messages.sh b/kcontrol/keyboard/Messages.sh index 0779aac..8d52752 100755 --- a/kcontrol/keyboard/Messages.sh +++ b/kcontrol/keyboard/Messages.sh @@ -1,5 +1,5 @@ #! /usr/bin/env bash $EXTRACTRC kcm*.ui >> rc.cpp -$XGETTEXT rc.cpp kcmmisc.cpp -o $podir/kcmkeyboard.pot +$XGETTEXT rc.cpp kcmmisc.cpp preview/*.cpp -o $podir/kcmkeyboard.pot $XGETTEXT kcm_*.cpp keyboard_*.cpp layout_*.cpp flags.cpp layouts_menu.cpp bindings.cpp -o $podir/kxkb.pot rm -f rc.cpp diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.cpp b/kcontrol/keyboard/kcm_add_layout_dialog.cpp index 34c9716..8f5d251 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.cpp +++ b/kcontrol/keyboard/kcm_add_layout_dialog.cpp @@ -17,7 +17,7 @@ */ #include "kcm_add_layout_dialog.h" - +#include <QApplication> #include <klocalizedstring.h> #include "xkb_rules.h" @@ -63,9 +63,9 @@ AddLayoutDialog::AddLayoutDialog(const Rules* rules_, Flags* flags_, bool showLa } languageChanged(0); - - connect(layoutDialogUi->languageComboBox, SIGNAL(activated(int)), this, SLOT(languageChanged(int))); + connect(layoutDialogUi->languageComboBox, SIGNAL(activated(int)), this, SLOT(languageChanged(int))); connect(layoutDialogUi->layoutComboBox, SIGNAL(activated(int)), this, SLOT(layoutChanged(int))); + connect(layoutDialogUi->prevbutton,SIGNAL(clicked()),this,SLOT(preview())); } void AddLayoutDialog::languageChanged(int langIdx) @@ -143,7 +143,7 @@ void AddLayoutDialog::accept() { selectedLayoutUnit.layout = layoutDialogUi->layoutComboBox->itemData(layoutDialogUi->layoutComboBox->currentIndex()).toString(); selectedLayoutUnit.variant = layoutDialogUi->variantComboBox->itemData(layoutDialogUi->variantComboBox->currentIndex()).toString(); - QString label = layoutDialogUi->labelEdit->text(); + QString label = layoutDialogUi->labelEdit->text(); if( label == selectedLayoutUnit.layout ) { label = ""; } @@ -151,3 +151,14 @@ void AddLayoutDialog::accept() selectedLayoutUnit.setShortcut(layoutDialogUi->kkeysequencewidget->keySequence()); QDialog::accept(); } + + +void AddLayoutDialog::preview(){ + int index = layoutDialogUi->variantComboBox->currentIndex(); + QString variant = layoutDialogUi->variantComboBox->itemData(index).toString(); + KeyboardPainter* layoutPreview = new KeyboardPainter(); + layoutPreview->generateKeyboardLayout(selectedLayout, variant); + layoutPreview->setModal(true); + layoutPreview->exec(); + delete layoutPreview; +} diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/kcm_add_layout_dialog.h index 6c6a795..5273347 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.h +++ b/kcontrol/keyboard/kcm_add_layout_dialog.h @@ -23,6 +23,7 @@ #include <QtGui/QDialog> #include "keyboard_config.h" +#include "preview/keyboardpainter.h" class Rules; class Flags; @@ -36,11 +37,13 @@ public: AddLayoutDialog(const Rules* rules, Flags* flags, bool showLabel, QWidget* parent=NULL); LayoutUnit getSelectedLayoutUnit() { return selectedLayoutUnit; } + QString getvariant(QString variant); void accept(); public Q_SLOTS: void languageChanged(int langIdx); void layoutChanged(int layoutIdx); + void preview(); private: const Rules* rules; diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.ui b/kcontrol/keyboard/kcm_add_layout_dialog.ui index b73080d..78304fb 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.ui +++ b/kcontrol/keyboard/kcm_add_layout_dialog.ui @@ -14,13 +14,6 @@ <string>Add Layout</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Limit selection by language:</string> - </property> - </widget> - </item> <item row="0" column="1"> <widget class="QComboBox" name="languageComboBox"> <property name="sizePolicy"> @@ -38,8 +31,22 @@ </property> </widget> </item> - <item row="1" column="1"> - <widget class="QComboBox" name="layoutComboBox"/> + <item row="4" column="1"> + <widget class="QLineEdit" name="labelEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="labelLabel_2"> + <property name="text"> + <string>Shortcut:</string> + </property> + </widget> </item> <item row="2" column="0"> <widget class="QLabel" name="label_3"> @@ -51,31 +58,21 @@ <item row="2" column="1"> <widget class="QComboBox" name="variantComboBox"/> </item> - <item row="3" column="0"> + <item row="4" column="0"> <widget class="QLabel" name="labelLabel"> <property name="text"> <string>Label:</string> </property> </widget> </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="labelEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="labelLabel_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> <property name="text"> - <string>Shortcut:</string> + <string>Limit selection by language:</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="6" column="1"> <widget class="KKeySequenceWidget" name="kkeysequencewidget"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> @@ -85,7 +82,7 @@ </property> </widget> </item> - <item row="5" column="1"> + <item row="7" column="1"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -95,6 +92,16 @@ </property> </widget> </item> + <item row="1" column="1"> + <widget class="QComboBox" name="layoutComboBox"/> + </item> + <item row="7" column="0"> + <widget class="QPushButton" name="prevbutton"> + <property name="text"> + <string>Preview</string> + </property> + </widget> + </item> </layout> </widget> <customwidgets> diff --git a/kcontrol/keyboard/kcm_keyboard.ui b/kcontrol/keyboard/kcm_keyboard.ui index 22968e8..f64eeea 100644 --- a/kcontrol/keyboard/kcm_keyboard.ui +++ b/kcontrol/keyboard/kcm_keyboard.ui @@ -329,6 +329,16 @@ </widget> </item> <item> + <widget class="QPushButton" name="previewbutton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Preview</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> diff --git a/kcontrol/keyboard/kcm_keyboard_widget.cpp b/kcontrol/keyboard/kcm_keyboard_widget.cpp index e1bd830..e513a41 100644 --- a/kcontrol/keyboard/kcm_keyboard_widget.cpp +++ b/kcontrol/keyboard/kcm_keyboard_widget.cpp @@ -33,6 +33,7 @@ #include <QtGui/QX11Info> #include "keyboard_config.h" +#include "preview/keyboardpainter.h" #include "xkb_rules.h" #include "flags.h" #include "x11_helper.h" @@ -335,6 +336,8 @@ void KCMKeyboardWidget::initializeLayoutsUI() connect(uiWidget->moveUpBtn, SIGNAL(clicked(bool)), this, SLOT(moveUp())); connect(uiWidget->moveDownBtn, SIGNAL(clicked(bool)), this, SLOT(moveDown())); + connect(uiWidget->previewbutton,SIGNAL(clicked(bool)),this,SLOT(previewLayout())); + connect(uiWidget->xkbGrpClearBtn, SIGNAL(clicked(bool)), this, SLOT(clearGroupShortcuts())); connect(uiWidget->xkb3rdLevelClearBtn, SIGNAL(clicked(bool)), this, SLOT(clear3rdLevelShortcuts())); @@ -360,6 +363,32 @@ void KCMKeyboardWidget::initializeLayoutsUI() connect(uiWidget->layoutLoopCountSpinBox, SIGNAL(valueChanged(int)), this, SLOT(uiChanged())); } +void KCMKeyboardWidget::previewLayout(){ + QMessageBox q; + QModelIndex index = uiWidget->layoutsTableView->currentIndex() ; + QModelIndex idcountry = index.sibling(index.row(),0) ; + QString country=uiWidget->layoutsTableView->model()->data(idcountry).toString(); + QModelIndex idvariant = index.sibling(index.row(),2) ; + QString variant=uiWidget->layoutsTableView->model()->data(idvariant).toString(); + if(index.row()==-1 || index.column()==-1){ + q.setText(i18n("No layout selected ")); + q.exec(); + } + else{ + KeyboardPainter* layoutPreview = new KeyboardPainter(); + const LayoutInfo* layoutInfo = rules->getLayoutInfo(country); + foreach(const VariantInfo* variantInfo, layoutInfo->variantInfos) { + if(variant==variantInfo->description){ + variant=variantInfo->name; + break; + } + } + layoutPreview->generateKeyboardLayout(country,variant); + layoutPreview->exec(); + layoutPreview->setModal(true); + } +} + void KCMKeyboardWidget::configureLayoutsChanged() { if( uiWidget->layoutsGroupBox->isChecked() && keyboardConfig->layouts.isEmpty() ) { @@ -388,6 +417,7 @@ void KCMKeyboardWidget::layoutSelectionChanged() uiWidget->removeLayoutBtn->setEnabled( ! selected.isEmpty() ); QPair<int, int> rowsRange( getSelectedRowRange(selected) ); uiWidget->moveUpBtn->setEnabled( ! selected.isEmpty() && rowsRange.first > 0); + uiWidget->previewbutton->setEnabled(! selected.isEmpty()); uiWidget->moveDownBtn->setEnabled( ! selected.isEmpty() && rowsRange.second < keyboardConfig->layouts.size()-1 ); } diff --git a/kcontrol/keyboard/kcm_keyboard_widget.h b/kcontrol/keyboard/kcm_keyboard_widget.h index fa912c7..58256df 100644 --- a/kcontrol/keyboard/kcm_keyboard_widget.h +++ b/kcontrol/keyboard/kcm_keyboard_widget.h @@ -68,6 +68,7 @@ private Q_SLOTS: void moveDown(); void configureLayoutsChanged(); void configureXkbOptionsChanged(); + void previewLayout(); private: Rules *rules; diff --git a/kcontrol/keyboard/preview/TODO b/kcontrol/keyboard/preview/TODO new file mode 100644 index 0000000..784924f --- /dev/null +++ b/kcontrol/keyboard/preview/TODO @@ -0,0 +1,10 @@ +Important: +* display tooltip for each key with key description from symbol file + +Good to have: +* read keyboard geometry and show it properly instead of default keyboard +* use some common parser to parse symbol and geometry descriptions +* replace symkey2ucs with something more reliable (e.g. XLookupString?) + +Cleanup: +* clean up the code (especially kbpreviewframe.cpp) diff --git a/kcontrol/keyboard/preview/kbpreviewframe.cpp b/kcontrol/keyboard/preview/kbpreviewframe.cpp new file mode 100644 index 0000000..8ecc4f2 --- /dev/null +++ b/kcontrol/keyboard/preview/kbpreviewframe.cpp @@ -0,0 +1,367 @@ +/* + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) + * + * 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. + */ + + +#include "kbpreviewframe.h" + +#include <QtCore/QFile> +#include <QtGui/QFont> + +#include <KApplication> +#include <KLocale> + + +static const QColor keyBorderColor("#d4d4d4"); +static const QColor lev12color("#d4d4d4"); +static const QColor lev34color("#FF3300"); +static const int sz=20, kszx=70, kszy=70; + +static const int xOffset[] = {15, 15, 40, 40 }; +static const int yOffset[] = {10, 40, 10, 40 }; +static const QColor color[] = { lev12color, lev12color, lev34color, lev34color }; + + +// TODO: parse geometry files and display keyboard according to current keyboard model + +KbPreviewFrame::KbPreviewFrame(QWidget *parent) : + QFrame(parent) +{ + setFrameStyle( QFrame::Box ); + setFrameShadow(QFrame::Sunken); +} + +void KbPreviewFrame::paintTLDE(QPainter &painter,int &x,int &y) +{ + painter.setPen(keyBorderColor); + painter.drawRect(x, y, kszx, kszy); + + const QList <QString> symbols = keyboardLayout.TLDE.symbols; + + for(int level=0; level<symbols.size(); level++) { + painter.setPen(color[level]); + painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::AlignTop, symbol.getKeySymbol(symbols.at(level))); + } + +} + +void KbPreviewFrame::paintAERow(QPainter &painter,int &x,int &y) +{ + paintTLDE(painter, x, y); + + const int noAEk=12; + for(int i=0; i<noAEk; i++){ + x+=kszx; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y, kszx, kszy); + + QList<QString> symbols = keyboardLayout.AE[i].symbols; + + for(int level=0; level<symbols.size(); level++) { + painter.setPen(color[level]); + painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::AlignTop, symbol.getKeySymbol(symbols.at(level))); + } + } + + x += kszx; + + const int bkspszx=100,bk1x=10;//,bk1y=20, + const int bk2y=60; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y,bkspszx,kszy); + + painter.setPen(lev12color); +// painter.drawText(x+bk1x, y+bk1y,i18n("<--")); + painter.drawText(x+bk1x, y+bk2y,i18n("Backspace")); +} + +void KbPreviewFrame::paintADRow(QPainter &painter,int &x,int&y) +{ + const int noADk=12; + const int tabszx=100; + const int tab3y=45; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y, tabszx,kszy); + + painter.setPen(lev12color); +// painter.drawText(x+tab1x, y+tab1y,i18n("<--")); + painter.drawText(x+xOffset[0], y+tab3y, i18nc("Tab key", "Tab")); +// painter.drawText(x+tab2x, y+tab2y,i18n("-->")); + x+=tabszx; + + + for(int i=0; i<noADk; i++){ + QList<QString> symbols = keyboardLayout.AD[i].symbols; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y,kszx,kszy); + + for(int level=0; level<symbols.size(); level++) { + painter.setPen(color[level]); + painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::AlignTop, symbol.getKeySymbol(symbols.at(level))); + } + + x+=kszx; + } + + painter.setPen(keyBorderColor); + painter.drawRect(x, y,kszx,kszy); + + QList<QString> symbols = keyboardLayout.BKSL.symbols; + + for(int level=0; level<symbols.size(); level++) { + painter.setPen(color[level]); + painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::AlignTop, symbol.getKeySymbol(symbols.at(level))); + } +} + +void KbPreviewFrame::paintACRow(QPainter &painter,int &x,int &y) +{ + const int sz = 20, kszx = 70, kszy = 70, capszx = 100; + const int noACk = 11; + const int lvl2x = 40, shifx = 10, shify = 60, retsz = 140; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y,capszx,kszy); + + painter.setPen(lev12color); +// painter.drawText(x+shifx, y+sz,i18n("^")); + painter.drawText(x+shifx, y+shify,i18n("Caps Lock")); + x+=capszx; + + for(int i=0; i<noACk; i++){ + painter.setPen(keyBorderColor); + painter.drawRect(x, y,kszx,kszy); + + QList<QString> symbols = keyboardLayout.AC[i].symbols; + + for(int level=0; level<symbols.size(); level++) { + painter.setPen(color[level]); + painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::AlignTop, symbol.getKeySymbol(symbols.at(level))); + } + + x+=kszx; + } + + painter.setPen(keyBorderColor); + painter.drawRect(x, y,retsz,kszy); + + painter.setPen(lev12color); +// painter.drawText(x+ret1x, y+ret1y,i18n("|")); +// painter.drawText(x+ret2x, y+ret2y,i18n("<--")); + painter.drawText(x+shify,y+lvl2x,i18n("Enter")); +} + +void KbPreviewFrame::paintABRow(QPainter &painter,int &x,int &y) +{ + const int noABk=10; + for(int i=0; i<noABk; i++) { + painter.setPen(keyBorderColor); + painter.drawRect(x, y,kszx,kszy); + + QList<QString> symbols = keyboardLayout.AB[i].symbols; + + for(int level=0; level<symbols.size(); level++) { + painter.setPen(color[level]); + painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::AlignTop, symbol.getKeySymbol(symbols.at(level))); + } + + x+=kszx; + } +} + +void KbPreviewFrame::paintBottomRow(QPainter &painter,int &x,int &y) +{ + const int txtx=30, txty=35, ctrlsz=100, altsz=100, spsz=400, kszy=70; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y, ctrlsz, kszy); + painter.setPen(lev12color); + painter.drawText(x+txtx, y+txty,i18n("Ctrl")); + + x+=ctrlsz; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y, altsz, kszy); + painter.setPen(lev12color); + painter.drawText(x+txtx, y+txty,i18n("Alt")); + + x+=altsz; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y, spsz, kszy); + + x+=spsz; + + painter.drawRect(x, y, altsz, kszy); + + painter.setPen(lev34color); + painter.drawText(x+txtx, y+txty,i18n("AltGr")); + + x+=ctrlsz; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y, ctrlsz, kszy); + + painter.setPen(lev12color); + painter.drawText(x+txtx, y+txty, i18n("Ctrl")); +} + +void KbPreviewFrame::paintFnKeys(QPainter &painter,int &x,int &y) +{ + const int escsz=50, escx=20, escy=55; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y, escsz, escsz); + + painter.setPen(lev12color); + painter.drawText(escx, escy, i18n("Esc")); + + const int spacex=50; + x+=spacex; + + const int fnkeyspace=60, fnkeysizex=50, fnkeysizey=50, fkc=15, fky=30, fnkig=4, fng=3; + int f=1; + + for(int i=0;i<fng;i++){ + x+=spacex; + + for(int j=0;j<fnkig;j++){ + x += fnkeyspace; + painter.setPen(keyBorderColor); + painter.drawRect(x, y, fnkeysizex, fnkeysizey); + + painter.setPen(lev12color); + painter.drawText(x+fkc, y+fky, i18nc("Function key", "F%1", f)); + f++; + } + } +} + +void KbPreviewFrame::paintEvent(QPaintEvent *) +{ + QPainter painter(this); + + QFont kbfont; + kbfont.setPointSize(12); + + painter.setFont(kbfont); + painter.setBrush(QBrush(Qt::darkGray)); + + const int strtx=0,strty=0,endx=1390,endy=490,kszy=70; + const int row1x=10,row1y=30,row2x=10,row2y=90,row5x=10,row5y=330,row3x=10,row3y=170,shifx=10,shify=60,row4x=10,row4y=250,row6x=110,row6y=410; + const int shiftsz=155; + + painter.setPen(keyBorderColor); + painter.drawRect(strtx, strty, endx, endy); + + painter.setPen(lev12color); + painter.setBrush(QBrush(Qt::black)); + + int x, y; + x=row1x; + y=row1y; + + paintFnKeys(painter,x, y); + + x=row2x; + y=row2y; + + paintAERow(painter,x, y); + + x=row3x; + y=row3y; + + paintADRow(painter,x, y); + + x=row4x; + y=row4y; + + paintACRow(painter,x, y); + + x=row5x; + y=row5y; + + painter.setPen(keyBorderColor); + painter.drawRect(x, y,shiftsz,kszy); + painter.setPen(lev12color); + painter.drawText(x+shifx, y+shify,i18n("Shift")); + x+=shiftsz; + + paintABRow(painter,x, y); + + painter.setPen(keyBorderColor); + painter.drawRect(x, y,shiftsz,kszy); + painter.setPen(lev12color); + painter.drawText(x+shifx, y+shify,i18n("Shift")); + + x=row6x; + y=row6y; + + paintBottomRow(painter,x, y); + + if( symbol.isFailed() ) { + painter.setPen(keyBorderColor); + painter.drawRect(strtx, strty, endx, endy); + + const int midx=470, midy=240; + painter.setPen(lev12color); + painter.drawText(midx, midy, i18n("No preview found")); + } + +} + + +void KbPreviewFrame::generateKeyboardLayout(const QString& layout, const QString& layoutVariant) +{ + QString filename = keyboardLayout.findSymbolBaseDir(); + filename.append(layout); + + QFile file(filename); + file.open(QIODevice::ReadOnly | QIODevice::Text); + QString content = file.readAll(); + file.close(); + + QList<QString> symstr = content.split("xkb_symbols "); + + if( layoutVariant.isEmpty() ) { + keyboardLayout.generateLayout(symstr.at(1), layout); + } + else { + for(int i=1;i<symstr.size();i++) { + QString h=symstr.at(i); + int k=h.indexOf("\""); + h=h.mid(k); + k=h.indexOf("{"); + h=h.left(k); + h=h.remove(" "); + QString f="\""; + f.append(layoutVariant); + f.append("\""); + f=f.remove(" "); + + if(h==f){ + keyboardLayout.generateLayout(symstr.at(i), layout); + break; + } + } + } +} + diff --git a/kcontrol/keyboard/preview/kbpreviewframe.h b/kcontrol/keyboard/preview/kbpreviewframe.h new file mode 100644 index 0000000..23c8704 --- /dev/null +++ b/kcontrol/keyboard/preview/kbpreviewframe.h @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) + * + * 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 KBPREVIEWFRAME_H +#define KBPREVIEWFRAME_H + +#include "keyboardlayout.h" +#include "keysymhelper.h" +#include "keyaliases.h" + +#include <QtGui/QPainter> +#include <QtGui/QFrame> + +class KbPreviewFrame : public QFrame +{ + Q_OBJECT + +private: + void paintTLDE(QPainter &painter, int &x, int &y); + void paintAERow(QPainter &painter, int &x, int &y); + void paintADRow(QPainter &painter, int &x, int &y); + void paintACRow(QPainter &painter, int &x, int &y); + void paintABRow(QPainter &painter, int &x, int &y); + void paintBottomRow(QPainter &painter, int &x, int &y); + void paintFnKeys(QPainter &painter, int &x, int &y); + + KeySymHelper symbol; + Aliases alias; + KeyboardLayout keyboardLayout; + +public: + explicit KbPreviewFrame(QWidget *parent = 0); + + void paintEvent(QPaintEvent * event); + void generateKeyboardLayout(const QString &country, const QString &layoutVariant); + QString getLayoutName() const { + return keyboardLayout.getLayoutName(); + } +}; + +#endif // KBPREVIEWFRAME_H diff --git a/kcontrol/keyboard/preview/keyaliases.cpp b/kcontrol/keyboard/preview/keyaliases.cpp new file mode 100644 index 0000000..3eb45ec --- /dev/null +++ b/kcontrol/keyboard/preview/keyaliases.cpp @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) + * + * 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. + */ + +#include "keyaliases.h" +#include <QtCore/QString> +#include <QtCore/QMap> +#include <QtGui/QMessageBox> +#include <QtCore/QFile> +#include <QtCore/QDir> + +#include <QtGui/QX11Info> +#include <X11/Xlib.h> +#include <X11/Xatom.h> +#include <X11/XKBlib.h> +#include <X11/extensions/XKBrules.h> + +#include <fixx11h.h> +#include <config-workspace.h> + + +Aliases::Aliases() +{ + QString filename=findaliasdir(); + QFile file(filename); + file.open(QIODevice::ReadOnly | QIODevice::Text); + QString content = file.readAll(); + file.close(); + QList<QString>als; + als=content.split("xkb_keycodes"); + for(int i=1;i<als.size();i++){ + QString temp=als.at(i); + temp=temp.remove(" "); + temp=temp.remove("\n"); + temp=temp.remove("\""); + temp=temp.remove(">"); + temp=temp.remove("<"); + temp=temp.remove(";"); + temp=temp.remove("}"); + temp=temp.remove("{"); + QList<QString>alskeys; + alskeys=temp.split("alias"); + if(temp.startsWith("qwerty")){ + for(int k=1;k<alskeys.size();k++){ + QString tmp=alskeys.at(k); + int inofeq=tmp.indexOf("="); + QString lat=tmp.left(inofeq); + QString key=tmp.mid(inofeq+1); + qwerty[lat]=key; + } + } + if(temp.startsWith("azerty")){ + for(int k=1;k<alskeys.size();k++){ + QString tmp=alskeys.at(k); + int inofeq=tmp.indexOf("="); + QString lat=tmp.left(inofeq); + QString key=tmp.mid(inofeq+1); + azerty[lat]=key; + } + } + if(temp.startsWith("qwertz")){ + for(int k=1;k<alskeys.size();k++){ + QString tmp=alskeys.at(k); + int inofeq=tmp.indexOf("="); + QString lat=tmp.left(inofeq); + QString key=tmp.mid(inofeq+1); + qwertz[lat]=key; + } + } + } + +} + +QString Aliases::getAlias(const QString& cname, const QString& name) +{ + QMessageBox q; + QString a=name; + if(cname=="ma"){ + a=azerty.value(name); + } + else{ + a=qwerty.value(name); + } + return a; +} + +QString Aliases::findaliasdir(){ + + QString aliasdir; + QString xkbParentDir; + + QString base(XLIBDIR); + if( base.count('/') >= 3 ) { + // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb + QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11"; + QDir baseDir(base + delta); + if( baseDir.exists() ) { + xkbParentDir = baseDir.absolutePath(); + } + else { + QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree) + if( baseDir.exists() ) { + xkbParentDir = baseDir.absolutePath(); + } + } + } + + if( xkbParentDir.isEmpty() ) { + xkbParentDir = "/usr/share/X11"; + } + aliasdir=QString("%1/xkb/keycodes/aliases").arg(xkbParentDir); + return(aliasdir); +} diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/preview/keyaliases.h similarity index 50% copy from kcontrol/keyboard/kcm_add_layout_dialog.h copy to kcontrol/keyboard/preview/keyaliases.h index 6c6a795..3769e4e 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.h +++ b/kcontrol/keyboard/preview/keyaliases.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andriy Rysin (rysin at kde.org) + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) * * 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 @@ -15,41 +15,21 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef ALIASES_H +#define ALIASES_H +#include <QtCore/QMap> -#ifndef KCM_ADD_LAYOUT_DIALOG_H_ -#define KCM_ADD_LAYOUT_DIALOG_H_ - -#include <QtGui/QDialog> - -#include "keyboard_config.h" - -class Rules; -class Flags; -class Ui_AddLayoutDialog; - -class AddLayoutDialog: public QDialog +class Aliases { - Q_OBJECT - -public: - AddLayoutDialog(const Rules* rules, Flags* flags, bool showLabel, QWidget* parent=NULL); - - LayoutUnit getSelectedLayoutUnit() { return selectedLayoutUnit; } - void accept(); - -public Q_SLOTS: - void languageChanged(int langIdx); - void layoutChanged(int layoutIdx); - private: - const Rules* rules; - Flags* flags; - Ui_AddLayoutDialog* layoutDialogUi; - QString selectedLanguage; - QString selectedLayout; - LayoutUnit selectedLayoutUnit; + QMap<QString,QString>qwerty; + QMap<QString,QString>azerty; + QMap<QString,QString>qwertz; + QString findaliasdir(); +public: + Aliases(); + QString getAlias(const QString &type, const QString &name); }; - -#endif /* KCM_ADD_LAYOUT_DIALOG_H_ */ +#endif // ALIASES_H diff --git a/kcontrol/keyboard/preview/keyboardlayout.cpp b/kcontrol/keyboard/preview/keyboardlayout.cpp new file mode 100644 index 0000000..6ac2f3f --- /dev/null +++ b/kcontrol/keyboard/preview/keyboardlayout.cpp @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) + * + * 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. + */ + + +#include "keyboardlayout.h" +#include "keysymbols.h" + +#include <QtGui/QMessageBox> +#include <QtCore/QList> +#include <QtCore/QFile> +#include <QtCore/QDir> + +#include <QtGui/QX11Info> +#include <X11/Xlib.h> +#include <X11/Xatom.h> +#include <X11/XKBlib.h> +#include <X11/extensions/XKBrules.h> +#include <fixx11h.h> +#include <config-workspace.h> + + +//TODO: replace this with grammar parser (e.g. antlr) + + +KeyboardLayout::KeyboardLayout() +{ +} + +void KeyboardLayout::generateLayout(QString a,const QString& cname) +{ + includeSymbol(a,cname); + int i=a.indexOf("name[Group1]="); + i+=13; + + QString n=a.mid(i); + n=n.simplified(); + i=n.indexOf("\"",1); + layoutName=n.left(i); + layoutName.remove("\""); + layoutName.simplified(); + i=n.indexOf("key"); + n=n.mid(i); + + QList<QString> st; + st=n.split("key"); + + KeySymbols dum; + QString r,y; + + for(int k=0;k<st.size();k++){ + dum.setKey(st.at(k)); + if(dum.keyname.startsWith("Lat")) + dum.keyname=alias.getAlias(cname,dum.keyname); + if(dum.keyname=="TLDE"){ + r=st.at(k); + TLDE.setKey(r); + } + if(dum.keyname=="BKSL"){ + r=st.at(k); + BKSL.setKey(r); + } + if(dum.keyname.contains("AE")){ + QString ind=dum.keyname.right(2); + int index=ind.toInt(); + r=st.at(k); + AE[index-1].setKey(r); + } + if(dum.keyname.contains("AD")){ + QString ind=dum.keyname.right(2); + int index=ind.toInt(); + r=st.at(k); + AD[index-1].setKey(r); + } + if(dum.keyname.contains("AC")){ + QString ind=dum.keyname.right(2); + int index=ind.toInt(); + r=st.at(k); + AC[index-1].setKey(r); + } + if(dum.keyname.contains("AB")){ + QString ind=dum.keyname.right(2); + int index=ind.toInt(); + r=st.at(k); + AB[index-1].setKey(r); + } + } +} + +void KeyboardLayout::includeSymbol(QString a,const QString& cname) +{ + int k=a.indexOf("include"); + a=a.mid(k); + + QList<QString>tobeinclude; + tobeinclude=a.split("include"); + + QString r; + for(int o=1;o<tobeinclude.size();o++){ + QString d=tobeinclude.at(o); + d.simplified(); + int k=d.indexOf("\"",2); + + QString incsym=d.left(k); + incsym.remove(" "); + incsym.remove("\""); + + QList<QString> incfile; + incfile=incsym.split("("); + for(int i=0;i<incfile.size();i++){ + QString z=incfile.at(i); + z.remove(" "); + incfile[i]=z; + } + if(incfile.size()==1) + incfile<<"basic"; + else{ + QString ns=incfile.at(1); + ns.remove(")"); + incfile[1]=ns; + } + r=incfile.at(0); + r.append(incfile.at(1)); + + QString filename=findSymbolBaseDir(); + filename.append(incfile.at(0)); + + QFile file(filename); + file.open(QIODevice::ReadOnly | QIODevice::Text); + + QString content = file.readAll(); + QList<QString> symstrlist; + + symstrlist=content.split("xkb_symbols "); + for(int u=1;u<symstrlist.size();u++){ + QString cur=symstrlist.at(u); + int pos = cur.indexOf("{"); + cur=cur.left(pos); + if(cur.contains(incfile.at(1))){ + generateLayout(symstrlist.at(u),cname); + break; + } + } + } +} + +QString KeyboardLayout::findSymbolBaseDir() +{ + QString xkbParentDir; + + QString base(XLIBDIR); + if( base.count('/') >= 3 ) { + // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb + QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11"; + QDir baseDir(base + delta); + if( baseDir.exists() ) { + xkbParentDir = baseDir.absolutePath(); + } + else { + QDir baseDir(base + "/X11"); // .../usr/X11/lib/X11/xkb (old XFree) + if( baseDir.exists() ) { + xkbParentDir = baseDir.absolutePath(); + } + } + } + + if( xkbParentDir.isEmpty() ) { + xkbParentDir = "/usr/share/X11"; + } + + return QString("%1/xkb/symbols/").arg(xkbParentDir); +} diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/preview/keyboardlayout.h similarity index 50% copy from kcontrol/keyboard/kcm_add_layout_dialog.h copy to kcontrol/keyboard/preview/keyboardlayout.h index 6c6a795..4844382 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.h +++ b/kcontrol/keyboard/preview/keyboardlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andriy Rysin (rysin at kde.org) + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) * * 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 @@ -15,41 +15,36 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef KEYBOARDLAYOUT_H +#define KEYBOARDLAYOUT_H +#include "keysymbols.h" +#include "keyaliases.h" -#ifndef KCM_ADD_LAYOUT_DIALOG_H_ -#define KCM_ADD_LAYOUT_DIALOG_H_ +#include <QtGui/QApplication> -#include <QtGui/QDialog> - -#include "keyboard_config.h" - -class Rules; -class Flags; -class Ui_AddLayoutDialog; - -class AddLayoutDialog: public QDialog +class KeyboardLayout { - Q_OBJECT - + QString layoutName; + Aliases alias; + public: - AddLayoutDialog(const Rules* rules, Flags* flags, bool showLabel, QWidget* parent=NULL); - - LayoutUnit getSelectedLayoutUnit() { return selectedLayoutUnit; } - void accept(); - -public Q_SLOTS: - void languageChanged(int langIdx); - void layoutChanged(int layoutIdx); - -private: - const Rules* rules; - Flags* flags; - Ui_AddLayoutDialog* layoutDialogUi; - QString selectedLanguage; - QString selectedLayout; - LayoutUnit selectedLayoutUnit; + KeyboardLayout(); + + KeySymbols TLDE; + KeySymbols BKSL; + KeySymbols AE[12]; + KeySymbols AD[12]; + KeySymbols AC[11]; + KeySymbols AB[11]; + + void generateLayout(QString a, const QString &cname); + QString findSymbolBaseDir(); + void includeSymbol(QString a, const QString &cname); + QString getLayoutName() const { + return layoutName; + } }; - -#endif /* KCM_ADD_LAYOUT_DIALOG_H_ */ +#endif // KEYBOARDLAYOUT_H diff --git a/kcontrol/keyboard/preview/keyboardpainter.cpp b/kcontrol/keyboard/preview/keyboardpainter.cpp new file mode 100644 index 0000000..cc32806 --- /dev/null +++ b/kcontrol/keyboard/preview/keyboardpainter.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) + * + * 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. + */ + +#include "keyboardpainter.h" +#include "ui_KeyboardPainter.h" + +#include <QtGui/QHBoxLayout> +#include <QtGui/QVBoxLayout> +#include <QtGui/QPushButton> + + +KeyboardPainter::KeyboardPainter(): + kbframe(new KbPreviewFrame(this)), + exitButton(new QPushButton(tr("Close"),this)) +{ + kbframe->setFixedSize( 1030, 490 ); + exitButton->setFixedSize(120, 30); + + QVBoxLayout* vLayout = new QVBoxLayout( this ); + vLayout->addWidget(kbframe); + vLayout->addWidget(exitButton); + + connect(exitButton, SIGNAL(clicked()), this, SLOT(close())); + + setWindowTitle(kbframe->getLayoutName()); +} + +void KeyboardPainter::generateKeyboardLayout(const QString& layout, const QString& variant) +{ + kbframe->generateKeyboardLayout(layout, variant); +} + +KeyboardPainter::~KeyboardPainter() +{ + delete kbframe; + delete exitButton; +} diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/preview/keyboardpainter.h similarity index 52% copy from kcontrol/keyboard/kcm_add_layout_dialog.h copy to kcontrol/keyboard/preview/keyboardpainter.h index 6c6a795..39382be 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.h +++ b/kcontrol/keyboard/preview/keyboardpainter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andriy Rysin (rysin at kde.org) + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) * * 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 @@ -15,41 +15,30 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef KEYBOARDPAINTER_H +#define KEYBOARDPAINTER_H -#ifndef KCM_ADD_LAYOUT_DIALOG_H_ -#define KCM_ADD_LAYOUT_DIALOG_H_ +#include "kbpreviewframe.h" #include <QtGui/QDialog> -#include "keyboard_config.h" +class QPushButton; -class Rules; -class Flags; -class Ui_AddLayoutDialog; - -class AddLayoutDialog: public QDialog +class KeyboardPainter : public QDialog { - Q_OBJECT - + Q_OBJECT + public: - AddLayoutDialog(const Rules* rules, Flags* flags, bool showLabel, QWidget* parent=NULL); - - LayoutUnit getSelectedLayoutUnit() { return selectedLayoutUnit; } - void accept(); - -public Q_SLOTS: - void languageChanged(int langIdx); - void layoutChanged(int layoutIdx); + explicit KeyboardPainter(); + ~KeyboardPainter(); + void generateKeyboardLayout(const QString& layout, const QString& variant); + private: - const Rules* rules; - Flags* flags; - Ui_AddLayoutDialog* layoutDialogUi; - QString selectedLanguage; - QString selectedLayout; - LayoutUnit selectedLayoutUnit; + KbPreviewFrame *kbframe; + QPushButton *exitButton; }; - -#endif /* KCM_ADD_LAYOUT_DIALOG_H_ */ +#endif // KEYBOARDPAINTER_H diff --git a/kcontrol/keyboard/preview/keysym2ucs.cpp b/kcontrol/keyboard/preview/keysym2ucs.cpp new file mode 100644 index 0000000..37afb08 --- /dev/null +++ b/kcontrol/keyboard/preview/keysym2ucs.cpp @@ -0,0 +1,899 @@ +/* + * Copyright (C) 2010 Andriy Rysin (rysin at kde.org) + * + * 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. + */ + +/* $XFree86$ + * This module converts keysym values into the corresponding ISO 10646-1 + * (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 0x1000abcd. + * + * 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 <mkuhn at acm.org>, University of Cambridge, June 1999 + * + * Special thanks to Richard Verhoeven <river at win.tue.nl> for preparing + * an initial draft of the mapping table. + */ + +#include <keysym2ucs.h> + +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 QAF */ + { 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 */ + { 0x06ad, 0x0491 }, /* Ukrainian_ghe_with_upturn ? CYRILLIC SMALL LETTER GHE WITH UPTURN */ + { 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 */ + { 0x06bd, 0x0490 }, /* Ukrainian_GHE_WITH_UPTURN ? CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ + { 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 ? RADICAL SYMBOL BOTTOM */ + { 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 ? LEFT SQUARE BRACKET UPPER CORNER */ + { 0x08a8, 0x23a3 }, /* botleftsqbracket ? LEFT SQUARE BRACKET LOWER CORNER */ + { 0x08a9, 0x23a4 }, /* toprightsqbracket ? RIGHT SQUARE BRACKET UPPER CORNER */ + { 0x08aa, 0x23a6 }, /* botrightsqbracket ? RIGHT SQUARE BRACKET LOWER CORNER */ + { 0x08ab, 0x239b }, /* topleftparens ? LEFT PARENTHESIS UPPER HOOK */ + { 0x08ac, 0x239d }, /* botleftparens ? LEFT PARENTHESIS LOWER HOOK */ + { 0x08ad, 0x239e }, /* toprightparens ? RIGHT PARENTHESIS UPPER HOOK */ + { 0x08ae, 0x23a0 }, /* botrightparens ? RIGHT PARENTHESIS LOWER HOOK */ + { 0x08af, 0x23a8 }, /* leftmiddlecurlybrace ? LEFT CURLY BRACKET MIDDLE PIECE */ + { 0x08b0, 0x23ac }, /* rightmiddlecurlybrace ? RIGHT CURLY BRACKET MIDDLE PIECE */ +/* 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, 0x2422 }, /* blank ? BLANK SYMBOL */ + { 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 */ + { 0x09f0, 0x23bb }, /* horizlinescan3 ? HORIZONTAL SCAN LINE-3 */ + { 0x09f1, 0x2500 }, /* horizlinescan5 ? BOX DRAWINGS LIGHT HORIZONTAL */ + { 0x09f2, 0x23bc }, /* horizlinescan7 ? HORIZONTAL SCAN LINE-7 */ + { 0x09f3, 0x23bd }, /* horizlinescan9 ? HORIZONTAL SCAN LINE-9 */ + { 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, 0x2423 }, /* signifblank ? OPEN BOX */ + { 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, 0x002e }, /* decimalpoint . FULL STOP */ + { 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 */ +/* 0x0ad5 permille ? ??? */ + { 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 QOF */ + { 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, 0x0e3e }, /* 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 */ + + /* Combining symbols */ + { 0xfe50, 0x0300 }, /* dead_grave */ + { 0xfe51, 0x0301 }, /* dead_acute" */ + { 0xfe52, 0x0302 }, /* dead_circumflex" */ + { 0xfe53, 0x0303 }, /* dead_tilde" */ + { 0xfe54, 0x0304 }, /* dead_macron" */ + { 0xfe55, 0x0306 }, /* dead_breve" */ + { 0xfe56, 0x0307 }, /* dead_abovedot" */ + { 0xfe57, 0x0308 }, /* dead_diaeresis" */ + { 0xfe58, 0x030A }, /* dead_abovering" */ + { 0xfe59, 0x030B }, /* dead_doubleacute" */ + { 0xfe5a, 0x030C }, /* dead_caron" */ + { 0xfe5b, 0x0327 }, /* dead_cedilla" */ + { 0xfe5c, 0x0328 }, /* dead_ogonek" */ + { 0xfe60, 0x0323 }, /* dead_belowdot */ + + /* Special function keys. */ + + { 0xff08, 0x0008 }, /* XK_BackSpace */ + { 0xff09, 0x0009 }, /* XK_Tab */ + { 0xff0a, 0x000a }, /* XK_Linefeed */ + { 0xff0d, 0x000d }, /* XK_Return */ + { 0xff13, 0x0013 }, /* XK_Pause */ + { 0xff1b, 0x001b }, /* XK_Escape */ + { 0xff50, 0x0001 }, /* XK_Home */ + { 0xff51, 0x001c }, /* XK_Left */ + { 0xff52, 0x001e }, /* XK_Up */ + { 0xff53, 0x001d }, /* XK_Right */ + { 0xff54, 0x001f }, /* XK_Down */ + { 0xff55, 0x000b }, /* XK_Prior */ + { 0xff56, 0x000c }, /* XK_Next */ + { 0xff57, 0x0004 }, /* XK_End */ + { 0xff6a, 0x0005 }, /* XK_Help */ + { 0xffff, 0x007f }, /* XK_Delete */ +}; + +long 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; +} diff --git a/kcontrol/keyboard/preview/keysym2ucs.h b/kcontrol/keyboard/preview/keysym2ucs.h new file mode 100644 index 0000000..6e50c76 --- /dev/null +++ b/kcontrol/keyboard/preview/keysym2ucs.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2012 Andriy Rysin (arysin at gmail.com) + * + * 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 KEYSYM2UCS_H +#define KEYSYM2UCS_H + +#include <X11/XKBlib.h> +#include <fixx11h.h> + +extern long keysym2ucs(KeySym keysym); + +#endif diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/preview/keysymbols.cpp similarity index 50% copy from kcontrol/keyboard/kcm_add_layout_dialog.h copy to kcontrol/keyboard/preview/keysymbols.cpp index 6c6a795..9483d3f 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.h +++ b/kcontrol/keyboard/preview/keysymbols.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andriy Rysin (rysin at kde.org) + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) * * 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 @@ -17,39 +17,38 @@ */ -#ifndef KCM_ADD_LAYOUT_DIALOG_H_ -#define KCM_ADD_LAYOUT_DIALOG_H_ +#include "keysymbols.h" -#include <QtGui/QDialog> +#include <QtGui/QApplication> +#include <QtCore/QStringList> -#include "keyboard_config.h" -class Rules; -class Flags; -class Ui_AddLayoutDialog; - -class AddLayoutDialog: public QDialog +KeySymbols::KeySymbols() { - Q_OBJECT - -public: - AddLayoutDialog(const Rules* rules, Flags* flags, bool showLabel, QWidget* parent=NULL); - - LayoutUnit getSelectedLayoutUnit() { return selectedLayoutUnit; } - void accept(); - -public Q_SLOTS: - void languageChanged(int langIdx); - void layoutChanged(int layoutIdx); +} -private: - const Rules* rules; - Flags* flags; - Ui_AddLayoutDialog* layoutDialogUi; - QString selectedLanguage; - QString selectedLayout; - LayoutUnit selectedLayoutUnit; -}; - - -#endif /* KCM_ADD_LAYOUT_DIALOG_H_ */ +void KeySymbols::setKey(const QString& a) +{ + int i=a.indexOf("<"); + i++; + keyname=a.mid(i,4); + keyname.remove(" "); + i=a.indexOf("["); + i++; + + QString str=a.mid(i); + i=str.indexOf("]"); + + QString st=str.left(i); + st=st.remove(" "); + //QStringList klst; + symbols=st.split(","); + + for(int k=0;k<symbols.size();k++){ + QString du=symbols.at(k); + du.remove(" "); + du.remove("\t"); + du.remove("\n"); + symbols[k]=du; + } +} diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/preview/keysymbols.h similarity index 50% copy from kcontrol/keyboard/kcm_add_layout_dialog.h copy to kcontrol/keyboard/preview/keysymbols.h index 6c6a795..8dfaee7 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.h +++ b/kcontrol/keyboard/preview/keysymbols.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andriy Rysin (rysin at kde.org) + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) * * 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 @@ -15,41 +15,23 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef KEYSYMBOLS_H +#define KEYSYMBOLS_H -#ifndef KCM_ADD_LAYOUT_DIALOG_H_ -#define KCM_ADD_LAYOUT_DIALOG_H_ +#include <QtGui/QApplication> +#include <QtCore/QList> -#include <QtGui/QDialog> - -#include "keyboard_config.h" - -class Rules; -class Flags; -class Ui_AddLayoutDialog; - -class AddLayoutDialog: public QDialog +class KeySymbols { - Q_OBJECT - public: - AddLayoutDialog(const Rules* rules, Flags* flags, bool showLabel, QWidget* parent=NULL); - - LayoutUnit getSelectedLayoutUnit() { return selectedLayoutUnit; } - void accept(); + KeySymbols(); -public Q_SLOTS: - void languageChanged(int langIdx); - void layoutChanged(int layoutIdx); + QString keyname; + QList<QString> symbols; -private: - const Rules* rules; - Flags* flags; - Ui_AddLayoutDialog* layoutDialogUi; - QString selectedLanguage; - QString selectedLayout; - LayoutUnit selectedLayoutUnit; + void setKey(const QString& opton); }; - -#endif /* KCM_ADD_LAYOUT_DIALOG_H_ */ +#endif // KEYSYMBOLS_H diff --git a/kcontrol/keyboard/preview/keysymhelper.cpp b/kcontrol/keyboard/preview/keysymhelper.cpp new file mode 100644 index 0000000..67beb80 --- /dev/null +++ b/kcontrol/keyboard/preview/keysymhelper.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) + * + * 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. + */ + +#include "keysymhelper.h" +#include "keysym2ucs.h" + +#include <QtCore/QString> +#include <QtCore/QChar> + +#include <KDebug> + +#include <X11/XKBlib.h> + + +KeySymHelper::KeySymHelper() +{ + nill = 0; +} + +QString KeySymHelper::getKeySymbol(const QString& opton) +{ + if( keySymbolMap.contains(opton) ) + return keySymbolMap[opton]; + + const char* str = opton.toAscii().data(); + +#if 0 + //TODO: figure out how to use this so we don't need our own symkey2ucs mapping + int res = Xutf8LookupString(XIC ic, XKeyPressedEvent *event, char *buffer_return, int bytes_buffer, KeySym *keysym_return, Status *status_return); + +#else + + KeySym keysym = XStringToKeysym(str); + long ucs = keysym2ucs(keysym); + +// if( ucs == -1 && (keysym >= 0xFE50 && keysym <= 0xFE5F) ) { +// ucs = 0x0300 + (keysym & 0x000F); +// kWarning() << "Got dead symbol" << QString("0x%1").arg(keysym, 0, 16) << "named" << opton << "will use" << QString("0x%1").arg(ucs, 0, 16) << "as UCS"; +// } + + if( ucs == -1 ) { + nill++; + kWarning() << "No mapping from keysym:" << QString("0x%1").arg(keysym, 0, 16) << "named:" << opton << "to UCS"; + } + + QString ucsStr = QString(QChar((int)ucs)); + + // Combining Diacritical Marks + if( ucs >= 0x0300 && ucs <= 0x036F ) { + ucsStr = " " + ucsStr + " "; + } + +// kWarning() << "--" << opton << "keysym: " << keysym << QString("0x%1").arg(keysym, 0, 16) << "keysym2string" << XKeysymToString(keysym) +// << "---" << QString("0x%1").arg(ucs, 0, 16) << ucsStr; + + keySymbolMap[opton] = ucsStr; + + return ucsStr; + +#endif + +} + diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/preview/keysymhelper.h similarity index 51% copy from kcontrol/keyboard/kcm_add_layout_dialog.h copy to kcontrol/keyboard/preview/keysymhelper.h index 6c6a795..763e872 100644 --- a/kcontrol/keyboard/kcm_add_layout_dialog.h +++ b/kcontrol/keyboard/preview/keysymhelper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andriy Rysin (rysin at kde.org) + * Copyright (C) 2012 Shivam Makkar (amourphious1992 at gmail.com) * * 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 @@ -16,40 +16,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef KEYSYMHELPER_H +#define KEYSYMHELPER_H -#ifndef KCM_ADD_LAYOUT_DIALOG_H_ -#define KCM_ADD_LAYOUT_DIALOG_H_ +#include <QtCore/QString> +#include <QtCore/QMap> -#include <QtGui/QDialog> - -#include "keyboard_config.h" - -class Rules; -class Flags; -class Ui_AddLayoutDialog; - -class AddLayoutDialog: public QDialog +class KeySymHelper { - Q_OBJECT - public: - AddLayoutDialog(const Rules* rules, Flags* flags, bool showLabel, QWidget* parent=NULL); - - LayoutUnit getSelectedLayoutUnit() { return selectedLayoutUnit; } - void accept(); - -public Q_SLOTS: - void languageChanged(int langIdx); - void layoutChanged(int layoutIdx); + KeySymHelper(); + + QString getKeySymbol(const QString &opton); + bool isFailed() const { + return nill >= 120; + } private: - const Rules* rules; - Flags* flags; - Ui_AddLayoutDialog* layoutDialogUi; - QString selectedLanguage; - QString selectedLayout; - LayoutUnit selectedLayoutUnit; + QMap<QString, QString> keySymbolMap; + int nill; }; - -#endif /* KCM_ADD_LAYOUT_DIALOG_H_ */ +#endif // KEYSYMHELPER_H diff --git a/kcontrol/keyboard/x11_helper.cpp b/kcontrol/keyboard/x11_helper.cpp index fdadeeb..ebd09f3 100644 --- a/kcontrol/keyboard/x11_helper.cpp +++ b/kcontrol/keyboard/x11_helper.cpp @@ -347,7 +347,7 @@ bool XEventNotifier::isGroupSwitchEvent(XEvent* event) #define GROUP_CHANGE_MASK \ ( XkbGroupStateMask | XkbGroupBaseMask | XkbGroupLatchMask | XkbGroupLockMask ) - return xkbEvent->any.xkb_type == XkbStateNotify && xkbEvent->state.changed & GROUP_CHANGE_MASK; + return xkbEvent->any.xkb_type == XkbStateNotify && (xkbEvent->state.changed & GROUP_CHANGE_MASK); } bool XEventNotifier::isLayoutSwitchEvent(XEvent* event)
