dwindows: gtk3/dw.c comparison

comparison gtk3/dw.c @ 782:5a4bfe989f50

Most of the dw_container_* functions now implemented but many untested. Some signal handler work still required but things looking good.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 21 Mar 2011 07:19:33 +0000
parents	df6091308b3f
children	9ef49898a5e6

comparison

equal deleted inserted replaced

-:df6091308b3f
+:5a4bfe989f50
 return retval;
 }
 static gint _tree_select_event(GtkTreeSelection *sel, gpointer data)
 {
-GtkWidget *item, *widget = (GtkWidget *)gtk_tree_selection_get_tree_view(sel);
+GtkWidget *item = NULL, *widget = (GtkWidget *)gtk_tree_selection_get_tree_view(sel);
 int retval = FALSE;
 if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__);
 if(widget)
 {
 int (*treeselectfunc)(HWND, HTREEITEM, char *, void *, void *) = work.func;
 GtkTreeIter iter;
 char *text = NULL;
 void *itemdata = NULL;
-if(gtk_tree_selection_get_selected(sel, NULL, &iter))
+if(gtk_tree_selection_get_mode(sel) != GTK_SELECTION_MULTIPLE &&
+gtk_tree_selection_get_selected(sel, NULL, &iter))
 {
 GtkTreeModel *store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
-gtk_tree_model_get(store, &iter, 0, &text, 2, &itemdata, 3, &item, -1);
+if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
+{
+gtk_tree_model_get(store, &iter, 0, &text, 2, &itemdata, 3, &item, -1);
+}
+else
+{
+gtk_tree_model_get(store, &iter, 0, &text, -1);
+}
 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
 }
 }
 }
 return retval;
 PangoContext *pcontext;
 GtkWidget *handle2 = handle;
 char *font;
 char *retfont=NULL;
 int _locked_by_me = FALSE;
-gpointer data;
 DW_MUTEX_LOCK;
 if(GTK_IS_SCROLLED_WINDOW(handle))
 {
 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
 if(tmp)
 handle2 = tmp;
 }
-#if 0
-/* Free old font name if one is allocated */
-data = g_object_get_data(G_OBJECT(handle2), "_dw_fontname");
-if(data)
-free(data);
-g_object_set_data(G_OBJECT(handle2), "_dw_fontname", (gpointer)font);
-#endif
 pcontext = gtk_widget_get_pango_context( handle2 );
 if ( pcontext )
 {
 pfont = pango_context_get_font_description( pcontext );
 HWND dw_menu_append_item(HMENUI menu, char *title, unsigned long id, unsigned long flags, int end, int check, HMENUI submenu)
 {
 GtkWidget *tmphandle;
 char accel, *tempbuf = malloc(strlen(title)+1);
 int _locked_by_me = FALSE, submenucount;
-guint tmp_key;
 GtkAccelGroup *accel_group;
 if (!menu)
 {
 free(tempbuf);
 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col);
 }
 /* Finish up */
 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), TRUE);
+gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(tree), TRUE);
+gtk_tree_view_set_rubber_banding(GTK_TREE_VIEW(tree), TRUE);
 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
 if(g_object_get_data(G_OBJECT(handle), "_dw_multi_sel"))
 {
 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
 }
 {
 int _locked_by_me = FALSE;
 char *file;
 FILE *fp;
 GdkPixbuf *pixbuf;
-unsigned long z, ret = 0;
+unsigned long ret = 0;
 /*
 * A real hack; create a temporary file and write the contents
 * of the data to the file
 */
 *          row: Zero based row of data being set.
 *          title: String title of the item.
 */
 void dw_container_set_row_title(void *pointer, int row, char *title)
 {
+GtkWidget *cont = pointer;
+GtkListStore *store = NULL;
+int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
+if(store)
+{
+GtkTreeIter iter;
+if(pointer)
+{
+row += (int)g_object_get_data(G_OBJECT(cont), "_dw_insertpos");
+}
+if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row))
+{
+gtk_list_store_set(store, &iter, 0, (gpointer)title, -1);
+}
+}
+DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the title of a row in the container.
 * Parameters:
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 *          rowcount: The number of rows to be inserted.
 */
 void dw_container_insert(HWND handle, void *pointer, int rowcount)
 {
+/* Don't need to do anything here */
 }
 /*
 * Removes the first x rows from a container.
 * Parameters:
 *       handle: Handle to the window (widget) to be deleted from.
 *       rowcount: The number of rows to be deleted.
 */
 void dw_container_delete(HWND handle, int rowcount)
 {
+GtkWidget *cont;
+GtkListStore *store = NULL;
+int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
+if(store)
+{
+GtkTreeIter iter;
+int rows, z;
+rows = (int)g_object_get_data(G_OBJECT(cont), "_dw_rowcount");
+for(z=0;z<rowcount;z++)
+{
+if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
+gtk_list_store_remove(store, &iter);
+}
+if(rows - rowcount < 0)
+rows = 0;
+else
+rows -= rowcount;
+g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
+}
+DW_MUTEX_UNLOCK;
 }
 /*
 * Removes all rows from a container.
 * Parameters:
 *       handle: Handle to the window (widget) to be cleared.
 *       redraw: TRUE to cause the container to redraw immediately.
 */
 void dw_container_clear(HWND handle, int redraw)
 {
+GtkWidget *cont;
+GtkListStore *store = NULL;
+int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
+if(store)
+{
+g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(0));
+g_object_set_data(G_OBJECT(cont), "_dw_insertpos", GINT_TO_POINTER(0));
+gtk_list_store_clear(store);
+}
+DW_MUTEX_UNLOCK;
 }
 /*
 * Scrolls container up or down.
 * Parameters:
 *              return items that are currently selected.  Otherwise
 *              it will return all records in the container.
 */
 char *dw_container_query_start(HWND handle, unsigned long flags)
 {
+GtkWidget *cont;
+GtkListStore *store = NULL;
 char *retval = NULL;
 int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
+if(store)
+{
+/* These should be separate but right now this will work */
+if(flags & DW_CRA_SELECTED)
+{
+GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
+GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
+if(list)
+{
+GtkTreePath *path = g_list_nth_data(list, 0);
+if(path)
+{
+gint *indices = gtk_tree_path_get_indices(path);
+if(indices)
+{
+GtkTreeIter iter;
+if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
+{
+gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &retval, -1);
+g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
+}
+}
+}
+g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
+g_list_free(list);
+}
+}
+else if(flags & DW_CRA_CURSORED)
+{
+GtkTreePath *path;
+gtk_tree_view_get_cursor(GTK_TREE_VIEW(cont), &path, NULL);
+if(path)
+{
+GtkTreeIter iter;
+if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
+{
+gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &retval, -1);
+}
+gtk_tree_path_free(path);
+}
+}
+else
+{
+GtkTreeIter iter;
+if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
+{
+gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &retval, -1);
+g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
+}
+}
+}
+DW_MUTEX_UNLOCK;
 return retval;
 }
 /*
 * Continues an existing query of a container.
 *              return items that are currently selected.  Otherwise
 *              it will return all records in the container.
 */
 char *dw_container_query_next(HWND handle, unsigned long flags)
 {
+GtkWidget *cont;
+GtkListStore *store = NULL;
 char *retval = NULL;
 int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
+if(store)
+{
+int pos = (int)g_object_get_data(G_OBJECT(cont), "_dw_querypos");
+int count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
+/* These should be separate but right now this will work */
+if(flags & DW_CRA_SELECTED)
+{
+GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
+GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
+if(list)
+{
+GtkTreePath *path = g_list_nth_data(list, pos);
+if(path)
+{
+gint *indices = gtk_tree_path_get_indices(path);
+if(indices)
+{
+GtkTreeIter iter;
+if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
+{
+gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &retval, -1);
+g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
+}
+}
+}
+g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
+g_list_free(list);
+}
+}
+else if(flags & DW_CRA_CURSORED)
+{
+/* There will only be one item cursored,
+* retrieve it with dw_container_query_start()
+*/
+retval = NULL;
+}
+else
+{
+GtkTreeIter iter;
+if(pos < count && gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, pos))
+{
+gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &retval, -1);
+g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
+}
+}
+}
+DW_MUTEX_UNLOCK;
 return retval;
+}
+int _find_iter(GtkListStore *store, GtkTreeIter *iter, char *text)
+{
+int z, rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
+char *thistext;
+for(z=0;z<rows;z++)
+{
+if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), iter, NULL, z))
+{
+gtk_tree_model_get(GTK_TREE_MODEL(store), iter, 0, &thistext, -1);
+if(thistext == text)
+{
+return TRUE;
+}
+}
+}
+return FALSE;
 }
 /*
 * Cursors the item with the text speficied, and scrolls to that item.
 * Parameters:
 *       handle: Handle to the window (widget) to be queried.
 *       text:  Text usually returned by dw_container_query().
 */
 void dw_container_cursor(HWND handle, char *text)
 {
+GtkWidget *cont;
+GtkListStore *store = NULL;
+int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
+if(store)
+{
+GtkTreeIter iter;
+if(_find_iter(store, &iter, text))
+{
+GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
+if(path)
+{
+gtk_tree_view_row_activated(GTK_TREE_VIEW(cont), path, NULL);
+gtk_tree_path_free(path);
+}
+}
+}
+DW_MUTEX_UNLOCK;
 }
 /*
 * Deletes the item with the text speficied.
 * Parameters:
 *       handle: Handle to the window (widget).
 *       text:  Text usually returned by dw_container_query().
 */
 void dw_container_delete_row(HWND handle, char *text)
 {
+GtkWidget *cont;
+GtkListStore *store = NULL;
+int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
+if(store)
+{
+GtkTreeIter iter;
+int rows = (int)g_object_get_data(G_OBJECT(cont), "_dw_rowcount");
+if(_find_iter(store, &iter, text))
+{
+gtk_list_store_remove(store, &iter);
+rows--;
+}
+g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
+}
+DW_MUTEX_UNLOCK;
 }
 /*
 * Optimizes the column widths so that all data is visible.
 * Parameters:
 *       handle: Handle to the window (widget) to be optimized.
 */
 void dw_container_optimize(HWND handle)
 {
+GtkWidget *cont;
+int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
+/* Make sure it is the correct tree type */
+if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
+gtk_tree_view_columns_autosize(GTK_TREE_VIEW(cont));
+DW_MUTEX_UNLOCK;
 }
 /*
 * Inserts an icon into the taskbar.
 * Parameters:

Mercurial > dwindows

comparison gtk3/dw.c @ 782:5a4bfe989f50