Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: When removing a chat, clear view only if it's currently loaded
by Daniel Brötzmann (＠wurstsalat) 25 Sep '22

25 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 678579ad by wurstsalat at 2022-09-25T13:11:15+02:00 fix: When removing a chat, clear view only if it's currently loaded Fixes #11164 - - - - - 1 changed file: - gajim/gtk/chat_page.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -283,10 +283,16 @@ def remove_chat(self, account: str, jid: JID) -> None: self._chat_list_stack.remove_chat(workspace_id, account, jid) return - def _on_chat_removed(self, _chat_list: ChatList, account: str, jid: JID, - type_: str) -> None: + def _on_chat_removed(self, + _chat_list: ChatList, + account: str, + jid: JID, + type_: str + ) -> None: + + if self._chat_control.is_loaded(account, jid): + self._chat_control.clear() - self._chat_control.clear() if type_ == 'groupchat': client = app.get_client(account) client.get_module('MUC').leave(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/678579adcce41add25e29899526711ee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/678579adcce41add25e29899526711ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: AccountPage: Disable Ad-Hoc Commands button when offline
by Daniel Brötzmann (＠wurstsalat) 25 Sep '22

25 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 117a4b92 by wurstsalat at 2022-09-25T12:57:50+02:00 fix: AccountPage: Disable Ad-Hoc Commands button when offline Fixes #11167 - - - - - ac898ebb by wurstsalat at 2022-09-25T12:58:09+02:00 chore: Fix typo in AccountDisconnected event - - - - - 10 changed files: - gajim/common/application.py - gajim/common/client.py - gajim/common/events.py - gajim/data/gui/account_page.ui - gajim/gtk/account_page.py - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/groupchat_creation.py - gajim/gtk/remove_account.py - gajim/gtk/status_icon.py Changes: ===================================== gajim/common/application.py ===================================== @@ -39,7 +39,7 @@ from gajim.common import passwords from gajim.common.commands import ChatCommands from gajim.common.dbus import logind -from gajim.common.events import AccountDisonnected +from gajim.common.events import AccountDisconnected from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable from gajim.common.client import Client @@ -167,7 +167,7 @@ def start_shutdown(self, *args: Any, **kwargs: Any) -> None: self._quit_app() return - def _on_disconnect(event: AccountDisonnected) -> None: + def _on_disconnect(event: AccountDisconnected) -> None: accounts_to_disconnect.pop(event.account) if not accounts_to_disconnect: self._quit_app() ===================================== gajim/common/client.py ===================================== @@ -36,7 +36,7 @@ from gajim.common import passwords from gajim.common.events import AccountConnected from gajim.common.events import MessageSent -from gajim.common.events import AccountDisonnected +from gajim.common.events import AccountDisconnected from gajim.common.events import PasswordRequired from gajim.common.events import PlainConnection from gajim.common.events import SignedIn @@ -316,7 +316,7 @@ def _after_disconnect(self) -> None: self._destroy_client = False self._create_client() - app.ged.raise_event(AccountDisonnected(account=self._account)) + app.ged.raise_event(AccountDisconnected(account=self._account)) def _on_connection_failed(self, _client: NBXMPPClient, ===================================== gajim/common/events.py ===================================== @@ -89,7 +89,7 @@ class AccountConnected(ApplicationEvent): @dataclass -class AccountDisonnected(ApplicationEvent): +class AccountDisconnected(ApplicationEvent): name: str = field(init=False, default='account-disconnected') account: str ===================================== gajim/data/gui/account_page.ui ===================================== @@ -229,7 +229,7 @@ </packing> </child> <child> - <object class="GtkButton"> + <object class="GtkButton" id="adhoc_commands_button"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> ===================================== gajim/gtk/account_page.py ===================================== @@ -14,6 +14,8 @@ from __future__ import annotations +from typing import Union + from gi.repository import Gdk from gi.repository import Gio from gi.repository import Gtk @@ -23,6 +25,8 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.events import AccountConnected +from gajim.common.events import AccountDisconnected from gajim.common.events import SubscribePresenceReceived from gajim.common.events import UnsubscribedPresenceReceived from gajim.common.events import MucInvitation @@ -88,6 +92,8 @@ def __init__(self, account: str) -> None: ged.GUI1, self._unsubscribed_received), ('muc-invitation', ged.GUI1, self._muc_invitation_received), ('muc-decline', ged.GUI1, self._muc_invitation_declined), + ('account-connected', ged.GUI2, self._on_account_state), + ('account-disconnected', ged.GUI2, self._on_account_state), ]) # pylint: enable=line-too-long @@ -109,6 +115,16 @@ def _on_adhoc_commands(self, _button: Gtk.Button) -> None: server_jid = JID.from_string(self._jid).domain open_window('AdHocCommands', account=self._account, jid=server_jid) + def _on_account_state(self, + event: Union[AccountConnected, AccountDisconnected] + ) -> None: + + if event.account != self._account: + return + + self._ui.adhoc_commands_button.set_sensitive( + app.account_is_connected(event.account)) + def _on_search_changed(self, widget: Gtk.SearchEntry) -> None: text = widget.get_text().lower() self._roster.set_search_string(text) ===================================== gajim/gtk/accounts.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import app from gajim.common import ged from gajim.common import passwords -from gajim.common.events import AccountDisonnected +from gajim.common.events import AccountDisconnected from gajim.common.i18n import _ from gajim.common.i18n import Q_ from gajim.common.settings import AllSettingsT @@ -541,7 +541,7 @@ def _on_enable_switch(self, state: bool, account: str ) -> int: - def _on_disconnect(event: AccountDisonnected) -> None: + def _on_disconnect(event: AccountDisconnected) -> None: if event.account != account: return app.ged.remove_event_handler('account-disconnected', ===================================== gajim/gtk/builder.pyi ===================================== @@ -18,6 +18,7 @@ class AccountPageBuilder(Builder): avatar_image: Gtk.Image account_label: Gtk.Label account_action_box: Gtk.Box + adhoc_commands_button: Gtk.Button status_message_box: Gtk.Box ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -29,7 +29,7 @@ from gajim.common.const import MUC_CREATION_EXAMPLES from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.events import AccountConnected -from gajim.common.events import AccountDisonnected +from gajim.common.events import AccountDisconnected from gajim.common.ged import EventHelper from gajim.common.helpers import get_random_muc_localpart from gajim.common.helpers import validate_jid @@ -85,7 +85,7 @@ def __init__(self, account: Optional[str]) -> None: self.set_focus(self._ui.address_entry) def _on_account_state(self, - _event: Union[AccountConnected, AccountDisonnected] + _event: Union[AccountConnected, AccountDisconnected] ) -> None: any_account_connected = app.get_number_of_connected_accounts() > 0 if any_account_connected: ===================================== gajim/gtk/remove_account.py ===================================== @@ -25,7 +25,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.events import AccountConnected -from gajim.common.events import AccountDisonnected +from gajim.common.events import AccountDisconnected from gajim.common.i18n import _ from gajim.common.helpers import to_user_string from gajim.common.helpers import event_filter @@ -83,7 +83,7 @@ def _on_account_connected(self, _event: AccountConnected) -> None: self._set_remove_from_server_checkbox() @event_filter(['account']) - def _on_account_disconnected(self, _event: AccountDisonnected) -> None: + def _on_account_disconnected(self, _event: AccountDisconnected) -> None: self._set_remove_from_server_checkbox() if self._account_removed: ===================================== gajim/gtk/status_icon.py ===================================== @@ -172,7 +172,7 @@ def _on_our_show(self, _event: events.ShowChanged) -> None: def _on_account_state(self, _event: Union[events.AccountConnected, - events.AccountDisonnected] + events.AccountDisconnected] ) -> None: account_connected = bool(app.get_number_of_connected_accounts() > 0) self._ui.start_chat_menuitem.set_sensitive(account_connected) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e3bba1d5ed530c30db52787d51a84ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e3bba1d5ed530c30db52787d51a84ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Emojis: Improve shortcode usability
by Daniel Brötzmann (＠wurstsalat) 25 Sep '22

25 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e3bba1d5 by wurstsalat at 2022-09-25T12:39:23+02:00 imprv: Emojis: Improve shortcode usability - - - - - 1 changed file: - gajim/gtk/emoji_data_gtk.py Changes: ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -103,6 +103,9 @@ def _pass(_user_data: Any) -> None: # https://gitlab.gnome.org/GNOME/gtk/-/blob/main/gtk/emoji/ # convert-emoji.c + # Replace colon by comma to improve emoji shortcode usability + shortcode = shortcode.replace(':', ',') + if 0 not in c_sequence: # No skin tone modifiers present u_sequence = generate_unicode_sequence(c_sequence) @@ -126,6 +129,8 @@ def _pass(_user_data: Any) -> None: emoji_data_dict['+1'] = '\U0001F44D' emoji_data_dict['-1'] = '\U0001F44E' + emoji_data_dict = dict(sorted(emoji_data_dict.items())) + return emoji_data_dict View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3bba1d5ed530c30db52787d51a84ea5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3bba1d5ed530c30db52787d51a84ea5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: CreateGroupchatWindow: Fix Create button state when switching MUC type
by Daniel Brötzmann (＠wurstsalat) 24 Sep '22

24 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a782329f by wurstsalat at 2022-09-25T00:08:03+02:00 fix: CreateGroupchatWindow: Fix Create button state when switching MUC type Fixes #11162 - - - - - 1 changed file: - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -231,6 +231,10 @@ def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: def _on_public_private_toggled(self, _radiobutton: Gtk.RadioButton) -> None: is_public = self._ui.public_radio.get_active() + if is_public: + self._validate_jid(self._ui.address_entry.get_text()) + else: + self._ui.create_button.set_sensitive(True) self._ui.address_label.set_visible(is_public) self._ui.address_entry.set_visible(is_public) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a782329f5d4beaa93b97896eb77865db… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a782329f5d4beaa93b97896eb77865db… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch emoji-improvements
by Daniel Brötzmann (＠wurstsalat) 24 Sep '22

24 Sep '22

Daniel Brötzmann deleted branch emoji-improvements at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: imprv: Emojis: Extract codepoints for all emoji variants
by Philipp Hörist (＠lovetox) 24 Sep '22

