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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 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
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
50 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
51} 52}
52 53
53# class methods for events 54# class methods for events
54sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 57 if $FOCUS;
57} 58}
58 59
59sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 62 if $FOCUS;
62} 63}
63 64
64sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
65 my ($ev) = @_; 66 my ($ev) = @_;
… …
74 check_tooltip; 75 check_tooltip;
75 } 76 }
76 77
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 79
79 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 82}
84 83
85sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
86 my ($ev) = @_; 85 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
88 87
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 89
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 91
93 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 94
98 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 97 $grab->update if $grab;
101 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 115
119 check_tooltip; 116 check_tooltip;
120 } 117 }
121 118
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 120 if $HOVER;
126} 121}
127 122
128# convert position array to integers 123# convert position array to integers
129sub harmonize { 124sub harmonize {
130 my ($vals) = @_; 125 my ($vals) = @_;
… …
144 139
145 $_->update 140 $_->update
146 for @widgets; 141 for @widgets;
147} 142}
148 143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
149# call when resolution changes etc. 152# call when resolution changes etc.
150sub rescale_widgets { 153sub rescale_widgets {
151 my ($sx, $sy) = @_; 154 my ($sx, $sy) = @_;
152 155
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 156 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 158 $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}; 159 $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}; 160 $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}; 161 $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}; 162 $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}; 163 $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}; 164 $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}; 165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 166 }
167
168 $widget->reconfigure;
169 } 167 }
168
169 reconfigure_widgets;
170} 170}
171 171
172############################################################################# 172#############################################################################
173 173
174package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 225 },
226 ); 226 );
227} 227}
228 228
229sub hide { 229sub set_invisible {
230 my ($self) = @_; 230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{visible};
231 235
232 undef $GRAB if $GRAB == $self; 236 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 237 undef $HOVER if $HOVER == $self;
238
239 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self;
241
242 $self->focus_out;
243}
244
245sub hide {
246 my ($self) = @_;
247
248 $self->set_invisible;
234 249
235 $self->{parent}->remove ($self) 250 $self->{parent}->remove ($self)
236 if $self->{parent}; 251 if $self->{parent};
237} 252}
238 253
… …
308} 323}
309 324
310sub set_tooltip { 325sub set_tooltip {
311 my ($self, $tooltip) = @_; 326 my ($self, $tooltip) = @_;
312 327
328 $tooltip =~ s/^\s+//;
329 $tooltip =~ s/\s+$//;
330
331 return if $self->{tooltip} eq $tooltip;
332
313 $self->{tooltip} = $tooltip; 333 $self->{tooltip} = $tooltip;
314 334
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 335 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 336 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 337 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 358 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 359 return unless $self->{can_focus};
340 360
341 my $focus = $FOCUS; $FOCUS = $self; 361 my $focus = $FOCUS; $FOCUS = $self;
342 362
343 $self->emit (focus_in => $focus); 363 $self->_emit (focus_in => $focus);
344 364
345 $focus->update if $focus; 365 $focus->update if $focus;
346 $FOCUS->update; 366 $FOCUS->update;
347} 367}
348 368
… …
351 371
352 return unless $FOCUS == $self; 372 return unless $FOCUS == $self;
353 373
354 my $focus = $FOCUS; undef $FOCUS; 374 my $focus = $FOCUS; undef $FOCUS;
355 375
356 $self->emit (focus_out => $focus); 376 $self->_emit (focus_out => $focus);
357 377
358 $focus->update if $focus; #? 378 $focus->update if $focus; #?
379
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS;
359} 382}
360 383
361sub mouse_motion { } 384sub mouse_motion { }
362sub button_up { } 385sub button_up { }
363sub key_down { } 386sub key_down { }
364sub key_up { } 387sub key_up { }
365 388
366sub button_down { 389sub button_down {
367 my ($self, $ev, $x, $y) = @_; 390 my ($self, $ev, $x, $y) = @_;
368 391
369 $self->focus_in; 392 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 426 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 427 glPushMatrix;
405 glColor 1, 1, 0, 1; 428 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 430 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 431 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 432 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 433 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 434 glVertex 0 , $self->{h} - 1;
412 glEnd; 435 glEnd;
413 glPopMatrix; 436 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 438 }
416} 439}
… …
436sub set_parent { 459sub set_parent {
437 my ($self, $parent) = @_; 460 my ($self, $parent) = @_;
438 461
439 Scalar::Util::weaken ($self->{parent} = $parent); 462 Scalar::Util::weaken ($self->{parent} = $parent);
440 463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
441 # TODO: req_w _does_change after ->reconfigure 467 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 468 $self->check_size
443 unless exists $self->{req_w}; 469 unless exists $self->{req_w};
444 470
445 $self->show; 471 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 489 my ($self, $signal, $cb) = @_;
464 490
465 push @{ $self->{signal_cb}{$signal} }, $cb; 491 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 492}
467 493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
468sub emit { 500sub emit {
469 my ($self, $signal, @args) = @_; 501 my ($self, $signal, @args) = @_;
470 502
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
472} 505}
473 506
474sub DESTROY { 507sub DESTROY {
475 my ($self) = @_; 508 my ($self) = @_;
476 509
… …
589 delete $child->{parent}; 622 delete $child->{parent};
590 $child->hide; 623 $child->hide;
591 624
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 626
594 $self->check_size; 627 $self->check_size (1);
595 $self->update; 628 $self->update;
596} 629}
597 630
598sub clear { 631sub clear {
599 my ($self) = @_; 632 my ($self) = @_;
… …
739 772
740package CFClient::UI::ViewPort; 773package CFClient::UI::ViewPort;
741 774
742our @ISA = CFClient::UI::Window::; 775our @ISA = CFClient::UI::Window::;
743 776
777sub new {
778 my $class = shift;
779
780 $class->SUPER::new (
781 scroll_x => 0,
782 scroll_y => 1,
783 @_,
784 )
785}
786
744sub size_request { 787sub size_request {
745 my ($self) = @_; 788 my ($self) = @_;
746 789
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 791
750 @$self{qw(child_w child_h)} 792 @$self{qw(child_w child_h)}
751} 793}
752 794
753sub size_allocate { 795sub size_allocate {
754 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
755 797
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800
801 $self->child->configure (0, 0, $w, $h);
756 $self->update; 802 $self->update;
757} 803}
758 804
759sub set_offset { 805sub set_offset {
760 my ($self, $x, $y) = @_; 806 my ($self, $x, $y) = @_;
… …
814 860
815 my $slider = new CFClient::UI::Slider 861 my $slider = new CFClient::UI::Slider
816 vertical => 1, 862 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 863 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 864 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 865 $self->{vp}->set_offset (0, $_[1]);
820 }, 866 },
821 ; 867 ;
822 868
823 $self = $class->SUPER::new ( 869 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 870 vp => (new CFClient::UI::ViewPort expand => 1),
… …
829 $self->{vp}->add ($self->{scrolled}); 875 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp}); 876 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 877 $self->add ($self->{slider});
832 878
833 $self 879 $self
880}
881
882sub update {
883 my ($self) = @_;
884
885 $self->SUPER::update;
886
887 # todo: overwrite size_allocate of child
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890}
891
892sub size_allocate {
893 my ($self, $w, $h) = @_;
894
895 $self->SUPER::size_allocate ($w, $h);
896
897 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 899}
835 900
836#TODO# update range on size_allocate depending on child 901#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 902# update viewport offset on scroll
838 903
… …
892 my $class = shift; 957 my $class = shift;
893 958
894 # TODO: user_x, user_y, overwrite moveto? 959 # TODO: user_x, user_y, overwrite moveto?
895 960
896 my $self = $class->SUPER::new ( 961 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 962 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 963 border_bg => [1, 1, 1, 1],
899 border => 0.6, 964 border => 0.6,
900 toplevel => 1, 965 is_toplevel => 1,
901 can_events => 1, 966 can_events => 1,
902 @_ 967 @_
903 ); 968 );
904 969
905 $self->{title} &&= new CFClient::UI::Label 970 $self->{title} &&= new CFClient::UI::Label
906 align => 0, 971 align => 0,
… …
1046sub new { 1111sub new {
1047 my $class = shift; 1112 my $class = shift;
1048 1113
1049 $class->SUPER::new ( 1114 $class->SUPER::new (
1050 col_expand => [], 1115 col_expand => [],
1051 @_ 1116 @_,
1052 ) 1117 )
1118}
1119
1120sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1122}
1054 1123
1055sub add { 1124sub add {
1056 my ($self, $x, $y, $child) = @_; 1125 my ($self, $x, $y, $child) = @_;
1057 1126
1058 $child->set_parent ($self); 1127 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1128 $self->{children}[$y][$x] = $child;
1060 1129
1061 $child->check_size; 1130 $self->check_size (1);
1062} 1131}
1063 1132
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1133# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1134sub clear {
1070 my ($self) = @_; 1135 my ($self) = @_;
1071 1136
1072 my @children = $self->children; 1137 my @children = $self->children;
1073 delete $self->{children}; 1138 delete $self->{children};
… …
1075 for (@children) { 1140 for (@children) {
1076 delete $_->{parent}; 1141 delete $_->{parent};
1077 $_->hide; 1142 $_->hide;
1078 } 1143 }
1079 1144
1145 $self->check_size (1);
1080 $self->update; 1146 $self->update;
1081} 1147}
1082 1148
1083sub get_wh { 1149sub get_wh {
1084 my ($self) = @_; 1150 my ($self) = @_;
… …
1116sub size_allocate { 1182sub size_allocate {
1117 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1118 1184
1119 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1120 1186
1121 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1123 1189
1124 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
… …
1488 active_fg => [0, 0, 0], 1554 active_fg => [0, 0, 0],
1489 can_hover => 1, 1555 can_hover => 1,
1490 can_focus => 1, 1556 can_focus => 1,
1491 valign => 0, 1557 valign => 0,
1492 can_events => 1, 1558 can_events => 1,
1559 #text => ...
1493 @_ 1560 @_
1494 ) 1561 )
1495} 1562}
1496 1563
1497sub _set_text { 1564sub _set_text {
… …
1507 $self->{text} = $text; 1574 $self->{text} = $text;
1508 1575
1509 $text =~ s/./*/g if $self->{hidden}; 1576 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1577 $self->{layout}->set_text ("$text ");
1511 1578
1512 $self->emit (changed => $self->{text}); 1579 $self->_emit (changed => $self->{text});
1513} 1580}
1514 1581
1515sub set_text { 1582sub set_text {
1516 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1517 1584
… …
1529 my ($self) = @_; 1596 my ($self) = @_;
1530 1597
1531 my ($w, $h) = $self->SUPER::size_request; 1598 my ($w, $h) = $self->SUPER::size_request;
1532 1599
1533 ($w + 1, $h) # add 1 for cursor 1600 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1601}
1541 1602
1542sub key_down { 1603sub key_down {
1543 my ($self, $ev) = @_; 1604 my ($self, $ev) = @_;
1544 1605
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1620 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1621 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1622 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1623 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1624 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1625 $self->_emit ('escape');
1565 } elsif ($uni) { 1626 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1627 substr $text, $self->{cursor}++, 0, chr $uni;
1567 } 1628 }
1568 1629
1569 $self->_set_text ($text); 1630 $self->_set_text ($text);
… …
1656 if ($sym == 13) { 1717 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1718 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1719 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1720 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1721 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1722 $self->_emit (activate => $txt);
1662 $self->update; 1723 $self->update;
1663 1724
1664 } elsif ($sym == CFClient::SDLK_UP) { 1725 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1726 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1727 $self->{history_saveback} = $self->get_text;
… …
1714 can_events => 1, 1775 can_events => 1,
1715 @_ 1776 @_
1716 ) 1777 )
1717} 1778}
1718 1779
1780sub activate { }
1781
1719sub button_up { 1782sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1783 my ($self, $ev, $x, $y) = @_;
1721 1784
1785 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1786 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1787 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate");
1725 }
1726} 1788}
1727 1789
1728sub _draw { 1790sub _draw {
1729 my ($self) = @_; 1791 my ($self) = @_;
1730 1792
… …
1782 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1783 1845
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1786 $self->{state} = !$self->{state}; 1848 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1849 $self->_emit (changed => $self->{state});
1788 } 1850 }
1789} 1851}
1790 1852
1791sub _draw { 1853sub _draw {
1792 my ($self) = @_; 1854 my ($self) = @_;
… …
2067 my $self = $class->SUPER::new ( 2129 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2130 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2131 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2132 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2133 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2134 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2135 req_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2136 req_h => $::WIDTH / 80,
2075 vertical => 0, 2137 vertical => 0,
2076 can_hover => 1, 2138 can_hover => 1,
2077 inner_pad => 0.02, 2139 inner_pad => 0.02,
… …
2082 $self->update; 2144 $self->update;
2083 2145
2084 $self 2146 $self
2085} 2147}
2086 2148
2149sub set_range {
2150 my ($self, $range) = @_;
2151
2152 ($range, $self->{range}) = ($self->{range}, $range);
2153
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2156}
2157
2087sub set_value { 2158sub set_value {
2088 my ($self, $value) = @_; 2159 my ($self, $value) = @_;
2089 2160
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2161 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2162
2092 $hi = $lo + 1 if $hi <= $lo; 2163 $hi = $lo + 1 if $hi <= $lo;
2093 2164
2165 $page = $hi - $lo if $page > $hi - $lo;
2166
2094 $value = $lo if $value < $lo; 2167 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2168 $value = $hi - $page if $value > $hi - $page;
2096 2169
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2170 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2171 if $unit;
2099 2172
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2174
2104 if ($value != $old_value) { 2175 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2176 $self->_emit (changed => $value);
2106 $self->update; 2177 $self->update;
2107 } 2178 }
2108} 2179}
2109 2180
2110sub size_request { 2181sub size_request {
… …
2118 2189
2119sub button_down { 2190sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2191 my ($self, $ev, $x, $y) = @_;
2121 2192
2122 $self->SUPER::button_down ($ev, $x, $y); 2193 $self->SUPER::button_down ($ev, $x, $y);
2194
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196
2123 $self->mouse_motion ($ev, $x, $y); 2197 $self->mouse_motion ($ev, $x, $y);
2124} 2198}
2125 2199
2126sub mouse_motion { 2200sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
… …
2129 if ($GRAB == $self) { 2203 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2204 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2205
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2206 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2207
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2209
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137 } 2211 }
2138} 2212}
2139 2213
2140sub update { 2214sub update {
2141 my ($self) = @_; 2215 my ($self) = @_;
2142 2216
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]); 2218 $self->set_value ($self->{range}[0]);
2145 2219
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2220 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100;
2147 2222
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2223 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2224
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2225 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2226 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2227
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2228 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2229 $value = $value * $self->{scale} + $self->{offset};
2154 2230
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2231 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2232 $self->{knob_w} = $knob_w;
2162 }); 2233 });
2163 2234
2164 $self->SUPER::update; 2235 $self->SUPER::update;
2165} 2236}
2166 2237
… …
2190 # draw handle 2261 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2262 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2263
2193 glDisable GL_TEXTURE_2D; 2264 glDisable GL_TEXTURE_2D;
2194} 2265}
2266
2267#############################################################################
2268
2269package CFClient::UI::ValSlider;
2270
2271our @ISA = CFClient::UI::HBox::;
2272
2273sub new {
2274 my ($class, %arg) = @_;
2275
2276 my $range = delete $arg{range};
2277
2278 my $self = $class->SUPER::new (
2279 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2280 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2281 to_value => sub { shift },
2282 from_value => sub { shift },
2283 %arg,
2284 );
2285
2286 $self->{slider}->connect (changed => sub {
2287 my ($self, $value) = @_;
2288 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2289 $self->{parent}->emit (changed => $value);
2290 });
2291
2292# $self->{entry}->connect (changed => sub {
2293# my ($self, $value) = @_;
2294# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2295# $self->{parent}->emit (changed => $value);
2296# });
2297
2298 $self->add ($self->{slider}, $self->{entry});
2299
2300 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2301
2302 $self
2303}
2304
2305sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) }
2195 2307
2196############################################################################# 2308#############################################################################
2197 2309
2198package CFClient::UI::TextView; 2310package CFClient::UI::TextView;
2199 2311
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2353 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2354
2243 $self->reflow; 2355 $self->reflow;
2244} 2356}
2245 2357
2246sub text_height { 2358sub text_size {
2247 my ($self, $text, $indent) = @_; 2359 my ($self, $text, $indent) = @_;
2248 2360
2249 my $layout = $self->{layout}; 2361 my $layout = $self->{layout};
2250 2362
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2364 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2365 $layout->set_markup ($text);
2254 2366
2255 ($layout->size)[1] 2367 $layout->size
2256} 2368}
2257 2369
2258sub reflow { 2370sub reflow {
2259 my ($self) = @_; 2371 my ($self) = @_;
2260 2372
2261 $self->{need_reflow}++; 2373 $self->{need_reflow}++;
2262 $self->update; 2374 $self->update;
2263} 2375}
2264 2376
2377sub set_offset {
2378 my ($self, $offset) = @_;
2379
2380 # todo: base offset on lines or so, not on pixels
2381 $self->{children}[1]->set_value ($offset);
2382}
2383
2384sub clear {
2385 my ($self) = @_;
2386
2387 $self->{par} = [];
2388 $self->{height} = 0;
2389 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2390}
2391
2265sub add_paragraph { 2392sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2393 my ($self, $color, $text, $indent) = @_;
2267 2394
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2395 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2396 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2397 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2399 }
2275 2400
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2401 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2402}
2279 2403
2280sub update { 2404sub update {
2281 my ($self) = @_; 2405 my ($self) = @_;
2282 2406
… …
2285 return unless $self->{h} > 0; 2409 return unless $self->{h} > 0;
2286 2410
2287 delete $self->{texture}; 2411 delete $self->{texture};
2288 2412
2289 $ROOT->on_post_alloc ($self, sub { 2413 $ROOT->on_post_alloc ($self, sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415
2290 if (delete $self->{need_reflow}) { 2416 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2417 my $height = 0;
2292 2418
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2419 my $layout = $self->{layout};
2420
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422
2294 for @{$self->{par}}; 2423 for (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2425 $layout->set_width ($W - $_->[3]);
2426 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3];
2429 $_->[1] = $h;
2430 }
2431
2432 $height += $_->[1];
2433 }
2295 2434
2296 $self->{height} = $height; 2435 $self->{height} = $height;
2297 2436
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2438
2301 delete $self->{texture}; 2439 delete $self->{texture};
2302 } 2440 }
2303 2441
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2443 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2444 glClear GL_COLOR_BUFFER_BIT;
2307 2445
2308 my $top = int $self->{children}[1]{range}[0]; 2446 my $top = int $self->{children}[1]{range}[0];
2309 2447
2310 my $y0 = $top; 2448 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2449 my $y1 = $top + $H;
2312 2450
2313 my $y = 0; 2451 my $y = 0;
2314 2452
2315 my $layout = $self->{layout}; 2453 my $layout = $self->{layout};
2316 2454
2317 $layout->set_font ($self->{font}) if $self->{font}; 2455 $layout->set_font ($self->{font}) if $self->{font};
2318 2456
2319 glEnable GL_BLEND; 2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2460
2322 for my $par (@{$self->{par}}) { 2461 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2462 my $h = $par->[1];
2324 2463
2325 if ($y0 < $y + $h && $y < $y1) { 2464 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2465 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2466 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2467 $layout->set_markup ($par->[4]);
2329 2468
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2469 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2470
2332 glRasterPos $par->[2], $y - $y0; 2471 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2472 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2473 }
2335 2474
2336 $y += $h; 2475 $y += $h;
2337 } 2476 }
… …
2424 2563
2425 # TODO: use animation 2564 # TODO: use animation
2426 if ($self->{state} = !$self->{state}) { 2565 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other}); 2566 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h})); 2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open"); 2568 $self->_emit ("open");
2430 } else { 2569 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other}); 2570 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close"); 2571 $self->_emit ("close");
2433 } 2572 }
2434 2573
2435 $self->emit (changed => $self->{state}); 2574 $self->_emit (changed => $self->{state});
2436} 2575}
2437 2576
2438############################################################################# 2577#############################################################################
2439 2578
2440package CFClient::UI::Tooltip; 2579package CFClient::UI::Tooltip;
… …
2516 2655
2517sub new { 2656sub new {
2518 my $class = shift; 2657 my $class = shift;
2519 2658
2520 my $self = $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2521 aspect => 1, 2660 aspect => 1,
2661 can_events => 0,
2522 @_, 2662 @_,
2523 ); 2663 );
2524 2664
2525 if ($self->{anim} && $self->{animspeed}) { 2665 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2666 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2692}
2553 2693
2554sub _draw { 2694sub _draw {
2555 my ($self) = @_; 2695 my ($self) = @_;
2556 2696
2557 return unless $::CONN;#d# manage and cache textures differently 2697 return unless $::CONN;
2558 2698
2559 my $face; 2699 my $face;
2560 2700
2561 if ($self->{frame}) { 2701 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2702 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2585 $self->SUPER::DESTROY; 2725 $self->SUPER::DESTROY;
2586} 2726}
2587 2727
2588############################################################################# 2728#############################################################################
2589 2729
2590package CFClient::UI::InventoryItem; 2730package CFClient::UI::Inventory;
2591 2731
2592our @ISA = CFClient::UI::HBox::; 2732our @ISA = CFClient::UI::ScrolledWindow::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619 2733
2620sub new { 2734sub new {
2621 my $class = shift; 2735 my $class = shift;
2622 2736
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new ( 2737 my $self = $class->SUPER::new (
2630 can_hover => 1, 2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if ($ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) {
2649 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2651 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2652 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2653 (
2654 $item->{flags} & Crossfire::Protocol::F_LOCKED
2655 ? (
2656 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2657 )
2658 : (
2659 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2660 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2661 )
2662 ),
2663 );
2664
2665 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2666 }
2667
2668 1
2669 },
2670 %args
2671 );
2672
2673
2674 $self->add (new CFClient::UI::Face
2675 can_events => 0,
2676 face => $item->{face},
2677 anim => $item->{anim},
2678 animspeed => $item->{animspeed},
2679 );
2680
2681 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2682
2683 $self->{item} = $item;
2684
2685 $self->update_item;
2686
2687 $self
2688}
2689
2690sub update_item {
2691 my ($self) = @_;
2692
2693 my $desc = _item_to_desc ($self->{item});
2694
2695 $self->{name_lbl}->set_text ($desc);
2696}
2697
2698#############################################################################
2699
2700package CFClient::UI::Inventory;
2701
2702our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox),
2709 @_, 2739 @_,
2710 ); 2740 );
2711 2741
2712 $self 2742 $self
2713} 2743}
… …
2723 or ($a->{name} cmp $b->{name}) 2753 or ($a->{name} cmp $b->{name})
2724 } @$items; 2754 } @$items;
2725 2755
2726 $self->{real_items} = \@items; 2756 $self->{real_items} = \@items;
2727 2757
2758 my $row = 0;
2728 for my $item (@items) { 2759 for my $item (@items) {
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2760 CFClient::Item::update_widgets $item;
2730 $item->update_item ();
2731 }
2732 2761
2733 $self->{scrolled}->add (@items); 2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2734 2765
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2766 $row++;
2767 }
2736} 2768}
2737 2769
2738sub size_request { 2770sub size_request {
2739 my ($self) = @_; 2771 my ($self) = @_;
2740 ($self->{req_w}, $self->{req_h}); 2772 ($self->{req_w}, $self->{req_h});
… …
2780 2812
2781# popup given the event (must be a mouse button down event currently) 2813# popup given the event (must be a mouse button down event currently)
2782sub popup { 2814sub popup {
2783 my ($self, $ev) = @_; 2815 my ($self, $ev) = @_;
2784 2816
2785 $self->emit ("popdown"); 2817 $self->_emit ("popdown");
2786 2818
2787 # maybe save $GRAB? must be careful about events... 2819 # maybe save $GRAB? must be careful about events...
2788 $GRAB = $self; 2820 $GRAB = $self;
2789 $self->{button} = $ev->{button}; 2821 $self->{button} = $ev->{button};
2790 2822
… …
2805 2837
2806 if ($ev->{button} == $self->{button}) { 2838 if ($ev->{button} == $self->{button}) {
2807 undef $GRAB; 2839 undef $GRAB;
2808 $self->hide; 2840 $self->hide;
2809 2841
2810 $self->emit ("popdown"); 2842 $self->_emit ("popdown");
2811 $self->{hover}[1]->() if $self->{hover}; 2843 $self->{hover}[1]->() if $self->{hover};
2812 } 2844 }
2813} 2845}
2814 2846
2815############################################################################# 2847#############################################################################
… …
2877sub add { 2909sub add {
2878 my ($self, $text, %arg) = @_; 2910 my ($self, $text, %arg) = @_;
2879 2911
2880 $text =~ s/^\s+//; 2912 $text =~ s/^\s+//;
2881 $text =~ s/\s+$//; 2913 $text =~ s/\s+$//;
2914
2915 return unless $text;
2882 2916
2883 my $timeout = time + ((delete $arg{timeout}) || 60); 2917 my $timeout = time + ((delete $arg{timeout}) || 60);
2884 2918
2885 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2886 2920
… …
2957} 2991}
2958 2992
2959sub size_allocate { 2993sub size_allocate {
2960 my ($self, $w, $h) = @_; 2994 my ($self, $w, $h) = @_;
2961 2995
2962 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967
2968 for my $child ($self->children) { 2996 for my $child ($self->children) {
2969 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2970 2998
2971 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2972 if exists $child->{req_x}; 3000 if exists $child->{req_x};
… …
3001} 3029}
3002 3030
3003sub add { 3031sub add {
3004 my ($self, @children) = @_; 3032 my ($self, @children) = @_;
3005 3033
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3006 for my $child (@children) { 3040 for my $child (@children) {
3007 $child->{toplevel} = 1; 3041 $child->{is_toplevel} = 1;
3008 3042
3009 # integerise window positions 3043 # integerise window positions
3010 $child->{x} = int $child->{x}; 3044 $child->{x} = int $child->{x};
3011 $child->{y} = int $child->{y}; 3045 $child->{y} = int $child->{y};
3012 } 3046 }
3013 3047
3014 $self->SUPER::add (@children); 3048 $self->SUPER::add (@children);
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3015 3055
3016 while (@children) { 3056 while (@children) {
3017 my $w = pop @children; 3057 my $w = pop @children;
3018 push @children, $w->children; 3058 push @children, $w->children;
3019 $w->{visible} = 1; 3059 $w->set_invisible;
3020 }
3021}
3022
3023sub remove {
3024 my ($self, @children) = @_;
3025
3026 $self->SUPER::remove (@children);
3027
3028 while (@children) {
3029 my $w = pop @children;
3030 push @children, $w->children;
3031 delete $w->{visible};
3032 } 3060 }
3033} 3061}
3034 3062
3035sub on_refresh { 3063sub on_refresh {
3036 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
… …
3090 $w = 0 if $w < 0; 3118 $w = 0 if $w < 0;
3091 $h = 0 if $h < 0; 3119 $h = 0 if $h < 0;
3092 3120
3093 $widget->{w} = $w; 3121 $widget->{w} = $w;
3094 $widget->{h} = $h; 3122 $widget->{h} = $h;
3095 $widget->size_allocate ($w, $h);
3096 $widget->emit (size_allocate => $w, $h); 3123 $widget->emit (size_allocate => $w, $h);
3097 } 3124 }
3098 } 3125 }
3099 3126
3100 while ($self->{post_alloc_hook}) { 3127 while ($self->{post_alloc_hook}) {

Diff Legend

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