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.237 by root, Thu May 25 21:36:45 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}
… …
416sub set_parent { 458sub set_parent {
417 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
418 460
419 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
420 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
421 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 467 $self->check_size
423 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
469
470 $self->show;
424} 471}
425 472
426sub check_size { 473sub check_size {
427 my ($self, $forced) = @_; 474 my ($self, $forced) = @_;
428 475
… …
441 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
442 489
443 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
444} 491}
445 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
446sub emit { 499sub emit {
447 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
448 501
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
450} 504}
451 505
452sub DESTROY { 506sub DESTROY {
453 my ($self) = @_; 507 my ($self) = @_;
454 508
… …
567 delete $child->{parent}; 621 delete $child->{parent};
568 $child->hide; 622 $child->hide;
569 623
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 625
572 $self->check_size; 626 $self->check_size (1);
573 $self->update; 627 $self->update;
574} 628}
575 629
576sub clear { 630sub clear {
577 my ($self) = @_; 631 my ($self) = @_;
… …
717 771
718package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
719 773
720our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
721 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
722sub size_request { 786sub size_request {
723 my ($self) = @_; 787 my ($self) = @_;
724 788
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 790
728 @$self{qw(child_w child_h)} 791 @$self{qw(child_w child_h)}
729} 792}
730 793
731sub size_allocate { 794sub size_allocate {
732 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 801 $self->update;
735} 802}
736 803
737sub set_offset { 804sub set_offset {
738 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
792 859
793 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
794 vertical => 1, 861 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 863 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
798 }, 865 },
799 ; 866 ;
800 867
801 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 869 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 870 slider => $slider,
804 @_, 871 @_,
805 ); 872 );
806 873
807 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 875 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
810 877
811 $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]);
812} 888}
813 889
814#TODO# update range on size_allocate depending on child 890#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 891# update viewport offset on scroll
816 892
… …
870 my $class = shift; 946 my $class = shift;
871 947
872 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
873 949
874 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
877 border => 0.6, 953 border => 0.6,
878 toplevel => 1, 954 is_toplevel => 1,
879 can_events => 1, 955 can_events => 1,
880 @_ 956 @_
881 ); 957 );
882 958
883 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
884 align => 0, 960 align => 0,
… …
1024sub new { 1100sub new {
1025 my $class = shift; 1101 my $class = shift;
1026 1102
1027 $class->SUPER::new ( 1103 $class->SUPER::new (
1028 col_expand => [], 1104 col_expand => [],
1029 @_ 1105 @_,
1030 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1111}
1032 1112
1033sub add { 1113sub add {
1034 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
1035 1115
1036 $child->set_parent ($self); 1116 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
1038 1118
1039 $child->check_size; 1119 $self->check_size (1);
1040} 1120}
1041 1121
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# 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?
1047sub clear { 1123sub clear {
1048 my ($self) = @_; 1124 my ($self) = @_;
1049 1125
1050 my @children = $self->children; 1126 my @children = $self->children;
1051 delete $self->{children}; 1127 delete $self->{children};
… …
1053 for (@children) { 1129 for (@children) {
1054 delete $_->{parent}; 1130 delete $_->{parent};
1055 $_->hide; 1131 $_->hide;
1056 } 1132 }
1057 1133
1134 $self->check_size (1);
1058 $self->update; 1135 $self->update;
1059} 1136}
1060 1137
1061sub get_wh { 1138sub get_wh {
1062 my ($self) = @_; 1139 my ($self) = @_;
… …
1466 active_fg => [0, 0, 0], 1543 active_fg => [0, 0, 0],
1467 can_hover => 1, 1544 can_hover => 1,
1468 can_focus => 1, 1545 can_focus => 1,
1469 valign => 0, 1546 valign => 0,
1470 can_events => 1, 1547 can_events => 1,
1548 #text => ...
1471 @_ 1549 @_
1472 ) 1550 )
1473} 1551}
1474 1552
1475sub _set_text { 1553sub _set_text {
… …
1485 $self->{text} = $text; 1563 $self->{text} = $text;
1486 1564
1487 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1489 1567
1490 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1491} 1569}
1492 1570
1493sub set_text { 1571sub set_text {
1494 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1495 1573
… …
1507 my ($self) = @_; 1585 my ($self) = @_;
1508 1586
1509 my ($w, $h) = $self->SUPER::size_request; 1587 my ($w, $h) = $self->SUPER::size_request;
1510 1588
1511 ($w + 1, $h) # add 1 for cursor 1589 ($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} 1590}
1519 1591
1520sub key_down { 1592sub key_down {
1521 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1522 1594
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1613 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1614 $self->_emit ('escape');
1543 } elsif ($uni) { 1615 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1545 } 1617 }
1546 1618
1547 $self->_set_text ($text); 1619 $self->_set_text ($text);
… …
1634 if ($sym == 13) { 1706 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1640 $self->update; 1712 $self->update;
1641 1713
1642 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1692 can_events => 1, 1764 can_events => 1,
1693 @_ 1765 @_
1694 ) 1766 )
1695} 1767}
1696 1768
1769sub activate { }
1770
1697sub button_up { 1771sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1699 1773
1774 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate");
1703 }
1704} 1777}
1705 1778
1706sub _draw { 1779sub _draw {
1707 my ($self) = @_; 1780 my ($self) = @_;
1708 1781
… …
1760 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1761 1834
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1764 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1766 } 1839 }
1767} 1840}
1768 1841
1769sub _draw { 1842sub _draw {
1770 my ($self) = @_; 1843 my ($self) = @_;
… …
2045 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2120 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2121 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2122 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2124 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2125 req_h => $::WIDTH / 80,
2053 vertical => 0, 2126 vertical => 0,
2054 can_hover => 1, 2127 can_hover => 1,
2055 inner_pad => .05, 2128 inner_pad => 0.02,
2056 @_ 2129 @_
2057 ); 2130 );
2058 2131
2059 $self->set_value ($self->{range}[0]); 2132 $self->set_value ($self->{range}[0]);
2060 $self->update; 2133 $self->update;
2061 2134
2062 $self 2135 $self
2063} 2136}
2064 2137
2138sub set_range {
2139 my ($self, $range) = @_;
2140
2141 $self->{range} = $range;
2142
2143 $self->update;
2144}
2145
2065sub set_value { 2146sub set_value {
2066 my ($self, $value) = @_; 2147 my ($self, $value) = @_;
2067 2148
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2149 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2150
2070 $hi = $lo + 1 if $hi <= $lo; 2151 $hi = $lo + 1 if $hi <= $lo;
2071 2152
2153 $page = $hi - $lo if $page > $hi - $lo;
2154
2072 $value = $lo if $value < $lo; 2155 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2156 $value = $hi - $page if $value > $hi - $page;
2074 2157
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2158 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2159 if $unit;
2077 2160
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2162
2082 if ($value != $old_value) { 2163 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2164 $self->_emit (changed => $value);
2084 $self->update; 2165 $self->update;
2085 } 2166 }
2086} 2167}
2087 2168
2088sub size_request { 2169sub size_request {
… …
2096 2177
2097sub button_down { 2178sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
2099 2180
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
2102} 2186}
2103 2187
2104sub mouse_motion { 2188sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2191 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2193
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2194 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2195
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2197
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2199 }
2116} 2200}
2117 2201
2118sub update { 2202sub update {
2119 my ($self) = @_; 2203 my ($self) = @_;
2120 2204
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2123 2207
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
2125 2210
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2212
2128 $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;
2129 2215
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2216 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2217 $value = $value * $self->{scale} + $self->{offset};
2132 2218
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; 2219 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2220 $self->{knob_w} = $knob_w;
2140 }); 2221 });
2141 2222
2142 $self->SUPER::update; 2223 $self->SUPER::update;
2143} 2224}
2144 2225
… …
2168 # draw handle 2249 # draw handle
2169 $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);
2170 2251
2171 glDisable GL_TEXTURE_2D; 2252 glDisable GL_TEXTURE_2D;
2172} 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 (@_) }
2173 2295
2174############################################################################# 2296#############################################################################
2175 2297
2176package CFClient::UI::TextView; 2298package CFClient::UI::TextView;
2177 2299
… …
2207 2329
2208 $self->{fontsize} = $fontsize; 2330 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2331 $self->reflow;
2210} 2332}
2211 2333
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 { 2334sub size_allocate {
2232 my ($self, $w, $h) = @_; 2335 my ($self, $w, $h) = @_;
2233 2336
2234 $self->SUPER::size_allocate ($w, $h); 2337 $self->SUPER::size_allocate ($w, $h);
2235 2338
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2341 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2342
2240 $self->reflow; 2343 $self->reflow;
2241} 2344}
2242 2345
2346sub text_size {
2347 my ($self, $text, $indent) = @_;
2348
2349 my $layout = $self->{layout};
2350
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $layout->set_width ($self->{children}[0]{w} - $indent);
2353 $layout->set_markup ($text);
2354
2355 $layout->size
2356}
2357
2358sub reflow {
2359 my ($self) = @_;
2360
2361 $self->{need_reflow}++;
2362 $self->update;
2363}
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
2243sub add_paragraph { 2380sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2381 my ($self, $color, $text, $indent) = @_;
2245 2382
2246 #TODO: intelligently "reformat" paragraph 2383 for my $line (split /\n/, $text) {
2247 2384 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2385 $self->{height} += $h;
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2387 }
2251 2388
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2390}
2257 2391
2258sub update { 2392sub update {
2259 my ($self) = @_; 2393 my ($self) = @_;
2260 2394
… …
2263 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
2264 2398
2265 delete $self->{texture}; 2399 delete $self->{texture};
2266 2400
2267 $ROOT->on_post_alloc ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
2268 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2405 my $height = 0;
2270 2406
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2272 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 }
2273 2422
2274 $self->{height} = $height; 2423 $self->{height} = $height;
2275 2424
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2426
2278 delete $self->{texture}; 2427 delete $self->{texture};
2279 } 2428 }
2280 2429
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2431 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
2284 2433
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]; 2434 my $top = int $self->{children}[1]{range}[0];
2289 2435
2290 my $y0 = $top; 2436 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2437 my $y1 = $top + $H;
2292 2438
2293 my $y = 0; 2439 my $y = 0;
2294 2440
2295 my $layout = $self->{layout}; 2441 my $layout = $self->{layout};
2296 2442
2297 $layout->set_font ($self->{font}) if $self->{font}; 2443 $layout->set_font ($self->{font}) if $self->{font};
2298 2444
2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2448
2299 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2450 my $h = $par->[1];
2301 2451
2302 if ($y0 < $y + $h && $y < $y1) { 2452 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2453 $layout->set_foreground (@{ $par->[2] });
2454 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2455 $layout->set_markup ($par->[4]);
2305 2456
2306 my ($W, $H) = $layout->size; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2458
2459 glRasterPos $par->[3], $y - $y0;
2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2461 }
2309 2462
2310 $y += $h; 2463 $y += $h;
2311 } 2464 }
2312 2465
2313 glDisable GL_TEXTURE_2D; 2466 glDisable GL_BLEND;
2314 }; 2467 };
2315 }); 2468 });
2316} 2469}
2317 2470
2318sub _draw { 2471sub _draw {
… …
2398 2551
2399 # TODO: use animation 2552 # TODO: use animation
2400 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open"); 2556 $self->_emit ("open");
2404 } else { 2557 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close"); 2559 $self->_emit ("close");
2407 } 2560 }
2408 2561
2409 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2410} 2563}
2411 2564
2412############################################################################# 2565#############################################################################
2413 2566
2414package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2489use CFClient::OpenGL; 2642use CFClient::OpenGL;
2490 2643
2491sub new { 2644sub new {
2492 my $class = shift; 2645 my $class = shift;
2493 2646
2494 $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2495 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2496 @_, 2650 @_,
2497 ) 2651 );
2652
2653 if ($self->{anim} && $self->{animspeed}) {
2654 Scalar::Util::weaken (my $widget = $self);
2655
2656 $self->{timer} = Event->timer (
2657 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2658 hard => 1,
2659 interval => $self->{animspeed},
2660 cb => sub {
2661 ++$widget->{frame};
2662 $widget->update;
2663 },
2664 );
2665 }
2666
2667 $self
2498} 2668}
2499 2669
2500sub size_request { 2670sub size_request {
2501 (32, 8) 2671 (32, 8)
2502} 2672}
2503 2673
2674sub update {
2675 my ($self) = @_;
2676
2677 return unless $self->{visible};
2678
2679 $self->SUPER::update;
2680}
2681
2504sub _draw { 2682sub _draw {
2505 my ($self) = @_; 2683 my ($self) = @_;
2506 2684
2507 return unless $::CONN;#d# manage and cache textures differently 2685 return unless $::CONN;
2686
2687 my $face;
2688
2689 if ($self->{frame}) {
2690 my $anim = $::CONN->{anim}[$self->{anim}];
2691
2692 $face = $anim->[ $self->{frame} % @$anim ]
2693 if $anim && @$anim;
2694 }
2695
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2697
2510 # TODO animation
2511 if ($tex) { 2698 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2699 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2701 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2703 glDisable GL_TEXTURE_2D;
2517 } 2704 }
2518} 2705}
2519 2706
2707sub DESTROY {
2708 my ($self) = @_;
2709
2710 $self->{timer}->cancel
2711 if $self->{timer};
2712
2713 $self->SUPER::DESTROY;
2714}
2715
2520############################################################################# 2716#############################################################################
2521 2717
2522package CFClient::UI::InventoryItem; 2718package CFClient::UI::Inventory;
2523 2719
2524our @ISA = CFClient::UI::HBox::; 2720our @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 2721
2552sub new { 2722sub new {
2553 my $class = shift; 2723 my $class = shift;
2554 2724
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 ( 2725 my $self = $class->SUPER::new (
2562 can_hover => 1, 2726 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 @_, 2727 @_,
2637 ); 2728 );
2638 2729
2639 $self 2730 $self
2640} 2731}
… …
2650 or ($a->{name} cmp $b->{name}) 2741 or ($a->{name} cmp $b->{name})
2651 } @$items; 2742 } @$items;
2652 2743
2653 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2654 2745
2746 my $row = 0;
2655 for my $item (@items) { 2747 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2748 CFClient::Item::update_widgets $item;
2657 $item->update_item ();
2658 }
2659 2749
2660 $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 }
2661 2756
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663} 2758}
2664 2759
2665sub size_request { 2760sub size_request {
… …
2707 2802
2708# 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)
2709sub popup { 2804sub popup {
2710 my ($self, $ev) = @_; 2805 my ($self, $ev) = @_;
2711 2806
2712 $self->emit ("popdown"); 2807 $self->_emit ("popdown");
2713 2808
2714 # maybe save $GRAB? must be careful about events... 2809 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2810 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2811 $self->{button} = $ev->{button};
2717 2812
… …
2732 2827
2733 if ($ev->{button} == $self->{button}) { 2828 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2829 undef $GRAB;
2735 $self->hide; 2830 $self->hide;
2736 2831
2737 $self->emit ("popdown"); 2832 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2833 $self->{hover}[1]->() if $self->{hover};
2739 } 2834 }
2740} 2835}
2741 2836
2742############################################################################# 2837#############################################################################
… …
2804sub add { 2899sub add {
2805 my ($self, $text, %arg) = @_; 2900 my ($self, $text, %arg) = @_;
2806 2901
2807 $text =~ s/^\s+//; 2902 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2809 2906
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 2908
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 2910
… …
2884} 2981}
2885 2982
2886sub size_allocate { 2983sub size_allocate {
2887 my ($self, $w, $h) = @_; 2984 my ($self, $w, $h) = @_;
2888 2985
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) { 2986 for my $child ($self->children) {
2896 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)};
2897 2988
2898 $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
2899 if exists $child->{req_x}; 2990 if exists $child->{req_x};
… …
2928} 3019}
2929 3020
2930sub add { 3021sub add {
2931 my ($self, @children) = @_; 3022 my ($self, @children) = @_;
2932 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
2933 for my $child (@children) { 3030 for my $child (@children) {
2934 $child->{toplevel} = 1; 3031 $child->{is_toplevel} = 1;
2935 3032
2936 # integerise window positions 3033 # integerise window positions
2937 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
2939 } 3036 }
2940 3037
2941 $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 }
2942} 3051}
2943 3052
2944sub on_refresh { 3053sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
2946 3055
… …
2999 $w = 0 if $w < 0; 3108 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3109 $h = 0 if $h < 0;
3001 3110
3002 $widget->{w} = $w; 3111 $widget->{w} = $w;
3003 $widget->{h} = $h; 3112 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h); 3113 $widget->emit (size_allocate => $w, $h);
3006 } 3114 }
3007 } 3115 }
3008 3116
3009 while ($self->{post_alloc_hook}) { 3117 while ($self->{post_alloc_hook}) {
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3124 glClear GL_COLOR_BUFFER_BIT;
3017 3125
3018 glMatrixMode GL_PROJECTION; 3126 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3127 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3129 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3130 glLoadIdentity;
3023 3131
3024 $self->_draw; 3132 $self->_draw;
3025} 3133}

Diff Legend

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