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.323 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
… …
452 486
453 $FOCUS->emit ("focus_out") if $FOCUS; 487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
474} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552#sub find_widget {
486 my ($self, $x, $y) = @_; 553# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 554
497sub set_parent { 555sub set_parent {
498 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
499 557
500 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
502} 560}
503 561
504sub realloc { 562sub realloc {
505 my ($self) = @_; 563 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
574 glEnd; 632 glEnd;
575 glPopMatrix; 633 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 635 }
578 636
579 $self->_draw; 637 $self->_draw;
580 glPopMatrix; 638 glPopMatrix;
581} 639}
… …
584 my ($self) = @_; 642 my ($self) = @_;
585 643
586 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
587} 645}
588 646
647my $cntx;#d#
589sub DESTROY { 648sub DESTROY {
590 my ($self) = @_; 649 my ($self) = @_;
591 650
592 delete $WIDGET{$self+0}; 651 return if CFPlus::in_destruct;
593 652
594 eval { $self->destroy }; 653 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
596} 657}
597 658
598############################################################################# 659#############################################################################
599 660
600package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
601 662
602our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
603 664
604use strict; 665use strict;
605use CFClient::OpenGL; 666use CFPlus::OpenGL;
606 667
607sub new { 668sub new {
608 my $class = shift; 669 my $class = shift;
609 670
610 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
641 } 702 }
642} 703}
643 704
644############################################################################# 705#############################################################################
645 706
646package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
647 708
648our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
649 710
650sub new { 711sub new {
651 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
653} 714}
… …
660 721
661sub draw { } 722sub draw { }
662 723
663############################################################################# 724#############################################################################
664 725
665package CFClient::UI::Container; 726package CFPlus::UI::Container;
666 727
667our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
668 729
669sub new { 730sub new {
670 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
671 732
672 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
681 if $children; 742 if $children;
682 743
683 $self 744 $self
684} 745}
685 746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
753}
754
686sub add { 755sub add {
687 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
688 757
689 $_->set_parent ($self) 758 $_->set_parent ($self)
690 for @widgets; 759 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
751} 820}
752 821
753############################################################################# 822#############################################################################
754 823
755package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
756 825
757our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
758 827
759sub new { 828sub new {
760 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
761 830
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 832
764 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
765} 834}
766 835
767sub add { 836sub add {
… …
774sub remove { 843sub remove {
775 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
776 845
777 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
778 847
779 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 849 unless @{$self->{children}};
781} 850}
782 851
783sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
784 853
… …
796 865
797############################################################################# 866#############################################################################
798 867
799# back-buffered drawing area 868# back-buffered drawing area
800 869
801package CFClient::UI::Window; 870package CFPlus::UI::Window;
802 871
803our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
804 873
805use CFClient::OpenGL; 874use CFPlus::OpenGL;
806 875
807sub new { 876sub new {
808 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
809 878
810 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
832} 901}
833 902
834sub render_child { 903sub render_child {
835 my ($self) = @_; 904 my ($self) = @_;
836 905
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
840 909
841 { 910 {
842 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
843 912
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
846 } 917 }
847
848 $self->_render;
849 }; 918 };
850} 919}
851 920
852sub _draw { 921sub _draw {
853 my ($self) = @_; 922 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 923
857 my $tex = $self->{texture} 924 my $tex = $self->{texture}
858 or return; 925 or return;
859 926
860 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
863 930
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
865 932
866 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
867} 934}
868 935
869############################################################################# 936#############################################################################
870 937
871package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
872 939
940use List::Util qw(min max);
941
873our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
874 943
875sub new { 944sub new {
876 my $class = shift; 945 my $class = shift;
877 946
878 $class->SUPER::new ( 947 $class->SUPER::new (
… …
908} 977}
909 978
910sub set_offset { 979sub set_offset {
911 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
912 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
915 988
989 $self->emit (changed => $x, $y);
916 $self->update; 990 $self->update;
991 }
917} 992}
918 993
919# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 995sub coord2local {
921 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
937 1012
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1015 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1017 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1019 }
945} 1020}
946 1021
947sub _render { 1022sub _render {
948 my ($self) = @_; 1023 my ($self) = @_;
949 1024
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1027
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1029
955 $self->SUPER::_render; 1030 $self->SUPER::_render;
956} 1031}
957 1032
958############################################################################# 1033#############################################################################
959 1034
960package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
961 1036
962our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
963 1038
964sub new { 1039sub new {
965 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
966 1041
967 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
968 1043
969 my $self; 1044 my $self;
970 1045
971 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1056 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1058 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1061 },
977 ; 1062 ;
978 1063
979 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1067 can_events => 1,
981 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
982 %arg, 1072 %arg,
983 ); 1073 );
984 1074
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
986 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
987 1092
988 $self 1093 $self
989} 1094}
990 1095
… …
997} 1102}
998 1103
999sub update_slider { 1104sub update_slider {
1000 my ($self) = @_; 1105 my ($self) = @_;
1001 1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1003} 1126}
1004 1127
1005sub update { 1128sub update {
1006 my ($self) = @_; 1129 my ($self) = @_;
1007 1130
1131 $self->update_slider;
1008 $self->SUPER::update; 1132 $self->SUPER::update;
1133}
1009 1134
1010 $self->update_slider; 1135sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_;
1137
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev);
1141
1142 1
1143}
1144
1145sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_;
1147
1148 if ($ev->{button} == 2) {
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1011} 1186}
1012 1187
1013sub invoke_size_allocate { 1188sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1015 1190
1016 $self->update_slider; 1191 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1193}
1020 1194
1021############################################################################# 1195#############################################################################
1022 1196
1023package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1024 1198
1025our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1026 1200
1027use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1028 1202
1029sub new { 1203sub new {
1030 my $class = shift; 1204 my $class = shift;
1031 1205
1032 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1059} 1233}
1060 1234
1061############################################################################# 1235#############################################################################
1062 1236
1063package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1064 1238
1065our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1066 1240
1067use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1068 1342
1069my $bg = 1343my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1072 1346
1073my @border = 1347my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1076 1354
1077sub new { 1355sub new {
1078 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1079 1357
1080 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1361 border => 0.6,
1084 can_events => 1, 1362 can_events => 1,
1085 min_w => 16, 1363 min_w => 64,
1086 min_h => 16, 1364 min_h => 32,
1087 %arg, 1365 %arg,
1088 ); 1366 );
1089 1367
1090 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1369 align => 0,
1092 valign => 1, 1370 valign => 1,
1093 text => $self->{title}, 1371 text => $self->{title},
1094 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1095 if exists $self->{title}; 1373 if exists $self->{title};
1096 1374
1097 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1376 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1378 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1379 on_activate => sub { $self->emit ("delete") };
1102 1380
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1382 }
1105 1383
1106 $self 1384 $self
1107} 1385}
1108 1386
1109sub add { 1387sub add {
1110 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1111 1389
1112 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1393}
1116 1394
1117sub border { 1395sub border {
1118 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1119} 1397}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1506
1229 ! ! $self->{motion} 1507 ! ! $self->{motion}
1230} 1508}
1231 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1232sub _draw { 1518sub _draw {
1233 my ($self) = @_; 1519 my ($self) = @_;
1234 1520
1235 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1236 1522
… …
1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1242 1528
1243 my $border = $self->border; 1529 my $border = $self->border;
1244 1530
1245 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1246 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1250 1550
1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1252 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1253 1553
1254 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1273 if $self->{close_button}; 1573 if $self->{close_button};
1274} 1574}
1275 1575
1276############################################################################# 1576#############################################################################
1277 1577
1278package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1279 1579
1280our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1281 1581
1282use List::Util qw(max sum); 1582use List::Util qw(max sum);
1283 1583
1284use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1285 1585
1286sub new { 1586sub new {
1287 my $class = shift; 1587 my $class = shift;
1288 1588
1289 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1290 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1291 @_, 1593 @_,
1292 ) 1594 )
1293} 1595}
1294 1596
1295sub children { 1597sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1599}
1298 1600
1601# TODO: store row/col info in child widget and use standard add/del
1299sub add { 1602sub add {
1300 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1301 1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1302 $child->set_parent ($self); 1615 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1304 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1621 $self->realloc;
1306} 1622}
1307 1623
1308sub remove { 1624sub remove {
1309 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1310 1626
1311 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1312} 1632}
1313 1633
1314# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1315sub clear { 1635sub clear {
1316 my ($self) = @_; 1636 my ($self) = @_;
… …
1365 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1366 1686
1367 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1369 1689
1370 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1371 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1374 1694
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1696
1379 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1380 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1381 1706
1382 my $y; 1707 my $y;
1383 1708
1384 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1428 } 1753 }
1429} 1754}
1430 1755
1431############################################################################# 1756#############################################################################
1432 1757
1433package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1434 1759
1760use List::Util qw(min max);
1761
1435our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1436 1843
1437sub size_request { 1844sub size_request {
1438 my ($self) = @_; 1845 my ($self) = @_;
1439 1846
1440 $self->{vertical} 1847 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1881 for 0 .. $#children;
1475 } 1882 }
1476 } 1883 }
1477 1884
1478 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1479 1886
1480 my $pos = 0; 1887 my $pos = 0;
1481 for (0 .. $#children) { 1888 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1895 1
1489} 1896}
1490 1897
1491############################################################################# 1898#############################################################################
1492 1899
1493package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1494 1901
1495our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1496 1903
1497sub new { 1904sub new {
1498 my $class = shift; 1905 my $class = shift;
1499 1906
1500 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1503 ) 1910 )
1504} 1911}
1505 1912
1506############################################################################# 1913#############################################################################
1507 1914
1508package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1509 1916
1510our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1511 1918
1512sub new { 1919sub new {
1513 my $class = shift; 1920 my $class = shift;
1514 1921
1515 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1518 ) 1925 )
1519} 1926}
1520 1927
1521############################################################################# 1928#############################################################################
1522 1929
1523package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1524 1931
1525our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1526 1933
1527use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1528 1935
1529sub new { 1936sub new {
1530 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1531 1938
1532 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1942 #active_bg => none
1536 #font => default_font 1943 #font => default_font
1537 #text => initial text 1944 #text => initial text
1538 #markup => initial narkup 1945 #markup => initial narkup
1539 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1540 ellipsise => 3, # end 1948 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1950 fontsize => 1,
1543 align => -1, 1951 align => -1,
1544 valign => -1, 1952 valign => -1,
1545 padding_x => 2, 1953 padding_x => 2,
1546 padding_y => 2, 1954 padding_y => 2,
1547 can_events => 0, 1955 can_events => 0,
1548 %arg 1956 %arg
1549 ); 1957 );
1550 1958
1551 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1962 $self->{template} = $layout;
1555 } 1963 }
1556 1964
1557 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1559 } else { 1967 } else {
1560 $self->set_text (delete $self->{text}); 1968 $self->set_text (delete $self->{text});
1561 } 1969 }
1562 1970
1563 $self 1971 $self
1564}
1565
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574} 1972}
1575 1973
1576sub update { 1974sub update {
1577 my ($self) = @_; 1975 my ($self) = @_;
1578 1976
… …
1705 }; 2103 };
1706 2104
1707 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1708 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1709 2107
1710 $self->{layout}->render ($self->{ox}, $self->{oy}); 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1711} 2109}
1712 2110
1713############################################################################# 2111#############################################################################
1714 2112
1715package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1716 2114
1717our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1718 2116
1719use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1720 2118
1721sub new { 2119sub new {
1722 my $class = shift; 2120 my $class = shift;
1723 2121
1724 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1729 can_hover => 1, 2127 can_hover => 1,
1730 can_focus => 1, 2128 can_focus => 1,
1731 valign => 0, 2129 valign => 0,
1732 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1733 #text => ... 2132 #text => ...
1734 #hidden => "*", 2133 #hidden => "*",
1735 @_ 2134 @_
1736 ) 2135 )
1737} 2136}
… …
1782 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1784 2183
1785 my $text = $self->get_text; 2184 my $text = $self->get_text;
1786 2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187
1787 if ($uni == 8) { 2188 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1796 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2212 $self->emit ('escape');
1801 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2217 } else {
1804 return 0; 2218 return 0;
1805 } 2219 }
1806 2220
1807 $self->_set_text ($text); 2221 $self->_set_text ($text);
1808 2222
1809 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1810 2225
1811 1 2226 1
1812} 2227}
1813 2228
1814sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1826 2241
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2242 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2243
1829 # byte-index to char-index 2244 # byte-index to char-index
1830 my $text = $self->{text}; 2245 my $text = $self->{text};
1831 utf8::encode $text; 2246 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2247 $self->{cursor} = length $text;
1833 2248
1834 $self->_set_text ($self->{text}); 2249 $self->_set_text ($self->{text});
1835 $self->update; 2250 $self->update;
1836 2251
1837 1 2252 1
… …
1876 utf8::encode $text; 2291 utf8::encode $text;
1877 2292
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2294 }
1880 2295
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2296 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2299 glEnd;
1886 } 2300 }
1887} 2301}
1888 2302
2303#############################################################################
2304
1889package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1890 2306
1891our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1892 2308
1893use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1894 2310
1895sub invoke_key_down { 2311sub invoke_key_down {
1896 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1897 2313
1898 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1899 2315
1900 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1903 2319
1904 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
1907 $self->update; 2323 $self->update;
1908 2324
1909 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1912 } 2328 }
1913 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2333 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2335 }
1920 2336
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2340
1925 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2351 1
1936} 2352}
1937 2353
1938############################################################################# 2354#############################################################################
1939 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
1940package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1941 2396
1942our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1943 2398
1944use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1945 2400
1946my @tex = 2401my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1949 2404
1950sub new { 2405sub new {
1951 my $class = shift; 2406 my $class = shift;
1952 2407
1953 $class->SUPER::new ( 2408 $class->SUPER::new (
1954 padding_x => 4, 2409 padding_x => 4,
1955 padding_y => 4, 2410 padding_y => 4,
1956 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1957 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1958 can_hover => 1, 2413 can_hover => 1,
1959 align => 0, 2414 align => 0,
1960 valign => 0, 2415 valign => 0,
1961 can_events => 1, 2416 can_events => 1,
1962 @_ 2417 @_
… …
1980 2435
1981 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1984 2439
2440 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2442
1987 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1988 2444
1989 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1990} 2446}
1991 2447
1992############################################################################# 2448#############################################################################
1993 2449
2450package CFPlus::UI::CheckBox;
2451
2452our @ISA = CFPlus::UI::DrawBG::;
2453
2454my @tex =
2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2457
2458use CFPlus::OpenGL;
2459
2460sub new {
2461 my $class = shift;
2462
2463 $class->SUPER::new (
2464 padding_x => 2,
2465 padding_y => 2,
2466 fg => [1, 1, 1],
2467 active_fg => [1, 1, 0],
2468 bg => [0, 0, 0, 0.2],
2469 active_bg => [1, 1, 1, 0.5],
2470 state => 0,
2471 can_hover => 1,
2472 @_
2473 )
2474}
2475
2476sub size_request {
2477 my ($self) = @_;
2478
2479 (6) x 2
2480}
2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
2490sub invoke_button_down {
2491 my ($self, $ev, $x, $y) = @_;
2492
2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2495 $self->toggle;
2496 } else {
2497 return 0
2498 }
2499
2500 1
2501}
2502
2503sub _draw {
2504 my ($self) = @_;
2505
2506 $self->SUPER::_draw;
2507
2508 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2509
2510 my ($w, $h) = @$self{qw(w h)};
2511
2512 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2513
2514 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2515
2516 my $tex = $self->{state} ? $tex[1] : $tex[0];
2517
2518 glEnable GL_TEXTURE_2D;
2519 $tex->draw_quad_alpha (0, 0, $s, $s);
2520 glDisable GL_TEXTURE_2D;
2521}
2522
2523#############################################################################
2524
2525package CFPlus::UI::Image;
2526
2527our @ISA = CFPlus::UI::Base::;
2528
2529use CFPlus::OpenGL;
2530
2531our %texture_cache;
2532
2533sub new {
2534 my $class = shift;
2535
2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2540
2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
2543
2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2546
2547 CFPlus::weaken $texture_cache{$self->{path}};
2548
2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2550
2551 $self
2552}
2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571
2572 ($self->{tex}{w}, $self->{tex}{h})
2573}
2574
2575sub _draw {
2576 my ($self) = @_;
2577
2578 my $tex = $self->{tex};
2579
2580 my ($w, $h) = ($self->{w}, $self->{h});
2581
2582 if ($self->{rot90}) {
2583 glRotate 90, 0, 0, 1;
2584 glTranslate 0, -$self->{w}, 0;
2585
2586 ($w, $h) = ($h, $w);
2587 }
2588
2589 glEnable GL_TEXTURE_2D;
2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591
2592 $tex->draw_quad (0, 0, $w, $h);
2593
2594 glDisable GL_TEXTURE_2D;
2595}
2596
2597#############################################################################
2598
1994package CFClient::UI::ImageButton; 2599package CFPlus::UI::ImageButton;
1995 2600
1996our @ISA = CFClient::UI::Image::; 2601our @ISA = CFPlus::UI::Image::;
1997 2602
1998use CFClient::OpenGL; 2603use CFPlus::OpenGL;
1999 2604
2000my %textures; 2605my %textures;
2001 2606
2002sub new { 2607sub new {
2003 my $class = shift; 2608 my $class = shift;
… …
2025 1 2630 1
2026} 2631}
2027 2632
2028############################################################################# 2633#############################################################################
2029 2634
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2070sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2075 $self->toggle;
2076 } else {
2077 return 0
2078 }
2079
2080 1
2081}
2082
2083sub _draw {
2084 my ($self) = @_;
2085
2086 $self->SUPER::_draw;
2087
2088 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2089
2090 my ($w, $h) = @$self{qw(w h)};
2091
2092 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2093
2094 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2095
2096 my $tex = $self->{state} ? $tex[1] : $tex[0];
2097
2098 glEnable GL_TEXTURE_2D;
2099 $tex->draw_quad_alpha (0, 0, $s, $s);
2100 glDisable GL_TEXTURE_2D;
2101}
2102
2103#############################################################################
2104
2105package CFClient::UI::Image; 2635package CFPlus::UI::VGauge;
2106 2636
2107our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2108
2109use CFClient::OpenGL;
2110
2111our %texture_cache;
2112
2113sub new {
2114 my $class = shift;
2115
2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2120
2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
2123
2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2126
2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2128
2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2130
2131 $self
2132}
2133
2134sub size_request {
2135 my ($self) = @_;
2136
2137 ($self->{tex}{w}, $self->{tex}{h})
2138}
2139
2140sub _draw {
2141 my ($self) = @_;
2142
2143 my $tex = $self->{tex};
2144
2145 my ($w, $h) = ($self->{w}, $self->{h});
2146
2147 if ($self->{rot90}) {
2148 glRotate 90, 0, 0, 1;
2149 glTranslate 0, -$self->{w}, 0;
2150
2151 ($w, $h) = ($h, $w);
2152 }
2153
2154 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156
2157 $tex->draw_quad_alpha (0, 0, $w, $h);
2158
2159 glDisable GL_TEXTURE_2D;
2160}
2161
2162#############################################################################
2163
2164package CFClient::UI::VGauge;
2165
2166our @ISA = CFClient::UI::Base::;
2167 2638
2168use List::Util qw(min max); 2639use List::Util qw(min max);
2169 2640
2170use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2171 2642
2172my %tex = ( 2643my %tex = (
2173 food => [ 2644 food => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2176 ], 2647 ],
2177 grace => [ 2648 grace => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2180 ], 2651 ],
2181 hp => [ 2652 hp => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2184 ], 2655 ],
2185 mana => [ 2656 mana => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2188 ], 2659 ],
2189); 2660);
2190 2661
2191# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2294 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2295} 2766}
2296 2767
2297############################################################################# 2768#############################################################################
2298 2769
2299package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2300 2771
2301our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2302 2773
2303sub new { 2774sub new {
2304 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2305 2776
2306 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2308 can_hover => 1, 2779 can_hover => 1,
2309 can_events => 1, 2780 can_events => 1,
2310 %arg, 2781 %arg,
2311 ); 2782 );
2312 2783
2313 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2314 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2315 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2316 2787
2317 $self 2788 $self
2318} 2789}
2319 2790
2320sub set_fontsize { 2791sub set_fontsize {
… …
2341 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2342} 2813}
2343 2814
2344############################################################################# 2815#############################################################################
2345 2816
2346package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2347 2818
2348use strict; 2819use strict;
2349 2820
2350use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2351 2822
2352our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2353 2824
2354my @tex = 2825my @tex =
2355 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2356 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2357 2828
2358sub new { 2829sub new {
2359 my $class = shift; 2830 my $class = shift;
2360 2831
… …
2449 } 2920 }
2450 2921
2451 1 2922 1
2452} 2923}
2453 2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933
2934 ! ! $delta
2935}
2936
2454sub update { 2937sub update {
2455 my ($self) = @_; 2938 my ($self) = @_;
2456 2939
2457 delete $self->{knob_w}; 2940 delete $self->{knob_w};
2458 $self->SUPER::update; 2941 $self->SUPER::update;
… …
2505 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2506} 2989}
2507 2990
2508############################################################################# 2991#############################################################################
2509 2992
2510package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2511 2994
2512our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2513 2996
2514sub new { 2997sub new {
2515 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2516 2999
2517 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2518 3001
2519 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2520 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2521 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2522 to_value => sub { shift }, 3005 to_value => sub { shift },
2523 from_value => sub { shift }, 3006 from_value => sub { shift },
2524 %arg, 3007 %arg,
2525 ); 3008 );
2526 3009
… …
2546sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2547sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2548 3031
2549############################################################################# 3032#############################################################################
2550 3033
2551package CFClient::UI::TextScroller; 3034package CFPlus::UI::TextScroller;
2552 3035
2553our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2554 3037
2555use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2556 3039
2557sub new { 3040sub new {
2558 my $class = shift; 3041 my $class = shift;
2559 3042
2560 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2561 fontsize => 1, 3044 fontsize => 1,
2562 can_events => 0, 3045 can_events => 1,
2563 indent => 0, 3046 indent => 0,
2564 #font => default_font 3047 #font => default_font
2565 @_, 3048 @_,
2566 3049
2567 layout => (new CFClient::Layout), 3050 layout => (new CFPlus::Layout),
2568 par => [], 3051 par => [],
3052 max_par => 0,
2569 height => 0, 3053 height => 0,
2570 children => [ 3054 children => [
2571 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2572 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2573 ], 3057 ],
2574 ); 3058 );
2575 3059
2576 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2577 3061
… …
2607 3091
2608 $self->reflow; 3092 $self->reflow;
2609 3093
2610 local $self->{children} = [$empty, $slider]; 3094 local $self->{children} = [$empty, $slider];
2611 $self->SUPER::invoke_size_allocate ($w, $h) 3095 $self->SUPER::invoke_size_allocate ($w, $h)
3096}
3097
3098sub invoke_mouse_wheel {
3099 my ($self, $ev) = @_;
3100
3101 return 0 unless $ev->{dy}; # only vertical movements
3102
3103 $self->{children}[1]->emit (mouse_wheel => $ev);
3104
3105 1
2612} 3106}
2613 3107
2614sub get_layout { 3108sub get_layout {
2615 my ($self, $para) = @_; 3109 my ($self, $para) = @_;
2616 3110
… …
2644 3138
2645 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2646 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2647} 3141}
2648 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2649sub clear { 3158sub clear {
2650 my ($self) = @_; 3159 my ($self) = @_;
2651 3160
2652 my (undef, undef, @other) = @{ $self->{children} }; 3161 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other; 3162 $self->remove ($_) for @other;
… …
2656 $self->{height} = 0; 3165 $self->{height} = 0;
2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2658} 3167}
2659 3168
2660sub add_paragraph { 3169sub add_paragraph {
2661 my ($self, $color, $para, $indent) = @_; 3170 my $self = shift;
2662 3171
2663 my ($text, @w) = ref $para ? @$para : $para; 3172 for my $para (@_) {
2664
2665 $para = { 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
2666 w => 1e10, 3179 w => 1e10,
2667 wrapped => 1, 3180 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2672 }; 3181 };
2673 3182
2674 $self->add (@w) if @w; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2675 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
2676 3190
2677 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2678 $self->update; 3192 $self->update;
2679} 3193}
2680 3194
2681sub scroll_to_bottom { 3195sub scroll_to_bottom {
2682 my ($self) = @_; 3196 my ($self) = @_;
2683 3197
2684 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2685 $self->update; 3199 $self->update;
2686} 3200}
2687 3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
3224 $self->{height} = $height;
3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3226
3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
3233}
3234
2688sub update { 3235sub update {
2689 my ($self) = @_; 3236 my ($self) = @_;
2690 3237
2691 $self->SUPER::update; 3238 $self->SUPER::update;
2692 3239
2693 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2694 3241
2695 delete $self->{texture}; 3242 delete $self->{texture};
2696 3243
2697 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2699 3248
2700 if (delete $self->{need_reflow}) {
2701 my $height = 0;
2702
2703 for my $para (@{$self->{par}}) {
2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2705 my $layout = $self->get_layout ($para);
2706 my ($w, $h) = $layout->size;
2707
2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2711 }
2712
2713 $height += $para->{h};
2714 }
2715
2716 $self->{height} = $height;
2717
2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2719
2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2725 }
2726
2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2728 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2729 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2730 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2731 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2732 3262
2733 my $y0 = $top; 3263 my $y0 = $top;
2734 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2735 3265
2736 my $y = 0;
2737
2738 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2739 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2740 3269
2741 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2742
2743 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2744 3272
2745 $layout->render ($para->{indent}, $y - $y0); 3273 $layout->render ($para->{indent}, $y - $y0);
2746 3274
2747 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
… …
2756 $_->draw; 3284 $_->draw;
2757 } 3285 }
2758 } 3286 }
2759 } 3287 }
2760 3288
2761 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3291 }
3292
3293 $self->{top_paragraph} = $top_paragraph;
2763 }; 3294 };
2764 }); 3295 });
2765} 3296}
2766 3297
2767sub reconfigure { 3298sub reconfigure {
… …
2785 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2786} 3317}
2787 3318
2788############################################################################# 3319#############################################################################
2789 3320
2790package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2791 3322
2792use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2793 3324
2794our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2795 3326
2796sub moveto { 3327sub moveto {
2797 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2798 3329
2799 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2827 glPopMatrix; 3358 glPopMatrix;
2828} 3359}
2829 3360
2830############################################################################# 3361#############################################################################
2831 3362
2832package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2833 3364
2834our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2835 3366
2836sub new { 3367sub new {
2837 my $class = shift; 3368 my $class = shift;
2838 3369
2839 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2851 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2852} 3383}
2853 3384
2854############################################################################# 3385#############################################################################
2855 3386
2856package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2857 3388
2858our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2859 3390
2860use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2861 3392
2862sub new { 3393sub new {
2863 my $class = shift; 3394 my $class = shift;
2864 3395
2865 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2868 ) 3399 )
2869} 3400}
2870 3401
2871sub set_tooltip_from { 3402sub set_tooltip_from {
2872 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2873 3407
2874 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2875 3409
2876 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2877 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2881 } 3415 }
2882 3416
2883 $tooltip =~ s/^\n+//; 3417 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//; 3418 $tooltip =~ s/\n+$//;
2885 3419
2886 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2887 markup => $tooltip, 3421 markup => $tooltip,
2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2889 fontsize => 0.8, 3423 fontsize => 0.8,
2890 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2891 ellipsise => 0, 3425 ellipsise => 0,
2892 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2893 ); 3427 );
2894} 3428}
2895 3429
… …
2914 3448
2915 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2916 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2917 or return; 3451 or return;
2918 3452
3453 if ($widget->{visible}) {
2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920 3455
2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922 if $x + $self->{w} > $self->{root}{w}; 3457 if $x + $self->{w} > $self->{root}{w};
2923 3458
2924 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2925 }); 3463 });
2926} 3464}
2927 3465
2928sub _draw { 3466sub _draw {
2929 my ($self) = @_; 3467 my ($self) = @_;
… …
2953 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2954} 3492}
2955 3493
2956############################################################################# 3494#############################################################################
2957 3495
2958package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2959 3497
2960our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2961 3499
2962use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2963 3501
2964sub new { 3502sub new {
2965 my $class = shift; 3503 my $class = shift;
2966 3504
2967 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2968 aspect => 1, 3508 aspect => 1,
2969 can_events => 0, 3509 can_events => 0,
2970 @_, 3510 @_,
2971 ); 3511 );
2972 3512
2973 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2974 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2975 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2976 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2977 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2978 hard => 1, 3519 parked => 1,
2979 interval => $self->{animspeed},
2980 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2981 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2982 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2983 }, 3528 },
2984 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2985 } 3533 }
2986 3534
2987 $self 3535 $self
2988} 3536}
2989 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
2990sub size_request { 3568sub size_request {
2991 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
2992} 3584}
2993 3585
2994sub update { 3586sub update {
2995 my ($self) = @_; 3587 my ($self) = @_;
2996 3588
2997 return unless $self->{visible}; 3589 return unless $self->{visible};
2998 3590
2999 $self->SUPER::update; 3591 $self->SUPER::update;
3000} 3592}
3001 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3002sub _draw { 3602sub _draw {
3003 my ($self) = @_; 3603 my ($self) = @_;
3004 3604
3005 return unless $::CONN; 3605 return unless $::CONN;
3006 3606
3007 my $face; 3607 $self->SUPER::_draw;
3008 3608
3009 if ($self->{frame}) {
3010 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3011 3610 or return;
3012 $face = $anim->[ $self->{frame} % @$anim ]
3013 if $anim && @$anim;
3014 }
3015 3611
3016 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3017 3613
3018 if ($tex) { 3614 if ($tex) {
3019 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3021 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3025} 3621}
3026 3622
3027sub destroy { 3623sub destroy {
3028 my ($self) = @_; 3624 my ($self) = @_;
3029 3625
3030 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3031 if $self->{timer}; 3627 if $self->{timer};
3032 3628
3033 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3034} 3630}
3035 3631
3036############################################################################# 3632#############################################################################
3037 3633
3038package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3039 3635
3040our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3041 3637
3042# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3043 3639
3044############################################################################# 3640#############################################################################
3045 3641
3046package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
3047 3643
3048our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3049 3645
3050use CFClient::OpenGL; 3646use CFPlus::OpenGL;
3051 3647
3052sub new { 3648sub new {
3053 my $class = shift; 3649 my $class = shift;
3054 3650
3055 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3056 items => [], 3652 items => [],
3057 z => 100, 3653 z => 100,
3058 @_, 3654 @_,
3059 ); 3655 );
3060 3656
3061 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3062 3658
3063 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
3064 my ($widget, $cb, $tooltip) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
3065 3661
3066 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
3067 if (!ref $widget) { 3663 if (!ref $widget) {
3068 if ($widget =~ /\t/) { 3664 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2; 3665 my ($left, $right) = split /\t/, $widget, 2;
3070 3666
3071 $widget = new CFClient::UI::HBox 3667 $widget = new CFPlus::UI::HBox
3072 can_hover => 1, 3668 can_hover => 1,
3073 can_events => 1, 3669 can_events => 1,
3074 tooltip => $tooltip, 3670 tooltip => $tooltip,
3075 children => [ 3671 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1), 3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1), 3673 (new CFPlus::UI::Label markup => $right, align => +1),
3078 ], 3674 ],
3079 ; 3675 ;
3080 3676
3081 } else { 3677 } else {
3082 $widget = new CFClient::UI::Label 3678 $widget = new CFPlus::UI::Label
3083 can_hover => 1, 3679 can_hover => 1,
3084 can_events => 1, 3680 can_events => 1,
3085 markup => $widget, 3681 markup => $widget,
3086 tooltip => $tooltip; 3682 tooltip => $tooltip;
3087 } 3683 }
… …
3135 1 3731 1
3136} 3732}
3137 3733
3138############################################################################# 3734#############################################################################
3139 3735
3140package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
3141 3737
3142our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
3143 3739
3144sub new { 3740sub new {
3145 my $class = shift; 3741 my $class = shift;
3146 3742
3147 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
3208 $self->{current}->draw; 3804 $self->{current}->draw;
3209} 3805}
3210 3806
3211############################################################################# 3807#############################################################################
3212 3808
3213package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3214 3810
3215our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3216 3812
3217sub new { 3813sub new {
3218 my $class = shift; 3814 my $class = shift;
3219 3815
3220 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3221 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3222 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3223 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3224 @_, 3820 @_,
3225 ); 3821 );
3226 3822
3227 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3231} 3827}
3232 3828
3233sub add { 3829sub add {
3234 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3235 3831
3236 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3237 3833
3238 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3239 markup => $title, 3835 markup => $title,
3240 tooltip => $tooltip, 3836 tooltip => $tooltip,
3241 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3242 ); 3838 );
3243 3839
… …
3257 $self->emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3258} 3854}
3259 3855
3260############################################################################# 3856#############################################################################
3261 3857
3262package CFClient::UI::Combobox; 3858package CFPlus::UI::Selector;
3263 3859
3264use utf8; 3860use utf8;
3265 3861
3266our @ISA = CFClient::UI::Button::; 3862our @ISA = CFPlus::UI::Button::;
3267 3863
3268sub new { 3864sub new {
3269 my $class = shift; 3865 my $class = shift;
3270 3866
3271 my $self = $class->SUPER::new ( 3867 my $self = $class->SUPER::new (
… …
3288 my ($value, $title, $tooltip) = @$_; 3884 my ($value, $title, $tooltip) = @$_;
3289 3885
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 } 3887 }
3292 3888
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294} 3890}
3295 3891
3296sub _set_value { 3892sub _set_value {
3297 my ($self, $value) = @_; 3893 my ($self, $value) = @_;
3298 3894
… …
3313 $self->emit (changed => $value); 3909 $self->emit (changed => $value);
3314} 3910}
3315 3911
3316############################################################################# 3912#############################################################################
3317 3913
3318package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3319 3915
3320our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3321 3917
3322sub new { 3918sub new {
3323 my $class = shift; 3919 my $class = shift;
3324 3920
3325 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3326 fontsize => 0.8, 3922 fontsize => 0.8,
3327 @_, 3923 @_,
3328 ); 3924 );
3329 3925
3330 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3331 3927
3332 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3333 3929
3334 $self 3930 $self
3335} 3931}
… …
3337sub reorder { 3933sub reorder {
3338 my ($self) = @_; 3934 my ($self) = @_;
3339 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3340 3936
3341 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3342 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3343 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3344 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3345 3941
3346 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3347 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3348 } 3944 }
… …
3369 for ($short) { 3965 for ($short) {
3370 s/^\s+//; 3966 s/^\s+//;
3371 s/\s+/ /g; 3967 s/\s+/ /g;
3372 } 3968 }
3373 3969
3374 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3375 markup => $short, 3971 markup => $short,
3376 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3377 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3378 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3379 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3458 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3459} 4055}
3460 4056
3461############################################################################# 4057#############################################################################
3462 4058
3463package CFClient::UI::Inventory;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 col_expand => [0, 1, 0],
3472 @_,
3473 );
3474
3475 $self
3476}
3477
3478sub set_items {
3479 my ($self, $items) = @_;
3480
3481 $self->clear;
3482 return unless $items;
3483
3484 my @items = sort {
3485 ($a->{type} <=> $b->{type})
3486 or ($a->{name} cmp $b->{name})
3487 } values %$items;
3488
3489 $self->{real_items} = \@items;
3490
3491 my $row = 0;
3492 for my $item (@items) {
3493 CFClient::Item::update_widgets $item;
3494
3495 $self->add (0, $row, $item->{face_widget});
3496 $self->add (1, $row, $item->{desc_widget});
3497 $self->add (2, $row, $item->{weight_widget});
3498
3499 $row++;
3500 }
3501}
3502
3503#############################################################################
3504
3505package CFClient::UI::SpellList;
3506
3507our @ISA = CFClient::UI::Table::;
3508
3509sub new {
3510 my $class = shift;
3511
3512 my $self = $class->SUPER::new (
3513 binding => [],
3514 commands => [],
3515 @_,
3516 )
3517}
3518
3519my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3520
3521my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3522 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3523my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531
3532sub rebuild_spell_list {
3533 my ($self) = @_;
3534
3535 $CFClient::UI::ROOT->on_refresh ($self => sub {
3536 $self->clear;
3537
3538 return unless $::CONN;
3539
3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546 my $row = 0;
3547
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_};
3550
3551 $row++;
3552
3553 my $spell_cb = sub {
3554 my ($widget, $ev) = @_;
3555
3556 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) {
3561 (new CFClient::UI::Menu
3562 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ],
3566 )->popup ($ev);
3567 } else {
3568 return 0;
3569 }
3570
3571 1
3572 };
3573
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579 $self->add (0, $row, new CFClient::UI::Face
3580 face => $spell->{face},
3581 can_hover => 1,
3582 can_events => 1,
3583 tooltip => $tooltip,
3584 on_button_down => $spell_cb,
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $tooltip,
3593 on_button_down => $spell_cb,
3594 );
3595
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600 }
3601 });
3602}
3603
3604sub add_spell {
3605 my ($self, $spell) = @_;
3606
3607 $self->{spell}->{$spell->{name}} = $spell;
3608 $self->rebuild_spell_list;
3609}
3610
3611sub remove_spell {
3612 my ($self, $spell) = @_;
3613
3614 delete $self->{spell}->{$spell->{name}};
3615 $self->rebuild_spell_list;
3616}
3617
3618sub clear_spells {
3619 my ($self) = @_;
3620
3621 $self->{spell} = {};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3628 4060
3629our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3630 4062
3631use List::Util qw(min max); 4063use List::Util qw(min max);
3632 4064
3633use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3634 4066
3635sub new { 4067sub new {
3636 my $class = shift; 4068 my $class = shift;
3637 4069
3638 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3639 visible => 1, 4071 visible => 1,
3640 @_, 4072 @_,
3641 ); 4073 );
3642 4074
3643 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3644 4076
3645 $self 4077 $self
3646} 4078}
3647 4079
3648sub size_request { 4080sub size_request {
… …
3814 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3815 4247
3816 $w = 0 if $w < 0; 4248 $w = 0 if $w < 0;
3817 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3818 4250
4251 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h;
4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259
3819 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3820 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
3821 4262
3822 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823 $widget->{old_w} = $widget->{w}; 4264 $widget->{old_w} = $widget->{w};
… …
3833 4274
3834 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3835 $_->() 4276 $_->()
3836 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3837 } 4278 }
3838
3839 4279
3840 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3841 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3842 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3843 4283
… …
3846 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3847 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3848 glLoadIdentity; 4288 glLoadIdentity;
3849 4289
3850 { 4290 {
3851 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3852 4292
3853 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3854 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3855 }
3856 4295
3857 $self->_draw; 4296 $self->_draw;
4297 }
3858} 4298}
3859 4299
3860############################################################################# 4300#############################################################################
3861 4301
3862package CFClient::UI; 4302package CFPlus::UI;
3863 4303
3864$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3865$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3866 4306
38671 43071
3868 4308

Diff Legend

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