24 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e5e17b4 by wurstsalat at 2022-09-24T21:03:36+02:00 imprv: Emojis: Extract codepoints for all emoji variants - - - - - ed35915f by wurstsalat at 2022-09-24T21:03:43+02:00 imprv: Avatars: Use PangoCairo for generate_avatar Fixes #10960 - - - - - 938d79fb by wurstsalat at 2022-09-24T21:44:10+02:00 chore: Remove unused method from emoji_data - - - - - 6 changed files: - gajim/gajim.py - gajim/gtk/avatar.py - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi - gajim/gtk/emoji_data_gtk.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gajim.py ===================================== @@ -66,6 +66,7 @@ def _check_required_deps() -> None: 'GtkSource': '4', 'GObject': '2.0', 'Pango': '1.0', + 'PangoCairo': '1.0', 'Soup': '2.4'}) except ValueError as error: sys.exit('Missing dependency: %s' % error) ===================================== gajim/gtk/avatar.py ===================================== @@ -26,6 +26,8 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf +from gi.repository import Pango +from gi.repository import PangoCairo import cairo from nbxmpp.protocol import JID @@ -38,8 +40,7 @@ from gajim.common.const import StyleAttr from .const import DEFAULT_WORKSPACE_COLOR -from .emoji_data import is_emoji -from .emoji_data import get_emoji_font +from .emoji_data_gtk import get_emoji_data from .util import load_icon_surface from .util import load_pixbuf from .util import text_to_color @@ -56,6 +57,23 @@ cairo.ImageSurface]] +def generate_avatar_letter(text: str) -> str: + if not text: + return '' + + if text[0].isalpha(): + return text[0].upper() + + emoji_data = get_emoji_data() + + # Max (arbitrary) length for emoji ZJW sequences: 11 + for length in range(11, 0, -1): + if text[:length] in emoji_data.values(): + return text[:length] + + return text[0].upper() + + def generate_avatar(letters: str, color: tuple[float, float, float], size: int, @@ -70,7 +88,7 @@ def generate_avatar(letters: str, width = size height = size - font_size = size * 0.5 + font_size = size * 0.4 # Set up surface surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) @@ -81,26 +99,25 @@ def generate_avatar(letters: str, context.fill() # Draw letters - if is_emoji(letters): - font_face = get_emoji_font() - else: - font_face = 'sans-serif' - context.select_font_face(font_face, - cairo.FontSlant.NORMAL, - cairo.FontWeight.NORMAL) - context.set_font_size(font_size) - extends = context.text_extents(letters) - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height - - x_pos = width / 2 - (ex_width / 2 + x_bearing) - y_pos = height / 2 - (ex_height / 2 + y_bearing) + layout = PangoCairo.create_layout(context) + layout.set_text(generate_avatar_letter(letters)) + + description = Pango.FontDescription() + description.set_family('Sans') + description.set_size(int(font_size * Pango.SCALE)) + + layout.set_font_description(description) + + _ink_rect, logical_rect = layout.get_extents() + layout_width = logical_rect.width / Pango.SCALE + layout_height = logical_rect.height / Pango.SCALE + x_pos = (width - layout_width) / 2 + y_pos = (height - layout_height) / 2 + context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) context.set_operator(cairo.Operator.OVER) - context.show_text(letters) + PangoCairo.show_layout(context, layout) return context.get_target() # pyright: ignore @@ -399,7 +416,7 @@ def get_surface(self, name = contact.name color_string = str(contact.jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar( letter, color_string, size, scale, style=style) if show is not None: @@ -441,7 +458,7 @@ def get_muc_surface(self, con = app.connections[account] name = get_groupchat_name(con, jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar(letter, str(jid), size, scale, style) self._cache[jid][(size, scale, None)] = surface return surface @@ -469,9 +486,8 @@ def get_workspace_surface(self, app.settings.set_workspace_setting(workspace_id, 'avatar_sha', '') rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) - letter = name[:1].upper() surface = make_workspace_avatar( - letter, rgba_to_float(rgba), size, scale) + name, rgba_to_float(rgba), size, scale) self._cache[workspace_id][(size, scale, None)] = surface return surface @@ -571,10 +587,3 @@ def _get_avatar_from_storage(self, if surface is None: return None return clip(surface, style) - - @staticmethod - def _generate_letter(name: str) -> str: - for letter in name: - if letter.isalpha(): - return letter.capitalize() - return name[0].capitalize() ===================================== gajim/gtk/emoji_data.py ===================================== @@ -17,7 +17,6 @@ from typing import Optional import re -import sys import weakref from enum import IntEnum from collections import OrderedDict @@ -62,12 +61,6 @@ def get_emoji_pixbuf(codepoints: str) -> Optional[GdkPixbuf.Pixbuf]: return pixbuf -def get_emoji_font() -> str: - if sys.platform == 'win32': - return 'Segoe UI Emoji' - return 'Noto Color Emoji' - - class EmojiData(OrderedDict): def __getitem__(self, key): try: ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -22,7 +22,6 @@ class Emoji(IntEnum): ... def is_emoji(codepoints: str) -> bool: ... -def get_emoji_font() -> str: ... def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... class EmojiData(OrderedDict): ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -26,6 +26,40 @@ log = logging.getLogger('gajim.gui.emoji_data_gtk') +SKIN_TONE_MODIFIERS = { + 127995: 'light skin tone', + 127996: 'medium-light skin tone', + 127997: 'medium skin tone', + 127998: 'medium-dark skin tone', + 127999: 'dark skin tone' +} + + +def generate_unicode_sequence(c_sequence: list[int]) -> str: + ''' + Generates a unicode sequence from a list of codepoints + ''' + u_sequence = '' + for codepoint in c_sequence: + u_sequence += chr(codepoint) + return u_sequence + + +def replace_skin_tone_placeholder(c_sequence: list[int], + modifier: int + ) -> list[int]: + + ''' + Replaces GTKs placeholder '0' for skin tone modifiers + with a given modifier + ''' + c_mod_sequence: list[int] = [] + for codepoint in c_sequence: + if codepoint == 0: + codepoint = modifier + c_mod_sequence.append(codepoint) + return c_mod_sequence + def get_emoji_data() -> dict[str, str]: return emoji_data @@ -46,33 +80,57 @@ def load_emoji_data() -> dict[str, str]: # We have to store bytes_data in a variable to make sure Python # keeps it until it is processed. bytes_data = bytes_.get_data() - - def _pass(_user_data: Any) -> None: - pass - - variant = GLib.Variant.new_from_data( - GLib.VariantType('a(auss)'), - bytes_data, - True, - _pass) - - emoji_data_dict: dict[str, str] = {} - index = 0 - for _item in variant: - emoji = variant.get_child_value(index) - points = emoji.get_child_value(0) - codepoint = points.get_child_value(0).get_uint32() - shortcode = emoji.get_child_value(1).get_string() - emoji_data_dict[shortcode] = chr(codepoint) - index += 1 - - # Add commonly used shortcodes - emoji_data_dict['+1'] = '\U0001F44D' - emoji_data_dict['-1'] = '\U0001F44E' - return emoji_data_dict - - except GLib.Error: + except GLib.Error as error: + log.warning('Loading emoji resources failed: %s', error) return {} - -emoji_data = load_emoji_data() + def _pass(_user_data: Any) -> None: + pass + + variant = GLib.Variant.new_from_data( + GLib.VariantType('a(auss)'), + bytes_data, + True, + _pass) + + emoji_data_dict: dict[str, str] = {} + for c_sequence, shortcode, _ in variant: + # Example item: + # ([128105, 0, 8205, 10084, 65039, 8205, 128104, 0], + # 'couple with heart: woman, man', + # 'couple'), + # GTK sets '0' as a placeholder for skin tone modifiers, see: + # https://gitlab.gnome.org/GNOME/gtk/-/blob/main/gtk/emoji/ + # convert-emoji.c + + if 0 not in c_sequence: + # No skin tone modifiers present + u_sequence = generate_unicode_sequence(c_sequence) + emoji_data_dict[shortcode] = u_sequence + continue + + # Filter out 0 in order to generate basic (yellow) variation + c_basic_sequence = [c for c in c_sequence if c != 0] + u_sequence = generate_unicode_sequence(c_basic_sequence) + emoji_data_dict[shortcode] = u_sequence + + # Add variations with skin tone modifiers + for modifier, mod_shortcode in SKIN_TONE_MODIFIERS.items(): + new_shortcode = f'{shortcode}, {mod_shortcode}' + c_mod_sequence = replace_skin_tone_placeholder( + c_sequence, modifier) + u_mod_sequence = generate_unicode_sequence(c_mod_sequence) + emoji_data_dict[new_shortcode] = u_mod_sequence + + # Add commonly used shortcodes + emoji_data_dict['+1'] = '\U0001F44D' + emoji_data_dict['-1'] = '\U0001F44E' + + return emoji_data_dict + + +try: + emoji_data = load_emoji_data() +except Exception as err: + log.warning('Unable to load emoji data: %s', err) + emoji_data = {} ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -131,7 +131,7 @@ def _update_avatar(self) -> None: scale) else: surface = make_workspace_avatar( - name[:1].upper(), + name, rgba_to_float(rgba), AvatarSize.WORKSPACE_EDIT, scale) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9cdd7b08a7ec0dd663d993fa09a40bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9cdd7b08a7ec0dd663d993fa09a40bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][emoji-improvements] chore: Remove unused method from emoji_data
by Daniel Brötzmann (＠wurstsalat) 24 Sep '22

