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

Diff Legend

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