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.317 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

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

Diff Legend

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