kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- export gkrellm_debug() function to plugins

This commit is contained in:
Stefan Gehn 2008-12-23 20:14:11 +00:00
parent a5194a3488
commit eb074fa36e
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/win32-plugin.c
View File

@ -147,7 +147,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_remove_krell = gkrellm_remove_krell; gkrellm_callbacks.gkrellm_remove_krell = gkrellm_remove_krell;
gkrellm_callbacks.gkrellm_insert_krell = gkrellm_insert_krell; gkrellm_callbacks.gkrellm_insert_krell = gkrellm_insert_krell;
gkrellm_callbacks.gkrellm_insert_krell_nth = gkrellm_insert_krell_nth; gkrellm_callbacks.gkrellm_insert_krell_nth = gkrellm_insert_krell_nth;
// Decal and Decalbutton functions // Decal and Decalbutton functions
gkrellm_callbacks.gkrellm_create_decal_text = gkrellm_create_decal_text; gkrellm_callbacks.gkrellm_create_decal_text = gkrellm_create_decal_text;
gkrellm_callbacks.gkrellm_create_decal_pixmap = gkrellm_create_decal_pixmap; gkrellm_callbacks.gkrellm_create_decal_pixmap = gkrellm_create_decal_pixmap;
@ -182,7 +182,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_hide_button = gkrellm_hide_button; gkrellm_callbacks.gkrellm_hide_button = gkrellm_hide_button;
gkrellm_callbacks.gkrellm_show_button = gkrellm_show_button; gkrellm_callbacks.gkrellm_show_button = gkrellm_show_button;
gkrellm_callbacks.gkrellm_destroy_button = gkrellm_destroy_button; gkrellm_callbacks.gkrellm_destroy_button = gkrellm_destroy_button;
// Pixops // Pixops
gkrellm_callbacks.gkrellm_load_piximage = gkrellm_load_piximage; gkrellm_callbacks.gkrellm_load_piximage = gkrellm_load_piximage;
gkrellm_callbacks.gkrellm_piximage_new_from_file = gkrellm_piximage_new_from_file; gkrellm_callbacks.gkrellm_piximage_new_from_file = gkrellm_piximage_new_from_file;
@ -199,7 +199,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_clone_bitmap = gkrellm_clone_bitmap; gkrellm_callbacks.gkrellm_clone_bitmap = gkrellm_clone_bitmap;
gkrellm_callbacks.gkrellm_free_pixmap = gkrellm_free_pixmap; gkrellm_callbacks.gkrellm_free_pixmap = gkrellm_free_pixmap;
gkrellm_callbacks.gkrellm_free_bitmap = gkrellm_free_bitmap; gkrellm_callbacks.gkrellm_free_bitmap = gkrellm_free_bitmap;
// Misc support functions // Misc support functions
gkrellm_callbacks.gkrellm_get_top_window = gkrellm_get_top_window; gkrellm_callbacks.gkrellm_get_top_window = gkrellm_get_top_window;
gkrellm_callbacks.gkrellm_set_gkrellmrc_piximage_border = gkrellm_set_gkrellmrc_piximage_border; gkrellm_callbacks.gkrellm_set_gkrellmrc_piximage_border = gkrellm_set_gkrellmrc_piximage_border;
@ -230,7 +230,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_message_dialog = gkrellm_message_dialog; gkrellm_callbacks.gkrellm_message_dialog = gkrellm_message_dialog;
gkrellm_callbacks.gkrellm_config_message_dialog = gkrellm_config_message_dialog; gkrellm_callbacks.gkrellm_config_message_dialog = gkrellm_config_message_dialog;
gkrellm_callbacks.gkrellm_spacers_set_types = gkrellm_spacers_set_types; gkrellm_callbacks.gkrellm_spacers_set_types = gkrellm_spacers_set_types;
// Alerts // Alerts
gkrellm_callbacks.gkrellm_alert_create = gkrellm_alert_create; gkrellm_callbacks.gkrellm_alert_create = gkrellm_alert_create;
gkrellm_callbacks.gkrellm_alert_destroy = gkrellm_alert_destroy; gkrellm_callbacks.gkrellm_alert_destroy = gkrellm_alert_destroy;
@ -248,7 +248,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_save_alertconfig = gkrellm_save_alertconfig; gkrellm_callbacks.gkrellm_save_alertconfig = gkrellm_save_alertconfig;
gkrellm_callbacks.gkrellm_load_alertconfig = gkrellm_load_alertconfig; gkrellm_callbacks.gkrellm_load_alertconfig = gkrellm_load_alertconfig;
gkrellm_callbacks.gkrellm_alert_set_triggers = gkrellm_alert_set_triggers; gkrellm_callbacks.gkrellm_alert_set_triggers = gkrellm_alert_set_triggers;
// GKrellM Styles and Textstyles // GKrellM Styles and Textstyles
gkrellm_callbacks.gkrellm_add_chart_style = gkrellm_add_chart_style; gkrellm_callbacks.gkrellm_add_chart_style = gkrellm_add_chart_style;
gkrellm_callbacks.gkrellm_add_meter_style = gkrellm_add_meter_style; gkrellm_callbacks.gkrellm_add_meter_style = gkrellm_add_meter_style;
@ -268,7 +268,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_chart_alt_textstyle = gkrellm_chart_alt_textstyle; gkrellm_callbacks.gkrellm_chart_alt_textstyle = gkrellm_chart_alt_textstyle;
gkrellm_callbacks.gkrellm_panel_alt_textstyle = gkrellm_panel_alt_textstyle; gkrellm_callbacks.gkrellm_panel_alt_textstyle = gkrellm_panel_alt_textstyle;
gkrellm_callbacks.gkrellm_meter_alt_textstyle = gkrellm_meter_alt_textstyle; gkrellm_callbacks.gkrellm_meter_alt_textstyle = gkrellm_meter_alt_textstyle;
// Accessing GKrellM GkrellmPiximages and pixmaps // Accessing GKrellM GkrellmPiximages and pixmaps
gkrellm_callbacks.gkrellm_bg_chart_piximage = gkrellm_bg_chart_piximage; gkrellm_callbacks.gkrellm_bg_chart_piximage = gkrellm_bg_chart_piximage;
gkrellm_callbacks.gkrellm_bg_grid_piximage = gkrellm_bg_grid_piximage; gkrellm_callbacks.gkrellm_bg_grid_piximage = gkrellm_bg_grid_piximage;
@ -286,7 +286,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_data_out_grid_pixmap = gkrellm_data_out_grid_pixmap; gkrellm_callbacks.gkrellm_data_out_grid_pixmap = gkrellm_data_out_grid_pixmap;
gkrellm_callbacks.gkrellm_decal_misc_pixmap = gkrellm_decal_misc_pixmap; gkrellm_callbacks.gkrellm_decal_misc_pixmap = gkrellm_decal_misc_pixmap;
gkrellm_callbacks.gkrellm_decal_misc_mask = gkrellm_decal_misc_mask; gkrellm_callbacks.gkrellm_decal_misc_mask = gkrellm_decal_misc_mask;
// Accessing other data from the GK struct // Accessing other data from the GK struct
gkrellm_callbacks.gkrellm_draw_GC = gkrellm_draw_GC; gkrellm_callbacks.gkrellm_draw_GC = gkrellm_draw_GC;
gkrellm_callbacks.gkrellm_bit_GC = gkrellm_bit_GC; gkrellm_callbacks.gkrellm_bit_GC = gkrellm_bit_GC;
@ -302,7 +302,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_ticks = gkrellm_ticks; gkrellm_callbacks.gkrellm_ticks = gkrellm_ticks;
gkrellm_callbacks.gkrellm_allow_scaling = gkrellm_allow_scaling; gkrellm_callbacks.gkrellm_allow_scaling = gkrellm_allow_scaling;
gkrellm_callbacks.gkrellm_plugin_debug = gkrellm_plugin_debug; gkrellm_callbacks.gkrellm_plugin_debug = gkrellm_plugin_debug;
// Wrappers around gtk widget functions to provide a convenience higher level // Wrappers around gtk widget functions to provide a convenience higher level
// interface for creating the config pages. // interface for creating the config pages.
gkrellm_callbacks.gkrellm_gtk_notebook_page = gkrellm_gtk_notebook_page; gkrellm_callbacks.gkrellm_gtk_notebook_page = gkrellm_gtk_notebook_page;
@ -330,7 +330,7 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_125_sequence = gkrellm_125_sequence; gkrellm_callbacks.gkrellm_125_sequence = gkrellm_125_sequence;
gkrellm_callbacks.gkrellm_save_all = gkrellm_save_all; gkrellm_callbacks.gkrellm_save_all = gkrellm_save_all;
// ------- Some builtin monitor public functions -------- // ------- Some builtin monitor public functions --------
// Functions exported by cpu.c // Functions exported by cpu.c
gkrellm_callbacks.gkrellm_smp_cpus = gkrellm_smp_cpus; gkrellm_callbacks.gkrellm_smp_cpus = gkrellm_smp_cpus;
@ -393,7 +393,7 @@ void win32_init_callbacks(void)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// new since 2.2.0 // new since 2.2.0
gkrellm_callbacks.gkrellm_decal_get_size = gkrellm_decal_get_size; gkrellm_callbacks.gkrellm_decal_get_size = gkrellm_decal_get_size;
gkrellm_callbacks.gkrellm_decal_text_set_offset = gkrellm_decal_text_set_offset; gkrellm_callbacks.gkrellm_decal_text_set_offset = gkrellm_decal_text_set_offset;
gkrellm_callbacks.gkrellm_decal_text_get_offset = gkrellm_decal_text_get_offset; gkrellm_callbacks.gkrellm_decal_text_get_offset = gkrellm_decal_text_get_offset;
gkrellm_callbacks.gkrellm_chart_reuse_text_format = gkrellm_chart_reuse_text_format; gkrellm_callbacks.gkrellm_chart_reuse_text_format = gkrellm_chart_reuse_text_format;
@ -419,7 +419,7 @@ void win32_init_callbacks(void)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// new since 2.2.1 // new since 2.2.1
gkrellm_callbacks.gkrellm_draw_decal_markup = gkrellm_draw_decal_markup; gkrellm_callbacks.gkrellm_draw_decal_markup = gkrellm_draw_decal_markup;
gkrellm_callbacks.gkrellm_decal_scroll_text_set_markup = gkrellm_decal_scroll_text_set_markup; gkrellm_callbacks.gkrellm_decal_scroll_text_set_markup = gkrellm_decal_scroll_text_set_markup;
@ -447,5 +447,11 @@ void win32_init_callbacks(void)
gkrellm_callbacks.gkrellm_gdk_text_markup_width = gkrellm_gdk_text_markup_width; gkrellm_callbacks.gkrellm_gdk_text_markup_width = gkrellm_gdk_text_markup_width;
gkrellm_callbacks.gkrellm_gdk_draw_string_markup = gkrellm_gdk_draw_string_markup; gkrellm_callbacks.gkrellm_gdk_draw_string_markup = gkrellm_gdk_draw_string_markup;
gkrellm_callbacks.gkrellm_gdk_draw_text_markup = gkrellm_gdk_draw_text_markup; gkrellm_callbacks.gkrellm_gdk_draw_text_markup = gkrellm_gdk_draw_text_markup;
//---------------------------------------------------------------------------
// new since 2.3.2
gkrellm_callbacks.gkrellm_debug = gkrellm_debug;
} // win32_init_callbacks() } // win32_init_callbacks()

