ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.326 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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