24 Sep '22

Daniel Brötzmann pushed to branch emoji-improvements at gajim / gajim Commits: 938d79fb by wurstsalat at 2022-09-24T21:44:10+02:00 chore: Remove unused method from emoji_data - - - - - 2 changed files: - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi Changes: ===================================== gajim/gtk/emoji_data.py ===================================== @@ -17,7 +17,6 @@ from typing import Optional import re -import sys import weakref from enum import IntEnum from collections import OrderedDict @@ -62,12 +61,6 @@ def get_emoji_pixbuf(codepoints: str) -> Optional[GdkPixbuf.Pixbuf]: return pixbuf -def get_emoji_font() -> str: - if sys.platform == 'win32': - return 'Segoe UI Emoji' - return 'Noto Color Emoji' - - class EmojiData(OrderedDict): def __getitem__(self, key): try: ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -22,7 +22,6 @@ class Emoji(IntEnum): ... def is_emoji(codepoints: str) -> bool: ... -def get_emoji_font() -> str: ... def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... class EmojiData(OrderedDict): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/938d79fbb4a9aa16dee200ed7d39b18b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/938d79fbb4a9aa16dee200ed7d39b18b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][emoji-improvements] 3 commits: imprv: Emojis: Extract codepoints for all emoji variants
by Daniel Brötzmann (＠wurstsalat) 24 Sep '22

24 Sep '22

