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.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.445 by root, Sat Dec 8 19:17:02 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFClient; 8use CFPlus;
9use CFPlus::Pod;
11use CFClient::Texture; 10use CFPlus::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 29 $TOOLTIP->hide;
28 30
29 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 33
31 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
32 35
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show; 37 $TOOLTIP->show;
39 } 38 }
40 39
41 return; 40 return;
42 } 41 }
43 } 42 }
44 } 43 }
45 44
46 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48}); 48};
49 49
50sub get_layout { 50sub get_layout {
51 my $layout; 51 my $layout;
52 52
53 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
88 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
89 89
90 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92 92
93 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
94 } 94 }
95} 95}
96 96
97sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
98 my ($ev) = @_; 98 my ($ev) = @_;
… …
104 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
105 105
106 $GRAB = $widget; 106 $GRAB = $widget;
107 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
108 108
109 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
110 } 110 }
111 111
112 if ($GRAB) { 112 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
117 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
118 } else { 122 } else {
119 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
120 } 124 }
121 } 125 }
… …
135 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
136 $grab->update if $grab; 140 $grab->update if $grab;
137 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
138 142
139 check_hover $widget; 143 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
141 } 145 }
142} 146}
143 147
144sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
145 my ($ev) = @_; 149 my ($ev) = @_;
… …
207 reconfigure_widgets; 211 reconfigure_widgets;
208} 212}
209 213
210############################################################################# 214#############################################################################
211 215
212package CFClient::UI::Event; 216package CFPlus::UI::Event;
213 217
214sub xy { 218sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 220}
217 221
218############################################################################# 222#############################################################################
219 223
220package CFClient::UI::Base; 224package CFPlus::UI::Base;
221 225
222use strict; 226use strict;
223 227
224use CFClient::OpenGL; 228use CFPlus::OpenGL;
225 229
226sub new { 230sub new {
227 my $class = shift; 231 my $class = shift;
228 232
229 my $self = bless { 233 my $self = bless {
… …
234 h => undef, 238 h => undef,
235 can_events => 1, 239 can_events => 1,
236 @_ 240 @_
237 }, $class; 241 }, $class;
238 242
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 244
241 for (keys %$self) { 245 for (keys %$self) {
242 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
244 } 248 }
245 } 249 }
246 250
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 256
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 259
256 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
261 265
262sub destroy { 266sub destroy {
263 my ($self) = @_; 267 my ($self) = @_;
264 268
265 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
266 %$self = (); 271 %$self = ();
267} 272}
268 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
269sub show { 278sub show {
270 my ($self) = @_; 279 my ($self) = @_;
271 280
272 return if $self->{parent}; 281 return if $self->{parent};
273 282
274 $CFClient::UI::ROOT->add ($self); 283 $CFPlus::UI::ROOT->add ($self);
275} 284}
276 285
277sub set_visible { 286sub set_visible {
278 my ($self) = @_; 287 my ($self) = @_;
279 288
… …
300 delete $self->{root}; 309 delete $self->{root};
301 310
302 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
304 313
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
306 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
307 316
308 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
310} 319}
… …
312sub set_visibility { 321sub set_visibility {
313 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
314 323
315 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
316 325
317 $visible ? $self->hide 326 $visible ? $self->show
318 : $self->show; 327 : $self->hide;
319} 328}
320 329
321sub toggle_visibility { 330sub toggle_visibility {
322 my ($self) = @_; 331 my ($self) = @_;
323 332
… …
352 $self->{force_h} = $h; 361 $self->{force_h} = $h;
353 362
354 $self->realloc; 363 $self->realloc;
355} 364}
356 365
366# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh {
368 my ($self) = @_;
369
370 return $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT)
374}
375
357sub size_request { 376sub size_request {
358 require Carp; 377 require Carp;
359 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
360} 379}
361 380
… …
367 my ($self, $x, $y, $w, $h) = @_; 386 my ($self, $x, $y, $w, $h) = @_;
368 387
369 if ($self->{aspect}) { 388 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 389 my ($ow, $oh) = ($w, $h);
371 390
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 391 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 392 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 393
375 # use alignment to adjust x, y 394 # use alignment to adjust x, y
376 395
377 $x += int 0.5 * ($ow - $w); 396 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 397 $y += int 0.5 * ($oh - $h);
… …
419 438
420 return if $self->{tooltip} eq $tooltip; 439 return if $self->{tooltip} eq $tooltip;
421 440
422 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
423 442
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
427 } 446 }
428} 447}
429 448
430# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
431sub coord2local { 450sub coord2local {
… …
497sub connect { 516sub connect {
498 my ($self, $signal, $cb) = @_; 517 my ($self, $signal, $cb) = @_;
499 518
500 push @{ $self->{signal_cb}{$signal} }, $cb; 519 push @{ $self->{signal_cb}{$signal} }, $cb;
501 520
502 defined wantarray and CFClient::guard { 521 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 522 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 523 @{ $self->{signal_cb}{$signal} };
505 } 524 }
525}
526
527sub disconnect_all {
528 my ($self, $signal) = @_;
529
530 delete $self->{signal_cb}{$signal};
506} 531}
507 532
508my %has_coords = ( 533my %has_coords = (
509 button_down => 1, 534 button_down => 1,
510 button_up => 1, 535 button_up => 1,
… …
513); 538);
514 539
515sub emit { 540sub emit {
516 my ($self, $signal, @args) = @_; 541 my ($self, $signal, @args) = @_;
517 542
518 # I do not really like this solution, but I dislike duplication 543 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 544 # and needlessly verbose code, either.
520 my @append 545 my @append
521 = $has_coords{$signal} 546 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 547 ? $args[0]->xy ($self)
523 : (); 548 : ();
524 549
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 550 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 551
527 #d##TODO# stop propagating at first true, do not use sum 552 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 553 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 554 ($self->can ("invoke_$signal") || sub { 1 }), # closure
555 ) {
556 return $cb->($self, @args, @append) || next;
557 }
558
559 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 560 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 561}
532 562
533sub find_widget { 563#sub find_widget {
534 my ($self, $x, $y) = @_; 564# in .xs
535
536 return () unless $self->{can_events};
537
538 return $self
539 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542 ()
543}
544 565
545sub set_parent { 566sub set_parent {
546 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
547 568
548 Scalar::Util::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 570 $self->set_visible if $parent->{visible};
550} 571}
551 572
552sub realloc { 573sub realloc {
553 my ($self) = @_; 574 my ($self) = @_;
… …
579 600
580# using global variables seems a bit hacky, but passing through all drawing 601# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 602# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 603our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 604
584sub draw { 605#sub draw {
585 my ($self) = @_; 606#CFPlus.xs
586
587 return unless $self->{h} && $self->{w};
588
589 # update screen rectangle
590 local $draw_x = $draw_x + $self->{x};
591 local $draw_y = $draw_y + $self->{y};
592
593 # skip widgets that are entirely outside the drawing area
594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597 glPushMatrix;
598 glTranslate $self->{x}, $self->{y}, 0;
599
600 if ($self == $HOVER && $self->{can_hover}) {
601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602 glEnable GL_BLEND;
603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glBegin GL_QUADS;
605 glVertex 0 , 0;
606 glVertex $self->{w}, 0;
607 glVertex $self->{w}, $self->{h};
608 glVertex 0 , $self->{h};
609 glEnd;
610 glDisable GL_BLEND;
611 }
612
613 if ($ENV{CFPLUS_DEBUG} & 1) {
614 glPushMatrix;
615 glColor 1, 1, 0, 1;
616 glTranslate 0.375, 0.375;
617 glBegin GL_LINE_LOOP;
618 glVertex 0 , 0;
619 glVertex $self->{w} - 1, 0;
620 glVertex $self->{w} - 1, $self->{h} - 1;
621 glVertex 0 , $self->{h} - 1;
622 glEnd;
623 glPopMatrix;
624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625 }
626
627 $self->_draw;
628 glPopMatrix;
629}
630 607
631sub _draw { 608sub _draw {
632 my ($self) = @_; 609 my ($self) = @_;
633 610
634 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
635} 612}
636 613
637sub DESTROY { 614sub DESTROY {
638 my ($self) = @_; 615 my ($self) = @_;
639 616
640 return if CFClient::in_destruct; 617 return if CFPlus::in_destruct;
641 618
642 delete $WIDGET{$self+0}; 619 local $@;
643
644 eval { $self->destroy }; 620 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
622
623 delete $WIDGET{$self+0};
646} 624}
647 625
648############################################################################# 626#############################################################################
649 627
650package CFClient::UI::DrawBG; 628package CFPlus::UI::DrawBG;
651 629
652our @ISA = CFClient::UI::Base::; 630our @ISA = CFPlus::UI::Base::;
653 631
654use strict; 632use strict;
655use CFClient::OpenGL; 633use CFPlus::OpenGL;
656 634
657sub new { 635sub new {
658 my $class = shift; 636 my $class = shift;
659
660 # range [value, low, high, page]
661 637
662 $class->SUPER::new ( 638 $class->SUPER::new (
663 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
664 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
665 @_ 641 @_
… …
677 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
678 654
679 glEnable GL_BLEND; 655 glEnable GL_BLEND;
680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681 glColor_premultiply @$color; 657 glColor_premultiply @$color;
682
683 glBegin GL_QUADS;
684 glVertex 0 , 0;
685 glVertex 0 , $h;
686 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
687 glVertex $w, 0;
688 glEnd;
689
690 glDisable GL_BLEND; 659 glDisable GL_BLEND;
691 } 660 }
692} 661}
693 662
694############################################################################# 663#############################################################################
695 664
696package CFClient::UI::Empty; 665package CFPlus::UI::Empty;
697 666
698our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
699 668
700sub new { 669sub new {
701 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 671 $class->SUPER::new (can_events => 0, %arg);
703} 672}
… …
710 679
711sub draw { } 680sub draw { }
712 681
713############################################################################# 682#############################################################################
714 683
715package CFClient::UI::Container; 684package CFPlus::UI::Container;
716 685
717our @ISA = CFClient::UI::Base::; 686our @ISA = CFPlus::UI::Base::;
718 687
719sub new { 688sub new {
720 my ($class, %arg) = @_; 689 my ($class, %arg) = @_;
721 690
722 my $children = delete $arg{children}; 691 my $children = delete $arg{children};
… …
726 can_events => 0, 695 can_events => 0,
727 %arg, 696 %arg,
728 ); 697 );
729 698
730 $self->add (@$children) 699 $self->add (@$children)
731 if $children; 700 if $children && @$children;
732 701
733 $self 702 $self
734} 703}
735 704
736sub realloc { 705sub realloc {
… …
745 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
746 715
747 $_->set_parent ($self) 716 $_->set_parent ($self)
748 for @widgets; 717 for @widgets;
749 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 720 use sort 'stable';
751 721
752 $self->{children} = [ 722 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
755 ]; 725 ];
756 726
757 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
758} 732}
759 733
760sub children { 734sub children {
761 @{ $_[0]{children} } 735 @{ $_[0]{children} }
762} 736}
763 737
764sub remove { 738sub remove {
765 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
766 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
767 delete $child->{parent}; 744 delete $child->{parent};
768 $child->hide; 745 $child->hide;
769
770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
771 748
772 $self->realloc; 749 $self->realloc;
773} 750}
774 751
775sub clear { 752sub clear {
776 my ($self) = @_; 753 my ($self) = @_;
777 754
778 my $children = delete $self->{children}; 755 my $children = $self->{children};
779 $self->{children} = []; 756 $self->{children} = [];
780 757
781 for (@$children) { 758 for (@$children) {
782 delete $_->{parent}; 759 delete $_->{parent};
783 $_->hide; 760 $_->hide;
… …
803} 780}
804 781
805sub _draw { 782sub _draw {
806 my ($self) = @_; 783 my ($self) = @_;
807 784
808 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
809} 786}
810 787
811############################################################################# 788#############################################################################
812 789
813package CFClient::UI::Bin; 790package CFPlus::UI::Bin;
814 791
815our @ISA = CFClient::UI::Container::; 792our @ISA = CFPlus::UI::Container::;
816 793
817sub new { 794sub new {
818 my ($class, %arg) = @_; 795 my ($class, %arg) = @_;
819 796
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 797 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 798
822 $class->SUPER::new (children => [$child], %arg) 799 $class->SUPER::new (children => [$child], %arg)
823} 800}
824 801
825sub add { 802sub add {
826 my ($self, $child) = @_; 803 my ($self, $child) = @_;
827 804
828 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
829 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
830} 807}
831 808
832sub remove { 809sub remove {
833 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
834 811
835 $self->SUPER::remove ($widget); 812 $self->SUPER::remove ($widget);
836 813
837 $self->{children} = [new CFClient::UI::Empty] 814 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 815 unless @{$self->{children}};
839} 816}
840 817
841sub child { $_[0]->{children}[0] } 818sub child { $_[0]->{children}[0] }
842 819
… …
851 828
852 1 829 1
853} 830}
854 831
855############################################################################# 832#############################################################################
856
857# back-buffered drawing area 833# back-buffered drawing area
858 834
859package CFClient::UI::Window; 835package CFPlus::UI::Window;
860 836
861our @ISA = CFClient::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
862 838
863use CFClient::OpenGL; 839use CFPlus::OpenGL;
864 840
865sub new { 841sub new {
866 my ($class, %arg) = @_; 842 my ($class, %arg) = @_;
867 843
868 my $self = $class->SUPER::new (%arg); 844 my $self = $class->SUPER::new (%arg);
… …
890} 866}
891 867
892sub render_child { 868sub render_child {
893 my ($self) = @_; 869 my ($self) = @_;
894 870
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 871 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 872 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 873 glClear GL_COLOR_BUFFER_BIT;
898 874
899 { 875 {
900 package CFClient::UI::Base; 876 package CFPlus::UI::Base;
901 877
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 878 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 879 (0, 0, $self->{w}, $self->{h});
880
881 $self->_render;
904 } 882 }
905
906 $self->_render;
907 }; 883 };
908} 884}
909 885
910sub _draw { 886sub _draw {
911 my ($self) = @_; 887 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 888
915 my $tex = $self->{texture} 889 my $tex = $self->{texture}
916 or return; 890 or return;
917 891
918 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 894 glColor 0, 0, 0, 1;
921 895
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0);
923 897
924 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
925} 899}
926 900
927############################################################################# 901#############################################################################
928 902
929package CFClient::UI::ViewPort; 903package CFPlus::UI::ViewPort;
930 904
905use List::Util qw(min max);
906
931our @ISA = CFClient::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
932 908
933sub new { 909sub new {
934 my $class = shift; 910 my $class = shift;
935 911
936 $class->SUPER::new ( 912 $class->SUPER::new (
… …
943sub size_request { 919sub size_request {
944 my ($self) = @_; 920 my ($self) = @_;
945 921
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 923
948 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
950 926
951 ($w, $h) 927 ($w, $h)
952} 928}
953 929
954sub invoke_size_allocate { 930sub invoke_size_allocate {
… …
966} 942}
967 943
968sub set_offset { 944sub set_offset {
969 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
970 946
947 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
948 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
949
950 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 951 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 952 $self->{view_y} = $y;
973 953
954 $self->emit (changed => $x, $y);
974 $self->update; 955 $self->update;
956 }
957}
958
959sub set_center {
960 my ($self, $x, $y) = @_;
961
962 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
963}
964
965sub make_visible {
966 my ($self, $x, $y, $border) = @_;
967
968 if ( $x < $self->{view_x} + $self->{w} * $border
969 || $x > $self->{view_x} + $self->{w} * (1 - $border)
970 || $y < $self->{view_y} + $self->{h} * $border
971 || $y > $self->{view_y} + $self->{h} * (1 - $border)
972 ) {
973 $self->set_center ($x, $y);
974 }
975} 975}
976 976
977# hmm, this does not work for topleft of $self... but we should not ask for that 977# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 978sub coord2local {
979 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
995 995
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 998 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 1000 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 1002 }
1003} 1003}
1004 1004
1005sub _render { 1005sub _render {
1006 my ($self) = @_; 1006 my ($self) = @_;
1007 1007
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1008 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 1010
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 1012
1013 $self->SUPER::_render; 1013 $self->SUPER::_render;
1014} 1014}
1015 1015
1016############################################################################# 1016#############################################################################
1017 1017
1018package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
1019 1019
1020our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::Table::;
1021 1021
1022sub new { 1022sub new {
1023 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
1024 1024
1025 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1026 1026
1027 my $self; 1027 my $self;
1028 1028
1029 my $slider = new CFClient::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1030 c_col => 0,
1031 c_row => 1,
1032 vertical => 0,
1033 range => [0, 0, 1, 0.01], # HACK fix
1034 on_changed => sub {
1035 $self->{hpos} = $_[1];
1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1037 },
1038 ;
1039
1040 my $vslider = new CFPlus::UI::Slider
1041 c_col => 1,
1042 c_row => 0,
1030 vertical => 1, 1043 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1045 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1046 $self->{vpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1048 },
1035 ; 1049 ;
1036 1050
1037 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1039 can_events => 1, 1054 can_events => 1,
1040 slider => $slider, 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
1041 %arg, 1059 %arg,
1042 ); 1060 );
1043 1061
1062 $self->{vp} = new CFPlus::UI::ViewPort
1063 c_col => 0,
1064 c_row => 0,
1065 expand => 1,
1066 scroll_x => $self->{scroll_x},
1067 scroll_y => $self->{scroll_y},
1068 on_changed => sub {
1069 my ($vp, $x, $y) = @_;
1070
1071 $vp->{parent}{hslider}->set_value ($x);
1072 $vp->{parent}{vslider}->set_value ($y);
1073
1074 0
1075 },
1076 on_size_allocate => sub {
1077 my ($vp, $w, $h) = @_;
1078 $vp->{parent}->update_slider;
1079 0
1080 },
1081 ;
1082
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add ($self->{vp});
1084
1045 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
1046 1086
1047 $self 1087 $self
1048} 1088}
1049
1050#TODO# update range on size_allocate depending on child
1051 1089
1052sub add { 1090sub add {
1053 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1054 1092
1055 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1056} 1094}
1057 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
1100sub update_slider {
1101 my ($self) = @_;
1102
1103 my $child = ($self->{vp} or return)->child;
1104
1105 if ($self->{scroll_x}) {
1106 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1107 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1108
1109 my $visible = $w1 > $w2;
1110 if ($visible != $self->{hslider_visible}) {
1111 $self->{hslider_visible} = $visible;
1112 $visible ? $self->SUPER::add ($self->{hslider})
1113 : $self->SUPER::remove ($self->{hslider});
1114 }
1115 }
1116
1117 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider_visible}) {
1123 $self->{vslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{vslider})
1125 : $self->SUPER::remove ($self->{vslider});
1126 }
1127 }
1128}
1129
1130sub start_dragging {
1131 my ($self, $ev) = @_;
1132
1133 $self->grab_focus;
1134
1135 my $ox = $self->{vp}{view_x};
1136 my $oy = $self->{vp}{view_y};
1137
1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
1140
1141 $ox -= $ev->{xrel};
1142 $oy -= $ev->{yrel};
1143
1144 $self->{vp}->set_offset ($ox, $oy);
1145 };
1146}
1147
1058sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1060 1150
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1151 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1153
1065 1 1154 1
1066} 1155}
1067 1156
1068sub update_slider { 1157sub invoke_button_down {
1069 my ($self) = @_; 1158 my ($self, $ev, $x, $y) = @_;
1070 1159
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1160 if ($ev->{button} == 2) {
1072} 1161 $self->start_dragging ($ev);
1162 return 1;
1163 }
1073 1164
1074sub update { 1165 0
1075 my ($self) = @_; 1166}
1076 1167
1077 $self->SUPER::update; 1168sub invoke_button_up {
1169 my ($self, $ev, $x, $y) = @_;
1078 1170
1079 $self->update_slider; 1171 if (delete $self->{motion}) {
1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_mouse_motion {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if ($self->{motion}) {
1182 $self->{motion}->($ev, $x, $y);
1183 return 1;
1184 }
1185
1186 0
1080} 1187}
1081 1188
1082sub invoke_size_allocate { 1189sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1084 1191
1085 $self->update_slider; 1192 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1193 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1194}
1089 1195
1090############################################################################# 1196#############################################################################
1091 1197
1092package CFClient::UI::Frame; 1198package CFPlus::UI::Frame;
1093 1199
1094our @ISA = CFClient::UI::Bin::; 1200our @ISA = CFPlus::UI::Bin::;
1095 1201
1096use CFClient::OpenGL; 1202use CFPlus::OpenGL;
1097 1203
1098sub new { 1204sub new {
1099 my $class = shift; 1205 my $class = shift;
1100 1206
1101 $class->SUPER::new ( 1207 $class->SUPER::new (
… …
1111 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1112 1218
1113 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1115 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1116
1117 glBegin GL_QUADS;
1118 glVertex 0 , 0;
1119 glVertex 0 , $h;
1120 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1121 glVertex $w, 0;
1122 glEnd;
1123
1124 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1125 } 1224 }
1126 1225
1127 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1128} 1227}
1129 1228
1130############################################################################# 1229#############################################################################
1131 1230
1132package CFClient::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1133 1232
1134our @ISA = CFClient::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1135 1234
1136use CFClient::OpenGL; 1235use CFPlus::OpenGL;
1236
1237sub new {
1238 my ($class, %arg) = @_;
1239
1240 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label
1242 align => 1,
1243 valign => 0,
1244 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75;
1246 }
1247
1248 my $self = $class->SUPER::new (
1249 # label => "",
1250 fg => [0.6, 0.3, 0.1],
1251 border => 0.8,
1252 style => 'single',
1253 %arg,
1254 );
1255
1256 $self
1257}
1258
1259sub add {
1260 my ($self, @widgets) = @_;
1261
1262 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1264}
1265
1266sub border {
1267 int $_[0]{border} * $::FONTSIZE
1268}
1269
1270sub size_request {
1271 my ($self) = @_;
1272
1273 ($self->{label_w}, undef) = $self->{label}->size_request
1274 if $self->{label};
1275
1276 my ($w, $h) = $self->SUPER::size_request;
1277
1278 (
1279 $w + $self->border * 2,
1280 $h + $self->border * 2,
1281 )
1282}
1283
1284sub invoke_size_allocate {
1285 my ($self, $w, $h) = @_;
1286
1287 my $border = $self->border;
1288
1289 $w -= List::Util::max 0, $border * 2;
1290 $h -= List::Util::max 0, $border * 2;
1291
1292 if (my $label = $self->{label}) {
1293 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1294 $label->{h} = List::Util::min $h, $border;
1295 $label->invoke_size_allocate ($label->{w}, $label->{h});
1296 }
1297
1298 $self->child->configure ($border, $border, $w, $h);
1299
1300 1
1301}
1302
1303sub _draw {
1304 my ($self) = @_;
1305
1306 my $child = $self->{children}[0];
1307
1308 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h});
1310
1311 $child->draw;
1312
1313 glColor @{$self->{fg}};
1314 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1319 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1321 glEnd;
1322
1323 if ($self->{label}) {
1324 glTranslate $border * 2, 0;
1325 $self->{label}->_draw;
1326 }
1327}
1328
1329#############################################################################
1330
1331package CFPlus::UI::Toplevel;
1332
1333our @ISA = CFPlus::UI::Bin::;
1334
1335use CFPlus::OpenGL;
1137 1336
1138my $bg = 1337my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1339 mipmap => 1, wrap => 1;
1141 1340
1142my @border = 1341my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1145 1348
1146sub new { 1349sub new {
1147 my ($class, %arg) = @_; 1350 my ($class, %arg) = @_;
1148 1351
1149 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1357 min_w => 64,
1155 min_h => 32, 1358 min_h => 32,
1156 %arg, 1359 %arg,
1157 ); 1360 );
1158 1361
1159 $self->{title_widget} = new CFClient::UI::Label 1362 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1363 align => 0,
1161 valign => 1, 1364 valign => 1,
1162 text => $self->{title}, 1365 text => $self->{title},
1163 fontsize => $self->{border}, 1366 fontsize => $self->{border},
1164 if exists $self->{title}; 1367 if exists $self->{title};
1165 1368
1166 if ($self->{has_close_button}) { 1369 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1370 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1371 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1372 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1373 on_activate => sub { $self->emit ("delete") };
1171 1374
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1375 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1376 }
1174 1377
1175 $self 1378 $self
1176} 1379}
1177 1380
1178sub add { 1381sub add {
1179 my ($self, @widgets) = @_; 1382 my ($self, @widgets) = @_;
1180 1383
1181 $self->SUPER::add (@widgets); 1384 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1385 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1386 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1387}
1185 1388
1186sub border { 1389sub border {
1187 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1391}
1392
1393sub get_max_wh {
1394 my ($self) = @_;
1395
1396 return ($self->{w}, $self->{h})
1397 if $self->{visible} && $self->{w};
1398
1399 $self->SUPER::get_max_wh
1188} 1400}
1189 1401
1190sub size_request { 1402sub size_request {
1191 my ($self) = @_; 1403 my ($self) = @_;
1192 1404
… …
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319 1531
1320 my $border = $self->border; 1532 my $border = $self->border;
1321 1533
1322 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1323 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327 1553
1328 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1330 1556
1331 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1350 if $self->{close_button}; 1576 if $self->{close_button};
1351} 1577}
1352 1578
1353############################################################################# 1579#############################################################################
1354 1580
1355package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1356 1582
1357our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1358 1584
1359use List::Util qw(max sum); 1585use List::Util qw(max sum);
1360 1586
1361use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1362 1588
1363sub new { 1589sub new {
1364 my $class = shift; 1590 my $class = shift;
1365 1591
1366 $class->SUPER::new ( 1592 $class->SUPER::new (
1367 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1368 @_, 1595 @_,
1369 ) 1596 )
1370} 1597}
1371 1598
1372sub children {
1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374}
1375
1376sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1377 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1378 1614
1379 while (@_) { 1615 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1381 $child->set_parent ($self);
1382 $self->{children}[$y][$x] = $child;
1383 }
1384 1617
1385 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1386 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1387 $self->realloc;
1388}
1389 1620
1390sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1391 my ($self, $child) = @_; 1628 my ($self) = @_;
1392 1629
1393 # TODO: not yet implemented 1630 my (@w, @h);
1394}
1395
1396# TODO: move to container class maybe? send children a signal on removal?
1397sub clear {
1398 my ($self) = @_;
1399 1631
1400 my @children = $self->children; 1632 my @children = $self->children;
1401 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1402 1643 }
1403 for (@children) {
1404 delete $_->{parent};
1405 $_->hide;
1406 }
1407 1644
1408 $self->realloc; 1645 # second pass, rows
1409} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1410
1411sub get_wh {
1412 my ($self) = @_;
1413
1414 my (@w, @h);
1415
1416 for my $y (0 .. $#{$self->{children}}) {
1417 my $row = $self->{children}[$y]
1418 or next;
1419
1420 for my $x (0 .. $#$row) {
1421 my $widget = $row->[$x]
1422 or next;
1423 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1424 1648
1425 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1426 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427 } 1653 }
1428 } 1654 }
1429 1655
1430 (\@w, \@h) 1656 (\@w, \@h)
1431} 1657}
… …
1447 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1448 1674
1449 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1451 1677
1452 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1453 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1456 1682
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1684
1461 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1462 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1463 1694
1464 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465 1697
1466 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1467 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1468 or next;
1469 1700
1470 my $x = 0; 1701 $widget->configure (
1471 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472 1704 );
1473 for my $c (0 .. $#$row) { 1705 }
1474 my $col_w = $ws->[$c];
1475 1706
1476 if (my $widget = $row->[$c]) { 1707 1
1477 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1478 }
1479 1709
1480 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1481 } 1737 }
1738 }
1482 1739
1483 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1484 } 1771 }
1485 1772
1486 1 1773 1
1487} 1774}
1488 1775
1489sub find_widget {
1490 my ($self, $x, $y) = @_;
1491
1492 $x -= $self->{x};
1493 $y -= $self->{y};
1494
1495 my $res;
1496
1497 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498 $res = $_->find_widget ($x, $y)
1499 and return $res;
1500 }
1501
1502 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503}
1504
1505sub _draw {
1506 my ($self) = @_;
1507
1508 for (grep $_, @{$self->{children}}) {
1509 $_->draw for grep $_, @$_;
1510 }
1511}
1512
1513############################################################################# 1776#############################################################################
1514 1777
1515package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1516 1779
1517our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1518 1781
1519sub size_request { 1782sub size_request {
1520 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1521 1786
1522 $self->{vertical} 1787 $self->{vertical}
1523 ? ( 1788 ? (
1524 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1525 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1526 ) 1791 )
1527 : ( 1792 : (
1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1529 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1530 ) 1795 )
1531} 1796}
1532 1797
1533sub invoke_size_allocate { 1798sub invoke_size_allocate {
1534 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1555 $req[$_] += $space * $children[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1556 for 0 .. $#children; 1821 for 0 .. $#children;
1557 } 1822 }
1558 } 1823 }
1559 1824
1560 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1561 1826
1562 my $pos = 0; 1827 my $pos = 0;
1563 for (0 .. $#children) { 1828 for (0 .. $#children) {
1564 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1570 1 1835 1
1571} 1836}
1572 1837
1573############################################################################# 1838#############################################################################
1574 1839
1575package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1576 1841
1577our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1578 1843
1579sub new { 1844sub new {
1580 my $class = shift; 1845 my $class = shift;
1581 1846
1582 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1585 ) 1850 )
1586} 1851}
1587 1852
1588############################################################################# 1853#############################################################################
1589 1854
1590package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1591 1856
1592our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1593 1858
1594sub new { 1859sub new {
1595 my $class = shift; 1860 my $class = shift;
1596 1861
1597 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1600 ) 1865 )
1601} 1866}
1602 1867
1603############################################################################# 1868#############################################################################
1604 1869
1605package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1606 1871
1607our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1608 1873
1609use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1610 1875
1611sub new { 1876sub new {
1612 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1613 1878
1614 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1617 #active_bg => none 1882 #active_bg => none
1618 #font => default_font 1883 #font => default_font
1619 #text => initial text 1884 #text => initial text
1620 #markup => initial narkup 1885 #markup => initial narkup
1621 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1622 ellipsise => 3, # end 1888 ellipsise => 3, # end
1623 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1890 fontsize => 1,
1625 align => -1, 1891 align => -1,
1626 valign => -1, 1892 valign => -1,
1627 padding_x => 2, 1893 padding_x => 2,
1628 padding_y => 2, 1894 padding_y => 2,
1629 can_events => 0, 1895 can_events => 0,
1630 %arg 1896 %arg
1631 ); 1897 );
1632 1898
1633 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1634 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1635 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1636 $self->{template} = $layout; 1902 $self->{template} = $layout;
1637 } 1903 }
1638 1904
1639 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1657 1923
1658 delete $self->{ox}; 1924 delete $self->{ox};
1659 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1660} 1926}
1661 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1662sub set_text { 1934sub set_text {
1663 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1664 1936
1665 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1666 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
1689 1961
1690sub size_request { 1962sub size_request {
1691 my ($self) = @_; 1963 my ($self) = @_;
1692 1964
1693 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1694 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1695 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1696 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1699 1973
1700 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
… …
1772 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1773 2047
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777 }; 2053 };
1778 2054
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2055# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1781 2057# CFPlus::OpenGL::glNewList $self->{list};
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2059# CFPlus::OpenGL::glEndList;
2060# }
2061#
2062# CFPlus::OpenGL::glCallList $self->{list};
2063
2064 $self->{layout}->draw;
1783} 2065}
2066
2067#sub destroy {
2068# my ($self) = @_;
2069#
2070# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2071#
2072# $self->SUPER::destroy;
2073#}
1784 2074
1785############################################################################# 2075#############################################################################
1786 2076
1787package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1788 2078
1789our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1790 2080
1791use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1792 2082
1793sub new { 2083sub new {
1794 my $class = shift; 2084 my $class = shift;
1795 2085
1796 $class->SUPER::new ( 2086 $class->SUPER::new (
1797 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1798 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1799 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1800 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1801 can_hover => 1, 2093 can_hover => 1,
1802 can_focus => 1, 2094 can_focus => 1,
1803 valign => 0, 2095 valign => 0,
1804 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1805 #text => ... 2098 #text => ...
1806 #hidden => "*", 2099 #hidden => "*",
1807 @_ 2100 @_
1808 ) 2101 )
1809} 2102}
… …
1854 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1856 2149
1857 my $text = $self->get_text; 2150 my $text = $self->get_text;
1858 2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153
1859 if ($uni == 8) { 2154 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFClient::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
2174 } elsif ($uni == 21) { # ctrl-u
2175 $text = "";
1868 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1869 } elsif ($sym == CFClient::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2178 $self->emit ('escape');
1873 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2183 } else {
1876 return 0; 2184 return 0;
1877 } 2185 }
1878 2186
1879 $self->_set_text ($text); 2187 $self->_set_text ($text);
1880 2188
1881 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1882 2191
1883 1 2192 1
1884} 2193}
1885 2194
1886sub invoke_focus_in { 2195sub invoke_focus_in {
… …
1928 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
1929 } 2238 }
1930 2239
1931 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1933 glBegin GL_QUADS;
1934 glVertex 0 , 0;
1935 glVertex 0 , $self->{h};
1936 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
1937 glVertex $self->{w}, 0;
1938 glEnd;
1939 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
1940 2244
1941 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
1942 2246
1943 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
1945 2249
1946 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
1947 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
1948 utf8::encode $text; 2252 utf8::encode $text;
1949 2253
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951 } 2255 }
1952 2256
1953 glColor @{$self->{fg}}; 2257 glColor_premultiply @{$self->{active_fg}};
1954 glBegin GL_LINES; 2258 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2261 glEnd;
1958 }
1959}
1960 2262
2263 glLineWidth 3;
2264 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5;
2275 glEnd;
2276 }
2277}
2278
2279#############################################################################
2280
1961package CFClient::UI::Entry; 2281package CFPlus::UI::Entry;
1962 2282
1963our @ISA = CFClient::UI::EntryBase::; 2283our @ISA = CFPlus::UI::EntryBase::;
1964 2284
1965use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1966 2286
1967sub invoke_key_down { 2287sub invoke_key_down {
1968 my ($self, $ev) = @_; 2288 my ($self, $ev) = @_;
1969 2289
1970 my $sym = $ev->{sym}; 2290 my $sym = $ev->{sym};
1971 2291
1972 if ($sym == 13) { 2292 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2293 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2294 my $txt = $self->get_text;
1975 2295
1976 $self->{history_pointer} = -1; 2296 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2297 $self->{history_saveback} = '';
1978 $self->emit (activate => $txt); 2298 $self->emit (activate => $txt);
1979 $self->update; 2299 $self->update;
1980 2300
1981 } elsif ($sym == CFClient::SDLK_UP) { 2301 } elsif ($sym == CFPlus::SDLK_UP) {
1982 if ($self->{history_pointer} < 0) { 2302 if ($self->{history_pointer} < 0) {
1983 $self->{history_saveback} = $self->get_text; 2303 $self->{history_saveback} = $self->get_text;
1984 } 2304 }
1985 if (@{$self->{history} || []} > 0) { 2305 if (@{$self->{history} || []} > 0) {
1986 $self->{history_pointer}++; 2306 $self->{history_pointer}++;
… …
1988 $self->{history_pointer} = @{$self->{history} || []} - 1; 2308 $self->{history_pointer} = @{$self->{history} || []} - 1;
1989 } 2309 }
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1991 } 2311 }
1992 2312
1993 } elsif ($sym == CFClient::SDLK_DOWN) { 2313 } elsif ($sym == CFPlus::SDLK_DOWN) {
1994 $self->{history_pointer}--; 2314 $self->{history_pointer}--;
1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2315 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996 2316
1997 if ($self->{history_pointer} >= 0) { 2317 if ($self->{history_pointer} >= 0) {
1998 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2318 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2007 1 2327 1
2008} 2328}
2009 2329
2010############################################################################# 2330#############################################################################
2011 2331
2332package CFPlus::UI::TextEdit;
2333
2334our @ISA = CFPlus::UI::EntryBase::;
2335
2336use CFPlus::OpenGL;
2337
2338sub move_cursor_ver {
2339 my ($self, $dy) = @_;
2340
2341 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2342
2343 $y += $dy;
2344
2345 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2346 $self->{cursor} = $index;
2347 delete $self->{cur_h};
2348 $self->update;
2349 return;
2350 }
2351}
2352
2353sub invoke_key_down {
2354 my ($self, $ev) = @_;
2355
2356 my $sym = $ev->{sym};
2357
2358 if ($sym == CFPlus::SDLK_UP) {
2359 $self->move_cursor_ver (-1);
2360 } elsif ($sym == CFPlus::SDLK_DOWN) {
2361 $self->move_cursor_ver (+1);
2362 } else {
2363 return $self->SUPER::invoke_key_down ($ev)
2364 }
2365
2366 1
2367}
2368
2369#############################################################################
2370
2012package CFClient::UI::Button; 2371package CFPlus::UI::ButtonBin;
2013 2372
2014our @ISA = CFClient::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
2015 2374
2016use CFClient::OpenGL; 2375use CFPlus::OpenGL;
2017 2376
2018my @tex = 2377my @tex =
2019 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
2021 2380
2022sub new { 2381sub new {
2023 my $class = shift; 2382 my $class = shift;
2024 2383
2025 $class->SUPER::new ( 2384 $class->SUPER::new (
2026 padding_x => 4,
2027 padding_y => 4,
2028 fg => [1, 1, 1],
2029 active_fg => [0, 0, 1],
2030 can_hover => 1, 2385 can_hover => 1,
2031 align => 0, 2386 align => 0,
2032 valign => 0, 2387 valign => 0,
2033 can_events => 1, 2388 can_events => 1,
2034 @_ 2389 @_
… …
2046} 2401}
2047 2402
2048sub _draw { 2403sub _draw {
2049 my ($self) = @_; 2404 my ($self) = @_;
2050 2405
2051 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2052
2053 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
2056 2409
2410 my $tex = $tex[$GRAB == $self];
2057 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058 2412
2059 glDisable GL_TEXTURE_2D; 2413 glDisable GL_TEXTURE_2D;
2060 2414
2061 $self->SUPER::_draw; 2415 $self->SUPER::_draw;
2062} 2416}
2063 2417
2064############################################################################# 2418#############################################################################
2065 2419
2066package CFClient::UI::CheckBox; 2420package CFPlus::UI::Button;
2067 2421
2068our @ISA = CFClient::UI::DrawBG::; 2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
2069 2425
2070my @tex = 2426my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2427 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2434 padding_x => 4,
2435 padding_y => 4,
2436 fg => [1.0, 1.0, 1.0],
2437 active_fg => [0.8, 0.8, 0.8],
2438 can_hover => 1,
2439 align => 0,
2440 valign => 0,
2441 can_events => 1,
2442 @_
2443 )
2444}
2445
2446sub invoke_button_up {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 $self->emit ("activate")
2450 if $x >= 0 && $x < $self->{w}
2451 && $y >= 0 && $y < $self->{h};
2452
2453 1
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2460
2461 glEnable GL_TEXTURE_2D;
2462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2463 glColor 0, 0, 0, 1;
2464
2465 my $tex = $tex[$GRAB == $self];
2466 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2467
2468 glDisable GL_TEXTURE_2D;
2469
2470 $self->SUPER::_draw;
2471}
2472
2473#############################################################################
2474
2475package CFPlus::UI::CheckBox;
2476
2477our @ISA = CFPlus::UI::DrawBG::;
2478
2479my @tex =
2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2481 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073 2482
2074use CFClient::OpenGL; 2483use CFPlus::OpenGL;
2075 2484
2076sub new { 2485sub new {
2077 my $class = shift; 2486 my $class = shift;
2078 2487
2079 $class->SUPER::new ( 2488 $class->SUPER::new (
… …
2119sub _draw { 2528sub _draw {
2120 my ($self) = @_; 2529 my ($self) = @_;
2121 2530
2122 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2123 2532
2124 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2125 2534
2126 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2127 2536
2128 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2537 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2129 2538
… …
2136 glDisable GL_TEXTURE_2D; 2545 glDisable GL_TEXTURE_2D;
2137} 2546}
2138 2547
2139############################################################################# 2548#############################################################################
2140 2549
2141package CFClient::UI::Image; 2550package CFPlus::UI::Image;
2142 2551
2143our @ISA = CFClient::UI::Base::; 2552our @ISA = CFPlus::UI::Base::;
2144 2553
2145use CFClient::OpenGL; 2554use CFPlus::OpenGL;
2146 2555
2147our %texture_cache; 2556our %texture_cache;
2148 2557
2149sub new { 2558sub new {
2150 my $class = shift; 2559 my $class = shift;
2151 2560
2152 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2153 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2154 @_, 2564 @_,
2155 ); 2565 );
2156 2566
2157 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
2159 2569
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2570 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2571 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2572
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2573 CFPlus::weaken $texture_cache{$self->{path}};
2164 2574
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2575 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2576
2167 $self 2577 $self
2168} 2578}
2169 2579
2170sub STORABLE_freeze { 2580sub STORABLE_freeze {
2171 my ($self, $cloning) = @_; 2581 my ($self, $cloning) = @_;
2172 2582
2173 $self->{path} 2583 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2584 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175 2585
2176 $self->{path} 2586 $self->{path}
2177} 2587}
2178 2588
2179sub STORABLE_attach { 2589sub STORABLE_attach {
… …
2183} 2593}
2184 2594
2185sub size_request { 2595sub size_request {
2186 my ($self) = @_; 2596 my ($self) = @_;
2187 2597
2188 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2189} 2599}
2190 2600
2191sub _draw { 2601sub _draw {
2192 my ($self) = @_; 2602 my ($self) = @_;
2193 2603
… …
2203 } 2613 }
2204 2614
2205 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 2617
2208 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2209 2619
2210 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2211} 2621}
2212 2622
2213############################################################################# 2623#############################################################################
2214 2624
2215package CFClient::UI::ImageButton; 2625package CFPlus::UI::ImageButton;
2216 2626
2217our @ISA = CFClient::UI::Image::; 2627our @ISA = CFPlus::UI::Image::;
2218 2628
2219use CFClient::OpenGL; 2629use CFPlus::OpenGL;
2220 2630
2221my %textures; 2631my %textures;
2222 2632
2223sub new { 2633sub new {
2224 my $class = shift; 2634 my $class = shift;
… …
2234 can_events => 1, 2644 can_events => 1,
2235 @_ 2645 @_
2236 ); 2646 );
2237} 2647}
2238 2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2653}
2654
2239sub invoke_button_up { 2655sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2241 2657
2242 $self->emit ("activate") 2658 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w} 2659 if $x >= 0 && $x < $self->{w}
… …
2246 1 2662 1
2247} 2663}
2248 2664
2249############################################################################# 2665#############################################################################
2250 2666
2251package CFClient::UI::VGauge; 2667package CFPlus::UI::VGauge;
2252 2668
2253our @ISA = CFClient::UI::Base::; 2669our @ISA = CFPlus::UI::Base::;
2254 2670
2255use List::Util qw(min max); 2671use List::Util qw(min max);
2256 2672
2257use CFClient::OpenGL; 2673use CFPlus::OpenGL;
2258 2674
2259my %tex = ( 2675my %tex = (
2260 food => [ 2676 food => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2677 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2678 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263 ], 2679 ],
2264 grace => [ 2680 grace => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2681 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2682 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267 ], 2683 ],
2268 hp => [ 2684 hp => [
2269 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2685 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2686 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271 ], 2687 ],
2272 mana => [ 2688 mana => [
2273 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2689 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2690 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275 ], 2691 ],
2276); 2692);
2277 2693
2278# eg. VGauge->new (gauge => 'food'), default gauge: food 2694# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2381 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2382} 2798}
2383 2799
2384############################################################################# 2800#############################################################################
2385 2801
2802package CFPlus::UI::Progress;
2803
2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
2807
2808sub new {
2809 my ($class, %arg) = @_;
2810
2811 my $self = $class->SUPER::new (
2812 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9,
2817 valign => 0,
2818 align => 0,
2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
2822 %arg,
2823 );
2824
2825 $self->set_value ($arg{value} || -1);
2826
2827 $self
2828}
2829
2830sub set_label {
2831 my ($self, $label) = @_;
2832
2833 return if $self->{label} eq $label;
2834 $self->{label} = $label;
2835
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2837}
2838
2839sub set_value {
2840 my ($self, $value) = @_;
2841
2842 if ($self->{value} ne $value) {
2843 $self->{value} = $value;
2844
2845 if ($value < 0) {
2846 $self->set_text ("-");
2847 } else {
2848 $self->set_text (sprintf $self->{label}, $value * 100);
2849 }
2850
2851 $self->update;
2852 }
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860
2861 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2863
2864 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2;
2866 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2868 }
2869
2870 glColor_premultiply @{$self->{outline}};
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2872
2873 glDisable GL_BLEND;
2874
2875 {
2876 local $self->{bg}; # do not draw background
2877 $self->SUPER::_draw;
2878 }
2879}
2880
2881#############################################################################
2882
2883package CFPlus::UI::ExperienceProgress;
2884
2885our @ISA = CFPlus::UI::Progress::;
2886
2887sub new {
2888 my ($class, %arg) = @_;
2889
2890 my $self = $class->SUPER::new (
2891 tooltip => sub {
2892 my ($self) = @_;
2893
2894 sprintf "level %d\n%s points\n%s next level\n%s to go",
2895 $self->{lvl},
2896 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}),
2899 },
2900 %arg
2901 );
2902
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN;
2905
2906 $self
2907}
2908
2909sub DESTROY {
2910 my ($self) = @_;
2911
2912 delete $::CONN->{on_exp_update}{$self+0}
2913 if $::CONN;
2914
2915 $self->SUPER::DESTROY;
2916}
2917
2918sub set_value {
2919 my ($self, $lvl, $exp) = @_;
2920
2921 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp;
2923
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v);
2936}
2937
2938#############################################################################
2939
2386package CFClient::UI::Gauge; 2940package CFPlus::UI::Gauge;
2387 2941
2388our @ISA = CFClient::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2389 2943
2390sub new { 2944sub new {
2391 my ($class, %arg) = @_; 2945 my ($class, %arg) = @_;
2392 2946
2393 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2395 can_hover => 1, 2949 can_hover => 1,
2396 can_events => 1, 2950 can_events => 1,
2397 %arg, 2951 %arg,
2398 ); 2952 );
2399 2953
2400 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2954 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2955 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2956 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403 2957
2404 $self 2958 $self
2405} 2959}
2406 2960
2407sub set_fontsize { 2961sub set_fontsize {
… …
2428 $self->{value}->set_text ($val); 2982 $self->{value}->set_text ($val);
2429} 2983}
2430 2984
2431############################################################################# 2985#############################################################################
2432 2986
2433package CFClient::UI::Slider; 2987package CFPlus::UI::Slider;
2434 2988
2435use strict; 2989use strict;
2436 2990
2437use CFClient::OpenGL; 2991use CFPlus::OpenGL;
2438 2992
2439our @ISA = CFClient::UI::DrawBG::; 2993our @ISA = CFPlus::UI::DrawBG::;
2440 2994
2441my @tex = 2995my @tex =
2442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2996 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443 qw(s1_slider.png s1_slider_bg.png); 2997 qw(s1_slider.png s1_slider_bg.png);
2444 2998
2445sub new { 2999sub new {
2446 my $class = shift; 3000 my $class = shift;
2447 3001
… …
2515 3069
2516 $self->SUPER::invoke_button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2517 3071
2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2519 3073
2520 $self->invoke_mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
3075
3076 1
2521} 3077}
2522 3078
2523sub invoke_mouse_motion { 3079sub invoke_mouse_motion {
2524 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2525 3081
… …
2541sub invoke_mouse_wheel { 3097sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 3098 my ($self, $ev) = @_;
2543 3099
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3100 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 3101
3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3103
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 3105
2548 ! ! $delta 3106 1
2549} 3107}
2550 3108
2551sub update { 3109sub update {
2552 my ($self) = @_; 3110 my ($self) = @_;
2553 3111
… …
2602 glDisable GL_TEXTURE_2D; 3160 glDisable GL_TEXTURE_2D;
2603} 3161}
2604 3162
2605############################################################################# 3163#############################################################################
2606 3164
2607package CFClient::UI::ValSlider; 3165package CFPlus::UI::ValSlider;
2608 3166
2609our @ISA = CFClient::UI::HBox::; 3167our @ISA = CFPlus::UI::HBox::;
2610 3168
2611sub new { 3169sub new {
2612 my ($class, %arg) = @_; 3170 my ($class, %arg) = @_;
2613 3171
2614 my $range = delete $arg{range}; 3172 my $range = delete $arg{range};
2615 3173
2616 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
2617 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3175 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3176 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619 to_value => sub { shift }, 3177 to_value => sub { shift },
2620 from_value => sub { shift }, 3178 from_value => sub { shift },
2621 %arg, 3179 %arg,
2622 ); 3180 );
2623 3181
… …
2643sub set_range { shift->{slider}->set_range (@_) } 3201sub set_range { shift->{slider}->set_range (@_) }
2644sub set_value { shift->{slider}->set_value (@_) } 3202sub set_value { shift->{slider}->set_value (@_) }
2645 3203
2646############################################################################# 3204#############################################################################
2647 3205
2648package CFClient::UI::TextScroller; 3206package CFPlus::UI::TextScroller;
2649 3207
2650our @ISA = CFClient::UI::HBox::; 3208our @ISA = CFPlus::UI::HBox::;
2651 3209
2652use CFClient::OpenGL; 3210use CFPlus::OpenGL;
2653 3211
2654sub new { 3212sub new {
2655 my $class = shift; 3213 my $class = shift;
2656 3214
2657 my $self = $class->SUPER::new ( 3215 my $self = $class->SUPER::new (
… …
2659 can_events => 1, 3217 can_events => 1,
2660 indent => 0, 3218 indent => 0,
2661 #font => default_font 3219 #font => default_font
2662 @_, 3220 @_,
2663 3221
2664 layout => (new CFClient::Layout), 3222 layout => (new CFPlus::Layout),
2665 par => [], 3223 par => [],
3224 max_par => 0,
2666 height => 0, 3225 height => 0,
2667 children => [ 3226 children => [
2668 (new CFClient::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
2669 (new CFClient::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
2670 ], 3229 ],
2671 ); 3230 );
2672 3231
2673 $self->{children}[1]->connect (changed => sub { $self->update }); 3232 $self->{children}[1]->connect (changed => sub { $self->update });
2674 3233
… …
2683} 3242}
2684 3243
2685sub size_request { 3244sub size_request {
2686 my ($self) = @_; 3245 my ($self) = @_;
2687 3246
2688 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
2689 3248
2690 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request 3250 $self->SUPER::size_request
2692} 3251}
2693 3252
… …
2749sub set_offset { 3308sub set_offset {
2750 my ($self, $offset) = @_; 3309 my ($self, $offset) = @_;
2751 3310
2752 # todo: base offset on lines or so, not on pixels 3311 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 3312 $self->{children}[1]->set_value ($offset);
3313}
3314
3315sub current_paragraph {
3316 my ($self) = @_;
3317
3318 $self->{top_paragraph} - 1
3319}
3320
3321sub scroll_to {
3322 my ($self, $para) = @_;
3323
3324 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3325
3326 $self->{scroll_to} = $para;
3327 $self->update;
2754} 3328}
2755 3329
2756sub clear { 3330sub clear {
2757 my ($self) = @_; 3331 my ($self) = @_;
2758 3332
… …
2780 3354
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3355 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3356 push @{$self->{par}}, $para;
2783 } 3357 }
2784 3358
3359 if (my $max = $self->{max_par}) {
3360 shift @{$self->{par}} while @{$self->{par}} > $max;
3361 }
3362
2785 $self->{need_reflow}++; 3363 $self->{need_reflow}++;
2786 $self->update; 3364 $self->update;
2787} 3365}
2788 3366
2789sub scroll_to_bottom { 3367sub scroll_to_bottom {
2790 my ($self) = @_; 3368 my ($self) = @_;
2791 3369
2792 $self->{scroll_to_bottom} = 1; 3370 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3371 $self->update;
2794} 3372}
2795 3373
3374sub force_uptodate {
3375 my ($self) = @_;
3376
3377 if (delete $self->{need_reflow}) {
3378 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3379
3380 my $height = 0;
3381
3382 for my $para (@{$self->{par}}) {
3383 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3384 my $layout = $self->get_layout ($para);
3385 my ($w, $h) = $layout->size;
3386
3387 $para->{w} = $w + $para->{indent};
3388 $para->{h} = $h;
3389 $para->{wrapped} = $layout->has_wrapped;
3390 }
3391
3392 $para->{y} = $height;
3393 $height += $para->{h};
3394 }
3395
3396 $self->{height} = $height;
3397 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3398
3399 delete $self->{texture};
3400 }
3401
3402 if (my $paridx = delete $self->{scroll_to}) {
3403 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3404 }
3405}
3406
2796sub update { 3407sub update {
2797 my ($self) = @_; 3408 my ($self) = @_;
2798 3409
2799 $self->SUPER::update; 3410 $self->SUPER::update;
2800 3411
2801 return unless $self->{h} > 0; 3412 return unless $self->{h} > 0;
2802 3413
2803 delete $self->{texture}; 3414 delete $self->{texture};
2804 3415
2805 $ROOT->on_post_alloc ($self => sub { 3416 $ROOT->on_post_alloc ($self => sub {
3417 $self->force_uptodate;
3418
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3419 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807 3420
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3421 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3422 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3423 glClear GL_COLOR_BUFFER_BIT;
2838 3424
3425 package CFPlus::UI::Base;
3426 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3427 (0, 0, $self->{w}, $self->{h});
3428
3429 my $top = int $self->{children}[1]{range}[0];
3430
3431 my $paridx = 0;
3432 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3433 my $top = int $self->{children}[1]{range}[0];
2840 3434
2841 my $y0 = $top; 3435 my $y0 = $top;
2842 my $y1 = $top + $H; 3436 my $y1 = $top + $H;
2843 3437
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3438 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3439 my $h = $para->{h};
3440 my $y = $para->{y};
2848 3441
2849 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
2852 3444
2853 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
2854 3447
2855 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
2857 3450
2858 for (@w) { 3451 for (@w) {
… …
2864 $_->draw; 3457 $_->draw;
2865 } 3458 }
2866 } 3459 }
2867 } 3460 }
2868 3461
2869 $y += $h; 3462 $paridx++;
3463 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3464 }
3465
3466 $self->{top_paragraph} = $top_paragraph;
2871 }; 3467 };
2872 }); 3468 });
2873} 3469}
2874 3470
2875sub reconfigure { 3471sub reconfigure {
… …
2893 $self->{children}[1]->draw; 3489 $self->{children}[1]->draw;
2894} 3490}
2895 3491
2896############################################################################# 3492#############################################################################
2897 3493
2898package CFClient::UI::Animator; 3494package CFPlus::UI::Animator;
2899 3495
2900use CFClient::OpenGL; 3496use CFPlus::OpenGL;
2901 3497
2902our @ISA = CFClient::UI::Bin::; 3498our @ISA = CFPlus::UI::Bin::;
2903 3499
2904sub moveto { 3500sub moveto {
2905 my ($self, $x, $y) = @_; 3501 my ($self, $x, $y) = @_;
2906 3502
2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3503 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2935 glPopMatrix; 3531 glPopMatrix;
2936} 3532}
2937 3533
2938############################################################################# 3534#############################################################################
2939 3535
2940package CFClient::UI::Flopper; 3536package CFPlus::UI::Flopper;
2941 3537
2942our @ISA = CFClient::UI::Button::; 3538our @ISA = CFPlus::UI::Button::;
2943 3539
2944sub new { 3540sub new {
2945 my $class = shift; 3541 my $class = shift;
2946 3542
2947 my $self = $class->SUPER::new ( 3543 my $self = $class->SUPER::new (
… …
2959 $self->{other}->toggle_visibility; 3555 $self->{other}->toggle_visibility;
2960} 3556}
2961 3557
2962############################################################################# 3558#############################################################################
2963 3559
2964package CFClient::UI::Tooltip; 3560package CFPlus::UI::Tooltip;
2965 3561
2966our @ISA = CFClient::UI::Bin::; 3562our @ISA = CFPlus::UI::Bin::;
2967 3563
2968use CFClient::OpenGL; 3564use CFPlus::OpenGL;
2969 3565
2970sub new { 3566sub new {
2971 my $class = shift; 3567 my $class = shift;
2972 3568
2973 $class->SUPER::new ( 3569 $class->SUPER::new (
… …
2977} 3573}
2978 3574
2979sub set_tooltip_from { 3575sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
2981 3577
2982 my $tooltip = $widget->{tooltip}; 3578 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580
3581 $tip = CFPlus::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/;
2983 3583
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2987 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
2988 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
2989 } 3589 }
2990 3590
2991 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
2993 3593
2994 $self->add (new CFClient::UI::Label 3594 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3595 markup => $tip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3597 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3598 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3599 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3601 );
3002} 3602}
3003 3603
… …
3038} 3638}
3039 3639
3040sub _draw { 3640sub _draw {
3041 my ($self) = @_; 3641 my ($self) = @_;
3042 3642
3043 glTranslate 0.375, 0.375;
3044
3045 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3046 3644
3047 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3048 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3049 glVertex 0 , 0;
3050 glVertex 0 , $h;
3051 glVertex $w, $h;
3052 glVertex $w, 0;
3053 glEnd;
3054 3647
3055 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3056 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3057 glVertex 0 , 0;
3058 glVertex 0 , $h;
3059 glVertex $w, $h;
3060 glVertex $w, 0;
3061 glEnd;
3062 3650
3063 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3064 3652
3065 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3066} 3654}
3067 3655
3068############################################################################# 3656#############################################################################
3069 3657
3070package CFClient::UI::Face; 3658package CFPlus::UI::Face;
3071 3659
3072our @ISA = CFClient::UI::DrawBG::; 3660our @ISA = CFPlus::UI::DrawBG::;
3073 3661
3074use CFClient::OpenGL; 3662use CFPlus::OpenGL;
3075 3663
3076sub new { 3664sub new {
3077 my $class = shift; 3665 my $class = shift;
3078 3666
3079 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
3080 aspect => 1, 3670 aspect => 1,
3081 can_events => 0, 3671 can_events => 0,
3082 @_, 3672 @_,
3083 ); 3673 );
3084 3674
3085 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3087 3677
3088 $self->{timer} = Event->timer ( 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3090 hard => 1, 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3091 interval => $self->{animspeed}, 3681 return unless $::CONN;
3092 cb => sub { 3682
3683 my $w = $widget
3684 or return;
3685
3093 ++$widget->{frame}; 3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3094 $widget->update; 3690 $w->update;
3095 }, 3691 $w->update_timer;
3096 ); 3692 };
3693
3694 $self->update_face;
3695 $self->update_timer;
3097 } 3696 }
3098 3697
3099 $self 3698 $self
3100} 3699}
3101 3700
3701sub update_timer {
3702 my ($self) = @_;
3703
3704 return unless $self->{timer};
3705
3706 if ($self->{visible}) {
3707 $self->{timer}->set (
3708 $self->{anim_start}
3709 + $self->{animspeed}
3710 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3711 );
3712 $self->{timer}->start;
3713 } else {
3714 $self->{timer}->stop;
3715 }
3716}
3717
3718sub update_face {
3719 my ($self) = @_;
3720
3721 if ($::CONN) {
3722 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3723 if ($anim && @$anim) {
3724 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3725 delete $self->{face_change_cb};
3726
3727 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3728 unless ($tex->{name} || $tex->{loading}) {
3729 $tex->upload (sub { $self->reconfigure });
3730 }
3731 }
3732 }
3733 }
3734 }
3735}
3736
3102sub size_request { 3737sub size_request {
3103 (32, 8) 3738 my ($self) = @_;
3739
3740 if ($::CONN) {
3741 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3742 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3743 if ($tex->{name}) {
3744 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3745 } elsif (!$tex->{loading}) {
3746 $tex->upload (sub { $self->reconfigure });
3747 }
3748 }
3749
3750 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3751 }
3752 }
3753
3754 ($self->{size_w} || 8, $self->{size_h} || 8)
3104} 3755}
3105 3756
3106sub update { 3757sub update {
3107 my ($self) = @_; 3758 my ($self) = @_;
3108 3759
3109 return unless $self->{visible}; 3760 return unless $self->{visible};
3110 3761
3111 $self->SUPER::update; 3762 $self->SUPER::update;
3112} 3763}
3113 3764
3765sub invoke_visibility_change {
3766 my ($self) = @_;
3767
3768 $self->update_timer;
3769
3770 0
3771}
3772
3114sub _draw { 3773sub _draw {
3115 my ($self) = @_; 3774 my ($self) = @_;
3116 3775
3117 return unless $::CONN;
3118
3119 $self->SUPER::_draw; 3776 $self->SUPER::_draw;
3120 3777
3121 my $face; 3778 if (my $tex = $self->{tex}) {
3122
3123 if ($self->{frame}) {
3124 my $anim = $::CONN->{anim}[$self->{anim}];
3125
3126 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim;
3128 }
3129
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3131
3132 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3779 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3780 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3781 glColor 0, 0, 0, 1;
3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3782 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137 glDisable GL_TEXTURE_2D; 3783 glDisable GL_TEXTURE_2D;
… …
3139} 3785}
3140 3786
3141sub destroy { 3787sub destroy {
3142 my ($self) = @_; 3788 my ($self) = @_;
3143 3789
3144 $self->{timer}->cancel 3790 (delete $self->{timer})->cancel
3145 if $self->{timer}; 3791 if $self->{timer};
3146 3792
3147 $self->SUPER::destroy; 3793 $self->SUPER::destroy;
3148} 3794}
3149 3795
3150############################################################################# 3796#############################################################################
3151 3797
3152package CFClient::UI::Buttonbar; 3798package CFPlus::UI::Buttonbar;
3153 3799
3154our @ISA = CFClient::UI::HBox::; 3800our @ISA = CFPlus::UI::HBox::;
3155 3801
3156# TODO: should actualyl wrap buttons and other goodies. 3802# TODO: should actually wrap buttons and other goodies.
3157 3803
3158############################################################################# 3804#############################################################################
3159 3805
3160package CFClient::UI::Menu; 3806package CFPlus::UI::Menu;
3161 3807
3162our @ISA = CFClient::UI::FancyFrame::; 3808our @ISA = CFPlus::UI::Toplevel::;
3163 3809
3164use CFClient::OpenGL; 3810use CFPlus::OpenGL;
3165 3811
3166sub new { 3812sub new {
3167 my $class = shift; 3813 my $class = shift;
3168 3814
3169 my $self = $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
3170 items => [], 3816 items => [],
3171 z => 100, 3817 z => 100,
3172 @_, 3818 @_,
3173 ); 3819 );
3174 3820
3175 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3821 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176 3822
3177 for my $item (@{ $self->{items} }) { 3823 for my $item (@{ $self->{items} }) {
3178 my ($widget, $cb, $tooltip) = @$item; 3824 my ($widget, $cb, $tooltip) = @$item;
3179 3825
3180 # handle various types of items, only text for now 3826 # handle various types of items, only text for now
3181 if (!ref $widget) { 3827 if (!ref $widget) {
3182 if ($widget =~ /\t/) { 3828 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2; 3829 my ($left, $right) = split /\t/, $widget, 2;
3184 3830
3185 $widget = new CFClient::UI::HBox 3831 $widget = new CFPlus::UI::HBox
3186 can_hover => 1, 3832 can_hover => 1,
3187 can_events => 1, 3833 can_events => 1,
3188 tooltip => $tooltip, 3834 tooltip => $tooltip,
3189 children => [ 3835 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1), 3836 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1), 3837 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ], 3838 ],
3193 ; 3839 ;
3194 3840
3195 } else { 3841 } else {
3196 $widget = new CFClient::UI::Label 3842 $widget = new CFPlus::UI::Label
3197 can_hover => 1, 3843 can_hover => 1,
3198 can_events => 1, 3844 can_events => 1,
3199 markup => $widget, 3845 markup => $widget,
3200 tooltip => $tooltip; 3846 tooltip => $tooltip;
3201 } 3847 }
… …
3249 1 3895 1
3250} 3896}
3251 3897
3252############################################################################# 3898#############################################################################
3253 3899
3254package CFClient::UI::Multiplexer; 3900package CFPlus::UI::Multiplexer;
3255 3901
3256our @ISA = CFClient::UI::Container::; 3902our @ISA = CFPlus::UI::Container::;
3257 3903
3258sub new { 3904sub new {
3259 my $class = shift; 3905 my $class = shift;
3260 3906
3261 my $self = $class->SUPER::new ( 3907 my $self = $class->SUPER::new (
… …
3322 $self->{current}->draw; 3968 $self->{current}->draw;
3323} 3969}
3324 3970
3325############################################################################# 3971#############################################################################
3326 3972
3327package CFClient::UI::Notebook; 3973package CFPlus::UI::Notebook;
3328 3974
3975use CFPlus::OpenGL;
3976
3329our @ISA = CFClient::UI::VBox::; 3977our @ISA = CFPlus::UI::VBox::;
3330 3978
3331sub new { 3979sub new {
3332 my $class = shift; 3980 my $class = shift;
3333 3981
3334 my $self = $class->SUPER::new ( 3982 my $self = $class->SUPER::new (
3335 buttonbar => (new CFClient::UI::Buttonbar), 3983 buttonbar => (new CFPlus::UI::Buttonbar),
3336 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3984 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3985 active_outline => [.7, .7, 0.2],
3337 # filter => # will be put between multiplexer and $self 3986 # filter => # will be put between multiplexer and $self
3338 @_, 3987 @_,
3339 ); 3988 );
3340 3989
3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3990 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3342 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3991 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3343 3992
3993 {
3994 Scalar::Util::weaken (my $wself = $self);
3995
3996 $self->{multiplexer}->connect (c_add => sub {
3997 my ($mplex, $widgets) = @_;
3998
3999 for my $child (@$widgets) {
4000 Scalar::Util::weaken $child;
4001 $child->{c_tab_} ||= do {
4002 my $tab =
4003 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4004 ? $child->{c_tab}
4005 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4006
4007 $tab->connect (activate => sub {
4008 $wself->set_current_page ($child);
4009 });
4010
4011 $tab
4012 };
4013
4014 $self->{buttonbar}->add ($child->{c_tab_});
4015 }
4016 });
4017
4018 $self->{multiplexer}->connect (c_remove => sub {
4019 my ($mplex, $widgets) = @_;
4020
4021 for my $child (@$widgets) {
4022 $wself->{buttonbar}->remove ($child->{c_tab_});
4023 }
4024 });
4025 }
4026
3344 $self 4027 $self
3345} 4028}
3346 4029
3347sub add { 4030sub add {
4031 my ($self, @widgets) = @_;
4032
4033 $self->{multiplexer}->add (@widgets)
4034}
4035
4036sub remove {
4037 my ($self, @widgets) = @_;
4038
4039 $self->{multiplexer}->remove (@widgets)
4040}
4041
4042sub pages {
4043 my ($self) = @_;
4044 $self->{multiplexer}->children
4045}
4046
4047sub add_tab {
3348 my ($self, $title, $widget, $tooltip) = @_; 4048 my ($self, $title, $widget, $tooltip) = @_;
3349 4049
3350 Scalar::Util::weaken $self; 4050 $title = [$title, $tooltip] unless ref $title;
4051 $widget->{c_tab} = $title;
3351 4052
3352 $self->{buttonbar}->add (new CFClient::UI::Button
3353 markup => $title,
3354 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) },
3356 );
3357
3358 $self->{multiplexer}->add ($widget); 4053 $self->add ($widget);
3359} 4054}
3360 4055
3361sub get_current_page { 4056sub get_current_page {
3362 my ($self) = @_; 4057 my ($self) = @_;
3363 4058
… …
3369 4064
3370 $self->{multiplexer}->set_current_page ($page); 4065 $self->{multiplexer}->set_current_page ($page);
3371 $self->emit (page_changed => $self->{multiplexer}{current}); 4066 $self->emit (page_changed => $self->{multiplexer}{current});
3372} 4067}
3373 4068
4069sub _draw {
4070 my ($self) = @_;
4071
4072 $self->SUPER::_draw ();
4073
4074 if (my $cur = $self->{multiplexer}{current}) {
4075 if ($cur = $cur->{c_tab_}) {
4076 glTranslate $self->{buttonbar}{x} + $cur->{x},
4077 $self->{buttonbar}{y} + $cur->{y};
4078 glLineWidth 3;
4079 #glEnable GL_BLEND;
4080 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4081 glColor @{$self->{active_outline}};
4082 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4083 glLineWidth 1;
4084 #glDisable GL_BLEND;
4085 }
4086 }
4087}
4088
3374############################################################################# 4089#############################################################################
3375 4090
3376package CFClient::UI::Selector; 4091package CFPlus::UI::Selector;
3377 4092
3378use utf8; 4093use utf8;
3379 4094
3380our @ISA = CFClient::UI::Button::; 4095our @ISA = CFPlus::UI::Button::;
3381 4096
3382sub new { 4097sub new {
3383 my $class = shift; 4098 my $class = shift;
3384 4099
3385 my $self = $class->SUPER::new ( 4100 my $self = $class->SUPER::new (
… …
3402 my ($value, $title, $tooltip) = @$_; 4117 my ($value, $title, $tooltip) = @$_;
3403 4118
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4119 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 } 4120 }
3406 4121
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4122 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408} 4123}
3409 4124
3410sub _set_value { 4125sub _set_value {
3411 my ($self, $value) = @_; 4126 my ($self, $value) = @_;
3412 4127
3413 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4128 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4129 $item ||= $self->{options}[0]
3414 or return; 4130 or return;
3415 4131
3416 $self->{value} = $item->[0]; 4132 $self->{value} = $item->[0];
3417 $self->set_markup ("$item->[1] ⇓"); 4133 $self->set_markup ("$item->[1] ⇓");
3418 $self->set_tooltip ($item->[2]); 4134# $self->set_tooltip ($item->[2]);
3419} 4135}
3420 4136
3421sub set_value { 4137sub set_value {
3422 my ($self, $value) = @_; 4138 my ($self, $value) = @_;
3423 4139
… …
3425 4141
3426 $self->_set_value ($value); 4142 $self->_set_value ($value);
3427 $self->emit (changed => $value); 4143 $self->emit (changed => $value);
3428} 4144}
3429 4145
4146sub set_options {
4147 my ($self, $options) = @_;
4148
4149 $self->{options} = $options;
4150 $self->_set_value ($self->{value});
4151}
4152
3430############################################################################# 4153#############################################################################
3431 4154
3432package CFClient::UI::Statusbox; 4155package CFPlus::UI::Statusbox;
3433 4156
3434our @ISA = CFClient::UI::VBox::; 4157our @ISA = CFPlus::UI::VBox::;
3435 4158
3436sub new { 4159sub new {
3437 my $class = shift; 4160 my $class = shift;
3438 4161
3439 my $self = $class->SUPER::new ( 4162 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 4163 fontsize => 0.8,
3441 @_, 4164 @_,
3442 ); 4165 );
3443 4166
3444 Scalar::Util::weaken (my $this = $self); 4167 CFPlus::weaken (my $this = $self);
3445 4168
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4169 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3447 4170
3448 $self 4171 $self
3449} 4172}
3450 4173
3451sub reorder { 4174sub reorder {
3452 my ($self) = @_; 4175 my ($self) = @_;
3453 my $NOW = Time::HiRes::time; 4176 my $NOW = Time::HiRes::time;
3454 4177
3455 # freeze display when hovering over any label 4178 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner} 4179 return if $CFPlus::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4180 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} }; 4181 values %{ $self->{item} };
3459 4182
3460 while (my ($k, $v) = each %{ $self->{item} }) { 4183 while (my ($k, $v) = each %{ $self->{item} }) {
3461 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462 } 4185 }
4186
4187 $self->{timer}->set (1, 1);
3463 4188
3464 my @widgets; 4189 my @widgets;
3465 4190
3466 my @items = sort { 4191 my @items = sort {
3467 $a->{pri} <=> $b->{pri} 4192 $a->{pri} <=> $b->{pri}
3468 or $b->{id} <=> $a->{id} 4193 or $b->{id} <=> $a->{id}
3469 } values %{ $self->{item} }; 4194 } values %{ $self->{item} };
3470
3471 $self->{timer}->interval (1);
3472 4195
3473 my $count = 10 + 1; 4196 my $count = 10 + 1;
3474 for my $item (@items) { 4197 for my $item (@items) {
3475 last unless --$count; 4198 last unless --$count;
3476 4199
… …
3483 for ($short) { 4206 for ($short) {
3484 s/^\s+//; 4207 s/^\s+//;
3485 s/\s+/ /g; 4208 s/\s+/ /g;
3486 } 4209 }
3487 4210
3488 new CFClient::UI::Label 4211 new CFPlus::UI::Label
3489 markup => $short, 4212 markup => $short,
3490 tooltip => $item->{tooltip}, 4213 tooltip => $item->{tooltip},
3491 tooltip_font => $::FONT_PROP, 4214 tooltip_font => $::FONT_PROP,
3492 tooltip_width => 0.67, 4215 tooltip_width => 0.67,
3493 fontsize => $item->{fontsize} || $self->{fontsize}, 4216 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3500 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3501 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3502 $label->update; 4225 $label->update;
3503 $label->set_max_size (undef, $label->{req_h} * $diff) 4226 $label->set_max_size (undef, $label->{req_h} * $diff)
3504 if $diff < 1; 4227 if $diff < 1;
3505 $self->{timer}->interval (1/30); 4228 $self->{timer}->set (1/30, 1/30);
3506 } else { 4229 } else {
3507 $label->{fg}[3] = $item->{fg}[3] || 1; 4230 $label->{fg}[3] = $item->{fg}[3] || 1;
3508 } 4231 }
3509 4232
3510 push @widgets, $label; 4233 push @widgets, $label;
… …
3572 $self->SUPER::destroy; 4295 $self->SUPER::destroy;
3573} 4296}
3574 4297
3575############################################################################# 4298#############################################################################
3576 4299
3577package CFClient::UI::Inventory;
3578
3579our @ISA = CFClient::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::SpellList;
3640
3641our @ISA = CFClient::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFClient::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFClient::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFClient::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFClient::UI::Root; 4300package CFPlus::UI::Root;
3762 4301
3763our @ISA = CFClient::UI::Container::; 4302our @ISA = CFPlus::UI::Container::;
3764 4303
3765use List::Util qw(min max); 4304use List::Util qw(min max);
3766 4305
3767use CFClient::OpenGL; 4306use CFPlus::OpenGL;
3768 4307
3769sub new { 4308sub new {
3770 my $class = shift; 4309 my $class = shift;
3771 4310
3772 my $self = $class->SUPER::new ( 4311 my $self = $class->SUPER::new (
3773 visible => 1, 4312 visible => 1,
3774 @_, 4313 @_,
3775 ); 4314 );
3776 4315
3777 Scalar::Util::weaken ($self->{root} = $self); 4316 CFPlus::weaken ($self->{root} = $self);
3778 4317
3779 $self 4318 $self
3780} 4319}
3781 4320
3782sub size_request { 4321sub size_request {
… …
3830} 4369}
3831 4370
3832sub update { 4371sub update {
3833 my ($self) = @_; 4372 my ($self) = @_;
3834 4373
3835 $::WANT_REFRESH++; 4374 $::WANT_REFRESH->start;
3836} 4375}
3837 4376
3838sub add { 4377sub add {
3839 my ($self, @children) = @_; 4378 my ($self, @children) = @_;
3840 4379
… …
3877 while ($self->{refresh_hook}) { 4416 while ($self->{refresh_hook}) {
3878 $_->() 4417 $_->()
3879 for values %{delete $self->{refresh_hook}}; 4418 for values %{delete $self->{refresh_hook}};
3880 } 4419 }
3881 4420
3882 if ($self->{realloc}) { 4421 while ($self->{realloc}) {
3883 my %queue; 4422 my %queue;
3884 my @queue; 4423 my @queue;
3885 my $widget; 4424 my $widget;
3886 4425
3887 outer: 4426 outer:
… …
3934 } 4473 }
3935 } 4474 }
3936 4475
3937 delete $self->{realloc}{$widget+0}; 4476 delete $self->{realloc}{$widget+0};
3938 } 4477 }
3939 }
3940 4478
3941 while (my $size_alloc = delete $self->{size_alloc}) { 4479 while (my $size_alloc = delete $self->{size_alloc}) {
3942 my @queue = sort { $b->{visible} <=> $a->{visible} } 4480 my @queue = sort { $a->{visible} <=> $b->{visible} }
3943 values %$size_alloc; 4481 values %$size_alloc;
3944 4482
3945 while () { 4483 while () {
3946 my $widget = pop @queue || last; 4484 my $widget = pop @queue || last;
3947 4485
3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4486 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949 4487
3950 $w = 0 if $w < 0;
3951 $h = 0 if $h < 0;
3952
3953 $w = max $widget->{min_w}, $w; 4488 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h; 4489 $h = max $widget->{min_h}, $h;
3955 4490
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4491# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4492# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958 4493
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4494 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4495 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961 4496
3962 $w = int $w + 0.5; 4497 $w = int $w + 0.5;
3963 $h = int $h + 0.5; 4498 $h = int $h + 0.5;
3964 4499
3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4500 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966 $widget->{old_w} = $widget->{w}; 4501 $widget->{old_w} = $widget->{w};
3967 $widget->{old_h} = $widget->{h}; 4502 $widget->{old_h} = $widget->{h};
3968 4503
3969 $widget->{w} = $w; 4504 $widget->{w} = $w;
3970 $widget->{h} = $h; 4505 $widget->{h} = $h;
3971 4506
3972 $widget->emit (size_allocate => $w, $h); 4507 $widget->emit (size_allocate => $w, $h);
4508 }
3973 } 4509 }
3974 } 4510 }
3975 } 4511 }
3976 4512
3977 while ($self->{post_alloc_hook}) { 4513 while ($self->{post_alloc_hook}) {
3978 $_->() 4514 $_->()
3979 for values %{delete $self->{post_alloc_hook}}; 4515 for values %{delete $self->{post_alloc_hook}};
3980 } 4516 }
3981
3982 4517
3983 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4518 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4519 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985 glClear GL_COLOR_BUFFER_BIT; 4520 glClear GL_COLOR_BUFFER_BIT;
3986 4521
… …
3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4524 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990 glMatrixMode GL_MODELVIEW; 4525 glMatrixMode GL_MODELVIEW;
3991 glLoadIdentity; 4526 glLoadIdentity;
3992 4527
3993 { 4528 {
3994 package CFClient::UI::Base; 4529 package CFPlus::UI::Base;
3995 4530
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4531 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4532 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4533
4000 $self->_draw; 4534 $self->_draw;
4535 }
4001} 4536}
4002 4537
4003############################################################################# 4538#############################################################################
4004 4539
4005package CFClient::UI; 4540package CFPlus::UI;
4006 4541
4007$ROOT = new CFClient::UI::Root; 4542$ROOT = new CFPlus::UI::Root;
4008$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4543$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009 4544
40101 45451
4011 4546

Diff Legend

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