mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-30 01:39:20 +00:00
Support of asynchrone status icon implementations
This commit is contained in:
François Grisez
parent
752de821b0
commit
9cb0974eb4
3 changed files with 135 additions and 28 deletions
23
gtk/main.c
23
gtk/main.c
|
|
@ -1549,16 +1549,18 @@ static void handle_icon_click(LinphoneStatusIcon *si, void *user_data) {
|
|||
}
|
||||
|
||||
static void linphone_gtk_init_status_icon(void) {
|
||||
LinphoneStatusIcon *icon = linphone_status_icon_get();
|
||||
if(icon) {
|
||||
GtkWidget *menu = create_icon_menu();
|
||||
LinphoneStatusIconParams *params = linphone_status_icon_params_new();
|
||||
linphone_status_icon_params_set_menu(params, menu);
|
||||
linphone_status_icon_params_set_title(params, _("Linphone - a video internet phone"));
|
||||
linphone_status_icon_params_set_on_click_cb(params, handle_icon_click, NULL);
|
||||
linphone_status_icon_start(icon, params);
|
||||
g_object_unref(G_OBJECT(menu));
|
||||
linphone_status_icon_params_unref(params);
|
||||
if(linphone_status_icon_init(NULL, NULL)) {
|
||||
LinphoneStatusIcon *icon = linphone_status_icon_get();
|
||||
if(icon) {
|
||||
GtkWidget *menu = create_icon_menu();
|
||||
LinphoneStatusIconParams *params = linphone_status_icon_params_new();
|
||||
linphone_status_icon_params_set_menu(params, menu);
|
||||
linphone_status_icon_params_set_title(params, _("Linphone - a video internet phone"));
|
||||
linphone_status_icon_params_set_on_click_cb(params, handle_icon_click, NULL);
|
||||
linphone_status_icon_start(icon, params);
|
||||
g_object_unref(G_OBJECT(menu));
|
||||
linphone_status_icon_params_unref(params);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1973,6 +1975,7 @@ static void linphone_gtk_quit(void){
|
|||
#ifdef HAVE_NOTIFY
|
||||
notify_uninit();
|
||||
#endif
|
||||
linphone_status_icon_uninit();
|
||||
gtk_widget_destroy(the_ui);
|
||||
the_ui=NULL;
|
||||
gdk_threads_leave();
|
||||
|
|
|
|||
|
|
@ -24,6 +24,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include <gtkosxapplication.h>
|
||||
#endif
|
||||
|
||||
typedef struct __LinphoneStatusIconDesc _LinphoneStatusIconDesc;
|
||||
|
||||
static LinphoneStatusIcon *_linphone_status_icon_instance = NULL;
|
||||
static const _LinphoneStatusIconDesc *_linphone_status_icon_selected_desc = NULL;
|
||||
static const _LinphoneStatusIconDesc *_linphone_status_icon_impls[];
|
||||
|
||||
|
||||
struct _LinphoneStatusIconParams {
|
||||
char *title;
|
||||
GtkWidget *menu;
|
||||
|
|
@ -72,23 +79,91 @@ typedef void (*LinphoneStatusIconDescInitFunc)(LinphoneStatusIcon *obj);
|
|||
typedef void (*LinphoneStatusIconDescUninitFunc)(LinphoneStatusIcon *obj);
|
||||
typedef void (*LinphoneStatusIconDescStartFunc)(LinphoneStatusIcon *obj);
|
||||
typedef void (*LinphoneStatusIconDescEnableBlinkingFunc)(LinphoneStatusIcon *obj, gboolean enable);
|
||||
typedef gboolean (*LinphoneStatusIconDescIsSupported)(void);
|
||||
typedef void (*LinphoneStatusIconDescIsSupportedResultCb)(const _LinphoneStatusIconDesc *obj, gboolean result, void *user_data);
|
||||
typedef gboolean (*LinphoneStatusIconDescIsSupportedFunc)(
|
||||
const _LinphoneStatusIconDesc *desc,
|
||||
gboolean *result,
|
||||
LinphoneStatusIconDescIsSupportedResultCb cb,
|
||||
void *user_data
|
||||
);
|
||||
typedef void (*LinphoneStatusIconDescFindResultCb)(const _LinphoneStatusIconDesc *desc, void *user_data);
|
||||
|
||||
typedef struct {
|
||||
struct __LinphoneStatusIconDesc {
|
||||
const char *impl_name;
|
||||
LinphoneStatusIconDescInitFunc init;
|
||||
LinphoneStatusIconDescUninitFunc uninit;
|
||||
LinphoneStatusIconDescStartFunc start;
|
||||
LinphoneStatusIconDescEnableBlinkingFunc enable_blinking;
|
||||
LinphoneStatusIconDescIsSupported is_supported;
|
||||
} _LinphoneStatusIconDesc;
|
||||
LinphoneStatusIconDescIsSupportedFunc is_supported;
|
||||
};
|
||||
|
||||
static const _LinphoneStatusIconDesc *_linphone_status_icon_impls[];
|
||||
static gboolean _linphone_status_icon_desc_is_supported(
|
||||
const _LinphoneStatusIconDesc *desc,
|
||||
gboolean *result,
|
||||
LinphoneStatusIconDescIsSupportedResultCb cb,
|
||||
void *user_data) {
|
||||
|
||||
return desc->is_supported(desc, result, cb, user_data);
|
||||
}
|
||||
|
||||
static const _LinphoneStatusIconDesc *_status_icon_find_instance(void) {
|
||||
typedef struct {
|
||||
int i;
|
||||
for(i=0; _linphone_status_icon_impls[i] && !_linphone_status_icon_impls[i]->is_supported(); i++);
|
||||
return _linphone_status_icon_impls[i];
|
||||
LinphoneStatusIconDescFindResultCb cb;
|
||||
void *user_data;
|
||||
} _LinphoneStatusIconDescSearchCtx;
|
||||
|
||||
static void _linphone_status_icon_desc_is_supprted_result_cb(
|
||||
const _LinphoneStatusIconDesc *desc,
|
||||
gboolean result,
|
||||
_LinphoneStatusIconDescSearchCtx *ctx) {
|
||||
|
||||
if(!result) {
|
||||
ctx->i++;
|
||||
for(; _linphone_status_icon_impls[ctx->i]; ctx->i++) {
|
||||
if(_linphone_status_icon_desc_is_supported(
|
||||
_linphone_status_icon_impls[ctx->i],
|
||||
&result,
|
||||
(LinphoneStatusIconDescIsSupportedResultCb)_linphone_status_icon_desc_is_supprted_result_cb,
|
||||
ctx)) {
|
||||
|
||||
if(result) break;
|
||||
} else return;
|
||||
}
|
||||
}
|
||||
if(ctx->cb) ctx->cb(_linphone_status_icon_impls[ctx->i], ctx->user_data);
|
||||
g_free(ctx);
|
||||
}
|
||||
|
||||
static gboolean _linphone_status_icon_find_first_available_impl(
|
||||
const _LinphoneStatusIconDesc **desc,
|
||||
LinphoneStatusIconDescFindResultCb cb,
|
||||
void *user_data) {
|
||||
|
||||
gboolean result;
|
||||
_LinphoneStatusIconDescSearchCtx *ctx = g_new0(_LinphoneStatusIconDescSearchCtx, 1);
|
||||
ctx->cb = cb;
|
||||
ctx->user_data = user_data;
|
||||
|
||||
for(ctx->i=0; _linphone_status_icon_impls[ctx->i]; ctx->i++) {
|
||||
if(_linphone_status_icon_desc_is_supported(
|
||||
_linphone_status_icon_impls[ctx->i],
|
||||
&result,
|
||||
(LinphoneStatusIconDescIsSupportedResultCb)_linphone_status_icon_desc_is_supprted_result_cb,
|
||||
ctx)) {
|
||||
|
||||
if(result) {
|
||||
*desc = _linphone_status_icon_impls[ctx->i];
|
||||
goto sync_return;
|
||||
}
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
*desc = NULL;
|
||||
|
||||
sync_return:
|
||||
g_free(ctx);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -130,19 +205,32 @@ static void _linphone_status_icon_notify_click(LinphoneStatusIcon *obj) {
|
|||
}
|
||||
|
||||
|
||||
static LinphoneStatusIcon *_linphone_status_icon_instance = NULL;
|
||||
void _linphone_status_icon_init_cb(const _LinphoneStatusIconDesc *desc, void *user_data) {
|
||||
void **ctx = (void **)user_data;
|
||||
LinphoneStatusIconReadyCb cb = (LinphoneStatusIconReadyCb)ctx[0];
|
||||
_linphone_status_icon_selected_desc = desc;
|
||||
if(cb) cb(ctx[1]);
|
||||
g_free(ctx);
|
||||
}
|
||||
|
||||
static void _linphone_status_icon_free_singleton(void) {
|
||||
_linphone_status_icon_free(_linphone_status_icon_instance);
|
||||
gboolean linphone_status_icon_init(LinphoneStatusIconReadyCb ready_cb, void *user_data) {
|
||||
const _LinphoneStatusIconDesc *desc;
|
||||
void **ctx = g_new(void *, 2);
|
||||
if(_linphone_status_icon_find_first_available_impl(&desc, _linphone_status_icon_init_cb, ctx)) {
|
||||
_linphone_status_icon_selected_desc = desc;
|
||||
g_free(ctx);
|
||||
return 1;
|
||||
} else return 0;
|
||||
}
|
||||
|
||||
void linphone_status_icon_uninit(void) {
|
||||
if(_linphone_status_icon_instance) _linphone_status_icon_free(_linphone_status_icon_instance);
|
||||
}
|
||||
|
||||
LinphoneStatusIcon *linphone_status_icon_get(void) {
|
||||
if(_linphone_status_icon_instance == NULL) {
|
||||
const _LinphoneStatusIconDesc *desc = _status_icon_find_instance();
|
||||
if(desc) {
|
||||
_linphone_status_icon_instance = _linphone_status_icon_new(desc);
|
||||
atexit(_linphone_status_icon_free_singleton);
|
||||
}
|
||||
if(_linphone_status_icon_selected_desc)
|
||||
_linphone_status_icon_instance = _linphone_status_icon_new(_linphone_status_icon_selected_desc);
|
||||
}
|
||||
return _linphone_status_icon_instance;
|
||||
}
|
||||
|
|
@ -213,7 +301,13 @@ static void _linphone_status_icon_impl_enable_blinking(LinphoneStatusIcon *si, g
|
|||
}
|
||||
}
|
||||
|
||||
static gboolean _linphone_status_icon_impl_is_supported(void) {
|
||||
static gboolean _linphone_status_icon_impl_is_supported(
|
||||
const _LinphoneStatusIconDesc *desc,
|
||||
gboolean *result,
|
||||
LinphoneStatusIconDescIsSupportedResultCb cb,
|
||||
void *user_data) {
|
||||
|
||||
*result = 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -241,7 +335,13 @@ static void _linphone_status_icon_impl_gtkosx_app_enable_blinking(StatusIcon *si
|
|||
}
|
||||
}
|
||||
|
||||
static gboolean _linphone_satus_icon_impl_gtkosx_app_is_supported(void) {
|
||||
static gboolean _linphone_satus_icon_impl_gtkosx_app_is_supported(
|
||||
const _LinphoneStatusIconDesc *desc,
|
||||
gboolean *result,
|
||||
LinphoneStatusIconDescIsSupportedResultCb cb,
|
||||
void *user_data) {
|
||||
|
||||
*result = 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,8 +35,12 @@ void linphone_status_icon_params_set_menu(LinphoneStatusIconParams *obj, GtkWidg
|
|||
void linphone_status_icon_params_set_on_click_cb(LinphoneStatusIconParams* obj, LinphoneStatusIconOnClickCallback cb, void *user_data);
|
||||
|
||||
|
||||
typedef void (*LinphoneStatusIconReadyCb)(void *user_data);
|
||||
|
||||
typedef struct _LinphoneStatusIcon LinphoneStatusIcon;
|
||||
|
||||
gboolean linphone_status_icon_init(LinphoneStatusIconReadyCb ready_cb, void* user_data);
|
||||
void linphone_status_icon_uninit(void);
|
||||
LinphoneStatusIcon *linphone_status_icon_get(void);
|
||||
const char *linphone_status_icon_get_implementation_name(const LinphoneStatusIcon *obj);
|
||||
void linphone_status_icon_start(LinphoneStatusIcon *obj, LinphoneStatusIconParams *params);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue