File fix-chardict-qt4.patch of Package uim_backports

Overview Repositories Revisions Requests Users Attributes Meta

File fix-chardict-qt4.patch of Package uim_backports

--- ./qt4/chardict/qt4.cpp.orig	2018-05-12 06:33:26.000000000 +0900
+++ ./qt4/chardict/qt4.cpp	2024-08-17 01:11:38.173690585 +0900
@@ -62,11 +62,15 @@
 #endif
 
 #ifdef Q_WS_X11
+
+#if QT_VERSION < 0x040700
 #include <QtGui/QX11Info>
 
 #include <X11/Xutil.h>
 #endif
 
+#endif
+
 #include <clocale>
 
 #include <uim/uim.h>
@@ -120,6 +124,7 @@
         : QWidget( parent )
 {
 #ifdef Q_WS_X11
+#if QT_VERSION < 0x040700
     // Don't give input focus to this window.
     XWMHints *wmhints = XGetWMHints( QX11Info::display(), winId() );
     if ( !wmhints )
@@ -128,6 +133,9 @@
     wmhints->input = False;
     XSetWMHints( QX11Info::display(), winId(), wmhints );
     XFree( wmhints );
+#else
+    setAttribute( Qt::WA_X11DoNotAcceptFocus );
+#endif
 #endif
 
     setupWidgets();
--- ./qt4/chardict/unicodeviewwidget.cpp.orig	2018-05-12 06:33:26.000000000 +0900
+++ ./qt4/chardict/unicodeviewwidget.cpp	2024-08-17 01:06:58.011964868 +0900
@@ -369,7 +369,14 @@
     QStringList charList;
     for ( uint d = block->getStartHex(); d < block->getEndHex(); d++ )
     {
-        charList.append( QString( QChar( d ) ) );
+        QString charStr;
+        if ( QChar::requiresSurrogates( d ) ) {
+            charStr += QChar( QChar::highSurrogate( d ) );
+            charStr += QChar( QChar::lowSurrogate( d ) );
+        } else {
+            charStr = QChar( d );
+        }
+        charList.append( charStr );
     }
 
     m_charGridView->setCharacters( charList );
--- ./qt4/immodule/quiminputcontext_compose.cpp.orig	2018-05-10 13:39:08.000000000 +0900
+++ ./qt4/immodule/quiminputcontext_compose.cpp	2024-08-18 02:38:43.913149683 +0900
@@ -945,7 +945,7 @@
         int n;
         char *args[2], *from, *to;
         // isspace for tab doesn't seem to work with Qt4...
-        while (static_cast<unsigned char>(isspace(*p)) || *p == '\t') {
+        while (isspace(static_cast<unsigned char>(*p)) || *p == '\t') {
             ++p;
         }
         if (iscomment(*p)) {
@@ -980,7 +980,7 @@
 
     while (argc < argsize) {
         // isspace for tab doesn't seem to work with Qt4...
-        while (static_cast<unsigned char>(isspace(*p)) || *p == '\t') {
+        while (isspace(static_cast<unsigned char>(*p)) || *p == '\t') {
             ++p;
         }
         if (*p == '\0') {

Places

File fix-chardict-qt4.patch of Package uim_backports

Places