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.210 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 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 for my $widget (values %WIDGET) { 155 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
147 $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};
148 $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};
149 $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};
150 $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};
151 $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};
152 $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};
153 $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};
154 $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};
155 } 165 }
156
157 $widget->reconfigure;
158 } 166 }
167
168 reconfigure_widgets;
159} 169}
160 170
161############################################################################# 171#############################################################################
162 172
163package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
195 %$self = (); 205 %$self = ();
196} 206}
197 207
198sub show { 208sub show {
199 my ($self) = @_; 209 my ($self) = @_;
200
201 return if $self->{parent}; 210 return if $self->{parent};
202 211
203 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
204} 213}
205 214
206sub hide { 215sub show_centered {
207 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};
208 234
209 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
210 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;
211 248
212 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
213 if $self->{parent}; 250 if $self->{parent};
214} 251}
215 252
… …
315 return if $FOCUS == $self; 352 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
317 354
318 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
319 356
320 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
321 358
322 $focus->update if $focus; 359 $focus->update if $focus;
323 $FOCUS->update; 360 $FOCUS->update;
324} 361}
325 362
… …
328 365
329 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
330 367
331 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
332 369
333 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
334 371
335 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
336} 376}
337 377
338sub mouse_motion { } 378sub mouse_motion { }
339sub button_up { } 379sub button_up { }
340sub key_down { } 380sub key_down { }
341sub key_up { } 381sub key_up { }
342 382
343sub button_down { 383sub button_down {
344 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
345 385
346 $self->focus_in; 386 $self->focus_in;
… …
416 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
417 457
418 # TODO: req_w _does_change after ->reconfigure 458 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size 459 $self->check_size
420 unless exists $self->{req_w}; 460 unless exists $self->{req_w};
461
462 $self->show;
421} 463}
422 464
423sub check_size { 465sub check_size {
424 my ($self, $forced) = @_; 466 my ($self, $forced) = @_;
425 467
… …
438 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
439 481
440 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
441} 483}
442 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
443sub emit { 491sub emit {
444 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
445 493
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
447} 496}
448 497
449sub DESTROY { 498sub DESTROY {
450 my ($self) = @_; 499 my ($self) = @_;
451 500
… …
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 738 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 739 glClear GL_COLOR_BUFFER_BIT;
691 740
692 $self->_render; 741 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 742 };
701} 743}
702 744
703sub _draw { 745sub _draw {
704 my ($self) = @_; 746 my ($self) = @_;
… …
708 my $tex = $self->{texture} 750 my $tex = $self->{texture}
709 or return; 751 or return;
710 752
711 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 755 glColor 1, 1, 1, 1;
714 756
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 758
717 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
718} 760}
… …
725 767
726sub size_request { 768sub size_request {
727 my ($self) = @_; 769 my ($self) = @_;
728 770
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 772
732 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
733} 774}
734 775
735sub size_allocate { 776sub size_allocate {
736 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
737 778
779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
738 $self->update; 782 $self->update;
739} 783}
740 784
741sub set_offset { 785sub set_offset {
742 my ($self, $x, $y) = @_; 786 my ($self, $x, $y) = @_;
… …
796 840
797 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
798 vertical => 1, 842 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 844 connect_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
802 }, 846 },
803 ; 847 ;
804 848
805 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 850 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 851 slider => $slider,
808 @_, 852 @_,
809 ); 853 );
810 854
811 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp}); 856 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
814 858
815 $self 859 $self
860}
861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 869}
817 870
818#TODO# update range on size_allocate depending on child 871#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 872# update viewport offset on scroll
820 873
… …
874 my $class = shift; 927 my $class = shift;
875 928
876 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
877 930
878 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
881 border => 0.6, 934 border => 0.6,
882 toplevel => 1, 935 is_toplevel => 1,
883 can_events => 1, 936 can_events => 1,
884 @_ 937 @_
885 ); 938 );
886 939
887 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
888 align => 0, 941 align => 0,
… …
1297 #bg => none 1350 #bg => none
1298 #active_bg => none 1351 #active_bg => none
1299 #font => default_font 1352 #font => default_font
1300 #text => initial text 1353 #text => initial text
1301 #markup => initial narkup 1354 #markup => initial narkup
1355 #max_w => maximum pixel width
1356 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1357 layout => (new CFClient::Layout),
1303 fontsize => 1, 1358 fontsize => 1,
1304 align => -1, 1359 align => -1,
1305 valign => -1, 1360 valign => -1,
1306 padding => 2, 1361 padding => 2,
… …
1371sub size_request { 1426sub size_request {
1372 my ($self) = @_; 1427 my ($self) = @_;
1373 1428
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1430 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1434
1378 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1379 1436
1380 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1416 1473
1417 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1475 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1477 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1481
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1482 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424 1483
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
… …
1464 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1465 can_hover => 1, 1524 can_hover => 1,
1466 can_focus => 1, 1525 can_focus => 1,
1467 valign => 0, 1526 valign => 0,
1468 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1469 @_ 1529 @_
1470 ) 1530 )
1471} 1531}
1472 1532
1473sub _set_text { 1533sub _set_text {
… …
1483 $self->{text} = $text; 1543 $self->{text} = $text;
1484 1544
1485 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1487 1547
1488 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1489} 1549}
1490 1550
1491sub set_text { 1551sub set_text {
1492 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1493 1553
… …
1505 my ($self) = @_; 1565 my ($self) = @_;
1506 1566
1507 my ($w, $h) = $self->SUPER::size_request; 1567 my ($w, $h) = $self->SUPER::size_request;
1508 1568
1509 ($w + 1, $h) # add 1 for cursor 1569 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1570}
1517 1571
1518sub key_down { 1572sub key_down {
1519 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1520 1574
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1593 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1594 $self->_emit ('escape');
1541 } elsif ($uni) { 1595 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1543 } 1597 }
1544 1598
1545 $self->_set_text ($text); 1599 $self->_set_text ($text);
… …
1632 if ($sym == 13) { 1686 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1638 $self->update; 1692 $self->update;
1639 1693
1640 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1690 can_events => 1, 1744 can_events => 1,
1691 @_ 1745 @_
1692 ) 1746 )
1693} 1747}
1694 1748
1749sub activate { }
1750
1695sub button_up { 1751sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1697 1753
1754 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate");
1701 }
1702} 1757}
1703 1758
1704sub _draw { 1759sub _draw {
1705 my ($self) = @_; 1760 my ($self) = @_;
1706 1761
… …
1758 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1759 1814
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1764 } 1819 }
1765} 1820}
1766 1821
1767sub _draw { 1822sub _draw {
1768 my ($self) = @_; 1823 my ($self) = @_;
… …
2043 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2101 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2102 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2051 vertical => 0, 2106 vertical => 0,
2052 can_hover => 1, 2107 can_hover => 1,
2053 inner_pad => .05, 2108 inner_pad => 0.02,
2054 @_ 2109 @_
2055 ); 2110 );
2056 2111
2057 $self->set_value ($self->{range}[0]); 2112 $self->set_value ($self->{range}[0]);
2058 $self->update; 2113 $self->update;
2059 2114
2060 $self 2115 $self
2061} 2116}
2062 2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2063sub set_value { 2126sub set_value {
2064 my ($self, $value) = @_; 2127 my ($self, $value) = @_;
2065 2128
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2130
2068 $hi = $lo + 1 if $hi <= $lo; 2131 $hi = $lo + 1 if $hi <= $lo;
2069 2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2070 $value = $lo if $value < $lo; 2135 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2136 $value = $hi - $page if $value > $hi - $page;
2072 2137
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2139 if $unit;
2075 2140
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2142
2080 if ($value != $old_value) { 2143 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2144 $self->_emit (changed => $value);
2082 $self->update; 2145 $self->update;
2083 } 2146 }
2084} 2147}
2085 2148
2086sub size_request { 2149sub size_request {
… …
2094 2157
2095sub button_down { 2158sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2097 2160
2098 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
2099 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2100} 2166}
2101 2167
2102sub mouse_motion { 2168sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
… …
2105 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2173
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2175
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2177
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113 } 2179 }
2114} 2180}
2115 2181
2116sub update { 2182sub update {
2117 my ($self) = @_; 2183 my ($self) = @_;
2118 2184
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2186 $self->set_value ($self->{range}[0]);
2121 2187
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2123 2190
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2192
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2195
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2196 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2197 $value = $value * $self->{scale} + $self->{offset};
2130 2198
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2200 $self->{knob_w} = $knob_w;
2138 }); 2201 });
2139 2202
2140 $self->SUPER::update; 2203 $self->SUPER::update;
2141} 2204}
2142 2205
… …
2148 glScale $self->{w}, $self->{h}; 2211 glScale $self->{w}, $self->{h};
2149 2212
2150 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
2152 2215
2216 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2218 }
2156 2219
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2222
… …
2166 # draw handle 2229 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2231
2169 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2170} 2233}
2234
2235#############################################################################
2236
2237package CFClient::UI::ValSlider;
2238
2239our @ISA = CFClient::UI::HBox::;
2240
2241sub new {
2242 my ($class, %arg) = @_;
2243
2244 my $range = delete $arg{range};
2245
2246 my $self = $class->SUPER::new (
2247 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2248 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2249 to_value => sub { shift },
2250 from_value => sub { shift },
2251 %arg,
2252 );
2253
2254 $self->{slider}->connect (changed => sub {
2255 my ($self, $value) = @_;
2256 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2257 $self->{parent}->emit (changed => $value);
2258 });
2259
2260# $self->{entry}->connect (changed => sub {
2261# my ($self, $value) = @_;
2262# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2263# $self->{parent}->emit (changed => $value);
2264# });
2265
2266 $self->add ($self->{slider}, $self->{entry});
2267
2268 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2269
2270 $self
2271}
2272
2273sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) }
2171 2275
2172############################################################################# 2276#############################################################################
2173 2277
2174package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2175 2279
… …
2205 2309
2206 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2311 $self->reflow;
2208} 2312}
2209 2313
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2314sub size_allocate {
2230 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2231 2316
2232 $self->SUPER::size_allocate ($w, $h); 2317 $self->SUPER::size_allocate ($w, $h);
2233 2318
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2322
2238 $self->reflow; 2323 $self->reflow;
2239} 2324}
2240 2325
2326sub text_size {
2327 my ($self, $text, $indent) = @_;
2328
2329 my $layout = $self->{layout};
2330
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2333 $layout->set_markup ($text);
2334
2335 $layout->size
2336}
2337
2338sub reflow {
2339 my ($self) = @_;
2340
2341 $self->{need_reflow}++;
2342 $self->update;
2343}
2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2352sub clear {
2353 my ($self) = @_;
2354
2355 $self->{par} = [];
2356 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358}
2359
2241sub add_paragraph { 2360sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2243 2362
2244 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2245 2364 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2249 2368
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2370}
2255 2371
2256sub update { 2372sub update {
2257 my ($self) = @_; 2373 my ($self) = @_;
2258 2374
… …
2261 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2262 2378
2263 delete $self->{texture}; 2379 delete $self->{texture};
2264 2380
2265 $ROOT->on_post_alloc ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2266 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2385 my $height = 0;
2268 2386
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2270 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2271 2402
2272 $self->{height} = $height; 2403 $self->{height} = $height;
2273 2404
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2406
2276 delete $self->{texture}; 2407 delete $self->{texture};
2277 } 2408 }
2278 2409
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2282 2413
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2414 my $top = int $self->{children}[1]{range}[0];
2287 2415
2288 my $y0 = $top; 2416 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2417 my $y1 = $top + $H;
2290 2418
2291 my $y = 0; 2419 my $y = 0;
2292 2420
2293 my $layout = $self->{layout}; 2421 my $layout = $self->{layout};
2294 2422
2295 $layout->set_font ($self->{font}) if $self->{font}; 2423 $layout->set_font ($self->{font}) if $self->{font};
2296 2424
2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2428
2297 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2430 my $h = $par->[1];
2299 2431
2300 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2303 2436
2304 my ($W, $H) = $layout->size; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2438
2439 glRasterPos $par->[3], $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2441 }
2307 2442
2308 $y += $h; 2443 $y += $h;
2309 } 2444 }
2310 2445
2311 glDisable GL_TEXTURE_2D; 2446 glDisable GL_BLEND;
2312 }; 2447 };
2313 }); 2448 });
2314} 2449}
2315 2450
2316sub _draw { 2451sub _draw {
2317 my ($self) = @_; 2452 my ($self) = @_;
2318 2453
2319 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2324 2459
2325 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2326 2461
2327} 2462}
… …
2396 2531
2397 # TODO: use animation 2532 # TODO: use animation
2398 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open"); 2536 $self->_emit ("open");
2402 } else { 2537 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close"); 2539 $self->_emit ("close");
2405 } 2540 }
2406 2541
2407 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2408} 2543}
2409 2544
2410############################################################################# 2545#############################################################################
2411 2546
2412package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2426 2561
2427sub set_tooltip_from { 2562sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2563 my ($self, $widget) = @_;
2429 2564
2430 $self->add (new CFClient::UI::Label 2565 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2566 markup => $widget->{tooltip},
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2568 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2569 fg => [0, 0, 0, 1],
2570 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2571 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2572 );
2437} 2573}
2438 2574
2439sub size_request { 2575sub size_request {
2440 my ($self) = @_; 2576 my ($self) = @_;
… …
2486use CFClient::OpenGL; 2622use CFClient::OpenGL;
2487 2623
2488sub new { 2624sub new {
2489 my $class = shift; 2625 my $class = shift;
2490 2626
2491 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2492 aspect => 1, 2628 aspect => 1,
2493 @_, 2629 @_,
2494 ) 2630 );
2631
2632 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self);
2634
2635 $self->{timer} = Event->timer (
2636 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2637 hard => 1,
2638 interval => $self->{animspeed},
2639 cb => sub {
2640 ++$widget->{frame};
2641 $widget->update;
2642 },
2643 );
2644 }
2645
2646 $self
2495} 2647}
2496 2648
2497sub size_request { 2649sub size_request {
2498 (32, 8) 2650 (32, 8)
2499} 2651}
2500 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2501sub _draw { 2661sub _draw {
2502 my ($self) = @_; 2662 my ($self) = @_;
2503 2663
2504 return unless $::CONN;#d# manage and cache textures differently 2664 return unless $::CONN;
2665
2666 my $face;
2667
2668 if ($self->{frame}) {
2669 my $anim = $::CONN->{anim}[$self->{anim}];
2670
2671 $face = $anim->[ $self->{frame} % @$anim ]
2672 if $anim && @$anim;
2673 }
2674
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2676
2507 # TODO animation
2508 if ($tex) { 2677 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2514 } 2683 }
2515} 2684}
2516 2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2693}
2694
2517############################################################################# 2695#############################################################################
2518 2696
2519package CFClient::UI::InventoryItem; 2697package CFClient::UI::InventoryItem;
2520 2698
2521our @ISA = CFClient::UI::HBox::; 2699our @ISA = CFClient::UI::HBox::;
2522 2700
2523sub new { 2701sub _item_to_desc {
2524 my $class = shift; 2702 my ($item) = @_;
2525 2703
2526 my %args = @_; 2704 my $desc =
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2 2705 $item->{nrof} < 2
2531 ? $item->{name} 2706 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}"; 2707 : "$item->{nrof} × $item->{name_pl}";
2533 2708
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)"; 2710 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED 2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)"; 2712 and $desc .= " (applied)";
… …
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED 2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)"; 2720 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED 2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *"; 2722 and $desc .= " *";
2548 2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2549 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2550 can_hover => 1, 2737 can_hover => 1,
2551 can_events => 1, 2738 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc) 2739 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub { 2741 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_; 2742 my ($self, $ev, $x, $y) = @_;
2556 2743
2557 # todo: maybe put examine on 1? but should just be a tooltip :( 2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2558 if ($ev->{button} == 1) { 2753 } elsif ($ev->{button} == 1) {
2559 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2754 $::CONN->send ("examine $item->{tag}");
2560 } elsif ($ev->{button} == 2) { 2755 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}"); 2756 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) { 2757 } elsif ($ev->{button} == 3) {
2563 my @menu_items = ( 2758 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [ 2770 )
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ], 2771 ),
2572 ); 2772 );
2573 2773
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 } 2775 }
2576 2776
2577 1 2777 1
2578 }, 2778 },
2579 %args 2779 %args
2580 ); 2780 );
2781
2581 2782
2582 $self->add (new CFClient::UI::Face 2783 $self->add (new CFClient::UI::Face
2583 can_events => 0, 2784 can_events => 0,
2584 face => $item->{face}, 2785 face => $item->{face},
2585 anim => $item->{anim}, 2786 anim => $item->{anim},
2586 animspeed => $item->{animspeed}, 2787 animspeed => $item->{animspeed},
2587 ); 2788 );
2588 2789
2589 $self->add (new CFClient::UI::Label 2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2590 can_events => 0, 2791
2591 text => $desc, 2792 $self->{item} = $item;
2592 ); 2793
2794 $self->update_item;
2593 2795
2594 $self 2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2595} 2805}
2596 2806
2597############################################################################# 2807#############################################################################
2598 2808
2599package CFClient::UI::Inventory; 2809package CFClient::UI::Inventory;
… …
2602 2812
2603sub new { 2813sub new {
2604 my $class = shift; 2814 my $class = shift;
2605 2815
2606 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox), 2817 scrolled => (new CFClient::UI::Table),
2608 @_, 2818 @_,
2609 ); 2819 );
2610 2820
2611 $self 2821 $self
2612} 2822}
… …
2623 } @$items; 2833 } @$items;
2624 2834
2625 $self->{real_items} = \@items; 2835 $self->{real_items} = \@items;
2626 2836
2627 for my $item (@items) { 2837 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2 2838 $item->{item} = $item;
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2633 } 2841 }
2634 2842
2843 my $i = 0;
2844 for (@items) {
2635 $self->{scrolled}->add (@items); 2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2636 2849
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638} 2851}
2639 2852
2640sub size_request { 2853sub size_request {
… …
2682 2895
2683# popup given the event (must be a mouse button down event currently) 2896# popup given the event (must be a mouse button down event currently)
2684sub popup { 2897sub popup {
2685 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2686 2899
2687 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2688 2901
2689 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2690 $GRAB = $self; 2903 $GRAB = $self;
2691 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2692 2905
… …
2707 2920
2708 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2709 undef $GRAB; 2922 undef $GRAB;
2710 $self->hide; 2923 $self->hide;
2711 2924
2712 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2713 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2714 } 2927 }
2715} 2928}
2716 2929
2717############################################################################# 2930#############################################################################
… …
2752 # TODO: doesn't handle markup well (read as: at all) 2965 # TODO: doesn't handle markup well (read as: at all)
2753 my $short = $item->{count} > 1 2966 my $short = $item->{count} > 1
2754 ? "<b>$item->{count} ×</b> $item->{text}" 2967 ? "<b>$item->{count} ×</b> $item->{text}"
2755 : $item->{text}; 2968 : $item->{text};
2756 2969
2757 my $fontsize = $item->{fontsize} || $self->{fontsize};
2758
2759 for ($short) { 2970 for ($short) {
2760 s/^\s+//; 2971 s/^\s+//;
2761 s/\s+/ /g; 2972 s/\s+/ /g;
2762 my $len = int 40 / $fontsize;
2763 substr $_, $len, length, "…" if $len < length;
2764 } 2973 }
2765 2974
2766 new CFClient::UI::Label 2975 new CFClient::UI::Label
2767 markup => $short, 2976 markup => $short,
2768 tooltip => $item->{tooltip}, 2977 tooltip => $item->{tooltip},
2769 tooltip_font => $::FONT_PROP, 2978 tooltip_font => $::FONT_PROP,
2770 tooltip_width => 0.67, 2979 tooltip_width => 0.67,
2771 fontsize => $fontsize, 2980 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44,
2772 fg => $item->{fg}, 2982 fg => $item->{fg},
2773 can_events => 1, 2983 can_events => 1,
2774 can_hover => 1 2984 can_hover => 1
2775 }; 2985 };
2776 } 2986 }
… …
2813 } 3023 }
2814 3024
2815 $self->reorder; 3025 $self->reorder;
2816} 3026}
2817 3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 delete $_->{label}
3032 for values %{ $self->{item} || {} };
3033
3034 $self->reorder;
3035 $self->SUPER::reconfigure;
3036}
3037
2818############################################################################# 3038#############################################################################
2819 3039
2820package CFClient::UI::Root; 3040package CFClient::UI::Root;
2821 3041
2822our @ISA = CFClient::UI::Container::; 3042our @ISA = CFClient::UI::Container::;
… …
2852} 3072}
2853 3073
2854sub size_allocate { 3074sub size_allocate {
2855 my ($self, $w, $h) = @_; 3075 my ($self, $w, $h) = @_;
2856 3076
2857 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2858 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2859
2860 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2861 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2862
2863 for my $child ($self->children) { 3077 for my $child ($self->children) {
2864 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2865 3079
2866 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2867 if exists $child->{req_x}; 3081 if exists $child->{req_x};
… …
2896} 3110}
2897 3111
2898sub add { 3112sub add {
2899 my ($self, @children) = @_; 3113 my ($self, @children) = @_;
2900 3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
2901 for my $child (@children) { 3121 for my $child (@children) {
2902 $child->{toplevel} = 1; 3122 $child->{is_toplevel} = 1;
2903 3123
2904 # integerise window positions 3124 # integerise window positions
2905 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2906 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
2907 } 3127 }
2908 3128
2909 $self->SUPER::add (@children); 3129 $self->SUPER::add (@children);
3130}
3131
3132sub remove {
3133 my ($self, @children) = @_;
3134
3135 $self->SUPER::remove (@children);
3136
3137 while (@children) {
3138 my $w = pop @children;
3139 push @children, $w->children;
3140 $w->set_invisible;
3141 }
2910} 3142}
2911 3143
2912sub on_refresh { 3144sub on_refresh {
2913 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2914 3146
… …
2967 $w = 0 if $w < 0; 3199 $w = 0 if $w < 0;
2968 $h = 0 if $h < 0; 3200 $h = 0 if $h < 0;
2969 3201
2970 $widget->{w} = $w; 3202 $widget->{w} = $w;
2971 $widget->{h} = $h; 3203 $widget->{h} = $h;
2972 $widget->size_allocate ($w, $h);
2973 $widget->emit (size_allocate => $w, $h); 3204 $widget->emit (size_allocate => $w, $h);
2974 } 3205 }
2975 } 3206 }
2976 3207
2977 while ($self->{post_alloc_hook}) { 3208 while ($self->{post_alloc_hook}) {
… …
2983 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2984 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2985 3216
2986 glMatrixMode GL_PROJECTION; 3217 glMatrixMode GL_PROJECTION;
2987 glLoadIdentity; 3218 glLoadIdentity;
2988 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2989 glMatrixMode GL_MODELVIEW; 3220 glMatrixMode GL_MODELVIEW;
2990 glLoadIdentity; 3221 glLoadIdentity;
2991 3222
2992 $self->_draw; 3223 $self->_draw;
2993} 3224}
… …
2995############################################################################# 3226#############################################################################
2996 3227
2997package CFClient::UI; 3228package CFClient::UI;
2998 3229
2999$ROOT = new CFClient::UI::Root; 3230$ROOT = new CFClient::UI::Root;
3000$TOOLTIP = new CFClient::UI::Tooltip; 3231$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3001 3232
30021 32331
3003 3234

Diff Legend

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