10
src/win32-plugin.h
View File

@ -562,10 +562,10 @@ typedef struct
// new since 2.2.5 // new since 2.2.5
gboolean (*gkrellm_client_send_to_server)(gchar *key_name, gchar *line); gboolean (*gkrellm_client_send_to_server)(gchar *key_name, gchar *line);
GkrellmDecal *(*gkrellm_create_decal_text_markup)(GkrellmPanel *p, gchar *string, GkrellmTextstyle *ts, GkrellmStyle *style, gint x, gint y, gint w); GkrellmDecal *(*gkrellm_create_decal_text_markup)(GkrellmPanel *p, gchar *string, GkrellmTextstyle *ts, GkrellmStyle *style, gint x, gint y, gint w);
void (*gkrellm_decal_text_markup_insert)(GkrellmDecal *d, gchar *s, GkrellmTextstyle *ts, gint x_off, gint y_off); void (*gkrellm_decal_text_markup_insert)(GkrellmDecal *d, gchar *s, GkrellmTextstyle *ts, gint x_off, gint y_off);
void (*gkrellm_decal_text_nth_inserted_set_offset)(GkrellmDecal *d, gint n, gint x_off, gint y_off); void (*gkrellm_decal_text_nth_inserted_set_offset)(GkrellmDecal *d, gint n, gint x_off, gint y_off);
void (*gkrellm_decal_text_nth_inserted_get_offset)(GkrellmDecal *d, gint n, gint *x_off, gint *y_off); void (*gkrellm_decal_text_nth_inserted_get_offset)(GkrellmDecal *d, gint n, gint *x_off, gint *y_off);
void (*gkrellm_config_instant_apply)(GkrellmMonitor *mon); void (*gkrellm_config_instant_apply)(GkrellmMonitor *mon);
@ -576,12 +576,16 @@ typedef struct
void (*gkrellm_gdk_draw_string_markup)(GdkDrawable *drawable, PangoFontDescription *font, GdkGC *gc, gint x, gint y, gchar *string); void (*gkrellm_gdk_draw_string_markup)(GdkDrawable *drawable, PangoFontDescription *font, GdkGC *gc, gint x, gint y, gchar *string);
void (*gkrellm_gdk_draw_text_markup)(GdkDrawable *drawable, PangoFontDescription *font, GdkGC *gc, gint x, gint y, gchar *string, gint len); void (*gkrellm_gdk_draw_text_markup)(GdkDrawable *drawable, PangoFontDescription *font, GdkGC *gc, gint x, gint y, gchar *string, gint len);
//---------------------------------------------------------------------------
// new since 2.3.2
void (*gkrellm_debug)(guint debug_level, const gchar *format, ...);
} win32_plugin_callbacks; } win32_plugin_callbacks;
/// part of win32-plugin.c /// part of win32-plugin.c
/// ///
extern win32_plugin_callbacks gkrellm_callbacks; extern win32_plugin_callbacks gkrellm_callbacks;