gryf/wmdocklib
1
0
Fork 0
mirror of https://github.com/gryf/wmdocklib.git synced 2025-12-19 20:38:03 +01:00
Code Issues Projects Releases Wiki Activity

Fixed possible duplicate in colors when merging palette.

Browse Source
This commit is contained in:
gryf
2022-05-04 16:37:24 +02:00
parent d38978168e
commit 434155a340
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wmdocklib/helpers.py
View File

@@ -35,6 +35,7 @@ from wmdocklib import pywmgeneral
charset_start = None charset_start = None
charset_width = None charset_width = None
MARKER = 'xxxxxxxxxxx'
RGB_FILE_LIST = ['/etc/X11/rgb.txt', RGB_FILE_LIST = ['/etc/X11/rgb.txt',
'/usr/lib/X11/rgb.txt', '/usr/lib/X11/rgb.txt',
'/usr/share/X11/rgb.txt', '/usr/share/X11/rgb.txt',
@@ -222,8 +223,10 @@ def merge_palettes(pal1, pal2, bitmap_list):
char changes in the bitmap_list. Returns new palette and corrected bitmap. char changes in the bitmap_list. Returns new palette and corrected bitmap.
""" """
rerun = False rerun = False
for char, color in pal2.copy().items(): for char in pal2.copy():
if color == 'xxxx': # get the color from possibly updated palette, not from the copy
color = pal2[char]
if color == MARKER:
# ignore replaced chars # ignore replaced chars
continue continue
@@ -241,10 +244,13 @@ def merge_palettes(pal1, pal2, bitmap_list):
# find out, if color exists under different key # find out, if color exists under different key
new_char = {v: k for k, v in pal1.items()}.get(color) new_char = {v: k for k, v in pal1.items()}.get(color)
if pal2.get(new_char) == MARKER:
continue
if new_char: if new_char:
if new_char in pal2 and pal2[new_char] != 'xxxx': if new_char in pal2:
# we have a clash - char contain different color, change it to # we have a clash - char contain different color, change it to
# somethig # temporary marker.
all_chars = pal1.copy() all_chars = pal1.copy()
all_chars.update(pal2) all_chars.update(pal2)
sub = get_unique_key(all_chars) sub = get_unique_key(all_chars)
@@ -253,7 +259,8 @@ def merge_palettes(pal1, pal2, bitmap_list):
temp.append(line.replace(new_char, sub)) temp.append(line.replace(new_char, sub))
bitmap_list = temp bitmap_list = temp
pal2[sub] = pal2[new_char] pal2[sub] = pal2[new_char]
pal2[new_char] = "xxxx" pal2[new_char] = MARKER
pal2[char] = MARKER
rerun = True rerun = True
else: else:
# color not found, add new replacement # color not found, add new replacement
@@ -271,10 +278,11 @@ def merge_palettes(pal1, pal2, bitmap_list):
for line in bitmap_list: for line in bitmap_list:
temp.append(line.replace(char, sub)) temp.append(line.replace(char, sub))
bitmap_list = temp bitmap_list = temp
pal2[sub] = pal2[char] pal2[sub] = color
pal2[char] = "xxxx" pal2[char] = MARKER
rerun = True rerun = True
if rerun: if rerun:
pal1, bitmap_list = merge_palettes(pal1, pal2, bitmap_list) pal1, bitmap_list = merge_palettes(pal1, pal2, bitmap_list)
return pal1, bitmap_list return pal1, bitmap_list