mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-06-10 06:55:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Run clang-format on the whole repo

Browse Source 
Also install the relevant git hook.

GIT_SILENT
This commit is contained in:
Ahmad Samir
2021-09-06 11:27:12 +02:00
parent fed1a9d2cf
commit 97569b764c
293 changed files with 8267 additions and 8135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/characters/CharacterWidth.src.cpp
View File

@@ -3,21 +3,22 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
«*NOTE:-----------------------------------------------------------------------*»
// Typing in "«" and "»" characters in some keyboard layouts (X11):
//
// English/UK: AltGr+Z AltGr+X
// EurKEY: AltGr+[ AltGr+]
// German: AltGr+X AltGr+Y
// Polish: AltGr+9 AltGr+0
// English/US: N/A; You can try EurKEY which extends En/US layout with extra
// characters available with AltGr[+Shift].
//
// Alternatively, you can use e.g. "<<<" and ">>>" and convert it to the valid
// characters using sed or your editor's replace function.
//
// This text will not appear in an output file.
«*-----------------------------------------------------------------------:NOTE*»
«*NOTE : -----------------------------------------------------------------------*»
// Typing in "«" and "»" characters in some keyboard layouts (X11):
//
// English/UK: AltGr+Z AltGr+X
// EurKEY: AltGr+[ AltGr+]
// German: AltGr+X AltGr+Y
// Polish: AltGr+9 AltGr+0
// English/US: N/A; You can try EurKEY which extends En/US layout with extra
// characters available with AltGr[+Shift].
//
// Alternatively, you can use e.g. "<<<" and ">>>" and convert it to the valid
// characters using sed or your editor's replace function.
//
// This text will not appear in an output file.
«
* ----------------------------------------------------------------------- : NOTE *»
//
// «gen-file-warning»
//
@@ -35,14 +36,13 @@
#include "CharacterWidth.h"
#include "konsolecharacters_export.h"
struct Range {
struct Range {
uint first, last;
};
struct RangeLut {
int8_t width;
const Range * const lut;
const Range *const lut;
int size;
};
@@ -50,36 +50,34 @@ enum {
InvalidWidth = INT8_MIN,
};
static constexpr const int8_t DIRECT_LUT[] = {«!fmt "% d":«direct-lut:
«!repeat 32:«:«»,»»
static constexpr const int8_t DIRECT_LUT[] = {«!fmt "% d" :«direct - lut :
«!repeat 32 :«:«»,»»
»»};
«ranges-luts:«:
static constexpr const Range «name»[] = {«!fmt "%#.6x":«ranges:
«!repeat 8:«:{«first»,«last»},»»
«ranges - luts :«: static constexpr const Range «name»[] = {«!fmt "%#.6x" :«ranges :
«!repeat 8 :«: {«first»,«last»},»»
»»};
»»
static constexpr const RangeLut RANGE_LUT_LIST[] = {«ranges-lut-list:
«:{«!fmt "% d":«width»», «!fmt "%-16s":«name»», «size»},»
static constexpr const RangeLut RANGE_LUT_LIST[] = {«ranges - lut - list :
«: {«!fmt "% d" :«width»», «!fmt "%-16s" :«name»», «size»},»
»};
static constexpr const int RANGE_LUT_LIST_SIZE = «ranges-lut-list-size»;
static constexpr const int RANGE_LUT_LIST_SIZE = «ranges - lut - list - size»;
int KONSOLECHARACTERS_EXPORT characterWidth(uint ucs4) {
if(Q_LIKELY(ucs4 < sizeof(DIRECT_LUT))) {
int KONSOLECHARACTERS_EXPORT characterWidth(uint ucs4)
{
if (Q_LIKELY(ucs4 < sizeof(DIRECT_LUT))) {
return DIRECT_LUT[ucs4];
}
for(auto rl = RANGE_LUT_LIST; rl->lut != nullptr; ++rl) {
for (auto rl = RANGE_LUT_LIST; rl->lut != nullptr; ++rl) {
int l = 0;
int r = rl->size - 1;
while(l <= r) {
while (l <= r) {
const int m = (l + r) / 2;
if(rl->lut[m].last < ucs4) {
if (rl->lut[m].last < ucs4) {
l = m + 1;
} else if(rl->lut[m].first > ucs4) {
} else if (rl->lut[m].first > ucs4) {
r = m - 1;
} else {
return rl->width;
@@ -89,4 +87,3 @@ int KONSOLECHARACTERS_EXPORT characterWidth(uint ucs4) {
return RANGE_LUT_LIST[RANGE_LUT_LIST_SIZE - 1].width;
}