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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.346 by root, Mon Aug 14 01:21:02 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
79sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 82 if $FOCUS;
82} 83}
83 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
84sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
90 106
91 $GRAB = $widget; 107 $GRAB = $widget;
92 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
93 109
94 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
95 } 111 }
96 112
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
98 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
100 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
101} 123}
102 124
103sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
104 my ($ev) = @_; 126 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 127
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 129
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 131
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
112 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 134
114 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 137 $grab->update if $grab;
117 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
118 139
140 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 141 $TOOLTIP_WATCHER->cb->();
120 } 142 }
121} 143}
122 144
123sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
124 my ($ev) = @_; 146 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
126 148
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 150
129 if ($widget != $HOVER) { 151 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 152
132 $hover->update if $hover && $hover->{can_hover}; 153 $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; 154 if $HOVER;
140} 155}
141 156
142# convert position array to integers 157# convert position array to integers
143sub harmonize { 158sub harmonize {
… …
193 reconfigure_widgets; 208 reconfigure_widgets;
194} 209}
195 210
196############################################################################# 211#############################################################################
197 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
198package CFClient::UI::Base; 221package CFPlus::UI::Base;
199 222
200use strict; 223use strict;
201 224
202use CFClient::OpenGL; 225use CFPlus::OpenGL;
203 226
204sub new { 227sub new {
205 my $class = shift; 228 my $class = shift;
206 229
207 my $self = bless { 230 my $self = bless {
… …
212 h => undef, 235 h => undef,
213 can_events => 1, 236 can_events => 1,
214 @_ 237 @_
215 }, $class; 238 }, $class;
216 239
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 241
219 for (keys %$self) { 242 for (keys %$self) {
220 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
222 } 245 }
223 } 246 }
224 247
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $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}; 250 $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}; 251 $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}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 253
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 256
234 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
272 295
273 return unless $self->{visible}; 296 return unless $self->{visible};
274 297
275 $_->set_invisible for $self->children; 298 $_->set_invisible for $self->children;
276 299
300 delete $self->{visible};
277 delete $self->{root}; 301 delete $self->{root};
278 delete $self->{visible};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->focus_out; 309 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
289} 311}
290 312
291sub set_visibility { 313sub set_visibility {
292 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
336sub size_request { 358sub size_request {
337 require Carp; 359 require Carp;
338 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
339} 361}
340 362
363sub baseline_shift {
364 0
365}
366
341sub configure { 367sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
343 369
344 if ($self->{aspect}) { 370 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
346 372
347 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 375
350 # use alignment to adjust x, y 376 # use alignment to adjust x, y
351 377
352 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
367 393
368 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
369 } 395 }
370} 396}
371 397
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 398sub children {
377 # nop 399 # nop
378} 400}
379 401
380sub visible_children { 402sub visible_children {
… …
398 420
399 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
400 422
401 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
402 424
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 428 }
407} 429}
408 430
409# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
410sub coord2local { 432sub coord2local {
411 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
412 434
435 Carp::confess unless $self->{parent};#d#
436
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 438}
415 439
416# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
417sub coord2global { 441sub coord2global {
418 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
419 443
444 Carp::confess unless $self->{parent};#d#
445
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 447}
422 448
423sub focus_in { 449sub invoke_focus_in {
424 my ($self) = @_; 450 my ($self) = @_;
425 451
426 return if $FOCUS == $self; 452 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
428 454
429 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
430 456
431 $self->_emit (focus_in => $focus); 457 $self->update;
432 458
433 $focus->update if $focus; 459 0
434 $FOCUS->update;
435} 460}
436 461
437sub focus_out { 462sub invoke_focus_out {
438 my ($self) = @_; 463 my ($self) = @_;
439 464
440 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
441 466
442 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
443 468
444 $self->_emit (focus_out => $focus); 469 $self->update;
445 470
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 472 unless $FOCUS;
450}
451 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
452sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 485sub invoke_button_up { 0 }
454sub key_down { 0 } 486sub invoke_key_down { 0 }
455sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
456 489
457sub button_down { 490sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
459 492
460 $self->focus_in; 493 $self->grab_focus;
461 494
462 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
515
516sub emit {
517 my ($self, $signal, @args) = @_;
518
519 # I do not really like this solution, but I dislike duplication
520 # and needlessly verbose code, too.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 #d##TODO# stop propagating at first true, do not use sum
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 532}
464 533
465sub find_widget { 534sub find_widget {
466 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
467 536
… …
477sub set_parent { 546sub set_parent {
478 my ($self, $parent) = @_; 547 my ($self, $parent) = @_;
479 548
480 Scalar::Util::weaken ($self->{parent} = $parent); 549 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 550 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 551}
506 552
507sub realloc { 553sub realloc {
508 my ($self) = @_; 554 my ($self) = @_;
509 555
… …
542 return unless $self->{h} && $self->{w}; 588 return unless $self->{h} && $self->{w};
543 589
544 # update screen rectangle 590 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 591 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 592 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 593
550 # skip widgets that are entirely outside the drawing area 594 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 597
… …
576 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
579 glEnd; 623 glEnd;
580 glPopMatrix; 624 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 626 }
583 627
584 $self->_draw; 628 $self->_draw;
585 glPopMatrix; 629 glPopMatrix;
586} 630}
… …
592} 636}
593 637
594sub DESTROY { 638sub DESTROY {
595 my ($self) = @_; 639 my ($self) = @_;
596 640
641 return if CFPlus::in_destruct;
642
597 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
598 #$self->deactivate; 644
645 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 647}
600 648
601############################################################################# 649#############################################################################
602 650
603package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
604 652
605our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
606 654
607use strict; 655use strict;
608use CFClient::OpenGL; 656use CFPlus::OpenGL;
609 657
610sub new { 658sub new {
611 my $class = shift; 659 my $class = shift;
612 660
613 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
644 } 692 }
645} 693}
646 694
647############################################################################# 695#############################################################################
648 696
649package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
650 698
651our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
652 700
653sub new { 701sub new {
654 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
656} 704}
… …
663 711
664sub draw { } 712sub draw { }
665 713
666############################################################################# 714#############################################################################
667 715
668package CFClient::UI::Container; 716package CFPlus::UI::Container;
669 717
670our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
671 719
672sub new { 720sub new {
673 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
674 722
675 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
684 if $children; 732 if $children;
685 733
686 $self 734 $self
687} 735}
688 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
689sub add { 745sub add {
690 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
691 747
692 $_->set_parent ($self) 748 $_->set_parent ($self)
693 for @widgets; 749 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
754} 810}
755 811
756############################################################################# 812#############################################################################
757 813
758package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
759 815
760our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
761 817
762sub new { 818sub new {
763 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
764 820
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 822
767 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
768} 824}
769 825
770sub add { 826sub add {
771 my ($self, $child) = @_; 827 my ($self, $child) = @_;
772 828
773 $self->{children} = []; 829 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
776} 831}
777 832
778sub remove { 833sub remove {
779 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
780 835
781 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
782 837
783 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 839 unless @{$self->{children}};
785} 840}
786 841
787sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
788 843
789sub size_request { 844sub size_request {
790 $_[0]{children}[0]->size_request 845 $_[0]{children}[0]->size_request
791} 846}
792 847
793sub size_allocate { 848sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 849 my ($self, $w, $h) = @_;
795 850
796 $self->{children}[0]->configure (0, 0, $w, $h); 851 $self->{children}[0]->configure (0, 0, $w, $h);
852
853 1
797} 854}
798 855
799############################################################################# 856#############################################################################
800 857
801# back-buffered drawing area 858# back-buffered drawing area
802 859
803package CFClient::UI::Window; 860package CFPlus::UI::Window;
804 861
805our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
806 863
807use CFClient::OpenGL; 864use CFPlus::OpenGL;
808 865
809sub new { 866sub new {
810 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
811 868
812 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
817 874
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 875 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 876 $self->SUPER::update;
820} 877}
821 878
822sub size_allocate { 879sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 880 my ($self, $w, $h) = @_;
824 881
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 882 $self->update;
883
884 $self->SUPER::invoke_size_allocate ($w, $h)
827} 885}
828 886
829sub _render { 887sub _render {
830 my ($self) = @_; 888 my ($self) = @_;
831 889
… …
833} 891}
834 892
835sub render_child { 893sub render_child {
836 my ($self) = @_; 894 my ($self) = @_;
837 895
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
841 899
842 { 900 {
843 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
844 902
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
847 } 905 }
848 906
… …
851} 909}
852 910
853sub _draw { 911sub _draw {
854 my ($self) = @_; 912 my ($self) = @_;
855 913
856 my ($w, $h) = @$self{qw(w h)};
857
858 my $tex = $self->{texture} 914 my $tex = $self->{texture}
859 or return; 915 or return;
860 916
861 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
864 920
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
866 922
867 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
868} 924}
869 925
870############################################################################# 926#############################################################################
871 927
872package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
873 929
874our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
875 931
876sub new { 932sub new {
877 my $class = shift; 933 my $class = shift;
878 934
879 $class->SUPER::new ( 935 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
893 949
894 ($w, $h) 950 ($w, $h)
895} 951}
896 952
897sub size_allocate { 953sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
899 955
900 my $child = $self->child; 956 my $child = $self->child;
901 957
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 960
905 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
906 $self->update; 962 $self->update;
963
964 1
907} 965}
908 966
909sub set_offset { 967sub set_offset {
910 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
911 969
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 997 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 999 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1001 }
944} 1002}
945 1003
946sub _render { 1004sub _render {
947 my ($self) = @_; 1005 my ($self) = @_;
948 1006
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1009
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1011
954 $self->SUPER::_render; 1012 $self->SUPER::_render;
955} 1013}
956 1014
957############################################################################# 1015#############################################################################
958 1016
959package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
960 1018
961our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
962 1020
963sub new { 1021sub new {
964 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
965 1023
966 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
967 1025
968 my $self; 1026 my $self;
969 1027
970 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1029 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1031 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
975 }, 1033 },
976 ; 1034 ;
977 1035
978 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
980 slider => $slider, 1039 slider => $slider,
981 %arg, 1040 %arg,
982 ); 1041 );
983 1042
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
986 1045
987 $self 1046 $self
988} 1047}
989 1048
1049#TODO# update range on size_allocate depending on child
1050
990sub add { 1051sub add {
991 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
992 1053
993 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
994} 1055}
995 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
996sub update { 1073sub update {
997 my ($self) = @_; 1074 my ($self) = @_;
998 1075
999 $self->SUPER::update; 1076 $self->SUPER::update;
1000 1077
1001 # todo: overwrite size_allocate of child 1078 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1079}
1005 1080
1006sub size_allocate { 1081sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1082 my ($self, $w, $h) = @_;
1008 1083
1084 $self->update_slider;
1085
1009 $self->SUPER::size_allocate ($w, $h); 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1087}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1088
1018############################################################################# 1089#############################################################################
1019 1090
1020package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1021 1092
1022our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1023 1094
1024use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1025 1096
1026sub new { 1097sub new {
1027 my $class = shift; 1098 my $class = shift;
1028 1099
1029 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1056} 1127}
1057 1128
1058############################################################################# 1129#############################################################################
1059 1130
1060package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1061 1132
1062our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1063 1134
1064use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1136
1074sub new { 1137sub new {
1075 my ($class, %arg) = @_; 1138 my ($class, %arg) = @_;
1076 1139
1077 my $title = delete $arg{title}; 1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 1,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1236
1237my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1239 mipmap => 1, wrap => 1;
1240
1241my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244
1245sub new {
1246 my ($class, %arg) = @_;
1078 1247
1079 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1251 border => 0.6,
1083 can_events => 1, 1252 can_events => 1,
1084 min_w => 16, 1253 min_w => 64,
1085 min_h => 16, 1254 min_h => 32,
1086 %arg, 1255 %arg,
1087 ); 1256 );
1088 1257
1089 $self->{title} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1259 align => 0,
1091 valign => 1, 1260 valign => 1,
1092 text => $title, 1261 text => $self->{title},
1093 fontsize => $self->{border} 1262 fontsize => $self->{border},
1094 if defined $title; 1263 if exists $self->{title};
1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1095 1273
1096 $self 1274 $self
1097} 1275}
1098 1276
1099sub add { 1277sub add {
1100 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1101 1279
1102 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1283}
1105 1284
1106sub border { 1285sub border {
1107 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1108} 1287}
1109 1288
1110sub size_request { 1289sub size_request {
1111 my ($self) = @_; 1290 my ($self) = @_;
1112 1291
1113 $self->{title}->size_request 1292 $self->{title_widget}->size_request
1114 if $self->{title}; 1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1115 1297
1116 my ($w, $h) = $self->SUPER::size_request; 1298 my ($w, $h) = $self->SUPER::size_request;
1117 1299
1118 ( 1300 (
1119 $w + $self->border * 2, 1301 $w + $self->border * 2,
1120 $h + $self->border * 2, 1302 $h + $self->border * 2,
1121 ) 1303 )
1122} 1304}
1123 1305
1124sub size_allocate { 1306sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1307 my ($self, $w, $h) = @_;
1126 1308
1127 if ($self->{title}) { 1309 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1310 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1311 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1313 }
1132 1314
1133 my $border = $self->border; 1315 my $border = $self->border;
1134 1316
1135 $h -= List::Util::max 0, $border * 2; 1317 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1318 $w -= List::Util::max 0, $border * 2;
1319
1320 $self->child->configure ($border, $border, $w, $h);
1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1137 1332
1138 $self->child->configure ($border, $border, $w, $h); 1333 1
1139} 1334}
1140 1335
1141sub button_down { 1336sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
1143 1338
1144 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1340 my $border = $self->border;
1146 1341
… …
1177 1372
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1374
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1376 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1378 };
1184 } else { 1379 } else {
1185 return 0; 1380 return 0;
1186 } 1381 }
1187 1382
1188 1 1383 1
1189} 1384}
1190 1385
1191sub button_up { 1386sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
1193 1388
1194 !!delete $self->{motion} 1389 ! ! delete $self->{motion}
1195} 1390}
1196 1391
1197sub mouse_motion { 1392sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1199 1394
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1396
1202 !!$self->{motion} 1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1203} 1406}
1204 1407
1205sub _draw { 1408sub _draw {
1206 my ($self) = @_; 1409 my ($self) = @_;
1207 1410
… …
1233 1436
1234 glDisable GL_TEXTURE_2D; 1437 glDisable GL_TEXTURE_2D;
1235 1438
1236 $child->draw; 1439 $child->draw;
1237 1440
1238 if ($self->{title}) { 1441 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1442 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1443 $self->{title_widget}->_draw;
1444
1445 glTranslate 0, - ($border - $self->{h});
1241 } 1446 }
1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1242} 1450}
1243 1451
1244############################################################################# 1452#############################################################################
1245 1453
1246package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1247 1455
1248our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1249 1457
1250use List::Util qw(max sum); 1458use List::Util qw(max sum);
1251 1459
1252use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1253 1461
1254sub new { 1462sub new {
1255 my $class = shift; 1463 my $class = shift;
1256 1464
1257 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1263sub children { 1471sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1473}
1266 1474
1267sub add { 1475sub add {
1268 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1269 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1480 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1272 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1486 $self->realloc;
1487}
1488
1489sub remove {
1490 my ($self, $child) = @_;
1491
1492 # TODO: not yet implemented
1274} 1493}
1275 1494
1276# TODO: move to container class maybe? send children a signal on removal? 1495# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1496sub clear {
1278 my ($self) = @_; 1497 my ($self) = @_;
… …
1319 (sum @$ws), 1538 (sum @$ws),
1320 (sum @$hs), 1539 (sum @$hs),
1321 ) 1540 )
1322} 1541}
1323 1542
1324sub size_allocate { 1543sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1326 1545
1327 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1328 1547
1329 my $req_w = (sum @$ws) || 1; 1548 my $req_w = (sum @$ws) || 1;
… …
1336 1555
1337 # linearly scale sizes 1556 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1559
1341 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1343 1562
1344 my $y; 1563 my $y;
1345 1564
1346 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1361 } 1580 }
1362 1581
1363 $y += $row_h; 1582 $y += $row_h;
1364 } 1583 }
1365 1584
1585 1
1366} 1586}
1367 1587
1368sub find_widget { 1588sub find_widget {
1369 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1370 1590
… …
1389 } 1609 }
1390} 1610}
1391 1611
1392############################################################################# 1612#############################################################################
1393 1613
1394package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1395 1615
1396our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1397 1617
1398sub size_request { 1618sub size_request {
1399 my ($self) = @_; 1619 my ($self) = @_;
1400 1620
1401 $self->{vertical} 1621 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1629 )
1410} 1630}
1411 1631
1412sub size_allocate { 1632sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1633 my ($self, $w, $h) = @_;
1414 1634
1415 my $space = $self->{vertical} ? $h : $w; 1635 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1636 my @children = $self->visible_children;
1417 1637
1418 my @req; 1638 my @req;
1419 1639
1420 if ($self->{homogeneous}) { 1640 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1641 @req = ($space / (@children || 1)) x @children;
1422 } else { 1642 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1644 my $req = List::Util::sum @req;
1425 1645
1426 if ($req > $space) { 1646 if ($req > $space) {
1427 # ah well, not enough space 1647 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1648 $_ *= $space / $req for @req;
1429 } else { 1649 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1651
1432 $space = ($space - $req) / $expand; # remaining space to give away 1652 $space = ($space - $req) / $expand; # remaining space to give away
1433 1653
1434 $req[$_] += $space * $children->[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1655 for 0 .. $#children;
1436 } 1656 }
1437 } 1657 }
1438 1658
1439 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1440 1660
1441 my $pos = 0; 1661 my $pos = 0;
1442 for (0 .. $#$children) { 1662 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1665
1446 $pos += $alloc; 1666 $pos += $alloc;
1447 } 1667 }
1448 1668
1449 1 1669 1
1450} 1670}
1451 1671
1452############################################################################# 1672#############################################################################
1453 1673
1454package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1455 1675
1456our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1457 1677
1458sub new { 1678sub new {
1459 my $class = shift; 1679 my $class = shift;
1460 1680
1461 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1464 ) 1684 )
1465} 1685}
1466 1686
1467############################################################################# 1687#############################################################################
1468 1688
1469package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1470 1690
1471our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1472 1692
1473sub new { 1693sub new {
1474 my $class = shift; 1694 my $class = shift;
1475 1695
1476 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1479 ) 1699 )
1480} 1700}
1481 1701
1482############################################################################# 1702#############################################################################
1483 1703
1484package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1485 1705
1486our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1487 1707
1488use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1489 1709
1490sub new { 1710sub new {
1491 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1492 1712
1493 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1716 #active_bg => none
1497 #font => default_font 1717 #font => default_font
1498 #text => initial text 1718 #text => initial text
1499 #markup => initial narkup 1719 #markup => initial narkup
1500 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1501 ellipsise => 3, # end 1722 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1724 fontsize => 1,
1504 align => -1, 1725 align => -1,
1505 valign => -1, 1726 valign => -1,
1506 padding_x => 2, 1727 padding_x => 2,
1507 padding_y => 2, 1728 padding_y => 2,
1508 can_events => 0, 1729 can_events => 0,
1509 %arg 1730 %arg
1510 ); 1731 );
1511 1732
1512 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1736 $self->{template} = $layout;
1516 } 1737 }
1517 1738
1518 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1522 } 1743 }
1523 1744
1524 $self 1745 $self
1525} 1746}
1526 1747
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1748sub update {
1538 my ($self) = @_; 1749 my ($self) = @_;
1539 1750
1540 delete $self->{texture}; 1751 delete $self->{texture};
1541 $self->SUPER::update; 1752 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1553 1764
1554 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1556 1767
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1559 1769
1560 delete $self->{size_req}; 1770 delete $self->{size_req};
1561 $self->realloc; 1771 $self->realloc;
1562 $self->update; 1772 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1570 1780
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1782
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1575 1784
1576 delete $self->{size_req}; 1785 delete $self->{size_req};
1577 $self->realloc; 1786 $self->realloc;
1578 $self->update; 1787 $self->update;
… …
1590 1799
1591 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1592 1801
1593 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1806
1597 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1598 1808
1599 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
… …
1604 }; 1814 };
1605 1815
1606 @{ $self->{size_req} } 1816 @{ $self->{size_req} }
1607} 1817}
1608 1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1609sub size_allocate { 1823sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1611 1825
1612 delete $self->{ox}; 1826 delete $self->{ox};
1613 1827
1614 delete $self->{texture} 1828 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1616} 1832}
1617 1833
1618sub set_fontsize { 1834sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1620 1836
1621 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1622 delete $self->{texture}; 1839 delete $self->{texture};
1623 1840
1624 $self->realloc; 1841 $self->realloc;
1625} 1842}
1626 1843
1627sub reconfigure { 1844sub reconfigure {
1628 my ($self) = @_; 1845 my ($self) = @_;
1629 1846
1630 delete $self->{size_req}; 1847 delete $self->{size_req};
1848 delete $self->{texture};
1631 1849
1632 $self->SUPER::reconfigure; 1850 $self->SUPER::reconfigure;
1633} 1851}
1634 1852
1635sub _draw { 1853sub _draw {
1636 my ($self) = @_; 1854 my ($self) = @_;
1637 1855
1638 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1639 1857
1640 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1865
1648 new_from_layout CFClient::Texture $self->{layout} 1866 [$self->{layout}->size]
1649 }; 1867 };
1650 1868
1651 unless (exists $self->{ox}) { 1869 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1655 1873
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1877 };
1660 1878
1661 glEnable GL_TEXTURE_2D;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1665 1881
1666 if ($tex->{format} == GL_ALPHA) { 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1674
1675 glDisable GL_TEXTURE_2D;
1676} 1883}
1677 1884
1678############################################################################# 1885#############################################################################
1679 1886
1680package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1681 1888
1682our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1683 1890
1684use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1685 1892
1686sub new { 1893sub new {
1687 my $class = shift; 1894 my $class = shift;
1688 1895
1689 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1713 1920
1714 $text =~ s/./*/g if $self->{hidden}; 1921 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1922 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1923 delete $self->{size_req};
1717 1924
1718 $self->_emit (changed => $self->{text}); 1925 $self->emit (changed => $self->{text});
1719 1926
1720 $self->realloc; 1927 $self->realloc;
1721 $self->update; 1928 $self->update;
1722} 1929}
1723 1930
… …
1738 my ($w, $h) = $self->SUPER::size_request; 1945 my ($w, $h) = $self->SUPER::size_request;
1739 1946
1740 ($w + 1, $h) # add 1 for cursor 1947 ($w + 1, $h) # add 1 for cursor
1741} 1948}
1742 1949
1743sub key_down { 1950sub invoke_key_down {
1744 my ($self, $ev) = @_; 1951 my ($self, $ev) = @_;
1745 1952
1746 my $mod = $ev->{mod}; 1953 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1954 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1955 my $uni = $ev->{unicode};
… …
1751 1958
1752 if ($uni == 8) { 1959 if ($uni == 8) {
1753 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1755 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1756 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1757 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1758 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1759 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1761 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1763 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 1971 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1972 $self->emit ('escape');
1766 } elsif ($uni) { 1973 } elsif ($uni) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1974 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1975 } else {
1769 return 0; 1976 return 0;
1770 } 1977 }
… …
1774 $self->realloc; 1981 $self->realloc;
1775 1982
1776 1 1983 1
1777} 1984}
1778 1985
1779sub focus_in { 1986sub invoke_focus_in {
1780 my ($self) = @_; 1987 my ($self) = @_;
1781 1988
1782 $self->{last_activity} = $::NOW; 1989 $self->{last_activity} = $::NOW;
1783 1990
1784 $self->SUPER::focus_in; 1991 $self->SUPER::invoke_focus_in
1785} 1992}
1786 1993
1787sub button_down { 1994sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 1995 my ($self, $ev, $x, $y) = @_;
1789 1996
1790 $self->SUPER::button_down ($ev, $x, $y); 1997 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 1998
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 1999 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 2000
1794 # byte-index to char-index 2001 # byte-index to char-index
1795 my $text = $self->{text}; 2002 my $text = $self->{text};
1796 utf8::encode $text; 2003 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797 $self->{cursor} = length substr $text, 0, $idx; 2004 $self->{cursor} = length $text;
1798 2005
1799 $self->_set_text ($self->{text}); 2006 $self->_set_text ($self->{text});
1800 $self->update; 2007 $self->update;
1801 2008
1802 1 2009 1
1803} 2010}
1804 2011
1805sub mouse_motion { 2012sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 2013 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2014# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 2015
1809 0 2016 1
1810} 2017}
1811 2018
1812sub _draw { 2019sub _draw {
1813 my ($self) = @_; 2020 my ($self) = @_;
1814 2021
… …
1841 utf8::encode $text; 2048 utf8::encode $text;
1842 2049
1843 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1844 } 2051 }
1845 2052
1846 glColor @{$self->{fg}};
1847 glBegin GL_LINES; 2053 glBegin GL_LINES;
1848 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2054 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1849 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2055 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1850 glEnd; 2056 glEnd;
1851 } 2057 }
1852} 2058}
1853 2059
1854package CFClient::UI::Entry; 2060package CFPlus::UI::Entry;
1855 2061
1856our @ISA = CFClient::UI::EntryBase::; 2062our @ISA = CFPlus::UI::EntryBase::;
1857 2063
1858use CFClient::OpenGL; 2064use CFPlus::OpenGL;
1859 2065
1860sub key_down { 2066sub invoke_key_down {
1861 my ($self, $ev) = @_; 2067 my ($self, $ev) = @_;
1862 2068
1863 my $sym = $ev->{sym}; 2069 my $sym = $ev->{sym};
1864 2070
1865 if ($sym == 13) { 2071 if ($sym == 13) {
1866 unshift @{$self->{history}}, 2072 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 2073 my $txt = $self->get_text;
2074
1868 $self->{history_pointer} = -1; 2075 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 2076 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 2077 $self->emit (activate => $txt);
1871 $self->update; 2078 $self->update;
1872 2079
1873 } elsif ($sym == CFClient::SDLK_UP) { 2080 } elsif ($sym == CFPlus::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 2081 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 2082 $self->{history_saveback} = $self->get_text;
1876 } 2083 }
1877 if (@{$self->{history} || []} > 0) { 2084 if (@{$self->{history} || []} > 0) {
1878 $self->{history_pointer}++; 2085 $self->{history_pointer}++;
… …
1880 $self->{history_pointer} = @{$self->{history} || []} - 1; 2087 $self->{history_pointer} = @{$self->{history} || []} - 1;
1881 } 2088 }
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2089 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } 2090 }
1884 2091
1885 } elsif ($sym == CFClient::SDLK_DOWN) { 2092 } elsif ($sym == CFPlus::SDLK_DOWN) {
1886 $self->{history_pointer}--; 2093 $self->{history_pointer}--;
1887 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2094 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888 2095
1889 if ($self->{history_pointer} >= 0) { 2096 if ($self->{history_pointer} >= 0) {
1890 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2097 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1891 } else { 2098 } else {
1892 $self->set_text ($self->{history_saveback}); 2099 $self->set_text ($self->{history_saveback});
1893 } 2100 }
1894 2101
1895 } else { 2102 } else {
1896 return $self->SUPER::key_down ($ev) 2103 return $self->SUPER::invoke_key_down ($ev)
1897 } 2104 }
1898 2105
1899 1 2106 1
1900} 2107}
1901 2108
1902############################################################################# 2109#############################################################################
1903 2110
1904package CFClient::UI::Button; 2111package CFPlus::UI::Button;
1905 2112
1906our @ISA = CFClient::UI::Label::; 2113our @ISA = CFPlus::UI::Label::;
1907 2114
1908use CFClient::OpenGL; 2115use CFPlus::OpenGL;
1909 2116
1910my @tex = 2117my @tex =
1911 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2118 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1912 qw(b1_button_active.png); 2119 qw(b1_button_active.png);
1913 2120
1914sub new { 2121sub new {
1915 my $class = shift; 2122 my $class = shift;
1916 2123
… …
1925 can_events => 1, 2132 can_events => 1,
1926 @_ 2133 @_
1927 ) 2134 )
1928} 2135}
1929 2136
1930sub activate { }
1931
1932sub button_up { 2137sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
1934 2139
1935 $self->emit ("activate") 2140 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 2141 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 2142 && $y >= 0 && $y < $self->{h};
… …
1955 $self->SUPER::_draw; 2160 $self->SUPER::_draw;
1956} 2161}
1957 2162
1958############################################################################# 2163#############################################################################
1959 2164
1960package CFClient::UI::CheckBox; 2165package CFPlus::UI::CheckBox;
1961 2166
1962our @ISA = CFClient::UI::DrawBG::; 2167our @ISA = CFPlus::UI::DrawBG::;
1963 2168
1964my @tex = 2169my @tex =
1965 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2170 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1966 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2171 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967 2172
1968use CFClient::OpenGL; 2173use CFPlus::OpenGL;
1969 2174
1970sub new { 2175sub new {
1971 my $class = shift; 2176 my $class = shift;
1972 2177
1973 $class->SUPER::new ( 2178 $class->SUPER::new (
… …
1987 my ($self) = @_; 2192 my ($self) = @_;
1988 2193
1989 (6) x 2 2194 (6) x 2
1990} 2195}
1991 2196
2197sub toggle {
2198 my ($self) = @_;
2199
2200 $self->{state} = !$self->{state};
2201 $self->emit (changed => $self->{state});
2202 $self->update;
2203}
2204
1992sub button_down { 2205sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1994 2207
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2208 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2209 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2210 $self->toggle;
1998 $self->_emit (changed => $self->{state});
1999 } else { 2211 } else {
2000 return 0 2212 return 0
2001 } 2213 }
2002 2214
2003 1 2215 1
… …
2023 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2024} 2236}
2025 2237
2026############################################################################# 2238#############################################################################
2027 2239
2028package CFClient::UI::Image; 2240package CFPlus::UI::Image;
2029 2241
2030our @ISA = CFClient::UI::Base::; 2242our @ISA = CFPlus::UI::Base::;
2031 2243
2032use CFClient::OpenGL; 2244use CFPlus::OpenGL;
2033use Carp qw/confess/;
2034 2245
2035our %loaded_images; 2246our %texture_cache;
2036 2247
2037sub new { 2248sub new {
2038 my $class = shift; 2249 my $class = shift;
2039 2250
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2251 my $self = $class->SUPER::new (
2252 can_events => 0,
2253 @_,
2254 );
2041 2255
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2256 $self->{path} || $self->{tex}
2257 or Carp::croak "'path' or 'tex' attributes required";
2043 2258
2044 $loaded_images{$self->{image}} ||= 2259 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2260 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2046 2261
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2262 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2263
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2264 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2265
2053 $self 2266 $self
2054} 2267}
2055 2268
2269sub STORABLE_freeze {
2270 my ($self, $cloning) = @_;
2271
2272 $self->{path}
2273 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2274
2275 $self->{path}
2276}
2277
2278sub STORABLE_attach {
2279 my ($self, $cloning, $path) = @_;
2280
2281 $self->new (path => $path)
2282}
2283
2056sub size_request { 2284sub size_request {
2057 my ($self) = @_; 2285 my ($self) = @_;
2058 2286
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2287 ($self->{tex}{w}, $self->{tex}{h})
2060} 2288}
2061 2289
2062sub _draw { 2290sub _draw {
2063 my ($self) = @_; 2291 my ($self) = @_;
2064 2292
… …
2074 } 2302 }
2075 2303
2076 glEnable GL_TEXTURE_2D; 2304 glEnable GL_TEXTURE_2D;
2077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2078 2306
2079 $tex->draw_quad_alpha (0, 0, $w, $h); 2307 $tex->draw_quad (0, 0, $w, $h);
2080 2308
2081 glDisable GL_TEXTURE_2D; 2309 glDisable GL_TEXTURE_2D;
2082} 2310}
2083 2311
2084############################################################################# 2312#############################################################################
2085 2313
2314package CFPlus::UI::ImageButton;
2315
2316our @ISA = CFPlus::UI::Image::;
2317
2318use CFPlus::OpenGL;
2319
2320my %textures;
2321
2322sub new {
2323 my $class = shift;
2324
2325 my $self = $class->SUPER::new (
2326 padding_x => 4,
2327 padding_y => 4,
2328 fg => [1, 1, 1],
2329 active_fg => [0, 0, 1],
2330 can_hover => 1,
2331 align => 0,
2332 valign => 0,
2333 can_events => 1,
2334 @_
2335 );
2336}
2337
2338sub invoke_button_up {
2339 my ($self, $ev, $x, $y) = @_;
2340
2341 $self->emit ("activate")
2342 if $x >= 0 && $x < $self->{w}
2343 && $y >= 0 && $y < $self->{h};
2344
2345 1
2346}
2347
2348#############################################################################
2349
2086package CFClient::UI::VGauge; 2350package CFPlus::UI::VGauge;
2087 2351
2088our @ISA = CFClient::UI::Base::; 2352our @ISA = CFPlus::UI::Base::;
2089 2353
2090use List::Util qw(min max); 2354use List::Util qw(min max);
2091 2355
2092use CFClient::OpenGL; 2356use CFPlus::OpenGL;
2093 2357
2094my %tex = ( 2358my %tex = (
2095 food => [ 2359 food => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2361 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098 ], 2362 ],
2099 grace => [ 2363 grace => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2365 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2102 ], 2366 ],
2103 hp => [ 2367 hp => [
2104 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2369 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106 ], 2370 ],
2107 mana => [ 2371 mana => [
2108 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2109 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2373 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2110 ], 2374 ],
2111); 2375);
2112 2376
2113# eg. VGauge->new (gauge => 'food'), default gauge: food 2377# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2173 my $ycut1 = max 0, min 1, $ycut; 2437 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2438 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2439
2176 my $h1 = $self->{h} * (1 - $ycut1); 2440 my $h1 = $self->{h} * (1 - $ycut1);
2177 my $h2 = $self->{h} * (1 - $ycut2); 2441 my $h2 = $self->{h} * (1 - $ycut2);
2442 my $h3 = $self->{h};
2443
2444 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178 2445
2179 glEnable GL_BLEND; 2446 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2447 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2448 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2449 glEnable GL_TEXTURE_2D;
… …
2201 2468
2202 if ($t3) { 2469 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2470 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2471 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2472 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2473 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2474 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2475 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2476 glEnd;
2210 } 2477 }
2211 2478
2212 glDisable GL_BLEND; 2479 glDisable GL_BLEND;
2213 glDisable GL_TEXTURE_2D; 2480 glDisable GL_TEXTURE_2D;
2214} 2481}
2215 2482
2216############################################################################# 2483#############################################################################
2217 2484
2218package CFClient::UI::Gauge; 2485package CFPlus::UI::Gauge;
2219 2486
2220our @ISA = CFClient::UI::VBox::; 2487our @ISA = CFPlus::UI::VBox::;
2221 2488
2222sub new { 2489sub new {
2223 my ($class, %arg) = @_; 2490 my ($class, %arg) = @_;
2224 2491
2225 my $self = $class->SUPER::new ( 2492 my $self = $class->SUPER::new (
… …
2227 can_hover => 1, 2494 can_hover => 1,
2228 can_events => 1, 2495 can_events => 1,
2229 %arg, 2496 %arg,
2230 ); 2497 );
2231 2498
2232 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2499 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2233 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2500 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2234 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2501 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2235 2502
2236 $self 2503 $self
2237} 2504}
2238 2505
2239sub set_fontsize { 2506sub set_fontsize {
… …
2260 $self->{value}->set_text ($val); 2527 $self->{value}->set_text ($val);
2261} 2528}
2262 2529
2263############################################################################# 2530#############################################################################
2264 2531
2265package CFClient::UI::Slider; 2532package CFPlus::UI::Slider;
2266 2533
2267use strict; 2534use strict;
2268 2535
2269use CFClient::OpenGL; 2536use CFPlus::OpenGL;
2270 2537
2271our @ISA = CFClient::UI::DrawBG::; 2538our @ISA = CFPlus::UI::DrawBG::;
2272 2539
2273my @tex = 2540my @tex =
2274 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2541 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2275 qw(s1_slider.png s1_slider_bg.png); 2542 qw(s1_slider.png s1_slider_bg.png);
2276 2543
2277sub new { 2544sub new {
2278 my $class = shift; 2545 my $class = shift;
2279 2546
… …
2300 $self->update; 2567 $self->update;
2301 2568
2302 $self 2569 $self
2303} 2570}
2304 2571
2305sub changed { }
2306
2307sub set_range { 2572sub set_range {
2308 my ($self, $range) = @_; 2573 my ($self, $range) = @_;
2309 2574
2310 ($range, $self->{range}) = ($self->{range}, $range); 2575 ($range, $self->{range}) = ($self->{range}, $range);
2311 2576
… …
2331 if $unit; 2596 if $unit;
2332 2597
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2598 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2599
2335 if ($value != $old_value) { 2600 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2601 $self->emit (changed => $value);
2337 $self->update; 2602 $self->update;
2338 } 2603 }
2339} 2604}
2340 2605
2341sub size_request { 2606sub size_request {
2342 my ($self) = @_; 2607 my ($self) = @_;
2343 2608
2344 ($self->{req_w}, $self->{req_h}) 2609 ($self->{req_w}, $self->{req_h})
2345} 2610}
2346 2611
2347sub button_down { 2612sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2613 my ($self, $ev, $x, $y) = @_;
2349 2614
2350 $self->SUPER::button_down ($ev, $x, $y); 2615 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2616
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2617 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2618
2354 $self->mouse_motion ($ev, $x, $y) 2619 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2620}
2356 2621
2357sub mouse_motion { 2622sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2623 my ($self, $ev, $x, $y) = @_;
2359 2624
2360 if ($GRAB == $self) { 2625 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2626 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2627
… …
2368 } else { 2633 } else {
2369 return 0; 2634 return 0;
2370 } 2635 }
2371 2636
2372 1 2637 1
2638}
2639
2640sub invoke_mouse_wheel {
2641 my ($self, $ev) = @_;
2642
2643 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2644
2645 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2646
2647 ! ! $delta
2373} 2648}
2374 2649
2375sub update { 2650sub update {
2376 my ($self) = @_; 2651 my ($self) = @_;
2377 2652
… …
2426 glDisable GL_TEXTURE_2D; 2701 glDisable GL_TEXTURE_2D;
2427} 2702}
2428 2703
2429############################################################################# 2704#############################################################################
2430 2705
2431package CFClient::UI::ValSlider; 2706package CFPlus::UI::ValSlider;
2432 2707
2433our @ISA = CFClient::UI::HBox::; 2708our @ISA = CFPlus::UI::HBox::;
2434 2709
2435sub new { 2710sub new {
2436 my ($class, %arg) = @_; 2711 my ($class, %arg) = @_;
2437 2712
2438 my $range = delete $arg{range}; 2713 my $range = delete $arg{range};
2439 2714
2440 my $self = $class->SUPER::new ( 2715 my $self = $class->SUPER::new (
2441 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2716 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2442 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2717 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2443 to_value => sub { shift }, 2718 to_value => sub { shift },
2444 from_value => sub { shift }, 2719 from_value => sub { shift },
2445 %arg, 2720 %arg,
2446 ); 2721 );
2447 2722
… …
2467sub set_range { shift->{slider}->set_range (@_) } 2742sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2743sub set_value { shift->{slider}->set_value (@_) }
2469 2744
2470############################################################################# 2745#############################################################################
2471 2746
2472package CFClient::UI::TextView; 2747package CFPlus::UI::TextScroller;
2473 2748
2474our @ISA = CFClient::UI::HBox::; 2749our @ISA = CFPlus::UI::HBox::;
2475 2750
2476use CFClient::OpenGL; 2751use CFPlus::OpenGL;
2477 2752
2478sub new { 2753sub new {
2479 my $class = shift; 2754 my $class = shift;
2480 2755
2481 my $self = $class->SUPER::new ( 2756 my $self = $class->SUPER::new (
2482 fontsize => 1, 2757 fontsize => 1,
2483 can_events => 0, 2758 can_events => 1,
2484 indent => 0, 2759 indent => 0,
2485 #font => default_font 2760 #font => default_font
2486 @_, 2761 @_,
2487 2762
2488 layout => (new CFClient::Layout 1), 2763 layout => (new CFPlus::Layout),
2489 par => [], 2764 par => [],
2490 height => 0, 2765 height => 0,
2491 children => [ 2766 children => [
2492 (new CFClient::UI::Empty expand => 1), 2767 (new CFPlus::UI::Empty expand => 1),
2493 (new CFClient::UI::Slider vertical => 1), 2768 (new CFPlus::UI::Slider vertical => 1),
2494 ], 2769 ],
2495 ); 2770 );
2496 2771
2497 $self->{children}[1]->connect (changed => sub { $self->update }); 2772 $self->{children}[1]->connect (changed => sub { $self->update });
2498 2773
… …
2504 2779
2505 $self->{fontsize} = $fontsize; 2780 $self->{fontsize} = $fontsize;
2506 $self->reflow; 2781 $self->reflow;
2507} 2782}
2508 2783
2784sub size_request {
2785 my ($self) = @_;
2786
2787 my ($empty, $slider) = @{ $self->{children} };
2788
2789 local $self->{children} = [$empty, $slider];
2790 $self->SUPER::size_request
2791}
2792
2509sub size_allocate { 2793sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 2794 my ($self, $w, $h) = @_;
2511 2795
2512 $self->SUPER::size_allocate ($w, $h); 2796 my ($empty, $slider, @other) = @{ $self->{children} };
2797 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 2798
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2799 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2800 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 2801 $self->{layout}->set_width ($empty->{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2802 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 2803
2519 $self->reflow; 2804 $self->reflow;
2520}
2521 2805
2522sub text_size { 2806 local $self->{children} = [$empty, $slider];
2807 $self->SUPER::invoke_size_allocate ($w, $h)
2808}
2809
2810sub invoke_mouse_wheel {
2523 my ($self, $text, $indent) = @_; 2811 my ($self, $ev) = @_;
2812
2813 return 0 unless $ev->{dy}; # only vertical movements
2814
2815 $self->{children}[1]->emit (mouse_wheel => $ev);
2816
2817 1
2818}
2819
2820sub get_layout {
2821 my ($self, $para) = @_;
2524 2822
2525 my $layout = $self->{layout}; 2823 my $layout = $self->{layout};
2526 2824
2825 $layout->set_font ($self->{font}) if $self->{font};
2826 $layout->set_foreground (@{$para->{fg}});
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2827 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 2828 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2829 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $layout->set_markup ($text); 2830 $layout->set_markup ($para->{markup});
2831
2832 $layout->set_shapes (
2833 map
2834 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2835 @{$para->{widget}}
2531 2836 );
2837
2532 $layout->size 2838 $layout
2533} 2839}
2534 2840
2535sub reflow { 2841sub reflow {
2536 my ($self) = @_; 2842 my ($self) = @_;
2537 2843
… …
2544 2850
2545 # todo: base offset on lines or so, not on pixels 2851 # todo: base offset on lines or so, not on pixels
2546 $self->{children}[1]->set_value ($offset); 2852 $self->{children}[1]->set_value ($offset);
2547} 2853}
2548 2854
2855sub current_paragraph {
2856 my ($self) = @_;
2857
2858 $self->force_uptodate;
2859 $self->{top_paragraph} - 1
2860}
2861
2862sub scroll_to {
2863 my ($self, $para) = @_;
2864
2865 $self->force_uptodate;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{children}[1]->set_value ($self->{par}[$para]{y});
2870}
2871
2549sub clear { 2872sub clear {
2550 my ($self) = @_; 2873 my ($self) = @_;
2874
2875 my (undef, undef, @other) = @{ $self->{children} };
2876 $self->remove ($_) for @other;
2551 2877
2552 $self->{par} = []; 2878 $self->{par} = [];
2553 $self->{height} = 0; 2879 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2880 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 2881}
2556 2882
2557sub add_paragraph { 2883sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 2884 my $self = shift;
2559 2885
2560 for my $line (split /\n/, $text) { 2886 for my $para (@_) {
2561 my ($w, $h) = $self->text_size ($line); 2887 $para = {
2888 fg => [1, 1, 1, 1],
2889 indent => 0,
2890 markup => "",
2891 widget => [],
2892 ref $para ? %$para : (markup => $para),
2893 w => 1e10,
2894 wrapped => 1,
2895 };
2896
2897 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2898 push @{$self->{par}}, $para;
2899 }
2900
2901 $self->{need_reflow}++;
2902 $self->update;
2903}
2904
2905sub scroll_to_bottom {
2906 my ($self) = @_;
2907
2908 $self->{scroll_to_bottom} = 1;
2909 $self->update;
2910}
2911
2912sub force_uptodate {
2913 my ($self) = @_;
2914
2915 if (delete $self->{need_reflow}) {
2916 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2917
2918 my $height = 0;
2919 my $paridx;
2920 my $top_paragraph;
2921 my $top = int $self->{children}[1]{range}[0];
2922
2923 for my $para (@{$self->{par}}) {
2924 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2925 my $layout = $self->get_layout ($para);
2926 my ($w, $h) = $layout->size;
2927
2928 $para->{w} = $w + $para->{indent};
2929 $para->{h} = $h;
2930 $para->{wrapped} = $layout->has_wrapped;
2931 }
2932
2933 $para->{y} = $height;
2934
2935 $paridx++;
2936 $top_paragraph ||= $paridx if $height >= $top;
2937
2938 $height += $para->{h};
2939 }
2940
2941 $self->{top_paragraph} = $top_paragraph;
2562 $self->{height} += $h; 2942 $self->{height} = $height;
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2564 }
2565 2943
2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2944 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2945
2946 delete $self->{texture};
2947 }
2948
2949 if (delete $self->{scroll_to_bottom}) {
2950 $self->{children}[1]->set_value (1e10);
2951 }
2567} 2952}
2568 2953
2569sub update { 2954sub update {
2570 my ($self) = @_; 2955 my ($self) = @_;
2571 2956
… …
2574 return unless $self->{h} > 0; 2959 return unless $self->{h} > 0;
2575 2960
2576 delete $self->{texture}; 2961 delete $self->{texture};
2577 2962
2578 $ROOT->on_post_alloc ($self => sub { 2963 $ROOT->on_post_alloc ($self => sub {
2964 $self->force_uptodate;
2965
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2966 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 2967
2581 if (delete $self->{need_reflow}) {
2582 my $height = 0;
2583
2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588 for (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($_->[4]);
2593 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3];
2595 $_->[1] = $h;
2596 }
2597
2598 $height += $_->[1];
2599 }
2600
2601 $self->{height} = $height;
2602
2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2604
2605 delete $self->{texture};
2606 }
2607
2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2968 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 2969 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 2970 glClear GL_COLOR_BUFFER_BIT;
2611 2971
2612 my $top = int $self->{children}[1]{range}[0]; 2972 my $top = int $self->{children}[1]{range}[0];
2613 2973
2614 my $y0 = $top; 2974 my $y0 = $top;
2615 my $y1 = $top + $H; 2975 my $y1 = $top + $H;
2616 2976
2617 my $y = 0;
2618
2619 my $layout = $self->{layout};
2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622
2623 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off
2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627 for my $par (@{$self->{par}}) { 2977 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 2978 my $h = $para->{h};
2979 my $y = $para->{y};
2629 2980
2630 if ($y0 < $y + $h && $y < $y1) { 2981 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 2982 my $layout = $self->get_layout ($para);
2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634 $layout->set_markup ($par->[4]);
2635 2983
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2984 $layout->render ($para->{indent}, $y - $y0);
2637 2985
2638 glRasterPos $par->[3], $y - $y0; 2986 if (my @w = @{ $para->{widget} }) {
2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2987 my @s = $layout->get_shapes;
2988
2989 for (@w) {
2990 my ($dx, $dy) = splice @s, 0, 2, ();
2991
2992 $_->{x} = $dx + $para->{indent};
2993 $_->{y} = $dy + $y - $y0;
2994
2995 $_->draw;
2996 }
2997 }
2640 } 2998 }
2641
2642 $y += $h;
2643 } 2999 }
2644
2645 glDisable GL_BLEND;
2646 }; 3000 };
2647 }); 3001 });
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $_->{w} = 1e10 for @{ $self->{par} };
3010 $self->reflow;
2648} 3011}
2649 3012
2650sub _draw { 3013sub _draw {
2651 my ($self) = @_; 3014 my ($self) = @_;
2652 3015
… …
2655 glColor 0, 0, 0, 1; 3018 glColor 0, 0, 0, 1;
2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3019 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2658 3021
2659 $self->{children}[1]->draw; 3022 $self->{children}[1]->draw;
2660
2661} 3023}
2662 3024
2663############################################################################# 3025#############################################################################
2664 3026
2665package CFClient::UI::Animator; 3027package CFPlus::UI::Animator;
2666 3028
2667use CFClient::OpenGL; 3029use CFPlus::OpenGL;
2668 3030
2669our @ISA = CFClient::UI::Bin::; 3031our @ISA = CFPlus::UI::Bin::;
2670 3032
2671sub moveto { 3033sub moveto {
2672 my ($self, $x, $y) = @_; 3034 my ($self, $x, $y) = @_;
2673 3035
2674 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3036 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2702 glPopMatrix; 3064 glPopMatrix;
2703} 3065}
2704 3066
2705############################################################################# 3067#############################################################################
2706 3068
2707package CFClient::UI::Flopper; 3069package CFPlus::UI::Flopper;
2708 3070
2709our @ISA = CFClient::UI::Button::; 3071our @ISA = CFPlus::UI::Button::;
2710 3072
2711sub new { 3073sub new {
2712 my $class = shift; 3074 my $class = shift;
2713 3075
2714 my $self = $class->SUPER::new ( 3076 my $self = $class->SUPER::new (
… …
2726 $self->{other}->toggle_visibility; 3088 $self->{other}->toggle_visibility;
2727} 3089}
2728 3090
2729############################################################################# 3091#############################################################################
2730 3092
2731package CFClient::UI::Tooltip; 3093package CFPlus::UI::Tooltip;
2732 3094
2733our @ISA = CFClient::UI::Bin::; 3095our @ISA = CFPlus::UI::Bin::;
2734 3096
2735use CFClient::OpenGL; 3097use CFPlus::OpenGL;
2736 3098
2737sub new { 3099sub new {
2738 my $class = shift; 3100 my $class = shift;
2739 3101
2740 $class->SUPER::new ( 3102 $class->SUPER::new (
… …
2743 ) 3105 )
2744} 3106}
2745 3107
2746sub set_tooltip_from { 3108sub set_tooltip_from {
2747 my ($self, $widget) = @_; 3109 my ($self, $widget) = @_;
3110
3111 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3112 if $widget->{tooltip} =~ /^#(.*)$/;
2748 3113
2749 my $tooltip = $widget->{tooltip}; 3114 my $tooltip = $widget->{tooltip};
2750 3115
2751 if ($ENV{CFPLUS_DEBUG} & 2) { 3116 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n" 3117 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3118 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 3119 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 3120 . "visible $widget->{visible}";
2756 } 3121 }
2757 3122
3123 $tooltip =~ s/^\n+//;
3124 $tooltip =~ s/\n+$//;
3125
2758 $self->add (new CFClient::UI::Label 3126 $self->add (new CFPlus::UI::Label
2759 markup => $tooltip, 3127 markup => $tooltip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3128 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761 fontsize => 0.8, 3129 fontsize => 0.8,
2762 fg => [0, 0, 0, 1], 3130 style => 1, # FLAG_INVERSE
2763 ellipsise => 0, 3131 ellipsise => 0,
2764 font => ($widget->{tooltip_font} || $::FONT_PROP), 3132 font => ($widget->{tooltip_font} || $::FONT_PROP),
2765 ); 3133 );
2766} 3134}
2767 3135
… …
2771 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3139 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772 3140
2773 ($w + 4, $h + 4) 3141 ($w + 4, $h + 4)
2774} 3142}
2775 3143
2776sub size_allocate { 3144sub invoke_size_allocate {
2777 my ($self, $w, $h) = @_; 3145 my ($self, $w, $h) = @_;
2778 3146
2779 $self->SUPER::size_allocate ($w - 4, $h - 4); 3147 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780} 3148}
2781 3149
2782sub visibility_change { 3150sub invoke_visibility_change {
2783 my ($self, $visible) = @_; 3151 my ($self, $visible) = @_;
2784 3152
2785 return unless $visible; 3153 return unless $visible;
2786 3154
2787 $self->{root}->on_post_alloc ("move_$self" => sub { 3155 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner} 3156 my $widget = $self->{owner}
2789 or return; 3157 or return;
2790 3158
3159 if ($widget->{visible}) {
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3160 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792 3161
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3162 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $self->{root}{w}; 3163 if $x + $self->{w} > $self->{root}{w};
2795 3164
2796 $self->move_abs ($x, $y); 3165 $self->move_abs ($x, $y);
3166 } else {
3167 $self->hide;
3168 }
2797 }); 3169 });
2798} 3170}
2799 3171
2800sub _draw { 3172sub _draw {
2801 my ($self) = @_; 3173 my ($self) = @_;
… …
2825 $self->SUPER::_draw; 3197 $self->SUPER::_draw;
2826} 3198}
2827 3199
2828############################################################################# 3200#############################################################################
2829 3201
2830package CFClient::UI::Face; 3202package CFPlus::UI::Face;
2831 3203
2832our @ISA = CFClient::UI::Base::; 3204our @ISA = CFPlus::UI::DrawBG::;
2833 3205
2834use CFClient::OpenGL; 3206use CFPlus::OpenGL;
2835 3207
2836sub new { 3208sub new {
2837 my $class = shift; 3209 my $class = shift;
2838 3210
2839 my $self = $class->SUPER::new ( 3211 my $self = $class->SUPER::new (
… …
2874sub _draw { 3246sub _draw {
2875 my ($self) = @_; 3247 my ($self) = @_;
2876 3248
2877 return unless $::CONN; 3249 return unless $::CONN;
2878 3250
3251 $self->SUPER::_draw;
3252
2879 my $face; 3253 my $face;
2880 3254
2881 if ($self->{frame}) { 3255 if ($self->{frame}) {
2882 my $anim = $::CONN->{anim}[$self->{anim}]; 3256 my $anim = $::CONN->{anim}[$self->{anim}];
2883 3257
… …
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3268 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 3269 glDisable GL_TEXTURE_2D;
2896 } 3270 }
2897} 3271}
2898 3272
2899sub DESTROY { 3273sub destroy {
2900 my ($self) = @_; 3274 my ($self) = @_;
2901 3275
2902 $self->{timer}->cancel 3276 $self->{timer}->cancel
2903 if $self->{timer}; 3277 if $self->{timer};
2904 3278
2905 $self->SUPER::DESTROY; 3279 $self->SUPER::destroy;
2906} 3280}
2907 3281
2908############################################################################# 3282#############################################################################
2909 3283
2910package CFClient::UI::Buttonbar; 3284package CFPlus::UI::Buttonbar;
2911 3285
2912our @ISA = CFClient::UI::HBox::; 3286our @ISA = CFPlus::UI::HBox::;
2913 3287
2914# TODO: should actualyl wrap buttons and other goodies. 3288# TODO: should actualyl wrap buttons and other goodies.
2915 3289
2916############################################################################# 3290#############################################################################
2917 3291
2918package CFClient::UI::Menu; 3292package CFPlus::UI::Menu;
2919 3293
2920our @ISA = CFClient::UI::FancyFrame::; 3294our @ISA = CFPlus::UI::Toplevel::;
2921 3295
2922use CFClient::OpenGL; 3296use CFPlus::OpenGL;
2923 3297
2924sub new { 3298sub new {
2925 my $class = shift; 3299 my $class = shift;
2926 3300
2927 my $self = $class->SUPER::new ( 3301 my $self = $class->SUPER::new (
2928 items => [], 3302 items => [],
2929 z => 100, 3303 z => 100,
2930 @_, 3304 @_,
2931 ); 3305 );
2932 3306
2933 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3307 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2934 3308
2935 for my $item (@{ $self->{items} }) { 3309 for my $item (@{ $self->{items} }) {
2936 my ($widget, $cb, $tooltip) = @$item; 3310 my ($widget, $cb, $tooltip) = @$item;
2937 3311
2938 # handle various types of items, only text for now 3312 # handle various types of items, only text for now
2939 if (!ref $widget) { 3313 if (!ref $widget) {
3314 if ($widget =~ /\t/) {
3315 my ($left, $right) = split /\t/, $widget, 2;
3316
2940 $widget = new CFClient::UI::Label 3317 $widget = new CFPlus::UI::HBox
2941 can_hover => 1, 3318 can_hover => 1,
2942 can_events => 1, 3319 can_events => 1,
2943 text => $widget,
2944 tooltip => $tooltip 3320 tooltip => $tooltip,
3321 children => [
3322 (new CFPlus::UI::Label markup => $left, expand => 1),
3323 (new CFPlus::UI::Label markup => $right, align => +1),
3324 ],
3325 ;
3326
3327 } else {
3328 $widget = new CFPlus::UI::Label
3329 can_hover => 1,
3330 can_events => 1,
3331 markup => $widget,
3332 tooltip => $tooltip;
3333 }
2945 } 3334 }
2946 3335
2947 $self->{item}{$widget} = $item; 3336 $self->{item}{$widget} = $item;
2948 3337
2949 $self->{vbox}->add ($widget); 3338 $self->{vbox}->add ($widget);
… …
2954 3343
2955# popup given the event (must be a mouse button down event currently) 3344# popup given the event (must be a mouse button down event currently)
2956sub popup { 3345sub popup {
2957 my ($self, $ev) = @_; 3346 my ($self, $ev) = @_;
2958 3347
2959 $self->_emit ("popdown"); 3348 $self->emit ("popdown");
2960 3349
2961 # maybe save $GRAB? must be careful about events... 3350 # maybe save $GRAB? must be careful about events...
2962 $GRAB = $self; 3351 $GRAB = $self;
2963 $self->{button} = $ev->{button}; 3352 $self->{button} = $ev->{button};
2964 3353
2965 $self->show; 3354 $self->show;
2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3355 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967} 3356}
2968 3357
2969sub mouse_motion { 3358sub invoke_mouse_motion {
2970 my ($self, $ev, $x, $y) = @_; 3359 my ($self, $ev, $x, $y) = @_;
2971 3360
2972 # TODO: should use vbox->find_widget or so 3361 # TODO: should use vbox->find_widget or so
2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3362 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974 $self->{hover} = $self->{item}{$HOVER}; 3363 $self->{hover} = $self->{item}{$HOVER};
2975 3364
2976 0 3365 0
2977} 3366}
2978 3367
2979sub button_up { 3368sub invoke_button_up {
2980 my ($self, $ev, $x, $y) = @_; 3369 my ($self, $ev, $x, $y) = @_;
2981 3370
2982 if ($ev->{button} == $self->{button}) { 3371 if ($ev->{button} == $self->{button}) {
2983 undef $GRAB; 3372 undef $GRAB;
2984 $self->hide; 3373 $self->hide;
2985 3374
2986 $self->_emit ("popdown"); 3375 $self->emit ("popdown");
2987 $self->{hover}[1]->() if $self->{hover}; 3376 $self->{hover}[1]->() if $self->{hover};
2988 } else { 3377 } else {
2989 return 0 3378 return 0
2990 } 3379 }
2991 3380
2992 1 3381 1
2993} 3382}
2994 3383
2995############################################################################# 3384#############################################################################
2996 3385
2997package CFClient::UI::Multiplexer; 3386package CFPlus::UI::Multiplexer;
2998 3387
2999our @ISA = CFClient::UI::Container::; 3388our @ISA = CFPlus::UI::Container::;
3000 3389
3001sub new { 3390sub new {
3002 my $class = shift; 3391 my $class = shift;
3003 3392
3004 my $self = $class->SUPER::new ( 3393 my $self = $class->SUPER::new (
… …
3018 3407
3019 $self->{current} = $self->{children}[0] 3408 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} }; 3409 if @{ $self->{children} };
3021} 3410}
3022 3411
3412sub get_current_page {
3413 my ($self) = @_;
3414
3415 $self->{current}
3416}
3417
3023sub set_current_page { 3418sub set_current_page {
3024 my ($self, $page_or_widget) = @_; 3419 my ($self, $page_or_widget) = @_;
3025 3420
3026 my $widget = ref $page_or_widget 3421 my $widget = ref $page_or_widget
3027 ? $page_or_widget 3422 ? $page_or_widget
3028 : $self->{children}[$page_or_widget]; 3423 : $self->{children}[$page_or_widget];
3029 3424
3030 $self->{current} = $widget; 3425 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3426 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032 3427
3033 $self->_emit (page_changed => $self->{current}); 3428 $self->emit (page_changed => $self->{current});
3034 3429
3035 $self->realloc; 3430 $self->realloc;
3036} 3431}
3037 3432
3038sub visible_children { 3433sub visible_children {
… …
3043 my ($self) = @_; 3438 my ($self) = @_;
3044 3439
3045 $self->{current}->size_request 3440 $self->{current}->size_request
3046} 3441}
3047 3442
3048sub size_allocate { 3443sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3444 my ($self, $w, $h) = @_;
3050 3445
3051 $self->{current}->configure (0, 0, $w, $h); 3446 $self->{current}->configure (0, 0, $w, $h);
3447
3448 1
3052} 3449}
3053 3450
3054sub _draw { 3451sub _draw {
3055 my ($self) = @_; 3452 my ($self) = @_;
3056 3453
3057 $self->{current}->draw; 3454 $self->{current}->draw;
3058} 3455}
3059 3456
3060############################################################################# 3457#############################################################################
3061 3458
3062package CFClient::UI::Notebook; 3459package CFPlus::UI::Notebook;
3063 3460
3064our @ISA = CFClient::UI::VBox::; 3461our @ISA = CFPlus::UI::VBox::;
3065 3462
3066sub new { 3463sub new {
3067 my $class = shift; 3464 my $class = shift;
3068 3465
3069 my $self = $class->SUPER::new ( 3466 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar), 3467 buttonbar => (new CFPlus::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3468 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self 3469 # filter => # will be put between multiplexer and $self
3073 @_, 3470 @_,
3074 ); 3471 );
3075 3472
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3473 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3082sub add { 3479sub add {
3083 my ($self, $title, $widget, $tooltip) = @_; 3480 my ($self, $title, $widget, $tooltip) = @_;
3084 3481
3085 Scalar::Util::weaken $self; 3482 Scalar::Util::weaken $self;
3086 3483
3087 $self->{buttonbar}->add (new CFClient::UI::Button 3484 $self->{buttonbar}->add (new CFPlus::UI::Button
3088 markup => $title, 3485 markup => $title,
3089 tooltip => $tooltip, 3486 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) }, 3487 on_activate => sub { $self->set_current_page ($widget) },
3091 ); 3488 );
3092 3489
3093 $self->{multiplexer}->add ($widget); 3490 $self->{multiplexer}->add ($widget);
3094} 3491}
3095 3492
3493sub get_current_page {
3494 my ($self) = @_;
3495
3496 $self->{multiplexer}->get_current_page
3497}
3498
3096sub set_current_page { 3499sub set_current_page {
3097 my ($self, $page) = @_; 3500 my ($self, $page) = @_;
3098 3501
3099 $self->{multiplexer}->set_current_page ($page); 3502 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current}); 3503 $self->emit (page_changed => $self->{multiplexer}{current});
3101} 3504}
3102 3505
3103############################################################################# 3506#############################################################################
3104 3507
3105package CFClient::UI::Combobox; 3508package CFPlus::UI::Selector;
3106 3509
3107use utf8; 3510use utf8;
3108 3511
3109our @ISA = CFClient::UI::Button::; 3512our @ISA = CFPlus::UI::Button::;
3110 3513
3111sub new { 3514sub new {
3112 my $class = shift; 3515 my $class = shift;
3113 3516
3114 my $self = $class->SUPER::new ( 3517 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3518 options => [], # [value, title, longdesc], ...
3116 value => undef, 3519 value => undef,
3117 @_, 3520 @_,
3118 ); 3521 );
3119 3522
3120 $self->_set_value ($self->{value}); 3523 $self->_set_value ($self->{value});
3121 3524
3122 $self 3525 $self
3123} 3526}
3124 3527
3125sub button_down { 3528sub invoke_button_down {
3126 my ($self, $ev) = @_; 3529 my ($self, $ev) = @_;
3127 3530
3128 my @menu_items; 3531 my @menu_items;
3129 3532
3130 for (@{ $self->{options} }) { 3533 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3534 my ($value, $title, $tooltip) = @$_;
3132 3535
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3536 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3537 }
3135 3538
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3539 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3540}
3138 3541
3139sub _set_value { 3542sub _set_value {
3140 my ($self, $value) = @_; 3543 my ($self, $value) = @_;
3141 3544
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3545 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3546 or return;
3144 3547
3145 $self->{value} = $item->[1]; 3548 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3549 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3550 $self->set_tooltip ($item->[2]);
3148} 3551}
3149 3552
3150sub set_value { 3553sub set_value {
3151 my ($self, $value) = @_; 3554 my ($self, $value) = @_;
3152 3555
3153 return unless $self->{value} ne $value; 3556 return unless $self->{value} ne $value;
3154 3557
3155 $self->_set_value ($value); 3558 $self->_set_value ($value);
3156 $self->_emit (changed => $value); 3559 $self->emit (changed => $value);
3157} 3560}
3158 3561
3159############################################################################# 3562#############################################################################
3160 3563
3161package CFClient::UI::Statusbox; 3564package CFPlus::UI::Statusbox;
3162 3565
3163our @ISA = CFClient::UI::VBox::; 3566our @ISA = CFPlus::UI::VBox::;
3164 3567
3165sub new { 3568sub new {
3166 my $class = shift; 3569 my $class = shift;
3167 3570
3168 my $self = $class->SUPER::new ( 3571 my $self = $class->SUPER::new (
… …
3180sub reorder { 3583sub reorder {
3181 my ($self) = @_; 3584 my ($self) = @_;
3182 my $NOW = Time::HiRes::time; 3585 my $NOW = Time::HiRes::time;
3183 3586
3184 # freeze display when hovering over any label 3587 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner} 3588 return if $CFPlus::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3589 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} }; 3590 values %{ $self->{item} };
3188 3591
3189 while (my ($k, $v) = each %{ $self->{item} }) { 3592 while (my ($k, $v) = each %{ $self->{item} }) {
3190 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3593 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3191 } 3594 }
… …
3212 for ($short) { 3615 for ($short) {
3213 s/^\s+//; 3616 s/^\s+//;
3214 s/\s+/ /g; 3617 s/\s+/ /g;
3215 } 3618 }
3216 3619
3217 new CFClient::UI::Label 3620 new CFPlus::UI::Label
3218 markup => $short, 3621 markup => $short,
3219 tooltip => $item->{tooltip}, 3622 tooltip => $item->{tooltip},
3220 tooltip_font => $::FONT_PROP, 3623 tooltip_font => $::FONT_PROP,
3221 tooltip_width => 0.67, 3624 tooltip_width => 0.67,
3222 fontsize => $item->{fontsize} || $self->{fontsize}, 3625 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3260 $item->{count}++; 3663 $item->{count}++;
3261 } else { 3664 } else {
3262 $item->{count} = 1; 3665 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 3666 $item->{text} = $item->{tooltip} = $text;
3264 } 3667 }
3265 $item->{id} = ++$self->{id}; 3668 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 3669 $item->{timeout} = $timeout;
3267 delete $item->{label}; 3670 delete $item->{label};
3268 } else { 3671 } else {
3269 $self->{item}{$group} = { 3672 $self->{item}{$group} = {
3270 id => ++$self->{id}, 3673 id => ++$self->{id},
… …
3276 count => 1, 3679 count => 1,
3277 %arg, 3680 %arg,
3278 }; 3681 };
3279 } 3682 }
3280 3683
3684 $ROOT->on_refresh (reorder => sub {
3281 $self->reorder; 3685 $self->reorder;
3686 });
3282} 3687}
3283 3688
3284sub reconfigure { 3689sub reconfigure {
3285 my ($self) = @_; 3690 my ($self) = @_;
3286 3691
… …
3289 3694
3290 $self->reorder; 3695 $self->reorder;
3291 $self->SUPER::reconfigure; 3696 $self->SUPER::reconfigure;
3292} 3697}
3293 3698
3294sub DESTROY { 3699sub destroy {
3295 my ($self) = @_; 3700 my ($self) = @_;
3296 3701
3297 $self->{timer}->cancel; 3702 $self->{timer}->cancel;
3298 3703
3299 $self->SUPER::DESTROY; 3704 $self->SUPER::destroy;
3300} 3705}
3301 3706
3302############################################################################# 3707#############################################################################
3303 3708
3304package CFClient::UI::Inventory; 3709package CFPlus::UI::Inventory;
3305 3710
3306our @ISA = CFClient::UI::ScrolledWindow::; 3711our @ISA = CFPlus::UI::Table::;
3307 3712
3308sub new { 3713sub new {
3309 my $class = shift; 3714 my $class = shift;
3310 3715
3311 my $self = $class->SUPER::new ( 3716 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3717 col_expand => [0, 1, 0],
3718 items => [],
3313 @_, 3719 @_,
3314 ); 3720 );
3315 3721
3722 $self->set_sort_order (undef);
3723
3316 $self 3724 $self
3725}
3726
3727sub update_items {
3728 my ($self) = @_;
3729
3730 $self->clear;
3731
3732 my @item = $self->{sort}->(@{ $self->{items} });
3733
3734 my @adds;
3735 my $row = 0;
3736 for my $item ($self->{sort}->(@{ $self->{items} })) {
3737 CFPlus::Item::update_widgets $item;
3738
3739 push @adds, 0, $row, $item->{face_widget};
3740 push @adds, 1, $row, $item->{desc_widget};
3741 push @adds, 2, $row, $item->{weight_widget};
3742
3743 $row++;
3744 }
3745
3746 $self->add (@adds);
3747}
3748
3749sub set_sort_order {
3750 my ($self, $order) = @_;
3751
3752 $self->{sort} = $order ||= sub {
3753 sort {
3754 $a->{type} <=> $b->{type}
3755 or $a->{name} cmp $b->{name}
3756 } @_
3757 };
3758
3759 $self->update_items;
3317} 3760}
3318 3761
3319sub set_items { 3762sub set_items {
3320 my ($self, $items) = @_; 3763 my ($self, $items) = @_;
3321 3764
3322 $self->{child}->clear; 3765 $self->{items} = [$items ? values %$items : ()];
3323 return unless $items; 3766 $self->update_items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342} 3767}
3343 3768
3344############################################################################# 3769#############################################################################
3345 3770
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList; 3771package CFPlus::UI::SpellList;
3544 3772
3545our @ISA = CFClient::UI::Table::; 3773our @ISA = CFPlus::UI::Table::;
3546 3774
3547sub new { 3775sub new {
3548 my $class = shift; 3776 my $class = shift;
3549 3777
3550 my $self = $class->SUPER::new ( 3778 my $self = $class->SUPER::new (
… …
3552 commands => [], 3780 commands => [],
3553 @_, 3781 @_,
3554 ) 3782 )
3555} 3783}
3556 3784
3785my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3786
3787my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3788 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3789my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3790 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3791my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3792 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3793my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3794 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3795my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3796 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3563 3797
3564sub rebuild_spell_list { 3798sub rebuild_spell_list {
3565 my ($self) = @_; 3799 my ($self) = @_;
3566 3800
3567 $CFClient::UI::ROOT->on_refresh ($self => sub { 3801 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear; 3802 $self->clear;
3569 3803
3804 return unless $::CONN;
3805
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3806 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3807 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3808 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3809 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3810 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574 3811
3575 my $row = 0; 3812 my $row = 0;
3576 3813
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3814 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_}; 3815 my $spell = $self->{spell}{$_};
3579 3816
3580 $row++; 3817 $row++;
3581 3818
3819 my $spell_cb = sub {
3820 my ($widget, $ev) = @_;
3821
3822 if ($ev->{button} == 1) {
3823 $::CONN->user_send ("cast $spell->{name}");
3824 } elsif ($ev->{button} == 2) {
3825 $::CONN->user_send ("invoke $spell->{name}");
3826 } elsif ($ev->{button} == 3) {
3827 (new CFPlus::UI::Menu
3828 items => [
3829 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3830 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3831 ],
3832 )->popup ($ev);
3833 } else {
3834 return 0;
3835 }
3836
3837 1
3838 };
3839
3840 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3841
3842 #TODO: add path info to tooltip
3843 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3844
3582 $self->add (0, $row, new CFClient::UI::Face 3845 $self->add (0, $row, new CFPlus::UI::Face
3583 face => $spell->{face}, 3846 face => $spell->{face},
3584 can_hover => 1, 3847 can_hover => 1,
3585 can_events => 1, 3848 can_events => 1,
3586 tooltip => $spell->{message}, 3849 tooltip => $tooltip,
3850 on_button_down => $spell_cb,
3587 ); 3851 );
3588 3852
3589 $self->add (1, $row, new CFClient::UI::Label 3853 $self->add (1, $row, new CFPlus::UI::Label
3590 expand => 1, 3854 expand => 1,
3591 text => $spell->{name}, 3855 text => $spell->{name},
3592 can_hover => 1, 3856 can_hover => 1,
3593 can_events => 1, 3857 can_events => 1,
3594 tooltip => $spell->{message}, 3858 tooltip => $tooltip,
3859 on_button_down => $spell_cb,
3595 ); 3860 );
3596 3861
3862 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3863 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3864 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3865 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 } 3866 }
3608 }); 3867 });
3609} 3868}
3610 3869
3611sub add_spell { 3870sub add_spell {
… …
3620 3879
3621 delete $self->{spell}->{$spell->{name}}; 3880 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list; 3881 $self->rebuild_spell_list;
3623} 3882}
3624 3883
3884sub clear_spells {
3885 my ($self) = @_;
3886
3887 $self->{spell} = {};
3888 $self->rebuild_spell_list;
3889}
3890
3625############################################################################# 3891#############################################################################
3626 3892
3627package CFClient::UI::Root; 3893package CFPlus::UI::Root;
3628 3894
3629our @ISA = CFClient::UI::Container::; 3895our @ISA = CFPlus::UI::Container::;
3630 3896
3631use List::Util qw(min max); 3897use List::Util qw(min max);
3632 3898
3633use CFClient::OpenGL; 3899use CFPlus::OpenGL;
3634 3900
3635sub new { 3901sub new {
3636 my $class = shift; 3902 my $class = shift;
3637 3903
3638 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
… …
3663 $coord = $max - $size if $coord > $max - $size; 3929 $coord = $max - $size if $coord > $max - $size;
3664 3930
3665 int $coord + 0.5 3931 int $coord + 0.5
3666} 3932}
3667 3933
3668sub size_allocate { 3934sub invoke_size_allocate {
3669 my ($self, $w, $h) = @_; 3935 my ($self, $w, $h) = @_;
3670 3936
3671 for my $child ($self->children) { 3937 for my $child ($self->children) {
3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3938 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673 3939
… …
3677 $X = _to_pixel $X, $W, $self->{w}; 3943 $X = _to_pixel $X, $W, $self->{w};
3678 $Y = _to_pixel $Y, $H, $self->{h}; 3944 $Y = _to_pixel $Y, $H, $self->{h};
3679 3945
3680 $child->configure ($X, $Y, $W, $H); 3946 $child->configure ($X, $Y, $W, $H);
3681 } 3947 }
3948
3949 1
3682} 3950}
3683 3951
3684sub coord2local { 3952sub coord2local {
3685 my ($self, $x, $y) = @_; 3953 my ($self, $x, $y) = @_;
3686 3954
… …
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4080 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813 4081
3814 $w = 0 if $w < 0; 4082 $w = 0 if $w < 0;
3815 $h = 0 if $h < 0; 4083 $h = 0 if $h < 0;
3816 4084
4085 $w = max $widget->{min_w}, $w;
4086 $h = max $widget->{min_h}, $h;
4087
4088# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4089# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4090
4091 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4092 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4093
3817 $w = int $w + 0.5; 4094 $w = int $w + 0.5;
3818 $h = int $h + 0.5; 4095 $h = int $h + 0.5;
3819 4096
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4097 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w}; 4098 $widget->{old_w} = $widget->{w};
… …
3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4121 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3845 glMatrixMode GL_MODELVIEW; 4122 glMatrixMode GL_MODELVIEW;
3846 glLoadIdentity; 4123 glLoadIdentity;
3847 4124
3848 { 4125 {
3849 package CFClient::UI::Base; 4126 package CFPlus::UI::Base;
3850 4127
3851 ($draw_x, $draw_y, $draw_w, $draw_h) = 4128 ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h}); 4129 (0, 0, $self->{w}, $self->{h});
3853 } 4130 }
3854 4131
3855 $self->_draw; 4132 $self->_draw;
3856} 4133}
3857 4134
3858############################################################################# 4135#############################################################################
3859 4136
3860package CFClient::UI; 4137package CFPlus::UI;
3861 4138
3862$ROOT = new CFClient::UI::Root; 4139$ROOT = new CFPlus::UI::Root;
3863$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4140$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3864 4141
38651 41421
3866 4143

Diff Legend

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