some minor changes - d'n'd support forthcoming

(but mainly commiting because of the gserver switch)

diff --git a/contrib/gtk-tool/Gtk_LdapServer.cc b/contrib/gtk-tool/Gtk_LdapServer.cc
index 85011b5f1e1b1c188dee74a21c282598d2a85132..8bb74809890b160762a8b8f6afa205e9efd960b4 100644 (file)
--- a/contrib/gtk-tool/Gtk_LdapServer.cc
+++ b/contrib/gtk-tool/Gtk_LdapServer.cc
@@ -387,6 +387,7 @@ Gtk_Tree* Gtk_LdapServer::getSubtree() {
                tree->append(*treeitem);
                if (subtree != NULL) treeitem->set_subtree(*subtree);
                treeitem->show();
+       //      treeitem->setDnd();
        //      tree->show();
        }
 //     this->set_subtree(*tree);

diff --git a/contrib/gtk-tool/Gtk_LdapTree.cc b/contrib/gtk-tool/Gtk_LdapTree.cc
index e5b25c793231cfdf10d295cfffb06d99b633147c..3908621aa085f9f4b700f9c7589c5daa73a1188e 100644 (file)
--- a/contrib/gtk-tool/Gtk_LdapTree.cc
+++ b/contrib/gtk-tool/Gtk_LdapTree.cc
@@ -15,7 +15,10 @@ void Gtk_LdapTree::show_impl() {
                if (item->get_subtree() == NULL) {
                        debug("ding!\n");
                        tree = item->getSubtree(item->ld, 1);
-                       if (tree != NULL) item->set_subtree(*tree);
+                       if (tree != NULL) { 
+                               item->set_subtree(*tree);
+                       }
+                       item->setDnd();
                }
        }
        debug("done\n");

diff --git a/contrib/gtk-tool/Gtk_LdapTreeItem.cc b/contrib/gtk-tool/Gtk_LdapTreeItem.cc
index 3851d432ebf8d21489c915de71774f6053a07795..0216a6503d64fd8529a4913352585e9cadf5470e 100644 (file)
--- a/contrib/gtk-tool/Gtk_LdapTreeItem.cc
+++ b/contrib/gtk-tool/Gtk_LdapTreeItem.cc
@@ -14,6 +14,21 @@ Gtk_LdapTreeItem::Gtk_LdapTreeItem(char *c, My_Window *w, LDAP *ld) : Gtk_TreeIt
        this->ld = ld;
        this->objectClass = NULL;
        this->getDetails();
