ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.226 by root, Tue May 23 23:14:46 2006 UTC vs.
Revision 1.242 by elmex, Sat May 27 20:00:40 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 185 }
167
168 $widget->reconfigure;
169 } 186 }
187
188 reconfigure_widgets;
170} 189}
171 190
172############################################################################# 191#############################################################################
173 192
174package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
194 } 213 }
195 } 214 }
196 215
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
199 $self 225 $self
200} 226}
201 227
202sub destroy { 228sub destroy {
203 my ($self) = @_; 229 my ($self) = @_;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 251 },
226 ); 252 );
227} 253}
228 254
229sub hide { 255sub set_invisible {
230 my ($self) = @_; 256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
231 262
232 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 264 undef $HOVER if $HOVER == $self;
265
266 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self;
268
269 $self->focus_out;
270}
271
272sub hide {
273 my ($self) = @_;
274
275 $self->set_invisible;
234 276
235 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
236 if $self->{parent}; 278 if $self->{parent};
237} 279}
238 280
… …
308} 350}
309 351
310sub set_tooltip { 352sub set_tooltip {
311 my ($self, $tooltip) = @_; 353 my ($self, $tooltip) = @_;
312 354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
313 $self->{tooltip} = $tooltip; 360 $self->{tooltip} = $tooltip;
314 361
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 363 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 364 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 385 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
340 387
341 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
342 389
343 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
344 391
345 $focus->update if $focus; 392 $focus->update if $focus;
346 $FOCUS->update; 393 $FOCUS->update;
347} 394}
348 395
… …
351 398
352 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
353 400
354 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
355 402
356 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
357 404
358 $focus->update if $focus; #? 405 $focus->update if $focus; #?
406
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS;
359} 409}
360 410
361sub mouse_motion { } 411sub mouse_motion { }
362sub button_up { } 412sub button_up { }
363sub key_down { } 413sub key_down { }
364sub key_up { } 414sub key_up { }
365 415
366sub button_down { 416sub button_down {
367 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
368 418
369 $self->focus_in; 419 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 454 glPushMatrix;
405 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 458 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
412 glEnd; 462 glEnd;
413 glPopMatrix; 463 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 465 }
416} 466}
… …
436sub set_parent { 486sub set_parent {
437 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
438 488
439 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
440 490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
441 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 495 $self->check_size
443 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
444 497
445 $self->show; 498 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
464 517
465 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 519}
467 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
468sub emit { 527sub emit {
469 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
470 529
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
472} 532}
473 533
474sub DESTROY { 534sub DESTROY {
475 my ($self) = @_; 535 my ($self) = @_;
476 536
… …
589 delete $child->{parent}; 649 delete $child->{parent};
590 $child->hide; 650 $child->hide;
591 651
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 653
594 $self->check_size; 654 $self->check_size (1);
595 $self->update; 655 $self->update;
596} 656}
597 657
598sub clear { 658sub clear {
599 my ($self) = @_; 659 my ($self) = @_;
… …
739 799
740package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
741 801
742our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
743 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
744sub size_request { 814sub size_request {
745 my ($self) = @_; 815 my ($self) = @_;
746 816
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 818
… …
750} 820}
751 821
752sub size_allocate { 822sub size_allocate {
753 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
754 824
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
757 $self->child->configure (0, 0, $cw, $ch); 828 $self->child->configure (0, 0, $w, $h);
758 $self->update; 829 $self->update;
759} 830}
760 831
761sub set_offset { 832sub set_offset {
762 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
816 887
817 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
818 vertical => 1, 889 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 891 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 892 $self->{vp}->set_offset (0, $_[1]);
822 }, 893 },
823 ; 894 ;
824 895
825 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 897 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
834 905
835 $self 906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917}
918
919sub size_allocate {
920 my ($self, $w, $h) = @_;
921
922 $self->SUPER::size_allocate ($w, $h);
923
924 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 926}
837 927
838#TODO# update range on size_allocate depending on child 928#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 929# update viewport offset on scroll
840 930
… …
894 my $class = shift; 984 my $class = shift;
895 985
896 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
897 987
898 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
901 border => 0.6, 991 border => 0.6,
902 toplevel => 1, 992 is_toplevel => 1,
903 can_events => 1, 993 can_events => 1,
904 @_ 994 @_
905 ); 995 );
906 996
907 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 998 align => 0,
… …
1048sub new { 1138sub new {
1049 my $class = shift; 1139 my $class = shift;
1050 1140
1051 $class->SUPER::new ( 1141 $class->SUPER::new (
1052 col_expand => [], 1142 col_expand => [],
1053 @_ 1143 @_,
1054 ) 1144 )
1145}
1146
1147sub children {
1148 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1149}
1056 1150
1057sub add { 1151sub add {
1058 my ($self, $x, $y, $child) = @_; 1152 my ($self, $x, $y, $child) = @_;
1059 1153
1060 $child->set_parent ($self); 1154 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1155 $self->{children}[$y][$x] = $child;
1062 1156
1063 $child->check_size; 1157 $self->check_size (1);
1064} 1158}
1065 1159
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1160# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1161sub clear {
1072 my ($self) = @_; 1162 my ($self) = @_;
1073 1163
1074 my @children = $self->children; 1164 my @children = $self->children;
1075 delete $self->{children}; 1165 delete $self->{children};
… …
1077 for (@children) { 1167 for (@children) {
1078 delete $_->{parent}; 1168 delete $_->{parent};
1079 $_->hide; 1169 $_->hide;
1080 } 1170 }
1081 1171
1172 $self->check_size (1);
1082 $self->update; 1173 $self->update;
1083} 1174}
1084 1175
1085sub get_wh { 1176sub get_wh {
1086 my ($self) = @_; 1177 my ($self) = @_;
… …
1118sub size_allocate { 1209sub size_allocate {
1119 my ($self, $w, $h) = @_; 1210 my ($self, $w, $h) = @_;
1120 1211
1121 my ($ws, $hs) = $self->get_wh; 1212 my ($ws, $hs) = $self->get_wh;
1122 1213
1123 my $req_w = sum @$ws; 1214 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1215 my $req_h = (sum @$hs) || 1;
1125 1216
1126 # TODO: nicer code && do row_expand 1217 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1218 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1219 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1220 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1601 $self->{text} = $text;
1511 1602
1512 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1514 1605
1515 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1516} 1607}
1517 1608
1518sub set_text { 1609sub set_text {
1519 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1520 1611
… …
1532 my ($self) = @_; 1623 my ($self) = @_;
1533 1624
1534 my ($w, $h) = $self->SUPER::size_request; 1625 my ($w, $h) = $self->SUPER::size_request;
1535 1626
1536 ($w + 1, $h) # add 1 for cursor 1627 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1628}
1544 1629
1545sub key_down { 1630sub key_down {
1546 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1547 1632
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1651 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1652 $self->_emit ('escape');
1568 } elsif ($uni) { 1653 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1655 }
1571 1656
1572 $self->_set_text ($text); 1657 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1744 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1665 $self->update; 1750 $self->update;
1666 1751
1667 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1802 can_events => 1,
1718 @_ 1803 @_
1719 ) 1804 )
1720} 1805}
1721 1806
1807sub activate { }
1808
1722sub button_up { 1809sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1724 1811
1812 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1815}
1730 1816
1731sub _draw { 1817sub _draw {
1732 my ($self) = @_; 1818 my ($self) = @_;
1733 1819
… …
1785 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1786 1872
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1791 } 1877 }
1792} 1878}
1793 1879
1794sub _draw { 1880sub _draw {
1795 my ($self) = @_; 1881 my ($self) = @_;
… …
2070 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2158 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2159 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2160 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2162 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2163 req_h => $::WIDTH / 80,
2078 vertical => 0, 2164 vertical => 0,
2079 can_hover => 1, 2165 can_hover => 1,
2080 inner_pad => 0.02, 2166 inner_pad => 0.02,
… …
2088} 2174}
2089 2175
2090sub set_range { 2176sub set_range {
2091 my ($self, $range) = @_; 2177 my ($self, $range) = @_;
2092 2178
2093 $self->{range} = $range; 2179 ($range, $self->{range}) = ($self->{range}, $range);
2094 2180
2095 $self->update; 2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2096} 2183}
2097 2184
2098sub set_value { 2185sub set_value {
2099 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2100 2187
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2188 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2189
2103 $hi = $lo + 1 if $hi <= $lo; 2190 $hi = $lo + 1 if $hi <= $lo;
2104 2191
2192 $page = $hi - $lo if $page > $hi - $lo;
2193
2105 $value = $lo if $value < $lo; 2194 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2195 $value = $hi - $page if $value > $hi - $page;
2107 2196
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2197 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2198 if $unit;
2110 2199
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2201
2115 if ($value != $old_value) { 2202 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2203 $self->_emit (changed => $value);
2117 $self->update; 2204 $self->update;
2118 } 2205 }
2119} 2206}
2120 2207
2121sub size_request { 2208sub size_request {
… …
2129 2216
2130sub button_down { 2217sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2132 2219
2133 $self->SUPER::button_down ($ev, $x, $y); 2220 $self->SUPER::button_down ($ev, $x, $y);
2221
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223
2134 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
2135} 2225}
2136 2226
2137sub mouse_motion { 2227sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2230 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2231 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2232
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2233 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2234
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2236
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2238 }
2149} 2239}
2150 2240
2151sub update { 2241sub update {
2152 my ($self) = @_; 2242 my ($self) = @_;
2153 2243
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2245 $self->set_value ($self->{range}[0]);
2156 2246
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
2158 2249
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2251
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2252 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2253 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2254
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2255 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2256 $value = $value * $self->{scale} + $self->{offset};
2165 2257
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2258 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2259 $self->{knob_w} = $knob_w;
2173 }); 2260 });
2174 2261
2175 $self->SUPER::update; 2262 $self->SUPER::update;
2176} 2263}
2177 2264
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2380 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2381
2295 $self->reflow; 2382 $self->reflow;
2296} 2383}
2297 2384
2298sub text_height { 2385sub text_size {
2299 my ($self, $text, $indent) = @_; 2386 my ($self, $text, $indent) = @_;
2300 2387
2301 my $layout = $self->{layout}; 2388 my $layout = $self->{layout};
2302 2389
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2391 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2392 $layout->set_markup ($text);
2306 2393
2307 ($layout->size)[1] 2394 $layout->size
2308} 2395}
2309 2396
2310sub reflow { 2397sub reflow {
2311 my ($self) = @_; 2398 my ($self) = @_;
2312 2399
2313 $self->{need_reflow}++; 2400 $self->{need_reflow}++;
2314 $self->update; 2401 $self->update;
2315} 2402}
2316 2403
2404sub set_offset {
2405 my ($self, $offset) = @_;
2406
2407 # todo: base offset on lines or so, not on pixels
2408 $self->{children}[1]->set_value ($offset);
2409}
2410
2317sub clear { 2411sub clear {
2318 my ($self) = @_; 2412 my ($self) = @_;
2319 2413
2320 $self->{par} = []; 2414 $self->{par} = [];
2321 $self->{height} = 0; 2415 $self->{height} = 0;
2322 2416 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2417}
2325 2418
2326sub add_paragraph { 2419sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2420 my ($self, $color, $text, $indent) = @_;
2328 2421
2329 for my $line (split /\n/, $text) { 2422 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2423 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2424 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2426 }
2334 2427
2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2428 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2336 $self->{children}[1]->update;
2337} 2429}
2338 2430
2339sub update { 2431sub update {
2340 my ($self) = @_; 2432 my ($self) = @_;
2341 2433
… …
2344 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
2345 2437
2346 delete $self->{texture}; 2438 delete $self->{texture};
2347 2439
2348 $ROOT->on_post_alloc ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
2349 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2444 my $height = 0;
2351 2445
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
2353 for @{$self->{par}}; 2450 for (@{$self->{par}}) {
2451 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2452 $layout->set_width ($W - $_->[3]);
2453 $layout->set_markup ($_->[4]);
2454 my ($w, $h) = $layout->size;
2455 $_->[0] = $w + $_->[3];
2456 $_->[1] = $h;
2457 }
2458
2459 $height += $_->[1];
2460 }
2354 2461
2355 $self->{height} = $height; 2462 $self->{height} = $height;
2356 2463
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2465
2360 delete $self->{texture}; 2466 delete $self->{texture};
2361 } 2467 }
2362 2468
2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2366 2472
2367 my $top = int $self->{children}[1]{range}[0]; 2473 my $top = int $self->{children}[1]{range}[0];
2368 2474
2369 my $y0 = $top; 2475 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2476 my $y1 = $top + $H;
2371 2477
2372 my $y = 0; 2478 my $y = 0;
2373 2479
2374 my $layout = $self->{layout}; 2480 my $layout = $self->{layout};
2375 2481
2376 $layout->set_font ($self->{font}) if $self->{font}; 2482 $layout->set_font ($self->{font}) if $self->{font};
2377 2483
2378 glEnable GL_BLEND; 2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2487
2381 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2489 my $h = $par->[1];
2383 2490
2384 if ($y0 < $y + $h && $y < $y1) { 2491 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2492 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2493 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2494 $layout->set_markup ($par->[4]);
2388 2495
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2497
2391 glRasterPos $par->[2], $y - $y0; 2498 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2499 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2500 }
2394 2501
2395 $y += $h; 2502 $y += $h;
2396 } 2503 }
… …
2483 2590
2484 # TODO: use animation 2591 # TODO: use animation
2485 if ($self->{state} = !$self->{state}) { 2592 if ($self->{state} = !$self->{state}) {
2486 $CFClient::UI::ROOT->add ($self->{other}); 2593 $CFClient::UI::ROOT->add ($self->{other});
2487 $self->{other}->move ($self->coord2global (0, $self->{h})); 2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2488 $self->emit ("open"); 2595 $self->_emit ("open");
2489 } else { 2596 } else {
2490 $CFClient::UI::ROOT->remove ($self->{other}); 2597 $CFClient::UI::ROOT->remove ($self->{other});
2491 $self->emit ("close"); 2598 $self->_emit ("close");
2492 } 2599 }
2493 2600
2494 $self->emit (changed => $self->{state}); 2601 $self->_emit (changed => $self->{state});
2495} 2602}
2496 2603
2497############################################################################# 2604#############################################################################
2498 2605
2499package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2575 2682
2576sub new { 2683sub new {
2577 my $class = shift; 2684 my $class = shift;
2578 2685
2579 my $self = $class->SUPER::new ( 2686 my $self = $class->SUPER::new (
2580 aspect => 1, 2687 aspect => 1,
2688 can_events => 0,
2581 @_, 2689 @_,
2582 ); 2690 );
2583 2691
2584 if ($self->{anim} && $self->{animspeed}) { 2692 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self); 2693 Scalar::Util::weaken (my $widget = $self);
… …
2611} 2719}
2612 2720
2613sub _draw { 2721sub _draw {
2614 my ($self) = @_; 2722 my ($self) = @_;
2615 2723
2616 return unless $::CONN;#d# manage and cache textures differently 2724 return unless $::CONN;
2617 2725
2618 my $face; 2726 my $face;
2619 2727
2620 if ($self->{frame}) { 2728 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2729 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2644 $self->SUPER::DESTROY; 2752 $self->SUPER::DESTROY;
2645} 2753}
2646 2754
2647############################################################################# 2755#############################################################################
2648 2756
2649package CFClient::UI::InventoryItem; 2757package CFClient::UI::Inventory;
2650 2758
2651our @ISA = CFClient::UI::HBox::; 2759our @ISA = CFClient::UI::ScrolledWindow::;
2652
2653sub _item_to_desc {
2654 my ($item) = @_;
2655
2656 my $desc =
2657 $item->{nrof} < 2
2658 ? $item->{name}
2659 : "$item->{nrof} × $item->{name_pl}";
2660
2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2662 and $desc .= " (open)";
2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2664 and $desc .= " (applied)";
2665 $item->{flags} & Crossfire::Protocol::F_UNPAID
2666 and $desc .= " (unpaid)";
2667 $item->{flags} & Crossfire::Protocol::F_MAGIC
2668 and $desc .= " (magic)";
2669 $item->{flags} & Crossfire::Protocol::F_CURSED
2670 and $desc .= " (cursed)";
2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2672 and $desc .= " (damned)";
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2674 and $desc .= " *";
2675
2676 $desc
2677}
2678 2760
2679sub new { 2761sub new {
2680 my $class = shift; 2762 my $class = shift;
2681 2763
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2688 my $self = $class->SUPER::new ( 2764 my $self = $class->SUPER::new (
2689 can_hover => 1,
2690 can_events => 1,
2691 tooltip => ((CFClient::UI::Label::escape $desc)
2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693 connect_button_down => sub {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2707 } elsif ($ev->{button} == 2) {
2708 $::CONN->send ("apply $item->{tag}");
2709 } elsif ($ev->{button} == 3) {
2710 my @menu_items = (
2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722 )
2723 ),
2724 );
2725
2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727 }
2728
2729 1
2730 },
2731 %args
2732 );
2733
2734
2735 $self->add (new CFClient::UI::Face
2736 can_events => 0,
2737 face => $item->{face},
2738 anim => $item->{anim},
2739 animspeed => $item->{animspeed},
2740 );
2741
2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744 $self->{item} = $item;
2745
2746 $self->update_item;
2747
2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table), 2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_, 2766 @_,
2771 ); 2767 );
2772 2768
2773 $self 2769 $self
2774} 2770}
… …
2784 or ($a->{name} cmp $b->{name}) 2780 or ($a->{name} cmp $b->{name})
2785 } @$items; 2781 } @$items;
2786 2782
2787 $self->{real_items} = \@items; 2783 $self->{real_items} = \@items;
2788 2784
2785 my $row = 0;
2789 for my $item (@items) { 2786 for my $item (@items) {
2790 $item->{item} = $item; 2787 CFClient::Item::update_widgets $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794 2788
2795 my $i = 0; 2789 $self->{scrolled}->add (0, $row, $item->{face_widget});
2796 for (@items) { 2790 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2797 $self->{scrolled}->add (0, $i, $_); 2791 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2801 2792
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2793 $row++;
2794 }
2803} 2795}
2804 2796
2805sub size_request { 2797sub size_request {
2806 my ($self) = @_; 2798 my ($self) = @_;
2807 ($self->{req_w}, $self->{req_h}); 2799 ($self->{req_w}, $self->{req_h});
… …
2847 2839
2848# popup given the event (must be a mouse button down event currently) 2840# popup given the event (must be a mouse button down event currently)
2849sub popup { 2841sub popup {
2850 my ($self, $ev) = @_; 2842 my ($self, $ev) = @_;
2851 2843
2852 $self->emit ("popdown"); 2844 $self->_emit ("popdown");
2853 2845
2854 # maybe save $GRAB? must be careful about events... 2846 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2847 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2848 $self->{button} = $ev->{button};
2857 2849
… …
2872 2864
2873 if ($ev->{button} == $self->{button}) { 2865 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 2866 undef $GRAB;
2875 $self->hide; 2867 $self->hide;
2876 2868
2877 $self->emit ("popdown"); 2869 $self->_emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 2870 $self->{hover}[1]->() if $self->{hover};
2879 } 2871 }
2880} 2872}
2881 2873
2882############################################################################# 2874#############################################################################
… …
2944sub add { 2936sub add {
2945 my ($self, $text, %arg) = @_; 2937 my ($self, $text, %arg) = @_;
2946 2938
2947 $text =~ s/^\s+//; 2939 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 2940 $text =~ s/\s+$//;
2941
2942 return unless $text;
2949 2943
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 2944 my $timeout = time + ((delete $arg{timeout}) || 60);
2951 2945
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2946 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 2947
… …
2997 2991
2998sub new { 2992sub new {
2999 my $class = shift; 2993 my $class = shift;
3000 2994
3001 $class->SUPER::new ( 2995 $class->SUPER::new (
2996 visible => 1,
3002 @_, 2997 @_,
3003 ) 2998 )
3004} 2999}
3005 3000
3006sub configure { 3001sub configure {
… …
3024} 3019}
3025 3020
3026sub size_allocate { 3021sub size_allocate {
3027 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h) = @_;
3028 3023
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
3035 for my $child ($self->children) { 3024 for my $child ($self->children) {
3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3037 3026
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3039 if exists $child->{req_x}; 3028 if exists $child->{req_x};
… …
3068} 3057}
3069 3058
3070sub add { 3059sub add {
3071 my ($self, @children) = @_; 3060 my ($self, @children) = @_;
3072 3061
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067
3073 for my $child (@children) { 3068 for my $child (@children) {
3074 $child->{toplevel} = 1; 3069 $child->{is_toplevel} = 1;
3075 3070
3076 # integerise window positions 3071 # integerise window positions
3077 $child->{x} = int $child->{x}; 3072 $child->{x} = int $child->{x};
3078 $child->{y} = int $child->{y}; 3073 $child->{y} = int $child->{y};
3079 } 3074 }
3080 3075
3081 $self->SUPER::add (@children); 3076 $self->SUPER::add (@children);
3077}
3078
3079sub remove {
3080 my ($self, @children) = @_;
3081
3082 $self->SUPER::remove (@children);
3082 3083
3083 while (@children) { 3084 while (@children) {
3084 my $w = pop @children; 3085 my $w = pop @children;
3085 push @children, $w->children; 3086 push @children, $w->children;
3086 $w->{visible} = 1; 3087 $w->set_invisible;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 } 3088 }
3100} 3089}
3101 3090
3102sub on_refresh { 3091sub on_refresh {
3103 my ($self, $id, $cb) = @_; 3092 my ($self, $id, $cb) = @_;
… …
3157 $w = 0 if $w < 0; 3146 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3147 $h = 0 if $h < 0;
3159 3148
3160 $widget->{w} = $w; 3149 $widget->{w} = $w;
3161 $widget->{h} = $h; 3150 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h);
3163 $widget->emit (size_allocate => $w, $h); 3151 $widget->emit (size_allocate => $w, $h);
3164 } 3152 }
3165 } 3153 }
3166 3154
3167 while ($self->{post_alloc_hook}) { 3155 while ($self->{post_alloc_hook}) {

Diff Legend

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