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.326 by root, Sun Jul 16 20:04:08 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 return if CFClient::in_destruct; 651 return if CFPlus::in_destruct;
593
594 delete $WIDGET{$self+0};
595 652
596 eval { $self->destroy }; 653 eval { $self->destroy };
597 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};
598} 657}
599 658
600############################################################################# 659#############################################################################
601 660
602package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
603 662
604our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
605 664
606use strict; 665use strict;
607use CFClient::OpenGL; 666use CFPlus::OpenGL;
608 667
609sub new { 668sub new {
610 my $class = shift; 669 my $class = shift;
611 670
612 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
643 } 702 }
644} 703}
645 704
646############################################################################# 705#############################################################################
647 706
648package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
649 708
650our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
651 710
652sub new { 711sub new {
653 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
655} 714}
… …
662 721
663sub draw { } 722sub draw { }
664 723
665############################################################################# 724#############################################################################
666 725
667package CFClient::UI::Container; 726package CFPlus::UI::Container;
668 727
669our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
670 729
671sub new { 730sub new {
672 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
673 732
674 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
683 if $children; 742 if $children;
684 743
685 $self 744 $self
686} 745}
687 746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
753}
754
688sub add { 755sub add {
689 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
690 757
691 $_->set_parent ($self) 758 $_->set_parent ($self)
692 for @widgets; 759 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
753} 820}
754 821
755############################################################################# 822#############################################################################
756 823
757package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
758 825
759our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
760 827
761sub new { 828sub new {
762 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
763 830
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 832
766 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
767} 834}
768 835
769sub add { 836sub add {
… …
776sub remove { 843sub remove {
777 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
778 845
779 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
780 847
781 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 849 unless @{$self->{children}};
783} 850}
784 851
785sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
786 853
… …
798 865
799############################################################################# 866#############################################################################
800 867
801# back-buffered drawing area 868# back-buffered drawing area
802 869
803package CFClient::UI::Window; 870package CFPlus::UI::Window;
804 871
805our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
806 873
807use CFClient::OpenGL; 874use CFPlus::OpenGL;
808 875
809sub new { 876sub new {
810 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
811 878
812 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
834} 901}
835 902
836sub render_child { 903sub render_child {
837 my ($self) = @_; 904 my ($self) = @_;
838 905
839 $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 {
840 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
842 909
843 { 910 {
844 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
845 912
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
848 } 917 }
849
850 $self->_render;
851 }; 918 };
852} 919}
853 920
854sub _draw { 921sub _draw {
855 my ($self) = @_; 922 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 923
859 my $tex = $self->{texture} 924 my $tex = $self->{texture}
860 or return; 925 or return;
861 926
862 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
865 930
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
867 932
868 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
869} 934}
870 935
871############################################################################# 936#############################################################################
872 937
873package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
874 939
940use List::Util qw(min max);
941
875our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
876 943
877sub new { 944sub new {
878 my $class = shift; 945 my $class = shift;
879 946
880 $class->SUPER::new ( 947 $class->SUPER::new (
… …
910} 977}
911 978
912sub set_offset { 979sub set_offset {
913 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
914 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}) {
915 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
917 988
989 $self->emit (changed => $x, $y);
918 $self->update; 990 $self->update;
991 }
919} 992}
920 993
921# 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
922sub coord2local { 995sub coord2local {
923 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
938 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
939 1012
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1015 ) {
943 $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})
944 } else { 1017 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1019 }
947} 1020}
948 1021
949sub _render { 1022sub _render {
950 my ($self) = @_; 1023 my ($self) = @_;
951 1024
952 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};
953 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};
954 1027
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1029
957 $self->SUPER::_render; 1030 $self->SUPER::_render;
958} 1031}
959 1032
960############################################################################# 1033#############################################################################
961 1034
962package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
963 1036
964our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
965 1038
966sub new { 1039sub new {
967 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
968 1041
969 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
970 1043
971 my $self; 1044 my $self;
972 1045
973 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
974 vertical => 1, 1056 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1058 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1061 },
979 ; 1062 ;
980 1063
981 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 1,
1067 can_events => 1,
983 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
984 %arg, 1072 %arg,
985 ); 1073 );
986 1074
987 $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
988 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
989 1092
990 $self 1093 $self
991} 1094}
992 1095
… …
999} 1102}
1000 1103
1001sub update_slider { 1104sub update_slider {
1002 my ($self) = @_; 1105 my ($self) = @_;
1003 1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 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 }
1005} 1126}
1006 1127
1007sub update { 1128sub update {
1008 my ($self) = @_; 1129 my ($self) = @_;
1009 1130
1131 $self->update_slider;
1010 $self->SUPER::update; 1132 $self->SUPER::update;
1133}
1011 1134
1012 $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
1013} 1186}
1014 1187
1015sub invoke_size_allocate { 1188sub invoke_size_allocate {
1016 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1017 1190
1018 $self->update_slider; 1191 $self->update_slider;
1019
1020 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1021} 1193}
1022 1194
1023############################################################################# 1195#############################################################################
1024 1196
1025package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1026 1198
1027our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1028 1200
1029use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1030 1202
1031sub new { 1203sub new {
1032 my $class = shift; 1204 my $class = shift;
1033 1205
1034 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1060 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1061} 1233}
1062 1234
1063############################################################################# 1235#############################################################################
1064 1236
1065package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1066 1238
1067our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1068 1240
1069use 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;
1070 1342
1071my $bg = 1343my $bg =
1072 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1074 1346
1075my @border = 1347my @border =
1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 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);
1078 1354
1079sub new { 1355sub new {
1080 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1081 1357
1082 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
… …
1087 min_w => 64, 1363 min_w => 64,
1088 min_h => 32, 1364 min_h => 32,
1089 %arg, 1365 %arg,
1090 ); 1366 );
1091 1367
1092 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1093 align => 0, 1369 align => 0,
1094 valign => 1, 1370 valign => 1,
1095 text => $self->{title}, 1371 text => $self->{title},
1096 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1097 if exists $self->{title}; 1373 if exists $self->{title};
1098 1374
1099 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1100 $self->{close_button} = 1376 $self->{close_button} =
1101 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1102 path => 'x1_close.png', 1378 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") }; 1379 on_activate => sub { $self->emit ("delete") };
1104 1380
1105 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1106 } 1382 }
1107 1383
1108 $self 1384 $self
1109} 1385}
1110 1386
1111sub add { 1387sub add {
1112 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1113 1389
1114 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1115 $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};
1116 $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};
1117} 1393}
1118 1394
1119sub border { 1395sub border {
1120 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1121} 1397}
… …
1229 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1230 1506
1231 ! ! $self->{motion} 1507 ! ! $self->{motion}
1232} 1508}
1233 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1234sub _draw { 1518sub _draw {
1235 my ($self) = @_; 1519 my ($self) = @_;
1236 1520
1237 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1238 1522
… …
1243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1244 1528
1245 my $border = $self->border; 1529 my $border = $self->border;
1246 1530
1247 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1248 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1249 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1250 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1251 $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);
1252 1550
1253 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1254 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1255 1553
1256 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1275 if $self->{close_button}; 1573 if $self->{close_button};
1276} 1574}
1277 1575
1278############################################################################# 1576#############################################################################
1279 1577
1280package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1281 1579
1282our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1283 1581
1284use List::Util qw(max sum); 1582use List::Util qw(max sum);
1285 1583
1286use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1287 1585
1288sub new { 1586sub new {
1289 my $class = shift; 1587 my $class = shift;
1290 1588
1291 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1292 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1293 @_, 1593 @_,
1294 ) 1594 )
1295} 1595}
1296 1596
1297sub children { 1597sub children {
1298 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299} 1599}
1300 1600
1601# TODO: store row/col info in child widget and use standard add/del
1301sub add { 1602sub add {
1302 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1303 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
1304 $child->set_parent ($self); 1615 $child->set_parent ($self);
1305 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1306 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1307 $self->realloc; 1621 $self->realloc;
1308} 1622}
1309 1623
1310sub remove { 1624sub remove {
1311 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1312 1626
1313 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1314} 1632}
1315 1633
1316# 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?
1317sub clear { 1635sub clear {
1318 my ($self) = @_; 1636 my ($self) = @_;
… …
1367 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1368 1686
1369 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1370 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1371 1689
1372 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1373 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1374 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1375 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1376 1694
1377 # linearly scale sizes
1378 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380 1696
1381 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
1382 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1383 1706
1384 my $y; 1707 my $y;
1385 1708
1386 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1387 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1430 } 1753 }
1431} 1754}
1432 1755
1433############################################################################# 1756#############################################################################
1434 1757
1435package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1436 1759
1760use List::Util qw(min max);
1761
1437our @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::;
1438 1843
1439sub size_request { 1844sub size_request {
1440 my ($self) = @_; 1845 my ($self) = @_;
1441 1846
1442 $self->{vertical} 1847 $self->{vertical}
… …
1475 $req[$_] += $space * $children[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1476 for 0 .. $#children; 1881 for 0 .. $#children;
1477 } 1882 }
1478 } 1883 }
1479 1884
1480 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1481 1886
1482 my $pos = 0; 1887 my $pos = 0;
1483 for (0 .. $#children) { 1888 for (0 .. $#children) {
1484 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1485 $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));
… …
1490 1 1895 1
1491} 1896}
1492 1897
1493############################################################################# 1898#############################################################################
1494 1899
1495package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1496 1901
1497our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1498 1903
1499sub new { 1904sub new {
1500 my $class = shift; 1905 my $class = shift;
1501 1906
1502 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1505 ) 1910 )
1506} 1911}
1507 1912
1508############################################################################# 1913#############################################################################
1509 1914
1510package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1511 1916
1512our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1513 1918
1514sub new { 1919sub new {
1515 my $class = shift; 1920 my $class = shift;
1516 1921
1517 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1520 ) 1925 )
1521} 1926}
1522 1927
1523############################################################################# 1928#############################################################################
1524 1929
1525package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1526 1931
1527our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1528 1933
1529use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1530 1935
1531sub new { 1936sub new {
1532 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1533 1938
1534 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1537 #active_bg => none 1942 #active_bg => none
1538 #font => default_font 1943 #font => default_font
1539 #text => initial text 1944 #text => initial text
1540 #markup => initial narkup 1945 #markup => initial narkup
1541 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1542 ellipsise => 3, # end 1948 ellipsise => 3, # end
1543 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1544 fontsize => 1, 1950 fontsize => 1,
1545 align => -1, 1951 align => -1,
1546 valign => -1, 1952 valign => -1,
1547 padding_x => 2, 1953 padding_x => 2,
1548 padding_y => 2, 1954 padding_y => 2,
1549 can_events => 0, 1955 can_events => 0,
1550 %arg 1956 %arg
1551 ); 1957 );
1552 1958
1553 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1554 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1555 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1556 $self->{template} = $layout; 1962 $self->{template} = $layout;
1557 } 1963 }
1558 1964
1559 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1561 } else { 1967 } else {
1562 $self->set_text (delete $self->{text}); 1968 $self->set_text (delete $self->{text});
1563 } 1969 }
1564 1970
1565 $self 1971 $self
1566}
1567
1568sub escape($) {
1569 local $_ = $_[0];
1570
1571 s/&/&amp;/g;
1572 s/>/&gt;/g;
1573 s/</&lt;/g;
1574
1575 $_
1576} 1972}
1577 1973
1578sub update { 1974sub update {
1579 my ($self) = @_; 1975 my ($self) = @_;
1580 1976
… …
1707 }; 2103 };
1708 2104
1709 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 2107
1712 $self->{layout}->render ($self->{ox}, $self->{oy}); 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713} 2109}
1714 2110
1715############################################################################# 2111#############################################################################
1716 2112
1717package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1718 2114
1719our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1720 2116
1721use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1722 2118
1723sub new { 2119sub new {
1724 my $class = shift; 2120 my $class = shift;
1725 2121
1726 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1731 can_hover => 1, 2127 can_hover => 1,
1732 can_focus => 1, 2128 can_focus => 1,
1733 valign => 0, 2129 valign => 0,
1734 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1735 #text => ... 2132 #text => ...
1736 #hidden => "*", 2133 #hidden => "*",
1737 @_ 2134 @_
1738 ) 2135 )
1739} 2136}
… …
1784 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1786 2183
1787 my $text = $self->get_text; 2184 my $text = $self->get_text;
1788 2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187
1789 if ($uni == 8) { 2188 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } 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 = "";
1798 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2212 $self->emit ('escape');
1803 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2217 } else {
1806 return 0; 2218 return 0;
1807 } 2219 }
1808 2220
1809 $self->_set_text ($text); 2221 $self->_set_text ($text);
1810 2222
1811 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1812 2225
1813 1 2226 1
1814} 2227}
1815 2228
1816sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1878 utf8::encode $text; 2291 utf8::encode $text;
1879 2292
1880 @$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)
1881 } 2294 }
1882 2295
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2296 glBegin GL_LINES;
1885 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};
1886 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};
1887 glEnd; 2299 glEnd;
1888 } 2300 }
1889} 2301}
1890 2302
2303#############################################################################
2304
1891package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1892 2306
1893our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1894 2308
1895use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1896 2310
1897sub invoke_key_down { 2311sub invoke_key_down {
1898 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1899 2313
1900 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1901 2315
1902 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1905 2319
1906 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
1909 $self->update; 2323 $self->update;
1910 2324
1911 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1914 } 2328 }
1915 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2333 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2335 }
1922 2336
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2340
1927 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2351 1
1938} 2352}
1939 2353
1940############################################################################# 2354#############################################################################
1941 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
1942package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1943 2396
1944our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1945 2398
1946use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1947 2400
1948my @tex = 2401my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1951 2404
1952sub new { 2405sub new {
1953 my $class = shift; 2406 my $class = shift;
1954 2407
1955 $class->SUPER::new ( 2408 $class->SUPER::new (
1956 padding_x => 4, 2409 padding_x => 4,
1957 padding_y => 4, 2410 padding_y => 4,
1958 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2413 can_hover => 1,
1961 align => 0, 2414 align => 0,
1962 valign => 0, 2415 valign => 0,
1963 can_events => 1, 2416 can_events => 1,
1964 @_ 2417 @_
… …
1982 2435
1983 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1986 2439
2440 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2442
1989 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1990 2444
1991 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1992} 2446}
1993 2447
1994############################################################################# 2448#############################################################################
1995 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
1996package CFClient::UI::ImageButton; 2599package CFPlus::UI::ImageButton;
1997 2600
1998our @ISA = CFClient::UI::Image::; 2601our @ISA = CFPlus::UI::Image::;
1999 2602
2000use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2001 2604
2002my %textures; 2605my %textures;
2003 2606
2004sub new { 2607sub new {
2005 my $class = shift; 2608 my $class = shift;
… …
2027 1 2630 1
2028} 2631}
2029 2632
2030############################################################################# 2633#############################################################################
2031 2634
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2072sub invoke_button_down {
2073 my ($self, $ev, $x, $y) = @_;
2074
2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077 $self->toggle;
2078 } else {
2079 return 0
2080 }
2081
2082 1
2083}
2084
2085sub _draw {
2086 my ($self) = @_;
2087
2088 $self->SUPER::_draw;
2089
2090 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092 my ($w, $h) = @$self{qw(w h)};
2093
2094 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098 my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100 glEnable GL_TEXTURE_2D;
2101 $tex->draw_quad_alpha (0, 0, $s, $s);
2102 glDisable GL_TEXTURE_2D;
2103}
2104
2105#############################################################################
2106
2107package CFClient::UI::Image; 2635package CFPlus::UI::VGauge;
2108 2636
2109our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2110
2111use CFClient::OpenGL;
2112
2113our %texture_cache;
2114
2115sub new {
2116 my $class = shift;
2117
2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2122
2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
2125
2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133 $self
2134}
2135
2136sub size_request {
2137 my ($self) = @_;
2138
2139 ($self->{tex}{w}, $self->{tex}{h})
2140}
2141
2142sub _draw {
2143 my ($self) = @_;
2144
2145 my $tex = $self->{tex};
2146
2147 my ($w, $h) = ($self->{w}, $self->{h});
2148
2149 if ($self->{rot90}) {
2150 glRotate 90, 0, 0, 1;
2151 glTranslate 0, -$self->{w}, 0;
2152
2153 ($w, $h) = ($h, $w);
2154 }
2155
2156 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159 $tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161 glDisable GL_TEXTURE_2D;
2162}
2163
2164#############################################################################
2165
2166package CFClient::UI::VGauge;
2167
2168our @ISA = CFClient::UI::Base::;
2169 2638
2170use List::Util qw(min max); 2639use List::Util qw(min max);
2171 2640
2172use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2173 2642
2174my %tex = ( 2643my %tex = (
2175 food => [ 2644 food => [
2176 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178 ], 2647 ],
2179 grace => [ 2648 grace => [
2180 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2182 ], 2651 ],
2183 hp => [ 2652 hp => [
2184 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186 ], 2655 ],
2187 mana => [ 2656 mana => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2190 ], 2659 ],
2191); 2660);
2192 2661
2193# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2296 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2297} 2766}
2298 2767
2299############################################################################# 2768#############################################################################
2300 2769
2301package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2302 2771
2303our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2304 2773
2305sub new { 2774sub new {
2306 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2307 2776
2308 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2310 can_hover => 1, 2779 can_hover => 1,
2311 can_events => 1, 2780 can_events => 1,
2312 %arg, 2781 %arg,
2313 ); 2782 );
2314 2783
2315 $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");
2316 $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);
2317 $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");
2318 2787
2319 $self 2788 $self
2320} 2789}
2321 2790
2322sub set_fontsize { 2791sub set_fontsize {
… …
2343 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2344} 2813}
2345 2814
2346############################################################################# 2815#############################################################################
2347 2816
2348package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2349 2818
2350use strict; 2819use strict;
2351 2820
2352use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2353 2822
2354our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2355 2824
2356my @tex = 2825my @tex =
2357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2359 2828
2360sub new { 2829sub new {
2361 my $class = shift; 2830 my $class = shift;
2362 2831
… …
2451 } 2920 }
2452 2921
2453 1 2922 1
2454} 2923}
2455 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
2456sub update { 2937sub update {
2457 my ($self) = @_; 2938 my ($self) = @_;
2458 2939
2459 delete $self->{knob_w}; 2940 delete $self->{knob_w};
2460 $self->SUPER::update; 2941 $self->SUPER::update;
… …
2507 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2508} 2989}
2509 2990
2510############################################################################# 2991#############################################################################
2511 2992
2512package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2513 2994
2514our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2515 2996
2516sub new { 2997sub new {
2517 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2518 2999
2519 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2520 3001
2521 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2522 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524 to_value => sub { shift }, 3005 to_value => sub { shift },
2525 from_value => sub { shift }, 3006 from_value => sub { shift },
2526 %arg, 3007 %arg,
2527 ); 3008 );
2528 3009
… …
2548sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2549sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2550 3031
2551############################################################################# 3032#############################################################################
2552 3033
2553package CFClient::UI::TextScroller; 3034package CFPlus::UI::TextScroller;
2554 3035
2555our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2556 3037
2557use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2558 3039
2559sub new { 3040sub new {
2560 my $class = shift; 3041 my $class = shift;
2561 3042
2562 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2563 fontsize => 1, 3044 fontsize => 1,
2564 can_events => 0, 3045 can_events => 1,
2565 indent => 0, 3046 indent => 0,
2566 #font => default_font 3047 #font => default_font
2567 @_, 3048 @_,
2568 3049
2569 layout => (new CFClient::Layout), 3050 layout => (new CFPlus::Layout),
2570 par => [], 3051 par => [],
3052 max_par => 0,
2571 height => 0, 3053 height => 0,
2572 children => [ 3054 children => [
2573 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2574 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2575 ], 3057 ],
2576 ); 3058 );
2577 3059
2578 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2579 3061
… …
2609 3091
2610 $self->reflow; 3092 $self->reflow;
2611 3093
2612 local $self->{children} = [$empty, $slider]; 3094 local $self->{children} = [$empty, $slider];
2613 $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
2614} 3106}
2615 3107
2616sub get_layout { 3108sub get_layout {
2617 my ($self, $para) = @_; 3109 my ($self, $para) = @_;
2618 3110
… …
2646 3138
2647 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2648 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2649} 3141}
2650 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
2651sub clear { 3158sub clear {
2652 my ($self) = @_; 3159 my ($self) = @_;
2653 3160
2654 my (undef, undef, @other) = @{ $self->{children} }; 3161 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other; 3162 $self->remove ($_) for @other;
… …
2658 $self->{height} = 0; 3165 $self->{height} = 0;
2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660} 3167}
2661 3168
2662sub add_paragraph { 3169sub add_paragraph {
2663 my ($self, $color, $para, $indent) = @_; 3170 my $self = shift;
2664 3171
2665 my ($text, @w) = ref $para ? @$para : $para; 3172 for my $para (@_) {
2666
2667 $para = { 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
2668 w => 1e10, 3179 w => 1e10,
2669 wrapped => 1, 3180 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2674 }; 3181 };
2675 3182
2676 $self->add (@w) if @w; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677 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 }
2678 3190
2679 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2680 $self->update; 3192 $self->update;
2681} 3193}
2682 3194
2683sub scroll_to_bottom { 3195sub scroll_to_bottom {
2684 my ($self) = @_; 3196 my ($self) = @_;
2685 3197
2686 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2687 $self->update; 3199 $self->update;
2688} 3200}
2689 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
2690sub update { 3235sub update {
2691 my ($self) = @_; 3236 my ($self) = @_;
2692 3237
2693 $self->SUPER::update; 3238 $self->SUPER::update;
2694 3239
2695 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2696 3241
2697 delete $self->{texture}; 3242 delete $self->{texture};
2698 3243
2699 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701 3248
2702 if (delete $self->{need_reflow}) {
2703 my $height = 0;
2704
2705 for my $para (@{$self->{par}}) {
2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707 my $layout = $self->get_layout ($para);
2708 my ($w, $h) = $layout->size;
2709
2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2713 }
2714
2715 $height += $para->{h};
2716 }
2717
2718 $self->{height} = $height;
2719
2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2731 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2732 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;
2733 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2734 3262
2735 my $y0 = $top; 3263 my $y0 = $top;
2736 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2737 3265
2738 my $y = 0;
2739
2740 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2741 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2742 3269
2743 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2744
2745 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2746 3272
2747 $layout->render ($para->{indent}, $y - $y0); 3273 $layout->render ($para->{indent}, $y - $y0);
2748 3274
2749 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
… …
2758 $_->draw; 3284 $_->draw;
2759 } 3285 }
2760 } 3286 }
2761 } 3287 }
2762 3288
2763 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3291 }
3292
3293 $self->{top_paragraph} = $top_paragraph;
2765 }; 3294 };
2766 }); 3295 });
2767} 3296}
2768 3297
2769sub reconfigure { 3298sub reconfigure {
… …
2787 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2788} 3317}
2789 3318
2790############################################################################# 3319#############################################################################
2791 3320
2792package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2793 3322
2794use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2795 3324
2796our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2797 3326
2798sub moveto { 3327sub moveto {
2799 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2800 3329
2801 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2829 glPopMatrix; 3358 glPopMatrix;
2830} 3359}
2831 3360
2832############################################################################# 3361#############################################################################
2833 3362
2834package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2835 3364
2836our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2837 3366
2838sub new { 3367sub new {
2839 my $class = shift; 3368 my $class = shift;
2840 3369
2841 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2853 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2854} 3383}
2855 3384
2856############################################################################# 3385#############################################################################
2857 3386
2858package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2859 3388
2860our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2861 3390
2862use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2863 3392
2864sub new { 3393sub new {
2865 my $class = shift; 3394 my $class = shift;
2866 3395
2867 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2870 ) 3399 )
2871} 3400}
2872 3401
2873sub set_tooltip_from { 3402sub set_tooltip_from {
2874 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2875 3407
2876 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2877 3409
2878 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2883 } 3415 }
2884 3416
2885 $tooltip =~ s/^\n+//; 3417 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//; 3418 $tooltip =~ s/\n+$//;
2887 3419
2888 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2889 markup => $tooltip, 3421 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8, 3423 fontsize => 0.8,
2892 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2893 ellipsise => 0, 3425 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 ); 3427 );
2896} 3428}
2897 3429
… …
2916 3448
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2919 or return; 3451 or return;
2920 3452
3453 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3455
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3457 if $x + $self->{w} > $self->{root}{w};
2925 3458
2926 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2927 }); 3463 });
2928} 3464}
2929 3465
2930sub _draw { 3466sub _draw {
2931 my ($self) = @_; 3467 my ($self) = @_;
… …
2955 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2956} 3492}
2957 3493
2958############################################################################# 3494#############################################################################
2959 3495
2960package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2961 3497
2962our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2963 3499
2964use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2965 3501
2966sub new { 3502sub new {
2967 my $class = shift; 3503 my $class = shift;
2968 3504
2969 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2970 aspect => 1, 3508 aspect => 1,
2971 can_events => 0, 3509 can_events => 0,
2972 @_, 3510 @_,
2973 ); 3511 );
2974 3512
2975 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2977 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2978 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1, 3519 parked => 1,
2981 interval => $self->{animspeed},
2982 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2983 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2984 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2985 }, 3528 },
2986 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2987 } 3533 }
2988 3534
2989 $self 3535 $self
2990} 3536}
2991 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
2992sub size_request { 3568sub size_request {
2993 (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)
2994} 3584}
2995 3585
2996sub update { 3586sub update {
2997 my ($self) = @_; 3587 my ($self) = @_;
2998 3588
2999 return unless $self->{visible}; 3589 return unless $self->{visible};
3000 3590
3001 $self->SUPER::update; 3591 $self->SUPER::update;
3002} 3592}
3003 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3004sub _draw { 3602sub _draw {
3005 my ($self) = @_; 3603 my ($self) = @_;
3006 3604
3007 return unless $::CONN; 3605 return unless $::CONN;
3008 3606
3009 my $face; 3607 $self->SUPER::_draw;
3010 3608
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3013 3610 or return;
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017 3611
3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3019 3613
3020 if ($tex) { 3614 if ($tex) {
3021 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3027} 3621}
3028 3622
3029sub destroy { 3623sub destroy {
3030 my ($self) = @_; 3624 my ($self) = @_;
3031 3625
3032 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3033 if $self->{timer}; 3627 if $self->{timer};
3034 3628
3035 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3036} 3630}
3037 3631
3038############################################################################# 3632#############################################################################
3039 3633
3040package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3041 3635
3042our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3043 3637
3044# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3045 3639
3046############################################################################# 3640#############################################################################
3047 3641
3048package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
3049 3643
3050our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3051 3645
3052use CFClient::OpenGL; 3646use CFPlus::OpenGL;
3053 3647
3054sub new { 3648sub new {
3055 my $class = shift; 3649 my $class = shift;
3056 3650
3057 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3058 items => [], 3652 items => [],
3059 z => 100, 3653 z => 100,
3060 @_, 3654 @_,
3061 ); 3655 );
3062 3656
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064 3658
3065 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
3067 3661
3068 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
3069 if (!ref $widget) { 3663 if (!ref $widget) {
3070 if ($widget =~ /\t/) { 3664 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2; 3665 my ($left, $right) = split /\t/, $widget, 2;
3072 3666
3073 $widget = new CFClient::UI::HBox 3667 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3668 can_hover => 1,
3075 can_events => 1, 3669 can_events => 1,
3076 tooltip => $tooltip, 3670 tooltip => $tooltip,
3077 children => [ 3671 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1), 3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1), 3673 (new CFPlus::UI::Label markup => $right, align => +1),
3080 ], 3674 ],
3081 ; 3675 ;
3082 3676
3083 } else { 3677 } else {
3084 $widget = new CFClient::UI::Label 3678 $widget = new CFPlus::UI::Label
3085 can_hover => 1, 3679 can_hover => 1,
3086 can_events => 1, 3680 can_events => 1,
3087 markup => $widget, 3681 markup => $widget,
3088 tooltip => $tooltip; 3682 tooltip => $tooltip;
3089 } 3683 }
… …
3137 1 3731 1
3138} 3732}
3139 3733
3140############################################################################# 3734#############################################################################
3141 3735
3142package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
3143 3737
3144our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
3145 3739
3146sub new { 3740sub new {
3147 my $class = shift; 3741 my $class = shift;
3148 3742
3149 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
3210 $self->{current}->draw; 3804 $self->{current}->draw;
3211} 3805}
3212 3806
3213############################################################################# 3807#############################################################################
3214 3808
3215package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3216 3810
3217our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3218 3812
3219sub new { 3813sub new {
3220 my $class = shift; 3814 my $class = shift;
3221 3815
3222 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3223 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3224 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3226 @_, 3820 @_,
3227 ); 3821 );
3228 3822
3229 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3233} 3827}
3234 3828
3235sub add { 3829sub add {
3236 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3237 3831
3238 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3239 3833
3240 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3241 markup => $title, 3835 markup => $title,
3242 tooltip => $tooltip, 3836 tooltip => $tooltip,
3243 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3244 ); 3838 );
3245 3839
… …
3259 $self->emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3260} 3854}
3261 3855
3262############################################################################# 3856#############################################################################
3263 3857
3264package CFClient::UI::Combobox; 3858package CFPlus::UI::Selector;
3265 3859
3266use utf8; 3860use utf8;
3267 3861
3268our @ISA = CFClient::UI::Button::; 3862our @ISA = CFPlus::UI::Button::;
3269 3863
3270sub new { 3864sub new {
3271 my $class = shift; 3865 my $class = shift;
3272 3866
3273 my $self = $class->SUPER::new ( 3867 my $self = $class->SUPER::new (
… …
3290 my ($value, $title, $tooltip) = @$_; 3884 my ($value, $title, $tooltip) = @$_;
3291 3885
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 } 3887 }
3294 3888
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296} 3890}
3297 3891
3298sub _set_value { 3892sub _set_value {
3299 my ($self, $value) = @_; 3893 my ($self, $value) = @_;
3300 3894
… …
3315 $self->emit (changed => $value); 3909 $self->emit (changed => $value);
3316} 3910}
3317 3911
3318############################################################################# 3912#############################################################################
3319 3913
3320package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3321 3915
3322our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3323 3917
3324sub new { 3918sub new {
3325 my $class = shift; 3919 my $class = shift;
3326 3920
3327 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3328 fontsize => 0.8, 3922 fontsize => 0.8,
3329 @_, 3923 @_,
3330 ); 3924 );
3331 3925
3332 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3333 3927
3334 $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 });
3335 3929
3336 $self 3930 $self
3337} 3931}
… …
3339sub reorder { 3933sub reorder {
3340 my ($self) = @_; 3934 my ($self) = @_;
3341 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3342 3936
3343 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3347 3941
3348 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3349 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350 } 3944 }
… …
3371 for ($short) { 3965 for ($short) {
3372 s/^\s+//; 3966 s/^\s+//;
3373 s/\s+/ /g; 3967 s/\s+/ /g;
3374 } 3968 }
3375 3969
3376 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3377 markup => $short, 3971 markup => $short,
3378 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3379 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3380 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3381 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3460 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3461} 4055}
3462 4056
3463############################################################################# 4057#############################################################################
3464 4058
3465package CFClient::UI::Inventory;
3466
3467our @ISA = CFClient::UI::Table::;
3468
3469sub new {
3470 my $class = shift;
3471
3472 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0],
3474 @_,
3475 );
3476
3477 $self
3478}
3479
3480sub set_items {
3481 my ($self, $items) = @_;
3482
3483 $self->clear;
3484 return unless $items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503}
3504
3505#############################################################################
3506
3507package CFClient::UI::SpellList;
3508
3509our @ISA = CFClient::UI::Table::;
3510
3511sub new {
3512 my $class = shift;
3513
3514 my $self = $class->SUPER::new (
3515 binding => [],
3516 commands => [],
3517 @_,
3518 )
3519}
3520
3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3627#############################################################################
3628
3629package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3630 4060
3631our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3632 4062
3633use List::Util qw(min max); 4063use List::Util qw(min max);
3634 4064
3635use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3636 4066
3637sub new { 4067sub new {
3638 my $class = shift; 4068 my $class = shift;
3639 4069
3640 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3641 visible => 1, 4071 visible => 1,
3642 @_, 4072 @_,
3643 ); 4073 );
3644 4074
3645 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3646 4076
3647 $self 4077 $self
3648} 4078}
3649 4079
3650sub size_request { 4080sub size_request {
… …
3819 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3820 4250
3821 $w = max $widget->{min_w}, $w; 4251 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h; 4252 $h = max $widget->{min_h}, $h;
3823 4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826 4259
3827 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
… …
3841 4274
3842 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3843 $_->() 4276 $_->()
3844 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3845 } 4278 }
3846
3847 4279
3848 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3851 4283
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 4288 glLoadIdentity;
3857 4289
3858 { 4290 {
3859 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3860 4292
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4295
3865 $self->_draw; 4296 $self->_draw;
4297 }
3866} 4298}
3867 4299
3868############################################################################# 4300#############################################################################
3869 4301
3870package CFClient::UI; 4302package CFPlus::UI;
3871 4303
3872$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874 4306
38751 43071
3876 4308

Diff Legend

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