Daniel Brötzmann pushed to branch emoji-improvements at gajim / gajim Commits: 1e5e17b4 by wurstsalat at 2022-09-24T21:03:36+02:00 imprv: Emojis: Extract codepoints for all emoji variants - - - - - ed35915f by wurstsalat at 2022-09-24T21:03:43+02:00 imprv: Avatars: Use PangoCairo for generate_avatar Fixes #10960 - - - - - a3a104a2 by wurstsalat at 2022-09-24T21:03:43+02:00 chore: emoji_data: Remove unused method - - - - - 6 changed files: - gajim/gajim.py - gajim/gtk/avatar.py - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi - gajim/gtk/emoji_data_gtk.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gajim.py ===================================== @@ -66,6 +66,7 @@ def _check_required_deps() -> None: 'GtkSource': '4', 'GObject': '2.0', 'Pango': '1.0', + 'PangoCairo': '1.0', 'Soup': '2.4'}) except ValueError as error: sys.exit('Missing dependency: %s' % error) ===================================== gajim/gtk/avatar.py ===================================== @@ -26,6 +26,8 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf +from gi.repository import Pango +from gi.repository import PangoCairo import cairo from nbxmpp.protocol import JID @@ -38,8 +40,7 @@ from gajim.common.const import StyleAttr from .const import DEFAULT_WORKSPACE_COLOR -from .emoji_data import is_emoji -from .emoji_data import get_emoji_font +from .emoji_data_gtk import get_emoji_data from .util import load_icon_surface from .util import load_pixbuf from .util import text_to_color @@ -56,6 +57,23 @@ cairo.ImageSurface]] +def generate_avatar_letter(text: str) -> str: + if not text: + return '' + + if text[0].isalpha(): + return text[0].upper() + + emoji_data = get_emoji_data() + + # Max (arbitrary) length for emoji ZJW sequences: 11 + for length in range(11, 0, -1): + if text[:length] in emoji_data.values(): + return text[:length] + + return text[0].upper() + + def generate_avatar(letters: str, color: tuple[float, float, float], size: int, @@ -70,7 +88,7 @@ def generate_avatar(letters: str, width = size height = size - font_size = size * 0.5 + font_size = size * 0.4 # Set up surface surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) @@ -81,26 +99,25 @@ def generate_avatar(letters: str, context.fill() # Draw letters - if is_emoji(letters): - font_face = get_emoji_font() - else: - font_face = 'sans-serif' - context.select_font_face(font_face, - cairo.FontSlant.NORMAL, - cairo.FontWeight.NORMAL) - context.set_font_size(font_size) - extends = context.text_extents(letters) - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height - - x_pos = width / 2 - (ex_width / 2 + x_bearing) - y_pos = height / 2 - (ex_height / 2 + y_bearing) + layout = PangoCairo.create_layout(context) + layout.set_text(generate_avatar_letter(letters)) + + description = Pango.FontDescription() + description.set_family('Sans') + description.set_size(int(font_size * Pango.SCALE)) + + layout.set_font_description(description) + + _ink_rect, logical_rect = layout.get_extents() + layout_width = logical_rect.width / Pango.SCALE + layout_height = logical_rect.height / Pango.SCALE + x_pos = (width - layout_width) / 2 + y_pos = (height - layout_height) / 2 + context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) context.set_operator(cairo.Operator.OVER) - context.show_text(letters) + PangoCairo.show_layout(context, layout) return context.get_target() # pyright: ignore @@ -399,7 +416,7 @@ def get_surface(self, name = contact.name color_string = str(contact.jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar( letter, color_string, size, scale, style=style) if show is not None: @@ -441,7 +458,7 @@ def get_muc_surface(self, con = app.connections[account] name = get_groupchat_name(con, jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar(letter, str(jid), size, scale, style) self._cache[jid][(size, scale, None)] = surface return surface @@ -469,9 +486,8 @@ def get_workspace_surface(self, app.settings.set_workspace_setting(workspace_id, 'avatar_sha', '') rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) - letter = name[:1].upper() surface = make_workspace_avatar( - letter, rgba_to_float(rgba), size, scale) + name, rgba_to_float(rgba), size, scale) self._cache[workspace_id][(size, scale, None)] = surface return surface @@ -571,10 +587,3 @@ def _get_avatar_from_storage(self, if surface is None: return None return clip(surface, style) - - @staticmethod - def _generate_letter(name: str) -> str: - for letter in name: - if letter.isalpha(): - return letter.capitalize() - return name[0].capitalize() ===================================== gajim/gtk/emoji_data.py ===================================== @@ -17,7 +17,6 @@ from typing import Optional import re -import sys import weakref from enum import IntEnum from collections import OrderedDict @@ -62,12 +61,6 @@ def get_emoji_pixbuf(codepoints: str) -> Optional[GdkPixbuf.Pixbuf]: return pixbuf -def get_emoji_font() -> str: - if sys.platform == 'win32': - return 'Segoe UI Emoji' - return 'Noto Color Emoji' - - class EmojiData(OrderedDict): def __getitem__(self, key): try: ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -22,7 +22,6 @@ class Emoji(IntEnum): ... def is_emoji(codepoints: str) -> bool: ... -def get_emoji_font() -> str: ... def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... class EmojiData(OrderedDict): ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -26,6 +26,40 @@ log = logging.getLogger('gajim.gui.emoji_data_gtk') +SKIN_TONE_MODIFIERS = { + 127995: 'light skin tone', + 127996: 'medium-light skin tone', + 127997: 'medium skin tone', + 127998: 'medium-dark skin tone', + 127999: 'dark skin tone' +} + + +def generate_unicode_sequence(c_sequence: list[int]) -> str: + ''' + Generates a unicode sequence from a list of codepoints + ''' + u_sequence = '' + for codepoint in c_sequence: + u_sequence += chr(codepoint) + return u_sequence + + +def replace_skin_tone_placeholder(c_sequence: list[int], + modifier: int + ) -> list[int]: + + ''' + Replaces GTKs placeholder '0' for skin tone modifiers + with a given modifier + ''' + c_mod_sequence: list[int] = [] + for codepoint in c_sequence: + if codepoint == 0: + codepoint = modifier + c_mod_sequence.append(codepoint) + return c_mod_sequence + def get_emoji_data() -> dict[str, str]: return emoji_data @@ -46,33 +80,57 @@ def load_emoji_data() -> dict[str, str]: # We have to store bytes_data in a variable to make sure Python # keeps it until it is processed. bytes_data = bytes_.get_data() - - def _pass(_user_data: Any) -> None: - pass - - variant = GLib.Variant.new_from_data( - GLib.VariantType('a(auss)'), - bytes_data, - True, - _pass) - - emoji_data_dict: dict[str, str] = {} - index = 0 - for _item in variant: - emoji = variant.get_child_value(index) - points = emoji.get_child_value(0) - codepoint = points.get_child_value(0).get_uint32() - shortcode = emoji.get_child_value(1).get_string() - emoji_data_dict[shortcode] = chr(codepoint) - index += 1 - - # Add commonly used shortcodes - emoji_data_dict['+1'] = '\U0001F44D' - emoji_data_dict['-1'] = '\U0001F44E' - return emoji_data_dict - - except GLib.Error: + except GLib.Error as error: + log.warning('Loading emoji resources failed: %s', error) return {} - -emoji_data = load_emoji_data() + def _pass(_user_data: Any) -> None: + pass + + variant = GLib.Variant.new_from_data( + GLib.VariantType('a(auss)'), + bytes_data, + True, + _pass) + + emoji_data_dict: dict[str, str] = {} + for c_sequence, shortcode, _ in variant: + # Example item: + # ([128105, 0, 8205, 10084, 65039, 8205, 128104, 0], + # 'couple with heart: woman, man', + # 'couple'), + # GTK sets '0' as a placeholder for skin tone modifiers, see: + # https://gitlab.gnome.org/GNOME/gtk/-/blob/main/gtk/emoji/ + # convert-emoji.c + + if 0 not in c_sequence: + # No skin tone modifiers present + u_sequence = generate_unicode_sequence(c_sequence) + emoji_data_dict[shortcode] = u_sequence + continue + + # Filter out 0 in order to generate basic (yellow) variation + c_basic_sequence = [c for c in c_sequence if c != 0] + u_sequence = generate_unicode_sequence(c_basic_sequence) + emoji_data_dict[shortcode] = u_sequence + + # Add variations with skin tone modifiers + for modifier, mod_shortcode in SKIN_TONE_MODIFIERS.items(): + new_shortcode = f'{shortcode}, {mod_shortcode}' + c_mod_sequence = replace_skin_tone_placeholder( + c_sequence, modifier) + u_mod_sequence = generate_unicode_sequence(c_mod_sequence) + emoji_data_dict[new_shortcode] = u_mod_sequence + + # Add commonly used shortcodes + emoji_data_dict['+1'] = '\U0001F44D' + emoji_data_dict['-1'] = '\U0001F44E' + + return emoji_data_dict + + +try: + emoji_data = load_emoji_data() +except Exception as err: + log.warning('Unable to load emoji data: %s', err) + emoji_data = {} ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -131,7 +131,7 @@ def _update_avatar(self) -> None: scale) else: surface = make_workspace_avatar( - name[:1].upper(), + name, rgba_to_float(rgba), AvatarSize.WORKSPACE_EDIT, scale) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/86c8c93a72cd428e8c138cbdffe9cfa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/86c8c93a72cd428e8c138cbdffe9cfa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][emoji-improvements] 3 commits: imprv: Emojis: Extract codepoints for all emoji variants
by Daniel Brötzmann (＠wurstsalat) 24 Sep '22

