diff --git a/src/include/internals.h b/src/include/internals.h index e4c4191..b321271 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -31,6 +31,7 @@ #define V3270_INTERNALS_H_INCLUDED 1 + #include #include #include #include @@ -88,6 +89,92 @@ #endif //! GTK 3.16 - G_END_DECLS + 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 #endif // V3270_INTERNALS_H_INCLUDED diff --git a/src/include/v3270.h b/src/include/v3270.h index 9c50fa9..8c62d4d 100644 --- a/src/include/v3270.h +++ b/src/include/v3270.h @@ -180,7 +180,6 @@ LIB3270_EXPORT void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes); LIB3270_EXPORT guint v3270_get_auto_disconnect(GtkWidget *widget); - // Clipboard typedef enum _v3270_select_format { diff --git a/src/terminal/accessible.c b/src/terminal/accessible.c index d29cd22..452b05b 100644 --- a/src/terminal/accessible.c +++ b/src/terminal/accessible.c @@ -39,6 +39,7 @@ #include #include #include + #include #include "private.h" #include diff --git a/src/terminal/blink.c b/src/terminal/blink.c index f8c88d1..a1a5557 100644 --- a/src/terminal/blink.c +++ b/src/terminal/blink.c @@ -29,6 +29,7 @@ #include #include "private.h" + #include /*--[ Implement ]------------------------------------------------------------------------------------*/ diff --git a/src/terminal/callbacks.c b/src/terminal/callbacks.c index 455b833..25fa28c 100644 --- a/src/terminal/callbacks.c +++ b/src/terminal/callbacks.c @@ -34,6 +34,7 @@ #endif // _WIN32 #include "private.h" + #include #include #include diff --git a/src/terminal/draw.c b/src/terminal/draw.c index c7c6c15..fee3c6c 100644 --- a/src/terminal/draw.c +++ b/src/terminal/draw.c @@ -39,6 +39,7 @@ #include #include #include + #include #include #include "private.h" diff --git a/src/terminal/iocallback.c b/src/terminal/iocallback.c index 66238b5..9ed8ced 100644 --- a/src/terminal/iocallback.c +++ b/src/terminal/iocallback.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "private.h" static void * static_AddSource(H3270 *session, int fd, LIB3270_IO_FLAG flag, void(*proc)(H3270 *, int, LIB3270_IO_FLAG, void *), void *userdata); diff --git a/src/terminal/keyboard.c b/src/terminal/keyboard.c index 57b0ec4..85f4d55 100644 --- a/src/terminal/keyboard.c +++ b/src/terminal/keyboard.c @@ -38,6 +38,7 @@ #include #include + #include #include "private.h" #if GTK_CHECK_VERSION(3,0,0) diff --git a/src/terminal/linux/iosource.c b/src/terminal/linux/iosource.c index 79202ea..c057c8d 100644 --- a/src/terminal/linux/iosource.c +++ b/src/terminal/linux/iosource.c @@ -31,6 +31,7 @@ #include #include #include + #include #include "../private.h" /*---[ Structs ]-------------------------------------------------------------------------------------------*/ diff --git a/src/terminal/mouse.c b/src/terminal/mouse.c index b0c712a..bd84e6c 100644 --- a/src/terminal/mouse.c +++ b/src/terminal/mouse.c @@ -32,6 +32,7 @@ #include #include #include "private.h" + #include #include #include #include diff --git a/src/terminal/oia.c b/src/terminal/oia.c index d29e722..bdb6485 100644 --- a/src/terminal/oia.c +++ b/src/terminal/oia.c @@ -56,6 +56,7 @@ #include #include "private.h" + #include #include /*--[ Prototipes ]-----------------------------------------------------------------------------------*/ diff --git a/src/terminal/private.h b/src/terminal/private.h index e082065..c1c1dcd 100644 --- a/src/terminal/private.h +++ b/src/terminal/private.h @@ -182,44 +182,8 @@ G_BEGIN_DECLS GSource * timer; /**< @brief Timer source. */ } blink; - /* - // Scripting - struct - { - int blink : 1; - gchar id; ///< Script indicator - GSource * timer; - } script; - */ - }; -/*--[ Properties ]-----------------------------------------------------------------------------------*/ - - /* - enum - { - PROP_0, - - // Construct - PROP_TYPE, - - // Widget properties - PROP_ONLINE, - PROP_SELECTION, - PROP_MODEL, - PROP_LUNAME, - PROP_AUTO_DISCONNECT, - PROP_URL, - PROP_SESSION_NAME, - - // Toggles - always the last one, the real values are PROP_TOGGLE+LIB3270_TOGGLE - PROP_TOGGLE - }; - - #define PROP_LAST (PROP_TOGGLE+LIB3270_TOGGLE_COUNT) - */ - /*--[ Globals ]--------------------------------------------------------------------------------------*/ G_GNUC_INTERNAL guint v3270_widget_signal[V3270_LAST_SIGNAL]; @@ -260,6 +224,7 @@ G_BEGIN_DECLS /*--[ Prototipes ]-----------------------------------------------------------------------------------*/ +/* const GtkWidgetClass * v3270_get_parent_class(void); G_GNUC_INTERNAL gboolean v3270_draw(GtkWidget * widget, cairo_t * cr); @@ -346,5 +311,6 @@ G_GNUC_INTERNAL gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll * // 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/selection.c b/src/terminal/selection.c index 7138568..34ac8a7 100644 --- a/src/terminal/selection.c +++ b/src/terminal/selection.c @@ -31,6 +31,7 @@ #include #include #include "private.h" + #include #include #include #include -- libgit2 0.21.2