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.149 by root, Sat Apr 22 23:11:32 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 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
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17sub check_tooltip {
18 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) {
23 $TOOLTIP->{owner} = $widget;
24
25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
29 $TOOLTIP->set_tooltip_from ($widget);
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 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48}
14 49
15# class methods for events 50# class methods for events
16sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
18} 54}
19 55
20sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
22} 59}
23 60
24sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
25 my ($ev) = @_; 62 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 65 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 66 my $widget = $ROOT->find_widget ($x, $y);
30 67
31 $GRAB = $widget; 68 $GRAB = $widget;
32 $GRAB->update if $GRAB; 69 $GRAB->update if $GRAB;
70
71 check_tooltip;
33 } 72 }
34 73
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 75
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
38} 80}
39 81
40sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
41 my ($ev) = @_; 83 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
43 85
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 87
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 89
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
49 94
50 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 97 $grab->update if $grab;
53 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
99
100 check_tooltip;
54 } 101 }
55} 102}
56 103
57sub feed_sdl_motion_event { 104sub feed_sdl_motion_event {
58 my ($ev) = @_; 105 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 110 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 111 my $hover = $HOVER; $HOVER = $widget;
65 112
66 $hover->update if $hover && $hover->{can_hover}; 113 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 115
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 116 check_tooltip;
117 }
118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
71} 123}
72 124
73# convert position array to integers 125# convert position array to integers
74sub harmonize { 126sub harmonize {
75 my ($vals) = @_; 127 my ($vals) = @_;
… …
93 145
94sub new { 146sub new {
95 my $class = shift; 147 my $class = shift;
96 148
97 my $self = bless { 149 my $self = bless {
98 x => 0, 150 x => 0,
99 y => 0, 151 y => 0,
100 z => 0, 152 z => 0,
153 can_events => 1,
101 @_ 154 @_
102 }, $class; 155 }, $class;
103 156
104 for (keys %$self) { 157 for (keys %$self) {
105 if (/^connect_(.*)$/) { 158 if (/^connect_(.*)$/) {
… …
108 } 161 }
109 162
110 $self 163 $self
111} 164}
112 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
113sub show { 173sub show {
114 my ($self) = @_; 174 my ($self) = @_;
115 175
116 return if $self->{parent}; 176 return if $self->{parent};
117 177
… …
119} 179}
120 180
121sub hide { 181sub hide {
122 my ($self) = @_; 182 my ($self) = @_;
123 183
124 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
125 186
126 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
127} 189}
128 190
129sub move { 191sub move {
130 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
131 193
… …
134 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
135 197
136 $self->update; 198 $self->update;
137} 199}
138 200
139sub needs_redraw { 201sub set_size {
140 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
141} 208}
142 209
143sub size_request { 210sub size_request {
144 require Carp; 211 require Carp;
145 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
165 $self->{y} = $y; 232 $self->{y} = $y;
166 $self->update; 233 $self->update;
167 } 234 }
168 235
169 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
170 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
171 $self->{h} = $h;
172
173 $self->size_allocate ($w, $h);
174 $self->update;
175 } 238 }
176} 239}
177 240
178sub size_allocate { 241sub size_allocate {
179 # nothing to be done 242 # nothing to be done
180} 243}
181 244
182# return top left coordinates 245sub children {
183sub _topleft { 246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258}
259
260sub set_max_size {
184 my ($self, $x, $y) = @_; 261 my ($self, $w, $h) = @_;
185 262
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h;
187} 265}
188 266
189# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
190sub coord2local { 268sub coord2local {
191 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
192 270
193 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 272}
196 273
197# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
198sub coord2global { 275sub coord2global {
199 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
200 277
201 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 279}
204 280
205sub focus_in { 281sub focus_in {
206 my ($self) = @_; 282 my ($self) = @_;
207 283
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 343 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 344 glVertex $x , $y + $self->{h};
269 glEnd; 345 glEnd;
270 glDisable GL_BLEND; 346 glDisable GL_BLEND;
271 } 347 }
348
349 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix;
351 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0;
355 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h};
358 glEnd;
359 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 }
272} 362}
273 363
274sub _draw { 364sub _draw {
275 my ($self) = @_; 365 my ($self) = @_;
276 366
277 warn "no draw defined for $self\n"; 367 warn "no draw defined for $self\n";
278} 368}
279 369
280sub find_widget { 370sub find_widget {
281 my ($self, $x, $y) = @_; 371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
282 374
283 return $self 375 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 378
… …
289 381
290sub set_parent { 382sub set_parent {
291 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
292 384
293 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
294} 389}
295 390
296sub check_size { 391sub check_size {
297 my ($self) = @_; 392 my ($self) = @_;
298 393
299 return unless $self->{parent}; 394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
300
301 my ($w, $h) = $self->size_request;
302
303 if ($w != $self->{req_w} || $h != $self->{req_h}) {
304 $self->{req_w} = $w;
305 $self->{req_h} = $h;
306
307 $self->{parent}->check_size;
308 }
309} 395}
310 396
311sub update { 397sub update {
312 my ($self) = @_; 398 my ($self) = @_;
313 399
… …
322} 408}
323 409
324sub emit { 410sub emit {
325 my ($self, $signal, @args) = @_; 411 my ($self, $signal, @args) = @_;
326 412
327 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
328 $cb->($self, @args);
329 }
330} 414}
331 415
332sub DESTROY { 416sub DESTROY {
333 my ($self) = @_; 417 my ($self) = @_;
334 418
… …
379 463
380package CFClient::UI::Empty; 464package CFClient::UI::Empty;
381 465
382our @ISA = CFClient::UI::Base::; 466our @ISA = CFClient::UI::Base::;
383 467
468sub new {
469 my ($class, %arg) = @_;
470 $class->SUPER::new (can_events => 0, %arg);
471}
472
384sub size_request { 473sub size_request {
385 (0, 0) 474 (0, 0)
386} 475}
387 476
388sub draw { } 477sub draw { }
… …
396sub new { 485sub new {
397 my ($class, %arg) = @_; 486 my ($class, %arg) = @_;
398 487
399 my $children = delete $arg{children} || []; 488 my $children = delete $arg{children} || [];
400 489
401 my $self = $class->SUPER::new (children => [], %arg); 490 my $self = $class->SUPER::new (
491 children => [],
492 can_events => 0,
493 %arg,
494 );
402 $self->add ($_) for @$children; 495 $self->add ($_) for @$children;
403 496
404 $self 497 $self
405} 498}
406 499
407sub add { 500sub add {
408 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
409 502
410 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
411 505
412 use sort 'stable'; 506 use sort 'stable';
413 507
414 $self->{children} = [ 508 $self->{children} = [
415 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
416 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
417 ]; 511 ];
418 512
419 $child->check_size; 513 $self->check_size;
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
420} 519}
421 520
422sub remove { 521sub remove {
423 my ($self, $child) = @_; 522 my ($self, $child) = @_;
424 523
425 delete $child->{parent}; 524 delete $child->{parent};
525 $child->hide;
426 526
427 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
428 528
429 $self->check_size; 529 $self->check_size;
530 $self->update;
531}
532
533sub clear {
534 my ($self) = @_;
535
536 my $children = delete $self->{children};
537 $self->{children} = [];
538
539 for (@$children) {
540 delete $_->{parent};
541 $_->hide;
542 }
543
544 $self->check_size;
545 $self->update;
430} 546}
431 547
432sub find_widget { 548sub find_widget {
433 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
434 550
… …
509} 625}
510 626
511sub update { 627sub update {
512 my ($self) = @_; 628 my ($self) = @_;
513 629
514 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
515 $self->render_chld;
516 $self->SUPER::update; 631 $self->SUPER::update;
517}
518
519sub render_chld {
520 my ($self) = @_;
521
522 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
523 glClearColor 0, 0, 0, 1;
524 glClear GL_COLOR_BUFFER_BIT;
525 $self->child->draw;
526 };
527} 632}
528 633
529sub size_allocate { 634sub size_allocate {
530 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
531 636
532 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
533 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
645sub render_child {
646 my ($self) = @_;
647
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT;
651
534 $self->render_chld; 652 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 };
535} 661}
536 662
537sub _draw { 663sub _draw {
538 my ($self) = @_; 664 my ($self) = @_;
539 665
540 my ($w, $h) = ($self->w, $self->h); 666 my ($w, $h) = ($self->w, $self->h);
541 667
542 my $tex = $self->{texture} 668 my $tex = $self->{texture}
543 or return; 669 or return;
544 670
545 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
547 glEnable GL_TEXTURE_2D; 671 glEnable GL_TEXTURE_2D;
548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1;
549 674
550 $tex->draw_quad (0, 0, $w, $h); 675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
551 676
552 glDisable GL_BLEND;
553 glDisable GL_TEXTURE_2D; 677 glDisable GL_TEXTURE_2D;
554} 678}
555 679
556############################################################################# 680#############################################################################
557 681
558package CFClient::UI::ViewPort; 682package CFClient::UI::ViewPort;
559 683
560our @ISA = CFClient::UI::Window::; 684our @ISA = CFClient::UI::Window::;
561 685
562sub new { die }
563
564sub size_request { 686sub size_request {
565 my ($self) = @_; 687 my ($self) = @_;
566 688
567 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 689 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
568 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 690 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
569 691
570 @$self{qw(child_w child_h)} 692 @$self{qw(child_w child_h)}
571} 693}
572 694
573sub _draw { 695sub size_allocate {
574 my ($self) = @_; 696 my ($self, $w, $h) = @_;
575 697
576 $self->{children}[1]->draw; 698 $self->update;
577} 699}
578 700
701sub set_offset {
702 my ($self, $x, $y) = @_;
703
704 $self->{view_x} = int $x;
705 $self->{view_y} = int $y;
706
707 $self->update;
708}
709
710# hmm, this does not work for topleft of $self... but we should not ask for that
711sub coord2local {
712 my ($self, $x, $y) = @_;
713
714 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
715}
716
717sub coord2global {
718 my ($self, $x, $y) = @_;
719
720 $x = List::Util::min $self->{w}, $x - $self->{view_x};
721 $y = List::Util::min $self->{h}, $y - $self->{view_y};
722
723 $self->SUPER::coord2global ($x, $y)
724}
725
726sub find_widget {
727 my ($self, $x, $y) = @_;
728
729 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
730 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
731 ) {
732 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
733 } else {
734 $self->CFClient::UI::Base::find_widget ($x, $y)
735 }
736}
737
738sub _render {
739 my ($self) = @_;
740
741 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
742
743 $self->SUPER::_render;
744}
745
746#############################################################################
747
748package CFClient::UI::ScrolledWindow;
749
750our @ISA = CFClient::UI::HBox::;
751
752sub new {
753 my $class = shift;
754
755 my $self;
756
757 my $slider = new CFClient::UI::Slider
758 vertical => 1,
759 range => [0, 0, 1, 0.01], # HACK fix
760 connect_changed => sub {
761 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
762 },
763 ;
764
765 $self = $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort),
767 slider => $slider,
768 @_,
769 );
770
771 $self->{vp}->add ($self->{scrolled});
772 $self->add ($self->{vp});
773 $self->add ($self->{slider});
774
775 $self
776}
777
778#TODO# update range on size_allocate depeneing on child
779# update viewport offset on scroll
579 780
580############################################################################# 781#############################################################################
581 782
582package CFClient::UI::Frame; 783package CFClient::UI::Frame;
583 784
… …
594 border => 0.8, 795 border => 0.8,
595 @_ 796 @_
596 ); 797 );
597 798
598 $self 799 $self
599}
600
601sub set_size {
602 my ($self, $w, $h) = @_;
603 $self->{req_w} = $w;
604 $self->{req_h} = $h;
605 $self->check_size;
606}
607
608sub size_request {
609 my ($self) = @_;
610 ($self->{req_w}, $self->{req_h})
611}
612
613sub size_allocate {
614 my ($self, $w, $h) = @_;
615 $self->{w} = $w;
616 $self->{h} = $h;
617 $self->child->configure (0, 0, $w, $h);
618} 800}
619 801
620sub _draw { 802sub _draw {
621 my ($self) = @_; 803 my ($self) = @_;
622 804
… …
657 my $class = shift; 839 my $class = shift;
658 840
659 # TODO: user_x, user_y, overwrite moveto? 841 # TODO: user_x, user_y, overwrite moveto?
660 842
661 my $self = $class->SUPER::new ( 843 my $self = $class->SUPER::new (
662 bg => [1, 1, 1, 1], 844 bg => [1, 1, 1, 1],
663 border_bg => [1, 1, 1, 1], 845 border_bg => [1, 1, 1, 1],
664 border => 0.8, 846 border => 0.6,
847 can_events => 1,
665 @_ 848 @_
666 ); 849 );
667 850
668 $self->{title} &&= new CFClient::UI::Label 851 $self->{title} &&= new CFClient::UI::Label
669 align => 0, 852 align => 0,
670 valign => 1, 853 valign => 1,
671 text => $self->{title}, 854 text => $self->{title},
672 fontsize => 1; 855 fontsize => $self->{border};
673 856
674 $self 857 $self
675} 858}
676 859
677sub border { 860sub border {
678 int $_[0]{border} * $::FONTSIZE 861 int $_[0]{border} * $::FONTSIZE
679} 862}
680 863
681sub size_request { 864sub size_request {
682 my ($self) = @_; 865 my ($self) = @_;
683
684 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
685 866
686 my ($w, $h) = $self->SUPER::size_request; 867 my ($w, $h) = $self->SUPER::size_request;
687 868
688 ( 869 (
689 $w + $self->border * 2, 870 $w + $self->border * 2,
… …
704} 885}
705 886
706sub button_down { 887sub button_down {
707 my ($self, $ev, $x, $y) = @_; 888 my ($self, $ev, $x, $y) = @_;
708 889
890 my ($w, $h) = @$self{qw(w h)};
709 my $border = $self->border; 891 my $border = $self->border;
710 892
711 if ($x < $self->{w} && $x >= $self->{w} - $border 893 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
712 && $y < $self->{h} && $y >= $self->{h} - $border) { 894 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
713 895
896 if ($lr & $td) {
897 my ($wx, $wy) = ($self->{x}, $self->{y});
714 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 898 my ($ox, $oy) = ($ev->{x}, $ev->{y});
715 my ($bw, $bh) = ($self->{w}, $self->{h}); 899 my ($bw, $bh) = ($self->{w}, $self->{h});
716 900
901 my $mx = $x < $border;
902 my $my = $y < $border;
903
717 $self->{motion} = sub { 904 $self->{motion} = sub {
718 my ($ev, $x, $y) = @_; 905 my ($ev, $x, $y) = @_;
719 906
720 ($x, $y) = ($ev->{x}, $ev->{y}); 907 my $dx = $ev->{x} - $ox;
908 my $dy = $ev->{y} - $oy;
721 909
722 $self->{user_w} = $bw + $x - $ox; 910 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
723 $self->{user_h} = $bh + $y - $oy; 911 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
912 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
724 $self->check_size; 913 $self->check_size;
725 }; 914 };
726 915
727 } elsif ($x >= 0 && $x < $self->{w} 916 } elsif ($lr ^ $td) {
728 && $y >= 0 && $y < $border) {
729
730 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
731 my ($bx, $by) = ($self->{x}, $self->{y}); 918 my ($bx, $by) = ($self->{x}, $self->{y});
732 919
733 $self->{motion} = sub { 920 $self->{motion} = sub {
734 my ($ev, $x, $y) = @_; 921 my ($ev, $x, $y) = @_;
… …
770 $tex[1]->draw_quad (0, 0, $w, $border); 957 $tex[1]->draw_quad (0, 0, $w, $border);
771 $tex[3]->draw_quad (0, $border, $border, $ch); 958 $tex[3]->draw_quad (0, $border, $border, $ch);
772 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
773 $tex[4]->draw_quad (0, $h - $border, $w, $border); 960 $tex[4]->draw_quad (0, $h - $border, $w, $border);
774 961
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
775 my $bg = $tex[0]; 963 my $bg = $tex[0];
776 964
777 # TODO: repeat texture not scale 965 # TODO: repeat texture not scale
778 my $rep_x = $cw / $bg->{w}; 966 my $rep_x = $cw / $bg->{w};
779 my $rep_y = $ch / $bg->{h}; 967 my $rep_y = $ch / $bg->{h};
780 968
781 glColor @{ $self->{bg} }; 969 glColor @{ $self->{bg} };
782 970
783 $bg->{s} = $rep_x; 971 $bg->{s} = $rep_x;
784 $bg->{t} = $rep_y; 972 $bg->{t} = $rep_y;
785 $bg->{wrap_mode} = 1; 973 $bg->{wrap_mode} = 1;
786 $bg->draw_quad ($border, $border, $cw, $ch); 974 $bg->draw_quad ($border, $border, $cw, $ch);
787 975
788 glDisable GL_TEXTURE_2D; 976 glDisable GL_TEXTURE_2D;
789 glDisable GL_BLEND; 977 glDisable GL_BLEND;
978 }
790 979
791 $self->{title}->draw if $self->{title}; 980 $self->{title}->draw if $self->{title};
981
792 $self->child->draw; 982 $self->child->draw;
793} 983}
794 984
795############################################################################# 985#############################################################################
796 986
… …
818 $self->{children}[$y][$x] = $child; 1008 $self->{children}[$y][$x] = $child;
819 1009
820 $child->check_size; 1010 $child->check_size;
821} 1011}
822 1012
1013sub children {
1014 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1015}
1016
823# TODO: move to container class maybe? send childs a signal on removal? 1017# TODO: move to container class maybe? send childs a signal on removal?
824sub clear { 1018sub clear {
825 my ($self) = @_; 1019 my ($self) = @_;
826 1020
1021 my @children = $self->children;
827 delete $self->{children}; 1022 delete $self->{children};
1023
1024 for (@children) {
1025 delete $_->{parent};
1026 $_->hide;
1027 }
1028
828 $self->update; 1029 $self->update;
829} 1030}
830 1031
831sub get_wh { 1032sub get_wh {
832 my ($self) = @_; 1033 my ($self) = @_;
… …
1009} 1210}
1010 1211
1011sub size_allocate { 1212sub size_allocate {
1012 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
1013 1214
1215 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1216
1014 my $children = $self->{children}; 1217 my $children = $self->{children};
1015 1218
1016 my @h = map $_->{req_h}, @$children; 1219 my @h = map $_->{req_h}, @$children;
1017 1220
1018 my $req_h = List::Util::sum @h; 1221 my $req_h = List::Util::sum @h;
… …
1055 1258
1056sub new { 1259sub new {
1057 my ($class, %arg) = @_; 1260 my ($class, %arg) = @_;
1058 1261
1059 my $self = $class->SUPER::new ( 1262 my $self = $class->SUPER::new (
1060 fg => [1, 1, 1], 1263 fg => [1, 1, 1],
1264 #font => default_font
1265 #text => initial text
1266 #markup => initial narkup
1267 layout => (new CFClient::Layout),
1061 fontsize => 1, 1268 fontsize => 1,
1062 text => "",
1063 align => -1, 1269 align => -1,
1064 valign => -1, 1270 valign => -1,
1065 padding => 2, 1271 padding => 2,
1066 layout => new CFClient::Layout, 1272 can_events => 0,
1067 %arg 1273 %arg
1068 ); 1274 );
1069 1275
1070 if (exists $self->{template}) { 1276 if (exists $self->{template}) {
1071 my $layout = new CFClient::Layout; 1277 my $layout = new CFClient::Layout;
1072 $layout->set_text (delete $self->{template}); 1278 $layout->set_text (delete $self->{template});
1073 $self->{template} = $layout; 1279 $self->{template} = $layout;
1074 } 1280 }
1075 1281
1076 $self->set_text (delete $self->{text}) if exists $self->{text}; 1282 if (exists $self->{markup}) {
1077 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1283 $self->set_markup (delete $self->{markup});
1284 } else {
1285 $self->set_text (delete $self->{text});
1286 }
1078 1287
1079 $self 1288 $self
1080} 1289}
1081 1290
1082sub escape_text { 1291sub escape {
1083 local $_ = $_[1]; 1292 local $_ = $_[1];
1084 1293
1085 s/&/&amp;/g; 1294 s/&/&amp;/g;
1086 s/>/&gt;/g; 1295 s/>/&gt;/g;
1087 s/</&lt;/g; 1296 s/</&lt;/g;
1088 1297
1089 $_[1] 1298 $_[1]
1090} 1299}
1091 1300
1301sub update {
1302 my ($self) = @_;
1303
1304 delete $self->{texture};
1305 $self->SUPER::update;
1306}
1307
1092sub set_text { 1308sub set_text {
1093 my ($self, $text) = @_; 1309 my ($self, $text) = @_;
1094 1310
1311 return if $self->{text} eq "T$text";
1312 $self->{text} = "T$text";
1313
1314 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1095 $self->{layout}->set_text ($text); 1315 $self->{layout}->set_text ($text);
1096 1316
1097 delete $self->{texture}; 1317 $self->update;
1098 $self->check_size; 1318 $self->check_size;
1099 $self->update;
1100} 1319}
1101 1320
1102sub set_markup { 1321sub set_markup {
1103 my ($self, $markup) = @_; 1322 my ($self, $markup) = @_;
1104 1323
1324 return if $self->{text} eq "M$markup";
1325 $self->{text} = "M$markup";
1326
1327 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1328
1329 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1105 $self->{layout}->set_markup ($markup); 1330 $self->{layout}->set_markup ($markup);
1106 1331
1107 delete $self->{texture}; 1332 $self->update;
1108 $self->check_size; 1333 $self->check_size;
1109 $self->update;
1110} 1334}
1111 1335
1112sub size_request { 1336sub size_request {
1113 my ($self) = @_; 1337 my ($self) = @_;
1114 1338
1115 $self->{layout}->set_width; 1339 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $self->{layout}->set_width ($self->{max_w} || -1);
1116 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1117 1342
1118 my ($w, $h) = $self->{layout}->size; 1343 my ($w, $h) = $self->{layout}->size;
1119 1344
1120 if (exists $self->{template}) { 1345 if (exists $self->{template}) {
1346 $self->{template}->set_font ($self->{font}) if $self->{font};
1121 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1347 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1122 1348
1123 my ($w2, $h2) = $self->{template}->size; 1349 my ($w2, $h2) = $self->{template}->size;
1124 1350
1125 $w = List::Util::max $w, $w2; 1351 $w = List::Util::max $w, $w2;
… …
1140 1366
1141sub set_fontsize { 1367sub set_fontsize {
1142 my ($self, $fontsize) = @_; 1368 my ($self, $fontsize) = @_;
1143 1369
1144 $self->{fontsize} = $fontsize; 1370 $self->{fontsize} = $fontsize;
1371 delete $self->{texture};
1372
1373 $self->update;
1145 $self->check_size; 1374 $self->check_size;
1146} 1375}
1147 1376
1148sub _draw { 1377sub _draw {
1149 my ($self) = @_; 1378 my ($self) = @_;
1150 1379
1151 my $tex = $self->{texture} ||= do { 1380 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font};
1152 $self->{layout}->set_width ($self->{w}); 1383 $self->{layout}->set_width ($self->{w});
1153 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1385
1154 new_from_layout CFClient::Texture $self->{layout} 1386 my $tex = new_from_layout CFClient::Texture $self->{layout};
1387
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5;
1391
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5;
1395
1396 $tex
1155 }; 1397 };
1156 1398
1157 glEnable GL_BLEND;
1158 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1159 glEnable GL_TEXTURE_2D; 1399 glEnable GL_TEXTURE_2D;
1160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1161 1401
1402 if ($tex->{format} == GL_ALPHA) {
1162 glColor @{$self->{fg}}; 1403 glColor @{$self->{fg}};
1163
1164 $self->{ox} = int (
1165 $self->{align} < 0 ? $self->{padding}
1166 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1167 : ($self->{w} - $tex->{w}) * 0.5
1168 );
1169
1170 $self->{oy} = int (
1171 $self->{valign} < 0 ? $self->{padding}
1172 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1173 : ($self->{h} - $tex->{h}) * 0.5
1174 );
1175
1176 $tex->draw_quad ($self->{ox}, $self->{oy}); 1404 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1405 } else {
1406 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1407 }
1177 1408
1178 glDisable GL_TEXTURE_2D; 1409 glDisable GL_TEXTURE_2D;
1179 glDisable GL_BLEND;
1180} 1410}
1181 1411
1182############################################################################# 1412#############################################################################
1183 1413
1184package CFClient::UI::EntryBase; 1414package CFClient::UI::EntryBase;
… …
1189 1419
1190sub new { 1420sub new {
1191 my $class = shift; 1421 my $class = shift;
1192 1422
1193 $class->SUPER::new ( 1423 $class->SUPER::new (
1194 fg => [1, 1, 1], 1424 fg => [1, 1, 1],
1195 bg => [0, 0, 0, 0.2], 1425 bg => [0, 0, 0, 0.2],
1196 active_bg => [1, 1, 1, 0.5], 1426 active_bg => [1, 1, 1, 0.5],
1197 active_fg => [0, 0, 0], 1427 active_fg => [0, 0, 0],
1198 can_hover => 1, 1428 can_hover => 1,
1199 can_focus => 1, 1429 can_focus => 1,
1200 valign => 0, 1430 valign => 0,
1431 can_events => 1,
1201 @_ 1432 @_
1202 ) 1433 )
1203} 1434}
1204 1435
1205sub _set_text { 1436sub _set_text {
… …
1218 $self->{layout}->set_text ("$text "); 1449 $self->{layout}->set_text ("$text ");
1219 1450
1220 $self->emit (changed => $self->{text}); 1451 $self->emit (changed => $self->{text});
1221} 1452}
1222 1453
1454sub set_text {
1455 my ($self, $text) = @_;
1456
1457 $self->{cursor} = length $text;
1458 $self->_set_text ($text);
1459 $self->check_size;
1460 $self->update;
1461}
1462
1223sub get_text { 1463sub get_text {
1224 $_[0]{text} 1464 $_[0]{text}
1225} 1465}
1226 1466
1227sub size_request { 1467sub size_request {
… …
1234 1474
1235sub size_allocate { 1475sub size_allocate {
1236 my ($self, $w, $h) = @_; 1476 my ($self, $w, $h) = @_;
1237 1477
1238 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1478 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1239}
1240
1241sub set_text {
1242 my ($self, $text) = @_;
1243
1244 $self->{cursor} = length $text;
1245 $self->_set_text ($text);
1246 $self->update;
1247} 1479}
1248 1480
1249sub key_down { 1481sub key_down {
1250 my ($self, $ev) = @_; 1482 my ($self, $ev) = @_;
1251 1483
… …
1358 my ($self, $ev) = @_; 1590 my ($self, $ev) = @_;
1359 1591
1360 my $sym = $ev->{sym}; 1592 my $sym = $ev->{sym};
1361 1593
1362 if ($sym == 13) { 1594 if ($sym == 13) {
1595 unshift @{$self->{history}},
1596 my $txt = $self->get_text;
1597 $self->{history_pointer} = -1;
1598 $self->{history_saveback} = '';
1363 $self->emit (activate => $self->get_text); 1599 $self->emit (activate => $txt);
1364 $self->update; 1600 $self->update;
1601
1602 } elsif ($sym == CFClient::SDLK_UP) {
1603 if ($self->{history_pointer} < 0) {
1604 $self->{history_saveback} = $self->get_text;
1605 }
1606 if (@{$self->{history} || []} > 0) {
1607 $self->{history_pointer}++;
1608 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1609 $self->{history_pointer} = @{$self->{history} || []} - 1;
1610 }
1611 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1612 }
1613
1614 } elsif ($sym == CFClient::SDLK_DOWN) {
1615 $self->{history_pointer}--;
1616 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1617
1618 if ($self->{history_pointer} >= 0) {
1619 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1620 } else {
1621 $self->set_text ($self->{history_saveback});
1622 }
1365 1623
1366 } else { 1624 } else {
1367 $self->SUPER::key_down ($ev); 1625 $self->SUPER::key_down ($ev);
1368 } 1626 }
1369 1627
… …
1383 1641
1384sub new { 1642sub new {
1385 my $class = shift; 1643 my $class = shift;
1386 1644
1387 $class->SUPER::new ( 1645 $class->SUPER::new (
1388 padding => 4, 1646 padding => 4,
1389 fg => [1, 1, 1], 1647 fg => [1, 1, 1],
1390 bg => [1, 1, 1, 0.2], 1648 bg => [1, 1, 1, 0.2],
1391 active_fg => [0, 0, 1], 1649 active_fg => [0, 0, 1],
1392 can_hover => 1, 1650 can_hover => 1,
1393 align => 0, 1651 align => 0,
1394 valign => 0, 1652 valign => 0,
1653 can_events => 1,
1395 @_ 1654 @_
1396 ) 1655 )
1397} 1656}
1398 1657
1399sub button_up { 1658sub button_up {
… …
1412 1671
1413 if ($GRAB == $self) { 1672 if ($GRAB == $self) {
1414 $self->{fg} = $self->{active_fg}; 1673 $self->{fg} = $self->{active_fg};
1415 } 1674 }
1416 1675
1417 glEnable GL_BLEND;
1418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1419 glEnable GL_TEXTURE_2D; 1676 glEnable GL_TEXTURE_2D;
1420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1421 glColor 0, 0, 0, 1; 1678 glColor 0, 0, 0, 1;
1422 1679
1423 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1680 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1424 1681
1425 glDisable GL_TEXTURE_2D; 1682 glDisable GL_TEXTURE_2D;
1426 glDisable GL_BLEND;
1427 1683
1428 $self->SUPER::_draw; 1684 $self->SUPER::_draw;
1429} 1685}
1430 1686
1431############################################################################# 1687#############################################################################
… …
1478 1734
1479 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1480 1736
1481 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1482 1738
1483 glEnable GL_BLEND;
1484 glEnable GL_TEXTURE_2D; 1739 glEnable GL_TEXTURE_2D;
1485 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1486 1740
1487 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1488 1742
1489 $tex->draw_quad (0, 0, $s, $s); 1743 $tex->draw_quad_alpha (0, 0, $s, $s);
1490 1744
1491 glDisable GL_TEXTURE_2D; 1745 glDisable GL_TEXTURE_2D;
1492 glDisable GL_BLEND;
1493} 1746}
1494 1747
1495############################################################################# 1748#############################################################################
1496 1749
1497package CFClient::UI::Image; 1750package CFClient::UI::Image;
… …
1504our %loaded_images; 1757our %loaded_images;
1505 1758
1506sub new { 1759sub new {
1507 my $class = shift; 1760 my $class = shift;
1508 1761
1509 my $self = $class->SUPER::new (@_); 1762 my $self = $class->SUPER::new (can_events => 0, @_);
1510 1763
1511 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1764 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1512 1765
1513 $loaded_images{$self->{image}} ||= 1766 $loaded_images{$self->{image}} ||=
1514 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1767 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1540 glTranslate 0, -$self->{w}, 0; 1793 glTranslate 0, -$self->{w}, 0;
1541 1794
1542 ($w, $h) = ($h, $w); 1795 ($w, $h) = ($h, $w);
1543 } 1796 }
1544 1797
1545 glEnable GL_BLEND;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547 glEnable GL_TEXTURE_2D; 1798 glEnable GL_TEXTURE_2D;
1548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1549 1800
1550 $tex->draw_quad (0, 0, $w, $h); 1801 $tex->draw_quad_alpha (0, 0, $w, $h);
1551 1802
1552 glDisable GL_BLEND;
1553 glDisable GL_TEXTURE_2D; 1803 glDisable GL_TEXTURE_2D;
1554} 1804}
1555 1805
1556############################################################################# 1806#############################################################################
1557 1807
1558package CFClient::UI::VGauge; 1808package CFClient::UI::VGauge;
1559 1809
1560our @ISA = CFClient::UI::Base::; 1810our @ISA = CFClient::UI::Base::;
1811
1812use List::Util qw(min max);
1561 1813
1562use CFClient::OpenGL; 1814use CFClient::OpenGL;
1563 1815
1564my %tex = ( 1816my %tex = (
1565 food => [ 1817 food => [
1566 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1818 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1567 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1819 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1568 ], 1820 ],
1569 grace => [ 1821 grace => [
1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1822 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1571 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1823 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1572 ], 1824 ],
1573 hp => [ 1825 hp => [
1574 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1826 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1575 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1827 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1576 ], 1828 ],
1577 mana => [ 1829 mana => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1830 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1831 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1580 ], 1832 ],
1581); 1833);
1582 1834
1583# eg. VGauge->new (gauge => 'food'), default gauge: food 1835# eg. VGauge->new (gauge => 'food'), default gauge: food
1584sub new { 1836sub new {
… …
1603} 1855}
1604 1856
1605sub set_max { 1857sub set_max {
1606 my ($self, $max) = @_; 1858 my ($self, $max) = @_;
1607 1859
1860 return if $self->{max_val} == $max;
1861
1608 $self->{max_val} = $max; 1862 $self->{max_val} = $max;
1863 $self->update;
1609} 1864}
1610 1865
1611sub set_value { 1866sub set_value {
1612 my ($self, $val, $max) = @_; 1867 my ($self, $val, $max) = @_;
1613 1868
1614 $self->set_max ($max) 1869 $self->set_max ($max)
1615 if defined $max; 1870 if defined $max;
1616 1871
1617 $max = $self->{max_val}; 1872 return if $self->{val} == $val;
1873
1618 $self->{val} = $val; 1874 $self->{val} = $val;
1619
1620 $self->update; 1875 $self->update;
1621} 1876}
1622 1877
1623sub _draw { 1878sub _draw {
1624 my ($self) = @_; 1879 my ($self) = @_;
1625 1880
1626 my $tex = $tex{$self->{type}}; 1881 my $tex = $tex{$self->{type}};
1882 my ($t1, $t2, $t3) = @$tex;
1627 1883
1628 my ($w, $h) = ($self->{w}, $self->{h}); 1884 my ($w, $h) = ($self->{w}, $self->{h});
1629 1885
1630 if ($self->{vertical}) { 1886 if ($self->{vertical}) {
1631 glRotate 90, 0, 0, 1; 1887 glRotate 90, 0, 0, 1;
… …
1633 1889
1634 ($w, $h) = ($h, $w); 1890 ($w, $h) = ($h, $w);
1635 } 1891 }
1636 1892
1637 my $ycut = $self->{val} / ($self->{max_val} || 1); 1893 my $ycut = $self->{val} / ($self->{max_val} || 1);
1638 $ycut = 1 if $self->{val} > $self->{max_val};
1639 1894
1640 my $t1 = $tex->[0]; 1895 my $ycut1 = max 0, min 1, $ycut;
1641 my $t2 = $tex->[1]; 1896 my $ycut2 = max 0, min 1, $ycut - 1;
1897
1898 my $h1 = $self->{h} * (1 - $ycut1);
1899 my $h2 = $self->{h} * (1 - $ycut2);
1642 1900
1643 glEnable GL_BLEND; 1901 glEnable GL_BLEND;
1644 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1902 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1645 glEnable GL_TEXTURE_2D; 1903 glEnable GL_TEXTURE_2D;
1646 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 1905
1648 my $h1 = $self->{h} - $ycut * $self->{h};
1649 my $h2 = $ycut * $self->{h};
1650
1651 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1906 glBindTexture GL_TEXTURE_2D, $t1->{name};
1652 glBegin GL_QUADS; 1907 glBegin GL_QUADS;
1653 glTexCoord 0 , 0; glVertex 0 , 0; 1908 glTexCoord 0 , 0; glVertex 0 , 0;
1654 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1909 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1655 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1910 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1656 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1911 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1657 glEnd; 1912 glEnd;
1658 1913
1914 my $ycut1 = List::Util::min 1, $ycut;
1659 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1915 glBindTexture GL_TEXTURE_2D, $t2->{name};
1660 glBegin GL_QUADS; 1916 glBegin GL_QUADS;
1661 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1917 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1662 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1918 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1663 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1919 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1664 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1920 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1665 glEnd; 1921 glEnd;
1922
1923 if ($t3) {
1924 glBindTexture GL_TEXTURE_2D, $t3->{name};
1925 glBegin GL_QUADS;
1926 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1927 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1928 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1929 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1930 glEnd;
1931 }
1666 1932
1667 glDisable GL_BLEND; 1933 glDisable GL_BLEND;
1668 glDisable GL_TEXTURE_2D; 1934 glDisable GL_TEXTURE_2D;
1669} 1935}
1670 1936
… …
1673package CFClient::UI::Gauge; 1939package CFClient::UI::Gauge;
1674 1940
1675our @ISA = CFClient::UI::VBox::; 1941our @ISA = CFClient::UI::VBox::;
1676 1942
1677sub new { 1943sub new {
1678 my ($class, %arg) = shift; 1944 my ($class, %arg) = @_;
1679 1945
1680 my $self = $class->SUPER::new ( 1946 my $self = $class->SUPER::new (
1681 @_, 1947 tooltip => $arg{type},
1948 can_hover => 1,
1949 can_events => 1,
1950 %arg,
1682 ); 1951 );
1683 1952
1684 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1953 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1685 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1954 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1686 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1955 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1687 1956
1688 $self 1957 $self
1689} 1958}
1690 1959
1691sub set_fontsize { 1960sub set_fontsize {
… …
1693 1962
1694 $self->{value}->set_fontsize ($fsize); 1963 $self->{value}->set_fontsize ($fsize);
1695 $self->{max} ->set_fontsize ($fsize); 1964 $self->{max} ->set_fontsize ($fsize);
1696} 1965}
1697 1966
1967sub set_max {
1968 my ($self, $max) = @_;
1969
1970 $self->{gauge}->set_max ($max);
1971 $self->{max}->set_text ($max);
1972}
1973
1698sub set_value { 1974sub set_value {
1699 my ($self, $val, $max) = @_; 1975 my ($self, $val, $max) = @_;
1700 1976
1701 $self->set_max ($max) 1977 $self->set_max ($max)
1702 if defined $max; 1978 if defined $max;
1703 1979
1704 $self->{gauge}->set_value ($val, $max); 1980 $self->{gauge}->set_value ($val, $max);
1705 $self->{value}->set_text ($val); 1981 $self->{value}->set_text ($val);
1706}
1707
1708sub set_max {
1709 my ($self, $max) = @_;
1710
1711 $self->{gauge}->set_max ($max);
1712 $self->{max}->set_text ($max);
1713} 1982}
1714 1983
1715############################################################################# 1984#############################################################################
1716 1985
1717package CFClient::UI::Slider; 1986package CFClient::UI::Slider;
… …
1736 # TODO: calculations are off 2005 # TODO: calculations are off
1737 my $self = $class->SUPER::new ( 2006 my $self = $class->SUPER::new (
1738 fg => [1, 1, 1], 2007 fg => [1, 1, 1],
1739 active_fg => [0, 0, 0], 2008 active_fg => [0, 0, 0],
1740 range => [0, 0, 100, 10], 2009 range => [0, 0, 100, 10],
1741 req_w => 20, 2010 req_w => $::WIDTH / 80,
1742 req_h => 20, 2011 req_h => $::WIDTH / 80,
1743 vertical => 0, 2012 vertical => 0,
1744 can_hover => 1, 2013 can_hover => 1,
1745 inner_pad => 5, 2014 inner_pad => 5,
1746 @_ 2015 @_
1747 ); 2016 );
… …
1830 $page ||= 2; 2099 $page ||= 2;
1831 2100
1832 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1833 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1834 2103
1835 glEnable GL_BLEND;
1836 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1837 glEnable GL_TEXTURE_2D; 2104 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 2106
1840 # draw background 2107 # draw background
1841 $tex[1]->draw_quad (0, 0, $w, $h); 2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1842 2109
1843 # draw handle 2110 # draw handle
1844 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1845 2112
1846 glDisable GL_BLEND;
1847 glDisable GL_TEXTURE_2D; 2113 glDisable GL_TEXTURE_2D;
1848} 2114}
1849 2115
1850############################################################################# 2116#############################################################################
1851 2117
… …
1857 2123
1858sub new { 2124sub new {
1859 my $class = shift; 2125 my $class = shift;
1860 2126
1861 my $self = $class->SUPER::new ( 2127 my $self = $class->SUPER::new (
1862 fontsize => 1, 2128 fontsize => 1,
2129 can_events => 0,
2130 #font => default_font
1863 @_, 2131 @_,
1864 2132
1865 layout => (new CFClient::Layout), 2133 layout => (new CFClient::Layout 1),
1866 par => [], 2134 par => [],
1867 height => 0, 2135 height => 0,
1868 children => [ 2136 children => [
1869 (new CFClient::UI::Empty expand => 1), 2137 (new CFClient::UI::Empty expand => 1),
1870 (new CFClient::UI::Slider vertical => 1), 2138 (new CFClient::UI::Slider vertical => 1),
1871 ], 2139 ],
1872 ); 2140 );
1873 2141
1874 $self->{children}[1]->connect (changed => sub { 2142 $self->{children}[1]->connect (changed => sub { $self->update });
1875 $self->update;
1876 });
1877 2143
1878 $self 2144 $self
1879} 2145}
1880 2146
1881sub set_fontsize { 2147sub set_fontsize {
… …
1889 my ($self, $text) = @_; 2155 my ($self, $text) = @_;
1890 2156
1891 my $layout = $self->{layout}; 2157 my $layout = $self->{layout};
1892 2158
1893 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1894 $layout->set_width ($self->{w}); 2160 $layout->set_width ($self->{children}[0]{w});
1895 $layout->set_text ($text); 2161 $layout->set_markup ($text);
1896 2162
1897 ($layout->size)[1] 2163 ($layout->size)[1]
1898} 2164}
1899 2165
1900sub reflow { 2166sub reflow {
… …
1907sub size_allocate { 2173sub size_allocate {
1908 my ($self, $w, $h) = @_; 2174 my ($self, $w, $h) = @_;
1909 2175
1910 $self->SUPER::size_allocate ($w, $h); 2176 $self->SUPER::size_allocate ($w, $h);
1911 2177
2178 $self->{layout}->set_font ($self->{font}) if $self->{font};
1912 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2179 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $self->{layout}->set_width ($self->{children}[0]{w}); 2180 $self->{layout}->set_width ($self->{children}[0]{w});
1914 2181
1915 $self->reflow; 2182 $self->reflow;
1916} 2183}
… …
1951 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2218 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1952 2219
1953 delete $self->{texture}; 2220 delete $self->{texture};
1954 } 2221 }
1955 2222
1956 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2223 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1957 glClearColor 0, 0, 0, 1; 2224 glClearColor 0, 0, 0, 0;
1958 glClear GL_COLOR_BUFFER_BIT; 2225 glClear GL_COLOR_BUFFER_BIT;
1959 2226
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D; 2227 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964 2229
1965 my $top = int $self->{children}[1]{range}[0]; 2230 my $top = int $self->{children}[1]{range}[0];
1966 2231
… …
1969 2234
1970 my $y = 0; 2235 my $y = 0;
1971 2236
1972 my $layout = $self->{layout}; 2237 my $layout = $self->{layout};
1973 2238
2239 $layout->set_font ($self->{font}) if $self->{font};
2240
1974 for my $par (@{$self->{par}}) { 2241 for my $par (@{$self->{par}}) {
1975 my $h = $par->[0]; 2242 my $h = $par->[0];
1976 2243
1977 if ($y0 < $y + $h && $y < $y1) { 2244 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] });
1978 $layout->set_text ($par->[2]); 2246 $layout->set_markup ($par->[2]);
1979 2247
1980 glColor @{ $par->[1] };
1981 my ($W, $H) = $layout->size; 2248 my ($W, $H) = $layout->size;
1982 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2249 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1983 } 2250 }
1984 2251
1985 $y += $h; 2252 $y += $h;
1986 } 2253 }
1987 2254
1988 glDisable GL_TEXTURE_2D; 2255 glDisable GL_TEXTURE_2D;
1989 glDisable GL_BLEND;
1990 }; 2256 };
1991 }); 2257 });
1992} 2258}
1993 2259
1994sub _draw { 2260sub _draw {
1995 my ($self) = @_; 2261 my ($self) = @_;
1996 2262
1997 if ($self->{texture}) {
1998 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2265 glColor 1, 1, 1, 1;
2266 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2001 glDisable GL_TEXTURE_2D; 2267 glDisable GL_TEXTURE_2D;
2002 }
2003 2268
2004 $self->{children}[1]->draw; 2269 $self->{children}[1]->draw;
2005 2270
2006} 2271}
2007 2272
… …
2055 2320
2056sub new { 2321sub new {
2057 my $class = shift; 2322 my $class = shift;
2058 2323
2059 my $self = $class->SUPER::new ( 2324 my $self = $class->SUPER::new (
2060 state => 0, 2325 state => 0,
2061 connect_activate => \&toggle_flopper, 2326 connect_activate => \&toggle_flopper,
2062 @_ 2327 @_
2063 ); 2328 );
2064 2329
2065 if ($self->{state}) { 2330 if ($self->{state}) {
… …
2086 $self->emit (changed => $self->{state}); 2351 $self->emit (changed => $self->{state});
2087} 2352}
2088 2353
2089############################################################################# 2354#############################################################################
2090 2355
2356package CFClient::UI::Tooltip;
2357
2358our @ISA = CFClient::UI::Bin::;
2359
2360use CFClient::OpenGL;
2361
2362sub new {
2363 my $class = shift;
2364
2365 $class->SUPER::new (
2366 @_,
2367 can_events => 0,
2368 )
2369}
2370
2371sub set_tooltip_from {
2372 my ($self, $widget) = @_;
2373
2374 $self->{label} = new CFClient::UI::Label
2375 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8,
2378 fg => [0, 0, 0, 1],
2379 font => ($widget->{tooltip_font} || $::FONT_PROP);
2380
2381 $self->add ($self->{label});
2382}
2383
2384sub size_request {
2385 my ($self) = @_;
2386
2387 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2388
2389 ($w + 4, $h + 4)
2390}
2391
2392sub size_allocate {
2393 my ($self, $w, $h) = @_;
2394
2395 $self->SUPER::size_allocate ($w - 4, $h - 4);
2396}
2397
2398sub _draw {
2399 my ($self) = @_;
2400
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375;
2403
2404 my ($w, $h) = @$self{qw(w h)};
2405
2406 glColor 1, 0.8, 0.4;
2407 glBegin GL_QUADS;
2408 glVertex 0 , 0;
2409 glVertex 0 , $h;
2410 glVertex $w, $h;
2411 glVertex $w, 0;
2412 glEnd;
2413
2414 glColor 0, 0, 0;
2415 glBegin GL_LINE_LOOP;
2416 glVertex 0 , 0;
2417 glVertex 0 , $h;
2418 glVertex $w, $h;
2419 glVertex $w, 0;
2420 glEnd;
2421
2422 glPopMatrix;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw;
2426}
2427
2428#############################################################################
2429
2430package CFClient::UI::Face;
2431
2432our @ISA = CFClient::UI::Base::;
2433
2434use CFClient::OpenGL;
2435
2436sub new {
2437 my $class = shift;
2438
2439 $class->SUPER::new (
2440 aspect => 1,
2441 @_,
2442 )
2443}
2444
2445sub size_request {
2446 (32, 8)
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 return unless $::CONN;#d# manage and cache textures differently
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2454
2455 # TODO animation
2456 if ($tex) {
2457 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D;
2462 }
2463}
2464
2465#############################################################################
2466
2467package CFClient::UI::InventoryItem;
2468
2469our @ISA = CFClient::UI::HBox::;
2470
2471sub new {
2472 my $class = shift;
2473
2474 my %args = @_;
2475
2476 my $item = delete $args{item};
2477
2478 my $desc = $item->{nrof} < 2
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482
2483 my $self = $class->SUPER::new (
2484 can_hover => 1,
2485 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_;
2490
2491 # todo: maybe put examine on 1? but should just be a tooltip :(
2492 if ($ev->{button} == 1) {
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2494 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507 ],
2508 )->popup ($ev);
2509 }
2510
2511 1
2512 },
2513 %args
2514 );
2515
2516 $self->add (new CFClient::UI::Face
2517 can_events => 0,
2518 face => $item->{face},
2519 anim => $item->{anim},
2520 animspeed => $item->{animspeed},
2521 );
2522
2523 $self->add (new CFClient::UI::Label
2524 can_events => 0,
2525 text => $desc,
2526 );
2527
2528 $self
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Inventory;
2534
2535our @ISA = CFClient::UI::ScrolledWindow::;
2536
2537sub new {
2538 my $class = shift;
2539
2540 my $self = $class->SUPER::new (
2541 scrolled => (new CFClient::UI::VBox),
2542 @_,
2543 );
2544
2545 $self
2546}
2547
2548sub set_items {
2549 my ($self, $items) = @_;
2550
2551 $self->{scrolled}->clear;
2552 return unless $items;
2553
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2555
2556 $self->{real_items} = \@items;
2557
2558 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2564 }
2565
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571 ($self->{req_w}, $self->{req_h});
2572}
2573
2574#############################################################################
2575
2576package CFClient::UI::Menu;
2577
2578our @ISA = CFClient::UI::FancyFrame::;
2579
2580use CFClient::OpenGL;
2581
2582sub new {
2583 my $class = shift;
2584
2585 my $self = $class->SUPER::new (
2586 items => [],
2587 z => 100,
2588 @_,
2589 );
2590
2591 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2592
2593 for my $item (@{ $self->{items} }) {
2594 my ($widget, $cb) = @$item;
2595
2596 # handle various types of items, only text for now
2597 if (!ref $widget) {
2598 $widget = new CFClient::UI::Label
2599 can_hover => 1,
2600 can_events => 1,
2601 text => $widget;
2602 }
2603
2604 $self->{item}{$widget} = $item;
2605
2606 $self->{vbox}->add ($widget);
2607 }
2608
2609 $self
2610}
2611
2612# popup given the event (must be a mouse button down event currently)
2613sub popup {
2614 my ($self, $ev) = @_;
2615
2616 $self->emit ("popdown");
2617
2618 # maybe save $GRAB? must be careful about events...
2619 $GRAB = $self;
2620 $self->{button} = $ev->{button};
2621
2622 $self->show;
2623 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2624}
2625
2626sub mouse_motion {
2627 my ($self, $ev, $x, $y) = @_;
2628
2629 # TODO: should use vbox->find_widget or so
2630 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2631 $self->{hover} = $self->{item}{$HOVER};
2632}
2633
2634sub button_up {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 if ($ev->{button} == $self->{button}) {
2638 undef $GRAB;
2639 $self->hide;
2640
2641 $self->emit ("popdown");
2642 $self->{hover}[1]->() if $self->{hover};
2643 }
2644}
2645
2646#############################################################################
2647
2648package CFClient::UI::Statusbox;
2649
2650our @ISA = CFClient::UI::VBox::;
2651
2652sub reorder {
2653 my ($self) = @_;
2654 my $NOW = time;
2655
2656 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 }
2659
2660 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2662 my $count = 10 + 1;
2663 for my $item (@items) {
2664 last unless --$count;
2665
2666 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text};
2669 for ($short) {
2670 s/^\s+//;
2671 s/\012.*//s;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 }
2675
2676 new CFClient::UI::Label
2677 markup => $short,
2678 tooltip => delete $item->{tooltip},
2679 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75,
2681 fontsize => delete $item->{fontsize},
2682 color => delete $item->{color},
2683 can_events => 1,
2684 can_hover => 1,
2685 };
2686 }
2687
2688 $self->clear;
2689 $self->SUPER::add (@widgets);
2690}
2691
2692sub add {
2693 my ($self, $text, %arg) = @_;
2694
2695 my $item = {
2696 time => time,
2697 text => $text,
2698 timeout => 60,
2699 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8],
2702 %arg,
2703 };
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709
2710 $self->reorder;
2711}
2712
2713#############################################################################
2714
2091package CFClient::UI::Root; 2715package CFClient::UI::Root;
2092 2716
2093our @ISA = CFClient::UI::Container::; 2717our @ISA = CFClient::UI::Container::;
2094 2718
2095use CFClient::OpenGL; 2719use CFClient::OpenGL;
2096 2720
2097sub check_size { 2721sub new {
2098 my ($self) = @_; 2722 my $class = shift;
2099 2723
2100 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2724 $class->SUPER::new (
2101} 2725 @_,
2102 2726 )
2103sub size_request {
2104 ($::WIDTH, $::HEIGHT)
2105} 2727}
2106 2728
2107sub configure { 2729sub configure {
2108 my ($self, $x, $y, $w, $h) = @_; 2730 my ($self, $x, $y, $w, $h) = @_;
2109 2731
2110 $self->SUPER::configure ($x, $y, $w, $h); 2732 $self->{w} = $w;
2733 $self->{h} = $h;
2734}
2111 2735
2736sub check_size {
2737 my ($self) = @_;
2738
2739 $self->size_allocate ($self->{w}, $self->{h})
2740 if $self->{w};
2741}
2742
2743sub size_request {
2744 my ($self) = @_;
2745
2746 ($self->{w}, $self->{h})
2747}
2748
2749sub size_allocate {
2750 my ($self, $w, $h) = @_;
2751
2752 my $old_w = $self->{old_w};
2753 my $old_h = $self->{old_h};
2754
2755 if ($old_w && $old_h) {
2756 for my $child ($self->children) {
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767
2112 for my $child (@{$self->{children}}) { 2768 for my $child ($self->children) {
2113 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2769 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2114 2770
2115 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2771 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2116 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2117 $child->configure ($X, $Y, $W,$H); 2773 $child->configure ($X, $Y, $W, $H);
2118 } 2774 }
2119}
2120 2775
2121sub _topleft { 2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778}
2779
2780sub coord2local {
2122 my ($self, $x, $y) = @_; 2781 my ($self, $x, $y) = @_;
2123 2782
2124 ($x, $y) 2783 ($x, $y)
2125} 2784}
2126 2785
2786sub coord2global {
2787 my ($self, $x, $y) = @_;
2788
2789 ($x, $y)
2790}
2791
2127sub update { 2792sub update {
2128 my ($self) = @_; 2793 my ($self) = @_;
2129 2794
2130 $self->check_size; 2795 $self->check_size;
2131 ::refresh (); 2796 $::WANT_REFRESH++;
2132} 2797}
2133 2798
2134sub add { 2799sub add {
2135 my ($self, $child) = @_; 2800 my ($self, $child) = @_;
2136 2801
2137 # integerize window positions 2802 # integerise window positions
2138 $child->{x} = int $child->{x}; 2803 $child->{x} = int $child->{x};
2139 $child->{y} = int $child->{y}; 2804 $child->{y} = int $child->{y};
2140 2805
2141 $self->SUPER::add ($child); 2806 $self->SUPER::add ($child);
2142} 2807}
… …
2145 my ($self, $id, $cb) = @_; 2810 my ($self, $id, $cb) = @_;
2146 2811
2147 $self->{refresh_hook}{$id} = $cb; 2812 $self->{refresh_hook}{$id} = $cb;
2148} 2813}
2149 2814
2150sub draw { 2815sub draw {
2151 my ($self) = @_; 2816 my ($self) = @_;
2152 2817
2818 if ($self->{check_size}) {
2819 my @queue = ([], []);
2820
2821 for (;;) {
2822 if ($self->{check_size}) {
2823 # heuristic: check containers last
2824 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2825 for values %{delete $self->{check_size}}
2826 }
2827
2828 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2829
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request;
2833
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836
2837 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h;
2839
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2841
2842 $widget->{parent}->check_size
2843 if $widget->{parent};
2844 }
2845 }
2846 }
2847
2848 while ($self->{size_alloc}) {
2849 for (values %{delete $self->{size_alloc}}) {
2850 my ($widget, $w, $h) = @$_;
2851
2852 $w = 0 if $w < 0;
2853 $h = 0 if $h < 0;
2854
2855 $widget->{w} = $w;
2856 $widget->{h} = $h;
2857 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h);
2859 }
2860 }
2861
2153 while (my $rcb = delete $self->{refresh_hook}) { 2862 while ($self->{refresh_hook}) {
2154 $_->() for values %$rcb; 2863 $_->()
2864 for values %{delete $self->{refresh_hook}};
2155 } 2865 }
2156 2866
2157 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2867 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2158 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2159 glClear GL_COLOR_BUFFER_BIT; 2869 glClear GL_COLOR_BUFFER_BIT;
… …
2170############################################################################# 2880#############################################################################
2171 2881
2172package CFClient::UI; 2882package CFClient::UI;
2173 2883
2174$ROOT = new CFClient::UI::Root; 2884$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip;
2175 2886
21761 28871
2177 2888

Diff Legend

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