diff options
Diffstat (limited to 'src/fe-gtk/xtext.h')
| -rw-r--r-- | src/fe-gtk/xtext.h | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/src/fe-gtk/xtext.h b/src/fe-gtk/xtext.h index 32e26af6..6956092f 100644 --- a/src/fe-gtk/xtext.h +++ b/src/fe-gtk/xtext.h @@ -21,16 +21,6 @@ #define HEXCHAT_XTEXT_H #include <gtk/gtk.h> -#ifdef USE_XFT -#include <X11/Xft/Xft.h> -#endif - -#ifdef USE_SHM -#include <X11/Xlib.h> -#include <sys/ipc.h> -#include <sys/shm.h> -#include <X11/extensions/XShm.h> -#endif #define GTK_TYPE_XTEXT (gtk_xtext_get_type ()) #define GTK_XTEXT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_XTEXT, GtkXText)) @@ -132,10 +122,6 @@ struct _GtkXText xtext_buffer *orig_buffer; xtext_buffer *selection_buffer; -#ifdef USE_SHM - XShmSegmentInfo shminfo; -#endif - GtkAdjustment *adj; GdkPixmap *pixmap; /* 0 = use palette[19] */ GdkDrawable *draw_buf; /* points to ->window */ @@ -149,10 +135,6 @@ struct _GtkXText int last_win_h; int last_win_w; - int tint_red; - int tint_green; - int tint_blue; - GdkGC *bgc; /* backing pixmap */ GdkGC *fgc; /* text foreground color */ GdkGC *light_gc; /* sep bar */ @@ -188,14 +170,6 @@ struct _GtkXText guint16 fontwidth[128]; /* each char's width, only the ASCII ones */ -#ifdef USE_XFT - XftColor color[XTEXT_COLS]; - XftColor *xft_fg; - XftColor *xft_bg; /* both point into color[20] */ - XftDraw *xftdraw; - XftFont *font; - XftFont *ifont; /* italics */ -#else struct pangofont { PangoFontDescription *font; @@ -204,7 +178,6 @@ struct _GtkXText int descent; } *font, pango_font; PangoLayout *layout; -#endif int fontsize; int space_width; /* width (pixels) of the space " " character */ @@ -213,7 +186,6 @@ struct _GtkXText unsigned char scratch_buffer[4096]; - void (*error_function) (int type); int (*urlcheck_function) (GtkWidget * xtext, char *word); int jump_out_offset; /* point at which to stop rendering */ @@ -256,20 +228,15 @@ struct _GtkXText unsigned int in_hilight:1; unsigned int un_hilight:1; unsigned int recycle:1; - unsigned int avoid_trans:1; unsigned int force_render:1; - unsigned int shm:1; unsigned int color_paste:1; /* CTRL was pressed when selection finished */ /* settings/prefs */ unsigned int auto_indent:1; unsigned int thinline:1; - unsigned int transparent:1; - unsigned int shaded:1; unsigned int marker:1; unsigned int separator:1; unsigned int wordwrap:1; - unsigned int overdraw:1; unsigned int ignore_hidden:1; /* rawlog uses this */ }; @@ -286,11 +253,11 @@ void gtk_xtext_append_indent (xtext_buffer *buf, unsigned char *right_text, int right_len, time_t stamp); int gtk_xtext_set_font (GtkXText *xtext, char *name); -void gtk_xtext_set_background (GtkXText * xtext, GdkPixmap * pixmap, gboolean trans); +void gtk_xtext_set_background (GtkXText * xtext, GdkPixmap * pixmap); void gtk_xtext_set_palette (GtkXText * xtext, GdkColor palette[]); void gtk_xtext_clear (xtext_buffer *buf, int lines); void gtk_xtext_save (GtkXText * xtext, int fh); -void gtk_xtext_refresh (GtkXText * xtext, int do_trans); +void gtk_xtext_refresh (GtkXText * xtext); int gtk_xtext_lastlog (xtext_buffer *out, xtext_buffer *search_area); textentry *gtk_xtext_search (GtkXText * xtext, const gchar *text, gtk_xtext_search_flags flags, GError **err); void gtk_xtext_reset_marker_pos (GtkXText *xtext); @@ -308,7 +275,6 @@ void gtk_xtext_set_show_marker (GtkXText *xtext, gboolean show_marker); void gtk_xtext_set_show_separator (GtkXText *xtext, gboolean show_separator); void gtk_xtext_set_thin_separator (GtkXText *xtext, gboolean thin_separator); void gtk_xtext_set_time_stamp (xtext_buffer *buf, gboolean timestamp); -void gtk_xtext_set_tint (GtkXText *xtext, int tint_red, int tint_green, int tint_blue); void gtk_xtext_set_urlcheck_function (GtkXText *xtext, int (*urlcheck_function) (GtkWidget *, char *)); void gtk_xtext_set_wordwrap (GtkXText *xtext, gboolean word_wrap); |