- don't require unused modules

- use my_gtk to transparently handle embedding
- fixes for strict mode
- fixes for perl_checker (more to come after lunch)

1 files changed, 133 insertions, 143 deletions

diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index b173a9334..6168e9265 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -22,48 +22,45 @@
 # MA 02111-1307, USA.
 
 
-use POSIX;
-use Gtk;
+use strict;
 use lib qw(/usr/lib/libDrakX);
 
 use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
 
 use interactive;
 use common;
-use Config;
-use any;
 use ugtk qw(:helpers);
-init Gtk;
-Gtk->set_locale;
+use my_gtk qw(:helpers);
 
-$in = 'interactive'->vnew('su', 'default');
+my $in = interactive->vnew('su', 'default');
 
-$expert_mode = 0;
+my $expert_mode = 0;
 # we have put here the list in order to do $list->clear() when we have to do
-$fixed_font = Gtk::Gdk::Font->fontset_load(N("-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"));
-my @titles = ( N("Module name"), N("Size") );
-my $list = new_with_titles Gtk::CList( @titles );
-
-my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel;
-$window->signal_connect( 'delete_event', sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) });
-$window->set_title( N("drakfloppy") );
-$window->set_policy(1, 1, 1);
-$window->border_width (5);
+my $fixed_font = Gtk::Gdk::Font->fontset_load(N("-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"));
+my $list = new_with_titles Gtk::CList(N("Module name"), N("Size"));
+
+my $window = my_gtk->new('drakfloppy');
+unless ($::isEmbedded) {
+    $window->{rwindow}->signal_connect(delete_event => sub { my_gtk->exit(0) });
+    $window->{rwindow}->set_title(N("drakfloppy"));
+    $window->{rwindow}->set_policy(1, 1, 1);
+    $window->{rwindow}->border_width(5);
+}
 
 ### menus definition
 # the menus are not shown
 # but they provides shiny shortcut like C-q
 my @menu_items = ( 
 		  { path => N("/_File"), type => '<Branch>' },
-		  { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } },
+		  { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { my_gtk->exit(0) } },
 		 );
-my $menubar = ugtk::create_factory_menu($window, @menu_items);
+ugtk::create_factory_menu($window->{rwindow}, @menu_items) unless $::isEmbedded;
 
 ######### menus end
 
 my $global_vbox = new Gtk::VBox();
 
-$::isEmbedded or $global_vbox->pack_start (new Gtk::Label(N("boot disk creation")), 0, 0, 0);
+$global_vbox->pack_start(new Gtk::Label(N("boot disk creation")), 0, 0, 0) unless $::isEmbedded;
 
 ######## up part
 my $up_vbox  = new Gtk::VBox (0, 0);
@@ -71,20 +68,20 @@ my $up_vbox  = new Gtk::VBox (0, 0);
 # device part
 my $dev_hbox = new Gtk::HBox (1, 0);
 my $device_combo = new Gtk::Combo();
-my $device_button = new Gtk::Button( N("default") );
+my $device_button = new Gtk::Button(N("default"));
 
-$device_combo->set_popdown_strings( "/dev/fd0", "/dev/fd1", );
-$device_button->signal_connect( 'clicked', sub { $device_combo->entry->set_text("/dev/fd0");});
+$device_combo->set_popdown_strings("/dev/fd0", "/dev/fd1");
+$device_button->signal_connect(clicked => sub { $device_combo->entry->set_text("/dev/fd0") });
 
-$dev_hbox->pack_start (new Gtk::Label( N("device") ), 0, 0, 0);
-$dev_hbox->pack_start ($device_combo, 0, 0, 0);
-$dev_hbox->pack_start ($device_button, 0, 0, 0);
-$up_vbox->pack_start  ($dev_hbox, 0, 0, 0);
+$dev_hbox->pack_start(new Gtk::Label(N("device")), 0, 0, 0);
+$dev_hbox->pack_start($device_combo, 0, 0, 0);
+$dev_hbox->pack_start($device_button, 0, 0, 0);
+$up_vbox->pack_start($dev_hbox, 0, 0, 0);
 
 # kernel part
 my $ker_hbox = new Gtk::HBox (1, 0);
 my $kernel_combo = new Gtk::Combo();
