[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-frameworks-devel
Subject: D6233: KKeyServer: fix handling of KeypadModifier.
From: Martin_Flöser <noreply () phabricator ! kde ! org>
Date: 2017-06-16 18:51:42
Message-ID: 20170616185142.66367.85084ABA67A2C29F () phabricator ! kde ! org
[Download RAW message or body]
graesslin requested changes to this revision.
graesslin added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> kkeyserver.cpp:160-180
> + { Qt::Key_Space, XK_KP_Space },
> + { Qt::Key_Tab, XK_KP_Tab },
> + { Qt::Key_Enter, XK_KP_Enter },
> + { Qt::Key_Home, XK_KP_Home },
> + { Qt::Key_Left, XK_KP_Left },
> + { Qt::Key_Up, XK_KP_Up },
> + { Qt::Key_Right, XK_KP_Right },
This looks very unrelated to the described change. Maybe an own commit?
> kkeyserver.cpp:765
> if (g_rgQtToSymX[i].keySymQt == symQt) {
> + if ((keyQt & Qt::KeypadModifier) && !xcb_is_keypad_key(g_rgQtToSymX[i].keySymX))
> + continue;
xcb_is_keypad_key is not part of any xcb component KWindowSystem looks for.
> kkeyserver.cpp:783
> + int keyModQt = 0;
> + if (symXToKeyQt(keySym, keyQt) && modXToQt(modX, &keyModQt)) {
> + *keyQt |= keyModQt;
why are you calling a deprecated method from a new method?
> kkeyserver_x11.h:150
> */
> -KWINDOWSYSTEM_EXPORT bool symXToKeyQt(uint sym, int *keyQt);
> +KWINDOWSYSTEM_DEPRECATED_EXPORT bool symXToKeyQt(uint sym, int *keyQt);
> +
if it's getting deprecated it must be wrapped in ifdef, shouldn't it?
> kkeyserver_x11.h:159
> + */
> +KWINDOWSYSTEM_EXPORT bool symXModXToKeyQt(uint keySym, uint modX, int *keyQt);
>
for new code I would find it better to use the proper types of either uint32_t or quint32.
REPOSITORY
R278 KWindowSystem
REVISION DETAIL
https://phabricator.kde.org/D6233
To: dfaure, graesslin
Cc: graesslin, #frameworks
[Attachment #3 (unknown)]
<table><tr><td style="">graesslin requested changes to this revision.<br />graesslin \
added inline comments.<br />This revision now requires changes to proceed. </td><a \
style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; \
color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; \
background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; \
border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D6233" \
rel="noreferrer">View Revision</a></tr></table><br /><div><strong>INLINE \
COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px \
solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; \
border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div \
style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a \
style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D6233#inline-25682" rel="noreferrer">View \
Inline</a><span style="color: #4b4d51; font-weight: \
bold;">kkeyserver.cpp:160-180</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">{</span> \
<span class="bright"></span><span style="color: #766510"><span \
class="bright">'/'</span></span><span class="p">,</span> <span \
class="bright"> </span><span class="n">XK_KP_<span \
class="bright">Divid</span>e</span> <span class="p">},</span> </div><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span \
class="p">{</span> <span class="bright"></span><span style="color: #766510"><span \
class="bright">'*'</span></span><span class="p">,</span> <span \
class="bright"> </span><span class="n">XK_KP_<span \
class="bright">Multiply</span></span> <span class="p">},</span> </div><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span \
class="p">{</span> <span class="bright"></span><span style="color: #766510"><span \
class="bright">'-'</span></span><span class="p">,</span> <span \
class="bright"> </span><span class="n">XK_KP_<span \
class="bright">Subtract</span></span> <span class="p">},</span> </div><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span \
class="p">{</span> <span class="bright"></span><span style="color: #766510"><span \
class="bright">'+'</span></span><span class="p">,</span> <span \
class="bright"> </span><span class="n">XK_KP_<span \
class="bright">Add</span></span> <span class="p">},</span> </div><div style="padding: \
0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span \
class="p">{</span> <span class="n">Qt</span><span style="color: \
#aa2211">::</span><span class="n">Key_<span class="bright">Return</span></span><span \
class="p">,</span> <span class="n">XK_KP_<span \
class="bright">Enter</span></span><span class="bright"> </span><span class="p"><span \
class="bright">}</span></span> </div><div style="padding: 0 8px; margin: 0 4px; \
background: rgba(151, 234, 151, .6);"> <span class="p">{</span> <span \
class="bright"></span><span class="n"><span class="bright">Qt</span></span><span \
class="bright"></span><span style="color: #aa2211"><span \
class="bright">::</span></span><span class="bright"></span><span class="n"><span \
class="bright">Key_Space</span></span><span class="p">,</span> <span \
class="n">XK_KP_<span class="bright">Spac</span>e</span> <span class="p">},</span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, \
.6);"> <span class="p">{</span> <span class="bright"></span><span class="n"><span \
class="bright">Qt</span></span><span class="bright"></span><span style="color: \
#aa2211"><span class="bright">::</span></span><span class="bright"></span><span \
class="n"><span class="bright">Key_Tab</span></span><span class="p">,</span> \
<span class="n">XK_KP_<span class="bright">Tab</span></span> <span \
class="p">},</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
rgba(151, 234, 151, .6);"> <span class="p">{</span> <span \
class="bright"></span><span class="n"><span class="bright">Qt</span></span><span \
class="bright"></span><span style="color: #aa2211"><span \
class="bright">::</span></span><span class="bright"></span><span class="n"><span \
class="bright">Key_Enter</span></span><span class="p">,</span> <span \
class="n">XK_KP_<span class="bright">Enter</span></span> <span class="p">},</span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, \
.6);"> <span class="p">{</span> <span class="bright"></span><span class="n"><span \
class="bright">Qt</span></span><span class="bright"></span><span style="color: \
#aa2211"><span class="bright">::</span></span><span class="bright"></span><span \
class="n"><span class="bright">Key_Home</span></span><span class="p">,</span> \
<span class="n">XK_KP_<span class="bright">Home</span></span> <span \
class="p">},</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
rgba(151, 234, 151, .6);"> <span class="p">{</span> <span class="n">Qt</span><span \
style="color: #aa2211">::</span><span class="n">Key_<span \
class="bright">Left</span></span><span class="p">,</span> <span class="bright"> \
</span><span class="n">XK_KP_<span class="bright">Left</span></span><span \
class="bright"> </span><span class="p"><span class="bright">},</span></span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, \
.6);"> <span class="p">{</span> <span class="n">Qt</span><span style="color: \
#aa2211">::</span><span class="n">Key_Up</span><span class="p">,</span> <span \
class="n">XK_KP_Up</span> <span class="p">},</span> </div><div style="padding: 0 8px; \
margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">{</span> \
<span class="n">Qt</span><span style="color: #aa2211">::</span><span \
class="n">Key_Right</span><span class="p">,</span> <span \
class="n">XK_KP_Right</span> <span class="p">},</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This \
looks very unrelated to the described change. Maybe an own commit?</p></div></div><br \
/><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; \
background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 \
1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; \
overflow: hidden;"><a style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D6233#inline-25681" rel="noreferrer">View \
Inline</a><span style="color: #4b4d51; font-weight: \
bold;">kkeyserver.cpp:765</span></div> <div style="font: 11px/15px "Menlo", \
"Consolas", "Monaco", monospace; white-space: pre-wrap; clear: \
both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> \
<span style="color: #aa4000">if</span> <span class="p">(</span><span \
class="n">g_rgQtToSymX</span><span class="p">[</span><span class="n">i</span><span \
class="p">].</span><span class="n">keySymQt</span> <span style="color: \
#aa2211">==</span> <span class="n">symQt</span><span class="p">)</span> <span \
class="p">{</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span \
class="p">((</span><span class="n">keyQt</span> <span style="color: \
#aa2211">&</span> <span class="n">Qt</span><span style="color: \
#aa2211">::</span><span class="n">KeypadModifier</span><span class="p">)</span> <span \
style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span \
class="n">xcb_is_keypad_key</span><span class="p">(</span><span \
class="n">g_rgQtToSymX</span><span class="p">[</span><span class="n">i</span><span \
class="p">].</span><span class="n">keySymX</span><span class="p">))</span> </div><div \
style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> \
<span style="color: #aa4000">continue</span><span class="p">;</span> \
</div></div></div> <div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; \
margin: 8px;">xcb_is_keypad_key is not part of any xcb component KWindowSystem looks \
for.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: \
3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; \
border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; \
background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; \
text-decoration: none;" href="https://phabricator.kde.org/D6233#inline-25680" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">kkeyserver.cpp:783</span></div> <div style="font: 11px/15px "Menlo", \
"Consolas", "Monaco", monospace; white-space: pre-wrap; clear: \
both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; \
background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">int</span> \
<span class="n">keyModQt</span> <span style="color: #aa2211">=</span> <span \
style="color: #601200">0</span><span class="p">;</span> </div><div style="padding: 0 \
8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: \
#aa4000">if</span> <span class="p">(</span><span class="n">symXToKeyQt</span><span \
class="p">(</span><span class="n">keySym</span><span class="p">,</span> <span \
class="n">keyQt</span><span class="p">)</span> <span style="color: \
#aa2211">&&</span> <span class="n">modXToQt</span><span \
class="p">(</span><span class="n">modX</span><span class="p">,</span> <span \
style="color: #aa2211">&</span><span class="n">keyModQt</span><span \
class="p">))</span> <span class="p">{</span> </div><div style="padding: 0 8px; \
margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: \
#aa2211">*</span><span class="n">keyQt</span> <span style="color: #aa2211">|=</span> \
<span class="n">keyModQt</span><span class="p">;</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">why \
are you calling a deprecated method from a new method?</p></div></div><br /><div \
style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; \
background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 \
1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; \
overflow: hidden;"><a style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D6233#inline-25679" rel="noreferrer">View \
Inline</a><span style="color: #4b4d51; font-weight: \
bold;">kkeyserver_x11.h:150</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; "><span style="color: #74777d"> */</span> </div><div style="padding: 0 \
8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span \
class="n">KWINDOWSYSTEM_EXPORT</span> <span style="color: #aa4000">bool</span> <span \
style="color: #004012">symXToKeyQt</span><span class="p">(</span><span \
class="n">uint</span> <span class="n">sym</span><span class="p">,</span> <span \
style="color: #aa4000">int</span> <span style="color: #aa2211">*</span><span \
class="n">keyQt</span><span class="p">);</span> </div><div style="padding: 0 8px; \
margin: 0 4px; background: rgba(151, 234, 151, .6);"><span \
class="n">KWINDOWSYSTEM_<span class="bright">DEPRECATED_</span>EXPORT</span> <span \
style="color: #aa4000">bool</span> <span style="color: \
#004012">symXToKeyQt</span><span class="p">(</span><span class="n">uint</span> <span \
class="n">sym</span><span class="p">,</span> <span style="color: #aa4000">int</span> \
<span style="color: #aa2211">*</span><span class="n">keyQt</span><span \
class="p">);</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">if \
it's getting deprecated it must be wrapped in ifdef, shouldn't \
it?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: \
3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; \
border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; \
background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; \
text-decoration: none;" href="https://phabricator.kde.org/D6233#inline-25678" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">kkeyserver_x11.h:159</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d"> \
*/</span> </div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, \
151, .6);"><span class="n">KWINDOWSYSTEM_EXPORT</span> <span style="color: \
#aa4000">bool</span> <span style="color: #004012">symXModXToKeyQt</span><span \
class="p">(</span><span class="n">uint</span> <span class="n">keySym</span><span \
class="p">,</span> <span class="n">uint</span> <span class="n">modX</span><span \
class="p">,</span> <span style="color: #aa4000">int</span> <span style="color: \
#aa2211">*</span><span class="n">keyQt</span><span class="p">);</span> \
</div></div></div> <div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; \
margin: 8px;">for new code I would find it better to use the proper types of either \
uint32_t or quint32.</p></div></div></div></div></div><br \
/><div><strong>REPOSITORY</strong><div><div>R278 KWindowSystem</div></div></div><br \
/><div><strong>REVISION DETAIL</strong><div><a \
href="https://phabricator.kde.org/D6233" \
rel="noreferrer">https://phabricator.kde.org/D6233</a></div></div><br \
/><div><strong>To: </strong>dfaure, graesslin<br /><strong>Cc: </strong>graesslin, \
Frameworks<br /></div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic