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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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