Fix marking functionality (bug 5279)

svn path=/trunk/; revision=35244
BeomChangKim · Dec 22, 2010 · 516bfe3 · 516bfe3
1 parent f4c6355
commit 516bfe3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/gtk/menus.c b/gtk/menus.c
@@ -1422,10 +1422,11 @@ static const GtkActionEntry main_menu_bar_entries[] = {
 
 #ifdef NEW_PACKET_LIST
  { "/Edit/MarkPacket", NULL, "_Mark Packet (toggle)", "<control>M", NULL, G_CALLBACK(new_packet_list_mark_frame_cb) },
+ { "/Edit/ToggleMarkingOfAllDisplayedPackets", NULL, "Toggle Marking Of All Displayed Packets", "<shift><alt><control>M", NULL, G_CALLBACK(new_packet_list_toggle_mark_all_displayed_frames_cb) },
+ { "/Edit/MarkAllDisplayedPackets", NULL, "Mark All Displayed Packets", "<shift><control>M", NULL, G_CALLBACK(new_packet_list_mark_all_displayed_frames_cb) },
+ { "/Edit/UnmarkAllDisplayedPackets", NULL, "_Unmark All Displayed Packets", "<alt><control>M", NULL, G_CALLBACK(new_packet_list_unmark_all_displayed_frames_cb) },
  { "/Edit/FindNextMark", NULL, "Find Next Mark", "<shift><control>N", NULL, G_CALLBACK(find_next_mark_cb) },
  { "/Edit/FindPreviousMark", NULL, "Find Next Mark", "<shift><control>B", NULL, G_CALLBACK(find_prev_mark_cb) },
- { "/Edit/MarkAllDisplayedPackets", NULL, "Mark All Displayed Packets (toggle)", "<control>A", NULL, G_CALLBACK(new_packet_list_mark_all_displayed_frames_cb) },
- { "/Edit/UnmarkAllPackets", NULL, "_Unmark All Packets", "<control>D", NULL, G_CALLBACK(new_packet_list_unmark_all_frames_cb) },
 
  { "/Edit/IgnorePacket", NULL, "_Ignore Packet (toggle)", "<control>X", NULL, G_CALLBACK(new_packet_list_ignore_frame_cb) },
  /*
@@ -1794,8 +1795,9 @@ static GtkItemFactoryEntry menu_items[] =
  {"/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
 #ifdef NEW_PACKET_LIST
  {"/Edit/_Mark Packet (toggle)", "<control>M", GTK_MENU_FUNC(new_packet_list_mark_frame_cb),0, NULL, NULL,},
- {"/Edit/Mark All Displayed Packets (toggle)", "<shift><control>M", GTK_MENU_FUNC(new_packet_list_mark_all_displayed_frames_cb), 0, NULL, NULL,},
- {"/Edit/Unmark All Packets", "<alt><control>M", GTK_MENU_FUNC(new_packet_list_unmark_all_frames_cb), 0, NULL, NULL,},
+ {"/Edit/Toggle Marking Of All Displayed Packets", "<shift><alt><control>M", GTK_MENU_FUNC(new_packet_list_toggle_mark_all_displayed_frames_cb), 0, NULL, NULL,},
+ {"/Edit/Mark All Displayed Packets", "<shift><control>M", GTK_MENU_FUNC(new_packet_list_mark_all_displayed_frames_cb), 0, NULL, NULL,},
+ {"/Edit/Unmark All Displayed Packets", "<alt><control>M", GTK_MENU_FUNC(new_packet_list_unmark_all_displayed_frames_cb), 0, NULL, NULL,},
  {"/Edit/Find Next Mark", "<shift><control>N", GTK_MENU_FUNC(find_next_mark_cb), 0, NULL, NULL,},
  {"/Edit/Find Previous Mark", "<shift><control>B", GTK_MENU_FUNC(find_prev_mark_cb), 0, NULL, NULL,},
  {"/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
@@ -1818,12 +1820,12 @@ static GtkItemFactoryEntry menu_items[] =
  */
  {"/Edit/_Mark Packet (toggle)", "<control>M", GTK_MENU_FUNC(packet_list_mark_frame_cb),
  0, NULL, NULL,},
+ {"/Edit/Mark _All Displayed Packets", "<shift><control>M", GTK_MENU_FUNC(packet_list_mark_all_frames_cb), 0, NULL, NULL,},
+ {"/Edit/_Unmark All Displayed Packets", "<alt><control>M", GTK_MENU_FUNC(packet_list_unmark_all_frames_cb), 0, NULL, NULL,},
  {"/Edit/Find Next Mark", "<shift><control>N", GTK_MENU_FUNC(find_next_mark_cb),
  0, NULL, NULL,},
  {"/Edit/Find Previous Mark", "<shift><control>B", GTK_MENU_FUNC(find_prev_mark_cb),
  0, NULL, NULL,},
- {"/Edit/Mark _All Displayed Packets (toggle)", "<shift><control>M", GTK_MENU_FUNC(packet_list_mark_all_frames_cb), 0, NULL, NULL,},
- {"/Edit/_Unmark All Packets", "<alt><control>M", GTK_MENU_FUNC(packet_list_unmark_all_frames_cb), 0, NULL, NULL,},
  {"/Edit/<separator>", NULL, NULL, 0, "<Separator>", NULL,},
  {"/Edit/_Ignore Packet (toggle)", "<control>D", GTK_MENU_FUNC(packet_list_ignore_frame_cb),
  0, NULL, NULL,},

diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
@@ -1470,28 +1470,32 @@ mark_all_displayed_frames(gboolean set)
 void
 new_packet_list_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
 {
- if (cf_find_packet_marked(&cfile, SD_FORWARD)) {
- mark_all_displayed_frames(FALSE);
- }else {
- mark_all_displayed_frames(TRUE);
- }
+ mark_all_displayed_frames(TRUE);
+ mark_frames_ready();
+}
+
+void
+new_packet_list_unmark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+{
+ mark_all_displayed_frames(FALSE);
  mark_frames_ready();
 }
 
 static void
-unmark_all_frames()
+toggle_mark_all_displayed_frames()
 {
  /* XXX: we might need a progressbar here */
  frame_data *fdata;
- for (fdata = cfile.plist_start; fdata != NULL && cfile.marked_count > 0; fdata = fdata->next) {
- set_frame_mark(FALSE, fdata);
+ for (fdata = cfile.plist_start; fdata != NULL; fdata = fdata->next) {
+ if( fdata->flags.passed_dfilter )
+ set_frame_mark(!fdata->flags.marked, fdata);
  }
 }
 
 void
-new_packet_list_unmark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+new_packet_list_toggle_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
 {
- unmark_all_frames();
+ toggle_mark_all_displayed_frames();
  mark_frames_ready();
 }
 

diff --git a/gtk/new_packet_list.h b/gtk/new_packet_list.h
@@ -73,7 +73,14 @@ extern void new_packet_list_set_font(PangoFontDescription *font);
  */
 extern void new_packet_list_mark_frame_cb(GtkWidget *widget, gpointer data);
 
-/** Mark/unmark all displayed packets.
+/** Toggle Mark on all displayed packets.
+ *
+ * @param widget parent widget (unused)
+ * @param data unused
+ */
+extern void new_packet_list_toggle_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+
+/** Mark all displayed packets.
  *
  * @param widget parent widget (unused)
  * @param data unused
@@ -85,7 +92,7 @@ extern void new_packet_list_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpoin
  * @param widget parent widget (unused)
  * @param data unused
  */
-extern void new_packet_list_unmark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_);
+extern void new_packet_list_unmark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_);
 
 /** Ignore the currently selected packet.
  *