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.325 by root, Thu Jul 13 01:29:17 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 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;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $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};
227 $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};
228 $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};
229 $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};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
… …
452 490
453 $FOCUS->emit ("focus_out") if $FOCUS; 491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
474} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
574 glEnd; 636 glEnd;
575 glPopMatrix; 637 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 639 }
578 640
579 $self->_draw; 641 $self->_draw;
580 glPopMatrix; 642 glPopMatrix;
581} 643}
… …
587} 649}
588 650
589sub DESTROY { 651sub DESTROY {
590 my ($self) = @_; 652 my ($self) = @_;
591 653
592 return if CFClient::in_destruct; 654 return if CFPlus::in_destruct;
593
594 delete $WIDGET{$self+0};
595 655
596 eval { $self->destroy }; 656 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658
659 delete $WIDGET{$self+0};
598} 660}
599 661
600############################################################################# 662#############################################################################
601 663
602package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
603 665
604our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
605 667
606use strict; 668use strict;
607use CFClient::OpenGL; 669use CFPlus::OpenGL;
608 670
609sub new { 671sub new {
610 my $class = shift; 672 my $class = shift;
611 673
612 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
643 } 705 }
644} 706}
645 707
646############################################################################# 708#############################################################################
647 709
648package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
649 711
650our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
651 713
652sub new { 714sub new {
653 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
655} 717}
… …
662 724
663sub draw { } 725sub draw { }
664 726
665############################################################################# 727#############################################################################
666 728
667package CFClient::UI::Container; 729package CFPlus::UI::Container;
668 730
669our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
670 732
671sub new { 733sub new {
672 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
673 735
674 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
678 can_events => 0, 740 can_events => 0,
679 %arg, 741 %arg,
680 ); 742 );
681 743
682 $self->add (@$children) 744 $self->add (@$children)
683 if $children; 745 if $children && @$children;
684 746
685 $self 747 $self
748}
749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
686} 756}
687 757
688sub add { 758sub add {
689 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
690 760
691 $_->set_parent ($self) 761 $_->set_parent ($self)
692 for @widgets; 762 for @widgets;
693 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
694 use sort 'stable'; 765 use sort 'stable';
695 766
696 $self->{children} = [ 767 $self->{children} = [
697 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
698 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
699 ]; 770 ];
700 771
701 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
702} 775}
703 776
704sub children { 777sub children {
705 @{ $_[0]{children} } 778 @{ $_[0]{children} }
706} 779}
… …
717} 790}
718 791
719sub clear { 792sub clear {
720 my ($self) = @_; 793 my ($self) = @_;
721 794
722 my $children = delete $self->{children}; 795 my $children = $self->{children};
723 $self->{children} = []; 796 $self->{children} = [];
724 797
725 for (@$children) { 798 for (@$children) {
726 delete $_->{parent}; 799 delete $_->{parent};
727 $_->hide; 800 $_->hide;
… …
752 $_->draw for @{$self->{children}}; 825 $_->draw for @{$self->{children}};
753} 826}
754 827
755############################################################################# 828#############################################################################
756 829
757package CFClient::UI::Bin; 830package CFPlus::UI::Bin;
758 831
759our @ISA = CFClient::UI::Container::; 832our @ISA = CFPlus::UI::Container::;
760 833
761sub new { 834sub new {
762 my ($class, %arg) = @_; 835 my ($class, %arg) = @_;
763 836
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 838
766 $class->SUPER::new (children => [$child], %arg) 839 $class->SUPER::new (children => [$child], %arg)
767} 840}
768 841
769sub add { 842sub add {
… …
776sub remove { 849sub remove {
777 my ($self, $widget) = @_; 850 my ($self, $widget) = @_;
778 851
779 $self->SUPER::remove ($widget); 852 $self->SUPER::remove ($widget);
780 853
781 $self->{children} = [new CFClient::UI::Empty] 854 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 855 unless @{$self->{children}};
783} 856}
784 857
785sub child { $_[0]->{children}[0] } 858sub child { $_[0]->{children}[0] }
786 859
… …
798 871
799############################################################################# 872#############################################################################
800 873
801# back-buffered drawing area 874# back-buffered drawing area
802 875
803package CFClient::UI::Window; 876package CFPlus::UI::Window;
804 877
805our @ISA = CFClient::UI::Bin::; 878our @ISA = CFPlus::UI::Bin::;
806 879
807use CFClient::OpenGL; 880use CFPlus::OpenGL;
808 881
809sub new { 882sub new {
810 my ($class, %arg) = @_; 883 my ($class, %arg) = @_;
811 884
812 my $self = $class->SUPER::new (%arg); 885 my $self = $class->SUPER::new (%arg);
… …
834} 907}
835 908
836sub render_child { 909sub render_child {
837 my ($self) = @_; 910 my ($self) = @_;
838 911
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 912 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 913 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
842 915
843 { 916 {
844 package CFClient::UI::Base; 917 package CFPlus::UI::Base;
845 918
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 920 (0, 0, $self->{w}, $self->{h});
921
922 $self->_render;
848 } 923 }
849
850 $self->_render;
851 }; 924 };
852} 925}
853 926
854sub _draw { 927sub _draw {
855 my ($self) = @_; 928 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 929
859 my $tex = $self->{texture} 930 my $tex = $self->{texture}
860 or return; 931 or return;
861 932
862 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 935 glColor 0, 0, 0, 1;
865 936
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
867 938
868 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
869} 940}
870 941
871############################################################################# 942#############################################################################
872 943
873package CFClient::UI::ViewPort; 944package CFPlus::UI::ViewPort;
874 945
946use List::Util qw(min max);
947
875our @ISA = CFClient::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
876 949
877sub new { 950sub new {
878 my $class = shift; 951 my $class = shift;
879 952
880 $class->SUPER::new ( 953 $class->SUPER::new (
… …
887sub size_request { 960sub size_request {
888 my ($self) = @_; 961 my ($self) = @_;
889 962
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 964
892 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
894 967
895 ($w, $h) 968 ($w, $h)
896} 969}
897 970
898sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
910} 983}
911 984
912sub set_offset { 985sub set_offset {
913 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
914 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
915 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
917 994
995 $self->emit (changed => $x, $y);
918 $self->update; 996 $self->update;
997 }
919} 998}
920 999
921# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 1001sub coord2local {
923 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
938 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
939 1018
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1021 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 1023 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1025 }
947} 1026}
948 1027
949sub _render { 1028sub _render {
950 my ($self) = @_; 1029 my ($self) = @_;
951 1030
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1031 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1032 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1033
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1035
957 $self->SUPER::_render; 1036 $self->SUPER::_render;
958} 1037}
959 1038
960############################################################################# 1039#############################################################################
961 1040
962package CFClient::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
963 1042
964our @ISA = CFClient::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
965 1044
966sub new { 1045sub new {
967 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
968 1047
969 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
970 1049
971 my $self; 1050 my $self;
972 1051
973 my $slider = new CFClient::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
974 vertical => 1, 1066 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1068 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1071 },
979 ; 1072 ;
980 1073
981 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
983 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
984 %arg, 1082 %arg,
985 ); 1083 );
986 1084
1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 ;
1100
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1101 $self->SUPER::add ($self->{vp});
1102
988 $self->add ($child) if $child; 1103 $self->add ($child) if $child;
989 1104
990 $self 1105 $self
991} 1106}
992
993#TODO# update range on size_allocate depending on child
994 1107
995sub add { 1108sub add {
996 my ($self, $widget) = @_; 1109 my ($self, $widget) = @_;
997 1110
998 $self->{vp}->add ($self->{child} = $widget); 1111 $self->{vp}->add ($self->{child} = $widget);
999} 1112}
1000 1113
1001sub update_slider { 1114sub update_slider {
1002 my ($self) = @_; 1115 my ($self) = @_;
1003 1116
1117 my $child = ($self->{vp} or return)->child;
1118
1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1120 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1005}
1006 1121
1007sub update { 1122 my $visible = $w1 > $w2;
1123 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138}
1139
1140sub start_dragging {
1008 my ($self) = @_; 1141 my ($self, $ev) = @_;
1009 1142
1010 $self->SUPER::update; 1143 $self->grab_focus;
1011 1144
1012 $self->update_slider; 1145 my $ox = $self->{vp}{view_x};
1146 my $oy = $self->{vp}{view_y};
1147
1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1155 };
1156}
1157
1158sub invoke_mouse_wheel {
1159 my ($self, $ev) = @_;
1160
1161 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1162 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1163
1164 1
1165}
1166
1167sub invoke_button_down {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if ($ev->{button} == 2) {
1171 $self->start_dragging ($ev);
1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if (delete $self->{motion}) {
1182 return 1;
1183 }
1184
1185 0
1186}
1187
1188sub invoke_mouse_motion {
1189 my ($self, $ev, $x, $y) = @_;
1190
1191 if ($self->{motion}) {
1192 $self->{motion}->($ev, $x, $y);
1193 return 1;
1194 }
1195
1196 0
1013} 1197}
1014 1198
1015sub invoke_size_allocate { 1199sub invoke_size_allocate {
1016 my ($self, $w, $h) = @_; 1200 my ($self, $w, $h) = @_;
1017 1201
1018 $self->update_slider; 1202 $self->update_slider;
1019
1020 $self->SUPER::invoke_size_allocate ($w, $h) 1203 $self->SUPER::invoke_size_allocate ($w, $h)
1021} 1204}
1022 1205
1023############################################################################# 1206#############################################################################
1024 1207
1025package CFClient::UI::Frame; 1208package CFPlus::UI::Frame;
1026 1209
1027our @ISA = CFClient::UI::Bin::; 1210our @ISA = CFPlus::UI::Bin::;
1028 1211
1029use CFClient::OpenGL; 1212use CFPlus::OpenGL;
1030 1213
1031sub new { 1214sub new {
1032 my $class = shift; 1215 my $class = shift;
1033 1216
1034 $class->SUPER::new ( 1217 $class->SUPER::new (
… …
1060 $self->SUPER::_draw; 1243 $self->SUPER::_draw;
1061} 1244}
1062 1245
1063############################################################################# 1246#############################################################################
1064 1247
1065package CFClient::UI::FancyFrame; 1248package CFPlus::UI::FancyFrame;
1066 1249
1067our @ISA = CFClient::UI::Bin::; 1250our @ISA = CFPlus::UI::Bin::;
1068 1251
1069use CFClient::OpenGL; 1252use CFPlus::OpenGL;
1253
1254sub new {
1255 my ($class, %arg) = @_;
1256
1257 if ((exists $arg{label}) && !ref $arg{label}) {
1258 $arg{label} = new CFPlus::UI::Label
1259 align => 1,
1260 valign => 0,
1261 text => $arg{label},
1262 fontsize => ($arg{border} || 0.8) * 0.75;
1263 }
1264
1265 my $self = $class->SUPER::new (
1266 # label => "",
1267 fg => [0.6, 0.3, 0.1],
1268 border => 0.8,
1269 style => 'single',
1270 %arg,
1271 );
1272
1273 $self
1274}
1275
1276sub add {
1277 my ($self, @widgets) = @_;
1278
1279 $self->SUPER::add (@widgets);
1280 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1281}
1282
1283sub border {
1284 int $_[0]{border} * $::FONTSIZE
1285}
1286
1287sub size_request {
1288 my ($self) = @_;
1289
1290 ($self->{label_w}, undef) = $self->{label}->size_request
1291 if $self->{label};
1292
1293 my ($w, $h) = $self->SUPER::size_request;
1294
1295 (
1296 $w + $self->border * 2,
1297 $h + $self->border * 2,
1298 )
1299}
1300
1301sub invoke_size_allocate {
1302 my ($self, $w, $h) = @_;
1303
1304 my $border = $self->border;
1305
1306 $w -= List::Util::max 0, $border * 2;
1307 $h -= List::Util::max 0, $border * 2;
1308
1309 if (my $label = $self->{label}) {
1310 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1311 $label->{h} = List::Util::min $h, $border;
1312 $label->invoke_size_allocate ($label->{w}, $label->{h});
1313 }
1314
1315 $self->child->configure ($border, $border, $w, $h);
1316
1317 1
1318}
1319
1320sub _draw {
1321 my ($self) = @_;
1322
1323 my $child = $self->{children}[0];
1324
1325 my $border = $self->border;
1326 my ($w, $h) = ($self->{w}, $self->{h});
1327
1328 $child->draw;
1329
1330 glColor @{$self->{fg}};
1331 glBegin GL_LINE_STRIP;
1332 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1333 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1337 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1338 glEnd;
1339
1340 if ($self->{label}) {
1341 glTranslate $border * 2, 0;
1342 $self->{label}->_draw;
1343 }
1344}
1345
1346#############################################################################
1347
1348package CFPlus::UI::Toplevel;
1349
1350our @ISA = CFPlus::UI::Bin::;
1351
1352use CFPlus::OpenGL;
1070 1353
1071my $bg = 1354my $bg =
1072 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1355 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073 mipmap => 1, wrap => 1; 1356 mipmap => 1, wrap => 1;
1074 1357
1075my @border = 1358my @border =
1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1360 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1361
1362my @icon =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(x1_move.png x1_resize.png);
1078 1365
1079sub new { 1366sub new {
1080 my ($class, %arg) = @_; 1367 my ($class, %arg) = @_;
1081 1368
1082 my $self = $class->SUPER::new ( 1369 my $self = $class->SUPER::new (
1083 bg => [1, 1, 1, 1], 1370 bg => [1, 1, 1, 1],
1084 border_bg => [1, 1, 1, 1], 1371 border_bg => [1, 1, 1, 1],
1085 border => 0.6, 1372 border => 0.6,
1086 can_events => 1, 1373 can_events => 1,
1087 min_w => 16, 1374 min_w => 64,
1088 min_h => 16, 1375 min_h => 32,
1089 %arg, 1376 %arg,
1090 ); 1377 );
1091 1378
1092 $self->{title_widget} = new CFClient::UI::Label 1379 $self->{title_widget} = new CFPlus::UI::Label
1093 align => 0, 1380 align => 0,
1094 valign => 1, 1381 valign => 1,
1095 text => $self->{title}, 1382 text => $self->{title},
1096 fontsize => $self->{border}, 1383 fontsize => $self->{border},
1097 if exists $self->{title}; 1384 if exists $self->{title};
1098 1385
1099 if ($self->{has_close_button}) { 1386 if ($self->{has_close_button}) {
1100 $self->{close_button} = 1387 $self->{close_button} =
1101 new CFClient::UI::ImageButton 1388 new CFPlus::UI::ImageButton
1102 path => 'x1_close.png', 1389 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") }; 1390 on_activate => sub { $self->emit ("delete") };
1104 1391
1105 $self->CFClient::UI::Container::add ($self->{close_button}); 1392 $self->CFPlus::UI::Container::add ($self->{close_button});
1106 } 1393 }
1107 1394
1108 $self 1395 $self
1109} 1396}
1110 1397
1111sub add { 1398sub add {
1112 my ($self, @widgets) = @_; 1399 my ($self, @widgets) = @_;
1113 1400
1114 $self->SUPER::add (@widgets); 1401 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1402 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1403 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1117} 1404}
1118 1405
1119sub border { 1406sub border {
1120 int $_[0]{border} * $::FONTSIZE 1407 int $_[0]{border} * $::FONTSIZE
1121} 1408}
… …
1229 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1516 $self->{motion}->($ev, $x, $y) if $self->{motion};
1230 1517
1231 ! ! $self->{motion} 1518 ! ! $self->{motion}
1232} 1519}
1233 1520
1521sub invoke_visibility_change {
1522 my ($self, $visible) = @_;
1523
1524 delete $self->{motion} unless $visible;
1525
1526 0
1527}
1528
1234sub _draw { 1529sub _draw {
1235 my ($self) = @_; 1530 my ($self) = @_;
1236 1531
1237 my $child = $self->{children}[0]; 1532 my $child = $self->{children}[0];
1238 1533
… …
1243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1244 1539
1245 my $border = $self->border; 1540 my $border = $self->border;
1246 1541
1247 glColor @{ $self->{border_bg} }; 1542 glColor @{ $self->{border_bg} };
1248 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1543 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1249 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1544 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1250 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1545 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1251 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1546 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1547
1548 # move
1549 my $w2 = ($w - $border) * .5;
1550 my $h2 = ($h - $border) * .5;
1551 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1552 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1554
1555 # resize
1556 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1558 unless $self->{has_close_button};
1559 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1252 1561
1253 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1562 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1254 glColor @{ $self->{bg} }; 1563 glColor @{ $self->{bg} };
1255 1564
1256 # TODO: repeat texture not scale 1565 # TODO: repeat texture not scale
… …
1275 if $self->{close_button}; 1584 if $self->{close_button};
1276} 1585}
1277 1586
1278############################################################################# 1587#############################################################################
1279 1588
1280package CFClient::UI::Table; 1589package CFPlus::UI::Table;
1281 1590
1282our @ISA = CFClient::UI::Base::; 1591our @ISA = CFPlus::UI::Container::;
1283 1592
1284use List::Util qw(max sum); 1593use List::Util qw(max sum);
1285 1594
1286use CFClient::OpenGL; 1595use CFPlus::OpenGL;
1287 1596
1288sub new { 1597sub new {
1289 my $class = shift; 1598 my $class = shift;
1290 1599
1291 $class->SUPER::new ( 1600 $class->SUPER::new (
1292 col_expand => [], 1601 col_expand => [],
1602 row_expand => [],
1293 @_, 1603 @_,
1294 ) 1604 )
1295} 1605}
1296 1606
1297sub children {
1298 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299}
1300
1301sub add { 1607sub add {
1302 my ($self, $x, $y, $child) = @_; 1608 my ($self, @widgets) = @_;
1303 1609
1304 $child->set_parent ($self); 1610 for my $child (@widgets) {
1305 $self->{children}[$y][$x] = $child; 1611 $child->{rowspan} ||= 1;
1612 $child->{colspan} ||= 1;
1613 }
1306 1614
1307 $self->realloc; 1615 $self->SUPER::add (@widgets);
1308} 1616}
1309 1617
1310sub remove { 1618sub add_at {
1619 my $self = shift;
1620
1621 my @widgets;
1622
1623 while (@_) {
1624 my ($col, $row, $child) = splice @_, 0, 3, ();
1625
1626 $child->{row} = $row;
1627 $child->{col} = $col;
1628
1629 push @widgets, $child;
1630 }
1631
1632 $self->add (@widgets);
1633}
1634
1635sub get_wh {
1311 my ($self, $child) = @_; 1636 my ($self) = @_;
1312 1637
1313 # TODO: not yet implemented 1638 my (@w, @h);
1314}
1315
1316# TODO: move to container class maybe? send children a signal on removal?
1317sub clear {
1318 my ($self) = @_;
1319 1639
1320 my @children = $self->children; 1640 my @children = $self->children;
1321 delete $self->{children}; 1641
1642 # first pass, columns
1643 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1644 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1645
1646 my $sw = sum @w[$c .. $c + $cs - 1];
1647
1648 if ($w > $sw) {
1649 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1650 }
1322 1651 }
1323 for (@children) {
1324 delete $_->{parent};
1325 $_->hide;
1326 }
1327 1652
1328 $self->realloc; 1653 # second pass, rows
1329} 1654 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1330
1331sub get_wh {
1332 my ($self) = @_;
1333
1334 my (@w, @h);
1335
1336 for my $y (0 .. $#{$self->{children}}) {
1337 my $row = $self->{children}[$y]
1338 or next;
1339
1340 for my $x (0 .. $#$row) {
1341 my $widget = $row->[$x]
1342 or next;
1343 my ($w, $h) = @$widget{qw(req_w req_h)}; 1655 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1344 1656
1345 $w[$x] = max $w[$x], $w; 1657 my $sh = sum @h[$r .. $r + $rs - 1];
1346 $h[$y] = max $h[$y], $h; 1658
1659 if ($h > $sh) {
1660 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1347 } 1661 }
1348 } 1662 }
1349 1663
1350 (\@w, \@h) 1664 (\@w, \@h)
1351} 1665}
… …
1367 my ($ws, $hs) = $self->get_wh; 1681 my ($ws, $hs) = $self->get_wh;
1368 1682
1369 my $req_w = (sum @$ws) || 1; 1683 my $req_w = (sum @$ws) || 1;
1370 my $req_h = (sum @$hs) || 1; 1684 my $req_h = (sum @$hs) || 1;
1371 1685
1372 # TODO: nicer code && do row_expand 1686 # now linearly scale the rows/columns to the allocated size
1373 my @col_expand = @{$self->{col_expand}}; 1687 my @col_expand = @{$self->{col_expand}};
1374 @col_expand = (1) x @$ws unless @col_expand; 1688 @col_expand = (1) x @$ws unless @col_expand;
1375 my $col_expand = (sum @col_expand) || 1; 1689 my $col_expand = (sum @col_expand) || 1;
1376 1690
1377 # linearly scale sizes
1378 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1691 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380 1692
1381 CFClient::UI::harmonize $ws; 1693 CFPlus::UI::harmonize $ws;
1694
1695 my @row_expand = @{$self->{row_expand}};
1696 @row_expand = (1) x @$ws unless @row_expand;
1697 my $row_expand = (sum @row_expand) || 1;
1698
1699 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1700
1382 CFClient::UI::harmonize $hs; 1701 CFPlus::UI::harmonize $hs;
1383 1702
1384 my $y; 1703 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1704 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1385 1705
1386 for my $r (0 .. $#{$self->{children}}) { 1706 for my $widget ($self->children) {
1387 my $row = $self->{children}[$r] 1707 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1388 or next;
1389 1708
1390 my $x = 0; 1709 $widget->configure (
1391 my $row_h = $hs->[$r]; 1710 $x[$c], $y[$r],
1711 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1392 1712 );
1393 for my $c (0 .. $#$row) { 1713 }
1394 my $col_w = $ws->[$c];
1395 1714
1396 if (my $widget = $row->[$c]) { 1715 1
1397 $widget->configure ($x, $y, $col_w, $row_h); 1716}
1398 }
1399 1717
1400 $x += $col_w; 1718#############################################################################
1719
1720package CFPlus::UI::Fixed;
1721
1722use List::Util qw(min max);
1723
1724our @ISA = CFPlus::UI::Container::;
1725
1726sub add {
1727 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1728
1729 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1730 $self->SUPER::add ($child);
1731}
1732
1733sub _scale($$$) {
1734 my ($mode, $val, $max) = @_;
1735
1736 $mode eq "abs" ? $val
1737 : $mode eq "rel" ? $val * $max
1738 : 0
1739}
1740
1741sub size_request {
1742 my ($self) = @_;
1743
1744 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1745
1746 # determine overall size by querying abs widgets
1747 for my $child ($self->visible_children) {
1748 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1749
1750 if ($pos eq "abs") {
1751 $w = _scale $size, $w, $child->{req_w};
1752 $h = _scale $size, $h, $child->{req_h};
1753
1754 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1755 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1401 } 1756 }
1757 }
1402 1758
1403 $y += $row_h; 1759 my $W = $x2 - $x1;
1760 my $H = $y2 - $y1;
1761
1762 # now layout remaining widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos ne "abs") {
1767 $x = _scale $pos, $x, $W;
1768 $y = _scale $pos, $x, $H;
1769 $w = _scale $size, $w, $child->{req_w};
1770 $h = _scale $size, $h, $child->{req_h};
1771
1772 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1773 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1774 }
1775 }
1776
1777 my $W = $x2 - $x1;
1778 my $H = $y2 - $y1;
1779
1780 ($W, $H)
1781}
1782
1783sub invoke_size_allocate {
1784 my ($self, $W, $H) = @_;
1785
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 $x = _scale $pos, $x, $W;
1790 $y = _scale $pos, $x, $H;
1791 $w = _scale $size, $w, $child->{req_w};
1792 $h = _scale $size, $h, $child->{req_h};
1793
1794 $child->configure ($x, $y, $w, $h);
1404 } 1795 }
1405 1796
1406 1 1797 1
1407} 1798}
1408 1799
1409sub find_widget {
1410 my ($self, $x, $y) = @_;
1411
1412 $x -= $self->{x};
1413 $y -= $self->{y};
1414
1415 my $res;
1416
1417 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1418 $res = $_->find_widget ($x, $y)
1419 and return $res;
1420 }
1421
1422 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1423}
1424
1425sub _draw {
1426 my ($self) = @_;
1427
1428 for (grep $_, @{$self->{children}}) {
1429 $_->draw for grep $_, @$_;
1430 }
1431}
1432
1433############################################################################# 1800#############################################################################
1434 1801
1435package CFClient::UI::Box; 1802package CFPlus::UI::Box;
1436 1803
1437our @ISA = CFClient::UI::Container::; 1804our @ISA = CFPlus::UI::Container::;
1438 1805
1439sub size_request { 1806sub size_request {
1440 my ($self) = @_; 1807 my ($self) = @_;
1441 1808
1442 $self->{vertical} 1809 $self->{vertical}
… …
1475 $req[$_] += $space * $children[$_]{expand} 1842 $req[$_] += $space * $children[$_]{expand}
1476 for 0 .. $#children; 1843 for 0 .. $#children;
1477 } 1844 }
1478 } 1845 }
1479 1846
1480 CFClient::UI::harmonize \@req; 1847 CFPlus::UI::harmonize \@req;
1481 1848
1482 my $pos = 0; 1849 my $pos = 0;
1483 for (0 .. $#children) { 1850 for (0 .. $#children) {
1484 my $alloc = $req[$_]; 1851 my $alloc = $req[$_];
1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1852 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1490 1 1857 1
1491} 1858}
1492 1859
1493############################################################################# 1860#############################################################################
1494 1861
1495package CFClient::UI::HBox; 1862package CFPlus::UI::HBox;
1496 1863
1497our @ISA = CFClient::UI::Box::; 1864our @ISA = CFPlus::UI::Box::;
1498 1865
1499sub new { 1866sub new {
1500 my $class = shift; 1867 my $class = shift;
1501 1868
1502 $class->SUPER::new ( 1869 $class->SUPER::new (
… …
1505 ) 1872 )
1506} 1873}
1507 1874
1508############################################################################# 1875#############################################################################
1509 1876
1510package CFClient::UI::VBox; 1877package CFPlus::UI::VBox;
1511 1878
1512our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1513 1880
1514sub new { 1881sub new {
1515 my $class = shift; 1882 my $class = shift;
1516 1883
1517 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1520 ) 1887 )
1521} 1888}
1522 1889
1523############################################################################# 1890#############################################################################
1524 1891
1525package CFClient::UI::Label; 1892package CFPlus::UI::Label;
1526 1893
1527our @ISA = CFClient::UI::DrawBG::; 1894our @ISA = CFPlus::UI::DrawBG::;
1528 1895
1529use CFClient::OpenGL; 1896use CFPlus::OpenGL;
1530 1897
1531sub new { 1898sub new {
1532 my ($class, %arg) = @_; 1899 my ($class, %arg) = @_;
1533 1900
1534 my $self = $class->SUPER::new ( 1901 my $self = $class->SUPER::new (
… …
1537 #active_bg => none 1904 #active_bg => none
1538 #font => default_font 1905 #font => default_font
1539 #text => initial text 1906 #text => initial text
1540 #markup => initial narkup 1907 #markup => initial narkup
1541 #max_w => maximum pixel width 1908 #max_w => maximum pixel width
1909 #style => 0, # render flags
1542 ellipsise => 3, # end 1910 ellipsise => 3, # end
1543 layout => (new CFClient::Layout), 1911 layout => (new CFPlus::Layout),
1544 fontsize => 1, 1912 fontsize => 1,
1545 align => -1, 1913 align => -1,
1546 valign => -1, 1914 valign => -1,
1547 padding_x => 2, 1915 padding_x => 2,
1548 padding_y => 2, 1916 padding_y => 2,
1549 can_events => 0, 1917 can_events => 0,
1550 %arg 1918 %arg
1551 ); 1919 );
1552 1920
1553 if (exists $self->{template}) { 1921 if (exists $self->{template}) {
1554 my $layout = new CFClient::Layout; 1922 my $layout = new CFPlus::Layout;
1555 $layout->set_text (delete $self->{template}); 1923 $layout->set_text (delete $self->{template});
1556 $self->{template} = $layout; 1924 $self->{template} = $layout;
1557 } 1925 }
1558 1926
1559 if (exists $self->{markup}) { 1927 if (exists $self->{markup}) {
… …
1561 } else { 1929 } else {
1562 $self->set_text (delete $self->{text}); 1930 $self->set_text (delete $self->{text});
1563 } 1931 }
1564 1932
1565 $self 1933 $self
1566}
1567
1568sub escape($) {
1569 local $_ = $_[0];
1570
1571 s/&/&amp;/g;
1572 s/>/&gt;/g;
1573 s/</&lt;/g;
1574
1575 $_
1576} 1934}
1577 1935
1578sub update { 1936sub update {
1579 my ($self) = @_; 1937 my ($self) = @_;
1580 1938
… …
1707 }; 2065 };
1708 2066
1709 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2067 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2068 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 2069
1712 $self->{layout}->render ($self->{ox}, $self->{oy}); 2070 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713} 2071}
1714 2072
1715############################################################################# 2073#############################################################################
1716 2074
1717package CFClient::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
1718 2076
1719our @ISA = CFClient::UI::Label::; 2077our @ISA = CFPlus::UI::Label::;
1720 2078
1721use CFClient::OpenGL; 2079use CFPlus::OpenGL;
1722 2080
1723sub new { 2081sub new {
1724 my $class = shift; 2082 my $class = shift;
1725 2083
1726 $class->SUPER::new ( 2084 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2088 active_fg => [0, 0, 0],
1731 can_hover => 1, 2089 can_hover => 1,
1732 can_focus => 1, 2090 can_focus => 1,
1733 valign => 0, 2091 valign => 0,
1734 can_events => 1, 2092 can_events => 1,
2093 ellipsise => 0,
1735 #text => ... 2094 #text => ...
1736 #hidden => "*", 2095 #hidden => "*",
1737 @_ 2096 @_
1738 ) 2097 )
1739} 2098}
… …
1784 my $sym = $ev->{sym}; 2143 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2144 my $uni = $ev->{unicode};
1786 2145
1787 my $text = $self->get_text; 2146 my $text = $self->get_text;
1788 2147
2148 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2149
1789 if ($uni == 8) { 2150 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2151 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2152 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2153 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2154 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2155 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2156 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2157 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2158 } elsif ($sym == CFPlus::SDLK_HOME) {
2159 # what a hack
2160 $self->{cursor} =
2161 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2162 ? length $1
2163 : 0;
2164 } elsif ($sym == CFPlus::SDLK_END) {
2165 # uh, again
2166 $self->{cursor} =
2167 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2168 ? $self->{cursor} + length $1
2169 : length $self->{text};
2170 } elsif ($uni == 21) { # ctrl-u
2171 $text = "";
1798 $self->{cursor} = 0; 2172 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2173 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2174 $self->emit ('escape');
1803 } elsif ($uni) { 2175 } elsif ($uni == 0x0d) {
2176 substr $text, $self->{cursor}++, 0, "\012";
2177 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2178 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2179 } else {
1806 return 0; 2180 return 0;
1807 } 2181 }
1808 2182
1809 $self->_set_text ($text); 2183 $self->_set_text ($text);
1810 2184
1811 $self->realloc; 2185 $self->realloc;
2186 $self->update;
1812 2187
1813 1 2188 1
1814} 2189}
1815 2190
1816sub invoke_focus_in { 2191sub invoke_focus_in {
… …
1878 utf8::encode $text; 2253 utf8::encode $text;
1879 2254
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2256 }
1882 2257
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2258 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2261 glEnd;
1888 } 2262 }
1889} 2263}
1890 2264
2265#############################################################################
2266
1891package CFClient::UI::Entry; 2267package CFPlus::UI::Entry;
1892 2268
1893our @ISA = CFClient::UI::EntryBase::; 2269our @ISA = CFPlus::UI::EntryBase::;
1894 2270
1895use CFClient::OpenGL; 2271use CFPlus::OpenGL;
1896 2272
1897sub invoke_key_down { 2273sub invoke_key_down {
1898 my ($self, $ev) = @_; 2274 my ($self, $ev) = @_;
1899 2275
1900 my $sym = $ev->{sym}; 2276 my $sym = $ev->{sym};
1901 2277
1902 if ($sym == 13) { 2278 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2279 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2280 my $txt = $self->get_text;
1905 2281
1906 $self->{history_pointer} = -1; 2282 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2283 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2284 $self->emit (activate => $txt);
1909 $self->update; 2285 $self->update;
1910 2286
1911 } elsif ($sym == CFClient::SDLK_UP) { 2287 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2288 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2289 $self->{history_saveback} = $self->get_text;
1914 } 2290 }
1915 if (@{$self->{history} || []} > 0) { 2291 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2292 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2294 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2295 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2296 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2297 }
1922 2298
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2299 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2300 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2301 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2302
1927 if ($self->{history_pointer} >= 0) { 2303 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2304 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2313 1
1938} 2314}
1939 2315
1940############################################################################# 2316#############################################################################
1941 2317
2318package CFPlus::UI::TextEdit;
2319
2320our @ISA = CFPlus::UI::EntryBase::;
2321
2322use CFPlus::OpenGL;
2323
2324sub move_cursor_ver {
2325 my ($self, $dy) = @_;
2326
2327 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2328
2329 $y += $dy;
2330
2331 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2332 $self->{cursor} = $index;
2333 delete $self->{cur_h};
2334 $self->update;
2335 return;
2336 }
2337}
2338
2339sub invoke_key_down {
2340 my ($self, $ev) = @_;
2341
2342 my $sym = $ev->{sym};
2343
2344 if ($sym == CFPlus::SDLK_UP) {
2345 $self->move_cursor_ver (-1);
2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
2347 $self->move_cursor_ver (+1);
2348 } else {
2349 return $self->SUPER::invoke_key_down ($ev)
2350 }
2351
2352 1
2353}
2354
2355#############################################################################
2356
1942package CFClient::UI::Button; 2357package CFPlus::UI::Button;
1943 2358
1944our @ISA = CFClient::UI::Label::; 2359our @ISA = CFPlus::UI::Label::;
1945 2360
1946use CFClient::OpenGL; 2361use CFPlus::OpenGL;
1947 2362
1948my @tex = 2363my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2365 qw(b1_button_inactive.png b1_button_active.png);
1951 2366
1952sub new { 2367sub new {
1953 my $class = shift; 2368 my $class = shift;
1954 2369
1955 $class->SUPER::new ( 2370 $class->SUPER::new (
1956 padding_x => 4, 2371 padding_x => 4,
1957 padding_y => 4, 2372 padding_y => 4,
1958 fg => [1, 1, 1], 2373 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2374 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2375 can_hover => 1,
1961 align => 0, 2376 align => 0,
1962 valign => 0, 2377 valign => 0,
1963 can_events => 1, 2378 can_events => 1,
1964 @_ 2379 @_
… …
1982 2397
1983 glEnable GL_TEXTURE_2D; 2398 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2399 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2400 glColor 0, 0, 0, 1;
1986 2401
2402 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2403 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2404
1989 glDisable GL_TEXTURE_2D; 2405 glDisable GL_TEXTURE_2D;
1990 2406
1991 $self->SUPER::_draw; 2407 $self->SUPER::_draw;
1992} 2408}
1993 2409
1994############################################################################# 2410#############################################################################
1995 2411
2412package CFPlus::UI::CheckBox;
2413
2414our @ISA = CFPlus::UI::DrawBG::;
2415
2416my @tex =
2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2418 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2419
2420use CFPlus::OpenGL;
2421
2422sub new {
2423 my $class = shift;
2424
2425 $class->SUPER::new (
2426 padding_x => 2,
2427 padding_y => 2,
2428 fg => [1, 1, 1],
2429 active_fg => [1, 1, 0],
2430 bg => [0, 0, 0, 0.2],
2431 active_bg => [1, 1, 1, 0.5],
2432 state => 0,
2433 can_hover => 1,
2434 @_
2435 )
2436}
2437
2438sub size_request {
2439 my ($self) = @_;
2440
2441 (6) x 2
2442}
2443
2444sub toggle {
2445 my ($self) = @_;
2446
2447 $self->{state} = !$self->{state};
2448 $self->emit (changed => $self->{state});
2449 $self->update;
2450}
2451
2452sub invoke_button_down {
2453 my ($self, $ev, $x, $y) = @_;
2454
2455 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2456 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2457 $self->toggle;
2458 } else {
2459 return 0
2460 }
2461
2462 1
2463}
2464
2465sub _draw {
2466 my ($self) = @_;
2467
2468 $self->SUPER::_draw;
2469
2470 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2471
2472 my ($w, $h) = @$self{qw(w h)};
2473
2474 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2475
2476 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2477
2478 my $tex = $self->{state} ? $tex[1] : $tex[0];
2479
2480 glEnable GL_TEXTURE_2D;
2481 $tex->draw_quad_alpha (0, 0, $s, $s);
2482 glDisable GL_TEXTURE_2D;
2483}
2484
2485#############################################################################
2486
2487package CFPlus::UI::Image;
2488
2489our @ISA = CFPlus::UI::Base::;
2490
2491use CFPlus::OpenGL;
2492
2493our %texture_cache;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 can_events => 0,
2500 @_,
2501 );
2502
2503 $self->{path} || $self->{tex}
2504 or Carp::croak "'path' or 'tex' attributes required";
2505
2506 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2507 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2508
2509 CFPlus::weaken $texture_cache{$self->{path}};
2510
2511 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2512
2513 $self
2514}
2515
2516sub STORABLE_freeze {
2517 my ($self, $cloning) = @_;
2518
2519 $self->{path}
2520 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2521
2522 $self->{path}
2523}
2524
2525sub STORABLE_attach {
2526 my ($self, $cloning, $path) = @_;
2527
2528 $self->new (path => $path)
2529}
2530
2531sub size_request {
2532 my ($self) = @_;
2533
2534 ($self->{tex}{w}, $self->{tex}{h})
2535}
2536
2537sub _draw {
2538 my ($self) = @_;
2539
2540 my $tex = $self->{tex};
2541
2542 my ($w, $h) = ($self->{w}, $self->{h});
2543
2544 if ($self->{rot90}) {
2545 glRotate 90, 0, 0, 1;
2546 glTranslate 0, -$self->{w}, 0;
2547
2548 ($w, $h) = ($h, $w);
2549 }
2550
2551 glEnable GL_TEXTURE_2D;
2552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2553
2554 $tex->draw_quad (0, 0, $w, $h);
2555
2556 glDisable GL_TEXTURE_2D;
2557}
2558
2559#############################################################################
2560
1996package CFClient::UI::ImageButton; 2561package CFPlus::UI::ImageButton;
1997 2562
1998our @ISA = CFClient::UI::Image::; 2563our @ISA = CFPlus::UI::Image::;
1999 2564
2000use CFClient::OpenGL; 2565use CFPlus::OpenGL;
2001 2566
2002my %textures; 2567my %textures;
2003 2568
2004sub new { 2569sub new {
2005 my $class = shift; 2570 my $class = shift;
… …
2027 1 2592 1
2028} 2593}
2029 2594
2030############################################################################# 2595#############################################################################
2031 2596
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2072sub invoke_button_down {
2073 my ($self, $ev, $x, $y) = @_;
2074
2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077 $self->toggle;
2078 } else {
2079 return 0
2080 }
2081
2082 1
2083}
2084
2085sub _draw {
2086 my ($self) = @_;
2087
2088 $self->SUPER::_draw;
2089
2090 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092 my ($w, $h) = @$self{qw(w h)};
2093
2094 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098 my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100 glEnable GL_TEXTURE_2D;
2101 $tex->draw_quad_alpha (0, 0, $s, $s);
2102 glDisable GL_TEXTURE_2D;
2103}
2104
2105#############################################################################
2106
2107package CFClient::UI::Image; 2597package CFPlus::UI::VGauge;
2108 2598
2109our @ISA = CFClient::UI::Base::; 2599our @ISA = CFPlus::UI::Base::;
2110
2111use CFClient::OpenGL;
2112
2113our %texture_cache;
2114
2115sub new {
2116 my $class = shift;
2117
2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2122
2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
2125
2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133 $self
2134}
2135
2136sub size_request {
2137 my ($self) = @_;
2138
2139 ($self->{tex}{w}, $self->{tex}{h})
2140}
2141
2142sub _draw {
2143 my ($self) = @_;
2144
2145 my $tex = $self->{tex};
2146
2147 my ($w, $h) = ($self->{w}, $self->{h});
2148
2149 if ($self->{rot90}) {
2150 glRotate 90, 0, 0, 1;
2151 glTranslate 0, -$self->{w}, 0;
2152
2153 ($w, $h) = ($h, $w);
2154 }
2155
2156 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159 $tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161 glDisable GL_TEXTURE_2D;
2162}
2163
2164#############################################################################
2165
2166package CFClient::UI::VGauge;
2167
2168our @ISA = CFClient::UI::Base::;
2169 2600
2170use List::Util qw(min max); 2601use List::Util qw(min max);
2171 2602
2172use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2173 2604
2174my %tex = ( 2605my %tex = (
2175 food => [ 2606 food => [
2176 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2607 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178 ], 2609 ],
2179 grace => [ 2610 grace => [
2180 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2612 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182 ], 2613 ],
2183 hp => [ 2614 hp => [
2184 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2615 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186 ], 2617 ],
2187 mana => [ 2618 mana => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2619 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2620 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190 ], 2621 ],
2191); 2622);
2192 2623
2193# eg. VGauge->new (gauge => 'food'), default gauge: food 2624# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2296 glDisable GL_TEXTURE_2D; 2727 glDisable GL_TEXTURE_2D;
2297} 2728}
2298 2729
2299############################################################################# 2730#############################################################################
2300 2731
2301package CFClient::UI::Gauge; 2732package CFPlus::UI::Gauge;
2302 2733
2303our @ISA = CFClient::UI::VBox::; 2734our @ISA = CFPlus::UI::VBox::;
2304 2735
2305sub new { 2736sub new {
2306 my ($class, %arg) = @_; 2737 my ($class, %arg) = @_;
2307 2738
2308 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
… …
2310 can_hover => 1, 2741 can_hover => 1,
2311 can_events => 1, 2742 can_events => 1,
2312 %arg, 2743 %arg,
2313 ); 2744 );
2314 2745
2315 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2746 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2316 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2747 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2317 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2748 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2318 2749
2319 $self 2750 $self
2320} 2751}
2321 2752
2322sub set_fontsize { 2753sub set_fontsize {
… …
2343 $self->{value}->set_text ($val); 2774 $self->{value}->set_text ($val);
2344} 2775}
2345 2776
2346############################################################################# 2777#############################################################################
2347 2778
2348package CFClient::UI::Slider; 2779package CFPlus::UI::Slider;
2349 2780
2350use strict; 2781use strict;
2351 2782
2352use CFClient::OpenGL; 2783use CFPlus::OpenGL;
2353 2784
2354our @ISA = CFClient::UI::DrawBG::; 2785our @ISA = CFPlus::UI::DrawBG::;
2355 2786
2356my @tex = 2787my @tex =
2357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2788 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358 qw(s1_slider.png s1_slider_bg.png); 2789 qw(s1_slider.png s1_slider_bg.png);
2359 2790
2360sub new { 2791sub new {
2361 my $class = shift; 2792 my $class = shift;
2362 2793
… …
2451 } 2882 }
2452 2883
2453 1 2884 1
2454} 2885}
2455 2886
2887sub invoke_mouse_wheel {
2888 my ($self, $ev) = @_;
2889
2890 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2891
2892 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2893
2894 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2895
2896 ! ! $delta
2897}
2898
2456sub update { 2899sub update {
2457 my ($self) = @_; 2900 my ($self) = @_;
2458 2901
2459 delete $self->{knob_w}; 2902 delete $self->{knob_w};
2460 $self->SUPER::update; 2903 $self->SUPER::update;
… …
2507 glDisable GL_TEXTURE_2D; 2950 glDisable GL_TEXTURE_2D;
2508} 2951}
2509 2952
2510############################################################################# 2953#############################################################################
2511 2954
2512package CFClient::UI::ValSlider; 2955package CFPlus::UI::ValSlider;
2513 2956
2514our @ISA = CFClient::UI::HBox::; 2957our @ISA = CFPlus::UI::HBox::;
2515 2958
2516sub new { 2959sub new {
2517 my ($class, %arg) = @_; 2960 my ($class, %arg) = @_;
2518 2961
2519 my $range = delete $arg{range}; 2962 my $range = delete $arg{range};
2520 2963
2521 my $self = $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
2522 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2965 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2966 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524 to_value => sub { shift }, 2967 to_value => sub { shift },
2525 from_value => sub { shift }, 2968 from_value => sub { shift },
2526 %arg, 2969 %arg,
2527 ); 2970 );
2528 2971
… …
2548sub set_range { shift->{slider}->set_range (@_) } 2991sub set_range { shift->{slider}->set_range (@_) }
2549sub set_value { shift->{slider}->set_value (@_) } 2992sub set_value { shift->{slider}->set_value (@_) }
2550 2993
2551############################################################################# 2994#############################################################################
2552 2995
2553package CFClient::UI::TextScroller; 2996package CFPlus::UI::TextScroller;
2554 2997
2555our @ISA = CFClient::UI::HBox::; 2998our @ISA = CFPlus::UI::HBox::;
2556 2999
2557use CFClient::OpenGL; 3000use CFPlus::OpenGL;
2558 3001
2559sub new { 3002sub new {
2560 my $class = shift; 3003 my $class = shift;
2561 3004
2562 my $self = $class->SUPER::new ( 3005 my $self = $class->SUPER::new (
2563 fontsize => 1, 3006 fontsize => 1,
2564 can_events => 0, 3007 can_events => 1,
2565 indent => 0, 3008 indent => 0,
2566 #font => default_font 3009 #font => default_font
2567 @_, 3010 @_,
2568 3011
2569 layout => (new CFClient::Layout), 3012 layout => (new CFPlus::Layout),
2570 par => [], 3013 par => [],
3014 max_par => 0,
2571 height => 0, 3015 height => 0,
2572 children => [ 3016 children => [
2573 (new CFClient::UI::Empty expand => 1), 3017 (new CFPlus::UI::Empty expand => 1),
2574 (new CFClient::UI::Slider vertical => 1), 3018 (new CFPlus::UI::Slider vertical => 1),
2575 ], 3019 ],
2576 ); 3020 );
2577 3021
2578 $self->{children}[1]->connect (changed => sub { $self->update }); 3022 $self->{children}[1]->connect (changed => sub { $self->update });
2579 3023
… …
2609 3053
2610 $self->reflow; 3054 $self->reflow;
2611 3055
2612 local $self->{children} = [$empty, $slider]; 3056 local $self->{children} = [$empty, $slider];
2613 $self->SUPER::invoke_size_allocate ($w, $h) 3057 $self->SUPER::invoke_size_allocate ($w, $h)
3058}
3059
3060sub invoke_mouse_wheel {
3061 my ($self, $ev) = @_;
3062
3063 return 0 unless $ev->{dy}; # only vertical movements
3064
3065 $self->{children}[1]->emit (mouse_wheel => $ev);
3066
3067 1
2614} 3068}
2615 3069
2616sub get_layout { 3070sub get_layout {
2617 my ($self, $para) = @_; 3071 my ($self, $para) = @_;
2618 3072
… …
2646 3100
2647 # todo: base offset on lines or so, not on pixels 3101 # todo: base offset on lines or so, not on pixels
2648 $self->{children}[1]->set_value ($offset); 3102 $self->{children}[1]->set_value ($offset);
2649} 3103}
2650 3104
3105sub current_paragraph {
3106 my ($self) = @_;
3107
3108 $self->{top_paragraph} - 1
3109}
3110
3111sub scroll_to {
3112 my ($self, $para) = @_;
3113
3114 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3115
3116 $self->{scroll_to} = $para;
3117 $self->update;
3118}
3119
2651sub clear { 3120sub clear {
2652 my ($self) = @_; 3121 my ($self) = @_;
2653 3122
2654 my (undef, undef, @other) = @{ $self->{children} }; 3123 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other; 3124 $self->remove ($_) for @other;
… …
2658 $self->{height} = 0; 3127 $self->{height} = 0;
2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3128 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660} 3129}
2661 3130
2662sub add_paragraph { 3131sub add_paragraph {
2663 my ($self, $color, $para, $indent) = @_; 3132 my $self = shift;
2664 3133
2665 my ($text, @w) = ref $para ? @$para : $para; 3134 for my $para (@_) {
2666
2667 $para = { 3135 $para = {
3136 fg => [1, 1, 1, 1],
3137 indent => 0,
3138 markup => "",
3139 widget => [],
3140 ref $para ? %$para : (markup => $para),
2668 w => 1e10, 3141 w => 1e10,
2669 wrapped => 1, 3142 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2674 }; 3143 };
2675 3144
2676 $self->add (@w) if @w; 3145 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677 push @{$self->{par}}, $para; 3146 push @{$self->{par}}, $para;
3147 }
3148
3149 if (my $max = $self->{max_par}) {
3150 shift @{$self->{par}} while @{$self->{par}} > $max;
3151 }
2678 3152
2679 $self->{need_reflow}++; 3153 $self->{need_reflow}++;
2680 $self->update; 3154 $self->update;
2681} 3155}
2682 3156
2683sub scroll_to_bottom { 3157sub scroll_to_bottom {
2684 my ($self) = @_; 3158 my ($self) = @_;
2685 3159
2686 $self->{scroll_to_bottom} = 1; 3160 $self->{scroll_to} = $#{$self->{par}};
2687 $self->update; 3161 $self->update;
2688} 3162}
2689 3163
3164sub force_uptodate {
3165 my ($self) = @_;
3166
3167 if (delete $self->{need_reflow}) {
3168 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3169
3170 my $height = 0;
3171
3172 for my $para (@{$self->{par}}) {
3173 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3174 my $layout = $self->get_layout ($para);
3175 my ($w, $h) = $layout->size;
3176
3177 $para->{w} = $w + $para->{indent};
3178 $para->{h} = $h;
3179 $para->{wrapped} = $layout->has_wrapped;
3180 }
3181
3182 $para->{y} = $height;
3183 $height += $para->{h};
3184 }
3185
3186 $self->{height} = $height;
3187 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3188
3189 delete $self->{texture};
3190 }
3191
3192 if (my $paridx = delete $self->{scroll_to}) {
3193 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3194 }
3195}
3196
2690sub update { 3197sub update {
2691 my ($self) = @_; 3198 my ($self) = @_;
2692 3199
2693 $self->SUPER::update; 3200 $self->SUPER::update;
2694 3201
2695 return unless $self->{h} > 0; 3202 return unless $self->{h} > 0;
2696 3203
2697 delete $self->{texture}; 3204 delete $self->{texture};
2698 3205
2699 $ROOT->on_post_alloc ($self => sub { 3206 $ROOT->on_post_alloc ($self => sub {
3207 $self->force_uptodate;
3208
2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3209 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701 3210
2702 if (delete $self->{need_reflow}) {
2703 my $height = 0;
2704
2705 for my $para (@{$self->{par}}) {
2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707 my $layout = $self->get_layout ($para);
2708 my ($w, $h) = $layout->size;
2709
2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2713 }
2714
2715 $height += $para->{h};
2716 }
2717
2718 $self->{height} = $height;
2719
2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3211 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730 glClearColor 0, 0, 0, 0; 3212 glClearColor 0, 0, 0, 0;
2731 glClear GL_COLOR_BUFFER_BIT; 3213 glClear GL_COLOR_BUFFER_BIT;
2732 3214
3215 package CFPlus::UI::Base;
3216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3217 (0, 0, $self->{w}, $self->{h});
3218
3219 my $top = int $self->{children}[1]{range}[0];
3220
3221 my $paridx = 0;
3222 my $top_paragraph;
2733 my $top = int $self->{children}[1]{range}[0]; 3223 my $top = int $self->{children}[1]{range}[0];
2734 3224
2735 my $y0 = $top; 3225 my $y0 = $top;
2736 my $y1 = $top + $H; 3226 my $y1 = $top + $H;
2737 3227
2738 my $y = 0;
2739
2740 for my $para (@{$self->{par}}) { 3228 for my $para (@{$self->{par}}) {
2741 my $h = $para->{h}; 3229 my $h = $para->{h};
3230 my $y = $para->{y};
2742 3231
2743 if ($y0 < $y + $h && $y < $y1) { 3232 if ($y0 < $y + $h && $y < $y1) {
2744
2745 my $layout = $self->get_layout ($para); 3233 my $layout = $self->get_layout ($para);
2746 3234
2747 $layout->render ($para->{indent}, $y - $y0); 3235 $layout->render ($para->{indent}, $y - $y0);
2748 3236
2749 if (my @w = @{ $para->{widget} }) { 3237 if (my @w = @{ $para->{widget} }) {
… …
2758 $_->draw; 3246 $_->draw;
2759 } 3247 }
2760 } 3248 }
2761 } 3249 }
2762 3250
2763 $y += $h; 3251 $paridx++;
3252 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3253 }
3254
3255 $self->{top_paragraph} = $top_paragraph;
2765 }; 3256 };
2766 }); 3257 });
2767} 3258}
2768 3259
2769sub reconfigure { 3260sub reconfigure {
… …
2787 $self->{children}[1]->draw; 3278 $self->{children}[1]->draw;
2788} 3279}
2789 3280
2790############################################################################# 3281#############################################################################
2791 3282
2792package CFClient::UI::Animator; 3283package CFPlus::UI::Animator;
2793 3284
2794use CFClient::OpenGL; 3285use CFPlus::OpenGL;
2795 3286
2796our @ISA = CFClient::UI::Bin::; 3287our @ISA = CFPlus::UI::Bin::;
2797 3288
2798sub moveto { 3289sub moveto {
2799 my ($self, $x, $y) = @_; 3290 my ($self, $x, $y) = @_;
2800 3291
2801 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3292 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2829 glPopMatrix; 3320 glPopMatrix;
2830} 3321}
2831 3322
2832############################################################################# 3323#############################################################################
2833 3324
2834package CFClient::UI::Flopper; 3325package CFPlus::UI::Flopper;
2835 3326
2836our @ISA = CFClient::UI::Button::; 3327our @ISA = CFPlus::UI::Button::;
2837 3328
2838sub new { 3329sub new {
2839 my $class = shift; 3330 my $class = shift;
2840 3331
2841 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2853 $self->{other}->toggle_visibility; 3344 $self->{other}->toggle_visibility;
2854} 3345}
2855 3346
2856############################################################################# 3347#############################################################################
2857 3348
2858package CFClient::UI::Tooltip; 3349package CFPlus::UI::Tooltip;
2859 3350
2860our @ISA = CFClient::UI::Bin::; 3351our @ISA = CFPlus::UI::Bin::;
2861 3352
2862use CFClient::OpenGL; 3353use CFPlus::OpenGL;
2863 3354
2864sub new { 3355sub new {
2865 my $class = shift; 3356 my $class = shift;
2866 3357
2867 $class->SUPER::new ( 3358 $class->SUPER::new (
… …
2870 ) 3361 )
2871} 3362}
2872 3363
2873sub set_tooltip_from { 3364sub set_tooltip_from {
2874 my ($self, $widget) = @_; 3365 my ($self, $widget) = @_;
3366
3367 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3368 if $widget->{tooltip} =~ /^#(.*)$/;
2875 3369
2876 my $tooltip = $widget->{tooltip}; 3370 my $tooltip = $widget->{tooltip};
2877 3371
2878 if ($ENV{CFPLUS_DEBUG} & 2) { 3372 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n" 3373 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2883 } 3377 }
2884 3378
2885 $tooltip =~ s/^\n+//; 3379 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//; 3380 $tooltip =~ s/\n+$//;
2887 3381
2888 $self->add (new CFClient::UI::Label 3382 $self->add (new CFPlus::UI::Label
2889 markup => $tooltip, 3383 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3384 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8, 3385 fontsize => 0.8,
2892 fg => [0, 0, 0, 1], 3386 style => 1, # FLAG_INVERSE
2893 ellipsise => 0, 3387 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP), 3388 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 ); 3389 );
2896} 3390}
2897 3391
… …
2916 3410
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3411 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3412 my $widget = $self->{owner}
2919 or return; 3413 or return;
2920 3414
3415 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3416 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3417
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3418 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3419 if $x + $self->{w} > $self->{root}{w};
2925 3420
2926 $self->move_abs ($x, $y); 3421 $self->move_abs ($x, $y);
3422 } else {
3423 $self->hide;
3424 }
2927 }); 3425 });
2928} 3426}
2929 3427
2930sub _draw { 3428sub _draw {
2931 my ($self) = @_; 3429 my ($self) = @_;
… …
2955 $self->SUPER::_draw; 3453 $self->SUPER::_draw;
2956} 3454}
2957 3455
2958############################################################################# 3456#############################################################################
2959 3457
2960package CFClient::UI::Face; 3458package CFPlus::UI::Face;
2961 3459
2962our @ISA = CFClient::UI::Base::; 3460our @ISA = CFPlus::UI::DrawBG::;
2963 3461
2964use CFClient::OpenGL; 3462use CFPlus::OpenGL;
2965 3463
2966sub new { 3464sub new {
2967 my $class = shift; 3465 my $class = shift;
2968 3466
2969 my $self = $class->SUPER::new ( 3467 my $self = $class->SUPER::new (
3468 size_w => 32,
3469 size_h => 8,
2970 aspect => 1, 3470 aspect => 1,
2971 can_events => 0, 3471 can_events => 0,
2972 @_, 3472 @_,
2973 ); 3473 );
2974 3474
2975 if ($self->{anim} && $self->{animspeed}) { 3475 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self); 3476 CFPlus::weaken (my $widget = $self);
2977 3477
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2978 $self->{timer} = Event->timer ( 3480 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1, 3481 parked => 1,
2981 interval => $self->{animspeed},
2982 cb => sub { 3482 cb => sub {
3483 return unless $::CONN && $widget;
3484
2983 ++$widget->{frame}; 3485 ++$widget->{frame};
3486 $widget->update_face;
2984 $widget->update; 3487 $widget->update;
3488
3489 $widget->update_timer;
2985 }, 3490 },
2986 ); 3491 );
3492
3493 $self->update_face;
3494 $self->update_timer;
2987 } 3495 }
2988 3496
2989 $self 3497 $self
2990} 3498}
2991 3499
3500sub update_timer {
3501 my ($self) = @_;
3502
3503 return unless $self->{timer};
3504
3505 if ($self->{visible}) {
3506 $self->{timer}->at (
3507 $self->{anim_start}
3508 + $self->{animspeed}
3509 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3510 );
3511 $self->{timer}->start;
3512 } else {
3513 $self->{timer}->stop;
3514 }
3515}
3516
3517sub update_face {
3518 my ($self) = @_;
3519
3520 return unless $::CONN;
3521
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) {
3524 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3526 }
3527 }
3528}
3529
2992sub size_request { 3530sub size_request {
2993 (32, 8) 3531 my ($self) = @_;
3532
3533 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc;
3540 });
3541 }
3542 }
3543 }
3544
3545 ($self->{size_w} || 8, $self->{size_h} || 8)
2994} 3546}
2995 3547
2996sub update { 3548sub update {
2997 my ($self) = @_; 3549 my ($self) = @_;
2998 3550
2999 return unless $self->{visible}; 3551 return unless $self->{visible};
3000 3552
3001 $self->SUPER::update; 3553 $self->SUPER::update;
3002} 3554}
3003 3555
3556sub invoke_visibility_change {
3557 my ($self) = @_;
3558
3559 $self->update_timer;
3560
3561 0
3562}
3563
3004sub _draw { 3564sub _draw {
3005 my ($self) = @_; 3565 my ($self) = @_;
3006 3566
3007 return unless $::CONN; 3567 return unless $::CONN;
3008 3568
3009 my $face; 3569 $self->SUPER::_draw;
3010 3570
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}]; 3571 my $faceid = $::CONN->{faceid}[$self->{face}]
3013 3572 or return;
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017 3573
3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3574 my $tex = $::CONN->{texture}[$faceid];
3019 3575
3020 if ($tex) { 3576 if ($tex) {
3021 glEnable GL_TEXTURE_2D; 3577 glEnable GL_TEXTURE_2D;
3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023 glColor 0, 0, 0, 1; 3579 glColor 0, 0, 0, 1;
… …
3027} 3583}
3028 3584
3029sub destroy { 3585sub destroy {
3030 my ($self) = @_; 3586 my ($self) = @_;
3031 3587
3032 $self->{timer}->cancel 3588 (delete $self->{timer})->cancel
3033 if $self->{timer}; 3589 if $self->{timer};
3034 3590
3035 $self->SUPER::destroy; 3591 $self->SUPER::destroy;
3036} 3592}
3037 3593
3038############################################################################# 3594#############################################################################
3039 3595
3040package CFClient::UI::Buttonbar; 3596package CFPlus::UI::Buttonbar;
3041 3597
3042our @ISA = CFClient::UI::HBox::; 3598our @ISA = CFPlus::UI::HBox::;
3043 3599
3044# TODO: should actualyl wrap buttons and other goodies. 3600# TODO: should actually wrap buttons and other goodies.
3045 3601
3046############################################################################# 3602#############################################################################
3047 3603
3048package CFClient::UI::Menu; 3604package CFPlus::UI::Menu;
3049 3605
3050our @ISA = CFClient::UI::FancyFrame::; 3606our @ISA = CFPlus::UI::Toplevel::;
3051 3607
3052use CFClient::OpenGL; 3608use CFPlus::OpenGL;
3053 3609
3054sub new { 3610sub new {
3055 my $class = shift; 3611 my $class = shift;
3056 3612
3057 my $self = $class->SUPER::new ( 3613 my $self = $class->SUPER::new (
3058 items => [], 3614 items => [],
3059 z => 100, 3615 z => 100,
3060 @_, 3616 @_,
3061 ); 3617 );
3062 3618
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3619 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064 3620
3065 for my $item (@{ $self->{items} }) { 3621 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3622 my ($widget, $cb, $tooltip) = @$item;
3067 3623
3068 # handle various types of items, only text for now 3624 # handle various types of items, only text for now
3069 if (!ref $widget) { 3625 if (!ref $widget) {
3070 if ($widget =~ /\t/) { 3626 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2; 3627 my ($left, $right) = split /\t/, $widget, 2;
3072 3628
3073 $widget = new CFClient::UI::HBox 3629 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3630 can_hover => 1,
3075 can_events => 1, 3631 can_events => 1,
3076 tooltip => $tooltip, 3632 tooltip => $tooltip,
3077 children => [ 3633 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1), 3634 (new CFPlus::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1), 3635 (new CFPlus::UI::Label markup => $right, align => +1),
3080 ], 3636 ],
3081 ; 3637 ;
3082 3638
3083 } else { 3639 } else {
3084 $widget = new CFClient::UI::Label 3640 $widget = new CFPlus::UI::Label
3085 can_hover => 1, 3641 can_hover => 1,
3086 can_events => 1, 3642 can_events => 1,
3087 markup => $widget, 3643 markup => $widget,
3088 tooltip => $tooltip; 3644 tooltip => $tooltip;
3089 } 3645 }
… …
3137 1 3693 1
3138} 3694}
3139 3695
3140############################################################################# 3696#############################################################################
3141 3697
3142package CFClient::UI::Multiplexer; 3698package CFPlus::UI::Multiplexer;
3143 3699
3144our @ISA = CFClient::UI::Container::; 3700our @ISA = CFPlus::UI::Container::;
3145 3701
3146sub new { 3702sub new {
3147 my $class = shift; 3703 my $class = shift;
3148 3704
3149 my $self = $class->SUPER::new ( 3705 my $self = $class->SUPER::new (
… …
3210 $self->{current}->draw; 3766 $self->{current}->draw;
3211} 3767}
3212 3768
3213############################################################################# 3769#############################################################################
3214 3770
3215package CFClient::UI::Notebook; 3771package CFPlus::UI::Notebook;
3216 3772
3217our @ISA = CFClient::UI::VBox::; 3773our @ISA = CFPlus::UI::VBox::;
3218 3774
3219sub new { 3775sub new {
3220 my $class = shift; 3776 my $class = shift;
3221 3777
3222 my $self = $class->SUPER::new ( 3778 my $self = $class->SUPER::new (
3223 buttonbar => (new CFClient::UI::Buttonbar), 3779 buttonbar => (new CFPlus::UI::Buttonbar),
3224 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3780 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225 # filter => # will be put between multiplexer and $self 3781 # filter => # will be put between multiplexer and $self
3226 @_, 3782 @_,
3227 ); 3783 );
3228 3784
3229 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3785 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3233} 3789}
3234 3790
3235sub add { 3791sub add {
3236 my ($self, $title, $widget, $tooltip) = @_; 3792 my ($self, $title, $widget, $tooltip) = @_;
3237 3793
3238 Scalar::Util::weaken $self; 3794 CFPlus::weaken $self;
3239 3795
3240 $self->{buttonbar}->add (new CFClient::UI::Button 3796 $self->{buttonbar}->add (new CFPlus::UI::Button
3241 markup => $title, 3797 markup => $title,
3242 tooltip => $tooltip, 3798 tooltip => $tooltip,
3243 on_activate => sub { $self->set_current_page ($widget) }, 3799 on_activate => sub { $self->set_current_page ($widget) },
3244 ); 3800 );
3245 3801
… …
3259 $self->emit (page_changed => $self->{multiplexer}{current}); 3815 $self->emit (page_changed => $self->{multiplexer}{current});
3260} 3816}
3261 3817
3262############################################################################# 3818#############################################################################
3263 3819
3264package CFClient::UI::Combobox; 3820package CFPlus::UI::Selector;
3265 3821
3266use utf8; 3822use utf8;
3267 3823
3268our @ISA = CFClient::UI::Button::; 3824our @ISA = CFPlus::UI::Button::;
3269 3825
3270sub new { 3826sub new {
3271 my $class = shift; 3827 my $class = shift;
3272 3828
3273 my $self = $class->SUPER::new ( 3829 my $self = $class->SUPER::new (
… …
3290 my ($value, $title, $tooltip) = @$_; 3846 my ($value, $title, $tooltip) = @$_;
3291 3847
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3848 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 } 3849 }
3294 3850
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3851 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296} 3852}
3297 3853
3298sub _set_value { 3854sub _set_value {
3299 my ($self, $value) = @_; 3855 my ($self, $value) = @_;
3300 3856
… …
3315 $self->emit (changed => $value); 3871 $self->emit (changed => $value);
3316} 3872}
3317 3873
3318############################################################################# 3874#############################################################################
3319 3875
3320package CFClient::UI::Statusbox; 3876package CFPlus::UI::Statusbox;
3321 3877
3322our @ISA = CFClient::UI::VBox::; 3878our @ISA = CFPlus::UI::VBox::;
3323 3879
3324sub new { 3880sub new {
3325 my $class = shift; 3881 my $class = shift;
3326 3882
3327 my $self = $class->SUPER::new ( 3883 my $self = $class->SUPER::new (
3328 fontsize => 0.8, 3884 fontsize => 0.8,
3329 @_, 3885 @_,
3330 ); 3886 );
3331 3887
3332 Scalar::Util::weaken (my $this = $self); 3888 CFPlus::weaken (my $this = $self);
3333 3889
3334 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3890 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335 3891
3336 $self 3892 $self
3337} 3893}
… …
3339sub reorder { 3895sub reorder {
3340 my ($self) = @_; 3896 my ($self) = @_;
3341 my $NOW = Time::HiRes::time; 3897 my $NOW = Time::HiRes::time;
3342 3898
3343 # freeze display when hovering over any label 3899 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner} 3900 return if $CFPlus::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3901 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} }; 3902 values %{ $self->{item} };
3347 3903
3348 while (my ($k, $v) = each %{ $self->{item} }) { 3904 while (my ($k, $v) = each %{ $self->{item} }) {
3349 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3905 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350 } 3906 }
… …
3371 for ($short) { 3927 for ($short) {
3372 s/^\s+//; 3928 s/^\s+//;
3373 s/\s+/ /g; 3929 s/\s+/ /g;
3374 } 3930 }
3375 3931
3376 new CFClient::UI::Label 3932 new CFPlus::UI::Label
3377 markup => $short, 3933 markup => $short,
3378 tooltip => $item->{tooltip}, 3934 tooltip => $item->{tooltip},
3379 tooltip_font => $::FONT_PROP, 3935 tooltip_font => $::FONT_PROP,
3380 tooltip_width => 0.67, 3936 tooltip_width => 0.67,
3381 fontsize => $item->{fontsize} || $self->{fontsize}, 3937 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3460 $self->SUPER::destroy; 4016 $self->SUPER::destroy;
3461} 4017}
3462 4018
3463############################################################################# 4019#############################################################################
3464 4020
3465package CFClient::UI::Inventory;
3466
3467our @ISA = CFClient::UI::Table::;
3468
3469sub new {
3470 my $class = shift;
3471
3472 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0],
3474 @_,
3475 );
3476
3477 $self
3478}
3479
3480sub set_items {
3481 my ($self, $items) = @_;
3482
3483 $self->clear;
3484 return unless $items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503}
3504
3505#############################################################################
3506
3507package CFClient::UI::SpellList;
3508
3509our @ISA = CFClient::UI::Table::;
3510
3511sub new {
3512 my $class = shift;
3513
3514 my $self = $class->SUPER::new (
3515 binding => [],
3516 commands => [],
3517 @_,
3518 )
3519}
3520
3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3627#############################################################################
3628
3629package CFClient::UI::Root; 4021package CFPlus::UI::Root;
3630 4022
3631our @ISA = CFClient::UI::Container::; 4023our @ISA = CFPlus::UI::Container::;
3632 4024
3633use List::Util qw(min max); 4025use List::Util qw(min max);
3634 4026
3635use CFClient::OpenGL; 4027use CFPlus::OpenGL;
3636 4028
3637sub new { 4029sub new {
3638 my $class = shift; 4030 my $class = shift;
3639 4031
3640 my $self = $class->SUPER::new ( 4032 my $self = $class->SUPER::new (
3641 visible => 1, 4033 visible => 1,
3642 @_, 4034 @_,
3643 ); 4035 );
3644 4036
3645 Scalar::Util::weaken ($self->{root} = $self); 4037 CFPlus::weaken ($self->{root} = $self);
3646 4038
3647 $self 4039 $self
3648} 4040}
3649 4041
3650sub size_request { 4042sub size_request {
… …
3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4208 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3817 4209
3818 $w = 0 if $w < 0; 4210 $w = 0 if $w < 0;
3819 $h = 0 if $h < 0; 4211 $h = 0 if $h < 0;
3820 4212
4213 $w = max $widget->{min_w}, $w;
4214 $h = max $widget->{min_h}, $h;
4215
4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4218
4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4221
3821 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
3822 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
3823 4224
3824 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3825 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
… …
3835 4236
3836 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
3837 $_->() 4238 $_->()
3838 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
3839 } 4240 }
3840
3841 4241
3842 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3843 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3844 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
3845 4245
… …
3848 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4248 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3849 glMatrixMode GL_MODELVIEW; 4249 glMatrixMode GL_MODELVIEW;
3850 glLoadIdentity; 4250 glLoadIdentity;
3851 4251
3852 { 4252 {
3853 package CFClient::UI::Base; 4253 package CFPlus::UI::Base;
3854 4254
3855 ($draw_x, $draw_y, $draw_w, $draw_h) = 4255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3856 (0, 0, $self->{w}, $self->{h}); 4256 (0, 0, $self->{w}, $self->{h});
3857 }
3858 4257
3859 $self->_draw; 4258 $self->_draw;
4259 }
3860} 4260}
3861 4261
3862############################################################################# 4262#############################################################################
3863 4263
3864package CFClient::UI; 4264package CFPlus::UI;
3865 4265
3866$ROOT = new CFClient::UI::Root; 4266$ROOT = new CFPlus::UI::Root;
3867$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4267$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3868 4268
38691 42691
3870 4270

Diff Legend

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