24 Sep '22

Daniel Brötzmann pushed to branch emoji-improvements at gajim / gajim Commits: 9c8ae80e by wurstsalat at 2022-09-24T20:58:07+02:00 imprv: Emojis: Extract codepoints for all emoji variants - - - - - 47dd30ab by wurstsalat at 2022-09-24T20:58:12+02:00 imprv: Avatars: Use PangoCairo for generate_avatar Fixes #10960 - - - - - 86c8c93a by wurstsalat at 2022-09-24T20:58:12+02:00 chore: emoji_data: Remove unused method - - - - - 6 changed files: - gajim/gajim.py - gajim/gtk/avatar.py - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi - gajim/gtk/emoji_data_gtk.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gajim.py ===================================== @@ -66,6 +66,7 @@ def _check_required_deps() -> None: 'GtkSource': '4', 'GObject': '2.0', 'Pango': '1.0', + 'PangoCairo': '1.0', 'Soup': '2.4'}) except ValueError as error: sys.exit('Missing dependency: %s' % error) ===================================== gajim/gtk/avatar.py ===================================== @@ -26,6 +26,8 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf +from gi.repository import Pango +from gi.repository import PangoCairo import cairo from nbxmpp.protocol import JID @@ -38,8 +40,7 @@ from gajim.common.const import StyleAttr from .const import DEFAULT_WORKSPACE_COLOR -from .emoji_data import is_emoji -from .emoji_data import get_emoji_font +from .emoji_data_gtk import get_emoji_data from .util import load_icon_surface from .util import load_pixbuf from .util import text_to_color @@ -56,6 +57,23 @@ cairo.ImageSurface]] +def generate_avatar_letter(text: str) -> str: + if not text: + return '' + + if text[0].isalpha(): + return text[0].upper() + + emoji_data = get_emoji_data() + + # Max (arbitrary) length for emoji ZJW sequences: 11 + for length in range(11, 0, -1): + if text[:length] in emoji_data.values(): + return text[:length] + + return text[0].upper() + + def generate_avatar(letters: str, color: tuple[float, float, float], size: int, @@ -70,7 +88,7 @@ def generate_avatar(letters: str, width = size height = size - font_size = size * 0.5 + font_size = size * 0.4 # Set up surface surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) @@ -81,26 +99,25 @@ def generate_avatar(letters: str, context.fill() # Draw letters - if is_emoji(letters): - font_face = get_emoji_font() - else: - font_face = 'sans-serif' - context.select_font_face(font_face, - cairo.FontSlant.NORMAL, - cairo.FontWeight.NORMAL) - context.set_font_size(font_size) - extends = context.text_extents(letters) - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height - - x_pos = width / 2 - (ex_width / 2 + x_bearing) - y_pos = height / 2 - (ex_height / 2 + y_bearing) + layout = PangoCairo.create_layout(context) + layout.set_text(generate_avatar_letter(letters)) + + description = Pango.FontDescription() + description.set_family('Sans') + description.set_size(int(font_size * Pango.SCALE)) + + layout.set_font_description(description) + + _ink_rect, logical_rect = layout.get_extents() + layout_width = logical_rect.width / Pango.SCALE + layout_height = logical_rect.height / Pango.SCALE + x_pos = (width - layout_width) / 2 + y_pos = (height - layout_height) / 2 + context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) context.set_operator(cairo.Operator.OVER) - context.show_text(letters) + PangoCairo.show_layout(context, layout) return context.get_target() # pyright: ignore @@ -399,7 +416,7 @@ def get_surface(self, name = contact.name color_string = str(contact.jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar( letter, color_string, size, scale, style=style) if show is not None: @@ -441,7 +458,7 @@ def get_muc_surface(self, con = app.connections[account] name = get_groupchat_name(con, jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar(letter, str(jid), size, scale, style) self._cache[jid][(size, scale, None)] = surface return surface @@ -469,9 +486,8 @@ def get_workspace_surface(self, app.settings.set_workspace_setting(workspace_id, 'avatar_sha', '') rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) - letter = name[:1].upper() surface = make_workspace_avatar( - letter, rgba_to_float(rgba), size, scale) + name, rgba_to_float(rgba), size, scale) self._cache[workspace_id][(size, scale, None)] = surface return surface @@ -571,10 +587,3 @@ def _get_avatar_from_storage(self, if surface is None: return None return clip(surface, style) - - @staticmethod - def _generate_letter(name: str) -> str: - for letter in name: - if letter.isalpha(): - return letter.capitalize() - return name[0].capitalize() ===================================== gajim/gtk/emoji_data.py ===================================== @@ -17,7 +17,6 @@ from typing import Optional import re -import sys import weakref from enum import IntEnum from collections import OrderedDict @@ -62,12 +61,6 @@ def get_emoji_pixbuf(codepoints: str) -> Optional[GdkPixbuf.Pixbuf]: return pixbuf -def get_emoji_font() -> str: - if sys.platform == 'win32': - return 'Segoe UI Emoji' - return 'Noto Color Emoji' - - class EmojiData(OrderedDict): def __getitem__(self, key): try: ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -22,7 +22,6 @@ class Emoji(IntEnum): ... def is_emoji(codepoints: str) -> bool: ... -def get_emoji_font() -> str: ... def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... class EmojiData(OrderedDict): ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -26,6 +26,40 @@ log = logging.getLogger('gajim.gui.emoji_data_gtk') +SKIN_TONE_MODIFIERS = { + 127995: 'light skin tone', + 127996: 'medium-light skin tone', + 127997: 'medium skin tone', + 127998: 'medium-dark skin tone', + 127999: 'dark skin tone' +} + + +def generate_unicode_sequence(c_sequence: list[int]) -> str: + ''' + Generates a unicode sequence from a list of codepoints + ''' + u_sequence = '' + for codepoint in c_sequence: + u_sequence += chr(codepoint) + return u_sequence + + +def replace_skin_tone_placeholder(c_sequence: list[int], + modifier: int + ) -> list[int]: + + ''' + Replaces GTKs placeholder '0' for skin tone modifiers + with a given modifier + ''' + c_mod_sequence: list[int] = [] + for codepoint in c_sequence: + if codepoint == 0: + codepoint = modifier + c_mod_sequence.append(codepoint) + return c_mod_sequence + def get_emoji_data() -> dict[str, str]: return emoji_data @@ -46,33 +80,57 @@ def load_emoji_data() -> dict[str, str]: # We have to store bytes_data in a variable to make sure Python # keeps it until it is processed. bytes_data = bytes_.get_data() - - def _pass(_user_data: Any) -> None: - pass - - variant = GLib.Variant.new_from_data( - GLib.VariantType('a(auss)'), - bytes_data, - True, - _pass) - - emoji_data_dict: dict[str, str] = {} - index = 0 - for _item in variant: - emoji = variant.get_child_value(index) - points = emoji.get_child_value(0) - codepoint = points.get_child_value(0).get_uint32() - shortcode = emoji.get_child_value(1).get_string() - emoji_data_dict[shortcode] = chr(codepoint) - index += 1 - - # Add commonly used shortcodes - emoji_data_dict['+1'] = '\U0001F44D' - emoji_data_dict['-1'] = '\U0001F44E' - return emoji_data_dict - - except GLib.Error: + except GLib.Error as err: + log.warning('Loading emoji resources failed: %s', err) return {} - -emoji_data = load_emoji_data() + def _pass(_user_data: Any) -> None: + pass + + variant = GLib.Variant.new_from_data( + GLib.VariantType('a(auss)'), + bytes_data, + True, + _pass) + + emoji_data_dict: dict[str, str] = {} + for c_sequence, shortcode, _ in variant: + # Example item: + # ([128105, 0, 8205, 10084, 65039, 8205, 128104, 0], + # 'couple with heart: woman, man', + # 'couple'), + # GTK sets '0' as a placeholder for skin tone modifiers, see: + # https://gitlab.gnome.org/GNOME/gtk/-/blob/main/gtk/emoji/ + # convert-emoji.c + + if 0 not in c_sequence: + # No skin tone modifiers present + u_sequence = generate_unicode_sequence(c_sequence) + emoji_data_dict[shortcode] = u_sequence + continue + + # Filter out 0 in order to generate basic (yellow) variation + c_basic_sequence = [c for c in c_sequence if c != 0] + u_sequence = generate_unicode_sequence(c_basic_sequence) + emoji_data_dict[shortcode] = u_sequence + + # Add variations with skin tone modifiers + for modifier, mod_shortcode in SKIN_TONE_MODIFIERS.items(): + new_shortcode = f'{shortcode}, {mod_shortcode}' + c_mod_sequence = replace_skin_tone_placeholder( + c_sequence, modifier) + u_mod_sequence = generate_unicode_sequence(c_mod_sequence) + emoji_data_dict[new_shortcode] = u_mod_sequence + + # Add commonly used shortcodes + emoji_data_dict['+1'] = '\U0001F44D' + emoji_data_dict['-1'] = '\U0001F44E' + + return emoji_data_dict + + +try: + emoji_data = load_emoji_data() +except Exception as err: + log.warning('Unable to load emoji data: %s', err) + emoji_data = {} ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -131,7 +131,7 @@ def _update_avatar(self) -> None: scale) else: surface = make_workspace_avatar( - name[:1].upper(), + name, rgba_to_float(rgba), AvatarSize.WORKSPACE_EDIT, scale) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0bbc43286af3d804d69337267a8903… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a0bbc43286af3d804d69337267a8903… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][emoji-improvements] 3 commits: imprv: Emojis: Extract codepoints for all emoji variants
by Daniel Brötzmann (＠wurstsalat) 24 Sep '22

