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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48} 51}
49 52
50# class methods for events 53# class methods for events
51sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 56 if $FOCUS;
54} 57}
55 58
56sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 61 if $FOCUS;
59} 62}
60 63
61sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
62 my ($ev) = @_; 65 my ($ev) = @_;
… …
71 check_tooltip; 74 check_tooltip;
72 } 75 }
73 76
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 78
76 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 81}
81 82
82sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
83 my ($ev) = @_; 84 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
85 86
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 88
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 90
90 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 93
95 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 96 $grab->update if $grab;
98 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 114
116 check_tooltip; 115 check_tooltip;
117 } 116 }
118 117
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 119 if $HOVER;
123} 120}
124 121
125# convert position array to integers 122# convert position array to integers
126sub harmonize { 123sub harmonize {
127 my ($vals) = @_; 124 my ($vals) = @_;
… …
131 for (@$vals) { 128 for (@$vals) {
132 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
133 $rem += $_ - $i; 130 $rem += $_ - $i;
134 $_ = $i; 131 $_ = $i;
135 } 132 }
133}
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
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
136} 169}
137 170
138############################################################################# 171#############################################################################
139 172
140package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
160 } 193 }
161 } 194 }
162 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
163 $self 198 $self
164} 199}
165 200
166sub destroy { 201sub destroy {
167 my ($self) = @_; 202 my ($self) = @_;
… …
170 %$self = (); 205 %$self = ();
171} 206}
172 207
173sub show { 208sub show {
174 my ($self) = @_; 209 my ($self) = @_;
175
176 return if $self->{parent}; 210 return if $self->{parent};
177 211
178 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
179} 213}
180 214
181sub hide { 215sub show_centered {
182 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};
183 234
184 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
185 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;
186 248
187 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
188 if $self->{parent}; 250 if $self->{parent};
189} 251}
190 252
… …
240 302
241sub size_allocate { 303sub size_allocate {
242 # nothing to be done 304 # nothing to be done
243} 305}
244 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
245sub children { 314sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 315}
259 316
260sub set_max_size { 317sub set_max_size {
261 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
262 319
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
322}
323
324sub set_tooltip {
325 my ($self, $tooltip) = @_;
326
327 $self->{tooltip} = $tooltip;
328
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip;
332 }
265} 333}
266 334
267# translate global coordinates to local coordinate system 335# translate global coordinates to local coordinate system
268sub coord2local { 336sub coord2local {
269 my ($self, $x, $y) = @_; 337 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 352 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
286 354
287 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
288 356
289 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
290 358
291 $focus->update if $focus; 359 $focus->update if $focus;
292 $FOCUS->update; 360 $FOCUS->update;
293} 361}
294 362
… …
297 365
298 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
299 367
300 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
301 369
302 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
303 371
304 $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;
305} 376}
306 377
307sub mouse_motion { } 378sub mouse_motion { }
308sub button_up { } 379sub button_up { }
309sub key_down { } 380sub key_down { }
310sub key_up { } 381sub key_up { }
311 382
312sub button_down { 383sub button_down {
313 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
314 385
315 $self->focus_in; 386 $self->focus_in;
… …
355 glVertex $self->{w}, 0; 426 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 427 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 428 glVertex 0 , $self->{h};
358 glEnd; 429 glEnd;
359 glPopMatrix; 430 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 432 }
362} 433}
363 434
364sub _draw { 435sub _draw {
365 my ($self) = @_; 436 my ($self) = @_;
… …
382sub set_parent { 453sub set_parent {
383 my ($self, $parent) = @_; 454 my ($self, $parent) = @_;
384 455
385 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
386 457
458 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 459 $self->check_size
388 unless exists $self->{req_w}; 460 unless exists $self->{req_w};
461
462 $self->show;
389} 463}
390 464
391sub check_size { 465sub check_size {
392 my ($self) = @_; 466 my ($self, $forced) = @_;
393 467
468 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 470}
396 471
397sub update { 472sub update {
398 my ($self) = @_; 473 my ($self) = @_;
… …
405 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
406 481
407 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
408} 483}
409 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
410sub emit { 491sub emit {
411 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
412 493
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
414} 496}
415 497
416sub DESTROY { 498sub DESTROY {
417 my ($self) = @_; 499 my ($self) = @_;
418 500
501 delete $WIDGET{$self+0};
419 #$self->deactivate; 502 #$self->deactivate;
420} 503}
421 504
422############################################################################# 505#############################################################################
423 506
… …
432 my $class = shift; 515 my $class = shift;
433 516
434 # range [value, low, high, page] 517 # range [value, low, high, page]
435 518
436 $class->SUPER::new ( 519 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 520 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 521 #active_bg => [1, 1, 1, 0.5],
439 @_ 522 @_
440 ) 523 )
441} 524}
442 525
443sub _draw { 526sub _draw {
444 my ($self) = @_; 527 my ($self) = @_;
445 528
529 my $color = $FOCUS == $self && $self->{active_bg}
530 ? $self->{active_bg}
531 : $self->{bg};
532
533 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 534 my ($w, $h) = @$self{qw(w h)};
447 535
448 glEnable GL_BLEND; 536 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 538 glColor @$color;
451 539
452 glBegin GL_QUADS; 540 glBegin GL_QUADS;
453 glVertex 0 , 0; 541 glVertex 0 , 0;
454 glVertex 0 , $h; 542 glVertex 0 , $h;
455 glVertex $w, $h; 543 glVertex $w, $h;
456 glVertex $w, 0; 544 glVertex $w, 0;
457 glEnd; 545 glEnd;
458 546
459 glDisable GL_BLEND; 547 glDisable GL_BLEND;
548 }
460} 549}
461 550
462############################################################################# 551#############################################################################
463 552
464package CFClient::UI::Empty; 553package CFClient::UI::Empty;
… …
508 $self->{children} = [ 597 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 598 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 599 @{$self->{children}}, @widgets
511 ]; 600 ];
512 601
513 $self->check_size; 602 $self->check_size (1);
514 $self->update; 603 $self->update;
515} 604}
516 605
517sub children { 606sub children {
518 @{ $_[0]{children} } 607 @{ $_[0]{children} }
… …
625} 714}
626 715
627sub update { 716sub update {
628 my ($self) = @_; 717 my ($self) = @_;
629 718
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 719 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 720 $self->SUPER::update;
632} 721}
633 722
634sub size_allocate { 723sub size_allocate {
635 my ($self, $w, $h) = @_; 724 my ($self, $w, $h) = @_;
… …
648 $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 {
649 glClearColor 0, 0, 0, 0; 738 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 739 glClear GL_COLOR_BUFFER_BIT;
651 740
652 $self->_render; 741 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 742 };
661} 743}
662 744
663sub _draw { 745sub _draw {
664 my ($self) = @_; 746 my ($self) = @_;
… …
668 my $tex = $self->{texture} 750 my $tex = $self->{texture}
669 or return; 751 or return;
670 752
671 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1; 755 glColor 1, 1, 1, 1;
674 756
675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676 758
677 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
678} 760}
… …
685 767
686sub size_request { 768sub size_request {
687 my ($self) = @_; 769 my ($self) = @_;
688 770
689 @$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)};
690 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
691 772
692 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
693} 774}
694 775
695sub size_allocate { 776sub size_allocate {
696 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
697 778
779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
698 $self->update; 782 $self->update;
699} 783}
700 784
701sub set_offset { 785sub set_offset {
702 my ($self, $x, $y) = @_; 786 my ($self, $x, $y) = @_;
… …
756 840
757 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
758 vertical => 1, 842 vertical => 1,
759 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
760 connect_changed => sub { 844 connect_changed => sub {
761 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
762 }, 846 },
763 ; 847 ;
764 848
765 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort), 850 vp => (new CFClient::UI::ViewPort expand => 1),
767 slider => $slider, 851 slider => $slider,
768 @_, 852 @_,
769 ); 853 );
770 854
771 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
… …
773 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
774 858
775 $self 859 $self
776} 860}
777 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]);
869}
870
778#TODO# update range on size_allocate depeneing on child 871#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 872# update viewport offset on scroll
780 873
781############################################################################# 874#############################################################################
782 875
783package CFClient::UI::Frame; 876package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 880use CFClient::OpenGL;
788 881
789sub new { 882sub new {
790 my $class = shift; 883 my $class = shift;
791 884
792 my $self = $class->SUPER::new ( 885 $class->SUPER::new (
793 bg => [1, 1, 1, 1], 886 bg => undef,
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_ 887 @_,
797 ); 888 )
798
799 $self
800} 889}
801 890
802sub _draw { 891sub _draw {
803 my ($self) = @_; 892 my ($self) = @_;
804 893
805 my ($w, $h) = ($self->{w}, $self->{h}); 894 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)};
806 896
807 glEnable GL_BLEND; 897 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 899 glColor @{ $self->{bg} };
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811 900
812# glBegin GL_QUADS; 901 glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0; 902 glVertex 0 , 0;
815# glVertex 0 , $h; 903 glVertex 0 , $h;
816# glVertex $w, $h; 904 glVertex $w, $h;
817# glVertex $w, 0; 905 glVertex $w, 0;
818# glEnd; 906 glEnd;
819 907
820
821 $self->child->draw;
822 glDisable GL_BLEND; 908 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D; 909 }
910
911 $self->SUPER::_draw;
824} 912}
825 913
826############################################################################# 914#############################################################################
827 915
828package CFClient::UI::FancyFrame; 916package CFClient::UI::FancyFrame;
… …
839 my $class = shift; 927 my $class = shift;
840 928
841 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
842 930
843 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
846 border => 0.6, 934 border => 0.6,
935 is_toplevel => 1,
847 can_events => 1, 936 can_events => 1,
848 @_ 937 @_
849 ); 938 );
850 939
851 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
852 align => 0, 941 align => 0,
… …
876 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
877 966
878 $h -= List::Util::max 0, $self->border * 2; 967 $h -= List::Util::max 0, $self->border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 968 $w -= List::Util::max 0, $self->border * 2;
880 969
881 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
882 if $self->{title}; 971 if $self->{title};
883 972
884 $self->child->configure ($self->border, $self->border, $w, $h); 973 $self->child->configure ($self->border, $self->border, $w, $h);
885} 974}
886 975
… …
944 my ($self) = @_; 1033 my ($self) = @_;
945 1034
946 my ($w, $h ) = ($self->{w}, $self->{h}); 1035 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948 1037
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 1040
954 my $border = $self->border; 1041 my $border = $self->border;
955 1042
956 glColor @{ $self->{border_bg} }; 1043 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961 1048
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1050 my $bg = $tex[0];
964 1051
965 # TODO: repeat texture not scale 1052 # TODO: repeat texture not scale
… …
969 glColor @{ $self->{bg} }; 1056 glColor @{ $self->{bg} };
970 1057
971 $bg->{s} = $rep_x; 1058 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y; 1059 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1; 1060 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 }
975 1063
976 glDisable GL_TEXTURE_2D; 1064 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1065
980 $self->{title}->draw if $self->{title}; 1066 $self->{title}->draw if $self->{title};
981 1067
982 $self->child->draw; 1068 $self->child->draw;
983} 1069}
… …
1250 1336
1251############################################################################# 1337#############################################################################
1252 1338
1253package CFClient::UI::Label; 1339package CFClient::UI::Label;
1254 1340
1255our @ISA = CFClient::UI::Base::; 1341our @ISA = CFClient::UI::DrawBG::;
1256 1342
1257use CFClient::OpenGL; 1343use CFClient::OpenGL;
1258 1344
1259sub new { 1345sub new {
1260 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1261 1347
1262 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1350 #bg => none
1351 #active_bg => none
1264 #font => default_font 1352 #font => default_font
1265 #text => initial text 1353 #text => initial text
1266 #markup => initial narkup 1354 #markup => initial narkup
1355 #max_w => maximum pixel width
1356 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1357 layout => (new CFClient::Layout),
1268 fontsize => 1, 1358 fontsize => 1,
1269 align => -1, 1359 align => -1,
1270 valign => -1, 1360 valign => -1,
1271 padding => 2, 1361 padding => 2,
… …
1286 } 1376 }
1287 1377
1288 $self 1378 $self
1289} 1379}
1290 1380
1291sub escape { 1381sub escape($) {
1292 local $_ = $_[1]; 1382 local $_ = $_[0];
1293 1383
1294 s/&/&amp;/g; 1384 s/&/&amp;/g;
1295 s/>/&gt;/g; 1385 s/>/&gt;/g;
1296 s/</&lt;/g; 1386 s/</&lt;/g;
1297 1387
1298 $_[1] 1388 $_
1299} 1389}
1300 1390
1301sub update { 1391sub update {
1302 my ($self) = @_; 1392 my ($self) = @_;
1303 1393
… …
1336sub size_request { 1426sub size_request {
1337 my ($self) = @_; 1427 my ($self) = @_;
1338 1428
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $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});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1434
1343 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1344 1436
1345 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1375} 1467}
1376 1468
1377sub _draw { 1469sub _draw {
1378 my ($self) = @_; 1470 my ($self) = @_;
1379 1471
1472 $self->SUPER::_draw; # draw background, if applicable
1473
1380 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1475 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $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});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1481
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1482 my $tex = new_from_layout CFClient::Texture $self->{layout};
1387 1483
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1486 : ($self->{w} - $tex->{w}) * 0.5);
1391 1487
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1490 : ($self->{h} - $tex->{h}) * 0.5);
1395 1491
1396 $tex 1492 $tex
1397 }; 1493 };
1398 1494
1399 glEnable GL_TEXTURE_2D; 1495 glEnable GL_TEXTURE_2D;
… …
1427 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1428 can_hover => 1, 1524 can_hover => 1,
1429 can_focus => 1, 1525 can_focus => 1,
1430 valign => 0, 1526 valign => 0,
1431 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1432 @_ 1529 @_
1433 ) 1530 )
1434} 1531}
1435 1532
1436sub _set_text { 1533sub _set_text {
… …
1446 $self->{text} = $text; 1543 $self->{text} = $text;
1447 1544
1448 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1449 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1450 1547
1451 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1452} 1549}
1453 1550
1454sub set_text { 1551sub set_text {
1455 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1456 1553
1457 $self->{cursor} = length $text; 1554 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1555 $self->_set_text ($text);
1556 $self->update;
1459 $self->check_size; 1557 $self->check_size;
1460 $self->update;
1461} 1558}
1462 1559
1463sub get_text { 1560sub get_text {
1464 $_[0]{text} 1561 $_[0]{text}
1465} 1562}
… …
1468 my ($self) = @_; 1565 my ($self) = @_;
1469 1566
1470 my ($w, $h) = $self->SUPER::size_request; 1567 my ($w, $h) = $self->SUPER::size_request;
1471 1568
1472 ($w + 1, $h) # add 1 for cursor 1569 ($w + 1, $h) # add 1 for cursor
1473}
1474
1475sub size_allocate {
1476 my ($self, $w, $h) = @_;
1477
1478 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1479} 1570}
1480 1571
1481sub key_down { 1572sub key_down {
1482 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1483 1574
… …
1485 my $sym = $ev->{sym}; 1576 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1577 my $uni = $ev->{unicode};
1487 1578
1488 my $text = $self->get_text; 1579 my $text = $self->get_text;
1489 1580
1490 if ($sym == 8) { 1581 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1582 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1583 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1584 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1585 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1586 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1587 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1588 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1593 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1594 $self->_emit ('escape');
1504 } elsif ($uni) { 1595 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1597 }
1507 1598
1508 $self->_set_text ($text); 1599 $self->_set_text ($text);
1509 $self->update; 1600 $self->update;
1601 $self->check_size;
1510} 1602}
1511 1603
1512sub focus_in { 1604sub focus_in {
1513 my ($self) = @_; 1605 my ($self) = @_;
1514 1606
… …
1594 if ($sym == 13) { 1686 if ($sym == 13) {
1595 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1596 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1597 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1598 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1599 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1600 $self->update; 1692 $self->update;
1601 1693
1602 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1603 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1604 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1643 my $class = shift; 1735 my $class = shift;
1644 1736
1645 $class->SUPER::new ( 1737 $class->SUPER::new (
1646 padding => 4, 1738 padding => 4,
1647 fg => [1, 1, 1], 1739 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1740 active_fg => [0, 0, 1],
1650 can_hover => 1, 1741 can_hover => 1,
1651 align => 0, 1742 align => 0,
1652 valign => 0, 1743 valign => 0,
1653 can_events => 1, 1744 can_events => 1,
1654 @_ 1745 @_
1655 ) 1746 )
1656} 1747}
1657 1748
1749sub activate { }
1750
1658sub button_up { 1751sub button_up {
1659 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1660 1753
1754 $self->emit ("activate")
1661 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1662 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1663 $self->emit ("activate");
1664 }
1665} 1757}
1666 1758
1667sub _draw { 1759sub _draw {
1668 my ($self) = @_; 1760 my ($self) = @_;
1669 1761
… …
1701 1793
1702 $class->SUPER::new ( 1794 $class->SUPER::new (
1703 padding => 2, 1795 padding => 2,
1704 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1705 active_fg => [1, 1, 0], 1797 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5],
1706 state => 0, 1800 state => 0,
1707 can_hover => 1, 1801 can_hover => 1,
1708 @_ 1802 @_
1709 ) 1803 )
1710} 1804}
… …
1719 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1720 1814
1721 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1722 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1723 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1724 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1725 } 1819 }
1726} 1820}
1727 1821
1728sub _draw { 1822sub _draw {
1729 my ($self) = @_; 1823 my ($self) = @_;
… …
1734 1828
1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1736 1830
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1832
1833 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834
1739 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1836 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1837 glDisable GL_TEXTURE_2D;
1746} 1838}
1747 1839
1748############################################################################# 1840#############################################################################
1749 1841
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2088 qw(s1_slider.png s1_slider_bg.png);
1997 2089
1998sub new { 2090sub new {
1999 my $class = shift; 2091 my $class = shift;
2000 2092
2001 # range [value, low, high, page] 2093 # range [value, low, high, page, unit]
2002 2094
2003 # TODO: 0-width page 2095 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2096 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2097 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2008 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5],
2009 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2010 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2012 vertical => 0, 2106 vertical => 0,
2013 can_hover => 1, 2107 can_hover => 1,
2014 inner_pad => 5, 2108 inner_pad => 0.02,
2015 @_ 2109 @_
2016 ); 2110 );
2017 2111
2112 $self->set_value ($self->{range}[0]);
2113 $self->update;
2114
2018 $self 2115 $self
2116}
2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2126sub set_value {
2127 my ($self, $value) = @_;
2128
2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2130
2131 $hi = $lo + 1 if $hi <= $lo;
2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2135 $value = $lo if $value < $lo;
2136 $value = $hi - $page if $value > $hi - $page;
2137
2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2139 if $unit;
2140
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142
2143 if ($value != $old_value) {
2144 $self->_emit (changed => $value);
2145 $self->update;
2146 }
2019} 2147}
2020 2148
2021sub size_request { 2149sub size_request {
2022 my ($self) = @_; 2150 my ($self) = @_;
2023 2151
… …
2029 2157
2030sub button_down { 2158sub button_down {
2031 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2032 2160
2033 $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
2034 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2035} 2166}
2036 2167
2037sub mouse_motion { 2168sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
2039 2170
2040 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173
2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2179 }
2180}
2181
2182sub update {
2183 my ($self) = @_;
2184
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2186 $self->set_value ($self->{range}[0]);
2187
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2042 2190
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2044 2192
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2047 2195
2048 $x -= $inner_pad_px; # substract the padding 2196 $value = ($value - $lo) / $range;
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2197 $value = $value * $self->{scale} + $self->{offset};
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2198
2054 $self->emit (changed => $x); 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2055 $self->update; 2200 $self->{knob_w} = $knob_w;
2056 } 2201 });
2057}
2058 2202
2059# the inner_* stuff is for generating a padding for the slider handle, 2203 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2204}
2066 2205
2067sub _draw { 2206sub _draw {
2068 my ($self) = @_; 2207 my ($self) = @_;
2069 2208
2070 $self->SUPER::_draw (); 2209 $self->SUPER::_draw ();
2071 2210
2072 my ($w, $h) = @$self{qw(w h)}; 2211 glScale $self->{w}, $self->{h};
2073 2212
2074 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
2076 2215
2216 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2218 }
2082 2219
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2222
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2225
2107 # draw background 2226 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2227 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2228
2110 # draw handle 2229 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2231
2113 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2114} 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 (@_) }
2115 2275
2116############################################################################# 2276#############################################################################
2117 2277
2118package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2119 2279
… …
2149 2309
2150 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2151 $self->reflow; 2311 $self->reflow;
2152} 2312}
2153 2313
2154sub text_height {
2155 my ($self, $text) = @_;
2156
2157 my $layout = $self->{layout};
2158
2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160 $layout->set_width ($self->{children}[0]{w});
2161 $layout->set_markup ($text);
2162
2163 ($layout->size)[1]
2164}
2165
2166sub reflow {
2167 my ($self) = @_;
2168
2169 $self->{need_reflow}++;
2170 $self->update;
2171}
2172
2173sub size_allocate { 2314sub size_allocate {
2174 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2175 2316
2176 $self->SUPER::size_allocate ($w, $h); 2317 $self->SUPER::size_allocate ($w, $h);
2177 2318
… …
2180 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2181 2322
2182 $self->reflow; 2323 $self->reflow;
2183} 2324}
2184 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
2185sub add_paragraph { 2360sub add_paragraph {
2186 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2187 2362
2188 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2189 2364 my ($w, $h) = $self->text_size ($line);
2190 my $height = $self->text_height ($text);
2191
2192 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2193 2368
2194 push @{$self->{par}}, [$height, $color, $text];
2195
2196 $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]);
2197 $self->{children}[1]->update;
2198} 2370}
2199 2371
2200sub update { 2372sub update {
2201 my ($self) = @_; 2373 my ($self) = @_;
2202 2374
… …
2204 2376
2205 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2206 2378
2207 delete $self->{texture}; 2379 delete $self->{texture};
2208 2380
2209 $ROOT->on_refresh ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2210 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2385 my $height = 0;
2212 2386
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2214 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 }
2215 2402
2216 $self->{height} = $height; 2403 $self->{height} = $height;
2217 2404
2218 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2219 2406
2220 delete $self->{texture}; 2407 delete $self->{texture};
2221 } 2408 }
2222 2409
2223 $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 {
2224 glClearColor 0, 0, 0, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2226 2413
2227 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229
2230 my $top = int $self->{children}[1]{range}[0]; 2414 my $top = int $self->{children}[1]{range}[0];
2231 2415
2232 my $y0 = $top; 2416 my $y0 = $top;
2233 my $y1 = $top + $self->{h}; 2417 my $y1 = $top + $H;
2234 2418
2235 my $y = 0; 2419 my $y = 0;
2236 2420
2237 my $layout = $self->{layout}; 2421 my $layout = $self->{layout};
2238 2422
2239 $layout->set_font ($self->{font}) if $self->{font}; 2423 $layout->set_font ($self->{font}) if $self->{font};
2240 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
2241 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2242 my $h = $par->[0]; 2430 my $h = $par->[1];
2243 2431
2244 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] }); 2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2246 $layout->set_markup ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2247 2436
2248 my ($W, $H) = $layout->size; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249 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;
2250 } 2441 }
2251 2442
2252 $y += $h; 2443 $y += $h;
2253 } 2444 }
2254 2445
2255 glDisable GL_TEXTURE_2D; 2446 glDisable GL_BLEND;
2256 }; 2447 };
2257 }); 2448 });
2258} 2449}
2259 2450
2260sub _draw { 2451sub _draw {
2261 my ($self) = @_; 2452 my ($self) = @_;
2262 2453
2263 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2266 $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});
2267 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2268 2459
2269 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2270 2461
2271} 2462}
… …
2340 2531
2341 # TODO: use animation 2532 # TODO: use animation
2342 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2343 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2344 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2345 $self->emit ("open"); 2536 $self->_emit ("open");
2346 } else { 2537 } else {
2347 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2348 $self->emit ("close"); 2539 $self->_emit ("close");
2349 } 2540 }
2350 2541
2351 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2352} 2543}
2353 2544
2354############################################################################# 2545#############################################################################
2355 2546
2356package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2369} 2560}
2370 2561
2371sub set_tooltip_from { 2562sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2563 my ($self, $widget) = @_;
2373 2564
2374 $self->{label} = new CFClient::UI::Label 2565 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2566 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2568 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2569 fg => [0, 0, 0, 1],
2570 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2571 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2572 );
2381 $self->add ($self->{label});
2382} 2573}
2383 2574
2384sub size_request { 2575sub size_request {
2385 my ($self) = @_; 2576 my ($self) = @_;
2386 2577
… …
2396} 2587}
2397 2588
2398sub _draw { 2589sub _draw {
2399 my ($self) = @_; 2590 my ($self) = @_;
2400 2591
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2592 glTranslate 0.375, 0.375;
2403 2593
2404 my ($w, $h) = @$self{qw(w h)}; 2594 my ($w, $h) = @$self{qw(w h)};
2405 2595
2406 glColor 1, 0.8, 0.4; 2596 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2607 glVertex 0 , $h;
2418 glVertex $w, $h; 2608 glVertex $w, $h;
2419 glVertex $w, 0; 2609 glVertex $w, 0;
2420 glEnd; 2610 glEnd;
2421 2611
2422 glPopMatrix; 2612 glTranslate 2 - 0.375, 2 - 0.375;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2613 $self->SUPER::_draw;
2426} 2614}
2427 2615
2428############################################################################# 2616#############################################################################
2429 2617
… …
2434use CFClient::OpenGL; 2622use CFClient::OpenGL;
2435 2623
2436sub new { 2624sub new {
2437 my $class = shift; 2625 my $class = shift;
2438 2626
2439 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2440 aspect => 1, 2628 aspect => 1,
2441 @_, 2629 @_,
2442 ) 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
2443} 2647}
2444 2648
2445sub size_request { 2649sub size_request {
2446 (32, 8) 2650 (32, 8)
2447} 2651}
2448 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2449sub _draw { 2661sub _draw {
2450 my ($self) = @_; 2662 my ($self) = @_;
2451 2663
2452 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
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454 2676
2455 # TODO animation
2456 if ($tex) { 2677 if ($tex) {
2457 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2462 } 2683 }
2463} 2684}
2464 2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2693}
2694
2465############################################################################# 2695#############################################################################
2466 2696
2467package CFClient::UI::InventoryItem; 2697package CFClient::UI::InventoryItem;
2468 2698
2469our @ISA = CFClient::UI::HBox::; 2699our @ISA = CFClient::UI::HBox::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2470 2726
2471sub new { 2727sub new {
2472 my $class = shift; 2728 my $class = shift;
2473 2729
2474 my %args = @_; 2730 my %args = @_;
2475 2731
2476 my $item = delete $args{item}; 2732 my $item = delete $args{item};
2477 2733
2478 my $desc = $item->{nrof} < 2 2734 my $desc = _item_to_desc ($item);
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482 2735
2483 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2484 can_hover => 1, 2737 can_hover => 1,
2485 can_events => 1, 2738 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc) 2739 tooltip => ((CFClient::UI::Label::escape $desc)
2487 . "\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>"),
2488 connect_button_down => sub { 2741 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_; 2742 my ($self, $ev, $x, $y) = @_;
2490 2743
2491 # 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");
2492 if ($ev->{button} == 1) { 2753 } elsif ($ev->{button} == 1) {
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2754 $::CONN->send ("examine $item->{tag}");
2494 } elsif ($ev->{button} == 2) { 2755 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}"); 2756 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) { 2757 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new ( 2758 my @menu_items = (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2505 ["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}) }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2507 ], 2771 ),
2508 )->popup ($ev); 2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2509 } 2775 }
2510 2776
2511 1 2777 1
2512 }, 2778 },
2513 %args 2779 %args
2514 ); 2780 );
2781
2515 2782
2516 $self->add (new CFClient::UI::Face 2783 $self->add (new CFClient::UI::Face
2517 can_events => 0, 2784 can_events => 0,
2518 face => $item->{face}, 2785 face => $item->{face},
2519 anim => $item->{anim}, 2786 anim => $item->{anim},
2520 animspeed => $item->{animspeed}, 2787 animspeed => $item->{animspeed},
2521 ); 2788 );
2522 2789
2523 $self->add (new CFClient::UI::Label 2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2524 can_events => 0, 2791
2525 text => $desc, 2792 $self->{item} = $item;
2526 ); 2793
2794 $self->update_item;
2527 2795
2528 $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);
2529} 2805}
2530 2806
2531############################################################################# 2807#############################################################################
2532 2808
2533package CFClient::UI::Inventory; 2809package CFClient::UI::Inventory;
… …
2536 2812
2537sub new { 2813sub new {
2538 my $class = shift; 2814 my $class = shift;
2539 2815
2540 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2541 scrolled => (new CFClient::UI::VBox), 2817 scrolled => (new CFClient::UI::Table),
2542 @_, 2818 @_,
2543 ); 2819 );
2544 2820
2545 $self 2821 $self
2546} 2822}
… …
2549 my ($self, $items) = @_; 2825 my ($self, $items) = @_;
2550 2826
2551 $self->{scrolled}->clear; 2827 $self->{scrolled}->clear;
2552 return unless $items; 2828 return unless $items;
2553 2829
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2555 2834
2556 $self->{real_items} = \@items; 2835 $self->{real_items} = \@items;
2557 2836
2558 for my $item (@items) { 2837 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2 2838 $item->{item} = $item;
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@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);
2564 } 2848 }
2565 2849
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567} 2851}
2568 2852
… …
2611 2895
2612# 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)
2613sub popup { 2897sub popup {
2614 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2615 2899
2616 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2617 2901
2618 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2619 $GRAB = $self; 2903 $GRAB = $self;
2620 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2621 2905
… …
2636 2920
2637 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2638 undef $GRAB; 2922 undef $GRAB;
2639 $self->hide; 2923 $self->hide;
2640 2924
2641 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2642 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2643 } 2927 }
2644} 2928}
2645 2929
2646############################################################################# 2930#############################################################################
2647 2931
2648package CFClient::UI::Statusbox; 2932package CFClient::UI::Statusbox;
2649 2933
2650our @ISA = CFClient::UI::VBox::; 2934our @ISA = CFClient::UI::VBox::;
2935
2936sub new {
2937 my $class = shift;
2938
2939 $class->SUPER::new (
2940 fontsize => 0.8,
2941 @_,
2942 )
2943}
2651 2944
2652sub reorder { 2945sub reorder {
2653 my ($self) = @_; 2946 my ($self) = @_;
2654 my $NOW = time; 2947 my $NOW = time;
2655 2948
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2949 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2951 }
2659 2952
2660 my @widgets; 2953 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2954
2955 my @items = sort {
2956 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} };
2959
2662 my $count = 10 + 1; 2960 my $count = 10 + 1;
2663 for my $item (@items) { 2961 for my $item (@items) {
2664 last unless --$count; 2962 last unless --$count;
2665 2963
2666 push @widgets, $item->{label} ||= do { 2964 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2965 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2966 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text};
2969
2669 for ($short) { 2970 for ($short) {
2670 s/^\s+//; 2971 s/^\s+//;
2671 s/\012.*//s; 2972 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2973 }
2675 2974
2676 new CFClient::UI::Label 2975 new CFClient::UI::Label
2677 markup => $short, 2976 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2977 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2978 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2979 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2980 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2981 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg},
2683 can_events => 1, 2983 can_events => 1,
2684 can_hover => 1, 2984 can_hover => 1
2685 }; 2985 };
2686 } 2986 }
2687 2987
2688 $self->clear; 2988 $self->clear;
2689 $self->SUPER::add (@widgets); 2989 $self->SUPER::add (reverse @widgets);
2690} 2990}
2691 2991
2692sub add { 2992sub add {
2693 my ($self, $text, %arg) = @_; 2993 my ($self, $text, %arg) = @_;
2694 2994
2695 my $item = { 2995 $text =~ s/^\s+//;
2696 time => time, 2996 $text =~ s/\s+$//;
2997
2998 my $timeout = time + ((delete $arg{timeout}) || 60);
2999
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001
3002 if (my $item = $self->{item}{$group}) {
3003 if ($item->{text} eq $text) {
3004 $item->{count}++;
3005 } else {
3006 $item->{count} = 1;
3007 $item->{text} = $item->{tooltip} = $text;
3008 }
3009 $item->{id} = ++$self->{id};
3010 $item->{timeout} = $timeout;
3011 delete $item->{label};
3012 } else {
3013 $self->{item}{$group} = {
3014 id => ++$self->{id},
2697 text => $text, 3015 text => $text,
2698 timeout => 60, 3016 timeout => $timeout,
2699 tooltip => $text, 3017 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 3018 fg => [0.8, 0.8, 0.8, 0.8],
3019 pri => 0,
3020 count => 1,
2702 %arg, 3021 %arg,
3022 };
2703 }; 3023 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 3024
2710 $self->reorder; 3025 $self->reorder;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 delete $_->{label}
3032 for values %{ $self->{item} || {} };
3033
3034 $self->reorder;
3035 $self->SUPER::reconfigure;
2711} 3036}
2712 3037
2713############################################################################# 3038#############################################################################
2714 3039
2715package CFClient::UI::Root; 3040package CFClient::UI::Root;
… …
2747} 3072}
2748 3073
2749sub size_allocate { 3074sub size_allocate {
2750 my ($self, $w, $h) = @_; 3075 my ($self, $w, $h) = @_;
2751 3076
2752 my $old_w = $self->{old_w};
2753 my $old_h = $self->{old_h};
2754
2755 if ($old_w && $old_h) {
2756 for my $child ($self->children) {
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767
2768 for my $child ($self->children) { 3077 for my $child ($self->children) {
2769 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)};
2770 3079
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3081 if exists $child->{req_x};
3082
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084 if exists $child->{req_y};
3085
2771 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088
2773 $child->configure ($X, $Y, $W, $H); 3089 $child->configure ($X, $Y, $W, $H);
2774 } 3090 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 3091}
2779 3092
2780sub coord2local { 3093sub coord2local {
2781 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2782 3095
… …
2795 $self->check_size; 3108 $self->check_size;
2796 $::WANT_REFRESH++; 3109 $::WANT_REFRESH++;
2797} 3110}
2798 3111
2799sub add { 3112sub add {
2800 my ($self, $child) = @_; 3113 my ($self, @children) = @_;
2801 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
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1;
3123
2802 # integerise window positions 3124 # integerise window positions
2803 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2804 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
3127 }
2805 3128
2806 $self->SUPER::add ($child); 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 }
2807} 3142}
2808 3143
2809sub on_refresh { 3144sub on_refresh {
2810 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2811 3146
2812 $self->{refresh_hook}{$id} = $cb; 3147 $self->{refresh_hook}{$id} = $cb;
2813} 3148}
2814 3149
3150sub on_post_alloc {
3151 my ($self, $id, $cb) = @_;
3152
3153 $self->{post_alloc_hook}{$id} = $cb;
3154}
3155
2815sub draw { 3156sub draw {
2816 my ($self) = @_; 3157 my ($self) = @_;
3158
3159 while ($self->{refresh_hook}) {
3160 $_->()
3161 for values %{delete $self->{refresh_hook}};
3162 }
2817 3163
2818 if ($self->{check_size}) { 3164 if ($self->{check_size}) {
2819 my @queue = ([], []); 3165 my @queue = ([], []);
2820 3166
2821 for (;;) { 3167 for (;;) {
… …
2829 3175
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)} 3177 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request; 3178 : $widget->size_request;
2833 3179
3180 if (delete $widget->{force_alloc}
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836 3183
2837 $widget->{req_w} = $w; 3184 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h; 3185 $widget->{req_h} = $h;
2839 3186
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841 3188
2842 $widget->{parent}->check_size 3189 $widget->{parent}->check_size
2843 if $widget->{parent}; 3190 if $widget->{parent};
2844 } 3191 }
2845 } 3192 }
… …
2852 $w = 0 if $w < 0; 3199 $w = 0 if $w < 0;
2853 $h = 0 if $h < 0; 3200 $h = 0 if $h < 0;
2854 3201
2855 $widget->{w} = $w; 3202 $widget->{w} = $w;
2856 $widget->{h} = $h; 3203 $widget->{h} = $h;
2857 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h); 3204 $widget->emit (size_allocate => $w, $h);
2859 } 3205 }
2860 } 3206 }
2861 3207
2862 while ($self->{refresh_hook}) { 3208 while ($self->{post_alloc_hook}) {
2863 $_->() 3209 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3210 for values %{delete $self->{post_alloc_hook}};
2865 } 3211 }
2866 3212
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3213 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2870 3216
2871 glMatrixMode GL_PROJECTION; 3217 glMatrixMode GL_PROJECTION;
2872 glLoadIdentity; 3218 glLoadIdentity;
2873 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874 glMatrixMode GL_MODELVIEW; 3220 glMatrixMode GL_MODELVIEW;
2875 glLoadIdentity; 3221 glLoadIdentity;
2876 3222
2877 $self->_draw; 3223 $self->_draw;
2878} 3224}
… …
2880############################################################################# 3226#############################################################################
2881 3227
2882package CFClient::UI; 3228package CFClient::UI;
2883 3229
2884$ROOT = new CFClient::UI::Root; 3230$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3231$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3232
28871 32331
2888 3234

Diff Legend

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