Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-07-01 03:25:17 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-01 03:25:49 +0300
commit753806c731b6e8b9de5f2af29ff6235b0590ab6c (patch)
treee3da3cf16c152b3509f4f1ce685b1e041546c424 /intern/ghost
parenta689b5932de3f27b6c14c51bc5bfc4c46699e04c (diff)
Cleanup: spelling
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.cpp31
-rw-r--r--intern/ghost/intern/GHOST_WindowWin32.cpp2
2 files changed, 15 insertions, 18 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 2b1069f9acc..c5564e9880e 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1044,33 +1044,30 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
GHOST_TKey gkey;
#ifdef USE_NON_LATIN_KB_WORKAROUND
- /* XXX Code below is kinda awfully convoluted... Issues are:
- *
- * - In keyboards like latin ones, numbers need a 'Shift' to be accessed but key_sym
- * is unmodified (or anyone swapping the keys with xmodmap).
- *
- * - XLookupKeysym seems to always use first defined keymap (see T47228), which generates
- * keycodes unusable by ghost_key_from_keysym for non-Latin-compatible keymaps.
+ /* XXX: Code below is kinda awfully convoluted... Issues are:
+ * - In keyboards like latin ones, numbers need a 'Shift' to be accessed but key_sym
+ * is unmodified (or anyone swapping the keys with `xmodmap`).
+ * - #XLookupKeysym seems to always use first defined key-map (see T47228), which generates
+ * key-codes unusable by ghost_key_from_keysym for non-Latin-compatible key-maps.
*
* To address this, we:
- *
- * - Try to get a 'number' key_sym using XLookupKeysym (with virtual shift modifier),
- * in a very restrictive set of cases.
- * - Fallback to XLookupString to get a key_sym from active user-defined keymap.
+ * - Try to get a 'number' key_sym using #XLookupKeysym (with virtual shift modifier),
+ * in a very restrictive set of cases.
+ * - Fallback to #XLookupString to get a key_sym from active user-defined key-map.
*
* Note that:
- * - This effectively 'lock' main number keys to always output number events
- * (except when using alt-gr).
- * - This enforces users to use an ASCII-compatible keymap with Blender -
- * but at least it gives predictable and consistent results.
+ * - This effectively 'lock' main number keys to always output number events
+ * (except when using alt-gr).
+ * - This enforces users to use an ASCII-compatible key-map with Blender -
+ * but at least it gives predictable and consistent results.
*
* Also, note that nothing in XLib sources [1] makes it obvious why those two functions give
- * different key_sym results...
+ * different key_sym results.
*
* [1] http://cgit.freedesktop.org/xorg/lib/libX11/tree/src/KeyBind.c
*/
KeySym key_sym_str;
- /* Mode_switch 'modifier' is AltGr - when this one or Shift are enabled,
+ /* Mode_switch 'modifier' is `AltGr` - when this one or Shift are enabled,
* we do not want to apply that 'forced number' hack. */
const unsigned int mode_switch_mask = XkbKeysymToModifiers(xke->display, XK_Mode_switch);
const unsigned int number_hack_forbidden_kmods_mask = mode_switch_mask | ShiftMask;
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 4f85e2ea8d0..1b73b765b49 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -136,7 +136,7 @@ GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system,
RegisterTouchWindow(m_hWnd, 0);
- /* Register as droptarget. OleInitialize(0) required first, done in GHOST_SystemWin32. */
+ /* Register as drop-target. #OleInitialize(0) required first, done in GHOST_SystemWin32. */
m_dropTarget = new GHOST_DropTargetWin32(this, m_system);
::RegisterDragDrop(m_hWnd, m_dropTarget);