Format the 515 error correctly.
[doldaconnect.git] / clients / gtk2 / main.c
index 66b1cce..d3c1c84 100644 (file)
@@ -33,6 +33,7 @@
 #include <regex.h>
 #include <signal.h>
 #include <time.h>
+#include <sys/time.h>
 #include <pwd.h>
 #include <locale.h>
 #include <libintl.h>
 #endif
 #include "progressbar.h"
 
+#define TRHISTSIZE 10
+
+struct trdata
+{
+    size_t poshist[TRHISTSIZE];
+    double timehist[TRHISTSIZE];
+    int hc;
+};
 
 struct fndata
 {
@@ -66,7 +75,7 @@ struct knownspeed
 };
 
 GtkWidget *inpdialog;
-GtkListStore *fnmodel, *ulmodel, *dlmodel, *pubhubmodel;
+GtkListStore *fnmodel, *ulmodel, *dlmodel, *pubhubmodel, *reslist;
 GtkTreeStore *srchmodel;
 GtkTreeModelFilter *srchmodelfilter;
 GtkTextTagTable *chattags;
@@ -84,12 +93,13 @@ int cursrch = -1, nextsrch = -1;
 time_t srcheta;
 struct srchsize *srchsizes = NULL;
 struct knownspeed *knownspeeds = NULL;
-int numsizes = 0, numspeeds = 0, ksqueryseq = -1, ksquerytag = -1;
+int numsizes = 0, numspeeds = 0, ksqueryseq = -1, ksquerytag = -1, lsrestag = -1;
 
 gboolean initdeath(GtkWidget *, gpointer);
 void cb_main_connmenu_activate(GtkWidget *widget, gpointer data);
 void cb_main_dconnmenu_activate(GtkWidget *widget, gpointer data);
 void cb_main_prefmenu_activate(GtkWidget *widget, gpointer data);
+void cb_main_lsres_activate(GtkWidget *widget, gpointer data);
 void cb_main_sdmenu_activate(GtkWidget *widget, gpointer data);
 void cb_inpdialog_entry_activate(GtkWidget *widget, gpointer data);
 void cb_main_fnaddr_activate(GtkWidget *widget, gpointer data);
@@ -104,11 +114,25 @@ void cb_main_simplesrch_changed(GtkWidget *widget, gpointer data);
 void cb_main_realsrch_changed(GtkWidget *widget, gpointer data);
 void cb_main_srchbtn_clicked(GtkWidget *widget, gpointer data);
 void cb_main_srchcanbtn_clicked(GtkWidget *widget, gpointer data);
-void cb_main_trlist_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data);
+gboolean cb_main_trlist_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data);
 void cb_main_filternoslots_toggled(GtkToggleButton *widget, gpointer data);
+void cb_main_srhash_activate(GtkWidget *widget, gpointer data);
+void cb_main_srcopy_activate(GtkWidget *widget, gpointer data);
+void cb_main_trhash_activate(GtkWidget *widget, gpointer data);
+void cb_main_trcopy_activate(GtkWidget *widget, gpointer data);
+void cb_main_trcancel_activate(GtkWidget *widget, gpointer data);
+gboolean cb_main_srpopup(GtkWidget *widget, GdkEventButton *event, gpointer data);
+gboolean cb_main_trpopup(GtkWidget *widget, GdkEventButton *event, gpointer data);
+void cb_reslist_reload_clicked(GtkWidget *widget, gpointer data);
+void cb_reslist_delete_clicked(GtkWidget *widget, gpointer data);
+void cb_reslist_search_clicked(GtkWidget *widget, gpointer data);
+void cb_reslist_list_cchange(GtkWidget *widget, gpointer data);
+void cb_reslist_list_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data);
+gboolean cb_reslist_list_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data);
 void dcfdcallback(gpointer data, gint source, GdkInputCondition condition);
 void srchstatupdate(void);
 void transnicebytefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
+void transspeedinfo(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
 void transerrorinfo(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
 void percentagefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
 void hidezerofunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data);
@@ -121,6 +145,7 @@ void speedtimefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *
 #include "mainwnd.gtk"
 #include "inpdialog.gtk"
 #include "pref.gtk"
+#include "reslist.gtk"
 
 void updatewrite(void)
 {
@@ -139,6 +164,14 @@ void updatewrite(void)
     }
 }
 
+double ntime(void)
+{
+    struct timeval tv;
+    
+    gettimeofday(&tv, NULL);
+    return((double)tv.tv_sec + ((double)tv.tv_usec / 1000000.0));
+}
+
 void fndestroycb(struct dc_fnetnode *fn)
 {
     struct fndata *data;
@@ -167,6 +200,45 @@ void addfndata(struct dc_fnetnode *fn)
     fn->udata = data;
 }
 
