# include <config.h>
#endif
+#include <limits.h> // for PATH_MAX
+#include <stdlib.h>
+
#include <gtk/gtk.h>
#include "callbacks.h"
#include <lttvwindow/menu.h>
#include <lttvwindow/toolbar.h>
#include <lttvwindow/lttvwindow.h>
+#include <lttvwindow/lttvwindowtraces.h>
#include <lttvwindow/gtkdirsel.h>
#include <lttvwindow/lttvfilter.h>
-#define PATH_LENGTH 256
+
#define DEFAULT_TIME_WIDTH_S 1
extern LttvTrace *g_init_trace ;
extern GSList * g_main_window_list;
/** MD : keep old directory. */
-static char remember_plugins_dir[PATH_LENGTH] = "";
-static char remember_trace_dir[PATH_LENGTH] = "";
+static char remember_plugins_dir[PATH_MAX] = "";
+static char remember_trace_dir[PATH_MAX] = "";
MainWindow * get_window_data_struct(GtkWidget * widget);
*
*/
+#define list_out tab->events_requests
gboolean lttvwindow_process_pending_requests(Tab *tab)
{
GtkWidget* widget;
LttvTracesetContext *tsc;
LttvTracefileContext *tfc;
- GSList *events_requests = tab->events_requests;
- GSList *list_out = events_requests;
GSList *list_in = NULL;
LttTime end_time;
guint end_nb_events;
guint count;
LttvTracesetContextPosition *end_position;
-
- /* Current tab check : if no current tab is present, no hooks to call. */
- /* (Xang Xiu) It makes the expose works.. MD:? */
if(tab == NULL)
return FALSE;
/* There is no events requests pending : we should never have been called! */
- g_assert(g_slist_length(events_requests) != 0);
+ g_assert(g_slist_length(list_out) != 0);
tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
gdk_window_stick(win);
gdk_window_unstick(win);
- g_debug("SIZE events req len : %d", g_slist_length(events_requests));
+ g_debug("SIZE events req len : %d", g_slist_length(list_out));
+
+ /* Preliminary check for no trace in traceset */
+ /* Unregister the routine if empty, empty list_out too */
+ if(lttv_traceset_number(tsc->ts) == 0) {
+
+ /* - For each req in list_out */
+ GSList *iter = list_out;
+
+ while(iter != NULL) {
+
+ gboolean remove = FALSE;
+ gboolean free_data = FALSE;
+ EventsRequest *events_request = (EventsRequest *)iter->data;
+
+ /* - Call end request for req */
+ if(events_request->servicing == TRUE)
+ lttv_hooks_call(events_request->after_request, (gpointer)tsc);
+
+ /* - remove req from list_out */
+ /* Destroy the request */
+ remove = TRUE;
+ free_data = TRUE;
+
+ /* Go to next */
+ if(remove)
+ {
+ GSList *remove_iter = iter;
+
+ iter = g_slist_next(iter);
+ if(free_data) g_free(remove_iter->data);
+ list_out = g_slist_remove_link(list_out, remove_iter);
+ } else { // not remove
+ iter = g_slist_next(iter);
+ }
+ }
+ }
/* Events processing algorithm implementation */
/* A. Servicing loop */
- while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)
- && !gtk_events_pending() ) {
+ while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) {
+ /* && !gtk_events_pending() ) */
/* 1. If list_in is empty (need a seek) */
if( g_slist_length(list_in) == 0 ) {
EventsRequest *event_request_lpos =
(EventsRequest*)iter->data;
- g_slist_append(list_in, event_request_lpos);
+ list_in = g_slist_append(list_in, event_request_lpos);
/* Remove from list_out */
- g_slist_remove(list_out, event_request_lpos);
+ list_out = g_slist_remove(list_out, event_request_lpos);
}
}
} else {
EventsRequest *event_request_ltime =
(EventsRequest*)iter->data;
- g_slist_append(list_in, event_request_ltime);
+ list_in = g_slist_append(list_in, event_request_ltime);
/* Remove from list_out */
- g_slist_remove(list_out, event_request_ltime);
+ list_out = g_slist_remove(list_out, event_request_ltime);
}
}
}
tfc = lttv_traceset_context_get_current_tfc(tsc);
g_assert(g_slist_length(list_in)>0);
EventsRequest *events_request = g_slist_nth_data(list_in, 0);
+ guint seek_count;
/* 1.2.1 If first request in list_in is a time request */
if(events_request->start_position == NULL) {
/* - If first req in list_in start time != current time */
- if(tfc != NULL && ltt_time_compare(events_request->start_time,
+ if(tfc == NULL || ltt_time_compare(events_request->start_time,
tfc->timestamp) != 0)
/* - Seek to that time */
- lttv_process_traceset_seek_time(tsc, events_request->start_time);
+ g_debug("SEEK TIME : %lu, %lu", events_request->start_time.tv_sec,
+ events_request->start_time.tv_nsec);
+ //lttv_process_traceset_seek_time(tsc, events_request->start_time);
+ lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc),
+ events_request->start_time);
+
+ /* Process the traceset with only state hooks */
+ seek_count =
+ lttv_process_traceset_middle(tsc,
+ events_request->start_time,
+ G_MAXUINT, NULL);
+
+
} else {
+ LttTime pos_time;
/* Else, the first request in list_in is a position request */
/* If first req in list_in pos != current pos */
g_assert(events_request->start_position != NULL);
+ g_debug("SEEK POS time : %lu, %lu",
+ lttv_traceset_context_position_get_time(events_request->start_position).tv_sec,
+ lttv_traceset_context_position_get_time(events_request->start_position).tv_nsec);
+
+ g_debug("SEEK POS context time : %lu, %lu",
+ lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_sec,
+ lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_nsec);
if(lttv_traceset_context_ctx_pos_compare(tsc,
events_request->start_position) != 0) {
/* 1.2.2.1 Seek to that position */
- lttv_process_traceset_seek_position(tsc, events_request->start_position);
+ g_debug("SEEK POSITION");
+ //lttv_process_traceset_seek_position(tsc, events_request->start_position);
+ pos_time = lttv_traceset_context_position_get_time(events_request->start_position);
+
+ lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc),
+ pos_time);
+
+ /* Process the traceset with only state hooks */
+ seek_count =
+ lttv_process_traceset_middle(tsc,
+ ltt_time_infinite,
+ G_MAXUINT,
+ events_request->start_position);
+
+
}
}
}
/* - begin request hooks called
* - servicing = TRUE
*/
- lttv_hooks_call(events_request->before_request, NULL);
+ lttv_hooks_call(events_request->before_request, (gpointer)tsc);
events_request->servicing = TRUE;
}
/* 1.3.2 call before chunk
}
} else {
/* 2. Else, list_in is not empty, we continue a read */
- GSList *iter = NULL;
- tfc = lttv_traceset_context_get_current_tfc(tsc);
+
+ {
+ /* 2.0 For each req of list_in */
+ GSList *iter = list_in;
- /* 2.1 For each req of list_out */
- for(iter=list_out;iter!=NULL;iter=g_slist_next(iter)) {
- EventsRequest *events_request = (EventsRequest*)iter->data;
+ while(iter != NULL) {
- /* if req.start time == current context time
- * or req.start position == current position*/
- if( ltt_time_compare(events_request->start_time,
- tfc->timestamp) == 0
- ||
- (events_request->start_position != NULL
- &&
- lttv_traceset_context_ctx_pos_compare(tsc,
- events_request->start_position) == 0)
- ) {
- /* - Add to list_in, remove from list_out */
- g_slist_append(list_in, events_request);
- g_slist_remove(list_out, events_request);
-
- /* - If !servicing */
- if(events_request->servicing == FALSE) {
- /* - begin request hooks called
- * - servicing = TRUE
- */
- lttv_hooks_call(events_request->before_request, NULL);
- events_request->servicing = TRUE;
- }
- /* call before chunk
- * events hooks added
+ EventsRequest *events_request = (EventsRequest *)iter->data;
+
+ /* - Call before chunk
+ * - events hooks added
*/
lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset,
- events_request->before_chunk_trace,
- events_request->before_chunk_tracefile,
- events_request->event,
- events_request->event_by_id);
+ events_request->before_chunk_trace,
+ events_request->before_chunk_tracefile,
+ events_request->event,
+ events_request->event_by_id);
+
+ iter = g_slist_next(iter);
+ }
+ }
+
+ {
+ GSList *iter = NULL;
+ tfc = lttv_traceset_context_get_current_tfc(tsc);
+
+ /* 2.1 For each req of list_out */
+ for(iter=list_out;iter!=NULL;iter=g_slist_next(iter)) {
+ EventsRequest *events_request = (EventsRequest*)iter->data;
+
+ /* if req.start time == current context time
+ * or req.start position == current position*/
+ if( ltt_time_compare(events_request->start_time,
+ tfc->timestamp) == 0
+ ||
+ (events_request->start_position != NULL
+ &&
+ lttv_traceset_context_ctx_pos_compare(tsc,
+ events_request->start_position) == 0)
+ ) {
+ /* - Add to list_in, remove from list_out */
+ list_in = g_slist_append(list_in, events_request);
+ list_out = g_slist_remove(list_out, events_request);
+
+ /* - If !servicing */
+ if(events_request->servicing == FALSE) {
+ /* - begin request hooks called
+ * - servicing = TRUE
+ */
+ lttv_hooks_call(events_request->before_request, (gpointer)tsc);
+ events_request->servicing = TRUE;
+ }
+ /* call before chunk
+ * events hooks added
+ */
+ lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset,
+ events_request->before_chunk_trace,
+ events_request->before_chunk_tracefile,
+ events_request->event,
+ events_request->event_by_id);
+ }
}
}
}
{
/* 4. Call process traceset middle */
+ g_critical("Calling process traceset middle with %p, %lu sec %lu nsec, %lu nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position);
count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position);
+
+ tfc = lttv_traceset_context_get_current_tfc(tsc);
+ g_critical("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec,
+ tfc->timestamp.tv_nsec);
+
}
{
/* 5. After process traceset middle */
events_request->event,
events_request->event_by_id);
/* - Call end request for req */
- lttv_hooks_call(events_request->after_request, NULL);
+ lttv_hooks_call(events_request->after_request, (gpointer)tsc);
/* - remove req from list_in */
/* Destroy the request */
}
}
}
-
{
/* 5.1 For each req in list_in */
GSList *iter = list_in;
g_assert(tfc != NULL);
/* - if req.num == 0
* or
- * current context time > req.end time
+ * current context time >= req.end time
* or
* req.end pos == current pos
* or
events_request->stop_flag == TRUE
||
ltt_time_compare(tfc->timestamp,
- events_request->end_time) > 0
+ events_request->end_time) >= 0
||
- (events_request->start_position != NULL
+ (events_request->end_position != NULL
&&
lttv_traceset_context_ctx_pos_compare(tsc,
- events_request->start_position) != 0)
+ events_request->end_position) != 0)
) {
+ g_assert(events_request->servicing == TRUE);
/* - Call end request for req
* - remove req from list_in */
- lttv_hooks_call(events_request->after_request, NULL);
+ lttv_hooks_call(events_request->after_request, (gpointer)tsc);
/* - remove req from list_in */
/* Destroy the request */
remove = TRUE;
}
}
}
+
+ if(gtk_events_pending()) break;
}
/* B. When interrupted between chunks */
EventsRequest *events_request = (EventsRequest *)iter->data;
/* 1.1. Use current postition as start position */
- g_free(events_request->start_position);
+ if(events_request->start_position != NULL)
+ lttv_traceset_context_position_destroy(events_request->start_position);
+ events_request->start_position = ltt_traceset_context_position_new();
lttv_traceset_context_position_save(tsc, events_request->start_position);
/* 1.2. Remove start time */
g_assert(g_slist_length(list_in) == 0);
+
if( g_slist_length(list_out) == 0 ) {
/* Put tab's request pending flag back to normal */
tab->events_request_pending = FALSE;
+ g_critical("remove the idle fct");
return FALSE; /* Remove the idle function */
}
+ g_critical("leave the idle fct");
return TRUE; /* Leave the idle function */
}
+#undef list_out
/* add_trace_into_traceset_selector, each instance of a viewer has an associated
LttvTraceset *traceset = tab->traceset_info->traceset;
guint i;
+ //Verify if trace is already present.
+ for(i=0; i<lttv_traceset_number(traceset); i++)
+ {
+ LttvTrace * trace = lttv_traceset_get(traceset, i);
+ if(trace == trace_v)
+ return;
+ }
+
//Keep a reference to the traces so they are not freed.
for(i=0; i<lttv_traceset_number(traceset); i++)
{
g_object_unref(tab->traceset_info->traceset_context);
lttv_traceset_add(traceset, trace_v);
+ lttv_trace_ref(trace_v); /* local ref */
/* Create new context */
tab->traceset_info->traceset_context =
LTTV_TRACESET_CONTEXT(tab->traceset_info->
traceset_context),
traceset);
+
+ /* Set the tab's time window and current time if currently 0, 0 */
+ if(tab->time_window.start_time.tv_sec == 0 &&
+ tab->time_window.start_time.tv_nsec == 0)
+ tab->time_window.start_time =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.start_time;
+ if(tab->time_window.time_width.tv_sec == 0 &&
+ tab->time_window.time_width.tv_nsec == 0) {
+ LttTime tmp_time;
+
+ if(DEFAULT_TIME_WIDTH_S <
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.end_time.tv_sec)
+ tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
+ else
+ tmp_time.tv_sec =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.end_time.tv_sec;
+ tmp_time.tv_nsec = 0;
+ tab->time_window.time_width = tmp_time ;
+ }
+ if(tab->current_time.tv_sec == 0 && tab->current_time.tv_nsec == 0) {
+ tab->current_time.tv_sec =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.start_time.tv_sec;
+ tab->current_time.tv_nsec =
+ LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+ time_span.start_time.tv_nsec;
+ }
+
+
//add state update hooks
lttv_state_add_event_hooks(
(LttvTracesetState*)tab->traceset_info->traceset_context);
LttvTrace * trace_v;
LttvTraceset * traceset;
const char * dir;
+ char abs_path[PATH_MAX];
gint id;
gint i;
MainWindow * mw_data = get_window_data_struct(widget);
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
dir = gtk_dir_selection_get_dir (file_selector);
- strncpy(remember_trace_dir, dir, PATH_LENGTH);
+ strncpy(remember_trace_dir, dir, PATH_MAX);
if(!dir || strlen(dir) == 0){
gtk_widget_destroy((GtkWidget*)file_selector);
break;
}
- trace = ltt_trace_open(dir);
- if(trace == NULL) g_critical("cannot open trace %s", dir);
- trace_v = lttv_trace_new(trace);
-
- lttvwindow_add_trace(tab, trace_v);
+ get_absolute_pathname(dir, abs_path);
+ trace_v = lttvwindowtraces_get_trace_by_name(abs_path);
+ if(trace_v == NULL) {
+ trace = ltt_trace_open(abs_path);
+ if(trace == NULL) {
+ g_warning("cannot open trace %s", abs_path);
+ } else {
+ trace_v = lttv_trace_new(trace);
+ lttvwindowtraces_add_trace(trace_v);
+ lttvwindow_add_trace(tab, trace_v);
+ }
+ } else {
+ lttvwindow_add_trace(tab, trace_v);
+ }
gtk_widget_destroy((GtkWidget*)file_selector);
trace_v = lttv_traceset_get(traceset, i);
- if(lttv_trace_get_ref_number(trace_v) <= 1)
+ if(lttv_trace_get_ref_number(trace_v) <= 2) {
+ /* ref 2 : traceset, local */
+ lttvwindowtraces_remove_trace(trace_v);
ltt_trace_close(lttv_trace(trace_v));
+ }
lttv_traceset_remove(traceset, i);
lttv_trace_unref(trace_v); // Remove local reference
}else{
if(tab){
while(tab->multi_vpaned->num_children){
- gtk_multi_vpaned_widget_delete(tab->multi_vpaned);
+ gtk_multi_vpaned_widget_delete(tab->multi_vpaned);
}
}
}
}
+/* Redraw all the viewers in the current tab */
+void redraw(GtkWidget *widget, gpointer user_data)
+{
+ GtkWidget * notebook = lookup_widget(widget, "MNotebook");
+ GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+ gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+ Tab *tab;
+ if(!page) {
+ return;
+ } else {
+ tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+ }
+
+ LttvHooks * tmp;
+ LttvAttributeValue value;
+
+ g_assert(lttv_iattribute_find_by_path(tab->attributes, "hooks/redraw", LTTV_POINTER, &value));
+
+ tmp = (LttvHooks*)*(value.v_pointer);
+ if(tmp != NULL)
+ lttv_hooks_call(tmp,NULL);
+}
+
+
+void continue_processing(GtkWidget *widget, gpointer user_data)
+{
+ GtkWidget * notebook = lookup_widget(widget, "MNotebook");
+ GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+ gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+ Tab *tab;
+ if(!page) {
+ return;
+ } else {
+ tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+ }
+
+ LttvHooks * tmp;
+ LttvAttributeValue value;
+
+ g_assert(lttv_iattribute_find_by_path(tab->attributes,
+ "hooks/continue", LTTV_POINTER, &value));
+
+ tmp = (LttvHooks*)*(value.v_pointer);
+ if(tmp != NULL)
+ lttv_hooks_call(tmp,NULL);
+}
+
+/* Stop the processing for the calling main window's current tab.
+ * It removes every processing requests that are in its list. It does not call
+ * the end request hooks, because the request is not finished.
+ */
+
+void stop_processing(GtkWidget *widget, gpointer user_data)
+{
+ GtkWidget * notebook = lookup_widget(widget, "MNotebook");
+ GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+ gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+ Tab *tab;
+ if(!page) {
+ return;
+ } else {
+ tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+ }
+ GSList *events_requests = tab->events_requests;
+
+ GSList *iter = events_requests;
+
+ while(iter != NULL) {
+ GSList *remove_iter = iter;
+ iter = g_slist_next(iter);
+
+ g_free(remove_iter->data);
+ events_requests = g_slist_remove_link(events_requests, remove_iter);
+ }
+ g_assert(g_slist_length(events_requests) == 0);
+}
+
+
/* save will save the traceset to a file
* Not implemented yet FIXME
*/
else
{
/* Center the image on the current time */
- g_critical("update is HERE");
new_time_window.start_time =
ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0));
/* If on borders, don't fall off */
*/
Tab *create_new_tab(GtkWidget* widget, gpointer user_data){
- gchar label[PATH_LENGTH];
+ gchar label[PATH_MAX];
MainWindow * mw_data = get_window_data_struct(widget);
GtkNotebook * notebook = (GtkNotebook *)lookup_widget(widget, "MNotebook");
*/
void
-on_close_tab_activate (GtkMenuItem *menuitem,
+on_close_tab_activate (GtkWidget *widget,
gpointer user_data)
{
gint page_num;
GtkWidget * notebook;
GtkWidget * page;
- MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
- notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook");
+ MainWindow * mw_data = get_window_data_struct(widget);
+ notebook = lookup_widget(widget, "MNotebook");
if(notebook == NULL){
g_printf("Notebook does not exist\n");
return;
}
+void
+on_close_tab_X_clicked (GtkWidget *widget,
+ gpointer user_data)
+{
+ gint page_num;
+ GtkWidget *notebook = lookup_widget(widget, "MNotebook");
+ if(notebook == NULL){
+ g_printf("Notebook does not exist\n");
+ return;
+ }
+
+ if((page_num = gtk_notebook_page_num(GTK_NOTEBOOK(notebook), widget)) != -1)
+ gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page_num);
+
+}
+
void
on_add_trace_activate (GtkMenuItem *menuitem,
{
char ** dir;
gint id;
- char str[PATH_LENGTH], *str1;
+ char str[PATH_MAX], *str1;
MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a module");
if(remember_plugins_dir[0] != '\0')
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
dir = gtk_file_selection_get_selections (file_selector);
- strncpy(str,dir[0],PATH_LENGTH);
- strncpy(remember_plugins_dir,dir[0],PATH_LENGTH);
+ strncpy(str,dir[0],PATH_MAX);
+ strncpy(remember_plugins_dir,dir[0],PATH_MAX);
str1 = strrchr(str,'/');
if(str1)str1++;
else{
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
dir = gtk_dir_selection_get_dir (file_selector);
- strncpy(remember_plugins_dir,dir,PATH_LENGTH);
- strncat(remember_plugins_dir,"/",PATH_LENGTH);
+ strncpy(remember_plugins_dir,dir,PATH_MAX);
+ strncat(remember_plugins_dir,"/",PATH_MAX);
lttv_library_path_add(dir);
case GTK_RESPONSE_REJECT:
case GTK_RESPONSE_CANCEL:
remove_trace((GtkWidget*)button, user_data);
}
+void
+on_button_redraw_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ redraw((GtkWidget*)button, user_data);
+}
+
+void
+on_button_continue_processing_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ continue_processing((GtkWidget*)button, user_data);
+}
+
+void
+on_button_stop_processing_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ stop_processing((GtkWidget*)button, user_data);
+}
+
+
void
on_button_save_clicked (GtkButton *button,
g_printf("Notebook does not exist\n");
return;
}
+ gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook));
//for now there is no name field in LttvTraceset structure
//Use "Traceset" as the label for the default tab
if(parent) {
trace = lttv_traceset_get(tab_instance->traceset_info->traceset, i);
ref_count = lttv_trace_get_ref_number(trace);
if(ref_count <= 1){
- ltt_trace_close(lttv_trace(trace));
- lttv_trace_destroy(trace);
+ ltt_trace_close(lttv_trace(trace));
}
- // lttv_trace_destroy(trace);
}
}
lttv_traceset_destroy(tab_instance->traceset_info->traceset);
tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new();
gtk_widget_show((GtkWidget*)tab->multi_vpaned);
tab->mw = mw;
+
+ /*{
+ // Display a label with a X
+ GtkWidget *w_hbox = gtk_hbox_new(FALSE, 4);
+ GtkWidget *w_label = gtk_label_new (label);
+ GtkWidget *pixmap = create_pixmap(GTK_WIDGET(notebook), "close.png");
+ GtkWidget *w_button = gtk_button_new ();
+ gtk_container_add(GTK_CONTAINER(w_button), pixmap);
+ //GtkWidget *w_button = gtk_button_new_with_label("x");
+
+ gtk_button_set_relief(GTK_BUTTON(w_button), GTK_RELIEF_NONE);
+
+ gtk_box_pack_start(GTK_BOX(w_hbox), w_label, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(w_hbox), w_button, FALSE,
+ FALSE, 0);
+
+ g_signal_connect_swapped (w_button, "clicked",
+ G_CALLBACK (on_close_tab_X_clicked),
+ tab->multi_vpaned);
+
+ gtk_widget_set_state(w_button, GTK_STATE_ACTIVE);
+
+ gtk_widget_show (w_label);
+ gtk_widget_show (pixmap);
+ gtk_widget_show (w_button);
+ gtk_widget_show (w_hbox);
+
+ tab->label = w_hbox;
+ }*/
+
tab->label = gtk_label_new (label);
gtk_widget_show (tab->label);
+
/* Start with empty events requests list */
tab->events_requests = NULL;
tab->events_request_pending = FALSE;
projects / lttv.git / blobdiff