--- texlive-bin-2006.svn3816.orig/build/source/texk/xdvik/gui/search-dialog.c	2006-01-17 22:41:51.000000000 +0100
+++ texlive-bin-2006.svn3816/build/source/texk/xdvik/gui/search-dialog.c	2007-01-26 04:00:04.000000000 +0100
@@ -694,6 +694,11 @@
 #ifdef MOTIF
     XtAddCallback(searchbox_input, XmNactivateCallback, cb_search_get_term, settings);
 #endif
+
+    /* Fix for #1499566: Force input focus for text input field */
+#ifndef MOTIF
+    XtSetKeyboardFocus(find_paned, searchbox_input);
+#endif
     
     /*
      * form for left row of options checkbuttons
--- texlive-bin-2006.svn3816.orig/build/source/texk/xdvik/dvi-draw.c	2006-01-17 22:41:51.000000000 +0100
+++ texlive-bin-2006.svn3816/build/source/texk/xdvik/dvi-draw.c	2007-01-26 04:00:04.000000000 +0100
@@ -1255,6 +1255,9 @@
 	do_color_change();
     }
 #endif
+    if (pixeltbl == NULL) {
+        do_color_change();
+    }
 
     /* TODO: rounding errors causing color fringing (see HACK comment below):