+void trdestroycb(struct dc_transfer *tr)
+{
+    free(tr->udata);
+}
+
+void addtrdata(struct dc_transfer *tr)
+{
+    struct trdata *data;
+    
+    if(tr->udata != NULL)
+       return;
+    tr->destroycb = trdestroycb;
+    data = smalloc(sizeof(*data));
+    memset(data, 0, sizeof(*data));
+    tr->udata = data;
+}
+
+void updatetrdata(struct dc_transfer *tr)
+{
+    int i;
+    struct trdata *data;
+    
+    data = tr->udata;
+    if(data->hc < TRHISTSIZE)
+    {
+       data->poshist[data->hc] = tr->curpos;
+       data->timehist[data->hc] = ntime();
+       data->hc++;
+    } else {
+       for(i = 0; i < TRHISTSIZE - 1; i++)
+       {
+           data->poshist[i] = data->poshist[i + 1];
+           data->timehist[i] = data->timehist[i + 1];
+       }
+       data->poshist[i] = tr->curpos;
+       data->timehist[i] = ntime();
+    }
+}
+
 char *getfnstatestock(int state)
 {
     if(state == DC_FNN_STATE_SYN)
@@ -245,6 +317,30 @@ void updatehublist(void)
     }
 }
 
+char *bytes2si(int bytes)
+{
+    int i;
+    double b;
+    char *sd;
+    static char ret[64];
+    
+    b = bytes;
+    for(i = 0; (b > 1024) && (i < 4); i++)
+       b /= 1024;
+    if(i == 0)
+       sd = "B";
+    else if(i == 1)
+       sd = "kiB";
+    else if(i == 2)
+       sd = "MiB";
+    else if(i == 3)
+       sd = "GiB";
+    else
+       sd = "TiB";
+    snprintf(ret, 64, "%.1f %s", b, sd);
+    return(ret);
+}
+
 void percentagefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
     int colnum;
@@ -264,6 +360,10 @@ void transnicebytefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeMod
     
     colnum = (int)data;
     gtk_tree_model_get(model, iter, colnum, &val, -1);
+/*
+    if(val >= 0)
+       strcpy(buf, bytes2si(val));
+*/
     if(val >= 0)
        snprintf(buf, 64, "%'i", val);
     else
@@ -306,6 +406,33 @@ void speedtimefunc(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *
     g_object_set(rend, "text", buf, NULL);
 }
 
+void transspeedinfo(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+    int id;
+    struct dc_transfer *tr;
+    struct trdata *d;
+    char buf[64];
+    int speed;
+    
+    gtk_tree_model_get(model, iter, 0, &id, -1);
+    if((tr = dc_findtransfer(id)) != NULL)
+    {
+       d = tr->udata;
+       if((tr->state != DC_TRNS_MAIN) || (d == NULL))
+       {
+           buf[0] = 0;
+       } else if(d->hc < 2) {
+           strcpy(buf, "...");
+       } else {
+           speed = (((double)(d->poshist[d->hc - 1] - d->poshist[0])) / (d->timehist[d->hc - 1] - d->timehist[0]));
+           snprintf(buf, 64, "%s/s", bytes2si(speed));
+       }
+    } else {
+       buf[0] = 0;
+    }
+    g_object_set(rend, "text", buf, NULL);
+}
+
 void transerrorinfo(GtkTreeViewColumn *col, GtkCellRenderer *rend, GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
     int error;
@@ -340,6 +467,24 @@ char *gettrstatestock(int state)
     return(NULL);
 }
 
