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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.236 by root, Thu May 25 16:54:29 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) = @_;
… …
136 $rem += $_ - $i; 130 $rem += $_ - $i;
137 $_ = $i; 131 $_ = $i;
138 } 132 }
139} 133}
140 134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
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
141# call when resolution changes etc. 151# call when resolution changes etc.
142sub rescale_widgets { 152sub rescale_widgets {
143 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
144 154
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
150 $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};
151 $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};
152 $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};
153 $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};
154 $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};
155 $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};
156 $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};
157 $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};
158 } 165 }
159
160 $widget->reconfigure;
161 } 166 }
167
168 reconfigure_widgets;
162} 169}
163 170
164############################################################################# 171#############################################################################
165 172
166package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
198 %$self = (); 205 %$self = ();
199} 206}
200 207
201sub show { 208sub show {
202 my ($self) = @_; 209 my ($self) = @_;
203
204 return if $self->{parent}; 210 return if $self->{parent};
205 211
206 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
207} 213}
208 214
209sub hide { 215sub show_centered {
210 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};
211 234
212 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
213 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;
214 248
215 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
216 if $self->{parent}; 250 if $self->{parent};
217} 251}
218 252
… …
288} 322}
289 323
290sub set_tooltip { 324sub set_tooltip {
291 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
292 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
293 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
294 333
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
318 return if $FOCUS == $self; 357 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
320 359
321 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
322 361
323 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
324 363
325 $focus->update if $focus; 364 $focus->update if $focus;
326 $FOCUS->update; 365 $FOCUS->update;
327} 366}
328 367
… …
331 370
332 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
333 372
334 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
335 374
336 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
337 376
338 $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;
339} 381}
340 382
341sub mouse_motion { } 383sub mouse_motion { }
342sub button_up { } 384sub button_up { }
343sub key_down { } 385sub key_down { }
344sub key_up { } 386sub key_up { }
345 387
346sub button_down { 388sub button_down {
347 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
348 390
349 $self->focus_in; 391 $self->focus_in;
… …
383 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix; 426 glPushMatrix;
385 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 430 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
392 glEnd; 434 glEnd;
393 glPopMatrix; 435 glPopMatrix;
394 #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;
395 } 437 }
396} 438}
… …
419 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
420 462
421 # TODO: req_w _does_change after ->reconfigure 463 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 464 $self->check_size
423 unless exists $self->{req_w}; 465 unless exists $self->{req_w};
466
467 $self->show;
424} 468}
425 469
426sub check_size { 470sub check_size {
427 my ($self, $forced) = @_; 471 my ($self, $forced) = @_;
428 472
… …
441 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
442 486
443 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 488}
445 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
446sub emit { 496sub emit {
447 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
448 498
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
450} 501}
451 502
452sub DESTROY { 503sub DESTROY {
453 my ($self) = @_; 504 my ($self) = @_;
454 505
… …
567 delete $child->{parent}; 618 delete $child->{parent};
568 $child->hide; 619 $child->hide;
569 620
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 622
572 $self->check_size; 623 $self->check_size (1);
573 $self->update; 624 $self->update;
574} 625}
575 626
576sub clear { 627sub clear {
577 my ($self) = @_; 628 my ($self) = @_;
… …
717 768
718package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
719 770
720our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
721 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
722sub size_request { 783sub size_request {
723 my ($self) = @_; 784 my ($self) = @_;
724 785
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 787
728 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
729} 789}
730 790
731sub size_allocate { 791sub size_allocate {
732 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
733 793
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
797 $self->child->configure (0, 0, $w, $h);
734 $self->update; 798 $self->update;
735} 799}
736 800
737sub set_offset { 801sub set_offset {
738 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
792 856
793 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
794 vertical => 1, 858 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 860 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
798 }, 862 },
799 ; 863 ;
800 864
801 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 866 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 867 slider => $slider,
804 @_, 868 @_,
805 ); 869 );
806 870
807 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 872 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
810 874
811 $self 875 $self
876}
877
878sub size_allocate {
879 my ($self, $w, $h) = @_;
880
881 $self->SUPER::size_allocate ($w, $h);
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 885}
813 886
814#TODO# update range on size_allocate depending on child 887#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 888# update viewport offset on scroll
816 889
… …
870 my $class = shift; 943 my $class = shift;
871 944
872 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
873 946
874 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
877 border => 0.6, 950 border => 0.6,
878 toplevel => 1, 951 is_toplevel => 1,
879 can_events => 1, 952 can_events => 1,
880 @_ 953 @_
881 ); 954 );
882 955
883 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 957 align => 0,
… …
1024sub new { 1097sub new {
1025 my $class = shift; 1098 my $class = shift;
1026 1099
1027 $class->SUPER::new ( 1100 $class->SUPER::new (
1028 col_expand => [], 1101 col_expand => [],
1029 @_ 1102 @_,
1030 ) 1103 )
1104}
1105
1106sub children {
1107 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1108}
1032 1109
1033sub add { 1110sub add {
1034 my ($self, $x, $y, $child) = @_; 1111 my ($self, $x, $y, $child) = @_;
1035 1112
1036 $child->set_parent ($self); 1113 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1114 $self->{children}[$y][$x] = $child;
1038 1115
1039 $child->check_size; 1116 $self->check_size (1);
1040} 1117}
1041 1118
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1119# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1120sub clear {
1048 my ($self) = @_; 1121 my ($self) = @_;
1049 1122
1050 my @children = $self->children; 1123 my @children = $self->children;
1051 delete $self->{children}; 1124 delete $self->{children};
… …
1053 for (@children) { 1126 for (@children) {
1054 delete $_->{parent}; 1127 delete $_->{parent};
1055 $_->hide; 1128 $_->hide;
1056 } 1129 }
1057 1130
1131 $self->check_size (1);
1058 $self->update; 1132 $self->update;
1059} 1133}
1060 1134
1061sub get_wh { 1135sub get_wh {
1062 my ($self) = @_; 1136 my ($self) = @_;
… …
1466 active_fg => [0, 0, 0], 1540 active_fg => [0, 0, 0],
1467 can_hover => 1, 1541 can_hover => 1,
1468 can_focus => 1, 1542 can_focus => 1,
1469 valign => 0, 1543 valign => 0,
1470 can_events => 1, 1544 can_events => 1,
1545 #text => ...
1471 @_ 1546 @_
1472 ) 1547 )
1473} 1548}
1474 1549
1475sub _set_text { 1550sub _set_text {
… …
1485 $self->{text} = $text; 1560 $self->{text} = $text;
1486 1561
1487 $text =~ s/./*/g if $self->{hidden}; 1562 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1563 $self->{layout}->set_text ("$text ");
1489 1564
1490 $self->emit (changed => $self->{text}); 1565 $self->_emit (changed => $self->{text});
1491} 1566}
1492 1567
1493sub set_text { 1568sub set_text {
1494 my ($self, $text) = @_; 1569 my ($self, $text) = @_;
1495 1570
… …
1507 my ($self) = @_; 1582 my ($self) = @_;
1508 1583
1509 my ($w, $h) = $self->SUPER::size_request; 1584 my ($w, $h) = $self->SUPER::size_request;
1510 1585
1511 ($w + 1, $h) # add 1 for cursor 1586 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1587}
1519 1588
1520sub key_down { 1589sub key_down {
1521 my ($self, $ev) = @_; 1590 my ($self, $ev) = @_;
1522 1591
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1606 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1607 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1608 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1609 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1610 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1611 $self->_emit ('escape');
1543 } elsif ($uni) { 1612 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1613 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1614 }
1546 1615
1547 $self->_set_text ($text); 1616 $self->_set_text ($text);
… …
1634 if ($sym == 13) { 1703 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1704 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1705 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1706 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1707 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1708 $self->_emit (activate => $txt);
1640 $self->update; 1709 $self->update;
1641 1710
1642 } elsif ($sym == CFClient::SDLK_UP) { 1711 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1712 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1713 $self->{history_saveback} = $self->get_text;
… …
1692 can_events => 1, 1761 can_events => 1,
1693 @_ 1762 @_
1694 ) 1763 )
1695} 1764}
1696 1765
1766sub activate { }
1767
1697sub button_up { 1768sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1769 my ($self, $ev, $x, $y) = @_;
1699 1770
1771 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1772 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1773 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1774}
1705 1775
1706sub _draw { 1776sub _draw {
1707 my ($self) = @_; 1777 my ($self) = @_;
1708 1778
… …
1760 my ($self, $ev, $x, $y) = @_; 1830 my ($self, $ev, $x, $y) = @_;
1761 1831
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764 $self->{state} = !$self->{state}; 1834 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1835 $self->_emit (changed => $self->{state});
1766 } 1836 }
1767} 1837}
1768 1838
1769sub _draw { 1839sub _draw {
1770 my ($self) = @_; 1840 my ($self) = @_;
… …
2045 my $self = $class->SUPER::new ( 2115 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2116 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2117 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2118 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2119 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2120 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2121 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2122 req_h => $::WIDTH / 80,
2053 vertical => 0, 2123 vertical => 0,
2054 can_hover => 1, 2124 can_hover => 1,
2055 inner_pad => .05, 2125 inner_pad => 0.02,
2056 @_ 2126 @_
2057 ); 2127 );
2058 2128
2059 $self->set_value ($self->{range}[0]); 2129 $self->set_value ($self->{range}[0]);
2060 $self->update; 2130 $self->update;
2061 2131
2062 $self 2132 $self
2063} 2133}
2064 2134
2135sub set_range {
2136 my ($self, $range) = @_;
2137
2138 $self->{range} = $range;
2139
2140 $self->update;
2141}
2142
2065sub set_value { 2143sub set_value {
2066 my ($self, $value) = @_; 2144 my ($self, $value) = @_;
2067 2145
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2146 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2147
2070 $hi = $lo + 1 if $hi <= $lo; 2148 $hi = $lo + 1 if $hi <= $lo;
2071 2149
2150 $page = $hi - $lo if $page > $hi - $lo;
2151
2072 $value = $lo if $value < $lo; 2152 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2153 $value = $hi - $page if $value > $hi - $page;
2074 2154
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2155 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2156 if $unit;
2077 2157
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2158 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2159
2082 if ($value != $old_value) { 2160 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2161 $self->_emit (changed => $value);
2084 $self->update; 2162 $self->update;
2085 } 2163 }
2086} 2164}
2087 2165
2088sub size_request { 2166sub size_request {
… …
2096 2174
2097sub button_down { 2175sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2176 my ($self, $ev, $x, $y) = @_;
2099 2177
2100 $self->SUPER::button_down ($ev, $x, $y); 2178 $self->SUPER::button_down ($ev, $x, $y);
2179
2180 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181
2101 $self->mouse_motion ($ev, $x, $y); 2182 $self->mouse_motion ($ev, $x, $y);
2102} 2183}
2103 2184
2104sub mouse_motion { 2185sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2186 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2188 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2189 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2190
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2191 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2192
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2194
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2196 }
2116} 2197}
2117 2198
2118sub update { 2199sub update {
2119 my ($self) = @_; 2200 my ($self) = @_;
2120 2201
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2203 $self->set_value ($self->{range}[0]);
2123 2204
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2205 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100;
2125 2207
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2208 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2209
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2210 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2211 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2212
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2213 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2214 $value = $value * $self->{scale} + $self->{offset};
2132 2215
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2216 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2217 $self->{knob_w} = $knob_w;
2140 }); 2218 });
2141 2219
2142 $self->SUPER::update; 2220 $self->SUPER::update;
2143} 2221}
2144 2222
… …
2168 # draw handle 2246 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2247 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2248
2171 glDisable GL_TEXTURE_2D; 2249 glDisable GL_TEXTURE_2D;
2172} 2250}
2251
2252#############################################################################
2253
2254package CFClient::UI::ValSlider;
2255
2256our @ISA = CFClient::UI::HBox::;
2257
2258sub new {
2259 my ($class, %arg) = @_;
2260
2261 my $range = delete $arg{range};
2262
2263 my $self = $class->SUPER::new (
2264 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2265 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2266 to_value => sub { shift },
2267 from_value => sub { shift },
2268 %arg,
2269 );
2270
2271 $self->{slider}->connect (changed => sub {
2272 my ($self, $value) = @_;
2273 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2274 $self->{parent}->emit (changed => $value);
2275 });
2276
2277# $self->{entry}->connect (changed => sub {
2278# my ($self, $value) = @_;
2279# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2280# $self->{parent}->emit (changed => $value);
2281# });
2282
2283 $self->add ($self->{slider}, $self->{entry});
2284
2285 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2286
2287 $self
2288}
2289
2290sub set_range { shift->{slider}->set_range (@_) }
2291sub set_value { shift->{slider}->set_value (@_) }
2173 2292
2174############################################################################# 2293#############################################################################
2175 2294
2176package CFClient::UI::TextView; 2295package CFClient::UI::TextView;
2177 2296
… …
2207 2326
2208 $self->{fontsize} = $fontsize; 2327 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2328 $self->reflow;
2210} 2329}
2211 2330
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2331sub size_allocate {
2232 my ($self, $w, $h) = @_; 2332 my ($self, $w, $h) = @_;
2233 2333
2234 $self->SUPER::size_allocate ($w, $h); 2334 $self->SUPER::size_allocate ($w, $h);
2235 2335
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2338 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2339
2240 $self->reflow; 2340 $self->reflow;
2241} 2341}
2242 2342
2343sub text_size {
2344 my ($self, $text, $indent) = @_;
2345
2346 my $layout = $self->{layout};
2347
2348 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2349 $layout->set_width ($self->{children}[0]{w} - $indent);
2350 $layout->set_markup ($text);
2351
2352 $layout->size
2353}
2354
2355sub reflow {
2356 my ($self) = @_;
2357
2358 $self->{need_reflow}++;
2359 $self->update;
2360}
2361
2362sub set_offset {
2363 my ($self, $offset) = @_;
2364
2365 # todo: base offset on lines or so, not on pixels
2366 $self->{children}[1]->set_value ($offset);
2367}
2368
2369sub clear {
2370 my ($self) = @_;
2371
2372 $self->{par} = [];
2373 $self->{height} = 0;
2374 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2375}
2376
2243sub add_paragraph { 2377sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2378 my ($self, $color, $text, $indent) = @_;
2245 2379
2246 #TODO: intelligently "reformat" paragraph 2380 for my $line (split /\n/, $text) {
2247 2381 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2382 $self->{height} += $h;
2383 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2384 }
2251 2385
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2386 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2387}
2257 2388
2258sub update { 2389sub update {
2259 my ($self) = @_; 2390 my ($self) = @_;
2260 2391
… …
2263 return unless $self->{h} > 0; 2394 return unless $self->{h} > 0;
2264 2395
2265 delete $self->{texture}; 2396 delete $self->{texture};
2266 2397
2267 $ROOT->on_post_alloc ($self, sub { 2398 $ROOT->on_post_alloc ($self, sub {
2399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2400
2268 if (delete $self->{need_reflow}) { 2401 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2402 my $height = 0;
2270 2403
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407
2272 for @{$self->{par}}; 2408 for (@{$self->{par}}) {
2409 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2410 $layout->set_width ($W - $_->[3]);
2411 $layout->set_markup ($_->[4]);
2412 my ($w, $h) = $layout->size;
2413 $_->[0] = $w + $_->[3];
2414 $_->[1] = $h;
2415 }
2416
2417 $height += $_->[1];
2418 }
2273 2419
2274 $self->{height} = $height; 2420 $self->{height} = $height;
2275 2421
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2422 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2423
2278 delete $self->{texture}; 2424 delete $self->{texture};
2279 } 2425 }
2280 2426
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2427 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2428 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2429 glClear GL_COLOR_BUFFER_BIT;
2284 2430
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2431 my $top = int $self->{children}[1]{range}[0];
2289 2432
2290 my $y0 = $top; 2433 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2434 my $y1 = $top + $H;
2292 2435
2293 my $y = 0; 2436 my $y = 0;
2294 2437
2295 my $layout = $self->{layout}; 2438 my $layout = $self->{layout};
2296 2439
2297 $layout->set_font ($self->{font}) if $self->{font}; 2440 $layout->set_font ($self->{font}) if $self->{font};
2298 2441
2442 glEnable GL_BLEND;
2443 #TODO# not correct in windows where rgba is forced off
2444 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2445
2299 for my $par (@{$self->{par}}) { 2446 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2447 my $h = $par->[1];
2301 2448
2302 if ($y0 < $y + $h && $y < $y1) { 2449 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2450 $layout->set_foreground (@{ $par->[2] });
2451 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2452 $layout->set_markup ($par->[4]);
2305 2453
2306 my ($W, $H) = $layout->size; 2454 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2455
2456 glRasterPos $par->[3], $y - $y0;
2457 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2458 }
2309 2459
2310 $y += $h; 2460 $y += $h;
2311 } 2461 }
2312 2462
2313 glDisable GL_TEXTURE_2D; 2463 glDisable GL_BLEND;
2314 }; 2464 };
2315 }); 2465 });
2316} 2466}
2317 2467
2318sub _draw { 2468sub _draw {
… …
2398 2548
2399 # TODO: use animation 2549 # TODO: use animation
2400 if ($self->{state} = !$self->{state}) { 2550 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other}); 2551 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h})); 2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open"); 2553 $self->_emit ("open");
2404 } else { 2554 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other}); 2555 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close"); 2556 $self->_emit ("close");
2407 } 2557 }
2408 2558
2409 $self->emit (changed => $self->{state}); 2559 $self->_emit (changed => $self->{state});
2410} 2560}
2411 2561
2412############################################################################# 2562#############################################################################
2413 2563
2414package CFClient::UI::Tooltip; 2564package CFClient::UI::Tooltip;
… …
2489use CFClient::OpenGL; 2639use CFClient::OpenGL;
2490 2640
2491sub new { 2641sub new {
2492 my $class = shift; 2642 my $class = shift;
2493 2643
2494 $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2495 aspect => 1, 2645 aspect => 1,
2646 can_events => 0,
2496 @_, 2647 @_,
2497 ) 2648 );
2649
2650 if ($self->{anim} && $self->{animspeed}) {
2651 Scalar::Util::weaken (my $widget = $self);
2652
2653 $self->{timer} = Event->timer (
2654 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2655 hard => 1,
2656 interval => $self->{animspeed},
2657 cb => sub {
2658 ++$widget->{frame};
2659 $widget->update;
2660 },
2661 );
2662 }
2663
2664 $self
2498} 2665}
2499 2666
2500sub size_request { 2667sub size_request {
2501 (32, 8) 2668 (32, 8)
2502} 2669}
2503 2670
2671sub update {
2672 my ($self) = @_;
2673
2674 return unless $self->{visible};
2675
2676 $self->SUPER::update;
2677}
2678
2504sub _draw { 2679sub _draw {
2505 my ($self) = @_; 2680 my ($self) = @_;
2506 2681
2507 return unless $::CONN;#d# manage and cache textures differently 2682 return unless $::CONN;
2683
2684 my $face;
2685
2686 if ($self->{frame}) {
2687 my $anim = $::CONN->{anim}[$self->{anim}];
2688
2689 $face = $anim->[ $self->{frame} % @$anim ]
2690 if $anim && @$anim;
2691 }
2692
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2694
2510 # TODO animation
2511 if ($tex) { 2695 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2696 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2698 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2700 glDisable GL_TEXTURE_2D;
2517 } 2701 }
2518} 2702}
2519 2703
2704sub DESTROY {
2705 my ($self) = @_;
2706
2707 $self->{timer}->cancel
2708 if $self->{timer};
2709
2710 $self->SUPER::DESTROY;
2711}
2712
2520############################################################################# 2713#############################################################################
2521 2714
2522package CFClient::UI::InventoryItem; 2715package CFClient::UI::Inventory;
2523 2716
2524our @ISA = CFClient::UI::HBox::; 2717our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551 2718
2552sub new { 2719sub new {
2553 my $class = shift; 2720 my $class = shift;
2554 2721
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new ( 2722 my $self = $class->SUPER::new (
2562 can_hover => 1, 2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_, 2724 @_,
2637 ); 2725 );
2638 2726
2639 $self 2727 $self
2640} 2728}
… …
2650 or ($a->{name} cmp $b->{name}) 2738 or ($a->{name} cmp $b->{name})
2651 } @$items; 2739 } @$items;
2652 2740
2653 $self->{real_items} = \@items; 2741 $self->{real_items} = \@items;
2654 2742
2743 my $row = 0;
2655 for my $item (@items) { 2744 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2745 CFClient::Item::update_widgets $item;
2657 $item->update_item ();
2658 }
2659 2746
2660 $self->{scrolled}->add (@items); 2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751 $row++;
2752 }
2661 2753
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663} 2755}
2664 2756
2665sub size_request { 2757sub size_request {
… …
2707 2799
2708# popup given the event (must be a mouse button down event currently) 2800# popup given the event (must be a mouse button down event currently)
2709sub popup { 2801sub popup {
2710 my ($self, $ev) = @_; 2802 my ($self, $ev) = @_;
2711 2803
2712 $self->emit ("popdown"); 2804 $self->_emit ("popdown");
2713 2805
2714 # maybe save $GRAB? must be careful about events... 2806 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2807 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2808 $self->{button} = $ev->{button};
2717 2809
… …
2732 2824
2733 if ($ev->{button} == $self->{button}) { 2825 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2826 undef $GRAB;
2735 $self->hide; 2827 $self->hide;
2736 2828
2737 $self->emit ("popdown"); 2829 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2830 $self->{hover}[1]->() if $self->{hover};
2739 } 2831 }
2740} 2832}
2741 2833
2742############################################################################# 2834#############################################################################
… …
2804sub add { 2896sub add {
2805 my ($self, $text, %arg) = @_; 2897 my ($self, $text, %arg) = @_;
2806 2898
2807 $text =~ s/^\s+//; 2899 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2900 $text =~ s/\s+$//;
2901
2902 return unless $text;
2809 2903
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2904 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2905
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2907
… …
2884} 2978}
2885 2979
2886sub size_allocate { 2980sub size_allocate {
2887 my ($self, $w, $h) = @_; 2981 my ($self, $w, $h) = @_;
2888 2982
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 2983 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 2985
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x}; 2987 if exists $child->{req_x};
… …
2928} 3016}
2929 3017
2930sub add { 3018sub add {
2931 my ($self, @children) = @_; 3019 my ($self, @children) = @_;
2932 3020
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
2933 for my $child (@children) { 3027 for my $child (@children) {
2934 $child->{toplevel} = 1; 3028 $child->{is_toplevel} = 1;
2935 3029
2936 # integerise window positions 3030 # integerise window positions
2937 $child->{x} = int $child->{x}; 3031 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y}; 3032 $child->{y} = int $child->{y};
2939 } 3033 }
2940 3034
2941 $self->SUPER::add (@children); 3035 $self->SUPER::add (@children);
3036}
3037
3038sub remove {
3039 my ($self, @children) = @_;
3040
3041 $self->SUPER::remove (@children);
3042
3043 while (@children) {
3044 my $w = pop @children;
3045 push @children, $w->children;
3046 $w->set_invisible;
3047 }
2942} 3048}
2943 3049
2944sub on_refresh { 3050sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3051 my ($self, $id, $cb) = @_;
2946 3052
… …
2999 $w = 0 if $w < 0; 3105 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3106 $h = 0 if $h < 0;
3001 3107
3002 $widget->{w} = $w; 3108 $widget->{w} = $w;
3003 $widget->{h} = $h; 3109 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h); 3110 $widget->emit (size_allocate => $w, $h);
3006 } 3111 }
3007 } 3112 }
3008 3113
3009 while ($self->{post_alloc_hook}) { 3114 while ($self->{post_alloc_hook}) {
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3121 glClear GL_COLOR_BUFFER_BIT;
3017 3122
3018 glMatrixMode GL_PROJECTION; 3123 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3124 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3126 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3127 glLoadIdentity;
3023 3128
3024 $self->_draw; 3129 $self->_draw;
3025} 3130}

Diff Legend

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