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.155 by root, Sun Apr 23 02:22:54 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
216# return top left coordinates 247sub children {
217sub _topleft { 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
261sub set_max_size {
218 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
219 263
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 266}
222 267
223# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
224sub coord2local { 269sub coord2local {
225 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
226 271
227 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 273}
230 274
231# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
232sub coord2global { 276sub coord2global {
233 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
234 278
235 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 280}
238 281
239sub focus_in { 282sub focus_in {
240 my ($self) = @_; 283 my ($self) = @_;
241 284
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
303 glEnd; 346 glEnd;
304 glDisable GL_BLEND; 347 glDisable GL_BLEND;
305 } 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 }
306} 363}
307 364
308sub _draw { 365sub _draw {
309 my ($self) = @_; 366 my ($self) = @_;
310 367
… …
325 382
326sub set_parent { 383sub set_parent {
327 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
328 385
329 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};
330} 392}
331 393
332sub check_size { 394sub check_size {
333 my ($self) = @_; 395 my ($self, $forced) = @_;
334 396
335 return unless $self->{parent}; 397 $self->{force_alloc} = 1 if $forced;
336 398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345} 399}
346 400
347sub update { 401sub update {
348 my ($self) = @_; 402 my ($self) = @_;
349 403
… …
358} 412}
359 413
360sub emit { 414sub emit {
361 my ($self, $signal, @args) = @_; 415 my ($self, $signal, @args) = @_;
362 416
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 418}
367 419
368sub DESTROY { 420sub DESTROY {
369 my ($self) = @_; 421 my ($self) = @_;
370 422
… …
437sub new { 489sub new {
438 my ($class, %arg) = @_; 490 my ($class, %arg) = @_;
439 491
440 my $children = delete $arg{children} || []; 492 my $children = delete $arg{children} || [];
441 493
442 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 );
443 $self->add ($_) for @$children; 499 $self->add ($_) for @$children;
444 500
445 $self 501 $self
446} 502}
447 503
448sub add { 504sub add {
449 my ($self, $child) = @_; 505 my ($self, @widgets) = @_;
450 506
451 $child->set_parent ($self); 507 $_->set_parent ($self)
508 for @widgets;
452 509
453 use sort 'stable'; 510 use sort 'stable';
454 511
455 $self->{children} = [ 512 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 513 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 514 @{$self->{children}}, @widgets
458 ]; 515 ];
459 516
460 $child->check_size; 517 $self->check_size (1);
518 $self->update;
519}
520
521sub children {
522 @{ $_[0]{children} }
461} 523}
462 524
463sub remove { 525sub remove {
464 my ($self, $child) = @_; 526 my ($self, $child) = @_;
465 527
466 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
467 530
468 $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 }
469 547
470 $self->check_size; 548 $self->check_size;
471 $self->update; 549 $self->update;
472} 550}
473 551
… …
551} 629}
552 630
553sub update { 631sub update {
554 my ($self) = @_; 632 my ($self) = @_;
555 633
556 # we want to do this delayed... 634 $ROOT->on_post_alloc ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 635 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 636}
570 637
571sub size_allocate { 638sub size_allocate {
572 my ($self, $w, $h) = @_; 639 my ($self, $w, $h) = @_;
573 640
574 $self->child->configure (0, 0, $w, $h); 641 $self->SUPER::size_allocate ($w, $h);
642 $self->update;
643}
575 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
576 $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 };
577} 665}
578 666
579sub _draw { 667sub _draw {
580 my ($self) = @_; 668 my ($self) = @_;
581 669
582 my ($w, $h) = ($self->w, $self->h); 670 my ($w, $h) = ($self->w, $self->h);
583 671
584 my $tex = $self->{texture} 672 my $tex = $self->{texture}
585 or return; 673 or return;
586 674
587 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
590 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;
591 678
592 $tex->draw_quad (0, 0, $w, $h); 679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
593 680
594 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
596} 682}
597 683
598############################################################################# 684#############################################################################
599 685
600package CFClient::UI::ViewPort; 686package CFClient::UI::ViewPort;
601 687
602our @ISA = CFClient::UI::Window::; 688our @ISA = CFClient::UI::Window::;
603 689
604sub new { die }
605
606sub size_request { 690sub size_request {
607 my ($self) = @_; 691 my ($self) = @_;
608 692
609 @$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)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
611 695
612 @$self{qw(child_w child_h)} 696 @$self{qw(child_w child_h)}
613} 697}
614 698
615sub _draw { 699sub size_allocate {
616 my ($self) = @_; 700 my ($self, $w, $h) = @_;
617 701
618 $self->{children}[1]->draw; 702 $self->update;
619} 703}
620 704
705sub set_offset {
706 my ($self, $x, $y) = @_;
621 707
622############################################################################# 708 $self->{view_x} = int $x;
709 $self->{view_y} = int $y;
623 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
624package CFClient::UI::Frame; 752package CFClient::UI::ScrolledWindow;
625 753
626our @ISA = CFClient::UI::Bin::; 754our @ISA = CFClient::UI::HBox::;
627
628use CFClient::OpenGL;
629 755
630sub new { 756sub new {
631 my $class = shift; 757 my $class = shift;
632 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
633 my $self = $class->SUPER::new ( 769 $self = $class->SUPER::new (
634 bg => [1, 1, 1, 1], 770 vp => (new CFClient::UI::ViewPort),
635 border_bg => [1, 1, 1, 1], 771 slider => $slider,
636 border => 0.8,
637 @_ 772 @_,
638 ); 773 );
639 774
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
640 $self 779 $self
641} 780}
642 781
643sub set_size { 782#TODO# update range on size_allocate depeneing on child
644 my ($self, $w, $h) = @_; 783# update viewport offset on scroll
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649 784
650sub size_request { 785#############################################################################
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654 786
655sub size_allocate { 787package CFClient::UI::Frame;
656 my ($self, $w, $h) = @_;
657 $self->{w} = $w;
658 $self->{h} = $h;
659 $self->child->configure (0, 0, $w, $h);
660}
661 788
662sub _draw { 789our @ISA = CFClient::UI::Bin::;
663 my ($self) = @_;
664 790
665 my ($w, $h) = ($self->{w}, $self->{h}); 791use CFClient::OpenGL;
666
667 glEnable GL_BLEND;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
669 glEnable GL_TEXTURE_2D;
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671
672# glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0;
675# glVertex 0 , $h;
676# glVertex $w, $h;
677# glVertex $w, 0;
678# glEnd;
679
680
681 $self->child->draw;
682 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D;
684}
685 792
686############################################################################# 793#############################################################################
687 794
688package CFClient::UI::FancyFrame; 795package CFClient::UI::FancyFrame;
689 796
… …
699 my $class = shift; 806 my $class = shift;
700 807
701 # TODO: user_x, user_y, overwrite moveto? 808 # TODO: user_x, user_y, overwrite moveto?
702 809
703 my $self = $class->SUPER::new ( 810 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 811 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 812 border_bg => [1, 1, 1, 1],
706 border => 0.8, 813 border => 0.6,
707 can_events => 1, 814 can_events => 1,
708 @_ 815 @_
709 ); 816 );
710 817
711 $self->{title} &&= new CFClient::UI::Label 818 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 819 align => 0,
713 valign => 1, 820 valign => 1,
714 text => $self->{title}, 821 text => $self->{title},
715 fontsize => 1; 822 fontsize => $self->{border};
716 823
717 $self 824 $self
718} 825}
719 826
720sub border { 827sub border {
721 int $_[0]{border} * $::FONTSIZE 828 int $_[0]{border} * $::FONTSIZE
722} 829}
723 830
724sub size_request { 831sub size_request {
725 my ($self) = @_; 832 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 833
729 my ($w, $h) = $self->SUPER::size_request; 834 my ($w, $h) = $self->SUPER::size_request;
730 835
731 ( 836 (
732 $w + $self->border * 2, 837 $w + $self->border * 2,
… …
747} 852}
748 853
749sub button_down { 854sub button_down {
750 my ($self, $ev, $x, $y) = @_; 855 my ($self, $ev, $x, $y) = @_;
751 856
857 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 858 my $border = $self->border;
753 859
754 if ($x < $self->{w} && $x >= $self->{w} - $border 860 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 861 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 862
863 if ($lr & $td) {
864 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 865 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 866 my ($bw, $bh) = ($self->{w}, $self->{h});
759 867
868 my $mx = $x < $border;
869 my $my = $y < $border;
870
760 $self->{motion} = sub { 871 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 872 my ($ev, $x, $y) = @_;
762 873
763 ($x, $y) = ($ev->{x}, $ev->{y}); 874 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy;
764 876
765 $self->{user_w} = $bw + $x - $ox; 877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 880 $self->check_size;
768 }; 881 };
769 882
770 } elsif ($x >= 0 && $x < $self->{w} 883 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 884 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 885 my ($bx, $by) = ($self->{x}, $self->{y});
775 886
776 $self->{motion} = sub { 887 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 888 my ($ev, $x, $y) = @_;
… …
800 my ($self) = @_; 911 my ($self) = @_;
801 912
802 my ($w, $h ) = ($self->{w}, $self->{h}); 913 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
804 915
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 916 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 918
810 my $border = $self->border; 919 my $border = $self->border;
811 920
812 glColor @{ $self->{border_bg} }; 921 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 922 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
817 926
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 928 my $bg = $tex[0];
819 929
820 # TODO: repeat texture not scale 930 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 931 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 932 my $rep_y = $ch / $bg->{h};
823 933
824 glColor @{ $self->{bg} }; 934 glColor @{ $self->{bg} };
825 935
826 $bg->{s} = $rep_x; 936 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 937 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 938 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 939 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 }
830 941
831 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 943
834 $self->{title}->draw if $self->{title}; 944 $self->{title}->draw if $self->{title};
945
835 $self->child->draw; 946 $self->child->draw;
836} 947}
837 948
838############################################################################# 949#############################################################################
839 950
… …
861 $self->{children}[$y][$x] = $child; 972 $self->{children}[$y][$x] = $child;
862 973
863 $child->check_size; 974 $child->check_size;
864} 975}
865 976
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
866# 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?
867sub clear { 982sub clear {
868 my ($self) = @_; 983 my ($self) = @_;
869 984
985 my @children = $self->children;
870 delete $self->{children}; 986 delete $self->{children};
987
988 for (@children) {
989 delete $_->{parent};
990 $_->hide;
991 }
992
871 $self->update; 993 $self->update;
872} 994}
873 995
874sub get_wh { 996sub get_wh {
875 my ($self) = @_; 997 my ($self) = @_;
… …
1052} 1174}
1053 1175
1054sub size_allocate { 1176sub size_allocate {
1055 my ($self, $w, $h) = @_; 1177 my ($self, $w, $h) = @_;
1056 1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1057 my $children = $self->{children}; 1181 my $children = $self->{children};
1058 1182
1059 my @h = map $_->{req_h}, @$children; 1183 my @h = map $_->{req_h}, @$children;
1060 1184
1061 my $req_h = List::Util::sum @h; 1185 my $req_h = List::Util::sum @h;
… …
1098 1222
1099sub new { 1223sub new {
1100 my ($class, %arg) = @_; 1224 my ($class, %arg) = @_;
1101 1225
1102 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1227 fg => [1, 1, 1],
1228 #font => default_font
1229 #text => initial text
1230 #markup => initial narkup
1231 layout => (new CFClient::Layout),
1104 fontsize => 1, 1232 fontsize => 1,
1105 text => "",
1106 align => -1, 1233 align => -1,
1107 valign => -1, 1234 valign => -1,
1108 padding => 2, 1235 padding => 2,
1109 layout => new CFClient::Layout,
1110 can_events => 0, 1236 can_events => 0,
1111 %arg 1237 %arg
1112 ); 1238 );
1113 1239
1114 if (exists $self->{template}) { 1240 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1241 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1242 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1243 $self->{template} = $layout;
1118 } 1244 }
1119 1245
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1246 if (exists $self->{markup}) {
1121 $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 }
1122 1251
1123 $self 1252 $self
1124} 1253}
1125 1254
1126sub escape_text { 1255sub escape {
1127 local $_ = $_[1]; 1256 local $_ = $_[1];
1128 1257
1129 s/&/&amp;/g; 1258 s/&/&amp;/g;
1130 s/>/&gt;/g; 1259 s/>/&gt;/g;
1131 s/</&lt;/g; 1260 s/</&lt;/g;
1132 1261
1133 $_[1] 1262 $_[1]
1134} 1263}
1135 1264
1265sub update {
1266 my ($self) = @_;
1267
1268 delete $self->{texture};
1269 $self->SUPER::update;
1270}
1271
1136sub set_text { 1272sub set_text {
1137 my ($self, $text) = @_; 1273 my ($self, $text) = @_;
1138 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;
1139 $self->{layout}->set_text ($text); 1279 $self->{layout}->set_text ($text);
1140 1280
1141 delete $self->{texture}; 1281 $self->update;
1142 $self->check_size; 1282 $self->check_size;
1143 $self->update;
1144} 1283}
1145 1284
1146sub set_markup { 1285sub set_markup {
1147 my ($self, $markup) = @_; 1286 my ($self, $markup) = @_;
1148 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;
1149 $self->{layout}->set_markup ($markup); 1294 $self->{layout}->set_markup ($markup);
1150 1295
1151 delete $self->{texture}; 1296 $self->update;
1152 $self->check_size; 1297 $self->check_size;
1153 $self->update;
1154} 1298}
1155 1299
1156sub size_request { 1300sub size_request {
1157 my ($self) = @_; 1301 my ($self) = @_;
1158 1302
1159 $self->{layout}->set_width; 1303 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1306
1162 my ($w, $h) = $self->{layout}->size; 1307 my ($w, $h) = $self->{layout}->size;
1163 1308
1164 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1310 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1311 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1312
1167 my ($w2, $h2) = $self->{template}->size; 1313 my ($w2, $h2) = $self->{template}->size;
1168 1314
1169 $w = List::Util::max $w, $w2; 1315 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1331sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1332 my ($self, $fontsize) = @_;
1187 1333
1188 $self->{fontsize} = $fontsize; 1334 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1335 delete $self->{texture};
1336
1337 $self->update;
1190 $self->check_size; 1338 $self->check_size;
1191 $self->update;
1192} 1339}
1193 1340
1194sub _draw { 1341sub _draw {
1195 my ($self) = @_; 1342 my ($self) = @_;
1196 1343
1197 my $tex = $self->{texture} ||= do { 1344 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1347 $self->{layout}->set_width ($self->{w});
1199 $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
1200 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
1201 }; 1361 };
1202 1362
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 glEnable GL_TEXTURE_2D; 1363 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1365
1366 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1367 glColor @{$self->{fg}};
1209
1210 $self->{ox} = int (
1211 $self->{align} < 0 ? $self->{padding}
1212 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1213 : ($self->{w} - $tex->{w}) * 0.5
1214 );
1215
1216 $self->{oy} = int (
1217 $self->{valign} < 0 ? $self->{padding}
1218 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1219 : ($self->{h} - $tex->{h}) * 0.5
1220 );
1221
1222 $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 }
1223 1372
1224 glDisable GL_TEXTURE_2D; 1373 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1374}
1227 1375
1228############################################################################# 1376#############################################################################
1229 1377
1230package CFClient::UI::EntryBase; 1378package CFClient::UI::EntryBase;
… …
1235 1383
1236sub new { 1384sub new {
1237 my $class = shift; 1385 my $class = shift;
1238 1386
1239 $class->SUPER::new ( 1387 $class->SUPER::new (
1240 fg => [1, 1, 1], 1388 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1389 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1390 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1391 active_fg => [0, 0, 0],
1244 can_hover => 1, 1392 can_hover => 1,
1245 can_focus => 1, 1393 can_focus => 1,
1246 valign => 0, 1394 valign => 0,
1247 can_events => 1, 1395 can_events => 1,
1248 @_ 1396 @_
1249 ) 1397 )
1250} 1398}
1251 1399
… …
1265 $self->{layout}->set_text ("$text "); 1413 $self->{layout}->set_text ("$text ");
1266 1414
1267 $self->emit (changed => $self->{text}); 1415 $self->emit (changed => $self->{text});
1268} 1416}
1269 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
1270sub get_text { 1427sub get_text {
1271 $_[0]{text} 1428 $_[0]{text}
1272} 1429}
1273 1430
1274sub size_request { 1431sub size_request {
… …
1281 1438
1282sub size_allocate { 1439sub size_allocate {
1283 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1284 1441
1285 $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
1286}
1287
1288sub set_text {
1289 my ($self, $text) = @_;
1290
1291 $self->{cursor} = length $text;
1292 $self->_set_text ($text);
1293 $self->update;
1294} 1443}
1295 1444
1296sub key_down { 1445sub key_down {
1297 my ($self, $ev) = @_; 1446 my ($self, $ev) = @_;
1298 1447
… …
1405 my ($self, $ev) = @_; 1554 my ($self, $ev) = @_;
1406 1555
1407 my $sym = $ev->{sym}; 1556 my $sym = $ev->{sym};
1408 1557
1409 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} = '';
1410 $self->emit (activate => $self->get_text); 1563 $self->emit (activate => $txt);
1411 $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 }
1412 1587
1413 } else { 1588 } else {
1414 $self->SUPER::key_down ($ev); 1589 $self->SUPER::key_down ($ev);
1415 } 1590 }
1416 1591
… …
1430 1605
1431sub new { 1606sub new {
1432 my $class = shift; 1607 my $class = shift;
1433 1608
1434 $class->SUPER::new ( 1609 $class->SUPER::new (
1435 padding => 4, 1610 padding => 4,
1436 fg => [1, 1, 1], 1611 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1612 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1613 active_fg => [0, 0, 1],
1439 can_hover => 1, 1614 can_hover => 1,
1440 align => 0, 1615 align => 0,
1441 valign => 0, 1616 valign => 0,
1442 can_events => 1, 1617 can_events => 1,
1443 @_ 1618 @_
1444 ) 1619 )
1445} 1620}
1446 1621
… …
1460 1635
1461 if ($GRAB == $self) { 1636 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1637 $self->{fg} = $self->{active_fg};
1463 } 1638 }
1464 1639
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1642 glColor 0, 0, 0, 1;
1470 1643
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1644 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1645
1473 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1647
1476 $self->SUPER::_draw; 1648 $self->SUPER::_draw;
1477} 1649}
1478 1650
1479############################################################################# 1651#############################################################################
… …
1526 1698
1527 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;
1528 1700
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1702
1531 glEnable GL_BLEND; 1703 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704
1532 glEnable GL_TEXTURE_2D; 1705 glEnable GL_TEXTURE_2D;
1533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1534
1535 my $tex = $self->{state} ? $tex[1] : $tex[0];
1536
1537 $tex->draw_quad (0, 0, $s, $s); 1706 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1707 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1708}
1542 1709
1543############################################################################# 1710#############################################################################
1544 1711
1545package CFClient::UI::Image; 1712package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 1755 glTranslate 0, -$self->{w}, 0;
1589 1756
1590 ($w, $h) = ($h, $w); 1757 ($w, $h) = ($h, $w);
1591 } 1758 }
1592 1759
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 1760 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 1762
1598 $tex->draw_quad (0, 0, $w, $h); 1763 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 1764
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 1765 glDisable GL_TEXTURE_2D;
1602} 1766}
1603 1767
1604############################################################################# 1768#############################################################################
1605 1769
1606package CFClient::UI::VGauge; 1770package CFClient::UI::VGauge;
1607 1771
1608our @ISA = CFClient::UI::Base::; 1772our @ISA = CFClient::UI::Base::;
1773
1774use List::Util qw(min max);
1609 1775
1610use CFClient::OpenGL; 1776use CFClient::OpenGL;
1611 1777
1612my %tex = ( 1778my %tex = (
1613 food => [ 1779 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1780 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1781 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1782 ],
1617 grace => [ 1783 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1784 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 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/
1620 ], 1786 ],
1621 hp => [ 1787 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1788 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1789 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1790 ],
1625 mana => [ 1791 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1792 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 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/
1628 ], 1794 ],
1629); 1795);
1630 1796
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1797# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1798sub new {
… …
1651} 1817}
1652 1818
1653sub set_max { 1819sub set_max {
1654 my ($self, $max) = @_; 1820 my ($self, $max) = @_;
1655 1821
1822 return if $self->{max_val} == $max;
1823
1656 $self->{max_val} = $max; 1824 $self->{max_val} = $max;
1825 $self->update;
1657} 1826}
1658 1827
1659sub set_value { 1828sub set_value {
1660 my ($self, $val, $max) = @_; 1829 my ($self, $val, $max) = @_;
1661 1830
1662 $self->set_max ($max) 1831 $self->set_max ($max)
1663 if defined $max; 1832 if defined $max;
1664 1833
1665 $max = $self->{max_val}; 1834 return if $self->{val} == $val;
1835
1666 $self->{val} = $val; 1836 $self->{val} = $val;
1667
1668 $self->update; 1837 $self->update;
1669} 1838}
1670 1839
1671sub _draw { 1840sub _draw {
1672 my ($self) = @_; 1841 my ($self) = @_;
1673 1842
1674 my $tex = $tex{$self->{type}}; 1843 my $tex = $tex{$self->{type}};
1844 my ($t1, $t2, $t3) = @$tex;
1675 1845
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1846 my ($w, $h) = ($self->{w}, $self->{h});
1677 1847
1678 if ($self->{vertical}) { 1848 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1849 glRotate 90, 0, 0, 1;
… …
1681 1851
1682 ($w, $h) = ($h, $w); 1852 ($w, $h) = ($h, $w);
1683 } 1853 }
1684 1854
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1855 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1856
1688 my $t1 = $tex->[0]; 1857 my $ycut1 = max 0, min 1, $ycut;
1689 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);
1690 1862
1691 glEnable GL_BLEND; 1863 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1864 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1865 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1867
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1868 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1869 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1870 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1871 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1872 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1873 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1874 glEnd;
1706 1875
1876 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1877 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1878 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1879 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1880 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1881 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1882 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 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 }
1714 1894
1715 glDisable GL_BLEND; 1895 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1717} 1897}
1718 1898
… …
1724 1904
1725sub new { 1905sub new {
1726 my ($class, %arg) = @_; 1906 my ($class, %arg) = @_;
1727 1907
1728 my $self = $class->SUPER::new ( 1908 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1909 tooltip => $arg{type},
1910 can_hover => 1,
1911 can_events => 1,
1730 %arg, 1912 %arg,
1731 ); 1913 );
1732 1914
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1915 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1916 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1917 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1918
1737 $self 1919 $self
1738} 1920}
1739 1921
… …
1742 1924
1743 $self->{value}->set_fontsize ($fsize); 1925 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1926 $self->{max} ->set_fontsize ($fsize);
1745} 1927}
1746 1928
1929sub set_max {
1930 my ($self, $max) = @_;
1931
1932 $self->{gauge}->set_max ($max);
1933 $self->{max}->set_text ($max);
1934}
1935
1747sub set_value { 1936sub set_value {
1748 my ($self, $val, $max) = @_; 1937 my ($self, $val, $max) = @_;
1749 1938
1750 $self->set_max ($max) 1939 $self->set_max ($max)
1751 if defined $max; 1940 if defined $max;
1752 1941
1753 $self->{gauge}->set_value ($val, $max); 1942 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 1943 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 1944}
1763 1945
1764############################################################################# 1946#############################################################################
1765 1947
1766package CFClient::UI::Slider; 1948package CFClient::UI::Slider;
… …
1785 # TODO: calculations are off 1967 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 1968 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 1969 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 1970 active_fg => [0, 0, 0],
1789 range => [0, 0, 100, 10], 1971 range => [0, 0, 100, 10],
1790 req_w => 20, 1972 req_w => $::WIDTH / 80,
1791 req_h => 20, 1973 req_h => $::WIDTH / 80,
1792 vertical => 0, 1974 vertical => 0,
1793 can_hover => 1, 1975 can_hover => 1,
1794 inner_pad => 5, 1976 inner_pad => 5,
1795 @_ 1977 @_
1796 ); 1978 );
… …
1879 $page ||= 2; 2061 $page ||= 2;
1880 2062
1881 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1882 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1883 2065
1884 glEnable GL_BLEND;
1885 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1886 glEnable GL_TEXTURE_2D; 2066 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2068
1889 # draw background 2069 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1891 2071
1892 # draw handle 2072 # draw handle
1893 $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);
1894 2074
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2075 glDisable GL_TEXTURE_2D;
1897} 2076}
1898 2077
1899############################################################################# 2078#############################################################################
1900 2079
… …
1906 2085
1907sub new { 2086sub new {
1908 my $class = shift; 2087 my $class = shift;
1909 2088
1910 my $self = $class->SUPER::new ( 2089 my $self = $class->SUPER::new (
1911 fontsize => 1, 2090 fontsize => 1,
2091 can_events => 0,
2092 #font => default_font
1912 @_, 2093 @_,
1913 2094
1914 layout => (new CFClient::Layout), 2095 layout => (new CFClient::Layout 1),
1915 par => [], 2096 par => [],
1916 height => 0, 2097 height => 0,
1917 children => [ 2098 children => [
1918 (new CFClient::UI::Empty expand => 1), 2099 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2100 (new CFClient::UI::Slider vertical => 1),
1920 ], 2101 ],
1921 ); 2102 );
1922 2103
1923 $self->{children}[1]->connect (changed => sub { 2104 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2105
1927 $self 2106 $self
1928} 2107}
1929 2108
1930sub set_fontsize { 2109sub set_fontsize {
… …
1938 my ($self, $text) = @_; 2117 my ($self, $text) = @_;
1939 2118
1940 my $layout = $self->{layout}; 2119 my $layout = $self->{layout};
1941 2120
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2122 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2123 $layout->set_markup ($text);
1945 2124
1946 ($layout->size)[1] 2125 ($layout->size)[1]
1947} 2126}
1948 2127
1949sub reflow { 2128sub reflow {
… …
1956sub size_allocate { 2135sub size_allocate {
1957 my ($self, $w, $h) = @_; 2136 my ($self, $w, $h) = @_;
1958 2137
1959 $self->SUPER::size_allocate ($w, $h); 2138 $self->SUPER::size_allocate ($w, $h);
1960 2139
2140 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2142 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2143
1964 $self->reflow; 2144 $self->reflow;
1965} 2145}
… …
1986 2166
1987 return unless $self->{h} > 0; 2167 return unless $self->{h} > 0;
1988 2168
1989 delete $self->{texture}; 2169 delete $self->{texture};
1990 2170
1991 $ROOT->on_refresh ($self, sub { 2171 $ROOT->on_post_alloc ($self, sub {
1992 if (delete $self->{need_reflow}) { 2172 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2173 my $height = 0;
1994 2174
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2175 $height += $_->[0] = $self->text_height ($_->[2])
1996 for @{$self->{par}}; 2176 for @{$self->{par}};
… …
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2181
2002 delete $self->{texture}; 2182 delete $self->{texture};
2003 } 2183 }
2004 2184
2005 $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 {
2006 glClearColor 0, 0, 0, 1; 2186 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2187 glClear GL_COLOR_BUFFER_BIT;
2008 2188
2009 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2189 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2191
2014 my $top = int $self->{children}[1]{range}[0]; 2192 my $top = int $self->{children}[1]{range}[0];
2015 2193
… …
2018 2196
2019 my $y = 0; 2197 my $y = 0;
2020 2198
2021 my $layout = $self->{layout}; 2199 my $layout = $self->{layout};
2022 2200
2201 $layout->set_font ($self->{font}) if $self->{font};
2202
2023 for my $par (@{$self->{par}}) { 2203 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2204 my $h = $par->[0];
2025 2205
2026 if ($y0 < $y + $h && $y < $y1) { 2206 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] });
2027 $layout->set_text ($par->[2]); 2208 $layout->set_markup ($par->[2]);
2028 2209
2029 glColor @{ $par->[1] };
2030 my ($W, $H) = $layout->size; 2210 my ($W, $H) = $layout->size;
2031 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);
2032 } 2212 }
2033 2213
2034 $y += $h; 2214 $y += $h;
2035 } 2215 }
2036 2216
2037 glDisable GL_TEXTURE_2D; 2217 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND;
2039 }; 2218 };
2040 }); 2219 });
2041} 2220}
2042 2221
2043sub _draw { 2222sub _draw {
2044 my ($self) = @_; 2223 my ($self) = @_;
2045 2224
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2225 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2049 $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});
2050 glDisable GL_TEXTURE_2D; 2229 glDisable GL_TEXTURE_2D;
2051 }
2052 2230
2053 $self->{children}[1]->draw; 2231 $self->{children}[1]->draw;
2054 2232
2055} 2233}
2056 2234
… …
2104 2282
2105sub new { 2283sub new {
2106 my $class = shift; 2284 my $class = shift;
2107 2285
2108 my $self = $class->SUPER::new ( 2286 my $self = $class->SUPER::new (
2109 state => 0, 2287 state => 0,
2110 connect_activate => \&toggle_flopper, 2288 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2289 @_
2113 ); 2290 );
2114 2291
2115 if ($self->{state}) { 2292 if ($self->{state}) {
2116 $self->{state} = 0; 2293 $self->{state} = 0;
… …
2151 @_, 2328 @_,
2152 can_events => 0, 2329 can_events => 0,
2153 ) 2330 )
2154} 2331}
2155 2332
2156sub set_text { 2333sub set_tooltip_from {
2157 my ($self, $text) = @_; 2334 my ($self, $widget) = @_;
2158 2335
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2336 $self->add (new CFClient::UI::Label
2160 $self->{label}->set_text ($text); 2337 markup => $widget->{tooltip},
2161 $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 );
2162} 2343}
2163 2344
2164sub size_request { 2345sub size_request {
2165 my ($self) = @_; 2346 my ($self) = @_;
2166 2347
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2349
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2350 ($w + 4, $h + 4)
2173} 2351}
2174 2352
2353sub size_allocate {
2354 my ($self, $w, $h) = @_;
2355
2356 $self->SUPER::size_allocate ($w - 4, $h - 4);
2357}
2358
2175sub _draw { 2359sub _draw {
2176 my ($self) = @_; 2360 my ($self) = @_;
2177 2361
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2362 glTranslate 0.375, 0.375;
2180 2363
2181 my ($w, $h) = @$self{qw(w h)}; 2364 my ($w, $h) = @$self{qw(w h)};
2182 2365
2183 glColor 1, 0.8, 0.4; 2366 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2377 glVertex 0 , $h;
2195 glVertex $w, $h; 2378 glVertex $w, $h;
2196 glVertex $w, 0; 2379 glVertex $w, 0;
2197 glEnd; 2380 glEnd;
2198 2381
2199 glPopMatrix; 2382 glTranslate 2 - 0.375, 2 - 0.375;
2200
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2383 $self->SUPER::_draw;
2203} 2384}
2204 2385
2205############################################################################# 2386#############################################################################
2206 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
2207package CFClient::UI::Root; 2697package CFClient::UI::Root;
2208 2698
2209our @ISA = CFClient::UI::Container::; 2699our @ISA = CFClient::UI::Container::;
2210 2700
2211use CFClient::OpenGL; 2701use CFClient::OpenGL;
2212 2702
2213sub check_size { 2703sub new {
2214 my ($self) = @_; 2704 my $class = shift;
2215 2705
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2706 $class->SUPER::new (
2217} 2707 @_,
2218 2708 )
2219sub size_request {
2220 ($::WIDTH, $::HEIGHT)
2221} 2709}
2222 2710
2223sub configure { 2711sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 2712 my ($self, $x, $y, $w, $h) = @_;
2225 2713
2226 $self->SUPER::configure ($x, $y, $w, $h); 2714 $self->{w} = $w;
2715 $self->{h} = $h;
2716}
2227 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
2228 for my $child (@{$self->{children}}) { 2750 for my $child ($self->children) {
2229 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)};
2230 2752
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2753 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2233 $child->configure ($X, $Y, $W,$H); 2755 $child->configure ($X, $Y, $W, $H);
2234 } 2756 }
2235}
2236 2757
2237sub _topleft { 2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760}
2761
2762sub coord2local {
2238 my ($self, $x, $y) = @_; 2763 my ($self, $x, $y) = @_;
2239 2764
2240 ($x, $y) 2765 ($x, $y)
2241} 2766}
2242 2767
2768sub coord2global {
2769 my ($self, $x, $y) = @_;
2770
2771 ($x, $y)
2772}
2773
2243sub update { 2774sub update {
2244 my ($self) = @_; 2775 my ($self) = @_;
2245 2776
2246 $self->check_size; 2777 $self->check_size;
2247 ::refresh (); 2778 $::WANT_REFRESH++;
2248} 2779}
2249 2780
2250sub add { 2781sub add {
2251 my ($self, $child) = @_; 2782 my ($self, $child) = @_;
2252 2783
2253 # integerize window positions 2784 # integerise window positions
2254 $child->{x} = int $child->{x}; 2785 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 2786 $child->{y} = int $child->{y};
2256 2787
2257 $self->SUPER::add ($child); 2788 $self->SUPER::add ($child);
2258} 2789}
… …
2261 my ($self, $id, $cb) = @_; 2792 my ($self, $id, $cb) = @_;
2262 2793
2263 $self->{refresh_hook}{$id} = $cb; 2794 $self->{refresh_hook}{$id} = $cb;
2264} 2795}
2265 2796
2797sub on_post_alloc {
2798 my ($self, $id, $cb) = @_;
2799
2800 $self->{post_alloc_hook}{$id} = $cb;
2801}
2802
2266sub draw { 2803sub draw {
2267 my ($self) = @_; 2804 my ($self) = @_;
2268 2805
2269 while (my $rcb = delete $self->{refresh_hook}) { 2806 while ($self->{refresh_hook}) {
2270 $_->() 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}};
2271 } 2859 }
2272 2860
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2861 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 2863 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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