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.338 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 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; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
96 99
97sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
98 my ($ev) = @_; 101 my ($ev) = @_;
99 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
100 103
101 unless ($BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
102 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
103 108
104 $GRAB = $widget; 109 $GRAB = $widget;
105 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
106 111
107 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
108 } 113 }
109
110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
207 reconfigure_widgets; 214 reconfigure_widgets;
208} 215}
209 216
210############################################################################# 217#############################################################################
211 218
212package CFClient::UI::Event; 219package CFPlus::UI::Event;
213 220
214sub xy { 221sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216} 223}
217 224
218############################################################################# 225#############################################################################
219 226
220package CFClient::UI::Base; 227package CFPlus::UI::Base;
221 228
222use strict; 229use strict;
223 230
224use CFClient::OpenGL; 231use CFPlus::OpenGL;
225 232
226sub new { 233sub new {
227 my $class = shift; 234 my $class = shift;
228 235
229 my $self = bless { 236 my $self = bless {
… …
234 h => undef, 241 h => undef,
235 can_events => 1, 242 can_events => 1,
236 @_ 243 @_
237 }, $class; 244 }, $class;
238 245
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 247
241 for (keys %$self) { 248 for (keys %$self) {
242 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
244 } 251 }
245 } 252 }
246 253
247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $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}; 256 $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}; 257 $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}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252 259
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255 262
256 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
261 268
262sub destroy { 269sub destroy {
263 my ($self) = @_; 270 my ($self) = @_;
264 271
265 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
266 %$self = (); 274 %$self = ();
267} 275}
268 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
269sub show { 281sub show {
270 my ($self) = @_; 282 my ($self) = @_;
271 283
272 return if $self->{parent}; 284 return if $self->{parent};
273 285
274 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
275} 287}
276 288
277sub set_visible { 289sub set_visible {
278 my ($self) = @_; 290 my ($self) = @_;
279 291
… …
300 delete $self->{root}; 312 delete $self->{root};
301 313
302 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
303 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
304 316
305 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
306 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
307 319
308 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
309 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
310} 322}
… …
312sub set_visibility { 324sub set_visibility {
313 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
314 326
315 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
316 328
317 $visible ? $self->hide 329 $visible ? $self->show
318 : $self->show; 330 : $self->hide;
319} 331}
320 332
321sub toggle_visibility { 333sub toggle_visibility {
322 my ($self) = @_; 334 my ($self) = @_;
323 335
… …
367 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
368 380
369 if ($self->{aspect}) { 381 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
371 383
372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374 386
375 # use alignment to adjust x, y 387 # use alignment to adjust x, y
376 388
377 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
378 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
419 431
420 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
421 433
422 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
423 435
424 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
426 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
427 } 439 }
428} 440}
429 441
430# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
431sub coord2local { 443sub coord2local {
… …
497sub connect { 509sub connect {
498 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
499 511
500 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
501 513
502 defined wantarray and CFClient::guard { 514 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
505 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
506} 524}
507 525
508my %has_coords = ( 526my %has_coords = (
509 button_down => 1, 527 button_down => 1,
510 button_up => 1, 528 button_up => 1,
… …
513); 531);
514 532
515sub emit { 533sub emit {
516 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
517 535
518 # I do not really like this solution, but I dislike duplication 536 # I do not really like this solution, but I do not like duplication
519 # and needlessly verbose code, too. 537 # and needlessly verbose code, either.
520 my @append 538 my @append
521 = $has_coords{$signal} 539 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
523 : (); 541 : ();
524 542
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526 544
527 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 554}
532 555
533sub find_widget { 556#sub find_widget {
534 my ($self, $x, $y) = @_; 557# 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 558
545sub set_parent { 559sub set_parent {
546 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
547 561
548 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
550} 564}
551 565
552sub realloc { 566sub realloc {
553 my ($self) = @_; 567 my ($self) = @_;
… …
579 593
580# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
581# functions seems pointless. 595# functions seems pointless.
582our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583 597
584sub draw { 598#sub draw {
585 my ($self) = @_; 599#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 600
631sub _draw { 601sub _draw {
632 my ($self) = @_; 602 my ($self) = @_;
633 603
634 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
635} 605}
636 606
637sub DESTROY { 607sub DESTROY {
638 my ($self) = @_; 608 my ($self) = @_;
639 609
640 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 611
644 eval { $self->destroy }; 612 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
646} 616}
647 617
648############################################################################# 618#############################################################################
649 619
650package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
651 621
652our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
653 623
654use strict; 624use strict;
655use CFClient::OpenGL; 625use CFPlus::OpenGL;
656 626
657sub new { 627sub new {
658 my $class = shift; 628 my $class = shift;
659 629
660 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
691 } 661 }
692} 662}
693 663
694############################################################################# 664#############################################################################
695 665
696package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
697 667
698our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
699 669
700sub new { 670sub new {
701 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
702 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
703} 673}
… …
710 680
711sub draw { } 681sub draw { }
712 682
713############################################################################# 683#############################################################################
714 684
715package CFClient::UI::Container; 685package CFPlus::UI::Container;
716 686
717our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
718 688
719sub new { 689sub new {
720 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
721 691
722 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
726 can_events => 0, 696 can_events => 0,
727 %arg, 697 %arg,
728 ); 698 );
729 699
730 $self->add (@$children) 700 $self->add (@$children)
731 if $children; 701 if $children && @$children;
732 702
733 $self 703 $self
734} 704}
735 705
736sub realloc { 706sub realloc {
… …
745 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
746 716
747 $_->set_parent ($self) 717 $_->set_parent ($self)
748 for @widgets; 718 for @widgets;
749 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
750 use sort 'stable'; 721 use sort 'stable';
751 722
752 $self->{children} = [ 723 $self->{children} = [
753 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
754 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
755 ]; 726 ];
756 727
757 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
758} 731}
759 732
760sub children { 733sub children {
761 @{ $_[0]{children} } 734 @{ $_[0]{children} }
762} 735}
… …
773} 746}
774 747
775sub clear { 748sub clear {
776 my ($self) = @_; 749 my ($self) = @_;
777 750
778 my $children = delete $self->{children}; 751 my $children = $self->{children};
779 $self->{children} = []; 752 $self->{children} = [];
780 753
781 for (@$children) { 754 for (@$children) {
782 delete $_->{parent}; 755 delete $_->{parent};
783 $_->hide; 756 $_->hide;
… …
808 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
809} 782}
810 783
811############################################################################# 784#############################################################################
812 785
813package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
814 787
815our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
816 789
817sub new { 790sub new {
818 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
819 792
820 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821 794
822 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
823} 796}
824 797
825sub add { 798sub add {
… …
832sub remove { 805sub remove {
833 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
834 807
835 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
836 809
837 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
838 unless @{$self->{children}}; 811 unless @{$self->{children}};
839} 812}
840 813
841sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
842 815
… …
854 827
855############################################################################# 828#############################################################################
856 829
857# back-buffered drawing area 830# back-buffered drawing area
858 831
859package CFClient::UI::Window; 832package CFPlus::UI::Window;
860 833
861our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
862 835
863use CFClient::OpenGL; 836use CFPlus::OpenGL;
864 837
865sub new { 838sub new {
866 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
867 840
868 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
890} 863}
891 864
892sub render_child { 865sub render_child {
893 my ($self) = @_; 866 my ($self) = @_;
894 867
895 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
897 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
898 871
899 { 872 {
900 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
901 874
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
904 } 879 }
905
906 $self->_render;
907 }; 880 };
908} 881}
909 882
910sub _draw { 883sub _draw {
911 my ($self) = @_; 884 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 885
915 my $tex = $self->{texture} 886 my $tex = $self->{texture}
916 or return; 887 or return;
917 888
918 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
921 892
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
923 894
924 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
925} 896}
926 897
927############################################################################# 898#############################################################################
928 899
929package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
930 901
902use List::Util qw(min max);
903
931our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
932 905
933sub new { 906sub new {
934 my $class = shift; 907 my $class = shift;
935 908
936 $class->SUPER::new ( 909 $class->SUPER::new (
… …
943sub size_request { 916sub size_request {
944 my ($self) = @_; 917 my ($self) = @_;
945 918
946 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947 920
948 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
949 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
950 923
951 ($w, $h) 924 ($w, $h)
952} 925}
953 926
954sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
966} 939}
967 940
968sub set_offset { 941sub set_offset {
969 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
970 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
971 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
972 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
973 950
951 $self->emit (changed => $x, $y);
974 $self->update; 952 $self->update;
953 }
975} 954}
976 955
977# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
978sub coord2local { 957sub coord2local {
979 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
994 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
995 974
996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
998 ) { 977 ) {
999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000 } else { 979 } else {
1001 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1002 } 981 }
1003} 982}
1004 983
1005sub _render { 984sub _render {
1006 my ($self) = @_; 985 my ($self) = @_;
1007 986
1008 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 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}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010 989
1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012 991
1013 $self->SUPER::_render; 992 $self->SUPER::_render;
1014} 993}
1015 994
1016############################################################################# 995#############################################################################
1017 996
1018package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
1019 998
1020our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
1021 1000
1022sub new { 1001sub new {
1023 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
1024 1003
1025 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1026 1005
1027 my $self; 1006 my $self;
1028 1007
1029 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1030 vertical => 1, 1022 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1024 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1027 },
1035 ; 1028 ;
1036 1029
1037 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
1038 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1039 can_events => 1, 1033 can_events => 1,
1040 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1041 %arg, 1038 %arg,
1042 ); 1039 );
1043 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
1045 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1046 1065
1047 $self 1066 $self
1048} 1067}
1049
1050#TODO# update range on size_allocate depending on child
1051 1068
1052sub add { 1069sub add {
1053 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1054 1071
1055 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1056} 1073}
1057 1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1058sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1060 1125
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev); 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064 1128
1065 1 1129 1
1066} 1130}
1067 1131
1068sub update_slider { 1132sub invoke_button_down {
1069 my ($self) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1070 1134
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1135 if ($ev->{button} == 2) {
1072} 1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1073 1139
1074sub update { 1140 0
1075 my ($self) = @_; 1141}
1076 1142
1077 $self->SUPER::update; 1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1078 1145
1079 $self->update_slider; 1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1080} 1162}
1081 1163
1082sub invoke_size_allocate { 1164sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1084 1166
1085 $self->update_slider; 1167 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1169}
1089 1170
1090############################################################################# 1171#############################################################################
1091 1172
1092package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1093 1174
1094our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1095 1176
1096use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1097 1178
1098sub new { 1179sub new {
1099 my $class = shift; 1180 my $class = shift;
1100 1181
1101 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1127 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1128} 1209}
1129 1210
1130############################################################################# 1211#############################################################################
1131 1212
1132package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1133 1214
1134our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1135 1216
1136use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1137 1318
1138my $bg = 1319my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1141 1322
1142my @border = 1323my @border =
1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1145 1330
1146sub new { 1331sub new {
1147 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1148 1333
1149 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
… …
1154 min_w => 64, 1339 min_w => 64,
1155 min_h => 32, 1340 min_h => 32,
1156 %arg, 1341 %arg,
1157 ); 1342 );
1158 1343
1159 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1160 align => 0, 1345 align => 0,
1161 valign => 1, 1346 valign => 1,
1162 text => $self->{title}, 1347 text => $self->{title},
1163 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1164 if exists $self->{title}; 1349 if exists $self->{title};
1165 1350
1166 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1167 $self->{close_button} = 1352 $self->{close_button} =
1168 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png', 1354 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") }; 1355 on_activate => sub { $self->emit ("delete") };
1171 1356
1172 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 } 1358 }
1174 1359
1175 $self 1360 $self
1176} 1361}
1177 1362
1178sub add { 1363sub add {
1179 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1180 1365
1181 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $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}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184} 1369}
1185 1370
1186sub border { 1371sub border {
1187 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1188} 1373}
… …
1296 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297 1482
1298 ! ! $self->{motion} 1483 ! ! $self->{motion}
1299} 1484}
1300 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1301sub _draw { 1494sub _draw {
1302 my ($self) = @_; 1495 my ($self) = @_;
1303 1496
1304 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1305 1498
… …
1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311 1504
1312 my $border = $self->border; 1505 my $border = $self->border;
1313 1506
1314 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1315 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319 1526
1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1322 1529
1323 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1342 if $self->{close_button}; 1549 if $self->{close_button};
1343} 1550}
1344 1551
1345############################################################################# 1552#############################################################################
1346 1553
1347package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1348 1555
1349our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1350 1557
1351use List::Util qw(max sum); 1558use List::Util qw(max sum);
1352 1559
1353use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1354 1561
1355sub new { 1562sub new {
1356 my $class = shift; 1563 my $class = shift;
1357 1564
1358 $class->SUPER::new ( 1565 $class->SUPER::new (
1359 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1360 @_, 1568 @_,
1361 ) 1569 )
1362} 1570}
1363 1571
1364sub children {
1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366}
1367
1368sub add { 1572sub add {
1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1369 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1370 1587
1371 while (@_) { 1588 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1373 $child->set_parent ($self);
1374 $self->{children}[$y][$x] = $child;
1375 }
1376 1590
1377 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1378 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1379 $self->realloc;
1380}
1381 1593
1382sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1383 my ($self, $child) = @_; 1601 my ($self) = @_;
1384 1602
1385 # TODO: not yet implemented 1603 my (@w, @h);
1386}
1387
1388# TODO: move to container class maybe? send children a signal on removal?
1389sub clear {
1390 my ($self) = @_;
1391 1604
1392 my @children = $self->children; 1605 my @children = $self->children;
1393 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1394 1616 }
1395 for (@children) {
1396 delete $_->{parent};
1397 $_->hide;
1398 }
1399 1617
1400 $self->realloc; 1618 # second pass, rows
1401} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1402
1403sub get_wh {
1404 my ($self) = @_;
1405
1406 my (@w, @h);
1407
1408 for my $y (0 .. $#{$self->{children}}) {
1409 my $row = $self->{children}[$y]
1410 or next;
1411
1412 for my $x (0 .. $#$row) {
1413 my $widget = $row->[$x]
1414 or next;
1415 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1416 1621
1417 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1418 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419 } 1626 }
1420 } 1627 }
1421 1628
1422 (\@w, \@h) 1629 (\@w, \@h)
1423} 1630}
… …
1439 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1440 1647
1441 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1442 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1443 1650
1444 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1445 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1446 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1447 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1448 1655
1449 # linearly scale sizes
1450 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452 1657
1453 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1454 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1455 1667
1456 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457 1670
1458 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1459 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1460 or next;
1461 1673
1462 my $x = 0; 1674 $widget->configure (
1463 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464 1677 );
1465 for my $c (0 .. $#$row) { 1678 }
1466 my $col_w = $ws->[$c];
1467 1679
1468 if (my $widget = $row->[$c]) { 1680 1
1469 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1470 }
1471 1682
1472 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub _scale($$$) {
1692 my ($rel, $val, $max) = @_;
1693
1694 $rel ? $val * $max : $val
1695}
1696
1697sub size_request {
1698 my ($self) = @_;
1699
1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1701
1702 # determine overall size by querying abs widgets
1703 for my $child ($self->visible_children) {
1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1707
1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1473 } 1710 }
1711 }
1474 1712
1475 $y += $row_h; 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1715
1716 # now layout remaining widgets
1717 for my $child ($self->visible_children) {
1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1721
1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1724 }
1725 }
1726
1727 my $W = $x2 - $x1;
1728 my $H = $y2 - $y1;
1729
1730 ($W, $H)
1731}
1732
1733sub invoke_size_allocate {
1734 my ($self, $W, $H) = @_;
1735
1736 for my $child ($self->visible_children) {
1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739
1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1742
1743 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1476 } 1744 }
1477 1745
1478 1 1746 1
1479} 1747}
1480 1748
1481sub find_widget {
1482 my ($self, $x, $y) = @_;
1483
1484 $x -= $self->{x};
1485 $y -= $self->{y};
1486
1487 my $res;
1488
1489 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490 $res = $_->find_widget ($x, $y)
1491 and return $res;
1492 }
1493
1494 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495}
1496
1497sub _draw {
1498 my ($self) = @_;
1499
1500 for (grep $_, @{$self->{children}}) {
1501 $_->draw for grep $_, @$_;
1502 }
1503}
1504
1505############################################################################# 1749#############################################################################
1506 1750
1507package CFClient::UI::Box; 1751package CFPlus::UI::Box;
1508 1752
1509our @ISA = CFClient::UI::Container::; 1753our @ISA = CFPlus::UI::Container::;
1510 1754
1511sub size_request { 1755sub size_request {
1512 my ($self) = @_; 1756 my ($self) = @_;
1513 1757
1514 $self->{vertical} 1758 $self->{vertical}
… …
1547 $req[$_] += $space * $children[$_]{expand} 1791 $req[$_] += $space * $children[$_]{expand}
1548 for 0 .. $#children; 1792 for 0 .. $#children;
1549 } 1793 }
1550 } 1794 }
1551 1795
1552 CFClient::UI::harmonize \@req; 1796 CFPlus::UI::harmonize \@req;
1553 1797
1554 my $pos = 0; 1798 my $pos = 0;
1555 for (0 .. $#children) { 1799 for (0 .. $#children) {
1556 my $alloc = $req[$_]; 1800 my $alloc = $req[$_];
1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1801 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1562 1 1806 1
1563} 1807}
1564 1808
1565############################################################################# 1809#############################################################################
1566 1810
1567package CFClient::UI::HBox; 1811package CFPlus::UI::HBox;
1568 1812
1569our @ISA = CFClient::UI::Box::; 1813our @ISA = CFPlus::UI::Box::;
1570 1814
1571sub new { 1815sub new {
1572 my $class = shift; 1816 my $class = shift;
1573 1817
1574 $class->SUPER::new ( 1818 $class->SUPER::new (
… …
1577 ) 1821 )
1578} 1822}
1579 1823
1580############################################################################# 1824#############################################################################
1581 1825
1582package CFClient::UI::VBox; 1826package CFPlus::UI::VBox;
1583 1827
1584our @ISA = CFClient::UI::Box::; 1828our @ISA = CFPlus::UI::Box::;
1585 1829
1586sub new { 1830sub new {
1587 my $class = shift; 1831 my $class = shift;
1588 1832
1589 $class->SUPER::new ( 1833 $class->SUPER::new (
… …
1592 ) 1836 )
1593} 1837}
1594 1838
1595############################################################################# 1839#############################################################################
1596 1840
1597package CFClient::UI::Label; 1841package CFPlus::UI::Label;
1598 1842
1599our @ISA = CFClient::UI::DrawBG::; 1843our @ISA = CFPlus::UI::DrawBG::;
1600 1844
1601use CFClient::OpenGL; 1845use CFPlus::OpenGL;
1602 1846
1603sub new { 1847sub new {
1604 my ($class, %arg) = @_; 1848 my ($class, %arg) = @_;
1605 1849
1606 my $self = $class->SUPER::new ( 1850 my $self = $class->SUPER::new (
… …
1609 #active_bg => none 1853 #active_bg => none
1610 #font => default_font 1854 #font => default_font
1611 #text => initial text 1855 #text => initial text
1612 #markup => initial narkup 1856 #markup => initial narkup
1613 #max_w => maximum pixel width 1857 #max_w => maximum pixel width
1858 #style => 0, # render flags
1614 ellipsise => 3, # end 1859 ellipsise => 3, # end
1615 layout => (new CFClient::Layout), 1860 layout => (new CFPlus::Layout),
1616 fontsize => 1, 1861 fontsize => 1,
1617 align => -1, 1862 align => -1,
1618 valign => -1, 1863 valign => -1,
1619 padding_x => 2, 1864 padding_x => 2,
1620 padding_y => 2, 1865 padding_y => 2,
1621 can_events => 0, 1866 can_events => 0,
1622 %arg 1867 %arg
1623 ); 1868 );
1624 1869
1625 if (exists $self->{template}) { 1870 if (exists $self->{template}) {
1626 my $layout = new CFClient::Layout; 1871 my $layout = new CFPlus::Layout;
1627 $layout->set_text (delete $self->{template}); 1872 $layout->set_text (delete $self->{template});
1628 $self->{template} = $layout; 1873 $self->{template} = $layout;
1629 } 1874 }
1630 1875
1631 if (exists $self->{markup}) { 1876 if (exists $self->{markup}) {
… …
1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1768 : ($self->{h} - $size->[1]) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
1769 }; 2014 };
1770 2015
1771 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2016# unless ($self->{list}) {
1772 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2017# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList;
2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
1773 2024
1774 $self->{layout}->render ($self->{ox}, $self->{oy}); 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
1776 2035
1777############################################################################# 2036#############################################################################
1778 2037
1779package CFClient::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1780 2039
1781our @ISA = CFClient::UI::Label::; 2040our @ISA = CFPlus::UI::Label::;
1782 2041
1783use CFClient::OpenGL; 2042use CFPlus::OpenGL;
1784 2043
1785sub new { 2044sub new {
1786 my $class = shift; 2045 my $class = shift;
1787 2046
1788 $class->SUPER::new ( 2047 $class->SUPER::new (
… …
1792 active_fg => [0, 0, 0], 2051 active_fg => [0, 0, 0],
1793 can_hover => 1, 2052 can_hover => 1,
1794 can_focus => 1, 2053 can_focus => 1,
1795 valign => 0, 2054 valign => 0,
1796 can_events => 1, 2055 can_events => 1,
2056 ellipsise => 0,
1797 #text => ... 2057 #text => ...
1798 #hidden => "*", 2058 #hidden => "*",
1799 @_ 2059 @_
1800 ) 2060 )
1801} 2061}
… …
1846 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1847 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1848 2108
1849 my $text = $self->get_text; 2109 my $text = $self->get_text;
1850 2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2112
1851 if ($uni == 8) { 2113 if ($uni == 8) {
1852 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1854 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1855 } elsif ($sym == CFClient::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1856 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1857 } elsif ($sym == CFClient::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1858 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1859 } elsif ($sym == CFClient::SDLK_HOME) { 2121 } elsif ($sym == CFPlus::SDLK_HOME) {
2122 # what a hack
2123 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1
2126 : 0;
2127 } elsif ($sym == CFPlus::SDLK_END) {
2128 # uh, again
2129 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2131 ? $self->{cursor} + length $1
2132 : length $self->{text};
2133 } elsif ($uni == 21) { # ctrl-u
2134 $text = "";
1860 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1861 } elsif ($sym == CFClient::SDLK_END) {
1862 $self->{cursor} = length $text;
1863 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1864 $self->emit ('escape'); 2137 $self->emit ('escape');
1865 } elsif ($uni) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1866 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else { 2142 } else {
1868 return 0; 2143 return 0;
1869 } 2144 }
1870 2145
1871 $self->_set_text ($text); 2146 $self->_set_text ($text);
1872 2147
1873 $self->realloc; 2148 $self->realloc;
2149 $self->update;
1874 2150
1875 1 2151 1
1876} 2152}
1877 2153
1878sub invoke_focus_in { 2154sub invoke_focus_in {
… …
1940 utf8::encode $text; 2216 utf8::encode $text;
1941 2217
1942 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943 } 2219 }
1944 2220
1945 glColor @{$self->{fg}};
1946 glBegin GL_LINES; 2221 glBegin GL_LINES;
1947 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949 glEnd; 2224 glEnd;
1950 } 2225 }
1951} 2226}
1952 2227
2228#############################################################################
2229
1953package CFClient::UI::Entry; 2230package CFPlus::UI::Entry;
1954 2231
1955our @ISA = CFClient::UI::EntryBase::; 2232our @ISA = CFPlus::UI::EntryBase::;
1956 2233
1957use CFClient::OpenGL; 2234use CFPlus::OpenGL;
1958 2235
1959sub invoke_key_down { 2236sub invoke_key_down {
1960 my ($self, $ev) = @_; 2237 my ($self, $ev) = @_;
1961 2238
1962 my $sym = $ev->{sym}; 2239 my $sym = $ev->{sym};
1963 2240
1964 if ($sym == 13) { 2241 if ($ev->{uni} == 0x0d || $sym == 13) {
1965 unshift @{$self->{history}}, 2242 unshift @{$self->{history}},
1966 my $txt = $self->get_text; 2243 my $txt = $self->get_text;
1967 2244
1968 $self->{history_pointer} = -1; 2245 $self->{history_pointer} = -1;
1969 $self->{history_saveback} = ''; 2246 $self->{history_saveback} = '';
1970 $self->emit (activate => $txt); 2247 $self->emit (activate => $txt);
1971 $self->update; 2248 $self->update;
1972 2249
1973 } elsif ($sym == CFClient::SDLK_UP) { 2250 } elsif ($sym == CFPlus::SDLK_UP) {
1974 if ($self->{history_pointer} < 0) { 2251 if ($self->{history_pointer} < 0) {
1975 $self->{history_saveback} = $self->get_text; 2252 $self->{history_saveback} = $self->get_text;
1976 } 2253 }
1977 if (@{$self->{history} || []} > 0) { 2254 if (@{$self->{history} || []} > 0) {
1978 $self->{history_pointer}++; 2255 $self->{history_pointer}++;
… …
1980 $self->{history_pointer} = @{$self->{history} || []} - 1; 2257 $self->{history_pointer} = @{$self->{history} || []} - 1;
1981 } 2258 }
1982 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2259 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1983 } 2260 }
1984 2261
1985 } elsif ($sym == CFClient::SDLK_DOWN) { 2262 } elsif ($sym == CFPlus::SDLK_DOWN) {
1986 $self->{history_pointer}--; 2263 $self->{history_pointer}--;
1987 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2264 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988 2265
1989 if ($self->{history_pointer} >= 0) { 2266 if ($self->{history_pointer} >= 0) {
1990 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2267 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1999 1 2276 1
2000} 2277}
2001 2278
2002############################################################################# 2279#############################################################################
2003 2280
2281package CFPlus::UI::TextEdit;
2282
2283our @ISA = CFPlus::UI::EntryBase::;
2284
2285use CFPlus::OpenGL;
2286
2287sub move_cursor_ver {
2288 my ($self, $dy) = @_;
2289
2290 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2291
2292 $y += $dy;
2293
2294 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2295 $self->{cursor} = $index;
2296 delete $self->{cur_h};
2297 $self->update;
2298 return;
2299 }
2300}
2301
2302sub invoke_key_down {
2303 my ($self, $ev) = @_;
2304
2305 my $sym = $ev->{sym};
2306
2307 if ($sym == CFPlus::SDLK_UP) {
2308 $self->move_cursor_ver (-1);
2309 } elsif ($sym == CFPlus::SDLK_DOWN) {
2310 $self->move_cursor_ver (+1);
2311 } else {
2312 return $self->SUPER::invoke_key_down ($ev)
2313 }
2314
2315 1
2316}
2317
2318#############################################################################
2319
2004package CFClient::UI::Button; 2320package CFPlus::UI::Button;
2005 2321
2006our @ISA = CFClient::UI::Label::; 2322our @ISA = CFPlus::UI::Label::;
2007 2323
2008use CFClient::OpenGL; 2324use CFPlus::OpenGL;
2009 2325
2010my @tex = 2326my @tex =
2011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
2013 2329
2014sub new { 2330sub new {
2015 my $class = shift; 2331 my $class = shift;
2016 2332
2017 $class->SUPER::new ( 2333 $class->SUPER::new (
2018 padding_x => 4, 2334 padding_x => 4,
2019 padding_y => 4, 2335 padding_y => 4,
2020 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
2021 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
2022 can_hover => 1, 2338 can_hover => 1,
2023 align => 0, 2339 align => 0,
2024 valign => 0, 2340 valign => 0,
2025 can_events => 1, 2341 can_events => 1,
2026 @_ 2342 @_
… …
2044 2360
2045 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
2048 2364
2365 my $tex = $tex[$GRAB == $self];
2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050 2367
2051 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
2052 2369
2053 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
2054} 2371}
2055 2372
2056############################################################################# 2373#############################################################################
2057 2374
2058package CFClient::UI::CheckBox; 2375package CFPlus::UI::CheckBox;
2059 2376
2060our @ISA = CFClient::UI::DrawBG::; 2377our @ISA = CFPlus::UI::DrawBG::;
2061 2378
2062my @tex = 2379my @tex =
2063 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2381 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065 2382
2066use CFClient::OpenGL; 2383use CFPlus::OpenGL;
2067 2384
2068sub new { 2385sub new {
2069 my $class = shift; 2386 my $class = shift;
2070 2387
2071 $class->SUPER::new ( 2388 $class->SUPER::new (
… …
2128 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
2129} 2446}
2130 2447
2131############################################################################# 2448#############################################################################
2132 2449
2133package CFClient::UI::Image; 2450package CFPlus::UI::Image;
2134 2451
2135our @ISA = CFClient::UI::Base::; 2452our @ISA = CFPlus::UI::Base::;
2136 2453
2137use CFClient::OpenGL; 2454use CFPlus::OpenGL;
2138 2455
2139our %texture_cache; 2456our %texture_cache;
2140 2457
2141sub new { 2458sub new {
2142 my $class = shift; 2459 my $class = shift;
… …
2148 2465
2149 $self->{path} || $self->{tex} 2466 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required"; 2467 or Carp::croak "'path' or 'tex' attributes required";
2151 2468
2152 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154 2471
2155 Scalar::Util::weaken $texture_cache{$self->{path}}; 2472 CFPlus::weaken $texture_cache{$self->{path}};
2156 2473
2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158 2475
2159 $self 2476 $self
2160} 2477}
2161 2478
2162sub STORABLE_freeze { 2479sub STORABLE_freeze {
2163 my ($self, $cloning) = @_; 2480 my ($self, $cloning) = @_;
2164 2481
2165 $self->{path} 2482 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; 2483 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167 2484
2168 $self->{path} 2485 $self->{path}
2169} 2486}
2170 2487
2171sub STORABLE_attach { 2488sub STORABLE_attach {
… …
2202 glDisable GL_TEXTURE_2D; 2519 glDisable GL_TEXTURE_2D;
2203} 2520}
2204 2521
2205############################################################################# 2522#############################################################################
2206 2523
2207package CFClient::UI::ImageButton; 2524package CFPlus::UI::ImageButton;
2208 2525
2209our @ISA = CFClient::UI::Image::; 2526our @ISA = CFPlus::UI::Image::;
2210 2527
2211use CFClient::OpenGL; 2528use CFPlus::OpenGL;
2212 2529
2213my %textures; 2530my %textures;
2214 2531
2215sub new { 2532sub new {
2216 my $class = shift; 2533 my $class = shift;
… …
2238 1 2555 1
2239} 2556}
2240 2557
2241############################################################################# 2558#############################################################################
2242 2559
2243package CFClient::UI::VGauge; 2560package CFPlus::UI::VGauge;
2244 2561
2245our @ISA = CFClient::UI::Base::; 2562our @ISA = CFPlus::UI::Base::;
2246 2563
2247use List::Util qw(min max); 2564use List::Util qw(min max);
2248 2565
2249use CFClient::OpenGL; 2566use CFPlus::OpenGL;
2250 2567
2251my %tex = ( 2568my %tex = (
2252 food => [ 2569 food => [
2253 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2570 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2571 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255 ], 2572 ],
2256 grace => [ 2573 grace => [
2257 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2574 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2575 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259 ], 2576 ],
2260 hp => [ 2577 hp => [
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2578 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2579 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263 ], 2580 ],
2264 mana => [ 2581 mana => [
2265 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2582 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2583 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267 ], 2584 ],
2268); 2585);
2269 2586
2270# eg. VGauge->new (gauge => 'food'), default gauge: food 2587# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2373 glDisable GL_TEXTURE_2D; 2690 glDisable GL_TEXTURE_2D;
2374} 2691}
2375 2692
2376############################################################################# 2693#############################################################################
2377 2694
2378package CFClient::UI::Gauge; 2695package CFPlus::UI::Gauge;
2379 2696
2380our @ISA = CFClient::UI::VBox::; 2697our @ISA = CFPlus::UI::VBox::;
2381 2698
2382sub new { 2699sub new {
2383 my ($class, %arg) = @_; 2700 my ($class, %arg) = @_;
2384 2701
2385 my $self = $class->SUPER::new ( 2702 my $self = $class->SUPER::new (
… …
2387 can_hover => 1, 2704 can_hover => 1,
2388 can_events => 1, 2705 can_events => 1,
2389 %arg, 2706 %arg,
2390 ); 2707 );
2391 2708
2392 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2709 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2710 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2711 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395 2712
2396 $self 2713 $self
2397} 2714}
2398 2715
2399sub set_fontsize { 2716sub set_fontsize {
… …
2420 $self->{value}->set_text ($val); 2737 $self->{value}->set_text ($val);
2421} 2738}
2422 2739
2423############################################################################# 2740#############################################################################
2424 2741
2425package CFClient::UI::Slider; 2742package CFPlus::UI::Slider;
2426 2743
2427use strict; 2744use strict;
2428 2745
2429use CFClient::OpenGL; 2746use CFPlus::OpenGL;
2430 2747
2431our @ISA = CFClient::UI::DrawBG::; 2748our @ISA = CFPlus::UI::DrawBG::;
2432 2749
2433my @tex = 2750my @tex =
2434 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2751 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435 qw(s1_slider.png s1_slider_bg.png); 2752 qw(s1_slider.png s1_slider_bg.png);
2436 2753
2437sub new { 2754sub new {
2438 my $class = shift; 2755 my $class = shift;
2439 2756
… …
2507 2824
2508 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2509 2826
2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2511 2828
2512 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2513} 2832}
2514 2833
2515sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2516 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2517 2836
… …
2533sub invoke_mouse_wheel { 2852sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_; 2853 my ($self, $ev) = @_;
2535 2854
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537 2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539 2860
2540 ! ! $delta 2861 1
2541} 2862}
2542 2863
2543sub update { 2864sub update {
2544 my ($self) = @_; 2865 my ($self) = @_;
2545 2866
… …
2594 glDisable GL_TEXTURE_2D; 2915 glDisable GL_TEXTURE_2D;
2595} 2916}
2596 2917
2597############################################################################# 2918#############################################################################
2598 2919
2599package CFClient::UI::ValSlider; 2920package CFPlus::UI::ValSlider;
2600 2921
2601our @ISA = CFClient::UI::HBox::; 2922our @ISA = CFPlus::UI::HBox::;
2602 2923
2603sub new { 2924sub new {
2604 my ($class, %arg) = @_; 2925 my ($class, %arg) = @_;
2605 2926
2606 my $range = delete $arg{range}; 2927 my $range = delete $arg{range};
2607 2928
2608 my $self = $class->SUPER::new ( 2929 my $self = $class->SUPER::new (
2609 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2930 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2931 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611 to_value => sub { shift }, 2932 to_value => sub { shift },
2612 from_value => sub { shift }, 2933 from_value => sub { shift },
2613 %arg, 2934 %arg,
2614 ); 2935 );
2615 2936
… …
2635sub set_range { shift->{slider}->set_range (@_) } 2956sub set_range { shift->{slider}->set_range (@_) }
2636sub set_value { shift->{slider}->set_value (@_) } 2957sub set_value { shift->{slider}->set_value (@_) }
2637 2958
2638############################################################################# 2959#############################################################################
2639 2960
2640package CFClient::UI::TextScroller; 2961package CFPlus::UI::TextScroller;
2641 2962
2642our @ISA = CFClient::UI::HBox::; 2963our @ISA = CFPlus::UI::HBox::;
2643 2964
2644use CFClient::OpenGL; 2965use CFPlus::OpenGL;
2645 2966
2646sub new { 2967sub new {
2647 my $class = shift; 2968 my $class = shift;
2648 2969
2649 my $self = $class->SUPER::new ( 2970 my $self = $class->SUPER::new (
… …
2651 can_events => 1, 2972 can_events => 1,
2652 indent => 0, 2973 indent => 0,
2653 #font => default_font 2974 #font => default_font
2654 @_, 2975 @_,
2655 2976
2656 layout => (new CFClient::Layout), 2977 layout => (new CFPlus::Layout),
2657 par => [], 2978 par => [],
2979 max_par => 0,
2658 height => 0, 2980 height => 0,
2659 children => [ 2981 children => [
2660 (new CFClient::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2661 (new CFClient::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2662 ], 2984 ],
2663 ); 2985 );
2664 2986
2665 $self->{children}[1]->connect (changed => sub { $self->update }); 2987 $self->{children}[1]->connect (changed => sub { $self->update });
2666 2988
… …
2741sub set_offset { 3063sub set_offset {
2742 my ($self, $offset) = @_; 3064 my ($self, $offset) = @_;
2743 3065
2744 # todo: base offset on lines or so, not on pixels 3066 # todo: base offset on lines or so, not on pixels
2745 $self->{children}[1]->set_value ($offset); 3067 $self->{children}[1]->set_value ($offset);
3068}
3069
3070sub current_paragraph {
3071 my ($self) = @_;
3072
3073 $self->{top_paragraph} - 1
3074}
3075
3076sub scroll_to {
3077 my ($self, $para) = @_;
3078
3079 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3080
3081 $self->{scroll_to} = $para;
3082 $self->update;
2746} 3083}
2747 3084
2748sub clear { 3085sub clear {
2749 my ($self) = @_; 3086 my ($self) = @_;
2750 3087
… …
2772 3109
2773 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774 push @{$self->{par}}, $para; 3111 push @{$self->{par}}, $para;
2775 } 3112 }
2776 3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
3116 }
3117
2777 $self->{need_reflow}++; 3118 $self->{need_reflow}++;
2778 $self->update; 3119 $self->update;
2779} 3120}
2780 3121
2781sub scroll_to_bottom { 3122sub scroll_to_bottom {
2782 my ($self) = @_; 3123 my ($self) = @_;
2783 3124
2784 $self->{scroll_to_bottom} = 1; 3125 $self->{scroll_to} = $#{$self->{par}};
2785 $self->update; 3126 $self->update;
2786} 3127}
2787 3128
3129sub force_uptodate {
3130 my ($self) = @_;
3131
3132 if (delete $self->{need_reflow}) {
3133 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3134
3135 my $height = 0;
3136
3137 for my $para (@{$self->{par}}) {
3138 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3139 my $layout = $self->get_layout ($para);
3140 my ($w, $h) = $layout->size;
3141
3142 $para->{w} = $w + $para->{indent};
3143 $para->{h} = $h;
3144 $para->{wrapped} = $layout->has_wrapped;
3145 }
3146
3147 $para->{y} = $height;
3148 $height += $para->{h};
3149 }
3150
3151 $self->{height} = $height;
3152 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3153
3154 delete $self->{texture};
3155 }
3156
3157 if (my $paridx = delete $self->{scroll_to}) {
3158 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3159 }
3160}
3161
2788sub update { 3162sub update {
2789 my ($self) = @_; 3163 my ($self) = @_;
2790 3164
2791 $self->SUPER::update; 3165 $self->SUPER::update;
2792 3166
2793 return unless $self->{h} > 0; 3167 return unless $self->{h} > 0;
2794 3168
2795 delete $self->{texture}; 3169 delete $self->{texture};
2796 3170
2797 $ROOT->on_post_alloc ($self => sub { 3171 $ROOT->on_post_alloc ($self => sub {
3172 $self->force_uptodate;
3173
2798 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3174 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2799 3175
2800 if (delete $self->{need_reflow}) {
2801 my $height = 0;
2802
2803 for my $para (@{$self->{par}}) {
2804 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2805 my $layout = $self->get_layout ($para);
2806 my ($w, $h) = $layout->size;
2807
2808 $para->{w} = $w + $para->{indent};
2809 $para->{h} = $h;
2810 $para->{wrapped} = $layout->has_wrapped;
2811 }
2812
2813 $height += $para->{h};
2814 }
2815
2816 $self->{height} = $height;
2817
2818 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2819
2820 delete $self->{texture};
2821 }
2822
2823 if (delete $self->{scroll_to_bottom}) {
2824 $self->{children}[1]->set_value (1e10);
2825 }
2826
2827 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3176 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2828 glClearColor 0, 0, 0, 0; 3177 glClearColor 0, 0, 0, 0;
2829 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2830 3179
3180 package CFPlus::UI::Base;
3181 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3182 (0, 0, $self->{w}, $self->{h});
3183
3184 my $top = int $self->{children}[1]{range}[0];
3185
3186 my $paridx = 0;
3187 my $top_paragraph;
2831 my $top = int $self->{children}[1]{range}[0]; 3188 my $top = int $self->{children}[1]{range}[0];
2832 3189
2833 my $y0 = $top; 3190 my $y0 = $top;
2834 my $y1 = $top + $H; 3191 my $y1 = $top + $H;
2835 3192
2836 my $y = 0;
2837
2838 for my $para (@{$self->{par}}) { 3193 for my $para (@{$self->{par}}) {
2839 my $h = $para->{h}; 3194 my $h = $para->{h};
3195 my $y = $para->{y};
2840 3196
2841 if ($y0 < $y + $h && $y < $y1) { 3197 if ($y0 < $y + $h && $y < $y1) {
2842
2843 my $layout = $self->get_layout ($para); 3198 my $layout = $self->get_layout ($para);
2844 3199
2845 $layout->render ($para->{indent}, $y - $y0); 3200 $layout->render ($para->{indent}, $y - $y0);
2846 3201
2847 if (my @w = @{ $para->{widget} }) { 3202 if (my @w = @{ $para->{widget} }) {
… …
2856 $_->draw; 3211 $_->draw;
2857 } 3212 }
2858 } 3213 }
2859 } 3214 }
2860 3215
2861 $y += $h; 3216 $paridx++;
3217 $top_paragraph ||= $paridx if $y >= $top;
2862 } 3218 }
3219
3220 $self->{top_paragraph} = $top_paragraph;
2863 }; 3221 };
2864 }); 3222 });
2865} 3223}
2866 3224
2867sub reconfigure { 3225sub reconfigure {
… …
2885 $self->{children}[1]->draw; 3243 $self->{children}[1]->draw;
2886} 3244}
2887 3245
2888############################################################################# 3246#############################################################################
2889 3247
2890package CFClient::UI::Animator; 3248package CFPlus::UI::Animator;
2891 3249
2892use CFClient::OpenGL; 3250use CFPlus::OpenGL;
2893 3251
2894our @ISA = CFClient::UI::Bin::; 3252our @ISA = CFPlus::UI::Bin::;
2895 3253
2896sub moveto { 3254sub moveto {
2897 my ($self, $x, $y) = @_; 3255 my ($self, $x, $y) = @_;
2898 3256
2899 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3257 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2927 glPopMatrix; 3285 glPopMatrix;
2928} 3286}
2929 3287
2930############################################################################# 3288#############################################################################
2931 3289
2932package CFClient::UI::Flopper; 3290package CFPlus::UI::Flopper;
2933 3291
2934our @ISA = CFClient::UI::Button::; 3292our @ISA = CFPlus::UI::Button::;
2935 3293
2936sub new { 3294sub new {
2937 my $class = shift; 3295 my $class = shift;
2938 3296
2939 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2951 $self->{other}->toggle_visibility; 3309 $self->{other}->toggle_visibility;
2952} 3310}
2953 3311
2954############################################################################# 3312#############################################################################
2955 3313
2956package CFClient::UI::Tooltip; 3314package CFPlus::UI::Tooltip;
2957 3315
2958our @ISA = CFClient::UI::Bin::; 3316our @ISA = CFPlus::UI::Bin::;
2959 3317
2960use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2961 3319
2962sub new { 3320sub new {
2963 my $class = shift; 3321 my $class = shift;
2964 3322
2965 $class->SUPER::new ( 3323 $class->SUPER::new (
… …
2968 ) 3326 )
2969} 3327}
2970 3328
2971sub set_tooltip_from { 3329sub set_tooltip_from {
2972 my ($self, $widget) = @_; 3330 my ($self, $widget) = @_;
3331
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
2973 3334
2974 my $tooltip = $widget->{tooltip}; 3335 my $tooltip = $widget->{tooltip};
2975 3336
2976 if ($ENV{CFPLUS_DEBUG} & 2) { 3337 if ($ENV{CFPLUS_DEBUG} & 2) {
2977 $tooltip .= "\n\n" . (ref $widget) . "\n" 3338 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2981 } 3342 }
2982 3343
2983 $tooltip =~ s/^\n+//; 3344 $tooltip =~ s/^\n+//;
2984 $tooltip =~ s/\n+$//; 3345 $tooltip =~ s/\n+$//;
2985 3346
2986 $self->add (new CFClient::UI::Label 3347 $self->add (new CFPlus::UI::Label
2987 markup => $tooltip, 3348 markup => $tooltip,
2988 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2989 fontsize => 0.8, 3350 fontsize => 0.8,
2990 fg => [0, 0, 0, 1], 3351 style => 1, # FLAG_INVERSE
2991 ellipsise => 0, 3352 ellipsise => 0,
2992 font => ($widget->{tooltip_font} || $::FONT_PROP), 3353 font => ($widget->{tooltip_font} || $::FONT_PROP),
2993 ); 3354 );
2994} 3355}
2995 3356
… …
3057 $self->SUPER::_draw; 3418 $self->SUPER::_draw;
3058} 3419}
3059 3420
3060############################################################################# 3421#############################################################################
3061 3422
3062package CFClient::UI::Face; 3423package CFPlus::UI::Face;
3063 3424
3064our @ISA = CFClient::UI::DrawBG::; 3425our @ISA = CFPlus::UI::DrawBG::;
3065 3426
3066use CFClient::OpenGL; 3427use CFPlus::OpenGL;
3067 3428
3068sub new { 3429sub new {
3069 my $class = shift; 3430 my $class = shift;
3070 3431
3071 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
3072 aspect => 1, 3435 aspect => 1,
3073 can_events => 0, 3436 can_events => 0,
3074 @_, 3437 @_,
3075 ); 3438 );
3076 3439
3077 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
3078 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
3079 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3080 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
3081 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3082 hard => 1, 3446 parked => 1,
3083 interval => $self->{animspeed},
3084 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
3085 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
3086 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
3087 }, 3455 },
3088 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
3089 } 3460 }
3090 3461
3091 $self 3462 $self
3092} 3463}
3093 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
3094sub size_request { 3496sub size_request {
3095 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
3096} 3513}
3097 3514
3098sub update { 3515sub update {
3099 my ($self) = @_; 3516 my ($self) = @_;
3100 3517
3101 return unless $self->{visible}; 3518 return unless $self->{visible};
3102 3519
3103 $self->SUPER::update; 3520 $self->SUPER::update;
3104} 3521}
3105 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
3106sub _draw { 3531sub _draw {
3107 my ($self) = @_; 3532 my ($self) = @_;
3108 3533
3109 return unless $::CONN;
3110
3111 $self->SUPER::_draw; 3534 $self->SUPER::_draw;
3112 3535
3113 my $face; 3536 if (my $tex = $self->{tex}) {
3114
3115 if ($self->{frame}) {
3116 my $anim = $::CONN->{anim}[$self->{anim}];
3117
3118 $face = $anim->[ $self->{frame} % @$anim ]
3119 if $anim && @$anim;
3120 }
3121
3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3123
3124 if ($tex) {
3125 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3127 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3129 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3131} 3543}
3132 3544
3133sub destroy { 3545sub destroy {
3134 my ($self) = @_; 3546 my ($self) = @_;
3135 3547
3136 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
3137 if $self->{timer}; 3549 if $self->{timer};
3138 3550
3139 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
3140} 3552}
3141 3553
3142############################################################################# 3554#############################################################################
3143 3555
3144package CFClient::UI::Buttonbar; 3556package CFPlus::UI::Buttonbar;
3145 3557
3146our @ISA = CFClient::UI::HBox::; 3558our @ISA = CFPlus::UI::HBox::;
3147 3559
3148# TODO: should actualyl wrap buttons and other goodies. 3560# TODO: should actually wrap buttons and other goodies.
3149 3561
3150############################################################################# 3562#############################################################################
3151 3563
3152package CFClient::UI::Menu; 3564package CFPlus::UI::Menu;
3153 3565
3154our @ISA = CFClient::UI::FancyFrame::; 3566our @ISA = CFPlus::UI::Toplevel::;
3155 3567
3156use CFClient::OpenGL; 3568use CFPlus::OpenGL;
3157 3569
3158sub new { 3570sub new {
3159 my $class = shift; 3571 my $class = shift;
3160 3572
3161 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3162 items => [], 3574 items => [],
3163 z => 100, 3575 z => 100,
3164 @_, 3576 @_,
3165 ); 3577 );
3166 3578
3167 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3579 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168 3580
3169 for my $item (@{ $self->{items} }) { 3581 for my $item (@{ $self->{items} }) {
3170 my ($widget, $cb, $tooltip) = @$item; 3582 my ($widget, $cb, $tooltip) = @$item;
3171 3583
3172 # handle various types of items, only text for now 3584 # handle various types of items, only text for now
3173 if (!ref $widget) { 3585 if (!ref $widget) {
3174 if ($widget =~ /\t/) { 3586 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2; 3587 my ($left, $right) = split /\t/, $widget, 2;
3176 3588
3177 $widget = new CFClient::UI::HBox 3589 $widget = new CFPlus::UI::HBox
3178 can_hover => 1, 3590 can_hover => 1,
3179 can_events => 1, 3591 can_events => 1,
3180 tooltip => $tooltip, 3592 tooltip => $tooltip,
3181 children => [ 3593 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1), 3594 (new CFPlus::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1), 3595 (new CFPlus::UI::Label markup => $right, align => +1),
3184 ], 3596 ],
3185 ; 3597 ;
3186 3598
3187 } else { 3599 } else {
3188 $widget = new CFClient::UI::Label 3600 $widget = new CFPlus::UI::Label
3189 can_hover => 1, 3601 can_hover => 1,
3190 can_events => 1, 3602 can_events => 1,
3191 markup => $widget, 3603 markup => $widget,
3192 tooltip => $tooltip; 3604 tooltip => $tooltip;
3193 } 3605 }
… …
3241 1 3653 1
3242} 3654}
3243 3655
3244############################################################################# 3656#############################################################################
3245 3657
3246package CFClient::UI::Multiplexer; 3658package CFPlus::UI::Multiplexer;
3247 3659
3248our @ISA = CFClient::UI::Container::; 3660our @ISA = CFPlus::UI::Container::;
3249 3661
3250sub new { 3662sub new {
3251 my $class = shift; 3663 my $class = shift;
3252 3664
3253 my $self = $class->SUPER::new ( 3665 my $self = $class->SUPER::new (
… …
3314 $self->{current}->draw; 3726 $self->{current}->draw;
3315} 3727}
3316 3728
3317############################################################################# 3729#############################################################################
3318 3730
3319package CFClient::UI::Notebook; 3731package CFPlus::UI::Notebook;
3320 3732
3321our @ISA = CFClient::UI::VBox::; 3733our @ISA = CFPlus::UI::VBox::;
3322 3734
3323sub new { 3735sub new {
3324 my $class = shift; 3736 my $class = shift;
3325 3737
3326 my $self = $class->SUPER::new ( 3738 my $self = $class->SUPER::new (
3327 buttonbar => (new CFClient::UI::Buttonbar), 3739 buttonbar => (new CFPlus::UI::Buttonbar),
3328 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329 # filter => # will be put between multiplexer and $self 3741 # filter => # will be put between multiplexer and $self
3330 @_, 3742 @_,
3331 ); 3743 );
3332 3744
3333 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3337} 3749}
3338 3750
3339sub add { 3751sub add {
3340 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3341 3753
3342 Scalar::Util::weaken $self; 3754 CFPlus::weaken $self;
3343 3755
3344 $self->{buttonbar}->add (new CFClient::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3345 markup => $title, 3758 markup => $title,
3346 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3347 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3348 ); 3764 $self->{buttonbar}->add ($title);
3349 3765
3350 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3351} 3767}
3352 3768
3353sub get_current_page { 3769sub get_current_page {
… …
3363 $self->emit (page_changed => $self->{multiplexer}{current}); 3779 $self->emit (page_changed => $self->{multiplexer}{current});
3364} 3780}
3365 3781
3366############################################################################# 3782#############################################################################
3367 3783
3368package CFClient::UI::Selector; 3784package CFPlus::UI::Selector;
3369 3785
3370use utf8; 3786use utf8;
3371 3787
3372our @ISA = CFClient::UI::Button::; 3788our @ISA = CFPlus::UI::Button::;
3373 3789
3374sub new { 3790sub new {
3375 my $class = shift; 3791 my $class = shift;
3376 3792
3377 my $self = $class->SUPER::new ( 3793 my $self = $class->SUPER::new (
… …
3394 my ($value, $title, $tooltip) = @$_; 3810 my ($value, $title, $tooltip) = @$_;
3395 3811
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3812 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 } 3813 }
3398 3814
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3815 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400} 3816}
3401 3817
3402sub _set_value { 3818sub _set_value {
3403 my ($self, $value) = @_; 3819 my ($self, $value) = @_;
3404 3820
… …
3419 $self->emit (changed => $value); 3835 $self->emit (changed => $value);
3420} 3836}
3421 3837
3422############################################################################# 3838#############################################################################
3423 3839
3424package CFClient::UI::Statusbox; 3840package CFPlus::UI::Statusbox;
3425 3841
3426our @ISA = CFClient::UI::VBox::; 3842our @ISA = CFPlus::UI::VBox::;
3427 3843
3428sub new { 3844sub new {
3429 my $class = shift; 3845 my $class = shift;
3430 3846
3431 my $self = $class->SUPER::new ( 3847 my $self = $class->SUPER::new (
3432 fontsize => 0.8, 3848 fontsize => 0.8,
3433 @_, 3849 @_,
3434 ); 3850 );
3435 3851
3436 Scalar::Util::weaken (my $this = $self); 3852 CFPlus::weaken (my $this = $self);
3437 3853
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439 3855
3440 $self 3856 $self
3441} 3857}
… …
3443sub reorder { 3859sub reorder {
3444 my ($self) = @_; 3860 my ($self) = @_;
3445 my $NOW = Time::HiRes::time; 3861 my $NOW = Time::HiRes::time;
3446 3862
3447 # freeze display when hovering over any label 3863 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner} 3864 return if $CFPlus::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3865 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} }; 3866 values %{ $self->{item} };
3451 3867
3452 while (my ($k, $v) = each %{ $self->{item} }) { 3868 while (my ($k, $v) = each %{ $self->{item} }) {
3453 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3869 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454 } 3870 }
… …
3475 for ($short) { 3891 for ($short) {
3476 s/^\s+//; 3892 s/^\s+//;
3477 s/\s+/ /g; 3893 s/\s+/ /g;
3478 } 3894 }
3479 3895
3480 new CFClient::UI::Label 3896 new CFPlus::UI::Label
3481 markup => $short, 3897 markup => $short,
3482 tooltip => $item->{tooltip}, 3898 tooltip => $item->{tooltip},
3483 tooltip_font => $::FONT_PROP, 3899 tooltip_font => $::FONT_PROP,
3484 tooltip_width => 0.67, 3900 tooltip_width => 0.67,
3485 fontsize => $item->{fontsize} || $self->{fontsize}, 3901 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3564 $self->SUPER::destroy; 3980 $self->SUPER::destroy;
3565} 3981}
3566 3982
3567############################################################################# 3983#############################################################################
3568 3984
3569package CFClient::UI::Inventory;
3570
3571our @ISA = CFClient::UI::Table::;
3572
3573sub new {
3574 my $class = shift;
3575
3576 my $self = $class->SUPER::new (
3577 col_expand => [0, 1, 0],
3578 items => [],
3579 @_,
3580 );
3581
3582 $self->set_sort_order (undef);
3583
3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3620}
3621
3622sub set_items {
3623 my ($self, $items) = @_;
3624
3625 $self->{items} = [$items ? values %$items : ()];
3626 $self->update_items;
3627}
3628
3629#############################################################################
3630
3631package CFClient::UI::SpellList;
3632
3633our @ISA = CFClient::UI::Table::;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 binding => [],
3640 commands => [],
3641 @_,
3642 )
3643}
3644
3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3730sub add_spell {
3731 my ($self, $spell) = @_;
3732
3733 $self->{spell}->{$spell->{name}} = $spell;
3734 $self->rebuild_spell_list;
3735}
3736
3737sub remove_spell {
3738 my ($self, $spell) = @_;
3739
3740 delete $self->{spell}->{$spell->{name}};
3741 $self->rebuild_spell_list;
3742}
3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3751#############################################################################
3752
3753package CFClient::UI::Root; 3985package CFPlus::UI::Root;
3754 3986
3755our @ISA = CFClient::UI::Container::; 3987our @ISA = CFPlus::UI::Container::;
3756 3988
3757use List::Util qw(min max); 3989use List::Util qw(min max);
3758 3990
3759use CFClient::OpenGL; 3991use CFPlus::OpenGL;
3760 3992
3761sub new { 3993sub new {
3762 my $class = shift; 3994 my $class = shift;
3763 3995
3764 my $self = $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3765 visible => 1, 3997 visible => 1,
3766 @_, 3998 @_,
3767 ); 3999 );
3768 4000
3769 Scalar::Util::weaken ($self->{root} = $self); 4001 CFPlus::weaken ($self->{root} = $self);
3770 4002
3771 $self 4003 $self
3772} 4004}
3773 4005
3774sub size_request { 4006sub size_request {
… …
3869 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3870 $_->() 4102 $_->()
3871 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3872 } 4104 }
3873 4105
3874 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
3875 my %queue; 4107 my %queue;
3876 my @queue; 4108 my @queue;
3877 my $widget; 4109 my $widget;
3878 4110
3879 outer: 4111 outer:
… …
3926 } 4158 }
3927 } 4159 }
3928 4160
3929 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
3930 } 4162 }
3931 }
3932 4163
3933 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3934 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3935 values %$size_alloc; 4166 values %$size_alloc;
3936 4167
3937 while () { 4168 while () {
3938 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
3939 4170
3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3941 4172
3942 $w = 0 if $w < 0;
3943 $h = 0 if $h < 0;
3944
3945 $w = max $widget->{min_w}, $w; 4173 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h; 4174 $h = max $widget->{min_h}, $h;
3947 4175
3948# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3949# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3950 4178
3951 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3952 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3953 4181
3954 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
3955 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
3956 4184
3957 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3958 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
3959 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
3960 4188
3961 $widget->{w} = $w; 4189 $widget->{w} = $w;
3962 $widget->{h} = $h; 4190 $widget->{h} = $h;
3963 4191
3964 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
3965 } 4194 }
3966 } 4195 }
3967 } 4196 }
3968 4197
3969 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
3970 $_->() 4199 $_->()
3971 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
3972 } 4201 }
3973
3974 4202
3975 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3976 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3977 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
3978 4206
… …
3981 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4209 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3982 glMatrixMode GL_MODELVIEW; 4210 glMatrixMode GL_MODELVIEW;
3983 glLoadIdentity; 4211 glLoadIdentity;
3984 4212
3985 { 4213 {
3986 package CFClient::UI::Base; 4214 package CFPlus::UI::Base;
3987 4215
3988 ($draw_x, $draw_y, $draw_w, $draw_h) = 4216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3989 (0, 0, $self->{w}, $self->{h}); 4217 (0, 0, $self->{w}, $self->{h});
3990 }
3991 4218
3992 $self->_draw; 4219 $self->_draw;
4220 }
3993} 4221}
3994 4222
3995############################################################################# 4223#############################################################################
3996 4224
3997package CFClient::UI; 4225package CFPlus::UI;
3998 4226
3999$ROOT = new CFClient::UI::Root; 4227$ROOT = new CFPlus::UI::Root;
4000$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4228$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4001 4229
40021 42301
4003 4231

Diff Legend

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