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.15 by root, Mon Feb 6 05:40:16 2006 UTC vs.
Revision 1.20 by root, Mon Feb 20 19:42:55 2006 UTC

84 0, $self->{tabheight}, 84 0, $self->{tabheight},
85 $self->width, $self->height - $self->{tabheight} 85 $self->width, $self->height - $self->{tabheight}
86 ); 86 );
87} 87}
88 88
89sub on_resize_all_windows {
90 my ($self, $width, $height) = @_;
91
92 1
93}
94
89sub copy_properties { 95sub copy_properties {
90 my ($self) = @_; 96 my ($self) = @_;
91 my $tab = $self->{cur}; 97 my $tab = $self->{cur};
92 98
93 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
94 100
95 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 101 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
102
103 delete $our_props{$self->XInternAtom ($_)}
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);
96 106
97 for my $atom ($tab->XListProperties ($tab->parent)) { 107 for my $atom ($tab->XListProperties ($tab->parent)) {
98 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 108 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
99 109
100 delete $our_props{$atom}; 110 delete $our_props{$atom};
101 111
102 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
103 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
104 114
105 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
106 116
107 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
108 } 118 }
119
120 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
121
122 if ($dtype != $type or $dformat != $format or $ditems ne $items) {
109 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
124 }
110 } 125 }
111 126
112 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 127 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
113} 128}
114 129
123 138
124 $self->{cur} = $tab; 139 $self->{cur} = $tab;
125 140
126 $self->configure; 141 $self->configure;
127 $self->copy_properties; 142 $self->copy_properties;
128 $tab->focus_in; 143
144 $tab->focus_out; # just in case, should be a nop
145 $tab->focus_in if $self->focus;
146
129 $tab->XMapWindow ($tab->parent); 147 $tab->XMapWindow ($tab->parent);
130 delete $tab->{activity}; 148 delete $tab->{activity};
131 $self->refresh; 149 $self->refresh;
132 150
133 () 151 ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines