X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=782acd1395232c54da35c7faa7550f6658468fc8;hb=0120992e5a32001e29b8b63a41f60ece14ef7aa6;hp=011b5fbf99ee6859f45940d1ba82ddf14452d5ee;hpb=510af770653094e2740bb693e269ae04864651f7;p=rodin%2Fchimara.git diff --git a/libchimara/window.c b/libchimara/window.c index 011b5fb..782acd1 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -170,7 +170,11 @@ winid_t glk_window_get_parent(winid_t win) { VALID_WINDOW(win, return NULL); + /* Value will also be NULL if win is the root window */ + if(win->window_node->parent == NULL) + return NULL; + return (winid_t)win->window_node->parent->data; } @@ -548,13 +552,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, /* Connect signal handlers */ /* Pager */ - /* "size-allocate"? Really? WTF, GTK? */ - g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), win ); win->pager_expose_handler = g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_on_expose), win ); g_signal_handler_block(textview, win->pager_expose_handler); win->pager_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(pager_on_key_press_event), win ); g_signal_handler_block(textview, win->pager_keypress_handler); - //g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(pager_after_insert_text), win ); GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow)); g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);