diff options
| author | TingPing <tingping@tingping.se> | 2013-09-27 17:42:38 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-09-27 17:42:38 -0400 |
| commit | 54657908862578d89c398d87271600b765f96596 (patch) | |
| tree | 25c4b5922239698afe5212ae1bfe3768a0d233f5 /src/fe-gtk/fe-gtk.c | |
| parent | 960ded7db4f5896690b62130884705b67bd3e940 (diff) | |
| parent | 958f4099f12841110282ab3e5e220c698a56ca19 (diff) | |
Merge branch 'xtext2'
Diffstat (limited to 'src/fe-gtk/fe-gtk.c')
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 5f811339..7fce696c 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -52,10 +52,6 @@ #include "urlgrab.h" #include "setup.h" -#ifdef USE_XLIB -#include <gdk/gdkx.h> -#endif - #ifdef USE_LIBCANBERRA #include <canberra.h> #endif @@ -66,49 +62,6 @@ GdkPixmap *channelwin_pix; static ca_context *ca_con; #endif -#ifdef USE_XLIB - -static void -redraw_trans_xtexts (void) -{ - GSList *list = sess_list; - session *sess; - int done_main = FALSE; - - while (list) - { - sess = list->data; - if (GTK_XTEXT (sess->gui->xtext)->transparent) - { - if (!sess->gui->is_tab || !done_main) - gtk_xtext_refresh (GTK_XTEXT (sess->gui->xtext), 1); - if (sess->gui->is_tab) - done_main = TRUE; - } - list = list->next; - } -} - -static GdkFilterReturn -root_event_cb (GdkXEvent *xev, GdkEventProperty *event, gpointer data) -{ - static Atom at = None; - XEvent *xevent = (XEvent *)xev; - - if (xevent->type == PropertyNotify) - { - if (at == None) - at = XInternAtom (xevent->xproperty.display, "_XROOTPMAP_ID", True); - - if (at == xevent->xproperty.atom) - redraw_trans_xtexts (); - } - - return GDK_FILTER_CONTINUE; -} - -#endif - /* === command-line parameter parsing : requires glib 2.6 === */ static char *arg_cfgdir = NULL; @@ -281,11 +234,6 @@ fe_args (int argc, char *argv[]) gtk_init (&argc, &argv); -#ifdef USE_XLIB - gdk_window_set_events (gdk_get_default_root_window (), GDK_PROPERTY_CHANGE_MASK); - gdk_window_add_filter (gdk_get_default_root_window (), (GdkFilterFunc)root_event_cb, NULL); -#endif - return -1; } |