diff --git a/src/dialogs/print/print.c b/src/dialogs/print/print.c index b21bfbe..9b9dc27 100644 --- a/src/dialogs/print/print.c +++ b/src/dialogs/print/print.c @@ -44,7 +44,7 @@ debug("%s",__FUNCTION__); if(operation->widget) - g_signal_emit(GTK_WIDGET(operation->widget), v3270_widget_signal[SIGNAL_PRINT_DONE], 0, prt, (guint) result); + g_signal_emit(GTK_WIDGET(operation->widget), v3270_widget_signal[V3270_SIGNAL_PRINT_DONE], 0, prt, (guint) result); } @@ -93,7 +93,7 @@ V3270PrintOperation * operation = GTK_V3270_PRINT_OPERATION(prt); if(operation->widget) - g_signal_emit(operation->widget, v3270_widget_signal[SIGNAL_PRINT_SETUP], 0, prt); + g_signal_emit(operation->widget, v3270_widget_signal[V3270_SIGNAL_PRINT_SETUP], 0, prt); // Create dialog @@ -151,7 +151,7 @@ debug("%s",__FUNCTION__); if(operation->widget) - g_signal_emit(operation->widget, v3270_widget_signal[SIGNAL_PRINT_APPLY], 0, prt); + g_signal_emit(operation->widget, v3270_widget_signal[V3270_SIGNAL_PRINT_APPLY], 0, prt); } diff --git a/src/include/internals.h b/src/include/internals.h index b321271..a0fd878 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -32,6 +32,10 @@ #define V3270_INTERNALS_H_INCLUDED 1 #include + + #define ENABLE_NLS + #define GETTEXT_PACKAGE PACKAGE_NAME + #include #include #include @@ -48,6 +52,42 @@ G_BEGIN_DECLS +/*--[ Signals ]--------------------------------------------------------------------------------------*/ + + /// @brief V3270 Signal list + enum + { + V3270_SIGNAL_TOGGLE_CHANGED, + V3270_SIGNAL_MESSAGE_CHANGED, + V3270_SIGNAL_KEYPRESS, + V3270_SIGNAL_CONNECTED, + V3270_SIGNAL_DISCONNECTED, + V3270_SIGNAL_UPDATE_CONFIG, + V3270_SIGNAL_MODEL_CHANGED, + V3270_SIGNAL_SELECTING, + V3270_SIGNAL_POPUP, + V3270_SIGNAL_PASTENEXT, + V3270_SIGNAL_CLIPBOARD, + V3270_SIGNAL_CHANGED, + V3270_SIGNAL_MESSAGE, + V3270_SIGNAL_FIELD, + V3270_SIGNAL_PRINT_SETUP, + V3270_SIGNAL_PRINT_APPLY, + V3270_SIGNAL_PRINT_DONE, + V3270_SIGNAL_SESSION_CHANGED, + + V3270_SIGNAL_LAST + }; + + G_GNUC_INTERNAL guint v3270_widget_signal[V3270_SIGNAL_LAST]; + +/*--[ Constants ]------------------------------------------------------------------------------------*/ + + G_GNUC_INTERNAL const gchar * v3270_default_colors; + G_GNUC_INTERNAL const gchar * v3270_default_font; + +/*--[ Internal methods ]-----------------------------------------------------------------------------*/ + G_GNUC_INTERNAL void v3270_drag_dest_set(GtkWidget *widget, GCallback callback); G_GNUC_INTERNAL GtkWidget * v3270_box_pack_start(GtkWidget *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding); @@ -160,6 +200,11 @@ G_GNUC_INTERNAL void v3270_disable_updates(GtkWidget *widget); G_GNUC_INTERNAL void v3270_enable_updates(GtkWidget *widget); + G_GNUC_INTERNAL void v3270_start_blinking(GtkWidget *widget); + G_GNUC_INTERNAL void v3270_oia_update_text_field(v3270 *terminal, gboolean flag, V3270_OIA_FIELD id, const gchar chr); + G_GNUC_INTERNAL cairo_t * v3270_oia_set_update_region(v3270 * terminal, GdkRectangle **r, V3270_OIA_FIELD id); + G_GNUC_INTERNAL void v3270_install_callbacks(v3270 *widget); + // Keyboard & Mouse G_GNUC_INTERNAL gboolean v3270_key_press_event(GtkWidget *widget, GdkEventKey *event); G_GNUC_INTERNAL gboolean v3270_key_release_event(GtkWidget *widget, GdkEventKey *event); diff --git a/src/terminal/callbacks.c b/src/terminal/callbacks.c index 25fa28c..0622d65 100644 --- a/src/terminal/callbacks.c +++ b/src/terminal/callbacks.c @@ -134,7 +134,7 @@ static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value } g_object_notify_by_pspec(G_OBJECT(widget), v3270_properties.toggle[ix]); - g_signal_emit(widget, v3270_widget_signal[SIGNAL_TOGGLE_CHANGED], 0, (guint) ix, (gboolean) (value != 0), (gchar *) name); + g_signal_emit(widget, v3270_widget_signal[V3270_SIGNAL_TOGGLE_CHANGED], 0, (guint) ix, (gboolean) (value != 0), (gchar *) name); } @@ -145,7 +145,7 @@ static gboolean bg_update_message(H3270 *session) g_signal_emit( GTK_WIDGET(widget), - v3270_widget_signal[SIGNAL_MESSAGE_CHANGED], + v3270_widget_signal[V3270_SIGNAL_MESSAGE_CHANGED], 0, (gint) lib3270_get_program_message(session) ); @@ -218,12 +218,12 @@ static void update_connect(H3270 *session, unsigned char connected) if(connected) { widget->cursor.show |= 2; - g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[SIGNAL_CONNECTED], 0, lib3270_get_host(session)); + g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[V3270_SIGNAL_CONNECTED], 0, lib3270_get_host(session)); } else { widget->cursor.show &= ~2; - g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[SIGNAL_DISCONNECTED], 0); + g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[V3270_SIGNAL_DISCONNECTED], 0); } if(v3270_properties.online) @@ -245,7 +245,7 @@ static void update_model(H3270 *session, const char *name, int model, G_GNUC_UNU if(v3270_properties.model) g_object_notify_by_pspec(G_OBJECT(lib3270_get_user_data(session)), v3270_properties.model); - g_signal_emit(GTK_WIDGET(lib3270_get_user_data(session)),v3270_widget_signal[SIGNAL_MODEL_CHANGED], 0, (guint) model, name); + g_signal_emit(GTK_WIDGET(lib3270_get_user_data(session)),v3270_widget_signal[V3270_SIGNAL_MODEL_CHANGED], 0, (guint) model, name); } static void changed(H3270 *session, int offset, int len) @@ -292,7 +292,7 @@ static void changed(H3270 *session, int offset, int len) gtk_widget_queue_draw(widget); #endif // WIN32 - g_signal_emit(GTK_WIDGET(widget),v3270_widget_signal[SIGNAL_CHANGED], 0, (guint) offset, (guint) len); + g_signal_emit(GTK_WIDGET(widget),v3270_widget_signal[V3270_SIGNAL_CHANGED], 0, (guint) offset, (guint) len); } static void set_selection(H3270 *session, unsigned char status) @@ -302,7 +302,7 @@ static void set_selection(H3270 *session, unsigned char status) if(v3270_properties.selection) g_object_notify_by_pspec(G_OBJECT(widget), v3270_properties.selection); - g_signal_emit(widget,v3270_widget_signal[SIGNAL_SELECTING], 0, status ? TRUE : FALSE); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_SELECTING], 0, status ? TRUE : FALSE); } @@ -319,7 +319,7 @@ static void update_selection(H3270 *session, G_GNUC_UNUSED int start, G_GNUC_UNU static void message(H3270 *session, LIB3270_NOTIFY id , const char *title, const char *message, const char *text) { - g_signal_emit( GTK_WIDGET(lib3270_get_user_data(session)), v3270_widget_signal[SIGNAL_MESSAGE], 0, + g_signal_emit( GTK_WIDGET(lib3270_get_user_data(session)), v3270_widget_signal[V3270_SIGNAL_MESSAGE], 0, (int) id, (gchar *) title, (gchar *) message, diff --git a/src/terminal/colors.c b/src/terminal/colors.c index 893a499..d646bd1 100644 --- a/src/terminal/colors.c +++ b/src/terminal/colors.c @@ -83,7 +83,7 @@ LIB3270_EXPORT void v3270_set_colors(GtkWidget *widget, const gchar *colors) } v3270_set_color_table(GTK_V3270(widget)->color,colors); - g_signal_emit(widget,v3270_widget_signal[SIGNAL_UPDATE_CONFIG], 0, "colors", colors); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG], 0, "colors", colors); v3270_reload(widget); } diff --git a/src/terminal/font.c b/src/terminal/font.c index 0704ea8..afe3ed3 100644 --- a/src/terminal/font.c +++ b/src/terminal/font.c @@ -282,8 +282,8 @@ LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name) terminal->font.family = g_strdup(name); terminal->font.weight = lib3270_get_toggle(terminal->host,LIB3270_TOGGLE_BOLD) ? CAIRO_FONT_WEIGHT_BOLD : CAIRO_FONT_WEIGHT_NORMAL; - g_signal_emit(widget,v3270_widget_signal[SIGNAL_UPDATE_CONFIG], 0, "font-family", name); - g_object_notify_by_pspec(G_OBJECT(widget), v3270_properties.font_family); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG], 0, "font-family", name); + g_object_notify_by_pspec(G_OBJECT(widget), GTK_V3270_GET_CLASS(widget)->properties.font_family); v3270_reload(widget); gtk_widget_queue_draw(widget); diff --git a/src/terminal/keyboard.c b/src/terminal/keyboard.c index 85f4d55..efd841d 100644 --- a/src/terminal/keyboard.c +++ b/src/terminal/keyboard.c @@ -138,7 +138,7 @@ state &= ~GDK_CONTROL_MASK; #endif - g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[SIGNAL_KEYPRESS], 0, event->keyval, state, &handled); + g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[V3270_SIGNAL_KEYPRESS], 0, event->keyval, state, &handled); debug("Keyboard action was %s",handled ? "Handled" : "Not handled"); if(handled) return TRUE; diff --git a/src/terminal/mouse.c b/src/terminal/mouse.c index bd84e6c..5626c78 100644 --- a/src/terminal/mouse.c +++ b/src/terminal/mouse.c @@ -125,7 +125,7 @@ void v3270_emit_popup(v3270 *widget, int baddr, GdkEventButton *event) lib3270_get_contents(widget->host,baddr,baddr,&chr,&attr); - g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[SIGNAL_POPUP], 0, + g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[V3270_SIGNAL_POPUP], 0, (attr & LIB3270_ATTR_SELECTED) ? TRUE : FALSE, lib3270_connected(widget->host) ? TRUE : FALSE, event, @@ -195,7 +195,7 @@ gboolean v3270_button_release_event(GtkWidget *widget, GdkEventButton*event) { gboolean handled = FALSE; - g_signal_emit(widget, v3270_widget_signal[SIGNAL_FIELD], 0, + g_signal_emit(widget, v3270_widget_signal[V3270_SIGNAL_FIELD], 0, lib3270_connected(GTK_V3270(widget)->host) ? TRUE : FALSE, GTK_V3270(widget)->oia.selected, event, diff --git a/src/terminal/private.h b/src/terminal/private.h index c1c1dcd..ba9947e 100644 --- a/src/terminal/private.h +++ b/src/terminal/private.h @@ -29,8 +29,7 @@ #include -#define ENABLE_NLS -#define GETTEXT_PACKAGE PACKAGE_NAME +#include #include #include @@ -44,7 +43,15 @@ G_BEGIN_DECLS { GtkWidgetClass parent_class; - /* Signals */ + // Internal properties. + struct { + size_t count; // Number of properties. + + GParamSpec * font_family; + + } properties; + + // Signals void (*activate)(GtkWidget *widget); void (*toggle_changed)(v3270 *widget,LIB3270_TOGGLE toggle_id,gboolean toggle_state,const gchar *toggle_name); void (*message_changed)(v3270 *widget, LIB3270_MESSAGE id); @@ -62,31 +69,6 @@ G_BEGIN_DECLS #define KEY_FLAG_ALT 0x0002 #endif // !WIN32 - enum - { - SIGNAL_TOGGLE_CHANGED, - SIGNAL_MESSAGE_CHANGED, - SIGNAL_KEYPRESS, - SIGNAL_CONNECTED, - SIGNAL_DISCONNECTED, - SIGNAL_UPDATE_CONFIG, - SIGNAL_MODEL_CHANGED, - SIGNAL_SELECTING, - SIGNAL_POPUP, - SIGNAL_PASTENEXT, - SIGNAL_CLIPBOARD, - SIGNAL_CHANGED, - SIGNAL_MESSAGE, - SIGNAL_FIELD, - SIGNAL_PRINT_SETUP, - SIGNAL_PRINT_APPLY, - SIGNAL_PRINT_DONE, - SIGNAL_SESSION_CHANGED, - - V3270_LAST_SIGNAL - }; - - /*--[ Globals ]--------------------------------------------------------------------------------------*/ struct v3270_ssl_status_msg @@ -186,20 +168,10 @@ G_BEGIN_DECLS /*--[ Globals ]--------------------------------------------------------------------------------------*/ - G_GNUC_INTERNAL guint v3270_widget_signal[V3270_LAST_SIGNAL]; G_GNUC_INTERNAL GdkCursor * v3270_cursor[LIB3270_POINTER_COUNT]; - G_GNUC_INTERNAL const gchar * v3270_default_colors; - G_GNUC_INTERNAL const gchar * v3270_default_font; - G_GNUC_INTERNAL void v3270_start_blinking(GtkWidget *widget); - - G_GNUC_INTERNAL void v3270_oia_update_text_field(v3270 *terminal, gboolean flag, V3270_OIA_FIELD id, const gchar chr); - G_GNUC_INTERNAL cairo_t * v3270_oia_set_update_region(v3270 * terminal, GdkRectangle **r, V3270_OIA_FIELD id); - - G_GNUC_INTERNAL void v3270_install_callbacks(v3270 *widget); G_GNUC_INTERNAL struct _v3270_properties { - size_t count; // Number of properties. GParamSpec * toggle[LIB3270_TOGGLE_COUNT]; // Toggle properties. struct @@ -210,8 +182,10 @@ G_BEGIN_DECLS guint str; } type; + /* // V3270 Internal properties. GParamSpec * font_family; + */ // Properties who launch signals. GParamSpec * online; @@ -221,96 +195,4 @@ G_BEGIN_DECLS } v3270_properties; - -/*--[ Prototipes ]-----------------------------------------------------------------------------------*/ - -/* -const GtkWidgetClass * v3270_get_parent_class(void); - -G_GNUC_INTERNAL gboolean v3270_draw(GtkWidget * widget, cairo_t * cr); -G_GNUC_INTERNAL void v3270_cursor_draw(v3270 *widget); - -G_GNUC_INTERNAL void v3270_draw_oia(v3270 *terminal, cairo_t *cr, int row, int cols); -G_GNUC_INTERNAL void v3270_update_mouse_pointer(GtkWidget *widget); - -G_GNUC_INTERNAL AtkObject * v3270_get_accessible(GtkWidget * widget); - -#if ! GTK_CHECK_VERSION(2,18,0) - G_GNUC_INTERNAL void gtk_widget_get_allocation(GtkWidget *widget,GtkAllocation *allocation); -#endif // !GTK(2,18) - -#if ! GTK_CHECK_VERSION(2,20,0) - #define gtk_widget_get_realized(w) GTK_WIDGET_REALIZED(w) - #define gtk_widget_set_realized(w,r) if(r) { GTK_WIDGET_SET_FLAGS(w,GTK_REALIZED); } else { GTK_WIDGET_UNSET_FLAGS(w,GTK_REALIZED); } -#endif // !GTK(2,20) - -#if ! GTK_CHECK_VERSION(2,22,0) - #define gtk_accessible_set_widget(a,w) g_object_set_data(G_OBJECT(a),"widget",w) - #define gtk_accessible_get_widget(a) GTK_WIDGET(g_object_get_data(G_OBJECT(a),"widget")) - - G_GNUC_INTERNAL cairo_surface_t * gdk_window_create_similar_surface(GdkWindow *window, cairo_content_t content, int width, int height); - -#endif // !GTK(2,22) - - -#if ! GTK_CHECK_VERSION(3,0,0) -gboolean v3270_expose(GtkWidget * widget, GdkEventExpose *event); -#endif // GTK 3 - -G_GNUC_INTERNAL void v3270_draw_shift_status(v3270 *terminal); -G_GNUC_INTERNAL void v3270_draw_alt_status(v3270 *terminal); -G_GNUC_INTERNAL void v3270_draw_ins_status(v3270 *terminal); - -G_GNUC_INTERNAL void v3270_clear_clipboard(v3270 *terminal); - -G_GNUC_INTERNAL void v3270_update_cursor_surface(v3270 *widget,unsigned char chr,unsigned short attr); - -G_GNUC_INTERNAL void v3270_register_io_handlers(v3270Class *cls); - -G_GNUC_INTERNAL void v3270_draw_char(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 *session, v3270FontInfo *font, GdkRectangle *rect, GdkRGBA *fg, GdkRGBA *bg); -G_GNUC_INTERNAL void v3270_draw_text(cairo_t *cr, const GdkRectangle *rect, v3270FontInfo *font, const char *str); -G_GNUC_INTERNAL void v3270_draw_text_at(cairo_t *cr, int x, int y, v3270FontInfo *font, const char *str); - -G_GNUC_INTERNAL void v3270_start_timer(GtkWidget *terminal); -G_GNUC_INTERNAL void v3270_stop_timer(GtkWidget *terminal); - -G_GNUC_INTERNAL void v3270_draw_connection(cairo_t *cr, H3270 *host, v3270FontInfo *metrics, GdkRGBA *color, const GdkRectangle *rect); - -G_GNUC_INTERNAL void v3270_draw_ssl_status(v3270 *widget, cairo_t *cr, GdkRectangle *rect); - -G_GNUC_INTERNAL void v3270_update_char(H3270 *session, int addr, unsigned char chr, unsigned short attr, unsigned char cursor); - -G_GNUC_INTERNAL void v3270_update_font_metrics(v3270 *terminal, cairo_t *cr, unsigned int width, unsigned int height); - -G_GNUC_INTERNAL void v3270_update_cursor_rect(v3270 *widget, GdkRectangle *rect, unsigned char chr, unsigned short attr); - -G_GNUC_INTERNAL void v3270_update_message(v3270 *widget, LIB3270_MESSAGE id); -G_GNUC_INTERNAL void v3270_update_cursor(H3270 *session, unsigned short row, unsigned short col, unsigned char c, unsigned short attr); -G_GNUC_INTERNAL void v3270_update_oia(v3270 *terminal, LIB3270_FLAG id, unsigned char on); - -G_GNUC_INTERNAL void v3270_blink_ssl(v3270 *terminal); - -G_GNUC_INTERNAL void v3270_update_luname(GtkWidget *widget,const gchar *name); -G_GNUC_INTERNAL void v3270_init_properties(GObjectClass * gobject_class); -G_GNUC_INTERNAL void v3270_queue_draw_area(GtkWidget *widget, gint x, gint y, gint width, gint height); - -G_GNUC_INTERNAL void v3270_disable_updates(GtkWidget *widget); -G_GNUC_INTERNAL void v3270_enable_updates(GtkWidget *widget); - -// Keyboard & Mouse -G_GNUC_INTERNAL gboolean v3270_key_press_event(GtkWidget *widget, GdkEventKey *event); -G_GNUC_INTERNAL gboolean v3270_key_release_event(GtkWidget *widget, GdkEventKey *event); -G_GNUC_INTERNAL void v3270_key_commit(GtkIMContext *imcontext, gchar *str, v3270 *widget); -G_GNUC_INTERNAL gboolean v3270_button_press_event(GtkWidget *widget, GdkEventButton *event); -G_GNUC_INTERNAL gboolean v3270_button_release_event(GtkWidget *widget, GdkEventButton*event); -G_GNUC_INTERNAL gboolean v3270_motion_notify_event(GtkWidget *widget, GdkEventMotion *event); -G_GNUC_INTERNAL void v3270_emit_popup(v3270 *widget, int baddr, GdkEventButton *event); -G_GNUC_INTERNAL gint v3270_get_offset_at_point(v3270 *widget, gint x, gint y); -G_GNUC_INTERNAL gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event); - -// I/O Callbacks -G_GNUC_INTERNAL GSource * IO_source_new(H3270 *session, int fd, LIB3270_IO_FLAG flag, void(*call)(H3270 *, int, LIB3270_IO_FLAG, void *), void *userdata); -G_GNUC_INTERNAL void IO_source_set_state(GSource *source, gboolean enable); -*/ - G_END_DECLS diff --git a/src/terminal/properties.c b/src/terminal/properties.c index d1f893f..194f346 100644 --- a/src/terminal/properties.c +++ b/src/terminal/properties.c @@ -191,6 +191,7 @@ { size_t ix; GParamSpec * spec; + v3270Class * klass = GTK_V3270_CLASS(gobject_class); debug("%s",__FUNCTION__); @@ -198,21 +199,21 @@ gobject_class->set_property = v3270_set_property; gobject_class->get_property = v3270_get_property; - v3270_properties.count = PROP_BEGIN; + klass->properties.count = PROP_BEGIN; // Setup internal properties. - v3270_properties.font_family = g_param_spec_string( - "font_family", - "font_family", - _("Font family for terminal contents"), - FALSE, - G_PARAM_READABLE|G_PARAM_WRITABLE - ); + klass->properties.font_family = g_param_spec_string( + "font_family", + "font_family", + _("Font family for terminal contents"), + FALSE, + G_PARAM_READABLE|G_PARAM_WRITABLE + ); g_object_class_install_property( gobject_class, - v3270_properties.count++, - v3270_properties.font_family + klass->properties.count++, + klass->properties.font_family ); // @@ -220,7 +221,7 @@ // // Extract toggle class. - v3270_properties.type.toggle = v3270_properties.count; + v3270_properties.type.toggle = klass->properties.count; for(ix = 0; ix < LIB3270_TOGGLE_COUNT; ix++) { debug("Property %u=%s (Toggle)",(unsigned int) v3270_properties.type.toggle + ix, lib3270_get_toggle_name(ix)); @@ -234,12 +235,12 @@ G_PARAM_WRITABLE|G_PARAM_READABLE ); - v3270_install_property(gobject_class, v3270_properties.count++, v3270_properties.toggle[ix]); + v3270_install_property(gobject_class, klass->properties.count++, v3270_properties.toggle[ix]); } // Creating boolean properties. - v3270_properties.type.boolean = v3270_properties.count; + v3270_properties.type.boolean = klass->properties.count; const LIB3270_INT_PROPERTY * bool_props = lib3270_get_boolean_properties_list(); for(ix = 0; bool_props[ix].name; ix++) @@ -253,13 +254,13 @@ (bool_props[ix].set == NULL ? G_PARAM_READABLE : (G_PARAM_READABLE|G_PARAM_WRITABLE)) ); - v3270_install_property(gobject_class, v3270_properties.count++, spec); + v3270_install_property(gobject_class, klass->properties.count++, spec); } // Creating integer properties. const LIB3270_INT_PROPERTY * int_props = lib3270_get_int_properties_list(); - v3270_properties.type.integer = v3270_properties.count; + v3270_properties.type.integer = klass->properties.count; for(ix = 0; int_props[ix].name; ix++) { @@ -274,19 +275,19 @@ 0, // Default (int_props[ix].set == NULL ? G_PARAM_READABLE : (G_PARAM_READABLE|G_PARAM_WRITABLE)) ); - debug("Creating %u properties", (unsigned int) v3270_properties.count); + debug("Creating %u properties", (unsigned int) klass->properties.count); - v3270_install_property(gobject_class, v3270_properties.count++, spec); + v3270_install_property(gobject_class, klass->properties.count++, spec); } // Creating string properties. const LIB3270_STRING_PROPERTY * str_props = lib3270_get_string_properties_list(); - v3270_properties.type.str = v3270_properties.count; + v3270_properties.type.str = klass->properties.count; for(ix = 0; str_props[ix].name; ix++) { @@ -301,7 +302,7 @@ (str_props[ix].set == NULL ? G_PARAM_READABLE : (G_PARAM_READABLE|G_PARAM_WRITABLE)) ); - v3270_install_property(gobject_class, v3270_properties.count++, spec); + v3270_install_property(gobject_class, klass->properties.count++, spec); } diff --git a/src/terminal/selection.c b/src/terminal/selection.c index 34ac8a7..82dc871 100644 --- a/src/terminal/selection.c +++ b/src/terminal/selection.c @@ -133,7 +133,7 @@ static const char * update_selected_text(GtkWidget *widget, gboolean cut) if(!text) { - g_signal_emit(widget,v3270_widget_signal[SIGNAL_CLIPBOARD], 0, FALSE); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_CLIPBOARD], 0, FALSE); lib3270_ring_bell(terminal->host); return NULL; } @@ -267,7 +267,7 @@ LIB3270_EXPORT void v3270_set_copy(GtkWidget *widget, const gchar *text) if(!text) { /* No string, signal clipboard clear and return */ - g_signal_emit(widget,v3270_widget_signal[SIGNAL_CLIPBOARD], 0, FALSE); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_CLIPBOARD], 0, FALSE); return; } @@ -278,7 +278,7 @@ LIB3270_EXPORT void v3270_set_copy(GtkWidget *widget, const gchar *text) if(!isotext) { /* No string, signal clipboard clear and return */ - g_signal_emit(widget,v3270_widget_signal[SIGNAL_CLIPBOARD], 0, FALSE); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_CLIPBOARD], 0, FALSE); return; } @@ -286,7 +286,7 @@ LIB3270_EXPORT void v3270_set_copy(GtkWidget *widget, const gchar *text) g_free(isotext); - g_signal_emit(widget,v3270_widget_signal[SIGNAL_CLIPBOARD], 0, TRUE); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_CLIPBOARD], 0, TRUE); } static void update_system_clipboard(GtkWidget *widget) @@ -306,7 +306,7 @@ static void update_system_clipboard(GtkWidget *widget) gtk_clipboard_set_can_store(clipboard,targets,1); } - g_signal_emit(widget,v3270_widget_signal[SIGNAL_CLIPBOARD], 0, TRUE); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_CLIPBOARD], 0, TRUE); } } @@ -506,7 +506,7 @@ LIB3270_EXPORT void v3270_paste_string(GtkWidget *widget, const gchar *text, con } else { - g_signal_emit(widget,v3270_widget_signal[SIGNAL_PASTENEXT], 0, FALSE); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_PASTENEXT], 0, FALSE); return; } @@ -514,7 +514,7 @@ LIB3270_EXPORT void v3270_paste_string(GtkWidget *widget, const gchar *text, con g_free(buffer); - g_signal_emit(widget,v3270_widget_signal[SIGNAL_PASTENEXT], 0, next); + g_signal_emit(widget,v3270_widget_signal[V3270_SIGNAL_PASTENEXT], 0, next); } diff --git a/src/terminal/widget.c b/src/terminal/widget.c index 0f72e3c..b7d2615 100644 --- a/src/terminal/widget.c +++ b/src/terminal/widget.c @@ -63,7 +63,7 @@ /*--[ Globals ]--------------------------------------------------------------------------------------*/ - guint v3270_widget_signal[V3270_LAST_SIGNAL] = { 0 }; + guint v3270_widget_signal[V3270_SIGNAL_LAST] = { 0 }; GdkCursor * v3270_cursor[LIB3270_POINTER_COUNT] = { 0 }; /*--[ Prototipes ]-----------------------------------------------------------------------------------*/ @@ -354,7 +354,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID, G_TYPE_NONE, 0); - v3270_widget_signal[SIGNAL_TOGGLE_CHANGED] = + v3270_widget_signal[V3270_SIGNAL_TOGGLE_CHANGED] = g_signal_new( "toggle_changed", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -363,7 +363,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_ENUM_BOOLEAN_POINTER, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_STRING); - v3270_widget_signal[SIGNAL_MESSAGE_CHANGED] = + v3270_widget_signal[V3270_SIGNAL_MESSAGE_CHANGED] = g_signal_new( "message_changed", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -372,7 +372,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_ENUM, G_TYPE_NONE, 1, G_TYPE_UINT); - v3270_widget_signal[SIGNAL_KEYPRESS] = + v3270_widget_signal[V3270_SIGNAL_KEYPRESS] = g_signal_new( "keypress", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -381,7 +381,7 @@ static void v3270_class_init(v3270Class *klass) v3270_BOOLEAN__UINT_ENUM, G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT); - v3270_widget_signal[SIGNAL_CONNECTED] = + v3270_widget_signal[V3270_SIGNAL_CONNECTED] = g_signal_new( "connected", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -390,7 +390,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_STRING); - v3270_widget_signal[SIGNAL_DISCONNECTED] = + v3270_widget_signal[V3270_SIGNAL_DISCONNECTED] = g_signal_new( "disconnected", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -399,7 +399,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID, G_TYPE_NONE, 0); - v3270_widget_signal[SIGNAL_SESSION_CHANGED] = + v3270_widget_signal[V3270_SIGNAL_SESSION_CHANGED] = g_signal_new( "session_changed", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -408,7 +408,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID, G_TYPE_NONE, 0); - v3270_widget_signal[SIGNAL_UPDATE_CONFIG] = + v3270_widget_signal[V3270_SIGNAL_UPDATE_CONFIG] = g_signal_new( "update_config", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -417,7 +417,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); - v3270_widget_signal[SIGNAL_MODEL_CHANGED] = + v3270_widget_signal[V3270_SIGNAL_MODEL_CHANGED] = g_signal_new( "model_changed", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -426,7 +426,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_UINT_POINTER, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); - v3270_widget_signal[SIGNAL_SELECTING] = + v3270_widget_signal[V3270_SIGNAL_SELECTING] = g_signal_new( "selecting", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -435,7 +435,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - v3270_widget_signal[SIGNAL_POPUP] = + v3270_widget_signal[V3270_SIGNAL_POPUP] = g_signal_new( "popup", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -444,7 +444,7 @@ static void v3270_class_init(v3270Class *klass) v3270_BOOLEAN__VOID_BOOLEAN_BOOLEAN_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_POINTER); - v3270_widget_signal[SIGNAL_PASTENEXT] = + v3270_widget_signal[V3270_SIGNAL_PASTENEXT] = g_signal_new( "pastenext", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -453,7 +453,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - v3270_widget_signal[SIGNAL_CLIPBOARD] = + v3270_widget_signal[V3270_SIGNAL_CLIPBOARD] = g_signal_new( "has_text", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -462,7 +462,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - v3270_widget_signal[SIGNAL_CHANGED] = + v3270_widget_signal[V3270_SIGNAL_CHANGED] = g_signal_new( "changed", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -471,7 +471,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); - v3270_widget_signal[SIGNAL_MESSAGE] = + v3270_widget_signal[V3270_SIGNAL_MESSAGE] = g_signal_new( "popup_message", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -480,7 +480,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_UINT_POINTER_POINTER_POINTER, G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); - v3270_widget_signal[SIGNAL_FIELD] = + v3270_widget_signal[V3270_SIGNAL_FIELD] = g_signal_new( "field_clicked", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -490,7 +490,7 @@ static void v3270_class_init(v3270Class *klass) G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_POINTER); - v3270_widget_signal[SIGNAL_PRINT_SETUP] = + v3270_widget_signal[V3270_SIGNAL_PRINT_SETUP] = g_signal_new( "print-begin", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -499,7 +499,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER, 0); - v3270_widget_signal[SIGNAL_PRINT_APPLY] = + v3270_widget_signal[V3270_SIGNAL_PRINT_APPLY] = g_signal_new( "print-apply", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -508,7 +508,7 @@ static void v3270_class_init(v3270Class *klass) v3270_VOID__VOID_POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER, 0); - v3270_widget_signal[SIGNAL_PRINT_DONE] = + v3270_widget_signal[V3270_SIGNAL_PRINT_DONE] = g_signal_new( "print-done", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, @@ -992,7 +992,7 @@ LIB3270_EXPORT void v3270_set_session_name(GtkWidget *widget, const gchar *name) debug("New session name is \"%s\"",GTK_V3270(widget)->session_name); - g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[SIGNAL_SESSION_CHANGED], 0); + g_signal_emit(GTK_WIDGET(widget), v3270_widget_signal[V3270_SIGNAL_SESSION_CHANGED], 0); } -- libgit2 0.21.2