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.227 by root, Wed May 24 03:29:20 2006 UTC vs.
Revision 1.234 by root, Thu May 25 16:24:44 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
149# call when resolution changes etc. 151# call when resolution changes etc.
150sub rescale_widgets { 152sub rescale_widgets {
151 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
152 154
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 165 }
167
168 $widget->reconfigure;
169 } 166 }
167
168 reconfigure_widgets;
170} 169}
171 170
172############################################################################# 171#############################################################################
173 172
174package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 224 },
226 ); 225 );
227} 226}
228 227
229sub hide { 228sub set_invisible {
230 my ($self) = @_; 229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
231 234
232 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
233 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;
234 248
235 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
236 if $self->{parent}; 250 if $self->{parent};
237} 251}
238 252
… …
308} 322}
309 323
310sub set_tooltip { 324sub set_tooltip {
311 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
312 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
313 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
314 333
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 357 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
340 359
341 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
342 361
343 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
344 363
345 $focus->update if $focus; 364 $focus->update if $focus;
346 $FOCUS->update; 365 $FOCUS->update;
347} 366}
348 367
… …
351 370
352 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
353 372
354 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
355 374
356 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
357 376
358 $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;
359} 381}
360 382
361sub mouse_motion { } 383sub mouse_motion { }
362sub button_up { } 384sub button_up { }
363sub key_down { } 385sub key_down { }
364sub key_up { } 386sub key_up { }
365 387
366sub button_down { 388sub button_down {
367 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
368 390
369 $self->focus_in; 391 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 426 glPushMatrix;
405 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 430 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
412 glEnd; 434 glEnd;
413 glPopMatrix; 435 glPopMatrix;
414 #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;
415 } 437 }
416} 438}
… …
463 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
464 486
465 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 488}
467 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
468sub emit { 496sub emit {
469 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
470 498
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
472} 501}
473 502
474sub DESTROY { 503sub DESTROY {
475 my ($self) = @_; 504 my ($self) = @_;
476 505
… …
739 768
740package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
741 770
742our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
743 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
744sub size_request { 783sub size_request {
745 my ($self) = @_; 784 my ($self) = @_;
746 785
747 @$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)};
748 787
… …
750} 789}
751 790
752sub size_allocate { 791sub size_allocate {
753 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
754 793
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
757 $self->child->configure (0, 0, $cw, $ch); 797 $self->child->configure (0, 0, $w, $h);
758 $self->update; 798 $self->update;
759} 799}
760 800
761sub set_offset { 801sub set_offset {
762 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
816 856
817 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
818 vertical => 1, 858 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 860 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
822 }, 862 },
823 ; 863 ;
824 864
825 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 866 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 872 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
834 874
835 $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]);
836} 885}
837 886
838#TODO# update range on size_allocate depending on child 887#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 888# update viewport offset on scroll
840 889
… …
894 my $class = shift; 943 my $class = shift;
895 944
896 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
897 946
898 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
901 border => 0.6, 950 border => 0.6,
902 toplevel => 1, 951 is_toplevel => 1,
903 can_events => 1, 952 can_events => 1,
904 @_ 953 @_
905 ); 954 );
906 955
907 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 957 align => 0,
… …
1048sub new { 1097sub new {
1049 my $class = shift; 1098 my $class = shift;
1050 1099
1051 $class->SUPER::new ( 1100 $class->SUPER::new (
1052 col_expand => [], 1101 col_expand => [],
1053 @_ 1102 @_,
1054 ) 1103 )
1055} 1104}
1056 1105
1057sub add { 1106sub add {
1058 my ($self, $x, $y, $child) = @_; 1107 my ($self, $x, $y, $child) = @_;
… …
1510 $self->{text} = $text; 1559 $self->{text} = $text;
1511 1560
1512 $text =~ s/./*/g if $self->{hidden}; 1561 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1562 $self->{layout}->set_text ("$text ");
1514 1563
1515 $self->emit (changed => $self->{text}); 1564 $self->_emit (changed => $self->{text});
1516} 1565}
1517 1566
1518sub set_text { 1567sub set_text {
1519 my ($self, $text) = @_; 1568 my ($self, $text) = @_;
1520 1569
… …
1532 my ($self) = @_; 1581 my ($self) = @_;
1533 1582
1534 my ($w, $h) = $self->SUPER::size_request; 1583 my ($w, $h) = $self->SUPER::size_request;
1535 1584
1536 ($w + 1, $h) # add 1 for cursor 1585 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1586}
1544 1587
1545sub key_down { 1588sub key_down {
1546 my ($self, $ev) = @_; 1589 my ($self, $ev) = @_;
1547 1590
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1605 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1606 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1607 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1608 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1609 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1610 $self->_emit ('escape');
1568 } elsif ($uni) { 1611 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1612 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1613 }
1571 1614
1572 $self->_set_text ($text); 1615 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1702 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1703 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1704 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1705 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1706 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1707 $self->_emit (activate => $txt);
1665 $self->update; 1708 $self->update;
1666 1709
1667 } elsif ($sym == CFClient::SDLK_UP) { 1710 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1711 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1712 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1760 can_events => 1,
1718 @_ 1761 @_
1719 ) 1762 )
1720} 1763}
1721 1764
1765sub activate { }
1766
1722sub button_up { 1767sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1724 1769
1770 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1771 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1772 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1773}
1730 1774
1731sub _draw { 1775sub _draw {
1732 my ($self) = @_; 1776 my ($self) = @_;
1733 1777
… …
1785 my ($self, $ev, $x, $y) = @_; 1829 my ($self, $ev, $x, $y) = @_;
1786 1830
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1833 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1834 $self->_emit (changed => $self->{state});
1791 } 1835 }
1792} 1836}
1793 1837
1794sub _draw { 1838sub _draw {
1795 my ($self) = @_; 1839 my ($self) = @_;
… …
2111 if $unit; 2155 if $unit;
2112 2156
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2158
2115 if ($value != $old_value) { 2159 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2160 $self->_emit (changed => $value);
2117 $self->update; 2161 $self->update;
2118 } 2162 }
2119} 2163}
2120 2164
2121sub size_request { 2165sub size_request {
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2337 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2338
2295 $self->reflow; 2339 $self->reflow;
2296} 2340}
2297 2341
2298sub text_height { 2342sub text_size {
2299 my ($self, $text, $indent) = @_; 2343 my ($self, $text, $indent) = @_;
2300 2344
2301 my $layout = $self->{layout}; 2345 my $layout = $self->{layout};
2302 2346
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2348 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2349 $layout->set_markup ($text);
2306 2350
2307 ($layout->size)[1] 2351 $layout->size
2308} 2352}
2309 2353
2310sub reflow { 2354sub reflow {
2311 my ($self) = @_; 2355 my ($self) = @_;
2312 2356
… …
2331 2375
2332sub add_paragraph { 2376sub add_paragraph {
2333 my ($self, $color, $text, $indent) = @_; 2377 my ($self, $color, $text, $indent) = @_;
2334 2378
2335 for my $line (split /\n/, $text) { 2379 for my $line (split /\n/, $text) {
2336 my $height = $self->text_height ($line); 2380 my ($w, $h) = $self->text_size ($line);
2337 $self->{height} += $height; 2381 $self->{height} += $h;
2338 push @{$self->{par}}, [$height, $color, $indent, $line]; 2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 } 2383 }
2340 2384
2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2385 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2342} 2386}
2343 2387
… …
2349 return unless $self->{h} > 0; 2393 return unless $self->{h} > 0;
2350 2394
2351 delete $self->{texture}; 2395 delete $self->{texture};
2352 2396
2353 $ROOT->on_post_alloc ($self, sub { 2397 $ROOT->on_post_alloc ($self, sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399
2354 if (delete $self->{need_reflow}) { 2400 if (delete $self->{need_reflow}) {
2355 my $height = 0; 2401 my $height = 0;
2356 2402
2357 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2358 for @{$self->{par}}; 2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
2359 2418
2360 $self->{height} = $height; 2419 $self->{height} = $height;
2361 2420
2362 $self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]); 2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2363 2422
2364 delete $self->{texture}; 2423 delete $self->{texture};
2365 } 2424 }
2366 2425
2367 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2368 glClearColor 0.5, 0.5, 0.5, 0; 2427 glClearColor 0.5, 0.5, 0.5, 0;
2369 glClear GL_COLOR_BUFFER_BIT; 2428 glClear GL_COLOR_BUFFER_BIT;
2370 2429
2371 my $top = int $self->{children}[1]{range}[0]; 2430 my $top = int $self->{children}[1]{range}[0];
2372 2431
2373 my $y0 = $top; 2432 my $y0 = $top;
2374 my $y1 = $top + $self->{h}; 2433 my $y1 = $top + $H;
2375 2434
2376 my $y = 0; 2435 my $y = 0;
2377 2436
2378 my $layout = $self->{layout}; 2437 my $layout = $self->{layout};
2379 2438
2380 $layout->set_font ($self->{font}) if $self->{font}; 2439 $layout->set_font ($self->{font}) if $self->{font};
2381 2440
2382 glEnable GL_BLEND; 2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2383 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2384 2444
2385 for my $par (@{$self->{par}}) { 2445 for my $par (@{$self->{par}}) {
2386 my $h = $par->[0]; 2446 my $h = $par->[1];
2387 2447
2388 if ($y0 < $y + $h && $y < $y1) { 2448 if ($y0 < $y + $h && $y < $y1) {
2389 $layout->set_foreground (@{ $par->[1] }); 2449 $layout->set_foreground (@{ $par->[2] });
2390 $layout->set_width ($self->{w} - $par->[2]); 2450 $layout->set_width ($W - $par->[3]);
2391 $layout->set_markup ($par->[3]); 2451 $layout->set_markup ($par->[4]);
2392 2452
2393 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2453 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2394 2454
2395 glRasterPos $par->[2], $y - $y0; 2455 glRasterPos $par->[3], $y - $y0;
2396 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2456 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2397 } 2457 }
2398 2458
2399 $y += $h; 2459 $y += $h;
2400 } 2460 }
… …
2487 2547
2488 # TODO: use animation 2548 # TODO: use animation
2489 if ($self->{state} = !$self->{state}) { 2549 if ($self->{state} = !$self->{state}) {
2490 $CFClient::UI::ROOT->add ($self->{other}); 2550 $CFClient::UI::ROOT->add ($self->{other});
2491 $self->{other}->move ($self->coord2global (0, $self->{h})); 2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2492 $self->emit ("open"); 2552 $self->_emit ("open");
2493 } else { 2553 } else {
2494 $CFClient::UI::ROOT->remove ($self->{other}); 2554 $CFClient::UI::ROOT->remove ($self->{other});
2495 $self->emit ("close"); 2555 $self->_emit ("close");
2496 } 2556 }
2497 2557
2498 $self->emit (changed => $self->{state}); 2558 $self->_emit (changed => $self->{state});
2499} 2559}
2500 2560
2501############################################################################# 2561#############################################################################
2502 2562
2503package CFClient::UI::Tooltip; 2563package CFClient::UI::Tooltip;
… …
2579 2639
2580sub new { 2640sub new {
2581 my $class = shift; 2641 my $class = shift;
2582 2642
2583 my $self = $class->SUPER::new ( 2643 my $self = $class->SUPER::new (
2584 aspect => 1, 2644 aspect => 1,
2645 can_events => 0,
2585 @_, 2646 @_,
2586 ); 2647 );
2587 2648
2588 if ($self->{anim} && $self->{animspeed}) { 2649 if ($self->{anim} && $self->{animspeed}) {
2589 Scalar::Util::weaken (my $widget = $self); 2650 Scalar::Util::weaken (my $widget = $self);
… …
2652 2713
2653package CFClient::UI::InventoryItem; 2714package CFClient::UI::InventoryItem;
2654 2715
2655our @ISA = CFClient::UI::HBox::; 2716our @ISA = CFClient::UI::HBox::;
2656 2717
2657sub _item_to_desc {
2658 my ($item) = @_;
2659
2660 my $desc =
2661 $item->{nrof} < 2
2662 ? $item->{name}
2663 : "$item->{nrof} × $item->{name_pl}";
2664
2665 $item->{flags} & Crossfire::Protocol::F_OPEN
2666 and $desc .= " (open)";
2667 $item->{flags} & Crossfire::Protocol::F_APPLIED
2668 and $desc .= " (applied)";
2669 $item->{flags} & Crossfire::Protocol::F_UNPAID
2670 and $desc .= " (unpaid)";
2671 $item->{flags} & Crossfire::Protocol::F_MAGIC
2672 and $desc .= " (magic)";
2673 $item->{flags} & Crossfire::Protocol::F_CURSED
2674 and $desc .= " (cursed)";
2675 $item->{flags} & Crossfire::Protocol::F_DAMNED
2676 and $desc .= " (damned)";
2677 $item->{flags} & Crossfire::Protocol::F_LOCKED
2678 and $desc .= " *";
2679
2680 $desc
2681}
2682
2683sub new { 2718sub new {
2684 my $class = shift; 2719 my $class = shift;
2685 2720
2686 my %args = @_; 2721 my %args = @_;
2687 2722
2688 my $item = delete $args{item}; 2723 my $item = delete $args{item};
2689 2724
2690 my $desc = _item_to_desc ($item); 2725 my $desc = CFClient::Item::desc_string $item;
2691 2726
2692 my $self = $class->SUPER::new ( 2727 my $self = $class->SUPER::new (
2693 can_hover => 1, 2728 can_hover => 1,
2694 can_events => 1, 2729 can_events => 1,
2695 tooltip => ((CFClient::UI::Label::escape $desc) 2730 tooltip => ((CFClient::UI::Label::escape $desc)
… …
2753} 2788}
2754 2789
2755sub update_item { 2790sub update_item {
2756 my ($self) = @_; 2791 my ($self) = @_;
2757 2792
2758 my $desc = _item_to_desc ($self->{item}); 2793 my $desc = CFClient::Item::desc_string ($self->{item});
2759 2794
2760 $self->{name_lbl}->set_text ($desc); 2795 $self->{name_lbl}->set_text ($desc);
2761} 2796}
2762 2797
2763############################################################################# 2798#############################################################################
… …
2768 2803
2769sub new { 2804sub new {
2770 my $class = shift; 2805 my $class = shift;
2771 2806
2772 my $self = $class->SUPER::new ( 2807 my $self = $class->SUPER::new (
2773 scrolled => (new CFClient::UI::Table), 2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2774 @_, 2809 @_,
2775 ); 2810 );
2776 2811
2777 $self 2812 $self
2778} 2813}
… …
2788 or ($a->{name} cmp $b->{name}) 2823 or ($a->{name} cmp $b->{name})
2789 } @$items; 2824 } @$items;
2790 2825
2791 $self->{real_items} = \@items; 2826 $self->{real_items} = \@items;
2792 2827
2828 my $row = 0;
2793 for my $item (@items) { 2829 for my $item (@items) {
2794 $item->{item} = $item; 2830 CFClient::Item::update_widgets $item;
2795 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2796 $item->update_item ();
2797 }
2798 2831
2799 my $i = 0; 2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2800 for (@items) { 2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2801 $self->{scrolled}->add (0, $i, $_); 2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2802 my $nrof = $_->{item}->{nrof} || 1; 2835
2803 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); 2836 $row++;
2804 } 2837 }
2805 2838
2806# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2807} 2840}
2808 2841
… …
2851 2884
2852# popup given the event (must be a mouse button down event currently) 2885# popup given the event (must be a mouse button down event currently)
2853sub popup { 2886sub popup {
2854 my ($self, $ev) = @_; 2887 my ($self, $ev) = @_;
2855 2888
2856 $self->emit ("popdown"); 2889 $self->_emit ("popdown");
2857 2890
2858 # maybe save $GRAB? must be careful about events... 2891 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2892 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2893 $self->{button} = $ev->{button};
2861 2894
… …
2876 2909
2877 if ($ev->{button} == $self->{button}) { 2910 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 2911 undef $GRAB;
2879 $self->hide; 2912 $self->hide;
2880 2913
2881 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2915 $self->{hover}[1]->() if $self->{hover};
2883 } 2916 }
2884} 2917}
2885 2918
2886############################################################################# 2919#############################################################################
… …
2948sub add { 2981sub add {
2949 my ($self, $text, %arg) = @_; 2982 my ($self, $text, %arg) = @_;
2950 2983
2951 $text =~ s/^\s+//; 2984 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 2985 $text =~ s/\s+$//;
2986
2987 return unless $text;
2953 2988
2954 my $timeout = time + ((delete $arg{timeout}) || 60); 2989 my $timeout = time + ((delete $arg{timeout}) || 60);
2955 2990
2956 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2957 2992
… …
3028} 3063}
3029 3064
3030sub size_allocate { 3065sub size_allocate {
3031 my ($self, $w, $h) = @_; 3066 my ($self, $w, $h) = @_;
3032 3067
3033 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3034 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3035
3036 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3037 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3038
3039 for my $child ($self->children) { 3068 for my $child ($self->children) {
3040 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3041 3070
3042 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3043 if exists $child->{req_x}; 3072 if exists $child->{req_x};
… …
3072} 3101}
3073 3102
3074sub add { 3103sub add {
3075 my ($self, @children) = @_; 3104 my ($self, @children) = @_;
3076 3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3077 for my $child (@children) { 3112 for my $child (@children) {
3078 $child->{toplevel} = 1; 3113 $child->{is_toplevel} = 1;
3079 3114
3080 # integerise window positions 3115 # integerise window positions
3081 $child->{x} = int $child->{x}; 3116 $child->{x} = int $child->{x};
3082 $child->{y} = int $child->{y}; 3117 $child->{y} = int $child->{y};
3083 } 3118 }
3084 3119
3085 $self->SUPER::add (@children); 3120 $self->SUPER::add (@children);
3121}
3122
3123sub remove {
3124 my ($self, @children) = @_;
3125
3126 $self->SUPER::remove (@children);
3086 3127
3087 while (@children) { 3128 while (@children) {
3088 my $w = pop @children; 3129 my $w = pop @children;
3089 push @children, $w->children; 3130 push @children, $w->children;
3090 $w->{visible} = 1; 3131 $w->set_invisible;
3091 }
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 delete $w->{visible};
3103 } 3132 }
3104} 3133}
3105 3134
3106sub on_refresh { 3135sub on_refresh {
3107 my ($self, $id, $cb) = @_; 3136 my ($self, $id, $cb) = @_;
… …
3161 $w = 0 if $w < 0; 3190 $w = 0 if $w < 0;
3162 $h = 0 if $h < 0; 3191 $h = 0 if $h < 0;
3163 3192
3164 $widget->{w} = $w; 3193 $widget->{w} = $w;
3165 $widget->{h} = $h; 3194 $widget->{h} = $h;
3166 $widget->size_allocate ($w, $h);
3167 $widget->emit (size_allocate => $w, $h); 3195 $widget->emit (size_allocate => $w, $h);
3168 } 3196 }
3169 } 3197 }
3170 3198
3171 while ($self->{post_alloc_hook}) { 3199 while ($self->{post_alloc_hook}) {

Diff Legend

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