24 Sep '22

Daniel Brötzmann pushed to branch emoji-improvements at gajim / gajim Commits: db86bf5d by wurstsalat at 2022-09-24T16:07:31+02:00 imprv: Emojis: Extract codepoints for all emoji variants - - - - - 9d315291 by wurstsalat at 2022-09-24T16:58:12+02:00 imprv: Avatars: Use PangoCairo for generate_avatar Fixes #10960 - - - - - a0bbc432 by wurstsalat at 2022-09-24T16:58:17+02:00 chore: emoji_data: Remove unused method - - - - - 6 changed files: - gajim/gajim.py - gajim/gtk/avatar.py - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi - gajim/gtk/emoji_data_gtk.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/gajim.py ===================================== @@ -66,6 +66,7 @@ def _check_required_deps() -> None: 'GtkSource': '4', 'GObject': '2.0', 'Pango': '1.0', + 'PangoCairo': '1.0', 'Soup': '2.4'}) except ValueError as error: sys.exit('Missing dependency: %s' % error) ===================================== gajim/gtk/avatar.py ===================================== @@ -26,6 +26,8 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf +from gi.repository import Pango +from gi.repository import PangoCairo import cairo from nbxmpp.protocol import JID @@ -38,8 +40,7 @@ from gajim.common.const import StyleAttr from .const import DEFAULT_WORKSPACE_COLOR -from .emoji_data import is_emoji -from .emoji_data import get_emoji_font +from .emoji_data_gtk import get_emoji_data from .util import load_icon_surface from .util import load_pixbuf from .util import text_to_color @@ -56,6 +57,23 @@ cairo.ImageSurface]] +def generate_avatar_letter(text: str) -> str: + if not text: + return '' + + if text[0].isalpha(): + return text[0].upper() + + emoji_data = get_emoji_data() + + # Max (arbitrary) length for emoji ZJW sequences: 11 + for length in range(11, 0, -1): + if text[:length] in emoji_data.values(): + return text[:length] + + return text[0].upper() + + def generate_avatar(letters: str, color: tuple[float, float, float], size: int, @@ -70,7 +88,7 @@ def generate_avatar(letters: str, width = size height = size - font_size = size * 0.5 + font_size = size * 0.4 # Set up surface surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) @@ -81,26 +99,25 @@ def generate_avatar(letters: str, context.fill() # Draw letters - if is_emoji(letters): - font_face = get_emoji_font() - else: - font_face = 'sans-serif' - context.select_font_face(font_face, - cairo.FontSlant.NORMAL, - cairo.FontWeight.NORMAL) - context.set_font_size(font_size) - extends = context.text_extents(letters) - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height - - x_pos = width / 2 - (ex_width / 2 + x_bearing) - y_pos = height / 2 - (ex_height / 2 + y_bearing) + layout = PangoCairo.create_layout(context) + layout.set_text(generate_avatar_letter(letters)) + + description = Pango.FontDescription() + description.set_family('Sans') + description.set_size(int(font_size * Pango.SCALE)) + + layout.set_font_description(description) + + _ink_rect, logical_rect = layout.get_extents() + layout_width = logical_rect.width / Pango.SCALE + layout_height = logical_rect.height / Pango.SCALE + x_pos = (width - layout_width) / 2 + y_pos = (height - layout_height) / 2 + context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) context.set_operator(cairo.Operator.OVER) - context.show_text(letters) + PangoCairo.show_layout(context, layout) return context.get_target() # pyright: ignore @@ -399,7 +416,7 @@ def get_surface(self, name = contact.name color_string = str(contact.jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar( letter, color_string, size, scale, style=style) if show is not None: @@ -441,7 +458,7 @@ def get_muc_surface(self, con = app.connections[account] name = get_groupchat_name(con, jid) - letter = self._generate_letter(name) + letter = generate_avatar_letter(name) surface = generate_default_avatar(letter, str(jid), size, scale, style) self._cache[jid][(size, scale, None)] = surface return surface @@ -469,9 +486,8 @@ def get_workspace_surface(self, app.settings.set_workspace_setting(workspace_id, 'avatar_sha', '') rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) - letter = name[:1].upper() surface = make_workspace_avatar( - letter, rgba_to_float(rgba), size, scale) + name, rgba_to_float(rgba), size, scale) self._cache[workspace_id][(size, scale, None)] = surface return surface @@ -571,10 +587,3 @@ def _get_avatar_from_storage(self, if surface is None: return None return clip(surface, style) - - @staticmethod - def _generate_letter(name: str) -> str: - for letter in name: - if letter.isalpha(): - return letter.capitalize() - return name[0].capitalize() ===================================== gajim/gtk/emoji_data.py ===================================== @@ -17,7 +17,6 @@ from typing import Optional import re -import sys import weakref from enum import IntEnum from collections import OrderedDict @@ -62,12 +61,6 @@ def get_emoji_pixbuf(codepoints: str) -> Optional[GdkPixbuf.Pixbuf]: return pixbuf -def get_emoji_font() -> str: - if sys.platform == 'win32': - return 'Segoe UI Emoji' - return 'Noto Color Emoji' - - class EmojiData(OrderedDict): def __getitem__(self, key): try: ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -22,7 +22,6 @@ class Emoji(IntEnum): ... def is_emoji(codepoints: str) -> bool: ... -def get_emoji_font() -> str: ... def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... class EmojiData(OrderedDict): ===================================== gajim/gtk/emoji_data_gtk.py ===================================== @@ -26,6 +26,40 @@ log = logging.getLogger('gajim.gui.emoji_data_gtk') +SKIN_TONE_MODIFIERS = { + 127995: 'light skin tone', + 127996: 'medium-light skin tone', + 127997: 'medium skin tone', + 127998: 'medium-dark skin tone', + 127999: 'dark skin tone' +} + + +def generate_unicode_sequence(c_sequence: list[int]) -> str: + ''' + Generates a unicode sequence from a list of codepoints + ''' + u_sequence = '' + for codepoint in c_sequence: + u_sequence += chr(codepoint) + return u_sequence + + +def replace_skin_tone_placeholder(c_sequence: list[int], + modifier: int + ) -> list[int]: + + ''' + Replaces GTKs placeholder '0' for skin tone modifiers + with a given modifier + ''' + c_mod_sequence: list[int] = [] + for codepoint in c_sequence: + if codepoint == 0: + codepoint = modifier + c_mod_sequence.append(codepoint) + return c_mod_sequence + def get_emoji_data() -> dict[str, str]: return emoji_data @@ -57,18 +91,38 @@ def _pass(_user_data: Any) -> None: _pass) emoji_data_dict: dict[str, str] = {} - index = 0 - for _item in variant: - emoji = variant.get_child_value(index) - points = emoji.get_child_value(0) - codepoint = points.get_child_value(0).get_uint32() - shortcode = emoji.get_child_value(1).get_string() - emoji_data_dict[shortcode] = chr(codepoint) - index += 1 + for c_sequence, shortcode, _ in variant: + # Example item: + # ([128105, 0, 8205, 10084, 65039, 8205, 128104, 0], + # 'couple with heart: woman, man', + # 'couple'), + # GTK sets '0' as a placeholder for skin tone modifiers, see: + # https://gitlab.gnome.org/GNOME/gtk/-/blob/main/gtk/emoji/ + # convert-emoji.c + + if 0 not in c_sequence: + # No skin tone modifiers present + u_sequence = generate_unicode_sequence(c_sequence) + emoji_data_dict[shortcode] = u_sequence + continue + + # Filter out 0 in order to generate basic (yellow) variation + c_basic_sequence = [c for c in c_sequence if c != 0] + u_sequence = generate_unicode_sequence(c_basic_sequence) + emoji_data_dict[shortcode] = u_sequence + + # Add variations with skin tone modifiers + for modifier, mod_shortcode in SKIN_TONE_MODIFIERS.items(): + new_shortcode = f'{shortcode}, {mod_shortcode}' + c_mod_sequence = replace_skin_tone_placeholder( + c_sequence, modifier) + u_mod_sequence = generate_unicode_sequence(c_mod_sequence) + emoji_data_dict[new_shortcode] = u_mod_sequence # Add commonly used shortcodes emoji_data_dict['+1'] = '\U0001F44D' emoji_data_dict['-1'] = '\U0001F44E' + return emoji_data_dict except GLib.Error: ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -131,7 +131,7 @@ def _update_avatar(self) -> None: scale) else: surface = make_workspace_avatar( - name[:1].upper(), + name, rgba_to_float(rgba), AvatarSize.WORKSPACE_EDIT, scale) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c3dfc7d6eb4c53d383f5945ce67bda4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c3dfc7d6eb4c53d383f5945ce67bda4… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits