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.320 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

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

Diff Legend

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