+gint updatetransfers(gpointer data)
+{
+    struct dc_transfer *tr;
+    struct trdata *d;
+    double now;
+    
+    now = ntime();
+    for(tr = dc_transfers; tr != NULL; tr = tr->next)
+    {
+       if((d = tr->udata) != NULL)
+       {
+           if((d->hc > 0) && ((now - d->timehist[d->hc - 1]) > 2))
+               updatetrdata(tr);
+       }
+    }
+    return(TRUE);
+}
+
 void updatetransferlists(void)
 {
     int i;
@@ -348,7 +493,7 @@ void updatetransferlists(void)
     GtkTreeIter iter;
     int id;
     char *buf;
-    char *peerid, *peernick, *path;
+    char *peerid, *peernick, *path, *hash;
     int state, dir, size, curpos, error;
     time_t errortime;
     GtkListStore *stores[3];
@@ -378,13 +523,17 @@ void updatetransferlists(void)
                        break;
                    } else {
                        transfer->found = 1;
-                       gtk_tree_model_get(GTK_TREE_MODEL(stores[i]), &iter, 2, &state, 3, &peerid, 4, &peernick, 5, &path, 6, &size, 7, &curpos, 10, &error, 11, &errortime, -1);
+                       gtk_tree_model_get(GTK_TREE_MODEL(stores[i]), &iter, 2, &state, 3, &peerid, 4, &peernick, 5, &path, 6, &size, 7, &curpos, 10, &error, 11, &errortime, 12, &hash, -1);
                        if(state != transfer->state)
                            gtk_list_store_set(stores[i], &iter, 2, transfer->state, 8, gettrstatestock(transfer->state), -1);
                        if(size != transfer->size)
                            gtk_list_store_set(stores[i], &iter, 6, transfer->size, -1);
                        if(curpos != transfer->curpos)
+                       {
                            gtk_list_store_set(stores[i], &iter, 7, transfer->curpos, -1);
+                           if(transfer->udata != NULL)
+                               updatetrdata(transfer);
+                       }
                        if(error != transfer->error)
                            gtk_list_store_set(stores[i], &iter, 10, transfer->error, -1);
                        if(errortime != transfer->errortime)
@@ -400,6 +549,10 @@ void updatetransferlists(void)
                        buf = (transfer->path == NULL)?_("Unknown"):icswcstombs(transfer->path, "UTF-8", NULL);
                        if(strcmp(buf, path))
                            gtk_list_store_set(stores[i], &iter, 5, buf, -1);
+                       buf = (transfer->hash == NULL)?"":icswcstombs(transfer->hash, "UTF-8", NULL);
+                       if(strcmp(buf, path))
+                           gtk_list_store_set(stores[i], &iter, 12, buf, -1);
+                       g_free(hash);
                        g_free(peerid);
                        g_free(peernick);
                        g_free(path);
@@ -417,6 +570,7 @@ void updatetransferlists(void)
                peerid = icwcstombs(transfer->peerid, "UTF-8");
                peernick = icwcstombs(((transfer->peernick == NULL) || (transfer->peernick[0] == L'\0'))?transfer->peerid:transfer->peernick, "UTF-8");
                path = (transfer->path == NULL)?_("Unknown"):icwcstombs(transfer->path, "UTF-8");
+               hash = (transfer->hash == NULL)?"":icwcstombs(transfer->hash, "UTF-8");
                gtk_list_store_append(stores[transfer->dir], &iter);
                gtk_list_store_set(stores[transfer->dir], &iter,
                                   0, transfer->id,
@@ -431,11 +585,15 @@ void updatetransferlists(void)
                                   9, 0.0,
                                   10, transfer->error,
                                   11, transfer->errortime,
+                                  12, hash,
                                   -1);
                free(peerid);
                free(peernick);
                if(transfer->path != NULL)
                    free(path);
+               if(transfer->hash != NULL)
+                   free(hash);
+               addtrdata(transfer);
            }
        }
     }
@@ -833,7 +991,15 @@ gint ksupdatecb(gpointer data)
        }
     }
     if(oldnum != numspeeds)
-       knownspeeds = srealloc(knownspeeds, numspeeds * sizeof(*knownspeeds));
+    {
+       if(numspeeds == 0)
+       {
+           free(knownspeeds);
+           knownspeeds = NULL;
+       } else {
+           knownspeeds = srealloc(knownspeeds, numspeeds * sizeof(*knownspeeds));
+       }
+    }
     gtk_tree_model_foreach(GTK_TREE_MODEL(srchmodel), ksupdaterow, NULL);
     if(ksqueryseq == -2)
     {
@@ -931,6 +1097,7 @@ void handleresps(void)
            case 615:
            case 616:
            case 617:
+           case 618:
                updatetransferlists();
                break;
            case 620:
@@ -989,11 +1156,11 @@ void handleresps(void)
                            gtk_tree_store_append(srchmodel, &titer, &piter);
                            srchsizes[i].ref = iter2ref(&titer);
                        } else if(srchsizes[i].num == 1) {
-                           char *filename, *peername, *fnetname;
+                           char *filename, *peername, *fnetname, *hash;
                            int slots, speed;
                            double resptime;
                            
-                           gtk_tree_model_get(GTK_TREE_MODEL(srchmodel), ref2iter(srchsizes[i].ref), 0, &fnetname, 1, &peername, 3, &filename, 5, &slots, 6, &resptime, 8, &speed, -1);
+                           gtk_tree_model_get(GTK_TREE_MODEL(srchmodel), ref2iter(srchsizes[i].ref), 0, &fnetname, 1, &peername, 3, &filename, 5, &slots, 6, &resptime, 8, &speed, 9, &hash, -1);
                            gtk_tree_store_remove(srchmodel, ref2iter(srchsizes[i].ref));
                            gtk_tree_row_reference_free(srchsizes[i].ref);
                            ss = finddiscsize();
@@ -1008,15 +1175,15 @@ void handleresps(void)
                            if((buf = icwcstombs(ires->argv[1].val.str, "UTF-8")) != NULL)
                            {
                                p = buf;
-                               /* XXX: Too DC-specific! */
+                               /* XXX: Too NMDC-specific! */
                                if(strrchr(p, '\\') != NULL)
                                    p = strrchr(p, '\\') + 1;
                                gtk_tree_store_set(srchmodel, &piter, 3, p, -1);
                                free(buf);
                            }
                            gtk_tree_store_append(srchmodel, &titer, &piter);
-                           gtk_tree_store_set(srchmodel, &titer, 0, fnetname, 1, peername, 2, peername, 3, filename, 4, srchsizes[i].size, 5, slots, 6, resptime, 8, speed, -1);
-                           g_free(filename); g_free(peername); g_free(fnetname);
+                           gtk_tree_store_set(srchmodel, &titer, 0, fnetname, 1, peername, 2, peername, 3, filename, 4, srchsizes[i].size, 5, slots, 6, resptime, 8, speed, 9, hash, -1);
+                           g_free(filename); g_free(peername); g_free(fnetname); g_free(hash);
                            gtk_tree_store_append(srchmodel, &titer, &piter);
                        } else {
                            srchsizes[i].num++;
@@ -1043,6 +1210,11 @@ void handleresps(void)
                            gtk_tree_store_set(srchmodel, &titer, 2, buf, -1);
                            free(buf);
                        }
+                       if((buf = icwcstombs(ires->argv[8].val.str, "UTF-8")) != NULL)
+                       {
+                           gtk_tree_store_set(srchmodel, &titer, 9, buf, -1);
+                           free(buf);
+                       }
                        gtk_tree_store_set(srchmodel, &titer, 4, ires->argv[4].val.num, 5, ires->argv[5].val.num, 6, ires->argv[7].val.flnum, 8, -1, -1);
                    }
                    dc_freeires(ires);
@@ -1063,6 +1235,30 @@ void handleresps(void)
                }
                ksquerytag = -1;
                ksupdatecb(NULL);
+           } else if((lsrestag >= 0) && (lsrestag == resp->tag)) {
+               for(i = 0; i < resp->numlines; i++)
+               {
+                   if(!wcsncmp(resp->rlines[i].argv[1], L"id:", 3))
+                   {
+                       gtk_list_store_append(reslist, &titer);
+                       gtk_list_store_set(reslist, &titer, 0, icswcstombs(resp->rlines[i].argv[1] + 3, "UTF-8", NULL), -1);
+                   } else if(!wcsncmp(resp->rlines[i].argv[1], L"size:", 5)) {
+                       gtk_list_store_set(reslist, &titer, 1, wcstol(resp->rlines[i].argv[1] + 5, NULL, 10), -1);
+                   } else if(!wcsncmp(resp->rlines[i].argv[1], L"prog:", 5)) {
+                       gtk_list_store_set(reslist, &titer, 2, wcstol(resp->rlines[i].argv[1] + 5, NULL, 10), -1);
+                   } else if(!wcsncmp(resp->rlines[i].argv[1], L"name:", 5)) {
+                       gtk_list_store_set(reslist, &titer, 3, icswcstombs(resp->rlines[i].argv[1] + 5, "UTF-8", NULL), -1);
+                   } else if(!wcsncmp(resp->rlines[i].argv[1], L"lock:", 5)) {
+                       if(!wcscmp(resp->rlines[i].argv[1] + 5, L"yes"))
+                           gtk_list_store_set(reslist, &titer, 4, TRUE, -1);
+                       else
+                           gtk_list_store_set(reslist, &titer, 4, FALSE, -1);
+                   } else if(!wcsncmp(resp->rlines[i].argv[1], L"hash:", 5)) {
+                       gtk_list_store_set(reslist, &titer, 5, icswcstombs(resp->rlines[i].argv[1] + 5, "UTF-8", NULL), -1);
+                   }
+               }
+               lsrestag = -1;
+               gtk_widget_set_sensitive(reslist_reload, TRUE);
            }
        }
        dc_freeresp(resp);
@@ -1123,6 +1319,19 @@ void cb_main_prefmenu_activate(GtkWidget *widget, gpointer data)
     gtk_widget_destroy(dialog);
 }
 