+       this->createPopupMenu();
+}
+
+void Gtk_LdapTreeItem::setDnd() {
+       debug("Gtk_LdapTreeItem::setDnd()\n");
+       this->set_events(get_events()|GDK_ALL_EVENTS_MASK);
+       this->drag_dest_set(GTK_DEST_DEFAULT_ALL, target_table, n_targets, static_cast <GdkDragAction> (GDK_ACTION_COPY|GDK_ACTION_MOVE));
+       this->drag_data_received.connect(slot(this, &(Gtk_LdapTreeItem::item_drag_data_received)));
+       this->drag_drop.connect(slot(this,&Gtk_LdapTreeItem::target_drag_drop));
+       this->drag_source_set(static_cast<GdkModifierType>(GDK_BUTTON1_MASK|GDK_BUTTON3_MASK), target_table, n_targets, static_cast<GdkDragAction>(GDK_ACTION_COPY|GDK_ACTION_MOVE));
+       gtk_drag_source_set(GTK_WIDGET(this->gtkobj()), static_cast<GdkModifierType>(GDK_BUTTON1_MASK|GDK_BUTTON3_MASK), target_table, n_targets, static_cast<GdkDragAction>(GDK_ACTION_COPY|GDK_ACTION_MOVE));
+       this->drag_data_get.connect(slot(this, &Gtk_LdapTreeItem::source_drag_data_get));
+       this->drag_data_delete.connect(slot(this,&Gtk_LdapTreeItem::source_drag_data_delete));
+       this->drag_leave.connect(slot(this,&Gtk_LdapTreeItem::target_drag_leave));
+
 }
 
 Gtk_LdapTreeItem::Gtk_LdapTreeItem(GtkTreeItem *t) : Gtk_TreeItem(t) {
@@ -51,6 +66,7 @@ Gtk_LdapTree* Gtk_LdapTreeItem::getSubtree(LDAP *ld, int counter) {
        debug("%i results\n", entriesCount);
        if (entriesCount != 0) { 
                tree = new Gtk_LdapTree();
+       //      this->set_subtree(*tree);
                tree->set_selection_mode(GTK_SELECTION_BROWSE);
                tree->set_view_mode(GTK_TREE_VIEW_ITEM);
                tree->set_view_lines(false);
@@ -62,11 +78,12 @@ Gtk_LdapTree* Gtk_LdapTreeItem::getSubtree(LDAP *ld, int counter) {
        //      this->par->progress.show();
                while (entry != NULL) {
                        subtreeitem = new Gtk_LdapTreeItem(ldap_get_dn(this->ld, entry), this->par, this->ld);
-                       subtree = subtreeitem->getSubtree(this->ld, counter);
                        debug("inserting %s into %s\n",subtreeitem->rdn,this->rdn);
                        tree->append(*subtreeitem);
+                       subtree = subtreeitem->getSubtree(this->ld, counter);
                        subtreeitem->show();
                        if (subtree != NULL) subtreeitem->set_subtree(*subtree);
+               //      subtreeitem->setDnd();
                        debug("done\n");
                        entry = ldap_next_entry(this->ld, entry);
                //      gfloat pvalue = (i*percent)/100;
@@ -223,6 +240,28 @@ int Gtk_LdapTreeItem::getDetails() {
        debug("done\n");
        return 0;
 }
+
+void Gtk_LdapTreeItem::createPopupMenu() {
+       debug("Gtk_LdapTreeItem::createPopupMenu()\n");
+       Gtk_MenuItem *item;
+
+       this->menu = new Gtk_Menu();
+       
+       item = new Gtk_MenuItem("Add");
+       this->menu->add(*item);
+       item = new Gtk_MenuItem("Delete");
+       this->menu->add(*item);
+       item = new Gtk_MenuItem();
+       this->menu->add(*item);
+       item = new Gtk_MenuItem("Cut");
+       this->menu->add(*item);
+       item = new Gtk_MenuItem("Copy");
+       this->menu->add(*item);
+       item = new Gtk_MenuItem("Paste");
+       this->menu->add(*item);
+       this->menu->show_all();
+       this->menu->activate();
+}
 /*
 void Gtk_LdapTreeItem::show_impl() {
        debug("%s showed\n", this->dn);
@@ -230,11 +269,13 @@ void Gtk_LdapTreeItem::show_impl() {
 //     sig->show(GTK_WIDGET(gtkobj()));
 }
 */
+/*
 void Gtk_LdapTreeItem::select_impl() {
        debug("%s selected\n", this->dn);
        this->showDetails();
        Gtk_TreeItem::select_impl();
 }
+*/
 
 void Gtk_LdapTreeItem::collapse_impl() {
        debug("%s collapsed\n", this->dn);
@@ -248,3 +289,88 @@ void Gtk_LdapTreeItem::expand_impl() {
        Gtk_Tree *tree;
        Gtk_TreeItem::expand_impl();
 }
+
+void Gtk_LdapTreeItem::click() {
+       debug("%s clicked\n", this->dn);
+}
+
+/*
+gint Gtk_LdapTreeItem::button_press_event_impl(GdkEventButton *p0) {
+       debug("Gtk_LdapTreeItem::button_press_event_impl(%i)\n", p0->button);
+       GdkEventButton *bevent = (GdkEventButton *) p0;
+       if (p0->button == 3) gtk_menu_popup(this->menu->gtkobj(), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
+       Gtk_TreeItem::button_press_event_impl(p0);
+//     Gtk_TreeItem::select_impl();
+}
+*/
+
+void Gtk_LdapTreeItem::item_drag_data_received(GdkDragContext *context,
+                                    gint                x,
+                                    gint                y,
+                                    GtkSelectionData   *data,
+                                    guint               info,
+                                    guint               time) {
+       debug("Gtk_LdapTreeItem::item_drag_data_received\n");
+       Gdk_DragContext gdc(context);
+       if ((data->length >= 0) && (data->format == 8)) {
+               cout << "Received \"" << (gchar *)data->data << "\" in label" << endl;
+               Gtk_Widget::drag_finish(gdc, true, false, time);
+               return;
+       }
+
+       Gtk_Widget::drag_finish(gdc , false, false, time);
+}
+
+gboolean Gtk_LdapTreeItem::target_drag_drop(GdkDragContext *context,
+                            gint x, gint y, guint theTime) {
+       debug("Gtk_LdapTreeItem::target_drag_drop\n");
+       cout << "drop" << endl;
+       have_drag = false;
+
+//     pixmap.set(trashcan_closed, trashcan_closed_mask);
+
+       Gdk_DragContext gdc(context);
+       Gdk_Atom *ga = static_cast <GdkAtom *>(context->targets->data);
+       if (context->targets) {
+               this->drag_get_data(gdc, *ga, theTime);
+               return true;
+       }
+
+       return false;
+}
+
+
+void Gtk_LdapTreeItem::source_drag_data_get(GdkDragContext     *context,
+                                 GtkSelectionData *selection_data,
+                                 guint info, guint32 time) {
+       debug("Gtk_LdapTreeItem::source_drag_data_get\n");
+       if (info == TARGET_ROOTWIN) {
+               cout << "I was dropped on the rootwin" << endl;
+       }
+       else {
+               if ( info == TARGET_URL ) {
+                       gtk_selection_data_set(selection_data,
+                               selection_data->target, 8,
+                               reinterpret_cast < const unsigned char * >
+                               ("file:///home/otaylor/images/weave.png"), 37);
+               }
+               else {
+                       gtk_selection_data_set(selection_data,
+                               selection_data->target, 8,
+                               reinterpret_cast <const unsigned char *>
+                               ("I'm Data!"), 9);
+               }
+       }
+}
+
+void Gtk_LdapTreeItem::source_drag_data_delete(GdkDragContext *context) {
+       debug("Gtk_LdapTreeItem::source_drag_data_delete\n");
+       debug("Delete the data!\n");
+}
+
+void Gtk_LdapTreeItem::target_drag_leave(GdkDragContext *context, guint time) {
+  debug("Gtk_LdapTreeItem::target_drag_leave\n");
+  this->have_drag = false;
+//  pixmap.set(trashcan_closed, trashcan_closed_mask);
+}
+

diff --git a/contrib/gtk-tool/Gtk_LdapTreeItem.h b/contrib/gtk-tool/Gtk_LdapTreeItem.h
index a5775c542c5484bdf88b13fdd54e419795419c71..fecc277368f8da1c648d38ed3a258caeb2bb15ec 100644 (file)
--- a/contrib/gtk-tool/Gtk_LdapTreeItem.h
+++ b/contrib/gtk-tool/Gtk_LdapTreeItem.h
@@ -32,18 +32,52 @@ public:
        My_Window *par;
        Gtk_Notebook *notebook;
        Gtk_HBox *xpm_label;
+       Gtk_Menu *menu;
+       enum
+       {
+               TARGET_STRING,
+               TARGET_ROOTWIN,
+               TARGET_URL
+       };
+       bool have_drag;
+
+       //Functions
        Gtk_LdapTreeItem();
        Gtk_LdapTreeItem(char *c, My_Window *w, LDAP *ld);
        Gtk_LdapTreeItem(GtkTreeItem *t);
        ~Gtk_LdapTreeItem();
+       void setDnd();
        gchar* getAttribute(char *c);
        Gtk_LdapTree* getSubtree(LDAP *ld, int i);
        void setType(int t);
        int getDetails();
+       void createPopupMenu();
        int showDetails();
 //     void show_impl();
-       void select_impl();
+//     void select_impl();
        void collapse_impl();
        void expand_impl();
+       void click();
+//     gint button_press_event_impl(GdkEventButton *p0);
+       void item_drag_data_received (GdkDragContext *context,
+                               gint x, gint y, GtkSelectionData *data,
+                               guint info, guint32 time);
+       gboolean target_drag_drop ( GdkDragContext *context,
+                               gint x, gint y, guint time);
+
+       void source_drag_data_get(GdkDragContext *context,
+                               GtkSelectionData *selection_data,
+                               guint info, guint32 time);
+       void source_drag_data_delete(GdkDragContext *context);
+       void target_drag_leave(GdkDragContext *context, guint time);
 };
+
+static GtkTargetEntry target_table[] = {
+       { "STRING",     0, Gtk_LdapTreeItem::TARGET_STRING },
+       { "text/plain", 0, Gtk_LdapTreeItem::TARGET_STRING },
+       { "text/uri-list", 0, Gtk_LdapTreeItem::TARGET_URL },
+       { "application/x-rootwin-drop", 0, Gtk_LdapTreeItem::TARGET_ROOTWIN }
+};
+
+static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
 #endif

diff --git a/contrib/gtk-tool/main.cc b/contrib/gtk-tool/main.cc
index 8b66c2da8a1b2a7d72e95d38ae49607dd88cf441..55978ed507dad1354d3eb4e75e5fa2b9c53dc72d 100644 (file)
--- a/contrib/gtk-tool/main.cc
+++ b/contrib/gtk-tool/main.cc
@@ -8,6 +8,9 @@
 
 int debug_level = 0;
 
+target_drag_leave(GdkDragContext *context, guint time) {
+}
+
 int main(int argc, char **argv) {
        My_Window *window;
        Gtk_LdapItem *treeresult;
@@ -68,6 +71,7 @@ int main(int argc, char **argv) {
 
        if (hosts!=NULL) {
                tree = new Gtk_Tree();
+               window->viewport->add(*tree);
                for (int f=0; f<g_list_length(hosts); f++) {
                        host = strtok((char*)g_list_nth(hosts, f)->data, ":");
                        prt = strtok(NULL, "\0");
@@ -79,7 +83,7 @@ int main(int argc, char **argv) {
                        server->set_subtree(*subtree);
                        server->show();
                }
-               window->viewport->add(*tree);
+               //window->viewport->add(*tree);
 //             tree->show();
        }
 
@@ -91,12 +95,17 @@ int main(int argc, char **argv) {
                Gtk_LdapTree::ItemList &items = tree->tree();
                Gtk_LdapTree::ItemList::iterator i = items.begin();
                server = (Gtk_LdapServer *)(* i);
-               server->select_impl();
+       //      server->select_impl();
        }
 
        window->set_title("gtk-tool");
        window->activate();
        window->set_usize(600, 500);
+
+       window->set_events(window->get_events()|GDK_ALL_EVENTS_MASK);
+       window->drag_dest_set(GTK_DEST_DEFAULT_ALL, target_table, n_targets, static_cast <GdkDragAction> (GDK_ACTION_COPY|GDK_ACTION_MOVE));
+       window->drag_source_set(static_cast<GdkModifierType>(GDK_BUTTON1_MASK|GDK_BUTTON3_MASK), target_table, n_targets, static_cast<GdkDragAction>(GDK_ACTION_COPY|GDK_ACTION_MOVE));
+        window->drag_leave.connect(window->slot(window,target_drag_leave));
        window->show_all();
 
        m.run();