--- zathura.c   2010-06-11 03:44:12.951977711 +0200
+++ myzathura.c 2010-06-11 13:27:57.218181648 +0200
@@ -149,7 +149,7 @@
 {
   struct
   {
-    GtkWindow         *window;
+    GtkWidget         *window;
     GtkBox            *box;
     GtkBox            *continuous;
     GtkScrolledWindow *view;
@@ -384,6 +384,8 @@
 /* configuration */
 #include "config.h"

+static GdkNativeWindow embed = 0;
+
 /* function implementation */
 void
 init_directories()
@@ -473,7 +475,12 @@
   Zathura.FileMonitor.file    = NULL;

   /* UI */
-  Zathura.UI.window            = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
+  if(embed) {
+    Zathura.UI.window    = gtk_plug_new(embed);
+  }
+  else
+    Zathura.UI.window    = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
   Zathura.UI.box               = GTK_BOX(gtk_vbox_new(FALSE, 0));
   Zathura.UI.continuous        = GTK_BOX(gtk_vbox_new(FALSE, 0));
   Zathura.UI.view              = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL, NULL));
@@ -485,10 +492,10 @@
   Zathura.UI.document            = gtk_event_box_new();

   /* window */
-  gtk_window_set_title(Zathura.UI.window, "zathura");
+  gtk_window_set_wmclass(GTK_WINDOW(Zathura.UI.window), Zathura.State.filename, Zathura.State.filename);
   GdkGeometry hints = { 1, 1 };
-  gtk_window_set_geometry_hints(Zathura.UI.window, NULL, &hints, GDK_HINT_MIN_SIZE);
-  gtk_window_set_default_size(Zathura.UI.window, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+  gtk_window_set_geometry_hints(GTK_WINDOW(Zathura.UI.window), NULL, &hints, GDK_HINT_MIN_SIZE);
+  gtk_window_set_default_size(GTK_WINDOW(Zathura.UI.window), DEFAULT_WIDTH, DEFAULT_HEIGHT);
   g_signal_connect(G_OBJECT(Zathura.UI.window), "destroy", G_CALLBACK(cb_destroy), NULL);

   /* box */
@@ -3647,16 +3654,32 @@

   gtk_init(&argc, &argv);

+  int i;
+  for(i = 1; i < argc && argv[i][0] == '-' &&
+      argv[i][1] != '\0' && argv[i][2] == '\0'; i++) {
+    switch(argv[i][1]) {
+      case 'e':
+        if(++i < argc)
+          embed = atoi(argv[i]);
+        break;
+      default:
+          fputs("try -e winid",stderr);
+    }
+   }
+
   init_zathura();
   init_directories();

-  if(argc >= 2)
-    open_file(argv[1], (argc == 3) ? argv[2] : NULL);
+  if(argc >= 1+i)
+    open_file(argv[i], (argc == 2+i) ? argv[1+i] : NULL);

   switch_view(Zathura.UI.document);
   update_status();

   gtk_widget_show_all(GTK_WIDGET(Zathura.UI.window));
+  gtk_widget_grab_focus(GTK_WIDGET(Zathura.UI.view));

   gdk_threads_enter();
   gtk_main();