+void cb_main_lsres_activate(GtkWidget *widget, gpointer data)
+{
+    gtk_list_store_clear(reslist);
+    gtk_widget_set_sensitive(reslist_delete, FALSE);
+    gtk_widget_set_sensitive(reslist_search, FALSE);
+    gtk_widget_show(reslist_wnd);
+    if(lsrestag == -1)
+    {
+       lsrestag = dc_queuecmd(NULL, NULL, L"filtercmd", L"lsres", NULL);
+       gtk_widget_set_sensitive(reslist_reload, FALSE);
+    }
+}
+
 void dcconnect(char *host)
 {
     dcfd = dc_connect(host, -1);
@@ -1173,28 +1382,35 @@ void cb_main_sdmenu_activate(GtkWidget *widget, gpointer data)
 void cb_main_fnaddr_activate(GtkWidget *widget, gpointer data)
 {
     int tag;
-    char *buf;
     struct dc_response *resp;
+    wchar_t **toks;
     
     if(dcfd < 0)
     {
        msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Not connected to DC server"));
        return;
     }
-    buf = sstrdup(gtk_entry_get_text(GTK_ENTRY(main_fnaddr)));
-    if(strchr(buf, ':') == NULL)
+    toks = dc_lexsexpr(icsmbstowcs((char *)gtk_entry_get_text(GTK_ENTRY(main_fnaddr)), "UTF-8", NULL));
+    if(*toks == NULL)
     {
-       buf = srealloc(buf, strlen(buf) + 5);
-       strcat(buf, ":411");
+       msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Illegal address entered"));
+       return;
     }
-    tag = dc_queuecmd(NULL, NULL, L"cnct", L"dc", L"%%s", buf, NULL);
-    free(buf);
+    if(wcschr(toks[0], L':') == NULL)
+    {
+       toks[0] = srealloc(toks[0], (wcslen(toks[0]) + 5) * sizeof(wchar_t));
+       wcscat(toks[0], L":411");
+    }
+    tag = dc_queuecmd(NULL, NULL, L"cnct", L"dc", L"%%a", toks, NULL);
+    dc_freewcsarr(toks);
     if((resp = dc_gettaggedrespsync(tag)) != NULL)
     {
        if(resp->code == 502)
            msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("You do not have permission to do that"));
        if(resp->code == 509)
            msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("The server could not parse that address"));
+       if(resp->code == 515)
+           msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("There are too many hubs connected"));
        dc_freeresp(resp);
     }
     gtk_entry_set_text(GTK_ENTRY(main_fnaddr), "");
@@ -1259,12 +1475,16 @@ void pubhubfdcallback(gpointer data, gint source, GdkInputCondition condition)
                {
                    if((wbuf = icsmbstowcs(fields[i], DCCHARSET, NULL)) == NULL)
                    {
+                       /*
                        msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not decode hublist - aborting at this point: %s"), strerror(errno));
                        kill(pubhubproc, SIGINT);
                        break;
+                       */
+                       fields[i] = sstrdup(_("(Invalid character)"));
+                   } else {
+                       if((fields[i] = icwcstombs(wbuf, "UTF-8")) == NULL)
+                           break;
                    }
-                   if((fields[i] = icwcstombs(wbuf, "UTF-8")) == NULL)
-                       break;
                }
                if(i == 4)
                {
@@ -1420,6 +1640,8 @@ void cb_main_phublist_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeView
            msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("You do not have permission to do that"));
        if(resp->code == 509)
            msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("The server could not parse that address"));
+       if(resp->code == 515)
+           msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("There are too many hubs connected"));
        dc_freeresp(resp);
     }
     handleresps();
@@ -1509,7 +1731,7 @@ void updatesrchfld(const char *simple)
            bufcat(buf, "N~", 2);
            for(; *p; p++)
            {
-               if(strchr("[]()$^.*?+\\|\"", *p) != NULL)
+               if(strchr("[]()$^.*?+\\|\"!", *p) != NULL)
                    addtobuf(buf, '\\');
                addtobuf(buf, *p);
            }
@@ -1604,7 +1826,7 @@ void cb_main_srchcanbtn_clicked(GtkWidget *widget, gpointer data)
     srchstatupdate();
 }
 
-void cb_main_trlist_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean cb_main_trlist_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
     int id, tag;
     GtkTreeSelection *sel;
@@ -1629,7 +1851,9 @@ void cb_main_trlist_keypress(GtkWidget *widget, GdkEventKey *event, gpointer dat
            }
            handleresps();
        }
+       return(TRUE);
     }
+    return(FALSE);
 }
 
 void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data)
@@ -1639,8 +1863,8 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
     GtkTreeIter iter;
     GtkTreeModel *model;
     int size, num;
-    char *tfnet, *tpeerid, *tfilename, *arg;
-    wchar_t *fnet, *peerid, *filename;
+    char *tfnet, *tpeerid, *tfilename, *thash, *arg;
+    wchar_t *fnet, *peerid, *filename, *hash;
     
     if(dcfd < 0)
     {
@@ -1653,10 +1877,11 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
     gtk_tree_model_get(model, &iter, 7, &num, -1);
     if(num > 0)
        return;
-    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &tfnet, 1, &tpeerid, 3, &tfilename, 4, &size, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &tfnet, 1, &tpeerid, 3, &tfilename, 4, &size, 9, &thash, -1);
     fnet = icmbstowcs(tfnet, "UTF-8");
     peerid = icmbstowcs(tpeerid, "UTF-8");
     filename = icmbstowcs(tfilename, "UTF-8");
+    hash = (thash == NULL)?NULL:icmbstowcs(thash, "UTF-8");
     if((fnet == NULL) || (peerid == NULL) || (filename == NULL))
     {
        if(fnet != NULL)
@@ -1665,9 +1890,13 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
            free(peerid);
        if(filename != NULL)
            free(filename);
+       if(hash != NULL)
+           free(hash);
        g_free(tfnet);
        g_free(tpeerid);
        g_free(tfilename);
+       if(thash != NULL)
+           g_free(thash);
        return;
     }
     g_free(tfnet);
