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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.238 by root, Thu May 25 21:48:22 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
149# call when resolution changes etc. 151# call when resolution changes etc.
150sub rescale_widgets { 152sub rescale_widgets {
151 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
152 154
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $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}; 158 $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}; 159 $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}; 160 $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}; 161 $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}; 162 $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}; 163 $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}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 165 }
167
168 $widget->reconfigure;
169 } 166 }
167
168 reconfigure_widgets;
170} 169}
171 170
172############################################################################# 171#############################################################################
173 172
174package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
206 %$self = (); 205 %$self = ();
207} 206}
208 207
209sub show { 208sub show {
210 my ($self) = @_; 209 my ($self) = @_;
211
212 return if $self->{parent}; 210 return if $self->{parent};
213 211
214 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
215} 213}
216 214
217sub hide { 215sub show_centered {
218 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
219 234
220 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
222 248
223 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
224 if $self->{parent}; 250 if $self->{parent};
225} 251}
226 252
… …
296} 322}
297 323
298sub set_tooltip { 324sub set_tooltip {
299 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
300 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
301 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
302 333
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
326 return if $FOCUS == $self; 357 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
328 359
329 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
330 361
331 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
332 363
333 $focus->update if $focus; 364 $focus->update if $focus;
334 $FOCUS->update; 365 $FOCUS->update;
335} 366}
336 367
… …
339 370
340 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
341 372
342 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
343 374
344 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
345 376
346 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
347} 381}
348 382
349sub mouse_motion { } 383sub mouse_motion { }
350sub button_up { } 384sub button_up { }
351sub key_down { } 385sub key_down { }
352sub key_up { } 386sub key_up { }
353 387
354sub button_down { 388sub button_down {
355 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
356 390
357 $self->focus_in; 391 $self->focus_in;
… …
391 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix; 426 glPushMatrix;
393 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 430 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
398 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
399 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
400 glEnd; 434 glEnd;
401 glPopMatrix; 435 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 437 }
404} 438}
… …
424sub set_parent { 458sub set_parent {
425 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
426 460
427 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
428 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
429 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size 467 $self->check_size
431 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
469
470 $self->show;
432} 471}
433 472
434sub check_size { 473sub check_size {
435 my ($self, $forced) = @_; 474 my ($self, $forced) = @_;
436 475
… …
449 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
450 489
451 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
452} 491}
453 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
454sub emit { 499sub emit {
455 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
456 501
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
458} 504}
459 505
460sub DESTROY { 506sub DESTROY {
461 my ($self) = @_; 507 my ($self) = @_;
462 508
… …
575 delete $child->{parent}; 621 delete $child->{parent};
576 $child->hide; 622 $child->hide;
577 623
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 625
580 $self->check_size; 626 $self->check_size (1);
581 $self->update; 627 $self->update;
582} 628}
583 629
584sub clear { 630sub clear {
585 my ($self) = @_; 631 my ($self) = @_;
… …
725 771
726package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
727 773
728our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
729 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
730sub size_request { 786sub size_request {
731 my ($self) = @_; 787 my ($self) = @_;
732 788
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 790
736 @$self{qw(child_w child_h)} 791 @$self{qw(child_w child_h)}
737} 792}
738 793
739sub size_allocate { 794sub size_allocate {
740 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
741 796
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
800 $self->child->configure (0, 0, $w, $h);
742 $self->update; 801 $self->update;
743} 802}
744 803
745sub set_offset { 804sub set_offset {
746 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
800 859
801 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
802 vertical => 1, 861 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 863 connect_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
806 }, 865 },
807 ; 866 ;
808 867
809 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 869 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 875 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
818 877
819 $self 878 $self
879}
880
881sub size_allocate {
882 my ($self, $w, $h) = @_;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 888}
821 889
822#TODO# update range on size_allocate depending on child 890#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 891# update viewport offset on scroll
824 892
… …
878 my $class = shift; 946 my $class = shift;
879 947
880 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
881 949
882 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
885 border => 0.6, 953 border => 0.6,
886 toplevel => 1, 954 is_toplevel => 1,
887 can_events => 1, 955 can_events => 1,
888 @_ 956 @_
889 ); 957 );
890 958
891 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
892 align => 0, 960 align => 0,
… …
1032sub new { 1100sub new {
1033 my $class = shift; 1101 my $class = shift;
1034 1102
1035 $class->SUPER::new ( 1103 $class->SUPER::new (
1036 col_expand => [], 1104 col_expand => [],
1037 @_ 1105 @_,
1038 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1111}
1040 1112
1041sub add { 1113sub add {
1042 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
1043 1115
1044 $child->set_parent ($self); 1116 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
1046 1118
1047 $child->check_size; 1119 $self->check_size (1);
1048} 1120}
1049 1121
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1123sub clear {
1056 my ($self) = @_; 1124 my ($self) = @_;
1057 1125
1058 my @children = $self->children; 1126 my @children = $self->children;
1059 delete $self->{children}; 1127 delete $self->{children};
… …
1061 for (@children) { 1129 for (@children) {
1062 delete $_->{parent}; 1130 delete $_->{parent};
1063 $_->hide; 1131 $_->hide;
1064 } 1132 }
1065 1133
1134 $self->check_size (1);
1066 $self->update; 1135 $self->update;
1067} 1136}
1068 1137
1069sub get_wh { 1138sub get_wh {
1070 my ($self) = @_; 1139 my ($self) = @_;
… …
1102sub size_allocate { 1171sub size_allocate {
1103 my ($self, $w, $h) = @_; 1172 my ($self, $w, $h) = @_;
1104 1173
1105 my ($ws, $hs) = $self->get_wh; 1174 my ($ws, $hs) = $self->get_wh;
1106 1175
1107 my $req_w = sum @$ws; 1176 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1177 my $req_h = (sum @$hs) || 1;
1109 1178
1110 # TODO: nicer code && do row_expand 1179 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1180 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1181 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1182 my $col_expand = (sum @col_expand) || 1;
… …
1474 active_fg => [0, 0, 0], 1543 active_fg => [0, 0, 0],
1475 can_hover => 1, 1544 can_hover => 1,
1476 can_focus => 1, 1545 can_focus => 1,
1477 valign => 0, 1546 valign => 0,
1478 can_events => 1, 1547 can_events => 1,
1548 #text => ...
1479 @_ 1549 @_
1480 ) 1550 )
1481} 1551}
1482 1552
1483sub _set_text { 1553sub _set_text {
… …
1493 $self->{text} = $text; 1563 $self->{text} = $text;
1494 1564
1495 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1497 1567
1498 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1499} 1569}
1500 1570
1501sub set_text { 1571sub set_text {
1502 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1503 1573
… …
1515 my ($self) = @_; 1585 my ($self) = @_;
1516 1586
1517 my ($w, $h) = $self->SUPER::size_request; 1587 my ($w, $h) = $self->SUPER::size_request;
1518 1588
1519 ($w + 1, $h) # add 1 for cursor 1589 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1590}
1527 1591
1528sub key_down { 1592sub key_down {
1529 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1530 1594
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1613 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1614 $self->_emit ('escape');
1551 } elsif ($uni) { 1615 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1553 } 1617 }
1554 1618
1555 $self->_set_text ($text); 1619 $self->_set_text ($text);
… …
1642 if ($sym == 13) { 1706 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1648 $self->update; 1712 $self->update;
1649 1713
1650 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1700 can_events => 1, 1764 can_events => 1,
1701 @_ 1765 @_
1702 ) 1766 )
1703} 1767}
1704 1768
1769sub activate { }
1770
1705sub button_up { 1771sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1707 1773
1774 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate");
1711 }
1712} 1777}
1713 1778
1714sub _draw { 1779sub _draw {
1715 my ($self) = @_; 1780 my ($self) = @_;
1716 1781
… …
1768 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1769 1834
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1772 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1774 } 1839 }
1775} 1840}
1776 1841
1777sub _draw { 1842sub _draw {
1778 my ($self) = @_; 1843 my ($self) = @_;
… …
2053 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2120 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2121 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2122 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2124 req_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2125 req_h => $::WIDTH / 80,
2061 vertical => 0, 2126 vertical => 0,
2062 can_hover => 1, 2127 can_hover => 1,
2063 inner_pad => 0.02, 2128 inner_pad => 0.02,
… …
2068 $self->update; 2133 $self->update;
2069 2134
2070 $self 2135 $self
2071} 2136}
2072 2137
2138sub set_range {
2139 my ($self, $range) = @_;
2140
2141 $self->{range} = $range;
2142
2143 $self->update;
2144}
2145
2073sub set_value { 2146sub set_value {
2074 my ($self, $value) = @_; 2147 my ($self, $value) = @_;
2075 2148
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2149 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2150
2078 $hi = $lo + 1 if $hi <= $lo; 2151 $hi = $lo + 1 if $hi <= $lo;
2079 2152
2153 $page = $hi - $lo if $page > $hi - $lo;
2154
2080 $value = $lo if $value < $lo; 2155 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2156 $value = $hi - $page if $value > $hi - $page;
2082 2157
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2158 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2159 if $unit;
2085 2160
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2162
2090 if ($value != $old_value) { 2163 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2164 $self->_emit (changed => $value);
2092 $self->update; 2165 $self->update;
2093 } 2166 }
2094} 2167}
2095 2168
2096sub size_request { 2169sub size_request {
… …
2104 2177
2105sub button_down { 2178sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
2107 2180
2108 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::button_down ($ev, $x, $y);
2182
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184
2109 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
2110} 2186}
2111 2187
2112sub mouse_motion { 2188sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
… …
2115 if ($GRAB == $self) { 2191 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2193
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2194 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2195
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2197
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123 } 2199 }
2124} 2200}
2125 2201
2126sub update { 2202sub update {
2127 my ($self) = @_; 2203 my ($self) = @_;
2128 2204
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2131 2207
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
2133 2210
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2212
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2213 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2214 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2215
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2216 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2217 $value = $value * $self->{scale} + $self->{offset};
2140 2218
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2219 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2220 $self->{knob_w} = $knob_w;
2148 }); 2221 });
2149 2222
2150 $self->SUPER::update; 2223 $self->SUPER::update;
2151} 2224}
2152 2225
… …
2176 # draw handle 2249 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2250 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2251
2179 glDisable GL_TEXTURE_2D; 2252 glDisable GL_TEXTURE_2D;
2180} 2253}
2254
2255#############################################################################
2256
2257package CFClient::UI::ValSlider;
2258
2259our @ISA = CFClient::UI::HBox::;
2260
2261sub new {
2262 my ($class, %arg) = @_;
2263
2264 my $range = delete $arg{range};
2265
2266 my $self = $class->SUPER::new (
2267 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2268 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2269 to_value => sub { shift },
2270 from_value => sub { shift },
2271 %arg,
2272 );
2273
2274 $self->{slider}->connect (changed => sub {
2275 my ($self, $value) = @_;
2276 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2277 $self->{parent}->emit (changed => $value);
2278 });
2279
2280# $self->{entry}->connect (changed => sub {
2281# my ($self, $value) = @_;
2282# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2283# $self->{parent}->emit (changed => $value);
2284# });
2285
2286 $self->add ($self->{slider}, $self->{entry});
2287
2288 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2289
2290 $self
2291}
2292
2293sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) }
2181 2295
2182############################################################################# 2296#############################################################################
2183 2297
2184package CFClient::UI::TextView; 2298package CFClient::UI::TextView;
2185 2299
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2341 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2342
2229 $self->reflow; 2343 $self->reflow;
2230} 2344}
2231 2345
2232sub text_height { 2346sub text_size {
2233 my ($self, $text, $indent) = @_; 2347 my ($self, $text, $indent) = @_;
2234 2348
2235 my $layout = $self->{layout}; 2349 my $layout = $self->{layout};
2236 2350
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2352 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2353 $layout->set_markup ($text);
2240 2354
2241 ($layout->size)[1] 2355 $layout->size
2242} 2356}
2243 2357
2244sub reflow { 2358sub reflow {
2245 my ($self) = @_; 2359 my ($self) = @_;
2246 2360
2247 $self->{need_reflow}++; 2361 $self->{need_reflow}++;
2248 $self->update; 2362 $self->update;
2249} 2363}
2250 2364
2365sub set_offset {
2366 my ($self, $offset) = @_;
2367
2368 # todo: base offset on lines or so, not on pixels
2369 $self->{children}[1]->set_value ($offset);
2370}
2371
2372sub clear {
2373 my ($self) = @_;
2374
2375 $self->{par} = [];
2376 $self->{height} = 0;
2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2378}
2379
2251sub add_paragraph { 2380sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2381 my ($self, $color, $text, $indent) = @_;
2253 2382
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2383 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2384 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2385 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2387 }
2261 2388
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2390}
2265 2391
2266sub update { 2392sub update {
2267 my ($self) = @_; 2393 my ($self) = @_;
2268 2394
… …
2271 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
2272 2398
2273 delete $self->{texture}; 2399 delete $self->{texture};
2274 2400
2275 $ROOT->on_post_alloc ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
2276 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2405 my $height = 0;
2278 2406
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2280 for @{$self->{par}}; 2411 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h;
2418 }
2419
2420 $height += $_->[1];
2421 }
2281 2422
2282 $self->{height} = $height; 2423 $self->{height} = $height;
2283 2424
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2426
2287 delete $self->{texture}; 2427 delete $self->{texture};
2288 } 2428 }
2289 2429
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2431 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
2293 2433
2294 my $top = int $self->{children}[1]{range}[0]; 2434 my $top = int $self->{children}[1]{range}[0];
2295 2435
2296 my $y0 = $top; 2436 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2437 my $y1 = $top + $H;
2298 2438
2299 my $y = 0; 2439 my $y = 0;
2300 2440
2301 my $layout = $self->{layout}; 2441 my $layout = $self->{layout};
2302 2442
2303 $layout->set_font ($self->{font}) if $self->{font}; 2443 $layout->set_font ($self->{font}) if $self->{font};
2304 2444
2305 glEnable GL_BLEND; 2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2448
2308 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2450 my $h = $par->[1];
2310 2451
2311 if ($y0 < $y + $h && $y < $y1) { 2452 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2453 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2454 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2455 $layout->set_markup ($par->[4]);
2315 2456
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2458
2318 glRasterPos $par->[2], $y - $y0; 2459 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2461 }
2321 2462
2322 $y += $h; 2463 $y += $h;
2323 } 2464 }
… …
2410 2551
2411 # TODO: use animation 2552 # TODO: use animation
2412 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open"); 2556 $self->_emit ("open");
2416 } else { 2557 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close"); 2559 $self->_emit ("close");
2419 } 2560 }
2420 2561
2421 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2422} 2563}
2423 2564
2424############################################################################# 2565#############################################################################
2425 2566
2426package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2502 2643
2503sub new { 2644sub new {
2504 my $class = shift; 2645 my $class = shift;
2505 2646
2506 my $self = $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2507 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2508 @_, 2650 @_,
2509 ); 2651 );
2510 2652
2511 if ($self->{anim} && $self->{animspeed}) { 2653 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2654 Scalar::Util::weaken (my $widget = $self);
… …
2527 2669
2528sub size_request { 2670sub size_request {
2529 (32, 8) 2671 (32, 8)
2530} 2672}
2531 2673
2674sub update {
2675 my ($self) = @_;
2676
2677 return unless $self->{visible};
2678
2679 $self->SUPER::update;
2680}
2681
2532sub _draw { 2682sub _draw {
2533 my ($self) = @_; 2683 my ($self) = @_;
2534 2684
2535 return unless $::CONN;#d# manage and cache textures differently 2685 return unless $::CONN;
2536 2686
2537 my $face; 2687 my $face;
2538 2688
2539 if ($self->{frame}) { 2689 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2690 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2563 $self->SUPER::DESTROY; 2713 $self->SUPER::DESTROY;
2564} 2714}
2565 2715
2566############################################################################# 2716#############################################################################
2567 2717
2568package CFClient::UI::InventoryItem; 2718package CFClient::UI::Inventory;
2569 2719
2570our @ISA = CFClient::UI::HBox::; 2720our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub _item_to_desc {
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597 2721
2598sub new { 2722sub new {
2599 my $class = shift; 2723 my $class = shift;
2600 2724
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new ( 2725 my $self = $class->SUPER::new (
2608 can_hover => 1, 2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_, 2727 @_,
2688 ); 2728 );
2689 2729
2690 $self 2730 $self
2691} 2731}
… …
2701 or ($a->{name} cmp $b->{name}) 2741 or ($a->{name} cmp $b->{name})
2702 } @$items; 2742 } @$items;
2703 2743
2704 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2705 2745
2746 my $row = 0;
2706 for my $item (@items) { 2747 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2748 CFClient::Item::update_widgets $item;
2708 $item->update_item ();
2709 }
2710 2749
2711 $self->{scrolled}->add (@items); 2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2712 2756
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714} 2758}
2715 2759
2716sub size_request { 2760sub size_request {
… …
2758 2802
2759# popup given the event (must be a mouse button down event currently) 2803# popup given the event (must be a mouse button down event currently)
2760sub popup { 2804sub popup {
2761 my ($self, $ev) = @_; 2805 my ($self, $ev) = @_;
2762 2806
2763 $self->emit ("popdown"); 2807 $self->_emit ("popdown");
2764 2808
2765 # maybe save $GRAB? must be careful about events... 2809 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2810 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2811 $self->{button} = $ev->{button};
2768 2812
… …
2783 2827
2784 if ($ev->{button} == $self->{button}) { 2828 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2829 undef $GRAB;
2786 $self->hide; 2830 $self->hide;
2787 2831
2788 $self->emit ("popdown"); 2832 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2833 $self->{hover}[1]->() if $self->{hover};
2790 } 2834 }
2791} 2835}
2792 2836
2793############################################################################# 2837#############################################################################
… …
2855sub add { 2899sub add {
2856 my ($self, $text, %arg) = @_; 2900 my ($self, $text, %arg) = @_;
2857 2901
2858 $text =~ s/^\s+//; 2902 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2860 2906
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2862 2908
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 2910
… …
2935} 2981}
2936 2982
2937sub size_allocate { 2983sub size_allocate {
2938 my ($self, $w, $h) = @_; 2984 my ($self, $w, $h) = @_;
2939 2985
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 2986 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 2988
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2950 if exists $child->{req_x}; 2990 if exists $child->{req_x};
… …
2979} 3019}
2980 3020
2981sub add { 3021sub add {
2982 my ($self, @children) = @_; 3022 my ($self, @children) = @_;
2983 3023
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
2984 for my $child (@children) { 3030 for my $child (@children) {
2985 $child->{toplevel} = 1; 3031 $child->{is_toplevel} = 1;
2986 3032
2987 # integerise window positions 3033 # integerise window positions
2988 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
2990 } 3036 }
2991 3037
2992 $self->SUPER::add (@children); 3038 $self->SUPER::add (@children);
3039}
3040
3041sub remove {
3042 my ($self, @children) = @_;
3043
3044 $self->SUPER::remove (@children);
3045
3046 while (@children) {
3047 my $w = pop @children;
3048 push @children, $w->children;
3049 $w->set_invisible;
3050 }
2993} 3051}
2994 3052
2995sub on_refresh { 3053sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
2997 3055
… …
3050 $w = 0 if $w < 0; 3108 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3109 $h = 0 if $h < 0;
3052 3110
3053 $widget->{w} = $w; 3111 $widget->{w} = $w;
3054 $widget->{h} = $h; 3112 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h);
3056 $widget->emit (size_allocate => $w, $h); 3113 $widget->emit (size_allocate => $w, $h);
3057 } 3114 }
3058 } 3115 }
3059 3116
3060 while ($self->{post_alloc_hook}) { 3117 while ($self->{post_alloc_hook}) {

Diff Legend

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