-my $kernel_button = new Gtk::Button( N("default") );
+my $kernel_button = new Gtk::Button(N("default"));
 $kernel_combo->disable_activate();
 $kernel_combo->set_popdown_strings( do {
     opendir YREP, "/lib/modules" or die N("DrakFloppy Error: %s", $!);
@@ -93,33 +90,33 @@ $kernel_combo->set_popdown_strings( do {
     @files_modules;
 });
 #$kernel_combo->entry->set_text(`uname -r`);
-$kernel_combo->entry->signal_connect( "changed", sub { change_tree($kernel_combo->entry->get_text()); $list->clear();});
-$aaaa= `uname -r`;
-chomp ($aaaa);
-$kernel_button->signal_connect( 'clicked', sub { $kernel_combo->entry->set_text($aaaa); $list->clear(); });
+$kernel_combo->entry->signal_connect(changed => sub { change_tree($kernel_combo->entry->get_text()); $list->clear() });
+my $aaaa = `uname -r`;
+chomp($aaaa);
+$kernel_button->signal_connect(clicked => sub { $kernel_combo->entry->set_text($aaaa); $list->clear() });
 
-$ker_hbox->pack_start (new Gtk::Label( N("kernel version") ), 0, 0, 0);
-$ker_hbox->pack_start ($kernel_combo, 0, 0, 0);
-$ker_hbox->pack_start ($kernel_button, 0, 0, 0);
-$up_vbox->pack_start  ($ker_hbox, 0, 0, 5);
+$ker_hbox->pack_start(new Gtk::Label(N("kernel version")), 0, 0, 0);
+$ker_hbox->pack_start($kernel_combo, 0, 0, 0);
+$ker_hbox->pack_start($kernel_button, 0, 0, 0);
+$up_vbox->pack_start($ker_hbox, 0, 0, 5);
 
 # vbox part
-my $up_frame = new Gtk::Frame( N("General") );
+my $up_frame = new Gtk::Frame(N("General"));
 $up_frame->add($up_vbox);
-$global_vbox->pack_start ($up_frame, 1, 1, 0);
+$global_vbox->pack_start($up_frame, 1, 1, 0);
 
 ### expert mode
-my $expert_main_frame = new Gtk::Frame( N("Expert Area") );
-my $expert_dedans = new Gtk::VBox( 0, 5 );
-$expert_dedans->border_width (5);
-my $expert_button_frame = new Gtk::Frame( N("mkinitrd optional arguments") );
-my $expert_mod_frame = new Gtk::Frame( N("Add a module") );
+my $expert_main_frame = new Gtk::Frame(N("Expert Area"));
+my $expert_dedans = new Gtk::VBox(0, 5);
+$expert_dedans->border_width(5);
+my $expert_button_frame = new Gtk::Frame(N("mkinitrd optional arguments"));
+my $expert_mod_frame = new Gtk::Frame(N("Add a module"));
 my $expert_pane = new Gtk::HPaned();
-$expert_pane->set_handle_size( 10 );
-$expert_pane->set_gutter_size( 8 );
+$expert_pane->set_handle_size(10);
+$expert_pane->set_gutter_size(8);
 
-my $expert_button = new Gtk::Button( N("Expert Mode") );
-$expert_button->signal_connect( "clicked", sub {
+my $expert_button = new Gtk::Button(N("Expert Mode"));
+$expert_button->signal_connect(clicked => sub {
 				  if ($expert_mode) {
 				    $expert_mod_frame->hide();
 				    $expert_button_frame->hide()
@@ -133,100 +130,98 @@ $expert_button->signal_connect( "clicked", sub {
 my $expert_button_vbox = new Gtk::VBox(0, 5);
 my $expert_button_hbox = new Gtk::HBox(0, 5);
 my $expert_button_hbox2 = new Gtk::HBox(0, 5);
-my $force_button = new Gtk::ToggleButton( N("force") );
-my $needed_button = new Gtk::ToggleButton( N("if needed") );
-my $scsi_button = new Gtk::ToggleButton( N("omit scsi modules") );
-my $raid_button = new Gtk::ToggleButton( N("omit raid modules") );
-$expert_button_hbox->pack_start( $force_button, 0, 0, 0 );
-$expert_button_hbox->pack_start( $raid_button, 0, 0, 0 );
+my $force_button = new Gtk::ToggleButton(N("force"));
+my $needed_button = new Gtk::ToggleButton(N("if needed"));
+my $scsi_button = new Gtk::ToggleButton(N("omit scsi modules"));
+my $raid_button = new Gtk::ToggleButton(N("omit raid modules"));
+$expert_button_hbox->pack_start($force_button, 0, 0, 0);
+$expert_button_hbox->pack_start($raid_button, 0, 0, 0);
 
-$expert_button_hbox2->pack_start( $needed_button, 0, 0, 0 );
-$expert_button_hbox2->pack_start( $scsi_button, 0, 0, 0 );
+$expert_button_hbox2->pack_start($needed_button, 0, 0, 0);
+$expert_button_hbox2->pack_start($scsi_button, 0, 0, 0);
 
 $expert_button_vbox->pack_start($expert_button_hbox, 0, 0, 0);
 $expert_button_vbox->pack_start($expert_button_hbox2, 0, 0, 0);
 $expert_button_frame->add($expert_button_vbox);
-$expert_dedans->pack_start ($expert_button_frame, 0, 0, 0);
+$expert_dedans->pack_start($expert_button_frame, 0, 0, 0);
 $expert_mod_frame->add($expert_pane);
-$expert_dedans->pack_start ($expert_mod_frame, 1, 1, 0);
+$expert_dedans->pack_start($expert_mod_frame, 1, 1, 0);
 $expert_main_frame->add($expert_dedans);
-$global_vbox->pack_start ($expert_main_frame, 1, 1, 0);
+$global_vbox->pack_start($expert_main_frame, 1, 1, 0);
 
 ### the tree
 
 # Create a ScrolledWindow for the tree
 my $tree_scrolled_win = new Gtk::ScrolledWindow();
 $tree_scrolled_win->set_usize( 200, $::isEmbedded ? 0 : 175);
-$expert_pane->add1( $tree_scrolled_win );
-$tree_scrolled_win->set_policy( 'automatic', 'automatic' );
+$expert_pane->add1($tree_scrolled_win);
+$tree_scrolled_win->set_policy('automatic', 'automatic');
 
 # Create root tree
 my $tree = new Gtk::Tree();
 my $leaf;
 my $root_dir;
-$tree_scrolled_win->add_with_viewport( $tree );
-$tree->set_selection_mode( 'single' );
-$tree->set_view_mode( 'item' );
+$tree_scrolled_win->add_with_viewport($tree);
+$tree->set_selection_mode('single');
+$tree->set_view_mode('item');
 
-fill_tree ($kernel_combo->entry->get_text());
+fill_tree($kernel_combo->entry->get_text());
 
 # Create a ScrolledWindow for the list
-my $list_scrolled_win = new Gtk::ScrolledWindow( undef, undef );
-my $rmmod_button = new Gtk::Button( N("Remove a module") );
-my $expert_inside_pane2 = new Gtk::VBox (0, 0);
+my $list_scrolled_win = new Gtk::ScrolledWindow(undef, undef);
+my $rmmod_button = new Gtk::Button(N("Remove a module"));
+my $expert_inside_pane2 = new Gtk::VBox(0, 0);
 my $list_selected_row;
 
-$expert_inside_pane2->pack_start ($list_scrolled_win, 1, 1, 0);
-$expert_inside_pane2->pack_start ($rmmod_button, 0, 0, 0);
-$expert_pane->add2( $expert_inside_pane2 );
-$list_scrolled_win->set_policy( 'automatic', 'automatic' );
-$rmmod_button->signal_connect('clicked', sub {$list->remove($list_selected_row);});
+$expert_inside_pane2->pack_start($list_scrolled_win, 1, 1, 0);
+$expert_inside_pane2->pack_start($rmmod_button, 0, 0, 0);
+$expert_pane->add2($expert_inside_pane2);
+$list_scrolled_win->set_policy('automatic', 'automatic');
+$rmmod_button->signal_connect(clicked => sub { $list->remove($list_selected_row) });
 
 # Create list box
 ########################################################## from here my $list
-$list->signal_connect('select_row', sub { (undef, $list_selected_row) = @_; });
-$list_scrolled_win->add( $list );
+$list->signal_connect(select_row => sub { (undef, $list_selected_row) = @_ });
+$list_scrolled_win->add($list);
 $list->set_column_justification(1, 'right');
-$list->set_column_width( 0, 200 );
-$list->set_column_width( 1, 50 );
-$list->set_selection_mode( 'single' );
-$list->set_shadow_type( 'none' );
+$list->set_column_width(0, 200);
+$list->set_column_width(1, 50);
+$list->set_selection_mode('single');
+$list->set_shadow_type('none');
 $list->show();
 
 ### output
-my $output_frame = new Gtk::Frame( N("Output") );
-my $output = new Gtk::Text( undef, undef );
-my $vscrollbar = new Gtk::VScrollbar( $output->vadj );
-my $output_hbox = new Gtk::HBox (0, 0);
-$output_hbox->border_width (5);
-$output_hbox->set_usize( 30, 75 );
-$output_hbox->pack_start( $output, 1, 1, 0 );
-$output_hbox->pack_start( $vscrollbar, 0, 0, 0 );
-$output_frame->add ($output_hbox);
-$global_vbox->pack_start ($output_frame, 0, 0, 0);
+my $output_frame = new Gtk::Frame(N("Output"));
+my $output = new Gtk::Text(undef, undef);
+my $vscrollbar = new Gtk::VScrollbar($output->vadj);
+my $output_hbox = new Gtk::HBox(0, 0);
+$output_hbox->border_width(5);
+$output_hbox->set_usize(30, 75);
+$output_hbox->pack_start($output, 1, 1, 0);
+$output_hbox->pack_start($vscrollbar, 0, 0, 0);
+$output_frame->add($output_hbox);
+$global_vbox->pack_start($output_frame, 0, 0, 0);
 
 ### final buttons
-my $build_button = new Gtk::Button( N("Build the disk") );
-my $cancel_button = new Gtk::Button( N("Cancel") );
-my $fin_hbox = new Gtk::HBox( 0, 0 );
-$cancel_button->signal_connect( clicked=> sub {$::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0)});
-$build_button->signal_connect('clicked', \&build_it);
+my $build_button = new Gtk::Button(N("Build the disk"));
+my $cancel_button = new Gtk::Button(N("Cancel"));
+my $fin_hbox = new Gtk::HBox(0, 0);
+$cancel_button->signal_connect(clicked => sub { my_gtk->exit(0) });
+$build_button->signal_connect(clicked => \&build_it);
 $fin_hbox->pack_end($cancel_button, 0, 0, 0);
 $fin_hbox->pack_end($build_button,  0, 0, 10);
 $fin_hbox->pack_end($expert_button, 0, 0, 10);
-$global_vbox->pack_start ($fin_hbox, 0, 0, 0);
+$global_vbox->pack_start($fin_hbox, 0, 0, 0);
 
 ### back to window
-$window->add( $global_vbox );
+$window->{window}->add($global_vbox);
 
-$window->show_all();
+$window->{rwindow}->show_all();
 $expert_mod_frame->hide();
 $expert_button_frame->hide();
 
-Gtk->main_iteration while Gtk->events_pending;
-$::isEmbedded and kill 'USR2', $::CCPID;
-Gtk->main;
-
+$window->main;
+my_gtk->exit(0);
 
 
 #-------------------------------------------------------------
@@ -238,83 +233,80 @@ sub fill_tree {
   ($root_dir) = @_;
   $root_dir = "/lib/modules/" . $root_dir;
   # Create root tree item widget
-  $leaf = new_with_label Gtk::TreeItem( $root_dir );
-  $tree->append( $leaf );
-  $leaf->signal_connect( 'select', \&select_item, $root_dir );
-  $leaf->set_user_data( $root_dir );
+  $leaf = new_with_label Gtk::TreeItem($root_dir);
+  $tree->append($leaf);
+  $leaf->signal_connect('select', \&select_item, $root_dir);
+  $leaf->set_user_data($root_dir);
 
   # Create the subtree
-  if ( has_sub_trees( $root_dir ) ) {
+  if (has_sub_trees($root_dir)) {
     my $subtree = new Gtk::Tree();
-    $leaf->set_subtree( $subtree );
-    $leaf->signal_connect( 'expand', \&expand_tree, $subtree );
-    $leaf->signal_connect( 'collapse', \&collapse_tree );
+    $leaf->set_subtree($subtree);
+    $leaf->signal_connect('expand', \&expand_tree, $subtree);
+    $leaf->signal_connect('collapse', \&collapse_tree);
     $leaf->expand();
   }
 }
 
 sub change_tree {
   $leaf->destroy();
-  fill_tree (@_);
+  fill_tree(@_);
   $leaf->show();
 }
 
 # Callback for expanding a tree - find subdirectories, files and add them to tree
-sub expand_tree
-  {
-    my ( $item, $subtree ) = @_;
+sub expand_tree {
+    my ($item, $subtree) = @_;
 
-    my $dir_entry;
     my $path;
     my $item_new;
     my $new_subtree;
 
     my $dir = $item->get_user_data();
 
-    chdir( $dir );
+    chdir($dir);
 
-    foreach $dir_entry (all(".")) {
-      if (( -d $dir_entry ) or ( $dir_entry =~ /\.o(\.gz)?$/)) {
+    foreach my $dir_entry (all(".")) {
+      if (-d $dir_entry or $dir_entry =~ /\.o(\.gz)?$/) {
 	$path = $dir . "/" . $dir_entry;
 	$path =~ s|//|/|g;
-	$item_new = new_with_label Gtk::TreeItem( $dir_entry );
-	$item_new->set_user_data( $path );
-	$item_new->signal_connect( 'select', \&select_item, $path );
-	$subtree->append( $item_new );
+	$item_new = new_with_label Gtk::TreeItem($dir_entry);
+	$item_new->set_user_data($path);
+	$item_new->signal_connect('select', \&select_item, $path);
+	$subtree->append($item_new);
 	$item_new->show();
 
-	if ( has_sub_trees( $path ) ) {
+	if (has_sub_trees($path)) {
 	  $new_subtree = new Gtk::Tree();
-	  $item_new->set_subtree( $new_subtree );
-	  $item_new->signal_connect( 'expand', \&expand_tree, $new_subtree );
-	  $item_new->signal_connect( 'collapse', \&collapse_tree );
+	  $item_new->set_subtree($new_subtree);
+	  $item_new->signal_connect('expand', \&expand_tree, $new_subtree);
+	  $item_new->signal_connect('collapse', \&collapse_tree);
 	}
       }
     }
-    chdir( ".." );
+    chdir("..");
   }
 
 
 # Callback for collapsing a tree -- removes the subtree
-sub collapse_tree
-  {
-    my ( $item ) = @_;
+sub collapse_tree {
+    my ($item) = @_;
     my $subtree = new Gtk::Tree();
 
     $item->remove_subtree();
-    $item->set_subtree( $subtree );
-    $item->signal_connect( 'expand', \&expand_tree, $subtree );
+    $item->set_subtree($subtree);
+    $item->signal_connect('expand', \&expand_tree, $subtree);
   }
 
 # Called whenever an item is clicked on the tree widget.
 sub select_item  {
-  my ( $widget, $file ) = @_;
-  return  if (-d $file);
-  my  $size = ( lstat( $file ) )[ 7 ];
+  my ($widget, $file) = @_;
+  return if -d $file;
+  my  $size = (lstat( $file))[7];
   my $lr = $list->rows();
   my $i;
   $file =~ s|/lib/modules/.*?/||g;
-  for ($i=0; $i < $lr; $i++) {
+  for ($i = 0; $i < $lr; $i++) {
     last if ($file eq $list->get_text($i, 0));
   }
   print $file,"\n";
@@ -372,15 +364,13 @@ sub build_it {
 ####
 
 # Test whether a directory has subdirectories
-sub has_sub_trees
-  {
-    my ( $dir ) = @_;
-    my $file;
-
-    foreach $file (glob_("$dir/*")) {
-      return 1 if ( -d $file ) or ($file =~ /\.o(\.gz)?$/);
+sub has_sub_trees {
+    my ($dir) = @_;
+    
+    foreach my $file (glob_("$dir/*")) {
+        return 1 if ( -d $file ) or ($file =~ /\.o(\.gz)?$/);
     }
-
+    
     return (0);
-  }
+}