isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Prefer using ClutterTextDirection

Browse Source 
In various public APIs, Clutter used to return a PangoDirection
while we have a text direction enum defined in Clutter.

This allows us to drop pango dependency from meta making it specific
to cogl-pango & clutter

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3531>
This commit is contained in:
Bilal Elmoussaoui
2024-01-17 16:39:21 +01:00
committed by Marge Bot
parent c19eef3f5e
commit a2397e6b80
13 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/native/meta-keymap-native.c
View File

@ -53,10 +53,10 @@ meta_keymap_native_finalize (GObject *object)
G_OBJECT_CLASS (meta_keymap_native_parent_class)->finalize (object);
}
static PangoDirection
static ClutterTextDirection
meta_keymap_native_get_direction (ClutterKeymap *keymap)
{
return PANGO_DIRECTION_NEUTRAL;
return CLUTTER_TEXT_DIRECTION_DEFAULT;
}
static void

32
src/backends/x11/meta-keymap-x11.c
View File

@ -49,7 +49,7 @@ struct _DirectionCacheEntry
{
uint32_t serial;
Atom group_atom;
PangoDirection direction;
ClutterTextDirection direction;
};
struct _MetaKeymapX11
@ -67,7 +67,7 @@ struct _MetaKeymapX11
ClutterModifierType scroll_lock_mask;
ClutterModifierType level3_shift_mask;
PangoDirection current_direction;
ClutterTextDirection current_direction;
XkbDescPtr xkb_desc;
int xkb_event_base;
@ -244,7 +244,7 @@ update_locked_mods (MetaKeymapX11 *keymap_x11,
* is taken from GDK:
* gdk/x11/gdkkeys-x11.c
*/
static PangoDirection
static ClutterTextDirection
get_direction (XkbDescPtr xkb,
int group)
{
@ -257,16 +257,16 @@ get_direction (XkbDescPtr xkb,
{
int level = 0;
KeySym sym = XkbKeySymEntry (xkb, code, level, group);
PangoDirection dir =
_clutter_pango_unichar_direction (clutter_keysym_to_unicode (sym));
ClutterTextDirection dir =
clutter_unichar_direction (clutter_keysym_to_unicode (sym));
switch (dir)
{
case PANGO_DIRECTION_RTL:
case CLUTTER_TEXT_DIRECTION_RTL:
rtl_minus_ltr++;
break;
case PANGO_DIRECTION_LTR:
case CLUTTER_TEXT_DIRECTION_LTR:
rtl_minus_ltr--;
break;
@ -276,12 +276,12 @@ get_direction (XkbDescPtr xkb,
}
if (rtl_minus_ltr > 0)
return PANGO_DIRECTION_RTL;
return CLUTTER_TEXT_DIRECTION_RTL;
return PANGO_DIRECTION_LTR;
return CLUTTER_TEXT_DIRECTION_LTR;
}
static PangoDirection
static ClutterTextDirection
get_direction_from_cache (MetaKeymapX11 *keymap_x11,
XkbDescPtr xkb,
int group)
@ -289,7 +289,7 @@ get_direction_from_cache (MetaKeymapX11 *keymap_x11,
Atom group_atom = xkb->names->groups[group];
gboolean cache_hit = FALSE;
DirectionCacheEntry *cache = keymap_x11->group_direction_cache;
PangoDirection direction = PANGO_DIRECTION_NEUTRAL;
ClutterTextDirection direction = CLUTTER_TEXT_DIRECTION_DEFAULT;
int i;
if (keymap_x11->has_direction)
@ -313,7 +313,7 @@ get_direction_from_cache (MetaKeymapX11 *keymap_x11,
for (i = 0; i < G_N_ELEMENTS (keymap_x11->group_direction_cache); i++)
{
cache[i].group_atom = 0;
cache[i].direction = PANGO_DIRECTION_NEUTRAL;
cache[i].direction = CLUTTER_TEXT_DIRECTION_DEFAULT;
cache[i].serial = keymap_x11->current_cache_serial;
}
@ -514,12 +514,12 @@ meta_keymap_x11_finalize (GObject *object)
G_OBJECT_CLASS (meta_keymap_x11_parent_class)->finalize (object);
}
static PangoDirection
static ClutterTextDirection
meta_keymap_x11_get_direction (ClutterKeymap *keymap)
{
MetaKeymapX11 *keymap_x11;
g_return_val_if_fail (META_IS_KEYMAP_X11 (keymap), PANGO_DIRECTION_NEUTRAL);
g_return_val_if_fail (META_IS_KEYMAP_X11 (keymap), CLUTTER_TEXT_DIRECTION_DEFAULT);
keymap_x11 = META_KEYMAP_X11 (keymap);
@ -538,7 +538,7 @@ meta_keymap_x11_get_direction (ClutterKeymap *keymap)
}
else
{
return PANGO_DIRECTION_NEUTRAL;
return CLUTTER_TEXT_DIRECTION_DEFAULT;
}
}
@ -565,7 +565,7 @@ meta_keymap_x11_class_init (MetaKeymapX11Class *klass)
static void
meta_keymap_x11_init (MetaKeymapX11 *keymap)
{
keymap->current_direction = PANGO_DIRECTION_NEUTRAL;
keymap->current_direction = CLUTTER_TEXT_DIRECTION_DEFAULT;
keymap->current_group = -1;
keymap->reserved_keycodes = g_hash_table_new (NULL, NULL);
keymap->available_keycodes = g_queue_new ();

1
src/backends/x11/meta-keymap-x11.h
View File

@ -20,7 +20,6 @@
#pragma once
#include <glib-object.h>
#include <pango/pango.h>
#include "clutter/clutter.h"