From 72abee34810471bea4d05adf4db2b3996837b014 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 26 Jul 2011 06:44:12 +0000 Subject: [PATCH] Ecore_X: Add a missing function for getting the count of screens. Bonus: Added doxy and the @since stuffs (for Tom) ;) NB: Needed for changes to ecore_evas as that was using xlib ScreenCount. This way we can just use ecore_x_screen_count_get and not have to worry if we are xcb/xlib/etc. SVN revision: 61728 --- legacy/ecore/src/lib/ecore_x/Ecore_X.h | 1 + legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c | 8 ++++++++ legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c | 16 ++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h index f0af0d1471..261a0786c3 100644 --- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h +++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h @@ -1088,6 +1088,7 @@ EAPI Ecore_X_Connection * ecore_x_connection_get(void); EAPI int ecore_x_fd_get(void); EAPI Ecore_X_Screen * ecore_x_default_screen_get(void); EAPI void ecore_x_screen_size_get(const Ecore_X_Screen *screen, int *w, int *h); +EAPI int ecore_x_screen_count_get(void); EAPI void ecore_x_double_click_time_set(double t); EAPI double ecore_x_double_click_time_get(void); EAPI void ecore_x_flush(void); diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c index 0980d3f264..ff51905781 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c @@ -1057,6 +1057,14 @@ ecore_x_screen_size_get(const Ecore_X_Screen *screen, int *w, int *h) if (h) *h = s->height_in_pixels; } +/** + * Retrieves the number of screens. + * + * @return The count of the number of screens. + * @ingroup Ecore_X_Display_Attr_Group + * + * @since 1.1 + */ EAPI int ecore_x_screen_count_get(void) { diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c index fa427ab757..346bb9f780 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c @@ -711,6 +711,22 @@ ecore_x_screen_size_get(const Ecore_X_Screen *screen, int *w, int *h) if (h) *h = s->height; } +/** + * Retrieves the number of screens. + * + * @return The count of the number of screens. + * @ingroup Ecore_X_Display_Attr_Group + * + * @since 1.1 + */ +EAPI int +ecore_x_screen_count_get(void) +{ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + return ScreenCount(_ecore_x_disp); +} + /** * Sets the timeout for a double and triple clicks to be flagged. *