summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-16 15:15:36 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-16 15:15:36 +0000
commit341d17c5b5021cc39159fbcae4975e87fbd6d122 (patch)
treea64b6243440b29d9a39d62a5684f54461a96ee5f
parent91291704c2621682c226bdeaa0b5a1cc7a971b8d (diff)
downloadcontrol-center-341d17c5b5021cc39159fbcae4975e87fbd6d122.tar
control-center-341d17c5b5021cc39159fbcae4975e87fbd6d122.tar.gz
control-center-341d17c5b5021cc39159fbcae4975e87fbd6d122.tar.bz2
control-center-341d17c5b5021cc39159fbcae4975e87fbd6d122.tar.xz
control-center-341d17c5b5021cc39159fbcae4975e87fbd6d122.zip
restore back rxvt embedding
-rwxr-xr-xcontrol-center14
1 files changed, 9 insertions, 5 deletions
diff --git a/control-center b/control-center
index 73398cc1..04a6768c 100755
--- a/control-center
+++ b/control-center
@@ -395,7 +395,7 @@ my (@curr_state, @old_state);
my ($d_width, $d_height) = (160, 45);
my @colors = (gtkcolor(0, 0, 0), gtkcolor(0xAA, 0xAA, 0xFF), gtkcolor(0, 0, 0));
my $spacing = 25;
-my $scale = 4;
+my $scale = 0;
my (@lspacing, $txt_offset);
my $top_lspacing = 4;
@@ -418,7 +418,8 @@ foreach (@tree) {
@lspacing = ($lspacing, $lspacing+$scale/2, $lspacing);
}
- my @icon_pixbufs = ($icon_pixbuf, scale(render_shiner($icon_pixbuf, 1.89), $scale), $icon_pixbuf);
+# my @icon_pixbufs = ($icon_pixbuf, scale(render_shiner($icon_pixbuf, 1.89), $scale), $icon_pixbuf);
+ my @icon_pixbufs = ($icon_pixbuf, render_shiner($icon_pixbuf, 1.89), $icon_pixbuf);
my @fonts = map { Gtk2::Pango::FontDescription->from_string($_) } '', 'Bold', 'Bold';
my ($lines, $widths, $heights, @dbl_area_left);
@@ -634,8 +635,9 @@ sub fork_ {
}
sub compute_exec_string {
- my ($icon, $log_exp, $exec, $gtkplug, undef, $alternate) = @_; #($_[0], @{$_[1]});
- $exec .= " --summary" if $expert_wizard && $exec =~ /drakwizard/;
+ my ($icon, $log_exp, $exec_, $gtkplug, undef, $alternate) = @_; #($_[0], @{$_[1]});
+ use Data::Dumper; print Dumper(\@_);
+ my $exec = $exec_ . " --summary" if $expert_wizard && $exec_ =~ /drakwizard/;
if ($embedded) {
if ($gtkplug != -1) { # not explicitely not embedded
$notebook_global->hide;
@@ -660,7 +662,7 @@ sub compute_exec_string {
} else { # gtkplug == 0
$emb_socket->show;
$SIG{CHLD} = undef;
- $emb_socket->steal(launch_xapp($exec));
+ $emb_socket->steal(launch_xapp(@{$exec_}));
$SIG{CHLD} = \&sig_child;
}
} else { # not embedded
@@ -696,6 +698,8 @@ sub compute_exec_string {
sub launch_xapp {
my ($exec, $name, $xx) = @_;
+ print "GOTCHA !!!\n\n";
+ use Data::Dumper; print Dumper(\@_);
my $find_windows = sub { split '\n', `xwininfo -root -tree -int | grep '$name'` };
my @before = &$find_windows();
fork_("$exec; kill -USR1 $$");