Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into scrollbars

5 files changed, 11 insertions, 25 deletions

diff --git a/src/events.c b/src/events.c
index 174ff75..58dddfc 100644
--- a/src/events.c
+++ b/src/events.c
@@ -92,7 +92,7 @@ send_event_sockets(GPtrArray *sockets, GString *msg) {
     }
 }
 
-static void
+void
 replay_buffered_events() {
     guint i = 0;
 
@@ -205,6 +205,7 @@ void
 key_to_event(guint keyval, gint mode) {
     gchar ucs[7];
     gint ulen;
+    gchar *keyname;
     guint32 ukval = gdk_keyval_to_unicode(keyval);
 
     /* check for printable unicode char */
@@ -219,9 +220,9 @@ key_to_event(guint keyval, gint mode) {
                 NULL, TYPE_FORMATTEDSTR, ucs, NULL);
     }
     /* send keysym for non-printable chars */
-    else {
+    else if((keyname = gdk_keyval_name(keyval))){
         send_event(mode == GDK_KEY_PRESS ? KEY_PRESS : KEY_RELEASE,
-                NULL, TYPE_NAME, gdk_keyval_name(keyval), NULL);
+                NULL, TYPE_NAME, keyname , NULL);
     }
 
 }
diff --git a/src/events.h b/src/events.h
index 8e75097..bd519a6 100644
--- a/src/events.h
+++ b/src/events.h
@@ -33,10 +33,7 @@ void
 event_buffer_timeout(guint sec);
 
 void
-send_event_socket(GString *msg);
-
-void
-send_event_stdout(GString *msg);
+replay_buffered_events();
 
 void
 vsend_event(int type, const gchar *custom_event, va_list vargs);
diff --git a/src/inspector.c b/src/inspector.c
index de3dbcd..4c8c890 100644
--- a/src/inspector.c
+++ b/src/inspector.c
@@ -49,7 +49,7 @@ inspector_show_window_cb (WebKitWebInspector* inspector){
     (void) inspector;
     gtk_widget_show(uzbl.gui.inspector_window);
 
-    send_event(WEBINSPECTOR, "open", NULL);
+    send_event(WEBINSPECTOR, NULL, TYPE_NAME, "open", NULL);
     return TRUE;
 }
 
@@ -57,7 +57,7 @@ inspector_show_window_cb (WebKitWebInspector* inspector){
 gboolean
 inspector_close_window_cb (WebKitWebInspector* inspector){
     (void) inspector;
-    send_event(WEBINSPECTOR, "close", NULL);
+    send_event(WEBINSPECTOR, NULL, TYPE_NAME, "close", NULL);
     return TRUE;
 }
 
diff --git a/src/io.c b/src/io.c
index b84780e..3f8fa2f 100644
--- a/src/io.c
+++ b/src/io.c
@@ -61,7 +61,7 @@ attach_fifo(gchar *path) {
         if (g_io_add_watch(chan, G_IO_IN|G_IO_HUP, (GIOFunc) control_fifo, NULL)) {
             if (uzbl.state.verbose)
                 printf ("attach_fifo: created successfully as %s\n", path);
-            send_event(FIFO_SET, path, NULL);
+            send_event(FIFO_SET, NULL, TYPE_STR, path, NULL);
             uzbl.comm.fifo_path = path;
             g_setenv("UZBL_FIFO", uzbl.comm.fifo_path, TRUE);
             return TRUE;
@@ -216,8 +216,8 @@ init_connect_socket() {
     }
 
     /* replay buffered events */
-    if(replay)
-        send_event_socket(NULL);
+    if(replay && uzbl.state.event_buffer)
+        replay_buffered_events();
 }
 
 
@@ -287,7 +287,7 @@ attach_socket(gchar *path, struct sockaddr_un *local) {
         if( (chan = g_io_channel_unix_new(sock)) ) {
             g_io_add_watch(chan, G_IO_IN|G_IO_HUP, (GIOFunc) control_socket, chan);
             uzbl.comm.socket_path = path;
-            send_event(SOCKET_SET, path, NULL);
+            send_event(SOCKET_SET, NULL, TYPE_STR, path, NULL);
             g_setenv("UZBL_SOCKET", uzbl.comm.socket_path, TRUE);
             return TRUE;
         }
diff --git a/src/uzbl-core.h b/src/uzbl-core.h
index 91ccf65..897f68e 100644
--- a/src/uzbl-core.h
+++ b/src/uzbl-core.h
@@ -163,7 +163,6 @@ typedef struct {
     gchar*   cursive_font_family;
 
     gboolean forward_keys;
-    guint    modmask;
     guint    http_debug;
     gchar*   shell_cmd;
     guint    view_source;
@@ -190,8 +189,6 @@ typedef struct {
     gchar    *inject_html;
     guint    caret_browsing;
     guint    javascript_windows;
-    guint    mode;
-    gchar*   base_url;
     gboolean print_version;
 
     /* command list: (key)name -> (value)Command  */
@@ -202,14 +199,6 @@ typedef struct {
 } Behaviour;
 
 
-/* Javascript */
-typedef struct {
-    gboolean            initialized;
-    JSClassDefinition   classdef;
-    JSClassRef          classref;
-} Javascript;
-
-
 /* Static information */
 typedef struct {
     int     webkit_major;
@@ -228,7 +217,6 @@ typedef struct {
     Network       net;
     Behaviour     behave;
     Communication comm;
-    Javascript    js;
     Info          info;
 
     Window        xwin;