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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
16sub check_tooltip { 17sub check_tooltip {
17 if (!$GRAB) { 18 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 20 if (length $widget->{tooltip}) {
20 21
21 if ($TOOLTIP->{owner} != $widget) { 22 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 23 $TOOLTIP->{owner} = $widget;
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
31 } 41 }
32 42
33 return; 43 return;
34 } 44 }
35 } 45 }
… …
39 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
40} 50}
41 51
42# class methods for events 52# class methods for events
43sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
45} 56}
46 57
47sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
49} 61}
50 62
51sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
52 my ($ev) = @_; 64 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 73 check_tooltip;
62 } 74 }
63 75
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 77
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 78 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y);
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
67} 82}
68 83
69sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
70 my ($ev) = @_; 85 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
72 87
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 89
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 91
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 92 if ($GRAB) {
93 ($x, $y) = $GRAB->coord2local ($x, $y);
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
78 96
79 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 99 $grab->update if $grab;
82 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 117
100 check_tooltip; 118 check_tooltip;
101 } 119 }
102 120
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
104} 125}
105 126
106# convert position array to integers 127# convert position array to integers
107sub harmonize { 128sub harmonize {
108 my ($vals) = @_; 129 my ($vals) = @_;
… …
126 147
127sub new { 148sub new {
128 my $class = shift; 149 my $class = shift;
129 150
130 my $self = bless { 151 my $self = bless {
131 x => 0, 152 x => 0,
132 y => 0, 153 y => 0,
133 z => 0, 154 z => 0,
134 can_events => 1, 155 can_events => 1,
135 @_ 156 @_
136 }, $class; 157 }, $class;
137 158
138 for (keys %$self) { 159 for (keys %$self) {
… …
142 } 163 }
143 164
144 $self 165 $self
145} 166}
146 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
147sub show { 175sub show {
148 my ($self) = @_; 176 my ($self) = @_;
149 177
150 return if $self->{parent}; 178 return if $self->{parent};
151 179
… …
153} 181}
154 182
155sub hide { 183sub hide {
156 my ($self) = @_; 184 my ($self) = @_;
157 185
158 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
159 188
160 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
161} 191}
162 192
163sub move { 193sub move {
164 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
165 195
… …
168 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
169 199
170 $self->update; 200 $self->update;
171} 201}
172 202
173sub needs_redraw { 203sub set_size {
174 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
175} 210}
176 211
177sub size_request { 212sub size_request {
178 require Carp; 213 require Carp;
179 Carp::confess "size_request is abstract"; 214 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 234 $self->{y} = $y;
200 $self->update; 235 $self->update;
201 } 236 }
202 237
203 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 240 }
210} 241}
211 242
212sub size_allocate { 243sub size_allocate {
213 # nothing to be done 244 # nothing to be done
214} 245}
215 246
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
216sub set_max_size { 261sub set_max_size {
217 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
218 263
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
221}
222
223# return top left coordinates
224sub _topleft {
225 my ($self, $x, $y) = @_;
226
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 266}
229 267
230# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
231sub coord2local { 269sub coord2local {
232 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
233 271
234 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 273}
237 274
238# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
239sub coord2global { 276sub coord2global {
240 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
241 278
242 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 280}
245 281
246sub focus_in { 282sub focus_in {
247 my ($self) = @_; 283 my ($self) = @_;
248 284
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
310 glEnd; 346 glEnd;
311 glDisable GL_BLEND; 347 glDisable GL_BLEND;
312 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
313} 363}
314 364
315sub _draw { 365sub _draw {
316 my ($self) = @_; 366 my ($self) = @_;
317 367
… …
332 382
333sub set_parent { 383sub set_parent {
334 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
335 385
336 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
337} 392}
338 393
339sub check_size { 394sub check_size {
340 my ($self) = @_; 395 my ($self, $forced) = @_;
341 396
342 return unless $self->{parent}; 397 $self->{force_alloc} = 1 if $forced;
343 398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352} 399}
353 400
354sub update { 401sub update {
355 my ($self) = @_; 402 my ($self) = @_;
356 403
… …
365} 412}
366 413
367sub emit { 414sub emit {
368 my ($self, $signal, @args) = @_; 415 my ($self, $signal, @args) = @_;
369 416
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 418}
374 419
375sub DESTROY { 420sub DESTROY {
376 my ($self) = @_; 421 my ($self) = @_;
377 422
… …
444sub new { 489sub new {
445 my ($class, %arg) = @_; 490 my ($class, %arg) = @_;
446 491
447 my $children = delete $arg{children} || []; 492 my $children = delete $arg{children} || [];
448 493
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 494 my $self = $class->SUPER::new (
495 children => [],
496 can_events => 0,
497 %arg,
498 );
450 $self->add ($_) for @$children; 499 $self->add ($_) for @$children;
451 500
452 $self 501 $self
453} 502}
454 503
455sub add { 504sub add {
456 my ($self, $child) = @_; 505 my ($self, @widgets) = @_;
457 506
458 $child->set_parent ($self); 507 $_->set_parent ($self)
508 for @widgets;
459 509
460 use sort 'stable'; 510 use sort 'stable';
461 511
462 $self->{children} = [ 512 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 513 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 514 @{$self->{children}}, @widgets
465 ]; 515 ];
466 516
467 $child->check_size; 517 $self->check_size (1);
518 $self->update;
519}
520
521sub children {
522 @{ $_[0]{children} }
468} 523}
469 524
470sub remove { 525sub remove {
471 my ($self, $child) = @_; 526 my ($self, $child) = @_;
472 527
473 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
474 530
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532
533 $self->check_size;
534 $self->update;
535}
536
537sub clear {
538 my ($self) = @_;
539
540 my $children = delete $self->{children};
541 $self->{children} = [];
542
543 for (@$children) {
544 delete $_->{parent};
545 $_->hide;
546 }
476 547
477 $self->check_size; 548 $self->check_size;
478 $self->update; 549 $self->update;
479} 550}
480 551
… …
558} 629}
559 630
560sub update { 631sub update {
561 my ($self) = @_; 632 my ($self) = @_;
562 633
563 # we want to do this delayed... 634 $ROOT->on_post_alloc ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 635 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 636}
577 637
578sub size_allocate { 638sub size_allocate {
579 my ($self, $w, $h) = @_; 639 my ($self, $w, $h) = @_;
580 640
581 $self->child->configure (0, 0, $w, $h); 641 $self->SUPER::size_allocate ($w, $h);
642 $self->update;
643}
582 644
645sub _render {
646 $_[0]{children}[0]->draw;
647}
648
649sub render_child {
650 my ($self) = @_;
651
652 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
653 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT;
655
583 $self->render_chld; 656 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 };
584} 665}
585 666
586sub _draw { 667sub _draw {
587 my ($self) = @_; 668 my ($self) = @_;
588 669
589 my ($w, $h) = ($self->w, $self->h); 670 my ($w, $h) = ($self->w, $self->h);
590 671
591 my $tex = $self->{texture} 672 my $tex = $self->{texture}
592 or return; 673 or return;
593 674
594 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1;
598 678
599 $tex->draw_quad (0, 0, $w, $h); 679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600 680
601 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
603} 682}
604 683
605############################################################################# 684#############################################################################
606 685
607package CFClient::UI::ViewPort; 686package CFClient::UI::ViewPort;
608 687
609our @ISA = CFClient::UI::Window::; 688our @ISA = CFClient::UI::Window::;
610 689
611sub new { die }
612
613sub size_request { 690sub size_request {
614 my ($self) = @_; 691 my ($self) = @_;
615 692
616 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 695
619 @$self{qw(child_w child_h)} 696 @$self{qw(child_w child_h)}
620} 697}
621 698
622sub _draw { 699sub size_allocate {
623 my ($self) = @_; 700 my ($self, $w, $h) = @_;
624 701
625 $self->{children}[1]->draw; 702 $self->update;
626} 703}
627 704
705sub set_offset {
706 my ($self, $x, $y) = @_;
628 707
629############################################################################# 708 $self->{view_x} = int $x;
709 $self->{view_y} = int $y;
630 710
711 $self->update;
712}
713
714# hmm, this does not work for topleft of $self... but we should not ask for that
715sub coord2local {
716 my ($self, $x, $y) = @_;
717
718 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
719}
720
721sub coord2global {
722 my ($self, $x, $y) = @_;
723
724 $x = List::Util::min $self->{w}, $x - $self->{view_x};
725 $y = List::Util::min $self->{h}, $y - $self->{view_y};
726
727 $self->SUPER::coord2global ($x, $y)
728}
729
730sub find_widget {
731 my ($self, $x, $y) = @_;
732
733 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
734 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
735 ) {
736 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
737 } else {
738 $self->CFClient::UI::Base::find_widget ($x, $y)
739 }
740}
741
742sub _render {
743 my ($self) = @_;
744
745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
746
747 $self->SUPER::_render;
748}
749
750#############################################################################
751
631package CFClient::UI::Frame; 752package CFClient::UI::ScrolledWindow;
632 753
633our @ISA = CFClient::UI::Bin::; 754our @ISA = CFClient::UI::HBox::;
634
635use CFClient::OpenGL;
636 755
637sub new { 756sub new {
638 my $class = shift; 757 my $class = shift;
639 758
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
640 my $self = $class->SUPER::new ( 769 $self = $class->SUPER::new (
641 bg => [1, 1, 1, 1], 770 vp => (new CFClient::UI::ViewPort),
642 border_bg => [1, 1, 1, 1], 771 slider => $slider,
643 border => 0.8,
644 @_ 772 @_,
645 ); 773 );
646 774
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
647 $self 779 $self
648} 780}
649 781
650sub set_size { 782#TODO# update range on size_allocate depeneing on child
651 my ($self, $w, $h) = @_; 783# update viewport offset on scroll
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656 784
657sub size_request { 785#############################################################################
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661 786
662sub size_allocate { 787package CFClient::UI::Frame;
663 my ($self, $w, $h) = @_;
664 $self->{w} = $w;
665 $self->{h} = $h;
666 $self->child->configure (0, 0, $w, $h);
667}
668 788
669sub _draw { 789our @ISA = CFClient::UI::Bin::;
670 my ($self) = @_;
671 790
672 my ($w, $h) = ($self->{w}, $self->{h}); 791use CFClient::OpenGL;
673
674 glEnable GL_BLEND;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glEnable GL_TEXTURE_2D;
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678
679# glBegin GL_QUADS;
680# glColor 0, 0, 0, 0;
681# glVertex 0 , 0;
682# glVertex 0 , $h;
683# glVertex $w, $h;
684# glVertex $w, 0;
685# glEnd;
686
687
688 $self->child->draw;
689 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D;
691}
692 792
693############################################################################# 793#############################################################################
694 794
695package CFClient::UI::FancyFrame; 795package CFClient::UI::FancyFrame;
696 796
… …
706 my $class = shift; 806 my $class = shift;
707 807
708 # TODO: user_x, user_y, overwrite moveto? 808 # TODO: user_x, user_y, overwrite moveto?
709 809
710 my $self = $class->SUPER::new ( 810 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 811 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 812 border_bg => [1, 1, 1, 1],
713 border => 0.8, 813 border => 0.6,
714 can_events => 1, 814 can_events => 1,
715 @_ 815 @_
716 ); 816 );
717 817
718 $self->{title} &&= new CFClient::UI::Label 818 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 819 align => 0,
720 valign => 1, 820 valign => 1,
721 text => $self->{title}, 821 text => $self->{title},
722 fontsize => 1; 822 fontsize => $self->{border};
723 823
724 $self 824 $self
725} 825}
726 826
727sub border { 827sub border {
728 int $_[0]{border} * $::FONTSIZE 828 int $_[0]{border} * $::FONTSIZE
729} 829}
730 830
731sub size_request { 831sub size_request {
732 my ($self) = @_; 832 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 833
736 my ($w, $h) = $self->SUPER::size_request; 834 my ($w, $h) = $self->SUPER::size_request;
737 835
738 ( 836 (
739 $w + $self->border * 2, 837 $w + $self->border * 2,
… …
754} 852}
755 853
756sub button_down { 854sub button_down {
757 my ($self, $ev, $x, $y) = @_; 855 my ($self, $ev, $x, $y) = @_;
758 856
857 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 858 my $border = $self->border;
760 859
761 if ($x < $self->{w} && $x >= $self->{w} - $border 860 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 861 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 862
863 if ($lr & $td) {
864 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 865 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 866 my ($bw, $bh) = ($self->{w}, $self->{h});
766 867
868 my $mx = $x < $border;
869 my $my = $y < $border;
870
767 $self->{motion} = sub { 871 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 872 my ($ev, $x, $y) = @_;
769 873
770 ($x, $y) = ($ev->{x}, $ev->{y}); 874 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy;
771 876
772 $self->{user_w} = $bw + $x - $ox; 877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 880 $self->check_size;
775 }; 881 };
776 882
777 } elsif ($x >= 0 && $x < $self->{w} 883 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 884 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 885 my ($bx, $by) = ($self->{x}, $self->{y});
782 886
783 $self->{motion} = sub { 887 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 888 my ($ev, $x, $y) = @_;
… …
807 my ($self) = @_; 911 my ($self) = @_;
808 912
809 my ($w, $h ) = ($self->{w}, $self->{h}); 913 my ($w, $h ) = ($self->{w}, $self->{h});
810 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811 915
812 glEnable GL_BLEND;
813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814 glEnable GL_TEXTURE_2D; 916 glEnable GL_TEXTURE_2D;
815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816 918
817 my $border = $self->border; 919 my $border = $self->border;
818 920
819 glColor @{ $self->{border_bg} }; 921 glColor @{ $self->{border_bg} };
820 $tex[1]->draw_quad (0, 0, $w, $border); 922 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
824 926
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 928 my $bg = $tex[0];
826 929
827 # TODO: repeat texture not scale 930 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 931 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 932 my $rep_y = $ch / $bg->{h};
830 933
831 glColor @{ $self->{bg} }; 934 glColor @{ $self->{bg} };
832 935
833 $bg->{s} = $rep_x; 936 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 937 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 938 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 939 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 }
837 941
838 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND;
840 943
841 $self->{title}->draw if $self->{title}; 944 $self->{title}->draw if $self->{title};
945
842 $self->child->draw; 946 $self->child->draw;
843} 947}
844 948
845############################################################################# 949#############################################################################
846 950
… …
868 $self->{children}[$y][$x] = $child; 972 $self->{children}[$y][$x] = $child;
869 973
870 $child->check_size; 974 $child->check_size;
871} 975}
872 976
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
873# TODO: move to container class maybe? send childs a signal on removal? 981# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 982sub clear {
875 my ($self) = @_; 983 my ($self) = @_;
876 984
985 my @children = $self->children;
877 delete $self->{children}; 986 delete $self->{children};
987
988 for (@children) {
989 delete $_->{parent};
990 $_->hide;
991 }
992
878 $self->update; 993 $self->update;
879} 994}
880 995
881sub get_wh { 996sub get_wh {
882 my ($self) = @_; 997 my ($self) = @_;
… …
1059} 1174}
1060 1175
1061sub size_allocate { 1176sub size_allocate {
1062 my ($self, $w, $h) = @_; 1177 my ($self, $w, $h) = @_;
1063 1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1064 my $children = $self->{children}; 1181 my $children = $self->{children};
1065 1182
1066 my @h = map $_->{req_h}, @$children; 1183 my @h = map $_->{req_h}, @$children;
1067 1184
1068 my $req_h = List::Util::sum @h; 1185 my $req_h = List::Util::sum @h;
… …
1105 1222
1106sub new { 1223sub new {
1107 my ($class, %arg) = @_; 1224 my ($class, %arg) = @_;
1108 1225
1109 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1227 fg => [1, 1, 1],
1111 #font => default_font 1228 #font => default_font
1229 #text => initial text
1230 #markup => initial narkup
1231 layout => (new CFClient::Layout),
1112 fontsize => 1, 1232 fontsize => 1,
1113 text => "",
1114 align => -1, 1233 align => -1,
1115 valign => -1, 1234 valign => -1,
1116 padding => 2, 1235 padding => 2,
1117 layout => new CFClient::Layout,
1118 can_events => 0, 1236 can_events => 0,
1119 %arg 1237 %arg
1120 ); 1238 );
1121 1239
1122 if (exists $self->{template}) { 1240 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout; 1241 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template}); 1242 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout; 1243 $self->{template} = $layout;
1126 } 1244 }
1127 1245
1128 $self->set_text (delete $self->{text}) if exists $self->{text}; 1246 if (exists $self->{markup}) {
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1247 $self->set_markup (delete $self->{markup});
1248 } else {
1249 $self->set_text (delete $self->{text});
1250 }
1130 1251
1131 $self 1252 $self
1132} 1253}
1133 1254
1134sub escape_text { 1255sub escape {
1135 local $_ = $_[1]; 1256 local $_ = $_[1];
1136 1257
1137 s/&/&amp;/g; 1258 s/&/&amp;/g;
1138 s/>/&gt;/g; 1259 s/>/&gt;/g;
1139 s/</&lt;/g; 1260 s/</&lt;/g;
1140 1261
1141 $_[1] 1262 $_[1]
1142} 1263}
1143 1264
1265sub update {
1266 my ($self) = @_;
1267
1268 delete $self->{texture};
1269 $self->SUPER::update;
1270}
1271
1144sub set_text { 1272sub set_text {
1145 my ($self, $text) = @_; 1273 my ($self, $text) = @_;
1146 1274
1275 return if $self->{text} eq "T$text";
1276 $self->{text} = "T$text";
1277
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1147 $self->{layout}->set_text ($text); 1279 $self->{layout}->set_text ($text);
1148 1280
1149 delete $self->{texture}; 1281 $self->update;
1150 $self->check_size; 1282 $self->check_size;
1151 $self->update;
1152} 1283}
1153 1284
1154sub set_markup { 1285sub set_markup {
1155 my ($self, $markup) = @_; 1286 my ($self, $markup) = @_;
1156 1287
1288 return if $self->{text} eq "M$markup";
1289 $self->{text} = "M$markup";
1290
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1157 $self->{layout}->set_markup ($markup); 1294 $self->{layout}->set_markup ($markup);
1158 1295
1159 delete $self->{texture}; 1296 $self->update;
1160 $self->check_size; 1297 $self->check_size;
1161 $self->update;
1162} 1298}
1163 1299
1164sub size_request { 1300sub size_request {
1165 my ($self) = @_; 1301 my ($self) = @_;
1166 1302
… …
1195sub set_fontsize { 1331sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1332 my ($self, $fontsize) = @_;
1197 1333
1198 $self->{fontsize} = $fontsize; 1334 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1335 delete $self->{texture};
1336
1337 $self->update;
1200 $self->check_size; 1338 $self->check_size;
1201 $self->update;
1202} 1339}
1203 1340
1204sub _draw { 1341sub _draw {
1205 my ($self) = @_; 1342 my ($self) = @_;
1206 1343
1207 my $tex = $self->{texture} ||= do { 1344 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1346 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $self->{layout}->set_width ($self->{w}); 1347 $self->{layout}->set_width ($self->{w});
1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1349
1211 new_from_layout CFClient::Texture $self->{layout} 1350 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5;
1355
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5;
1359
1360 $tex
1212 }; 1361 };
1213 1362
1214 glEnable GL_BLEND;
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216 glEnable GL_TEXTURE_2D; 1363 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1365
1366 if ($tex->{format} == GL_ALPHA) {
1219 glColor @{$self->{fg}}; 1367 glColor @{$self->{fg}};
1220
1221 $self->{ox} = int (
1222 $self->{align} < 0 ? $self->{padding}
1223 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224 : ($self->{w} - $tex->{w}) * 0.5
1225 );
1226
1227 $self->{oy} = int (
1228 $self->{valign} < 0 ? $self->{padding}
1229 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230 : ($self->{h} - $tex->{h}) * 0.5
1231 );
1232
1233 $tex->draw_quad ($self->{ox}, $self->{oy}); 1368 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1369 } else {
1370 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1371 }
1234 1372
1235 glDisable GL_TEXTURE_2D; 1373 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1374}
1238 1375
1239############################################################################# 1376#############################################################################
1240 1377
1241package CFClient::UI::EntryBase; 1378package CFClient::UI::EntryBase;
… …
1246 1383
1247sub new { 1384sub new {
1248 my $class = shift; 1385 my $class = shift;
1249 1386
1250 $class->SUPER::new ( 1387 $class->SUPER::new (
1251 fg => [1, 1, 1], 1388 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1389 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1390 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1391 active_fg => [0, 0, 0],
1255 can_hover => 1, 1392 can_hover => 1,
1256 can_focus => 1, 1393 can_focus => 1,
1257 valign => 0, 1394 valign => 0,
1258 can_events => 1, 1395 can_events => 1,
1259 @_ 1396 @_
1260 ) 1397 )
1261} 1398}
1262 1399
… …
1276 $self->{layout}->set_text ("$text "); 1413 $self->{layout}->set_text ("$text ");
1277 1414
1278 $self->emit (changed => $self->{text}); 1415 $self->emit (changed => $self->{text});
1279} 1416}
1280 1417
1418sub set_text {
1419 my ($self, $text) = @_;
1420
1421 $self->{cursor} = length $text;
1422 $self->_set_text ($text);
1423 $self->check_size;
1424 $self->update;
1425}
1426
1281sub get_text { 1427sub get_text {
1282 $_[0]{text} 1428 $_[0]{text}
1283} 1429}
1284 1430
1285sub size_request { 1431sub size_request {
… …
1292 1438
1293sub size_allocate { 1439sub size_allocate {
1294 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1295 1441
1296 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1297}
1298
1299sub set_text {
1300 my ($self, $text) = @_;
1301
1302 $self->{cursor} = length $text;
1303 $self->_set_text ($text);
1304 $self->update;
1305} 1443}
1306 1444
1307sub key_down { 1445sub key_down {
1308 my ($self, $ev) = @_; 1446 my ($self, $ev) = @_;
1309 1447
… …
1416 my ($self, $ev) = @_; 1554 my ($self, $ev) = @_;
1417 1555
1418 my $sym = $ev->{sym}; 1556 my $sym = $ev->{sym};
1419 1557
1420 if ($sym == 13) { 1558 if ($sym == 13) {
1559 unshift @{$self->{history}},
1560 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1563 $self->emit (activate => $txt);
1422 $self->update; 1564 $self->update;
1565
1566 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text;
1569 }
1570 if (@{$self->{history} || []} > 0) {
1571 $self->{history_pointer}++;
1572 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1573 $self->{history_pointer} = @{$self->{history} || []} - 1;
1574 }
1575 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1576 }
1577
1578 } elsif ($sym == CFClient::SDLK_DOWN) {
1579 $self->{history_pointer}--;
1580 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1581
1582 if ($self->{history_pointer} >= 0) {
1583 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1584 } else {
1585 $self->set_text ($self->{history_saveback});
1586 }
1423 1587
1424 } else { 1588 } else {
1425 $self->SUPER::key_down ($ev); 1589 $self->SUPER::key_down ($ev);
1426 } 1590 }
1427 1591
… …
1441 1605
1442sub new { 1606sub new {
1443 my $class = shift; 1607 my $class = shift;
1444 1608
1445 $class->SUPER::new ( 1609 $class->SUPER::new (
1446 padding => 4, 1610 padding => 4,
1447 fg => [1, 1, 1], 1611 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1612 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1613 active_fg => [0, 0, 1],
1450 can_hover => 1, 1614 can_hover => 1,
1451 align => 0, 1615 align => 0,
1452 valign => 0, 1616 valign => 0,
1453 can_events => 1, 1617 can_events => 1,
1454 @_ 1618 @_
1455 ) 1619 )
1456} 1620}
1457 1621
… …
1471 1635
1472 if ($GRAB == $self) { 1636 if ($GRAB == $self) {
1473 $self->{fg} = $self->{active_fg}; 1637 $self->{fg} = $self->{active_fg};
1474 } 1638 }
1475 1639
1476 glEnable GL_BLEND;
1477 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1642 glColor 0, 0, 0, 1;
1481 1643
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1644 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1645
1484 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1647
1487 $self->SUPER::_draw; 1648 $self->SUPER::_draw;
1488} 1649}
1489 1650
1490############################################################################# 1651#############################################################################
… …
1537 1698
1538 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1699 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1539 1700
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 1702
1542 glEnable GL_BLEND; 1703 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704
1543 glEnable GL_TEXTURE_2D; 1705 glEnable GL_TEXTURE_2D;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546 my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548 $tex->draw_quad (0, 0, $s, $s); 1706 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 1707 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 1708}
1553 1709
1554############################################################################# 1710#############################################################################
1555 1711
1556package CFClient::UI::Image; 1712package CFClient::UI::Image;
… …
1599 glTranslate 0, -$self->{w}, 0; 1755 glTranslate 0, -$self->{w}, 0;
1600 1756
1601 ($w, $h) = ($h, $w); 1757 ($w, $h) = ($h, $w);
1602 } 1758 }
1603 1759
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 1760 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 1762
1609 $tex->draw_quad (0, 0, $w, $h); 1763 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 1764
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 1765 glDisable GL_TEXTURE_2D;
1613} 1766}
1614 1767
1615############################################################################# 1768#############################################################################
1616 1769
1617package CFClient::UI::VGauge; 1770package CFClient::UI::VGauge;
1618 1771
1619our @ISA = CFClient::UI::Base::; 1772our @ISA = CFClient::UI::Base::;
1773
1774use List::Util qw(min max);
1620 1775
1621use CFClient::OpenGL; 1776use CFClient::OpenGL;
1622 1777
1623my %tex = ( 1778my %tex = (
1624 food => [ 1779 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1780 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1781 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1782 ],
1628 grace => [ 1783 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1784 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1785 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1786 ],
1632 hp => [ 1787 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1788 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1789 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1790 ],
1636 mana => [ 1791 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1792 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1793 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1794 ],
1640); 1795);
1641 1796
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1797# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1798sub new {
… …
1662} 1817}
1663 1818
1664sub set_max { 1819sub set_max {
1665 my ($self, $max) = @_; 1820 my ($self, $max) = @_;
1666 1821
1822 return if $self->{max_val} == $max;
1823
1667 $self->{max_val} = $max; 1824 $self->{max_val} = $max;
1825 $self->update;
1668} 1826}
1669 1827
1670sub set_value { 1828sub set_value {
1671 my ($self, $val, $max) = @_; 1829 my ($self, $val, $max) = @_;
1672 1830
1673 $self->set_max ($max) 1831 $self->set_max ($max)
1674 if defined $max; 1832 if defined $max;
1675 1833
1676 $max = $self->{max_val}; 1834 return if $self->{val} == $val;
1835
1677 $self->{val} = $val; 1836 $self->{val} = $val;
1678
1679 $self->update; 1837 $self->update;
1680} 1838}
1681 1839
1682sub _draw { 1840sub _draw {
1683 my ($self) = @_; 1841 my ($self) = @_;
1684 1842
1685 my $tex = $tex{$self->{type}}; 1843 my $tex = $tex{$self->{type}};
1844 my ($t1, $t2, $t3) = @$tex;
1686 1845
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1846 my ($w, $h) = ($self->{w}, $self->{h});
1688 1847
1689 if ($self->{vertical}) { 1848 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1849 glRotate 90, 0, 0, 1;
… …
1692 1851
1693 ($w, $h) = ($h, $w); 1852 ($w, $h) = ($h, $w);
1694 } 1853 }
1695 1854
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1855 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1856
1699 my $t1 = $tex->[0]; 1857 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1858 my $ycut2 = max 0, min 1, $ycut - 1;
1859
1860 my $h1 = $self->{h} * (1 - $ycut1);
1861 my $h2 = $self->{h} * (1 - $ycut2);
1701 1862
1702 glEnable GL_BLEND; 1863 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1864 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1865 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1867
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1868 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1869 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1870 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1871 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1872 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1873 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1874 glEnd;
1717 1875
1876 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1877 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1878 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1879 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1880 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1881 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1882 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1883 glEnd;
1884
1885 if ($t3) {
1886 glBindTexture GL_TEXTURE_2D, $t3->{name};
1887 glBegin GL_QUADS;
1888 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1889 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1890 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1891 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1892 glEnd;
1893 }
1725 1894
1726 glDisable GL_BLEND; 1895 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1728} 1897}
1729 1898
… …
1735 1904
1736sub new { 1905sub new {
1737 my ($class, %arg) = @_; 1906 my ($class, %arg) = @_;
1738 1907
1739 my $self = $class->SUPER::new ( 1908 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1909 tooltip => $arg{type},
1910 can_hover => 1,
1911 can_events => 1,
1741 %arg, 1912 %arg,
1742 ); 1913 );
1743 1914
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1915 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1916 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1917 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1918
1748 $self 1919 $self
1749} 1920}
1750 1921
1751sub set_fontsize { 1922sub set_fontsize {
… …
1753 1924
1754 $self->{value}->set_fontsize ($fsize); 1925 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1926 $self->{max} ->set_fontsize ($fsize);
1756} 1927}
1757 1928
1929sub set_max {
1930 my ($self, $max) = @_;
1931
1932 $self->{gauge}->set_max ($max);
1933 $self->{max}->set_text ($max);
1934}
1935
1758sub set_value { 1936sub set_value {
1759 my ($self, $val, $max) = @_; 1937 my ($self, $val, $max) = @_;
1760 1938
1761 $self->set_max ($max) 1939 $self->set_max ($max)
1762 if defined $max; 1940 if defined $max;
1763 1941
1764 $self->{gauge}->set_value ($val, $max); 1942 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1943 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 1944}
1774 1945
1775############################################################################# 1946#############################################################################
1776 1947
1777package CFClient::UI::Slider; 1948package CFClient::UI::Slider;
… …
1796 # TODO: calculations are off 1967 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 1968 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 1969 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 1970 active_fg => [0, 0, 0],
1800 range => [0, 0, 100, 10], 1971 range => [0, 0, 100, 10],
1801 req_w => 20, 1972 req_w => $::WIDTH / 80,
1802 req_h => 20, 1973 req_h => $::WIDTH / 80,
1803 vertical => 0, 1974 vertical => 0,
1804 can_hover => 1, 1975 can_hover => 1,
1805 inner_pad => 5, 1976 inner_pad => 5,
1806 @_ 1977 @_
1807 ); 1978 );
… …
1890 $page ||= 2; 2061 $page ||= 2;
1891 2062
1892 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894 2065
1895 glEnable GL_BLEND;
1896 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897 glEnable GL_TEXTURE_2D; 2066 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2068
1900 # draw background 2069 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1902 2071
1903 # draw handle 2072 # draw handle
1904 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1905 2074
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2075 glDisable GL_TEXTURE_2D;
1908} 2076}
1909 2077
1910############################################################################# 2078#############################################################################
1911 2079
… …
1917 2085
1918sub new { 2086sub new {
1919 my $class = shift; 2087 my $class = shift;
1920 2088
1921 my $self = $class->SUPER::new ( 2089 my $self = $class->SUPER::new (
1922 fontsize => 1, 2090 fontsize => 1,
2091 can_events => 0,
1923 #font => default_font 2092 #font => default_font
1924 @_, 2093 @_,
1925 2094
1926 layout => (new CFClient::Layout), 2095 layout => (new CFClient::Layout 1),
1927 par => [], 2096 par => [],
1928 height => 0, 2097 height => 0,
1929 children => [ 2098 children => [
1930 (new CFClient::UI::Empty expand => 1), 2099 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2100 (new CFClient::UI::Slider vertical => 1),
1932 ], 2101 ],
1933 ); 2102 );
1934 2103
1935 $self->{children}[1]->connect (changed => sub { 2104 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2105
1939 $self 2106 $self
1940} 2107}
1941 2108
1942sub set_fontsize { 2109sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2117 my ($self, $text) = @_;
1951 2118
1952 my $layout = $self->{layout}; 2119 my $layout = $self->{layout};
1953 2120
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2122 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2123 $layout->set_markup ($text);
1957 2124
1958 ($layout->size)[1] 2125 ($layout->size)[1]
1959} 2126}
1960 2127
1961sub reflow { 2128sub reflow {
… …
1999 2166
2000 return unless $self->{h} > 0; 2167 return unless $self->{h} > 0;
2001 2168
2002 delete $self->{texture}; 2169 delete $self->{texture};
2003 2170
2004 $ROOT->on_refresh ($self, sub { 2171 $ROOT->on_post_alloc ($self, sub {
2005 if (delete $self->{need_reflow}) { 2172 if (delete $self->{need_reflow}) {
2006 my $height = 0; 2173 my $height = 0;
2007 2174
2008 $height += $_->[0] = $self->text_height ($_->[2]) 2175 $height += $_->[0] = $self->text_height ($_->[2])
2009 for @{$self->{par}}; 2176 for @{$self->{par}};
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2181
2015 delete $self->{texture}; 2182 delete $self->{texture};
2016 } 2183 }
2017 2184
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019 glClearColor 0, 0, 0, 1; 2186 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2187 glClear GL_COLOR_BUFFER_BIT;
2021 2188
2022 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2189 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026 2191
2027 my $top = int $self->{children}[1]{range}[0]; 2192 my $top = int $self->{children}[1]{range}[0];
2028 2193
… …
2037 2202
2038 for my $par (@{$self->{par}}) { 2203 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2204 my $h = $par->[0];
2040 2205
2041 if ($y0 < $y + $h && $y < $y1) { 2206 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] });
2042 $layout->set_text ($par->[2]); 2208 $layout->set_markup ($par->[2]);
2043 2209
2044 glColor @{ $par->[1] };
2045 my ($W, $H) = $layout->size; 2210 my ($W, $H) = $layout->size;
2046 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2047 } 2212 }
2048 2213
2049 $y += $h; 2214 $y += $h;
2050 } 2215 }
2051 2216
2052 glDisable GL_TEXTURE_2D; 2217 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND;
2054 }; 2218 };
2055 }); 2219 });
2056} 2220}
2057 2221
2058sub _draw { 2222sub _draw {
2059 my ($self) = @_; 2223 my ($self) = @_;
2060 2224
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2225 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2227 glColor 1, 1, 1, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2229 glDisable GL_TEXTURE_2D;
2066 }
2067 2230
2068 $self->{children}[1]->draw; 2231 $self->{children}[1]->draw;
2069 2232
2070} 2233}
2071 2234
… …
2119 2282
2120sub new { 2283sub new {
2121 my $class = shift; 2284 my $class = shift;
2122 2285
2123 my $self = $class->SUPER::new ( 2286 my $self = $class->SUPER::new (
2124 state => 0, 2287 state => 0,
2125 connect_activate => \&toggle_flopper, 2288 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2289 @_
2128 ); 2290 );
2129 2291
2130 if ($self->{state}) { 2292 if ($self->{state}) {
2131 $self->{state} = 0; 2293 $self->{state} = 0;
… …
2166 @_, 2328 @_,
2167 can_events => 0, 2329 can_events => 0,
2168 ) 2330 )
2169} 2331}
2170 2332
2171sub set_text { 2333sub set_tooltip_from {
2172 my ($self, $text) = @_; 2334 my ($self, $widget) = @_;
2173 2335
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2336 $self->add (new CFClient::UI::Label
2175 $self->{label}->set_text ($text); 2337 markup => $widget->{tooltip},
2176 $self->add ($self->{label}); 2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8,
2340 fg => [0, 0, 0, 1],
2341 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 );
2177} 2343}
2178 2344
2179sub size_request { 2345sub size_request {
2180 my ($self) = @_; 2346 my ($self) = @_;
2181 2347
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2349
2186 ($w + 4, $h + 4) 2350 ($w + 4, $h + 4)
2187} 2351}
2188 2352
2353sub size_allocate {
2354 my ($self, $w, $h) = @_;
2355
2356 $self->SUPER::size_allocate ($w - 4, $h - 4);
2357}
2358
2189sub _draw { 2359sub _draw {
2190 my ($self) = @_; 2360 my ($self) = @_;
2191 2361
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2362 glTranslate 0.375, 0.375;
2194 2363
2195 my ($w, $h) = @$self{qw(w h)}; 2364 my ($w, $h) = @$self{qw(w h)};
2196 2365
2197 glColor 1, 0.8, 0.4; 2366 glColor 1, 0.8, 0.4;
… …
2208 glVertex 0 , $h; 2377 glVertex 0 , $h;
2209 glVertex $w, $h; 2378 glVertex $w, $h;
2210 glVertex $w, 0; 2379 glVertex $w, 0;
2211 glEnd; 2380 glEnd;
2212 2381
2213 glPopMatrix; 2382 glTranslate 2 - 0.375, 2 - 0.375;
2214
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2383 $self->SUPER::_draw;
2217} 2384}
2218 2385
2219############################################################################# 2386#############################################################################
2220 2387
2388package CFClient::UI::Face;
2389
2390our @ISA = CFClient::UI::Base::;
2391
2392use CFClient::OpenGL;
2393
2394sub new {
2395 my $class = shift;
2396
2397 $class->SUPER::new (
2398 aspect => 1,
2399 @_,
2400 )
2401}
2402
2403sub size_request {
2404 (32, 8)
2405}
2406
2407sub _draw {
2408 my ($self) = @_;
2409
2410 return unless $::CONN;#d# manage and cache textures differently
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2412
2413 # TODO animation
2414 if ($tex) {
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D;
2420 }
2421}
2422
2423#############################################################################
2424
2425package CFClient::UI::InventoryItem;
2426
2427our @ISA = CFClient::UI::HBox::;
2428
2429sub new {
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Menu;
2535
2536our @ISA = CFClient::UI::FancyFrame::;
2537
2538use CFClient::OpenGL;
2539
2540sub new {
2541 my $class = shift;
2542
2543 my $self = $class->SUPER::new (
2544 items => [],
2545 z => 100,
2546 @_,
2547 );
2548
2549 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2550
2551 for my $item (@{ $self->{items} }) {
2552 my ($widget, $cb) = @$item;
2553
2554 # handle various types of items, only text for now
2555 if (!ref $widget) {
2556 $widget = new CFClient::UI::Label
2557 can_hover => 1,
2558 can_events => 1,
2559 text => $widget;
2560 }
2561
2562 $self->{item}{$widget} = $item;
2563
2564 $self->{vbox}->add ($widget);
2565 }
2566
2567 $self
2568}
2569
2570# popup given the event (must be a mouse button down event currently)
2571sub popup {
2572 my ($self, $ev) = @_;
2573
2574 $self->emit ("popdown");
2575
2576 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self;
2578 $self->{button} = $ev->{button};
2579
2580 $self->show;
2581 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2582}
2583
2584sub mouse_motion {
2585 my ($self, $ev, $x, $y) = @_;
2586
2587 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER};
2590}
2591
2592sub button_up {
2593 my ($self, $ev, $x, $y) = @_;
2594
2595 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB;
2597 $self->hide;
2598
2599 $self->emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover};
2601 }
2602}
2603
2604#############################################################################
2605
2606package CFClient::UI::Statusbox;
2607
2608our @ISA = CFClient::UI::VBox::;
2609
2610sub reorder {
2611 my ($self) = @_;
2612 my $NOW = time;
2613
2614 while (my ($k, $v) = each %{ $self->{item} }) {
2615 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2616 }
2617
2618 my @widgets;
2619
2620 my @items = sort {
2621 $a->{pri} <=> $b->{pri}
2622 or $b->{id} <=> $a->{id}
2623 } values %{ $self->{item} };
2624
2625 my $count = 10 + 1;
2626 for my $item (@items) {
2627 last unless --$count;
2628
2629 push @widgets, $item->{label} ||= do {
2630 # TODO: doesn't handle markup well (read as: at all)
2631 my $short = $item->{count} > 1
2632 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text};
2634
2635 for ($short) {
2636 s/^\s+//;
2637 s/\012.*/…/s;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 }
2641
2642 new CFClient::UI::Label
2643 markup => $short,
2644 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize},
2648 color => $item->{color},
2649 can_events => 1,
2650 can_hover => 1
2651 };
2652 }
2653
2654 $self->clear;
2655 $self->SUPER::add (reverse @widgets);
2656}
2657
2658sub add {
2659 my ($self, $text, %arg) = @_;
2660
2661 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//;
2663
2664 my $timeout = time + ((delete $arg{timeout}) || 60);
2665
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667
2668 if (my $item = $self->{item}{$group}) {
2669 if ($item->{text} eq $text) {
2670 $item->{count}++;
2671 } else {
2672 $item->{count} = 1;
2673 $item->{text} = $item->{tooltip} = $text;
2674 }
2675 $item->{id} = ++$self->{id};
2676 $item->{timeout} = $timeout;
2677 delete $item->{label};
2678 } else {
2679 $self->{item}{$group} = {
2680 id => ++$self->{id},
2681 text => $text,
2682 timeout => $timeout,
2683 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0,
2687 count => 1,
2688 %arg,
2689 };
2690 }
2691
2692 $self->reorder;
2693}
2694
2695#############################################################################
2696
2221package CFClient::UI::Root; 2697package CFClient::UI::Root;
2222 2698
2223our @ISA = CFClient::UI::Container::; 2699our @ISA = CFClient::UI::Container::;
2224 2700
2225use CFClient::OpenGL; 2701use CFClient::OpenGL;
2226 2702
2227sub check_size { 2703sub new {
2228 my ($self) = @_; 2704 my $class = shift;
2229 2705
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2706 $class->SUPER::new (
2231} 2707 @_,
2232 2708 )
2233sub size_request {
2234 ($::WIDTH, $::HEIGHT)
2235} 2709}
2236 2710
2237sub configure { 2711sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2712 my ($self, $x, $y, $w, $h) = @_;
2239 2713
2240 $self->SUPER::configure ($x, $y, $w, $h); 2714 $self->{w} = $w;
2715 $self->{h} = $h;
2716}
2241 2717
2718sub check_size {
2719 my ($self) = @_;
2720
2721 $self->size_allocate ($self->{w}, $self->{h})
2722 if $self->{w};
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727
2728 ($self->{w}, $self->{h})
2729}
2730
2731sub size_allocate {
2732 my ($self, $w, $h) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749
2242 for my $child (@{$self->{children}}) { 2750 for my $child ($self->children) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244 2752
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2753 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247 $child->configure ($X, $Y, $W,$H); 2755 $child->configure ($X, $Y, $W, $H);
2248 } 2756 }
2249}
2250 2757
2251sub _topleft { 2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760}
2761
2762sub coord2local {
2252 my ($self, $x, $y) = @_; 2763 my ($self, $x, $y) = @_;
2253 2764
2254 ($x, $y) 2765 ($x, $y)
2255} 2766}
2256 2767
2768sub coord2global {
2769 my ($self, $x, $y) = @_;
2770
2771 ($x, $y)
2772}
2773
2257sub update { 2774sub update {
2258 my ($self) = @_; 2775 my ($self) = @_;
2259 2776
2260 $self->check_size; 2777 $self->check_size;
2261 ::refresh (); 2778 $::WANT_REFRESH++;
2262} 2779}
2263 2780
2264sub add { 2781sub add {
2265 my ($self, $child) = @_; 2782 my ($self, $child) = @_;
2266 2783
2267 # integerize window positions 2784 # integerise window positions
2268 $child->{x} = int $child->{x}; 2785 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 2786 $child->{y} = int $child->{y};
2270 2787
2271 $self->SUPER::add ($child); 2788 $self->SUPER::add ($child);
2272} 2789}
… …
2275 my ($self, $id, $cb) = @_; 2792 my ($self, $id, $cb) = @_;
2276 2793
2277 $self->{refresh_hook}{$id} = $cb; 2794 $self->{refresh_hook}{$id} = $cb;
2278} 2795}
2279 2796
2797sub on_post_alloc {
2798 my ($self, $id, $cb) = @_;
2799
2800 $self->{post_alloc_hook}{$id} = $cb;
2801}
2802
2280sub draw { 2803sub draw {
2281 my ($self) = @_; 2804 my ($self) = @_;
2282 2805
2283 while (my $rcb = delete $self->{refresh_hook}) { 2806 while ($self->{refresh_hook}) {
2284 $_->() for values %$rcb; 2807 $_->()
2808 for values %{delete $self->{refresh_hook}};
2809 }
2810
2811 if ($self->{check_size}) {
2812 my @queue = ([], []);
2813
2814 for (;;) {
2815 if ($self->{check_size}) {
2816 # heuristic: check containers last
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2818 for values %{delete $self->{check_size}}
2819 }
2820
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2822
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2824 ? @$widget{qw(user_w user_h)}
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830
2831 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h;
2833
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2835
2836 $widget->{parent}->check_size
2837 if $widget->{parent};
2838 }
2839 }
2840 }
2841
2842 while ($self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) {
2844 my ($widget, $w, $h) = @$_;
2845
2846 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0;
2848
2849 $widget->{w} = $w;
2850 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h);
2852 $widget->emit (size_allocate => $w, $h);
2853 }
2854 }
2855
2856 while ($self->{post_alloc_hook}) {
2857 $_->()
2858 for values %{delete $self->{post_alloc_hook}};
2285 } 2859 }
2286 2860
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2861 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 2863 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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