ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/perl/tabbed
(Generate patch)

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.20 by root, Mon Feb 20 19:42:55 2006 UTC vs.
Revision 1.25 by root, Sun Jun 15 14:54:44 2008 UTC

… …
42 42
43 $self->want_refresh; 43 $self->want_refresh;
44} 44}
45 45
46sub new_tab { 46sub new_tab {
47 my ($self) = @_; 47 my ($self, @argv) = @_;
48 48
49 my $offset = $self->fheight; 49 my $offset = $self->fheight;
50 50
51 # save a backlink to us, make sure tabbed is inactive 51 # save a backlink to us, make sure tabbed is inactive
52 push @urxvt::TERM_INIT, sub { 52 push @urxvt::TERM_INIT, sub {
53 my ($term) = @_; 53 my ($term) = @_;
54 $term->{parent} = $self; 54 $term->{parent} = $self;
55 55
56 $term->resource ($_->[0] => $_->[1]) 56 for (0 .. urxvt::NUM_RESOURCES - 1) {
57 for @{ $self->{resource} || [] }; 57 my $value = $self->{resource}[$_];
58
59 $term->resource ("+$_" => $value)
60 if defined $value;
61 }
58 62
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 63 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60
61 }; 64 };
62 65
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 66 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 67
65 my $term = new urxvt::term 68 my $term = new urxvt::term
66 $self->env, $urxvt::RXVTNAME, 69 $self->env, $urxvt::RXVTNAME,
67 -embed => $self->parent, 70 -embed => $self->parent,
71 @argv,
68 ; 72 ;
69} 73}
70 74
71sub configure { 75sub configure {
72 my ($self) = @_; 76 my ($self) = @_;
… …
96 my ($self) = @_; 100 my ($self) = @_;
97 my $tab = $self->{cur}; 101 my $tab = $self->{cur};
98 102
99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 103 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
100 104
101 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 105 my $current = delete $self->{current_properties};
102 106
103 delete $our_props{$self->XInternAtom ($_)} 107 # pass 1: copy over properties different or nonexisting
104 for qw(WM_STATE WM_ICON_SIZE
105 _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS);
106
107 for my $atom ($tab->XListProperties ($tab->parent)) { 108 for my $atom ($tab->XListProperties ($tab->parent)) {
108 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 109 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
109 110
110 delete $our_props{$atom}; 111 # fix up size hints
111
112 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
113 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
114 114
115 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
116 116
117 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
118 } 118 }
119 119
120 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); 120 my $cur = delete $current->{$atom};
121 121
122 if ($dtype != $type or $dformat != $format or $ditems ne $items) { 122 # update if changed, we assume empty items and zero type and format will not happen
123 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
124 } 124 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
125 }
126 125
126 $self->{current_properties}{$atom} = [$type, $format, $items];
127 }
128
129 # pass 2, delete all extraneous properties
127 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 130 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
128} 131}
129 132
130sub make_current { 133sub make_current {
131 my ($self, $tab) = @_; 134 my ($self, $tab) = @_;
132 135
… …
206} 209}
207 210
208sub on_init { 211sub on_init {
209 my ($self) = @_; 212 my ($self) = @_;
210 213
211 for (qw(name perl_ext_1 perl_ext_2)) { 214 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
212 my $val = $self->resource ($_);
213
214 push @{ $self->{resource} }, [$_ => $val]
215 if defined $val;
216 }
217 215
218 $self->resource (int_bwidth => 0); 216 $self->resource (int_bwidth => 0);
219 $self->resource (name => "URxvt.tabbed"); 217 $self->resource (name => "URxvt.tabbed");
220 $self->resource (pty_fd => -1); 218 $self->resource (pty_fd => -1);
221 219
… …
242 240
243 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 241 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
244 242
245 $self->cmd_parse ("\033[?25l"); 243 $self->cmd_parse ("\033[?25l");
246 244
245 my @argv = $self->argv;
246
247 do {
248 shift @argv;
249 } while @argv && $argv[0] ne "-e";
250
247 $self->new_tab; 251 $self->new_tab (@argv);
248 252
249 () 253 ()
250} 254}
251 255
252sub on_configure_notify { 256sub on_configure_notify {
… …
312 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 316 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
313 317
314 return 1; 318 return 1;
315 } elsif ($keysym == 0xff54) { 319 } elsif ($keysym == 0xff54) {
316 $self->new_tab; 320 $self->new_tab;
321
322 return 1;
323 }
324 }
325 elsif ($event->{state} & urxvt::ControlMask) {
326 if ($keysym == 0xff51 || $keysym == 0xff53) {
327 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
328 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
329
330 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
331 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
332
333 $self->make_current ($self->{tabs}[$idx2]);
317 334
318 return 1; 335 return 1;
319 } 336 }
320 } 337 }
321 338

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines