diff options
author | Benjamin Otte <otte@redhat.com> | 2016-10-28 04:42:24 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2016-10-28 05:22:50 +0200 |
commit | 45c0379f873e33f6ac072cd32bb7785b61a2f962 (patch) | |
tree | 682c79156586d8f03d50f87c6ac714464d6d43c3 /gdk/quartz | |
parent | f420dc74566ef1c284cd22314017e12624d51a15 (diff) | |
download | gtk+-45c0379f873e33f6ac072cd32bb7785b61a2f962.tar.gz |
API: gdk: Remove visual querying APIs
They are unused, only work on the default display anyway and visuals are
on their way out.
Diffstat (limited to 'gdk/quartz')
-rw-r--r-- | gdk/quartz/gdkprivate-quartz.h | 17 | ||||
-rw-r--r-- | gdk/quartz/gdkscreen-quartz.c | 8 | ||||
-rw-r--r-- | gdk/quartz/gdkvisual-quartz.c | 95 |
3 files changed, 0 insertions, 120 deletions
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h index 69491b03f9..79d2778d68 100644 --- a/gdk/quartz/gdkprivate-quartz.h +++ b/gdk/quartz/gdkprivate-quartz.h @@ -164,23 +164,6 @@ void _gdk_quartz_screen_update_window_sizes (GdkScreen *screen); /* Screen methods - visual */ GdkVisual * _gdk_quartz_screen_get_rgba_visual (GdkScreen *screen); GdkVisual * _gdk_quartz_screen_get_system_visual (GdkScreen *screen); -gint _gdk_quartz_screen_visual_get_best_depth (GdkScreen *screen); -GdkVisualType _gdk_quartz_screen_visual_get_best_type (GdkScreen *screen); -GdkVisual * _gdk_quartz_screen_get_system_visual (GdkScreen *screen); -GdkVisual* _gdk_quartz_screen_visual_get_best (GdkScreen *screen); -GdkVisual* _gdk_quartz_screen_visual_get_best_with_depth (GdkScreen *screen, - gint depth); -GdkVisual* _gdk_quartz_screen_visual_get_best_with_type (GdkScreen *screen, - GdkVisualType visual_type); -GdkVisual* _gdk_quartz_screen_visual_get_best_with_both (GdkScreen *screen, - gint depth, - GdkVisualType visual_type); -void _gdk_quartz_screen_query_depths (GdkScreen *screen, - gint **depths, - gint *count); -void _gdk_quartz_screen_query_visual_types (GdkScreen *screen, - GdkVisualType **visual_types, - gint *count); void _gdk_quartz_screen_init_visuals (GdkScreen *screen); GList * _gdk_quartz_screen_list_visuals (GdkScreen *screen); diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c index 13b0274e64..d29615a718 100644 --- a/gdk/quartz/gdkscreen-quartz.c +++ b/gdk/quartz/gdkscreen-quartz.c @@ -480,14 +480,6 @@ gdk_quartz_screen_class_init (GdkQuartzScreenClass *klass) screen_class->get_setting = _gdk_quartz_screen_get_setting; screen_class->get_rgba_visual = _gdk_quartz_screen_get_rgba_visual; screen_class->get_system_visual = _gdk_quartz_screen_get_system_visual; - screen_class->visual_get_best_depth = _gdk_quartz_screen_visual_get_best_depth; - screen_class->visual_get_best_type = _gdk_quartz_screen_visual_get_best_type; - screen_class->visual_get_best = _gdk_quartz_screen_visual_get_best; - screen_class->visual_get_best_with_depth = _gdk_quartz_screen_visual_get_best_with_depth; - screen_class->visual_get_best_with_type = _gdk_quartz_screen_visual_get_best_with_type; - screen_class->visual_get_best_with_both = _gdk_quartz_screen_visual_get_best_with_both; - screen_class->query_depths = _gdk_quartz_screen_query_depths; - screen_class->query_visual_types = _gdk_quartz_screen_query_visual_types; screen_class->list_visuals = _gdk_quartz_screen_list_visuals; screen_class->get_monitor_scale_factor = _gdk_quartz_screen_get_monitor_scale_factor; } diff --git a/gdk/quartz/gdkvisual-quartz.c b/gdk/quartz/gdkvisual-quartz.c index ea7d2c8d59..53d74aba7b 100644 --- a/gdk/quartz/gdkvisual-quartz.c +++ b/gdk/quartz/gdkvisual-quartz.c @@ -88,19 +88,6 @@ gdk_quartz_visual_class_init (GdkQuartzVisualClass *class) { } -/* We prefer the system visual for now ... */ -gint -_gdk_quartz_screen_visual_get_best_depth (GdkScreen *screen) -{ - return system_visual->depth; -} - -GdkVisualType -_gdk_quartz_screen_visual_get_best_type (GdkScreen *screen) -{ - return system_visual->type; -} - GdkVisual * _gdk_quartz_screen_get_rgba_visual (GdkScreen *screen) { @@ -113,88 +100,6 @@ _gdk_quartz_screen_get_system_visual (GdkScreen *screen) return system_visual; } -GdkVisual* -_gdk_quartz_screen_visual_get_best (GdkScreen *screen) -{ - return system_visual; -} - -GdkVisual* -_gdk_quartz_screen_visual_get_best_with_depth (GdkScreen *screen, - gint depth) -{ - GdkVisual *visual = NULL; - - switch (depth) - { - case 32: - visual = rgba_visual; - break; - - case 24: - visual = system_visual; - break; - - case 1: - visual = gray_visual; - break; - - default: - visual = NULL; - } - - return visual; -} - -GdkVisual* -_gdk_quartz_screen_visual_get_best_with_type (GdkScreen *screen, - GdkVisualType visual_type) -{ - if (system_visual->type == visual_type) - return system_visual; - else if (gray_visual->type == visual_type) - return gray_visual; - - return NULL; -} - -GdkVisual* -_gdk_quartz_screen_visual_get_best_with_both (GdkScreen *screen, - gint depth, - GdkVisualType visual_type) -{ - if (system_visual->depth == depth - && system_visual->type == visual_type) - return system_visual; - else if (rgba_visual->depth == depth - && rgba_visual->type == visual_type) - return rgba_visual; - else if (gray_visual->depth == depth - && gray_visual->type == visual_type) - return gray_visual; - - return NULL; -} - -/* For these, we also prefer the system visual */ -void -_gdk_quartz_screen_query_depths (GdkScreen *screen, - gint **depths, - gint *count) -{ - *count = 1; - *depths = &system_visual->depth; -} - -void -_gdk_quartz_screen_query_visual_types (GdkScreen *screen, - GdkVisualType **visual_types, - gint *count) -{ - *count = 1; - *visual_types = &system_visual->type; -} - void _gdk_quartz_screen_init_visuals (GdkScreen *screen) { |