@@ -1675,12 +1904,14 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
     g_free(tfilename);
     arg = (char *)gtk_entry_get_text(GTK_ENTRY(main_dlarg));
     if(*arg)
-       tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, L"user", L"%%s", arg, NULL);
+       tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, L"hash", L"%%ls", (hash == NULL)?L"":hash, L"user", L"%%s", arg, NULL);
     else
-       tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, NULL);
+       tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, L"hash", L"%%ls", (hash == NULL)?L"":hash, NULL);
     free(fnet);
     free(peerid);
     free(filename);
+    if(hash != NULL)
+       free(hash);
     if((resp = dc_gettaggedrespsync(tag)) != NULL)
     {
        if(resp->code == 502)
@@ -1711,6 +1942,328 @@ void cb_main_filternoslots_toggled(GtkToggleButton *widget, gpointer data)
     gtk_tree_model_filter_refilter(srchmodelfilter);
 }
 
+void cb_main_srhash_activate(GtkWidget *widget, gpointer data)
+{
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash, *buf;
+    
+    if(nextsrch != -1)
+       return;
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_srchres));
+    if(gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+       gtk_tree_model_get(model, &iter, 9, &hash, -1);
+       buf = sprintf2("H=%s", hash);
+       gtk_entry_set_text(GTK_ENTRY(main_realsrch), buf);
+       g_free(hash);
+       free(buf);
+       cb_main_srchbtn_clicked(widget, NULL);
+    } else {
+       return;
+    }
+}
+
+void cb_main_srcopy_activate(GtkWidget *widget, gpointer data)
+{
+    GtkClipboard *cb;
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash;
+    
+    if(nextsrch != -1)
+       return;
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_srchres));
+    if(!gtk_tree_selection_get_selected(sel, &model, &iter))
+       return;
+    gtk_tree_model_get(model, &iter, 9, &hash, -1);
+    cb = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+    gtk_clipboard_set_text(cb, hash, -1);
+    g_free(hash);
+}
+
+void cb_main_trhash_activate(GtkWidget *widget, gpointer data)
+{
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash, *buf;
+    
+    if(nextsrch != -1)
+       return;
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_downloads));
+    if(gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+       gtk_tree_model_get(model, &iter, 12, &hash, -1);
+       buf = sprintf2("H=%s", hash);
+       gtk_entry_set_text(GTK_ENTRY(main_realsrch), buf);
+       g_free(hash);
+       free(buf);
+       cb_main_srchbtn_clicked(widget, NULL);
+    } else {
+       return;
+    }
+}
+
+void cb_main_trcopy_activate(GtkWidget *widget, gpointer data)
+{
+    GtkClipboard *cb;
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash;
+    
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_downloads));
+    if(!gtk_tree_selection_get_selected(sel, &model, &iter))
+       return;
+    gtk_tree_model_get(model, &iter, 12, &hash, -1);
+    cb = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+    gtk_clipboard_set_text(cb, hash, -1);
+    g_free(hash);
+}
+
+void cb_main_trcancel_activate(GtkWidget *widget, gpointer data)
+{
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    int id, tag;
+    struct dc_response *resp;
+    
+    if(nextsrch != -1)
+       return;
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_downloads));
+    if(gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+       gtk_tree_model_get(model, &iter, 0, &id, -1);
+       tag = dc_queuecmd(NULL, NULL, L"cancel", L"%%i", id, NULL);
+       if((resp = dc_gettaggedrespsync(tag)) != NULL)
+       {
+           if(resp->code == 502)
+               msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("You do not have permission to do that"));
+           else if(resp->code != 200)
+               msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("An error occurred while trying to cancel (%i)"), resp->code);
+           dc_freeresp(resp);
+       }
+       handleresps();
+    } else {
+       return;
+    }
+}
+
+/* XXX: This is quite a hack, since the calling convention is
+ * different for the popup-menu sig and the button-press-event sig. It
+ * most certainly works, but I don't know how portable it is. */
+gboolean cb_main_srpopup(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash;
+    
+    if((event != NULL) && (event->button != 3))
+       return(FALSE);
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+    if(gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+       gtk_tree_model_get(model, &iter, 9, &hash, -1);
+       if((hash == NULL) || (*hash == 0))
+       {
+           gtk_widget_set_sensitive(main_srhash, FALSE);
+           gtk_widget_set_sensitive(main_srcopy, FALSE);
+       } else {
+           if(nextsrch == -1)
+               gtk_widget_set_sensitive(main_srhash, TRUE);
+           else
+               gtk_widget_set_sensitive(main_srhash, FALSE);
+           gtk_widget_set_sensitive(main_srcopy, TRUE);
+       }
+       g_free(hash);
+    } else {
+       return(FALSE);
+    }
+    if(event == NULL)
+       gtk_menu_popup(GTK_MENU(main_srpopup), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+    else
+       gtk_menu_popup(GTK_MENU(main_srpopup), NULL, NULL, NULL, NULL, event->button, event->time);
+    return(FALSE);
+}
+
+/* The above hack note goes for this one too. */
+gboolean cb_main_trpopup(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash;
+    
+    if((event != NULL) && (event->button != 3))
+       return(FALSE);
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+    if(gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+       gtk_tree_model_get(model, &iter, 12, &hash, -1);
+       if((hash == NULL) || (*hash == 0))
+       {
+           gtk_widget_set_sensitive(main_trhash, FALSE);
+           gtk_widget_set_sensitive(main_trcopy, FALSE);
+       } else {
+           if(nextsrch == -1)
+               gtk_widget_set_sensitive(main_trhash, TRUE);
+           else
+               gtk_widget_set_sensitive(main_trhash, FALSE);
+           gtk_widget_set_sensitive(main_trcopy, TRUE);
+       }
+       g_free(hash);
+    } else {
+       return(FALSE);
+    }
+    if(event == NULL)
+       gtk_menu_popup(GTK_MENU(main_trpopup), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+    else
+       gtk_menu_popup(GTK_MENU(main_trpopup), NULL, NULL, NULL, NULL, event->button, event->time);
+    return(FALSE);
+}
+
+void cb_reslist_reload_clicked(GtkWidget *widget, gpointer data)
+{
+    if(lsrestag != -1)
+       return;
+    gtk_widget_set_sensitive(reslist_delete, FALSE);
+    gtk_widget_set_sensitive(reslist_search, FALSE);
+    gtk_list_store_clear(reslist);
+    lsrestag = dc_queuecmd(NULL, NULL, L"filtercmd", L"lsres", NULL);
+    gtk_widget_set_sensitive(reslist_reload, FALSE);
+}
+
+int rmres(char *id)
+{
+    int tag, ret;
+    struct dc_response *resp;
+    
+    ret = -1;
+    tag = dc_queuecmd(NULL, NULL, L"filtercmd", L"rmres", L"%%s", id, NULL);
+    if((resp = dc_gettaggedrespsync(tag)) != NULL)
+    {
+       if(resp->numlines > 0)
+       {
+           if(!wcscmp(resp->rlines[0].argv[1], L"ok"))
+               ret = 0;
+           else if(!wcsncmp(resp->rlines[0].argv[1], L"err:", 4))
+               msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("An error occurred (%ls)"), resp->rlines[0].argv[1] + 4);
+       }
+       dc_freeresp(resp);
+    }
+    handleresps();
+    return(ret);
+}
+
+void cb_reslist_delete_clicked(GtkWidget *widget, gpointer data)
+{
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    char *id;
+    gboolean locked;
+    
+    if(nextsrch != -1)
+       return;
+    if(!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(reslist_list)), &model, &iter))
+       return;
+    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &id, 4, &locked, -1);
+    if(locked)
+    {
+       g_free(id);
+       return;
+    }
+    if(!rmres(id))
+       gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+    g_free(id);
+}
+
+void cb_reslist_search_clicked(GtkWidget *widget, gpointer data)
+{
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    char *hash, *buf;
+    
+    if(nextsrch != -1)
+       return;
+    if(!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(reslist_list)), &model, &iter))
+       return;
+    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 5, &hash, -1);
+    buf = sprintf2("H=%s", hash);
+    gtk_entry_set_text(GTK_ENTRY(main_realsrch), buf);
+    free(buf);
+    g_free(hash);
+    cb_main_srchbtn_clicked(widget, NULL);
+}
+
+void cb_reslist_list_cchange(GtkWidget *widget, gpointer data)
+{
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    gboolean locked;
+    char *hash;
+    
+    if(!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(reslist_list)), &model, &iter))
+    {
+       gtk_widget_set_sensitive(reslist_delete, FALSE);
+       gtk_widget_set_sensitive(reslist_search, FALSE);
+       return;
+    }
+    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 4, &locked, 5, &hash, -1);
+    gtk_widget_set_sensitive(reslist_delete, !locked);
+    gtk_widget_set_sensitive(reslist_search, hash && *hash);
+    g_free(hash);
+}
+
+void cb_reslist_list_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data)
+{
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    char *hash, *buf;
+
+    model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
+    if(!gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path))
+       return;
+    if(nextsrch != -1)
+       return;
+    gtk_tree_model_get(model, &iter, 5, &hash, -1);
+    buf = sprintf2("H=%s", hash);
+    gtk_entry_set_text(GTK_ENTRY(main_realsrch), buf);
+    free(buf);
+    g_free(hash);
+    cb_main_srchbtn_clicked(widget, NULL);
+}
+
+gboolean cb_reslist_list_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *id;
+    gboolean locked;
+    
+    if((event->type == GDK_KEY_PRESS) && (event->keyval == GDK_Delete))
+    {
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+       if(gtk_tree_selection_get_selected(sel, &model, &iter))
+       {
+           gtk_tree_model_get(model, &iter, 0, &id, 4, &locked, -1);
+           if(!locked)
+           {
+               if(!rmres(id))
+                   gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+           }
+           g_free(id);
+       }
+       return(TRUE);
+    }
+    return(FALSE);
+}
+
 void srchstatupdate(void)
 {
     char buf[1024];
@@ -1754,7 +2307,7 @@ int main(int argc, char **argv)
     gtk_init(&argc, &argv);
     dc_init();
     signal(SIGCHLD, SIG_IGN);
-    pubhubaddr = sstrdup("http://www.neo-modus.com/PublicHubList.config");
+    pubhubaddr = sstrdup("http://www.hublist.org/PublicHubList.config.bz2");
     dcserver = sstrdup("localhost");
     if((pwent = getpwuid(getuid())) == NULL)
     {
@@ -1763,19 +2316,24 @@ int main(int argc, char **argv)
     }
     connectas = sstrdup(pwent->pw_name);
     wnd = create_main_wnd();
+    create_reslist_wnd();
+    gtk_window_resize(GTK_WINDOW(reslist_wnd), 600, 400);
     initchattags();
 
     fnmodel = gtk_list_store_new(6, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
     gtk_tree_view_set_model(GTK_TREE_VIEW(main_fnetnodes), GTK_TREE_MODEL(fnmodel));
     gtk_tree_view_set_model(GTK_TREE_VIEW(main_chatnodes), GTK_TREE_MODEL(fnmodel));
-
+    
+    reslist = gtk_list_store_new(6, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING);
+    gtk_tree_view_set_model(GTK_TREE_VIEW(reslist_list), GTK_TREE_MODEL(reslist));
+    
     pubhubmodel = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
     sortmodel = gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(pubhubmodel));
     gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(sortmodel), 3, GTK_SORT_DESCENDING);
     gtk_tree_view_set_model(GTK_TREE_VIEW(main_phublist), GTK_TREE_MODEL(sortmodel));
     g_object_unref(sortmodel);
 
-    dlmodel = gtk_list_store_new(12, G_TYPE_INT, /* id */
+    dlmodel = gtk_list_store_new(13, G_TYPE_INT, /* id */
                                 G_TYPE_INT,     /* dir */
                                 G_TYPE_INT,     /* state */
                                 G_TYPE_STRING,  /* peerid */
@@ -1786,13 +2344,23 @@ int main(int argc, char **argv)
                                 G_TYPE_STRING,  /* stock */
                                 G_TYPE_FLOAT,   /* percentage */
                                 G_TYPE_INT,     /* error */
-                                G_TYPE_INT);    /* errortime */
+                                G_TYPE_INT,     /* errortime */
+                                G_TYPE_STRING); /* hash */
     gtk_tree_view_set_model(GTK_TREE_VIEW(main_downloads), GTK_TREE_MODEL(dlmodel));
 
-    ulmodel = gtk_list_store_new(12, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_FLOAT, G_TYPE_INT, G_TYPE_INT);
+    ulmodel = gtk_list_store_new(13, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_FLOAT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING);
     gtk_tree_view_set_model(GTK_TREE_VIEW(main_uploads), GTK_TREE_MODEL(ulmodel));
 
-    srchmodel = gtk_tree_store_new(9, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_INT, G_TYPE_INT);
+    srchmodel = gtk_tree_store_new(10, G_TYPE_STRING, /* fnetname */
+                                  G_TYPE_STRING,     /* peerid */
+                                  G_TYPE_STRING,     /* peername */
+                                  G_TYPE_STRING,     /* filename */
+                                  G_TYPE_INT,        /* size */
+                                  G_TYPE_INT,        /* slots */
+                                  G_TYPE_DOUBLE,     /* resptime */
+                                  G_TYPE_INT,        /* sizenum */
+                                  G_TYPE_INT,        /* speed */
+                                  G_TYPE_STRING);    /* hash */
     srchmodelfilter = GTK_TREE_MODEL_FILTER(gtk_tree_model_filter_new(GTK_TREE_MODEL(srchmodel), NULL));
     gtk_tree_model_filter_set_visible_func(srchmodelfilter, srchfilterfunc, NULL, NULL);
     sortmodel = gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(srchmodelfilter));
@@ -1810,6 +2378,7 @@ int main(int argc, char **argv)
        dcconnect(dcserver);
     g_timeout_add(500, srchstatupdatecb, NULL);
     g_timeout_add(5000, ksupdatecb, NULL);
+    g_timeout_add(1000, updatetransfers, NULL);
     gtk_main();
     return(0);
 }