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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 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};
… …
681 if $children; 746 if $children;
682 747
683 $self 748 $self
684} 749}
685 750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
757}
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;
… …
750 $_->draw for @{$self->{children}}; 823 $_->draw for @{$self->{children}};
751} 824}
752 825
753############################################################################# 826#############################################################################
754 827
755package CFClient::UI::Bin; 828package CFPlus::UI::Bin;
756 829
757our @ISA = CFClient::UI::Container::; 830our @ISA = CFPlus::UI::Container::;
758 831
759sub new { 832sub new {
760 my ($class, %arg) = @_; 833 my ($class, %arg) = @_;
761 834
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 835 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 836
764 $class->SUPER::new (children => [$child], %arg) 837 $class->SUPER::new (children => [$child], %arg)
765} 838}
766 839
767sub add { 840sub add {
… …
774sub remove { 847sub remove {
775 my ($self, $widget) = @_; 848 my ($self, $widget) = @_;
776 849
777 $self->SUPER::remove ($widget); 850 $self->SUPER::remove ($widget);
778 851
779 $self->{children} = [new CFClient::UI::Empty] 852 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 853 unless @{$self->{children}};
781} 854}
782 855
783sub child { $_[0]->{children}[0] } 856sub child { $_[0]->{children}[0] }
784 857
… …
796 869
797############################################################################# 870#############################################################################
798 871
799# back-buffered drawing area 872# back-buffered drawing area
800 873
801package CFClient::UI::Window; 874package CFPlus::UI::Window;
802 875
803our @ISA = CFClient::UI::Bin::; 876our @ISA = CFPlus::UI::Bin::;
804 877
805use CFClient::OpenGL; 878use CFPlus::OpenGL;
806 879
807sub new { 880sub new {
808 my ($class, %arg) = @_; 881 my ($class, %arg) = @_;
809 882
810 my $self = $class->SUPER::new (%arg); 883 my $self = $class->SUPER::new (%arg);
… …
832} 905}
833 906
834sub render_child { 907sub render_child {
835 my ($self) = @_; 908 my ($self) = @_;
836 909
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 910 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 911 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 912 glClear GL_COLOR_BUFFER_BIT;
840 913
841 { 914 {
842 package CFClient::UI::Base; 915 package CFPlus::UI::Base;
843 916
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 917 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 918 (0, 0, $self->{w}, $self->{h});
919
920 $self->_render;
846 } 921 }
847
848 $self->_render;
849 }; 922 };
850} 923}
851 924
852sub _draw { 925sub _draw {
853 my ($self) = @_; 926 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 927
857 my $tex = $self->{texture} 928 my $tex = $self->{texture}
858 or return; 929 or return;
859 930
860 glEnable GL_TEXTURE_2D; 931 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 933 glColor 0, 0, 0, 1;
863 934
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 935 $tex->draw_quad_alpha_premultiplied (0, 0);
865 936
866 glDisable GL_TEXTURE_2D; 937 glDisable GL_TEXTURE_2D;
867} 938}
868 939
869############################################################################# 940#############################################################################
870 941
871package CFClient::UI::ViewPort; 942package CFPlus::UI::ViewPort;
872 943
944use List::Util qw(min max);
945
873our @ISA = CFClient::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
874 947
875sub new { 948sub new {
876 my $class = shift; 949 my $class = shift;
877 950
878 $class->SUPER::new ( 951 $class->SUPER::new (
… …
885sub size_request { 958sub size_request {
886 my ($self) = @_; 959 my ($self) = @_;
887 960
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 961 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 962
890 $w = 10 if $self->{scroll_x}; 963 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 964 $h = 1 if $self->{scroll_y};
892 965
893 ($w, $h) 966 ($w, $h)
894} 967}
895 968
896sub invoke_size_allocate { 969sub invoke_size_allocate {
… …
908} 981}
909 982
910sub set_offset { 983sub set_offset {
911 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
912 985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
915 992
993 $self->emit (changed => $x, $y);
916 $self->update; 994 $self->update;
995 }
917} 996}
918 997
919# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 999sub coord2local {
921 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
937 1016
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1019 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1021 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1023 }
945} 1024}
946 1025
947sub _render { 1026sub _render {
948 my ($self) = @_; 1027 my ($self) = @_;
949 1028
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1031
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1033
955 $self->SUPER::_render; 1034 $self->SUPER::_render;
956} 1035}
957 1036
958############################################################################# 1037#############################################################################
959 1038
960package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
961 1040
962our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
963 1042
964sub new { 1043sub new {
965 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
966 1045
967 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
968 1047
969 my $self; 1048 my $self;
970 1049
971 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1060 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1062 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1065 },
977 ; 1066 ;
978 1067
979 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
981 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
982 %arg, 1076 %arg,
983 ); 1077 );
984 1078
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094
986 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
987 1096
988 $self 1097 $self
989} 1098}
990 1099
… …
997} 1106}
998 1107
999sub update_slider { 1108sub update_slider {
1000 my ($self) = @_; 1109 my ($self) = @_;
1001 1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 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]); 1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1003} 1130}
1004 1131
1005sub update { 1132sub update {
1006 my ($self) = @_; 1133 my ($self) = @_;
1007 1134
1135 $self->update_slider;
1008 $self->SUPER::update; 1136 $self->SUPER::update;
1137}
1009 1138
1010 $self->update_slider; 1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_;
1141
1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
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::Base::;
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 (
1596 children => [],
1290 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1291 @_, 1599 @_,
1292 ) 1600 )
1293} 1601}
1294 1602
1295sub children { 1603sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1605}
1298 1606
1607# TODO: store row/col info in child widget and use standard add/del
1299sub add { 1608sub add {
1300 my ($self, $x, $y, $child) = @_; 1609 my $self = shift;
1301 1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 $child->{rowspan} ||= 1;
1625 $child->{colspan} ||= 1;
1626
1302 $child->set_parent ($self); 1627 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1628 $self->{children}[$row][$col] = $child;
1629 }
1304 1630
1631 $self->{force_realloc} = 1;
1632 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1633 $self->realloc;
1306} 1634}
1307 1635
1308sub remove { 1636sub remove {
1309 my ($self, $child) = @_; 1637 my ($self, $child) = @_;
1310 1638
1311 # TODO: not yet implemented 1639 for (@{ $self->{children} }) {
1640 for (@{ $_ || [] }) {
1641 $_ = undef if $_ == $child;
1642 }
1643 }
1312} 1644}
1313 1645
1314# TODO: move to container class maybe? send children a signal on removal? 1646# TODO: move to container class maybe? send children a signal on removal?
1315sub clear { 1647sub clear {
1316 my ($self) = @_; 1648 my ($self) = @_;
… …
1329sub get_wh { 1661sub get_wh {
1330 my ($self) = @_; 1662 my ($self) = @_;
1331 1663
1332 my (@w, @h); 1664 my (@w, @h);
1333 1665
1334 for my $y (0 .. $#{$self->{children}}) { 1666 my @children = $self->children;
1335 my $row = $self->{children}[$y]
1336 or next;
1337 1667
1338 for my $x (0 .. $#$row) { 1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1339 my $widget = $row->[$x] 1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1340 or next;
1341 my ($w, $h) = @$widget{qw(req_w req_h)};
1342 1670
1343 $w[$x] = max $w[$x], $w; 1671 my $sw = sum @w[$c .. $c + $cs - 1];
1344 $h[$y] = max $h[$y], $h; 1672 my $sh = sum @h[$r .. $r + $rs - 1];
1673
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1345 } 1680 }
1346 } 1681 }
1347 1682
1348 (\@w, \@h) 1683 (\@w, \@h)
1349} 1684}
… …
1365 my ($ws, $hs) = $self->get_wh; 1700 my ($ws, $hs) = $self->get_wh;
1366 1701
1367 my $req_w = (sum @$ws) || 1; 1702 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1703 my $req_h = (sum @$hs) || 1;
1369 1704
1370 # TODO: nicer code && do row_expand 1705 # now linearly scale the rows/columns to the allocated size
1371 my @col_expand = @{$self->{col_expand}}; 1706 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1707 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1708 my $col_expand = (sum @col_expand) || 1;
1374 1709
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1711
1379 CFClient::UI::harmonize $ws; 1712 CFPlus::UI::harmonize $ws;
1713
1714 my @row_expand = @{$self->{row_expand}};
1715 @row_expand = (1) x @$ws unless @row_expand;
1716 my $row_expand = (sum @row_expand) || 1;
1717
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719
1380 CFClient::UI::harmonize $hs; 1720 CFPlus::UI::harmonize $hs;
1381 1721
1382 my $y; 1722 my (@x, @y);
1383 1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726
1384 for my $r (0 .. $#{$self->{children}}) { 1727 for my $widget ($self->children) {
1385 my $row = $self->{children}[$r] 1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1386 or next;
1387 1729
1388 my $x = 0; 1730 $widget->configure (
1389 my $row_h = $hs->[$r]; 1731 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1390 1733 );
1391 for my $c (0 .. $#$row) {
1392 my $col_w = $ws->[$c];
1393
1394 if (my $widget = $row->[$c]) {
1395 $widget->configure ($x, $y, $col_w, $row_h);
1396 }
1397
1398 $x += $col_w;
1399 }
1400
1401 $y += $row_h;
1402 } 1734 }
1403 1735
1404 1 1736 1
1405} 1737}
1406 1738
… …
1428 } 1760 }
1429} 1761}
1430 1762
1431############################################################################# 1763#############################################################################
1432 1764
1433package CFClient::UI::Box; 1765package CFPlus::UI::Fixed;
1434 1766
1767use List::Util qw(min max);
1768
1435our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1770
1771sub add {
1772 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775 $self->SUPER::add ($child);
1776}
1777
1778sub _scale($$$) {
1779 my ($mode, $val, $max) = @_;
1780
1781 $mode eq "abs" ? $val
1782 : $mode eq "rel" ? $val * $max
1783 : 0
1784}
1785
1786sub size_request {
1787 my ($self) = @_;
1788
1789 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790
1791 # determine overall size by querying abs widgets
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 if ($pos eq "abs") {
1796 $w = _scale $size, $w, $child->{req_w};
1797 $h = _scale $size, $h, $child->{req_h};
1798
1799 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1800 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1801 }
1802 }
1803
1804 my $W = $x2 - $x1;
1805 my $H = $y2 - $y1;
1806
1807 # now layout remaining widgets
1808 for my $child ($self->visible_children) {
1809 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1810
1811 if ($pos ne "abs") {
1812 $x = _scale $pos, $x, $W;
1813 $y = _scale $pos, $x, $H;
1814 $w = _scale $size, $w, $child->{req_w};
1815 $h = _scale $size, $h, $child->{req_h};
1816
1817 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1818 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1819 }
1820 }
1821
1822 my $W = $x2 - $x1;
1823 my $H = $y2 - $y1;
1824
1825 ($W, $H)
1826}
1827
1828sub invoke_size_allocate {
1829 my ($self, $W, $H) = @_;
1830
1831 for my $child ($self->visible_children) {
1832 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1833
1834 $x = _scale $pos, $x, $W;
1835 $y = _scale $pos, $x, $H;
1836 $w = _scale $size, $w, $child->{req_w};
1837 $h = _scale $size, $h, $child->{req_h};
1838
1839 $child->configure ($x, $y, $w, $h);
1840 }
1841
1842 1
1843}
1844
1845#############################################################################
1846
1847package CFPlus::UI::Box;
1848
1849our @ISA = CFPlus::UI::Container::;
1436 1850
1437sub size_request { 1851sub size_request {
1438 my ($self) = @_; 1852 my ($self) = @_;
1439 1853
1440 $self->{vertical} 1854 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1887 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1888 for 0 .. $#children;
1475 } 1889 }
1476 } 1890 }
1477 1891
1478 CFClient::UI::harmonize \@req; 1892 CFPlus::UI::harmonize \@req;
1479 1893
1480 my $pos = 0; 1894 my $pos = 0;
1481 for (0 .. $#children) { 1895 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1896 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1897 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1902 1
1489} 1903}
1490 1904
1491############################################################################# 1905#############################################################################
1492 1906
1493package CFClient::UI::HBox; 1907package CFPlus::UI::HBox;
1494 1908
1495our @ISA = CFClient::UI::Box::; 1909our @ISA = CFPlus::UI::Box::;
1496 1910
1497sub new { 1911sub new {
1498 my $class = shift; 1912 my $class = shift;
1499 1913
1500 $class->SUPER::new ( 1914 $class->SUPER::new (
… …
1503 ) 1917 )
1504} 1918}
1505 1919
1506############################################################################# 1920#############################################################################
1507 1921
1508package CFClient::UI::VBox; 1922package CFPlus::UI::VBox;
1509 1923
1510our @ISA = CFClient::UI::Box::; 1924our @ISA = CFPlus::UI::Box::;
1511 1925
1512sub new { 1926sub new {
1513 my $class = shift; 1927 my $class = shift;
1514 1928
1515 $class->SUPER::new ( 1929 $class->SUPER::new (
… …
1518 ) 1932 )
1519} 1933}
1520 1934
1521############################################################################# 1935#############################################################################
1522 1936
1523package CFClient::UI::Label; 1937package CFPlus::UI::Label;
1524 1938
1525our @ISA = CFClient::UI::DrawBG::; 1939our @ISA = CFPlus::UI::DrawBG::;
1526 1940
1527use CFClient::OpenGL; 1941use CFPlus::OpenGL;
1528 1942
1529sub new { 1943sub new {
1530 my ($class, %arg) = @_; 1944 my ($class, %arg) = @_;
1531 1945
1532 my $self = $class->SUPER::new ( 1946 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1949 #active_bg => none
1536 #font => default_font 1950 #font => default_font
1537 #text => initial text 1951 #text => initial text
1538 #markup => initial narkup 1952 #markup => initial narkup
1539 #max_w => maximum pixel width 1953 #max_w => maximum pixel width
1954 #style => 0, # render flags
1540 ellipsise => 3, # end 1955 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1956 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1957 fontsize => 1,
1543 align => -1, 1958 align => -1,
1544 valign => -1, 1959 valign => -1,
1545 padding_x => 2, 1960 padding_x => 2,
1546 padding_y => 2, 1961 padding_y => 2,
1547 can_events => 0, 1962 can_events => 0,
1548 %arg 1963 %arg
1549 ); 1964 );
1550 1965
1551 if (exists $self->{template}) { 1966 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1967 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1968 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1969 $self->{template} = $layout;
1555 } 1970 }
1556 1971
1557 if (exists $self->{markup}) { 1972 if (exists $self->{markup}) {
… …
1561 } 1976 }
1562 1977
1563 $self 1978 $self
1564} 1979}
1565 1980
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1981sub update {
1577 my ($self) = @_; 1982 my ($self) = @_;
1578 1983
1579 delete $self->{texture}; 1984 delete $self->{texture};
1580 $self->SUPER::update; 1985 $self->SUPER::update;
… …
1591 my ($self, $text) = @_; 1996 my ($self, $text) = @_;
1592 1997
1593 return if $self->{text} eq "T$text"; 1998 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1999 $self->{text} = "T$text";
1595 2000
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 2001 $self->{layout}->set_text ($text);
1598 2002
1599 delete $self->{size_req}; 2003 delete $self->{size_req};
1600 $self->realloc; 2004 $self->realloc;
1601 $self->update; 2005 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 2011 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 2012 $self->{text} = "M$markup";
1609 2013
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2014 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 2015
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 2016 $self->{layout}->set_markup ($markup);
1614 2017
1615 delete $self->{size_req}; 2018 delete $self->{size_req};
1616 $self->realloc; 2019 $self->realloc;
1617 $self->update; 2020 $self->update;
… …
1629 2032
1630 my ($w, $h) = $self->{layout}->size; 2033 my ($w, $h) = $self->{layout}->size;
1631 2034
1632 if (exists $self->{template}) { 2035 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 2036 $self->{template}->set_font ($self->{font}) if $self->{font};
2037 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2038 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 2039
1636 my ($w2, $h2) = $self->{template}->size; 2040 my ($w2, $h2) = $self->{template}->size;
1637 2041
1638 $w = List::Util::max $w, $w2; 2042 $w = List::Util::max $w, $w2;
… …
1672 2076
1673sub reconfigure { 2077sub reconfigure {
1674 my ($self) = @_; 2078 my ($self) = @_;
1675 2079
1676 delete $self->{size_req}; 2080 delete $self->{size_req};
2081 delete $self->{texture};
1677 2082
1678 $self->SUPER::reconfigure; 2083 $self->SUPER::reconfigure;
1679} 2084}
1680 2085
1681sub _draw { 2086sub _draw {
1682 my ($self) = @_; 2087 my ($self) = @_;
1683 2088
1684 $self->SUPER::_draw; # draw background, if applicable 2089 $self->SUPER::_draw; # draw background, if applicable
1685 2090
1686 my $tex = $self->{texture} ||= do { 2091 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 2092 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2093 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 2094 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2095 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2096 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2097 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 2098
1694 new_from_layout CFClient::Texture $self->{layout} 2099 [$self->{layout}->size]
1695 }; 2100 };
1696 2101
1697 unless (exists $self->{ox}) { 2102 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2103 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2104 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 2105 : ($self->{w} - $size->[0]) * 0.5);
1701 2106
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2107 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2108 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 2109 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 2110 };
1706 2111
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2112 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2113 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 2114
1712 if ($tex->{format} == GL_ALPHA) { 2115 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 2116}
1723 2117
1724############################################################################# 2118#############################################################################
1725 2119
1726package CFClient::UI::EntryBase; 2120package CFPlus::UI::EntryBase;
1727 2121
1728our @ISA = CFClient::UI::Label::; 2122our @ISA = CFPlus::UI::Label::;
1729 2123
1730use CFClient::OpenGL; 2124use CFPlus::OpenGL;
1731 2125
1732sub new { 2126sub new {
1733 my $class = shift; 2127 my $class = shift;
1734 2128
1735 $class->SUPER::new ( 2129 $class->SUPER::new (
… …
1739 active_fg => [0, 0, 0], 2133 active_fg => [0, 0, 0],
1740 can_hover => 1, 2134 can_hover => 1,
1741 can_focus => 1, 2135 can_focus => 1,
1742 valign => 0, 2136 valign => 0,
1743 can_events => 1, 2137 can_events => 1,
2138 ellipsise => 0,
1744 #text => ... 2139 #text => ...
1745 #hidden => "*", 2140 #hidden => "*",
1746 @_ 2141 @_
1747 ) 2142 )
1748} 2143}
… …
1793 my $sym = $ev->{sym}; 2188 my $sym = $ev->{sym};
1794 my $uni = $ev->{unicode}; 2189 my $uni = $ev->{unicode};
1795 2190
1796 my $text = $self->get_text; 2191 my $text = $self->get_text;
1797 2192
2193 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2194
1798 if ($uni == 8) { 2195 if ($uni == 8) {
1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2196 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800 } elsif ($uni == 127) { 2197 } elsif ($uni == 127) {
1801 substr $text, $self->{cursor}, 1, ""; 2198 substr $text, $self->{cursor}, 1, "";
1802 } elsif ($sym == CFClient::SDLK_LEFT) { 2199 } elsif ($sym == CFPlus::SDLK_LEFT) {
1803 --$self->{cursor} if $self->{cursor}; 2200 --$self->{cursor} if $self->{cursor};
1804 } elsif ($sym == CFClient::SDLK_RIGHT) { 2201 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1805 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2202 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1806 } elsif ($sym == CFClient::SDLK_HOME) { 2203 } elsif ($sym == CFPlus::SDLK_HOME) {
2204 # what a hack
2205 $self->{cursor} =
2206 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2207 ? length $1
2208 : 0;
2209 } elsif ($sym == CFPlus::SDLK_END) {
2210 # uh, again
2211 $self->{cursor} =
2212 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2213 ? $self->{cursor} + length $1
2214 : length $self->{text};
2215 } elsif ($uni == 21) { # ctrl-u
2216 $text = "";
1807 $self->{cursor} = 0; 2217 $self->{cursor} = 0;
1808 } elsif ($sym == CFClient::SDLK_END) {
1809 $self->{cursor} = length $text;
1810 } elsif ($uni == 27) { 2218 } elsif ($uni == 27) {
1811 $self->emit ('escape'); 2219 $self->emit ('escape');
1812 } elsif ($uni) { 2220 } elsif ($uni == 0x0d) {
2221 substr $text, $self->{cursor}++, 0, "\012";
2222 } elsif ($uni >= 0x20) {
1813 substr $text, $self->{cursor}++, 0, chr $uni; 2223 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else { 2224 } else {
1815 return 0; 2225 return 0;
1816 } 2226 }
1817 2227
1818 $self->_set_text ($text); 2228 $self->_set_text ($text);
1819 2229
1820 $self->realloc; 2230 $self->realloc;
2231 $self->update;
1821 2232
1822 1 2233 1
1823} 2234}
1824 2235
1825sub invoke_focus_in { 2236sub invoke_focus_in {
… …
1837 2248
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 2249 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 2250
1840 # byte-index to char-index 2251 # byte-index to char-index
1841 my $text = $self->{text}; 2252 my $text = $self->{text};
1842 utf8::encode $text; 2253 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 2254 $self->{cursor} = length $text;
1844 2255
1845 $self->_set_text ($self->{text}); 2256 $self->_set_text ($self->{text});
1846 $self->update; 2257 $self->update;
1847 2258
1848 1 2259 1
… …
1887 utf8::encode $text; 2298 utf8::encode $text;
1888 2299
1889 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2300 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890 } 2301 }
1891 2302
1892 glColor @{$self->{fg}};
1893 glBegin GL_LINES; 2303 glBegin GL_LINES;
1894 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2304 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2305 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896 glEnd; 2306 glEnd;
1897 } 2307 }
1898} 2308}
1899 2309
2310#############################################################################
2311
1900package CFClient::UI::Entry; 2312package CFPlus::UI::Entry;
1901 2313
1902our @ISA = CFClient::UI::EntryBase::; 2314our @ISA = CFPlus::UI::EntryBase::;
1903 2315
1904use CFClient::OpenGL; 2316use CFPlus::OpenGL;
1905 2317
1906sub invoke_key_down { 2318sub invoke_key_down {
1907 my ($self, $ev) = @_; 2319 my ($self, $ev) = @_;
1908 2320
1909 my $sym = $ev->{sym}; 2321 my $sym = $ev->{sym};
1910 2322
1911 if ($sym == 13) { 2323 if ($ev->{uni} == 0x0d || $sym == 13) {
1912 unshift @{$self->{history}}, 2324 unshift @{$self->{history}},
1913 my $txt = $self->get_text; 2325 my $txt = $self->get_text;
1914 2326
1915 $self->{history_pointer} = -1; 2327 $self->{history_pointer} = -1;
1916 $self->{history_saveback} = ''; 2328 $self->{history_saveback} = '';
1917 $self->emit (activate => $txt); 2329 $self->emit (activate => $txt);
1918 $self->update; 2330 $self->update;
1919 2331
1920 } elsif ($sym == CFClient::SDLK_UP) { 2332 } elsif ($sym == CFPlus::SDLK_UP) {
1921 if ($self->{history_pointer} < 0) { 2333 if ($self->{history_pointer} < 0) {
1922 $self->{history_saveback} = $self->get_text; 2334 $self->{history_saveback} = $self->get_text;
1923 } 2335 }
1924 if (@{$self->{history} || []} > 0) { 2336 if (@{$self->{history} || []} > 0) {
1925 $self->{history_pointer}++; 2337 $self->{history_pointer}++;
… …
1927 $self->{history_pointer} = @{$self->{history} || []} - 1; 2339 $self->{history_pointer} = @{$self->{history} || []} - 1;
1928 } 2340 }
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2341 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } 2342 }
1931 2343
1932 } elsif ($sym == CFClient::SDLK_DOWN) { 2344 } elsif ($sym == CFPlus::SDLK_DOWN) {
1933 $self->{history_pointer}--; 2345 $self->{history_pointer}--;
1934 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2346 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935 2347
1936 if ($self->{history_pointer} >= 0) { 2348 if ($self->{history_pointer} >= 0) {
1937 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2349 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1946 1 2358 1
1947} 2359}
1948 2360
1949############################################################################# 2361#############################################################################
1950 2362
2363package CFPlus::UI::TextEdit;
2364
2365our @ISA = CFPlus::UI::EntryBase::;
2366
2367use CFPlus::OpenGL;
2368
2369sub move_cursor_ver {
2370 my ($self, $dy) = @_;
2371
2372 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2373
2374 $y += $dy;
2375
2376 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2377 $self->{cursor} = $index;
2378 delete $self->{cur_h};
2379 $self->update;
2380 return;
2381 }
2382}
2383
2384sub invoke_key_down {
2385 my ($self, $ev) = @_;
2386
2387 my $sym = $ev->{sym};
2388
2389 if ($sym == CFPlus::SDLK_UP) {
2390 $self->move_cursor_ver (-1);
2391 } elsif ($sym == CFPlus::SDLK_DOWN) {
2392 $self->move_cursor_ver (+1);
2393 } else {
2394 return $self->SUPER::invoke_key_down ($ev)
2395 }
2396
2397 1
2398}
2399
2400#############################################################################
2401
1951package CFClient::UI::Button; 2402package CFPlus::UI::Button;
1952 2403
1953our @ISA = CFClient::UI::Label::; 2404our @ISA = CFPlus::UI::Label::;
1954 2405
1955use CFClient::OpenGL; 2406use CFPlus::OpenGL;
1956 2407
1957my @tex = 2408my @tex =
1958 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959 qw(b1_button_active.png); 2410 qw(b1_button_inactive.png b1_button_active.png);
1960 2411
1961sub new { 2412sub new {
1962 my $class = shift; 2413 my $class = shift;
1963 2414
1964 $class->SUPER::new ( 2415 $class->SUPER::new (
1965 padding_x => 4, 2416 padding_x => 4,
1966 padding_y => 4, 2417 padding_y => 4,
1967 fg => [1, 1, 1], 2418 fg => [1.0, 1.0, 1.0],
1968 active_fg => [0, 0, 1], 2419 active_fg => [0.8, 0.8, 0.8],
1969 can_hover => 1, 2420 can_hover => 1,
1970 align => 0, 2421 align => 0,
1971 valign => 0, 2422 valign => 0,
1972 can_events => 1, 2423 can_events => 1,
1973 @_ 2424 @_
… …
1991 2442
1992 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1994 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
1995 2446
2447 my $tex = $tex[$GRAB == $self];
1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1997 2449
1998 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
1999 2451
2000 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2001} 2453}
2002 2454
2003############################################################################# 2455#############################################################################
2004 2456
2457package CFPlus::UI::CheckBox;
2458
2459our @ISA = CFPlus::UI::DrawBG::;
2460
2461my @tex =
2462 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2463 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2464
2465use CFPlus::OpenGL;
2466
2467sub new {
2468 my $class = shift;
2469
2470 $class->SUPER::new (
2471 padding_x => 2,
2472 padding_y => 2,
2473 fg => [1, 1, 1],
2474 active_fg => [1, 1, 0],
2475 bg => [0, 0, 0, 0.2],
2476 active_bg => [1, 1, 1, 0.5],
2477 state => 0,
2478 can_hover => 1,
2479 @_
2480 )
2481}
2482
2483sub size_request {
2484 my ($self) = @_;
2485
2486 (6) x 2
2487}
2488
2489sub toggle {
2490 my ($self) = @_;
2491
2492 $self->{state} = !$self->{state};
2493 $self->emit (changed => $self->{state});
2494 $self->update;
2495}
2496
2497sub invoke_button_down {
2498 my ($self, $ev, $x, $y) = @_;
2499
2500 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2501 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2502 $self->toggle;
2503 } else {
2504 return 0
2505 }
2506
2507 1
2508}
2509
2510sub _draw {
2511 my ($self) = @_;
2512
2513 $self->SUPER::_draw;
2514
2515 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2516
2517 my ($w, $h) = @$self{qw(w h)};
2518
2519 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2520
2521 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2522
2523 my $tex = $self->{state} ? $tex[1] : $tex[0];
2524
2525 glEnable GL_TEXTURE_2D;
2526 $tex->draw_quad_alpha (0, 0, $s, $s);
2527 glDisable GL_TEXTURE_2D;
2528}
2529
2530#############################################################################
2531
2532package CFPlus::UI::Image;
2533
2534our @ISA = CFPlus::UI::Base::;
2535
2536use CFPlus::OpenGL;
2537
2538our %texture_cache;
2539
2540sub new {
2541 my $class = shift;
2542
2543 my $self = $class->SUPER::new (
2544 can_events => 0,
2545 @_,
2546 );
2547
2548 $self->{path} || $self->{tex}
2549 or Carp::croak "'path' or 'tex' attributes required";
2550
2551 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2552 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2553
2554 CFPlus::weaken $texture_cache{$self->{path}};
2555
2556 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2557
2558 $self
2559}
2560
2561sub STORABLE_freeze {
2562 my ($self, $cloning) = @_;
2563
2564 $self->{path}
2565 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2566
2567 $self->{path}
2568}
2569
2570sub STORABLE_attach {
2571 my ($self, $cloning, $path) = @_;
2572
2573 $self->new (path => $path)
2574}
2575
2576sub size_request {
2577 my ($self) = @_;
2578
2579 ($self->{tex}{w}, $self->{tex}{h})
2580}
2581
2582sub _draw {
2583 my ($self) = @_;
2584
2585 my $tex = $self->{tex};
2586
2587 my ($w, $h) = ($self->{w}, $self->{h});
2588
2589 if ($self->{rot90}) {
2590 glRotate 90, 0, 0, 1;
2591 glTranslate 0, -$self->{w}, 0;
2592
2593 ($w, $h) = ($h, $w);
2594 }
2595
2596 glEnable GL_TEXTURE_2D;
2597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2598
2599 $tex->draw_quad (0, 0, $w, $h);
2600
2601 glDisable GL_TEXTURE_2D;
2602}
2603
2604#############################################################################
2605
2005package CFClient::UI::ImageButton; 2606package CFPlus::UI::ImageButton;
2006 2607
2007our @ISA = CFClient::UI::Image::; 2608our @ISA = CFPlus::UI::Image::;
2008 2609
2009use CFClient::OpenGL; 2610use CFPlus::OpenGL;
2010 2611
2011my %textures; 2612my %textures;
2012 2613
2013sub new { 2614sub new {
2014 my $class = shift; 2615 my $class = shift;
… …
2036 1 2637 1
2037} 2638}
2038 2639
2039############################################################################# 2640#############################################################################
2040 2641
2041package CFClient::UI::CheckBox;
2042
2043our @ISA = CFClient::UI::DrawBG::;
2044
2045my @tex =
2046 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049use CFClient::OpenGL;
2050
2051sub new {
2052 my $class = shift;
2053
2054 $class->SUPER::new (
2055 padding_x => 2,
2056 padding_y => 2,
2057 fg => [1, 1, 1],
2058 active_fg => [1, 1, 0],
2059 bg => [0, 0, 0, 0.2],
2060 active_bg => [1, 1, 1, 0.5],
2061 state => 0,
2062 can_hover => 1,
2063 @_
2064 )
2065}
2066
2067sub size_request {
2068 my ($self) = @_;
2069
2070 (6) x 2
2071}
2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
2081sub invoke_button_down {
2082 my ($self, $ev, $x, $y) = @_;
2083
2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086 $self->toggle;
2087 } else {
2088 return 0
2089 }
2090
2091 1
2092}
2093
2094sub _draw {
2095 my ($self) = @_;
2096
2097 $self->SUPER::_draw;
2098
2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109 glEnable GL_TEXTURE_2D;
2110 $tex->draw_quad_alpha (0, 0, $s, $s);
2111 glDisable GL_TEXTURE_2D;
2112}
2113
2114#############################################################################
2115
2116package CFClient::UI::Image; 2642package CFPlus::UI::VGauge;
2117 2643
2118our @ISA = CFClient::UI::Base::; 2644our @ISA = CFPlus::UI::Base::;
2119
2120use CFClient::OpenGL;
2121
2122our %texture_cache;
2123
2124sub new {
2125 my $class = shift;
2126
2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2131
2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2134
2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142 $self
2143}
2144
2145sub size_request {
2146 my ($self) = @_;
2147
2148 ($self->{tex}{w}, $self->{tex}{h})
2149}
2150
2151sub _draw {
2152 my ($self) = @_;
2153
2154 my $tex = $self->{tex};
2155
2156 my ($w, $h) = ($self->{w}, $self->{h});
2157
2158 if ($self->{rot90}) {
2159 glRotate 90, 0, 0, 1;
2160 glTranslate 0, -$self->{w}, 0;
2161
2162 ($w, $h) = ($h, $w);
2163 }
2164
2165 glEnable GL_TEXTURE_2D;
2166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168 $tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170 glDisable GL_TEXTURE_2D;
2171}
2172
2173#############################################################################
2174
2175package CFClient::UI::VGauge;
2176
2177our @ISA = CFClient::UI::Base::;
2178 2645
2179use List::Util qw(min max); 2646use List::Util qw(min max);
2180 2647
2181use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2182 2649
2183my %tex = ( 2650my %tex = (
2184 food => [ 2651 food => [
2185 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2652 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2653 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187 ], 2654 ],
2188 grace => [ 2655 grace => [
2189 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2656 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2657 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191 ], 2658 ],
2192 hp => [ 2659 hp => [
2193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2660 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2661 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195 ], 2662 ],
2196 mana => [ 2663 mana => [
2197 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2664 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2665 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199 ], 2666 ],
2200); 2667);
2201 2668
2202# eg. VGauge->new (gauge => 'food'), default gauge: food 2669# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2305 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2306} 2773}
2307 2774
2308############################################################################# 2775#############################################################################
2309 2776
2310package CFClient::UI::Gauge; 2777package CFPlus::UI::Gauge;
2311 2778
2312our @ISA = CFClient::UI::VBox::; 2779our @ISA = CFPlus::UI::VBox::;
2313 2780
2314sub new { 2781sub new {
2315 my ($class, %arg) = @_; 2782 my ($class, %arg) = @_;
2316 2783
2317 my $self = $class->SUPER::new ( 2784 my $self = $class->SUPER::new (
… …
2319 can_hover => 1, 2786 can_hover => 1,
2320 can_events => 1, 2787 can_events => 1,
2321 %arg, 2788 %arg,
2322 ); 2789 );
2323 2790
2324 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2791 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2325 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2792 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2793 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2327 2794
2328 $self 2795 $self
2329} 2796}
2330 2797
2331sub set_fontsize { 2798sub set_fontsize {
… …
2352 $self->{value}->set_text ($val); 2819 $self->{value}->set_text ($val);
2353} 2820}
2354 2821
2355############################################################################# 2822#############################################################################
2356 2823
2357package CFClient::UI::Slider; 2824package CFPlus::UI::Slider;
2358 2825
2359use strict; 2826use strict;
2360 2827
2361use CFClient::OpenGL; 2828use CFPlus::OpenGL;
2362 2829
2363our @ISA = CFClient::UI::DrawBG::; 2830our @ISA = CFPlus::UI::DrawBG::;
2364 2831
2365my @tex = 2832my @tex =
2366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2833 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367 qw(s1_slider.png s1_slider_bg.png); 2834 qw(s1_slider.png s1_slider_bg.png);
2368 2835
2369sub new { 2836sub new {
2370 my $class = shift; 2837 my $class = shift;
2371 2838
… …
2460 } 2927 }
2461 2928
2462 1 2929 1
2463} 2930}
2464 2931
2932sub invoke_mouse_wheel {
2933 my ($self, $ev) = @_;
2934
2935 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2936
2937 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2938
2939 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2940
2941 ! ! $delta
2942}
2943
2465sub update { 2944sub update {
2466 my ($self) = @_; 2945 my ($self) = @_;
2467 2946
2468 delete $self->{knob_w}; 2947 delete $self->{knob_w};
2469 $self->SUPER::update; 2948 $self->SUPER::update;
… …
2516 glDisable GL_TEXTURE_2D; 2995 glDisable GL_TEXTURE_2D;
2517} 2996}
2518 2997
2519############################################################################# 2998#############################################################################
2520 2999
2521package CFClient::UI::ValSlider; 3000package CFPlus::UI::ValSlider;
2522 3001
2523our @ISA = CFClient::UI::HBox::; 3002our @ISA = CFPlus::UI::HBox::;
2524 3003
2525sub new { 3004sub new {
2526 my ($class, %arg) = @_; 3005 my ($class, %arg) = @_;
2527 3006
2528 my $range = delete $arg{range}; 3007 my $range = delete $arg{range};
2529 3008
2530 my $self = $class->SUPER::new ( 3009 my $self = $class->SUPER::new (
2531 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3010 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3011 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533 to_value => sub { shift }, 3012 to_value => sub { shift },
2534 from_value => sub { shift }, 3013 from_value => sub { shift },
2535 %arg, 3014 %arg,
2536 ); 3015 );
2537 3016
… …
2557sub set_range { shift->{slider}->set_range (@_) } 3036sub set_range { shift->{slider}->set_range (@_) }
2558sub set_value { shift->{slider}->set_value (@_) } 3037sub set_value { shift->{slider}->set_value (@_) }
2559 3038
2560############################################################################# 3039#############################################################################
2561 3040
2562package CFClient::UI::TextScroller; 3041package CFPlus::UI::TextScroller;
2563 3042
2564our @ISA = CFClient::UI::HBox::; 3043our @ISA = CFPlus::UI::HBox::;
2565 3044
2566use CFClient::OpenGL; 3045use CFPlus::OpenGL;
2567 3046
2568sub new { 3047sub new {
2569 my $class = shift; 3048 my $class = shift;
2570 3049
2571 my $self = $class->SUPER::new ( 3050 my $self = $class->SUPER::new (
2572 fontsize => 1, 3051 fontsize => 1,
2573 can_events => 0, 3052 can_events => 1,
2574 indent => 0, 3053 indent => 0,
2575 #font => default_font 3054 #font => default_font
2576 @_, 3055 @_,
2577 3056
2578 layout => (new CFClient::Layout 1), 3057 layout => (new CFPlus::Layout),
2579 par => [], 3058 par => [],
3059 max_par => 0,
2580 height => 0, 3060 height => 0,
2581 children => [ 3061 children => [
2582 (new CFClient::UI::Empty expand => 1), 3062 (new CFPlus::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 3063 (new CFPlus::UI::Slider vertical => 1),
2584 ], 3064 ],
2585 ); 3065 );
2586 3066
2587 $self->{children}[1]->connect (changed => sub { $self->update }); 3067 $self->{children}[1]->connect (changed => sub { $self->update });
2588 3068
… …
2618 3098
2619 $self->reflow; 3099 $self->reflow;
2620 3100
2621 local $self->{children} = [$empty, $slider]; 3101 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h) 3102 $self->SUPER::invoke_size_allocate ($w, $h)
3103}
3104
3105sub invoke_mouse_wheel {
3106 my ($self, $ev) = @_;
3107
3108 return 0 unless $ev->{dy}; # only vertical movements
3109
3110 $self->{children}[1]->emit (mouse_wheel => $ev);
3111
3112 1
2623} 3113}
2624 3114
2625sub get_layout { 3115sub get_layout {
2626 my ($self, $para) = @_; 3116 my ($self, $para) = @_;
2627 3117
… …
2655 3145
2656 # todo: base offset on lines or so, not on pixels 3146 # todo: base offset on lines or so, not on pixels
2657 $self->{children}[1]->set_value ($offset); 3147 $self->{children}[1]->set_value ($offset);
2658} 3148}
2659 3149
3150sub current_paragraph {
3151 my ($self) = @_;
3152
3153 $self->{top_paragraph} - 1
3154}
3155
3156sub scroll_to {
3157 my ($self, $para) = @_;
3158
3159 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3160
3161 $self->{scroll_to} = $para;
3162 $self->update;
3163}
3164
2660sub clear { 3165sub clear {
2661 my ($self) = @_; 3166 my ($self) = @_;
2662 3167
2663 my (undef, undef, @other) = @{ $self->{children} }; 3168 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other; 3169 $self->remove ($_) for @other;
… …
2667 $self->{height} = 0; 3172 $self->{height} = 0;
2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3173 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669} 3174}
2670 3175
2671sub add_paragraph { 3176sub add_paragraph {
2672 my ($self, $color, $para, $indent) = @_; 3177 my $self = shift;
2673 3178
2674 my ($text, @w) = ref $para ? @$para : $para; 3179 for my $para (@_) {
2675
2676 $para = { 3180 $para = {
3181 fg => [1, 1, 1, 1],
3182 indent => 0,
3183 markup => "",
3184 widget => [],
3185 ref $para ? %$para : (markup => $para),
2677 w => 1e10, 3186 w => 1e10,
2678 wrapped => 1, 3187 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2683 }; 3188 };
2684 3189
2685 $self->add (@w) if @w; 3190 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686 push @{$self->{par}}, $para; 3191 push @{$self->{par}}, $para;
3192 }
3193
3194 if (my $max = $self->{max_par}) {
3195 shift @{$self->{par}} while @{$self->{par}} > $max;
3196 }
2687 3197
2688 $self->{need_reflow}++; 3198 $self->{need_reflow}++;
2689 $self->update; 3199 $self->update;
2690} 3200}
2691 3201
2692sub scroll_to_bottom { 3202sub scroll_to_bottom {
2693 my ($self) = @_; 3203 my ($self) = @_;
2694 3204
2695 $self->{scroll_to_bottom} = 1; 3205 $self->{scroll_to} = $#{$self->{par}};
2696 $self->update; 3206 $self->update;
2697} 3207}
2698 3208
3209sub force_uptodate {
3210 my ($self) = @_;
3211
3212 if (delete $self->{need_reflow}) {
3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3214
3215 my $height = 0;
3216
3217 for my $para (@{$self->{par}}) {
3218 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3219 my $layout = $self->get_layout ($para);
3220 my ($w, $h) = $layout->size;
3221
3222 $para->{w} = $w + $para->{indent};
3223 $para->{h} = $h;
3224 $para->{wrapped} = $layout->has_wrapped;
3225 }
3226
3227 $para->{y} = $height;
3228 $height += $para->{h};
3229 }
3230
3231 $self->{height} = $height;
3232 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3233
3234 delete $self->{texture};
3235 }
3236
3237 if (my $paridx = delete $self->{scroll_to}) {
3238 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3239 }
3240}
3241
2699sub update { 3242sub update {
2700 my ($self) = @_; 3243 my ($self) = @_;
2701 3244
2702 $self->SUPER::update; 3245 $self->SUPER::update;
2703 3246
2704 return unless $self->{h} > 0; 3247 return unless $self->{h} > 0;
2705 3248
2706 delete $self->{texture}; 3249 delete $self->{texture};
2707 3250
2708 $ROOT->on_post_alloc ($self => sub { 3251 $ROOT->on_post_alloc ($self => sub {
3252 $self->force_uptodate;
3253
2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3254 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710 3255
2711 if (delete $self->{need_reflow}) {
2712 my $height = 0;
2713
2714 for my $para (@{$self->{par}}) {
2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716 my $layout = $self->get_layout ($para);
2717 my ($w, $h) = $layout->size;
2718
2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2722 }
2723
2724 $height += $para->{h};
2725 }
2726
2727 $self->{height} = $height;
2728
2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3256 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739 glClearColor 0, 0, 0, 0; 3257 glClearColor 0, 0, 0, 0;
2740 glClear GL_COLOR_BUFFER_BIT; 3258 glClear GL_COLOR_BUFFER_BIT;
2741 3259
3260 package CFPlus::UI::Base;
3261 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3262 (0, 0, $self->{w}, $self->{h});
3263
3264 my $top = int $self->{children}[1]{range}[0];
3265
3266 my $paridx = 0;
3267 my $top_paragraph;
2742 my $top = int $self->{children}[1]{range}[0]; 3268 my $top = int $self->{children}[1]{range}[0];
2743 3269
2744 my $y0 = $top; 3270 my $y0 = $top;
2745 my $y1 = $top + $H; 3271 my $y1 = $top + $H;
2746 3272
2747 my $y = 0;
2748
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 3273 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 3274 my $h = $para->{h};
3275 my $y = $para->{y};
2755 3276
2756 if ($y0 < $y + $h && $y < $y1) { 3277 if ($y0 < $y + $h && $y < $y1) {
2757
2758 my $layout = $self->get_layout ($para); 3278 my $layout = $self->get_layout ($para);
2759 3279
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 3280 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764 3281
2765 if (my @w = @{ $para->{widget} }) { 3282 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 3283 my @s = $layout->get_shapes;
2767 3284
2768 glDisable GL_BLEND;
2769 for (@w) { 3285 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 3286 my ($dx, $dy) = splice @s, 0, 2, ();
2771 3287
2772 $_->{x} = $dx + $para->{indent}; 3288 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 3289 $_->{y} = $dy + $y - $y0;
2774 3290
2775 $_->draw; 3291 $_->draw;
2776 } 3292 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 3293 }
2780 } 3294 }
2781 3295
2782 $y += $h; 3296 $paridx++;
3297 $top_paragraph ||= $paridx if $y >= $top;
2783 } 3298 }
2784 3299
2785 glDisable GL_BLEND; 3300 $self->{top_paragraph} = $top_paragraph;
2786 }; 3301 };
2787 }); 3302 });
2788} 3303}
2789 3304
2790sub reconfigure { 3305sub reconfigure {
… …
2808 $self->{children}[1]->draw; 3323 $self->{children}[1]->draw;
2809} 3324}
2810 3325
2811############################################################################# 3326#############################################################################
2812 3327
2813package CFClient::UI::Animator; 3328package CFPlus::UI::Animator;
2814 3329
2815use CFClient::OpenGL; 3330use CFPlus::OpenGL;
2816 3331
2817our @ISA = CFClient::UI::Bin::; 3332our @ISA = CFPlus::UI::Bin::;
2818 3333
2819sub moveto { 3334sub moveto {
2820 my ($self, $x, $y) = @_; 3335 my ($self, $x, $y) = @_;
2821 3336
2822 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3337 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2850 glPopMatrix; 3365 glPopMatrix;
2851} 3366}
2852 3367
2853############################################################################# 3368#############################################################################
2854 3369
2855package CFClient::UI::Flopper; 3370package CFPlus::UI::Flopper;
2856 3371
2857our @ISA = CFClient::UI::Button::; 3372our @ISA = CFPlus::UI::Button::;
2858 3373
2859sub new { 3374sub new {
2860 my $class = shift; 3375 my $class = shift;
2861 3376
2862 my $self = $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
… …
2874 $self->{other}->toggle_visibility; 3389 $self->{other}->toggle_visibility;
2875} 3390}
2876 3391
2877############################################################################# 3392#############################################################################
2878 3393
2879package CFClient::UI::Tooltip; 3394package CFPlus::UI::Tooltip;
2880 3395
2881our @ISA = CFClient::UI::Bin::; 3396our @ISA = CFPlus::UI::Bin::;
2882 3397
2883use CFClient::OpenGL; 3398use CFPlus::OpenGL;
2884 3399
2885sub new { 3400sub new {
2886 my $class = shift; 3401 my $class = shift;
2887 3402
2888 $class->SUPER::new ( 3403 $class->SUPER::new (
… …
2891 ) 3406 )
2892} 3407}
2893 3408
2894sub set_tooltip_from { 3409sub set_tooltip_from {
2895 my ($self, $widget) = @_; 3410 my ($self, $widget) = @_;
3411
3412 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3413 if $widget->{tooltip} =~ /^#(.*)$/;
2896 3414
2897 my $tooltip = $widget->{tooltip}; 3415 my $tooltip = $widget->{tooltip};
2898 3416
2899 if ($ENV{CFPLUS_DEBUG} & 2) { 3417 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n" 3418 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2904 } 3422 }
2905 3423
2906 $tooltip =~ s/^\n+//; 3424 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//; 3425 $tooltip =~ s/\n+$//;
2908 3426
2909 $self->add (new CFClient::UI::Label 3427 $self->add (new CFPlus::UI::Label
2910 markup => $tooltip, 3428 markup => $tooltip,
2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3429 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912 fontsize => 0.8, 3430 fontsize => 0.8,
2913 fg => [0, 0, 0, 1], 3431 style => 1, # FLAG_INVERSE
2914 ellipsise => 0, 3432 ellipsise => 0,
2915 font => ($widget->{tooltip_font} || $::FONT_PROP), 3433 font => ($widget->{tooltip_font} || $::FONT_PROP),
2916 ); 3434 );
2917} 3435}
2918 3436
… …
2937 3455
2938 $self->{root}->on_post_alloc ("move_$self" => sub { 3456 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner} 3457 my $widget = $self->{owner}
2940 or return; 3458 or return;
2941 3459
3460 if ($widget->{visible}) {
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3461 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943 3462
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3463 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w}; 3464 if $x + $self->{w} > $self->{root}{w};
2946 3465
2947 $self->move_abs ($x, $y); 3466 $self->move_abs ($x, $y);
3467 } else {
3468 $self->hide;
3469 }
2948 }); 3470 });
2949} 3471}
2950 3472
2951sub _draw { 3473sub _draw {
2952 my ($self) = @_; 3474 my ($self) = @_;
… …
2976 $self->SUPER::_draw; 3498 $self->SUPER::_draw;
2977} 3499}
2978 3500
2979############################################################################# 3501#############################################################################
2980 3502
2981package CFClient::UI::Face; 3503package CFPlus::UI::Face;
2982 3504
2983our @ISA = CFClient::UI::Base::; 3505our @ISA = CFPlus::UI::DrawBG::;
2984 3506
2985use CFClient::OpenGL; 3507use CFPlus::OpenGL;
2986 3508
2987sub new { 3509sub new {
2988 my $class = shift; 3510 my $class = shift;
2989 3511
2990 my $self = $class->SUPER::new ( 3512 my $self = $class->SUPER::new (
3513 size_w => 32,
3514 size_h => 8,
2991 aspect => 1, 3515 aspect => 1,
2992 can_events => 0, 3516 can_events => 0,
2993 @_, 3517 @_,
2994 ); 3518 );
2995 3519
2996 if ($self->{anim} && $self->{animspeed}) { 3520 if ($self->{anim} && $self->{animspeed}) {
2997 Scalar::Util::weaken (my $widget = $self); 3521 CFPlus::weaken (my $widget = $self);
2998 3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2999 $self->{timer} = Event->timer ( 3525 $self->{timer} = Event->timer (
3000 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3001 hard => 1, 3526 parked => 1,
3002 interval => $self->{animspeed},
3003 cb => sub { 3527 cb => sub {
3528 return unless $::CONN && $widget;
3529
3004 ++$widget->{frame}; 3530 ++$widget->{frame};
3531 $widget->update_face;
3005 $widget->update; 3532 $widget->update;
3533
3534 $widget->update_timer;
3006 }, 3535 },
3007 ); 3536 );
3537
3538 $self->update_face;
3539 $self->update_timer;
3008 } 3540 }
3009 3541
3010 $self 3542 $self
3011} 3543}
3012 3544
3545sub update_timer {
3546 my ($self) = @_;
3547
3548 return unless $self->{timer};
3549
3550 if ($self->{visible}) {
3551 $self->{timer}->at (
3552 $self->{anim_start}
3553 + $self->{animspeed}
3554 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555 );
3556 $self->{timer}->start;
3557 } else {
3558 $self->{timer}->stop;
3559 }
3560}
3561
3562sub update_face {
3563 my ($self) = @_;
3564
3565 return unless $::CONN;
3566
3567 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568 if ($anim && @$anim) {
3569 delete $self->{wait_face};
3570 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3571 }
3572 }
3573}
3574
3013sub size_request { 3575sub size_request {
3014 (32, 8) 3576 my ($self) = @_;
3577
3578 if ($::CONN) {
3579 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3580 if (my $tex = $::CONN->{texture}[$faceid]) {
3581 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3582 } else {
3583 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3584 $self->realloc;
3585 });
3586 }
3587 }
3588 }
3589
3590 ($self->{size_w} || 8, $self->{size_h} || 8)
3015} 3591}
3016 3592
3017sub update { 3593sub update {
3018 my ($self) = @_; 3594 my ($self) = @_;
3019 3595
3020 return unless $self->{visible}; 3596 return unless $self->{visible};
3021 3597
3022 $self->SUPER::update; 3598 $self->SUPER::update;
3023} 3599}
3024 3600
3601sub invoke_visibility_change {
3602 my ($self) = @_;
3603
3604 $self->update_timer;
3605
3606 0
3607}
3608
3025sub _draw { 3609sub _draw {
3026 my ($self) = @_; 3610 my ($self) = @_;
3027 3611
3028 return unless $::CONN; 3612 return unless $::CONN;
3029 3613
3030 my $face; 3614 $self->SUPER::_draw;
3031 3615
3032 if ($self->{frame}) {
3033 my $anim = $::CONN->{anim}[$self->{anim}]; 3616 my $faceid = $::CONN->{faceid}[$self->{face}]
3034 3617 or return;
3035 $face = $anim->[ $self->{frame} % @$anim ]
3036 if $anim && @$anim;
3037 }
3038 3618
3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3619 my $tex = $::CONN->{texture}[$faceid];
3040 3620
3041 if ($tex) { 3621 if ($tex) {
3042 glEnable GL_TEXTURE_2D; 3622 glEnable GL_TEXTURE_2D;
3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3044 glColor 0, 0, 0, 1; 3624 glColor 0, 0, 0, 1;
… …
3048} 3628}
3049 3629
3050sub destroy { 3630sub destroy {
3051 my ($self) = @_; 3631 my ($self) = @_;
3052 3632
3053 $self->{timer}->cancel 3633 (delete $self->{timer})->cancel
3054 if $self->{timer}; 3634 if $self->{timer};
3055 3635
3056 $self->SUPER::destroy; 3636 $self->SUPER::destroy;
3057} 3637}
3058 3638
3059############################################################################# 3639#############################################################################
3060 3640
3061package CFClient::UI::Buttonbar; 3641package CFPlus::UI::Buttonbar;
3062 3642
3063our @ISA = CFClient::UI::HBox::; 3643our @ISA = CFPlus::UI::HBox::;
3064 3644
3065# TODO: should actualyl wrap buttons and other goodies. 3645# TODO: should actually wrap buttons and other goodies.
3066 3646
3067############################################################################# 3647#############################################################################
3068 3648
3069package CFClient::UI::Menu; 3649package CFPlus::UI::Menu;
3070 3650
3071our @ISA = CFClient::UI::FancyFrame::; 3651our @ISA = CFPlus::UI::Toplevel::;
3072 3652
3073use CFClient::OpenGL; 3653use CFPlus::OpenGL;
3074 3654
3075sub new { 3655sub new {
3076 my $class = shift; 3656 my $class = shift;
3077 3657
3078 my $self = $class->SUPER::new ( 3658 my $self = $class->SUPER::new (
3079 items => [], 3659 items => [],
3080 z => 100, 3660 z => 100,
3081 @_, 3661 @_,
3082 ); 3662 );
3083 3663
3084 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3664 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085 3665
3086 for my $item (@{ $self->{items} }) { 3666 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3667 my ($widget, $cb, $tooltip) = @$item;
3088 3668
3089 # handle various types of items, only text for now 3669 # handle various types of items, only text for now
3090 if (!ref $widget) { 3670 if (!ref $widget) {
3671 if ($widget =~ /\t/) {
3672 my ($left, $right) = split /\t/, $widget, 2;
3673
3091 $widget = new CFClient::UI::Label 3674 $widget = new CFPlus::UI::HBox
3092 can_hover => 1, 3675 can_hover => 1,
3093 can_events => 1, 3676 can_events => 1,
3677 tooltip => $tooltip,
3678 children => [
3679 (new CFPlus::UI::Label markup => $left, expand => 1),
3680 (new CFPlus::UI::Label markup => $right, align => +1),
3681 ],
3682 ;
3683
3684 } else {
3685 $widget = new CFPlus::UI::Label
3686 can_hover => 1,
3687 can_events => 1,
3094 markup => $widget, 3688 markup => $widget,
3095 tooltip => $tooltip 3689 tooltip => $tooltip;
3690 }
3096 } 3691 }
3097 3692
3098 $self->{item}{$widget} = $item; 3693 $self->{item}{$widget} = $item;
3099 3694
3100 $self->{vbox}->add ($widget); 3695 $self->{vbox}->add ($widget);
… …
3143 1 3738 1
3144} 3739}
3145 3740
3146############################################################################# 3741#############################################################################
3147 3742
3148package CFClient::UI::Multiplexer; 3743package CFPlus::UI::Multiplexer;
3149 3744
3150our @ISA = CFClient::UI::Container::; 3745our @ISA = CFPlus::UI::Container::;
3151 3746
3152sub new { 3747sub new {
3153 my $class = shift; 3748 my $class = shift;
3154 3749
3155 my $self = $class->SUPER::new ( 3750 my $self = $class->SUPER::new (
… …
3216 $self->{current}->draw; 3811 $self->{current}->draw;
3217} 3812}
3218 3813
3219############################################################################# 3814#############################################################################
3220 3815
3221package CFClient::UI::Notebook; 3816package CFPlus::UI::Notebook;
3222 3817
3223our @ISA = CFClient::UI::VBox::; 3818our @ISA = CFPlus::UI::VBox::;
3224 3819
3225sub new { 3820sub new {
3226 my $class = shift; 3821 my $class = shift;
3227 3822
3228 my $self = $class->SUPER::new ( 3823 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar), 3824 buttonbar => (new CFPlus::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3825 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self 3826 # filter => # will be put between multiplexer and $self
3232 @_, 3827 @_,
3233 ); 3828 );
3234 3829
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3830 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3239} 3834}
3240 3835
3241sub add { 3836sub add {
3242 my ($self, $title, $widget, $tooltip) = @_; 3837 my ($self, $title, $widget, $tooltip) = @_;
3243 3838
3244 Scalar::Util::weaken $self; 3839 CFPlus::weaken $self;
3245 3840
3246 $self->{buttonbar}->add (new CFClient::UI::Button 3841 $self->{buttonbar}->add (new CFPlus::UI::Button
3247 markup => $title, 3842 markup => $title,
3248 tooltip => $tooltip, 3843 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) }, 3844 on_activate => sub { $self->set_current_page ($widget) },
3250 ); 3845 );
3251 3846
… …
3265 $self->emit (page_changed => $self->{multiplexer}{current}); 3860 $self->emit (page_changed => $self->{multiplexer}{current});
3266} 3861}
3267 3862
3268############################################################################# 3863#############################################################################
3269 3864
3270package CFClient::UI::Combobox; 3865package CFPlus::UI::Selector;
3271 3866
3272use utf8; 3867use utf8;
3273 3868
3274our @ISA = CFClient::UI::Button::; 3869our @ISA = CFPlus::UI::Button::;
3275 3870
3276sub new { 3871sub new {
3277 my $class = shift; 3872 my $class = shift;
3278 3873
3279 my $self = $class->SUPER::new ( 3874 my $self = $class->SUPER::new (
… …
3296 my ($value, $title, $tooltip) = @$_; 3891 my ($value, $title, $tooltip) = @$_;
3297 3892
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3893 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 } 3894 }
3300 3895
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3896 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302} 3897}
3303 3898
3304sub _set_value { 3899sub _set_value {
3305 my ($self, $value) = @_; 3900 my ($self, $value) = @_;
3306 3901
… …
3321 $self->emit (changed => $value); 3916 $self->emit (changed => $value);
3322} 3917}
3323 3918
3324############################################################################# 3919#############################################################################
3325 3920
3326package CFClient::UI::Statusbox; 3921package CFPlus::UI::Statusbox;
3327 3922
3328our @ISA = CFClient::UI::VBox::; 3923our @ISA = CFPlus::UI::VBox::;
3329 3924
3330sub new { 3925sub new {
3331 my $class = shift; 3926 my $class = shift;
3332 3927
3333 my $self = $class->SUPER::new ( 3928 my $self = $class->SUPER::new (
3334 fontsize => 0.8, 3929 fontsize => 0.8,
3335 @_, 3930 @_,
3336 ); 3931 );
3337 3932
3338 Scalar::Util::weaken (my $this = $self); 3933 CFPlus::weaken (my $this = $self);
3339 3934
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3935 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341 3936
3342 $self 3937 $self
3343} 3938}
… …
3345sub reorder { 3940sub reorder {
3346 my ($self) = @_; 3941 my ($self) = @_;
3347 my $NOW = Time::HiRes::time; 3942 my $NOW = Time::HiRes::time;
3348 3943
3349 # freeze display when hovering over any label 3944 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner} 3945 return if $CFPlus::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3946 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} }; 3947 values %{ $self->{item} };
3353 3948
3354 while (my ($k, $v) = each %{ $self->{item} }) { 3949 while (my ($k, $v) = each %{ $self->{item} }) {
3355 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356 } 3951 }
… …
3377 for ($short) { 3972 for ($short) {
3378 s/^\s+//; 3973 s/^\s+//;
3379 s/\s+/ /g; 3974 s/\s+/ /g;
3380 } 3975 }
3381 3976
3382 new CFClient::UI::Label 3977 new CFPlus::UI::Label
3383 markup => $short, 3978 markup => $short,
3384 tooltip => $item->{tooltip}, 3979 tooltip => $item->{tooltip},
3385 tooltip_font => $::FONT_PROP, 3980 tooltip_font => $::FONT_PROP,
3386 tooltip_width => 0.67, 3981 tooltip_width => 0.67,
3387 fontsize => $item->{fontsize} || $self->{fontsize}, 3982 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3466 $self->SUPER::destroy; 4061 $self->SUPER::destroy;
3467} 4062}
3468 4063
3469############################################################################# 4064#############################################################################
3470 4065
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root; 4066package CFPlus::UI::Root;
3636 4067
3637our @ISA = CFClient::UI::Container::; 4068our @ISA = CFPlus::UI::Container::;
3638 4069
3639use List::Util qw(min max); 4070use List::Util qw(min max);
3640 4071
3641use CFClient::OpenGL; 4072use CFPlus::OpenGL;
3642 4073
3643sub new { 4074sub new {
3644 my $class = shift; 4075 my $class = shift;
3645 4076
3646 my $self = $class->SUPER::new ( 4077 my $self = $class->SUPER::new (
3647 visible => 1, 4078 visible => 1,
3648 @_, 4079 @_,
3649 ); 4080 );
3650 4081
3651 Scalar::Util::weaken ($self->{root} = $self); 4082 CFPlus::weaken ($self->{root} = $self);
3652 4083
3653 $self 4084 $self
3654} 4085}
3655 4086
3656sub size_request { 4087sub size_request {
… …
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4253 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823 4254
3824 $w = 0 if $w < 0; 4255 $w = 0 if $w < 0;
3825 $h = 0 if $h < 0; 4256 $h = 0 if $h < 0;
3826 4257
4258 $w = max $widget->{min_w}, $w;
4259 $h = max $widget->{min_h}, $h;
4260
4261# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4262# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4263
4264 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4265 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4266
3827 $w = int $w + 0.5; 4267 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 4268 $h = int $h + 0.5;
3829 4269
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4270 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w}; 4271 $widget->{old_w} = $widget->{w};
… …
3841 4281
3842 while ($self->{post_alloc_hook}) { 4282 while ($self->{post_alloc_hook}) {
3843 $_->() 4283 $_->()
3844 for values %{delete $self->{post_alloc_hook}}; 4284 for values %{delete $self->{post_alloc_hook}};
3845 } 4285 }
3846
3847 4286
3848 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4287 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4288 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3850 glClear GL_COLOR_BUFFER_BIT; 4289 glClear GL_COLOR_BUFFER_BIT;
3851 4290
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4293 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 4294 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 4295 glLoadIdentity;
3857 4296
3858 { 4297 {
3859 package CFClient::UI::Base; 4298 package CFPlus::UI::Base;
3860 4299
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 4300 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4301 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4302
3865 $self->_draw; 4303 $self->_draw;
4304 }
3866} 4305}
3867 4306
3868############################################################################# 4307#############################################################################
3869 4308
3870package CFClient::UI; 4309package CFPlus::UI;
3871 4310
3872$ROOT = new CFClient::UI::Root; 4311$ROOT = new CFPlus::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4312$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874 4313
38751 43141
3876 4315

Diff Legend

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