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

Diff Legend

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