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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.342 by root, Sun Aug 13 14:38:35 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
… …
278 delete $self->{root}; 301 delete $self->{root};
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 644
599 eval { $self->destroy }; 645 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601} 647}
602 648
603############################################################################# 649#############################################################################
604 650
605package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
606 652
607our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
608 654
609use strict; 655use strict;
610use CFClient::OpenGL; 656use CFPlus::OpenGL;
611 657
612sub new { 658sub new {
613 my $class = shift; 659 my $class = shift;
614 660
615 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
646 } 692 }
647} 693}
648 694
649############################################################################# 695#############################################################################
650 696
651package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
652 698
653our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
654 700
655sub new { 701sub new {
656 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
658} 704}
… …
665 711
666sub draw { } 712sub draw { }
667 713
668############################################################################# 714#############################################################################
669 715
670package CFClient::UI::Container; 716package CFPlus::UI::Container;
671 717
672our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
673 719
674sub new { 720sub new {
675 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
676 722
677 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
686 if $children; 732 if $children;
687 733
688 $self 734 $self
689} 735}
690 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
691sub add { 745sub add {
692 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
693 747
694 $_->set_parent ($self) 748 $_->set_parent ($self)
695 for @widgets; 749 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
756} 810}
757 811
758############################################################################# 812#############################################################################
759 813
760package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
761 815
762our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
763 817
764sub new { 818sub new {
765 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
766 820
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 822
769 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
770} 824}
771 825
772sub add { 826sub add {
… …
779sub remove { 833sub remove {
780 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
781 835
782 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
783 837
784 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 839 unless @{$self->{children}};
786} 840}
787 841
788sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
789 843
790sub size_request { 844sub size_request {
791 $_[0]{children}[0]->size_request 845 $_[0]{children}[0]->size_request
792} 846}
793 847
794sub size_allocate { 848sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 849 my ($self, $w, $h) = @_;
796 850
797 $self->{children}[0]->configure (0, 0, $w, $h); 851 $self->{children}[0]->configure (0, 0, $w, $h);
852
853 1
798} 854}
799 855
800############################################################################# 856#############################################################################
801 857
802# back-buffered drawing area 858# back-buffered drawing area
803 859
804package CFClient::UI::Window; 860package CFPlus::UI::Window;
805 861
806our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
807 863
808use CFClient::OpenGL; 864use CFPlus::OpenGL;
809 865
810sub new { 866sub new {
811 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
812 868
813 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
818 874
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 875 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 876 $self->SUPER::update;
821} 877}
822 878
823sub size_allocate { 879sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 880 my ($self, $w, $h) = @_;
825 881
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 882 $self->update;
883
884 $self->SUPER::invoke_size_allocate ($w, $h)
828} 885}
829 886
830sub _render { 887sub _render {
831 my ($self) = @_; 888 my ($self) = @_;
832 889
… …
834} 891}
835 892
836sub render_child { 893sub render_child {
837 my ($self) = @_; 894 my ($self) = @_;
838 895
839 $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 {
840 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
842 899
843 { 900 {
844 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
845 902
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
848 } 905 }
849 906
… …
868 glDisable GL_TEXTURE_2D; 925 glDisable GL_TEXTURE_2D;
869} 926}
870 927
871############################################################################# 928#############################################################################
872 929
873package CFClient::UI::ViewPort; 930package CFPlus::UI::ViewPort;
874 931
875our @ISA = CFClient::UI::Window::; 932our @ISA = CFPlus::UI::Window::;
876 933
877sub new { 934sub new {
878 my $class = shift; 935 my $class = shift;
879 936
880 $class->SUPER::new ( 937 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 950 $h = 10 if $self->{scroll_y};
894 951
895 ($w, $h) 952 ($w, $h)
896} 953}
897 954
898sub size_allocate { 955sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 956 my ($self, $w, $h) = @_;
900 957
901 my $child = $self->child; 958 my $child = $self->child;
902 959
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 960 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 961 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 962
906 $self->child->configure (0, 0, $w, $h); 963 $self->child->configure (0, 0, $w, $h);
907 $self->update; 964 $self->update;
965
966 1
908} 967}
909 968
910sub set_offset { 969sub set_offset {
911 my ($self, $x, $y) = @_; 970 my ($self, $x, $y) = @_;
912 971
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 998 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 999 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1001 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1002 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1003 }
945} 1004}
946 1005
947sub _render { 1006sub _render {
948 my ($self) = @_; 1007 my ($self) = @_;
949 1008
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1009 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1010 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1011
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1012 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1013
955 $self->SUPER::_render; 1014 $self->SUPER::_render;
956} 1015}
957 1016
958############################################################################# 1017#############################################################################
959 1018
960package CFClient::UI::ScrolledWindow; 1019package CFPlus::UI::ScrolledWindow;
961 1020
962our @ISA = CFClient::UI::HBox::; 1021our @ISA = CFPlus::UI::HBox::;
963 1022
964sub new { 1023sub new {
965 my ($class, %arg) = @_; 1024 my ($class, %arg) = @_;
966 1025
967 my $child = delete $arg{child}; 1026 my $child = delete $arg{child};
968 1027
969 my $self; 1028 my $self;
970 1029
971 my $slider = new CFClient::UI::Slider 1030 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1031 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1033 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1034 $self->{vp}->set_offset (0, $_[1]);
976 }, 1035 },
977 ; 1036 ;
978 1037
979 $self = $class->SUPER::new ( 1038 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1039 vp => (new CFPlus::UI::ViewPort expand => 1),
1040 can_events => 1,
981 slider => $slider, 1041 slider => $slider,
982 %arg, 1042 %arg,
983 ); 1043 );
984 1044
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1045 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1046 $self->add ($child) if $child;
987 1047
988 $self 1048 $self
989} 1049}
990 1050
1051#TODO# update range on size_allocate depending on child
1052
991sub add { 1053sub add {
992 my ($self, $widget) = @_; 1054 my ($self, $widget) = @_;
993 1055
994 $self->{vp}->add ($self->{child} = $widget); 1056 $self->{vp}->add ($self->{child} = $widget);
995} 1057}
996 1058
1059sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_;
1061
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $self->{slider}->emit (mouse_wheel => $ev);
1065
1066 1
1067}
1068
1069sub update_slider {
1070 my ($self) = @_;
1071
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1073}
1074
997sub update { 1075sub update {
998 my ($self) = @_; 1076 my ($self) = @_;
999 1077
1000 $self->SUPER::update; 1078 $self->SUPER::update;
1001 1079
1002 # todo: overwrite size_allocate of child 1080 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1081}
1006 1082
1007sub size_allocate { 1083sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1084 my ($self, $w, $h) = @_;
1009 1085
1086 $self->update_slider;
1087
1010 $self->SUPER::size_allocate ($w, $h); 1088 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1089}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1090
1019############################################################################# 1091#############################################################################
1020 1092
1021package CFClient::UI::Frame; 1093package CFPlus::UI::Frame;
1022 1094
1023our @ISA = CFClient::UI::Bin::; 1095our @ISA = CFPlus::UI::Bin::;
1024 1096
1025use CFClient::OpenGL; 1097use CFPlus::OpenGL;
1026 1098
1027sub new { 1099sub new {
1028 my $class = shift; 1100 my $class = shift;
1029 1101
1030 $class->SUPER::new ( 1102 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1128 $self->SUPER::_draw;
1057} 1129}
1058 1130
1059############################################################################# 1131#############################################################################
1060 1132
1061package CFClient::UI::FancyFrame; 1133package CFPlus::UI::FancyFrame;
1062 1134
1063our @ISA = CFClient::UI::Bin::; 1135our @ISA = CFPlus::UI::Bin::;
1064 1136
1065use CFClient::OpenGL; 1137use CFPlus::OpenGL;
1066 1138
1067my $bg = 1139my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1141 mipmap => 1, wrap => 1;
1070 1142
1071my @border = 1143my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1146
1075sub new { 1147sub new {
1076 my ($class, %arg) = @_; 1148 my ($class, %arg) = @_;
1077 1149
1078 my $self = $class->SUPER::new ( 1150 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1151 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1152 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1153 border => 0.6,
1082 can_events => 1, 1154 can_events => 1,
1083 min_w => 16, 1155 min_w => 64,
1084 min_h => 16, 1156 min_h => 32,
1085 %arg, 1157 %arg,
1086 ); 1158 );
1087 1159
1088 $self->{title_widget} = new CFClient::UI::Label 1160 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1161 align => 0,
1090 valign => 1, 1162 valign => 1,
1091 text => $self->{title}, 1163 text => $self->{title},
1092 fontsize => $self->{border}, 1164 fontsize => $self->{border},
1093 if exists $self->{title}; 1165 if exists $self->{title};
1094 1166
1167 if ($self->{has_close_button}) {
1168 $self->{close_button} =
1169 new CFPlus::UI::ImageButton
1170 path => 'x1_close.png',
1171 on_activate => sub { $self->emit ("delete") };
1172
1173 $self->CFPlus::UI::Container::add ($self->{close_button});
1174 }
1175
1095 $self 1176 $self
1096} 1177}
1097 1178
1098sub add { 1179sub add {
1099 my ($self, @widgets) = @_; 1180 my ($self, @widgets) = @_;
1100 1181
1101 $self->SUPER::add (@widgets); 1182 $self->SUPER::add (@widgets);
1183 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1184 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1185}
1104 1186
1105sub border { 1187sub border {
1106 int $_[0]{border} * $::FONTSIZE 1188 int $_[0]{border} * $::FONTSIZE
1107} 1189}
… …
1109sub size_request { 1191sub size_request {
1110 my ($self) = @_; 1192 my ($self) = @_;
1111 1193
1112 $self->{title_widget}->size_request 1194 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1195 if $self->{title_widget};
1196
1197 $self->{close_button}->size_request
1198 if $self->{close_button};
1114 1199
1115 my ($w, $h) = $self->SUPER::size_request; 1200 my ($w, $h) = $self->SUPER::size_request;
1116 1201
1117 ( 1202 (
1118 $w + $self->border * 2, 1203 $w + $self->border * 2,
1119 $h + $self->border * 2, 1204 $h + $self->border * 2,
1120 ) 1205 )
1121} 1206}
1122 1207
1123sub size_allocate { 1208sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1125 1210
1126 if ($self->{title_widget}) { 1211 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1212 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1213 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1214 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1215 }
1131 1216
1132 my $border = $self->border; 1217 my $border = $self->border;
1133 1218
1134 $h -= List::Util::max 0, $border * 2; 1219 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1220 $w -= List::Util::max 0, $border * 2;
1221
1222 $self->child->configure ($border, $border, $w, $h);
1223
1224 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1225 if $self->{close_button};
1226
1227 1
1228}
1229
1230sub invoke_delete {
1231 my ($self) = @_;
1232
1233 $self->hide;
1136 1234
1137 $self->child->configure ($border, $border, $w, $h); 1235 1
1138} 1236}
1139 1237
1140sub button_down { 1238sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1142 1240
1143 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1242 my $border = $self->border;
1145 1243
… …
1176 1274
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1275 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1276
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1277 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1278 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1279 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1280 };
1183 } else { 1281 } else {
1184 return 0; 1282 return 0;
1185 } 1283 }
1186 1284
1187 1 1285 1
1188} 1286}
1189 1287
1190sub button_up { 1288sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1289 my ($self, $ev, $x, $y) = @_;
1192 1290
1193 !!delete $self->{motion} 1291 ! ! delete $self->{motion}
1194} 1292}
1195 1293
1196sub mouse_motion { 1294sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1295 my ($self, $ev, $x, $y) = @_;
1198 1296
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1297 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1298
1201 !!$self->{motion} 1299 ! ! $self->{motion}
1300}
1301
1302sub invoke_visibility_change {
1303 my ($self, $visible) = @_;
1304
1305 delete $self->{motion} unless $visible;
1306
1307 0
1202} 1308}
1203 1309
1204sub _draw { 1310sub _draw {
1205 my ($self) = @_; 1311 my ($self) = @_;
1206 1312
… …
1235 $child->draw; 1341 $child->draw;
1236 1342
1237 if ($self->{title_widget}) { 1343 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1344 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1345 $self->{title_widget}->_draw;
1346
1347 glTranslate 0, - ($border - $self->{h});
1240 } 1348 }
1349
1350 $self->{close_button}->draw
1351 if $self->{close_button};
1241} 1352}
1242 1353
1243############################################################################# 1354#############################################################################
1244 1355
1245package CFClient::UI::Table; 1356package CFPlus::UI::Table;
1246 1357
1247our @ISA = CFClient::UI::Base::; 1358our @ISA = CFPlus::UI::Base::;
1248 1359
1249use List::Util qw(max sum); 1360use List::Util qw(max sum);
1250 1361
1251use CFClient::OpenGL; 1362use CFPlus::OpenGL;
1252 1363
1253sub new { 1364sub new {
1254 my $class = shift; 1365 my $class = shift;
1255 1366
1256 $class->SUPER::new ( 1367 $class->SUPER::new (
… …
1262sub children { 1373sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1375}
1265 1376
1266sub add { 1377sub add {
1267 my ($self, $x, $y, $child) = @_; 1378 my ($self) = shift;
1268 1379
1380 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1382 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1383 $self->{children}[$y][$x] = $child;
1384 }
1271 1385
1386 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1388 $self->realloc;
1273} 1389}
1274 1390
1275sub remove { 1391sub remove {
1276 my ($self, $child) = @_; 1392 my ($self, $child) = @_;
… …
1324 (sum @$ws), 1440 (sum @$ws),
1325 (sum @$hs), 1441 (sum @$hs),
1326 ) 1442 )
1327} 1443}
1328 1444
1329sub size_allocate { 1445sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1446 my ($self, $w, $h) = @_;
1331 1447
1332 my ($ws, $hs) = $self->get_wh; 1448 my ($ws, $hs) = $self->get_wh;
1333 1449
1334 my $req_w = (sum @$ws) || 1; 1450 my $req_w = (sum @$ws) || 1;
… …
1341 1457
1342 # linearly scale sizes 1458 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1461
1346 CFClient::UI::harmonize $ws; 1462 CFPlus::UI::harmonize $ws;
1347 CFClient::UI::harmonize $hs; 1463 CFPlus::UI::harmonize $hs;
1348 1464
1349 my $y; 1465 my $y;
1350 1466
1351 for my $r (0 .. $#{$self->{children}}) { 1467 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1468 my $row = $self->{children}[$r]
… …
1366 } 1482 }
1367 1483
1368 $y += $row_h; 1484 $y += $row_h;
1369 } 1485 }
1370 1486
1487 1
1371} 1488}
1372 1489
1373sub find_widget { 1490sub find_widget {
1374 my ($self, $x, $y) = @_; 1491 my ($self, $x, $y) = @_;
1375 1492
… …
1394 } 1511 }
1395} 1512}
1396 1513
1397############################################################################# 1514#############################################################################
1398 1515
1399package CFClient::UI::Box; 1516package CFPlus::UI::Box;
1400 1517
1401our @ISA = CFClient::UI::Container::; 1518our @ISA = CFPlus::UI::Container::;
1402 1519
1403sub size_request { 1520sub size_request {
1404 my ($self) = @_; 1521 my ($self) = @_;
1405 1522
1406 $self->{vertical} 1523 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1529 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1530 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1531 )
1415} 1532}
1416 1533
1417sub size_allocate { 1534sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1535 my ($self, $w, $h) = @_;
1419 1536
1420 my $space = $self->{vertical} ? $h : $w; 1537 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1538 my @children = $self->visible_children;
1422 1539
1423 my @req; 1540 my @req;
1424 1541
1425 if ($self->{homogeneous}) { 1542 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1543 @req = ($space / (@children || 1)) x @children;
1427 } else { 1544 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1545 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1546 my $req = List::Util::sum @req;
1430 1547
1431 if ($req > $space) { 1548 if ($req > $space) {
1432 # ah well, not enough space 1549 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1550 $_ *= $space / $req for @req;
1434 } else { 1551 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1552 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1553
1437 $space = ($space - $req) / $expand; # remaining space to give away 1554 $space = ($space - $req) / $expand; # remaining space to give away
1438 1555
1439 $req[$_] += $space * $children->[$_]{expand} 1556 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1557 for 0 .. $#children;
1441 } 1558 }
1442 } 1559 }
1443 1560
1444 CFClient::UI::harmonize \@req; 1561 CFPlus::UI::harmonize \@req;
1445 1562
1446 my $pos = 0; 1563 my $pos = 0;
1447 for (0 .. $#$children) { 1564 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1565 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1566 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1567
1451 $pos += $alloc; 1568 $pos += $alloc;
1452 } 1569 }
1453 1570
1454 1 1571 1
1455} 1572}
1456 1573
1457############################################################################# 1574#############################################################################
1458 1575
1459package CFClient::UI::HBox; 1576package CFPlus::UI::HBox;
1460 1577
1461our @ISA = CFClient::UI::Box::; 1578our @ISA = CFPlus::UI::Box::;
1462 1579
1463sub new { 1580sub new {
1464 my $class = shift; 1581 my $class = shift;
1465 1582
1466 $class->SUPER::new ( 1583 $class->SUPER::new (
… …
1469 ) 1586 )
1470} 1587}
1471 1588
1472############################################################################# 1589#############################################################################
1473 1590
1474package CFClient::UI::VBox; 1591package CFPlus::UI::VBox;
1475 1592
1476our @ISA = CFClient::UI::Box::; 1593our @ISA = CFPlus::UI::Box::;
1477 1594
1478sub new { 1595sub new {
1479 my $class = shift; 1596 my $class = shift;
1480 1597
1481 $class->SUPER::new ( 1598 $class->SUPER::new (
… …
1484 ) 1601 )
1485} 1602}
1486 1603
1487############################################################################# 1604#############################################################################
1488 1605
1489package CFClient::UI::Label; 1606package CFPlus::UI::Label;
1490 1607
1491our @ISA = CFClient::UI::DrawBG::; 1608our @ISA = CFPlus::UI::DrawBG::;
1492 1609
1493use CFClient::OpenGL; 1610use CFPlus::OpenGL;
1494 1611
1495sub new { 1612sub new {
1496 my ($class, %arg) = @_; 1613 my ($class, %arg) = @_;
1497 1614
1498 my $self = $class->SUPER::new ( 1615 my $self = $class->SUPER::new (
… …
1502 #font => default_font 1619 #font => default_font
1503 #text => initial text 1620 #text => initial text
1504 #markup => initial narkup 1621 #markup => initial narkup
1505 #max_w => maximum pixel width 1622 #max_w => maximum pixel width
1506 ellipsise => 3, # end 1623 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1624 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1625 fontsize => 1,
1509 align => -1, 1626 align => -1,
1510 valign => -1, 1627 valign => -1,
1511 padding_x => 2, 1628 padding_x => 2,
1512 padding_y => 2, 1629 padding_y => 2,
1513 can_events => 0, 1630 can_events => 0,
1514 %arg 1631 %arg
1515 ); 1632 );
1516 1633
1517 if (exists $self->{template}) { 1634 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1635 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1636 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1637 $self->{template} = $layout;
1521 } 1638 }
1522 1639
1523 if (exists $self->{markup}) { 1640 if (exists $self->{markup}) {
… …
1527 } 1644 }
1528 1645
1529 $self 1646 $self
1530} 1647}
1531 1648
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1649sub update {
1543 my ($self) = @_; 1650 my ($self) = @_;
1544 1651
1545 delete $self->{texture}; 1652 delete $self->{texture};
1546 $self->SUPER::update; 1653 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1664 my ($self, $text) = @_;
1558 1665
1559 return if $self->{text} eq "T$text"; 1666 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1667 $self->{text} = "T$text";
1561 1668
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1669 $self->{layout}->set_text ($text);
1564 1670
1565 delete $self->{size_req}; 1671 delete $self->{size_req};
1566 $self->realloc; 1672 $self->realloc;
1567 $self->update; 1673 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1679 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1680 $self->{text} = "M$markup";
1575 1681
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1682 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1683
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1684 $self->{layout}->set_markup ($markup);
1580 1685
1581 delete $self->{size_req}; 1686 delete $self->{size_req};
1582 $self->realloc; 1687 $self->realloc;
1583 $self->update; 1688 $self->update;
… …
1595 1700
1596 my ($w, $h) = $self->{layout}->size; 1701 my ($w, $h) = $self->{layout}->size;
1597 1702
1598 if (exists $self->{template}) { 1703 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1704 $self->{template}->set_font ($self->{font}) if $self->{font};
1705 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1707
1602 my ($w2, $h2) = $self->{template}->size; 1708 my ($w2, $h2) = $self->{template}->size;
1603 1709
1604 $w = List::Util::max $w, $w2; 1710 $w = List::Util::max $w, $w2;
… …
1609 }; 1715 };
1610 1716
1611 @{ $self->{size_req} } 1717 @{ $self->{size_req} }
1612} 1718}
1613 1719
1720sub baseline_shift {
1721 $_[0]{layout}->descent
1722}
1723
1614sub size_allocate { 1724sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1725 my ($self, $w, $h) = @_;
1616 1726
1617 delete $self->{ox}; 1727 delete $self->{ox};
1618 1728
1619 delete $self->{texture} 1729 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1730 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1731
1732 1
1621} 1733}
1622 1734
1623sub set_fontsize { 1735sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1736 my ($self, $fontsize) = @_;
1625 1737
1626 $self->{fontsize} = $fontsize; 1738 $self->{fontsize} = $fontsize;
1739 delete $self->{size_req};
1627 delete $self->{texture}; 1740 delete $self->{texture};
1628 1741
1629 $self->realloc; 1742 $self->realloc;
1630} 1743}
1631 1744
1632sub reconfigure { 1745sub reconfigure {
1633 my ($self) = @_; 1746 my ($self) = @_;
1634 1747
1635 delete $self->{size_req}; 1748 delete $self->{size_req};
1749 delete $self->{texture};
1636 1750
1637 $self->SUPER::reconfigure; 1751 $self->SUPER::reconfigure;
1638} 1752}
1639 1753
1640sub _draw { 1754sub _draw {
1641 my ($self) = @_; 1755 my ($self) = @_;
1642 1756
1643 $self->SUPER::_draw; # draw background, if applicable 1757 $self->SUPER::_draw; # draw background, if applicable
1644 1758
1645 my $tex = $self->{texture} ||= do { 1759 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1760 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1761 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1762 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1763 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1764 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1765 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1766
1653 new_from_layout CFClient::Texture $self->{layout} 1767 [$self->{layout}->size]
1654 }; 1768 };
1655 1769
1656 unless (exists $self->{ox}) { 1770 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1771 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1772 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1773 : ($self->{w} - $size->[0]) * 0.5);
1660 1774
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1775 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1776 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1777 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1778 };
1665 1779
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1780 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1781 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1782
1671 if ($tex->{format} == GL_ALPHA) { 1783 $self->{layout}->render ($self->{ox}, $self->{oy});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1784}
1682 1785
1683############################################################################# 1786#############################################################################
1684 1787
1685package CFClient::UI::EntryBase; 1788package CFPlus::UI::EntryBase;
1686 1789
1687our @ISA = CFClient::UI::Label::; 1790our @ISA = CFPlus::UI::Label::;
1688 1791
1689use CFClient::OpenGL; 1792use CFPlus::OpenGL;
1690 1793
1691sub new { 1794sub new {
1692 my $class = shift; 1795 my $class = shift;
1693 1796
1694 $class->SUPER::new ( 1797 $class->SUPER::new (
… …
1718 1821
1719 $text =~ s/./*/g if $self->{hidden}; 1822 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1823 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1824 delete $self->{size_req};
1722 1825
1723 $self->_emit (changed => $self->{text}); 1826 $self->emit (changed => $self->{text});
1724 1827
1725 $self->realloc; 1828 $self->realloc;
1726 $self->update; 1829 $self->update;
1727} 1830}
1728 1831
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1846 my ($w, $h) = $self->SUPER::size_request;
1744 1847
1745 ($w + 1, $h) # add 1 for cursor 1848 ($w + 1, $h) # add 1 for cursor
1746} 1849}
1747 1850
1748sub key_down { 1851sub invoke_key_down {
1749 my ($self, $ev) = @_; 1852 my ($self, $ev) = @_;
1750 1853
1751 my $mod = $ev->{mod}; 1854 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1855 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1856 my $uni = $ev->{unicode};
… …
1756 1859
1757 if ($uni == 8) { 1860 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 1862 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 1863 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 1864 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 1865 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 1866 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1867 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1868 } elsif ($sym == CFPlus::SDLK_HOME) {
1766 $self->{cursor} = 0; 1869 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1870 } elsif ($sym == CFPlus::SDLK_END) {
1768 $self->{cursor} = length $text; 1871 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1872 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1873 $self->emit ('escape');
1771 } elsif ($uni) { 1874 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1875 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1876 } else {
1774 return 0; 1877 return 0;
1775 } 1878 }
… …
1779 $self->realloc; 1882 $self->realloc;
1780 1883
1781 1 1884 1
1782} 1885}
1783 1886
1784sub focus_in { 1887sub invoke_focus_in {
1785 my ($self) = @_; 1888 my ($self) = @_;
1786 1889
1787 $self->{last_activity} = $::NOW; 1890 $self->{last_activity} = $::NOW;
1788 1891
1789 $self->SUPER::focus_in; 1892 $self->SUPER::invoke_focus_in
1790} 1893}
1791 1894
1792sub button_down { 1895sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1896 my ($self, $ev, $x, $y) = @_;
1794 1897
1795 $self->SUPER::button_down ($ev, $x, $y); 1898 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1899
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1900 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1901
1799 # byte-index to char-index 1902 # byte-index to char-index
1800 my $text = $self->{text}; 1903 my $text = $self->{text};
1801 utf8::encode $text; 1904 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 1905 $self->{cursor} = length $text;
1803 1906
1804 $self->_set_text ($self->{text}); 1907 $self->_set_text ($self->{text});
1805 $self->update; 1908 $self->update;
1806 1909
1807 1 1910 1
1808} 1911}
1809 1912
1810sub mouse_motion { 1913sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1914 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1915# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 1916
1814 0 1917 1
1815} 1918}
1816 1919
1817sub _draw { 1920sub _draw {
1818 my ($self) = @_; 1921 my ($self) = @_;
1819 1922
… …
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 1958 glEnd;
1856 } 1959 }
1857} 1960}
1858 1961
1859package CFClient::UI::Entry; 1962package CFPlus::UI::Entry;
1860 1963
1861our @ISA = CFClient::UI::EntryBase::; 1964our @ISA = CFPlus::UI::EntryBase::;
1862 1965
1863use CFClient::OpenGL; 1966use CFPlus::OpenGL;
1864 1967
1865sub key_down { 1968sub invoke_key_down {
1866 my ($self, $ev) = @_; 1969 my ($self, $ev) = @_;
1867 1970
1868 my $sym = $ev->{sym}; 1971 my $sym = $ev->{sym};
1869 1972
1870 if ($sym == 13) { 1973 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1974 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1975 my $txt = $self->get_text;
1976
1873 $self->{history_pointer} = -1; 1977 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1978 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1979 $self->emit (activate => $txt);
1876 $self->update; 1980 $self->update;
1877 1981
1878 } elsif ($sym == CFClient::SDLK_UP) { 1982 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1983 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1984 $self->{history_saveback} = $self->get_text;
1881 } 1985 }
1882 if (@{$self->{history} || []} > 0) { 1986 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 1987 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 1989 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 1990 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1991 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 1992 }
1889 1993
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 1994 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 1995 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1996 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 1997
1894 if ($self->{history_pointer} >= 0) { 1998 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1999 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2000 } else {
1897 $self->set_text ($self->{history_saveback}); 2001 $self->set_text ($self->{history_saveback});
1898 } 2002 }
1899 2003
1900 } else { 2004 } else {
1901 return $self->SUPER::key_down ($ev) 2005 return $self->SUPER::invoke_key_down ($ev)
1902 } 2006 }
1903 2007
1904 1 2008 1
1905} 2009}
1906 2010
1907############################################################################# 2011#############################################################################
1908 2012
1909package CFClient::UI::Button; 2013package CFPlus::UI::Button;
1910 2014
1911our @ISA = CFClient::UI::Label::; 2015our @ISA = CFPlus::UI::Label::;
1912 2016
1913use CFClient::OpenGL; 2017use CFPlus::OpenGL;
1914 2018
1915my @tex = 2019my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2021 qw(b1_button_active.png);
1918 2022
1919sub new { 2023sub new {
1920 my $class = shift; 2024 my $class = shift;
1921 2025
… …
1930 can_events => 1, 2034 can_events => 1,
1931 @_ 2035 @_
1932 ) 2036 )
1933} 2037}
1934 2038
1935sub activate { }
1936
1937sub button_up { 2039sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1939 2041
1940 $self->emit ("activate") 2042 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2043 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2044 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2062 $self->SUPER::_draw;
1961} 2063}
1962 2064
1963############################################################################# 2065#############################################################################
1964 2066
1965package CFClient::UI::CheckBox; 2067package CFPlus::UI::CheckBox;
1966 2068
1967our @ISA = CFClient::UI::DrawBG::; 2069our @ISA = CFPlus::UI::DrawBG::;
1968 2070
1969my @tex = 2071my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2073 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2074
1973use CFClient::OpenGL; 2075use CFPlus::OpenGL;
1974 2076
1975sub new { 2077sub new {
1976 my $class = shift; 2078 my $class = shift;
1977 2079
1978 $class->SUPER::new ( 2080 $class->SUPER::new (
… …
1992 my ($self) = @_; 2094 my ($self) = @_;
1993 2095
1994 (6) x 2 2096 (6) x 2
1995} 2097}
1996 2098
2099sub toggle {
2100 my ($self) = @_;
2101
2102 $self->{state} = !$self->{state};
2103 $self->emit (changed => $self->{state});
2104 $self->update;
2105}
2106
1997sub button_down { 2107sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2108 my ($self, $ev, $x, $y) = @_;
1999 2109
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2110 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2111 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2112 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2113 } else {
2005 return 0 2114 return 0
2006 } 2115 }
2007 2116
2008 1 2117 1
… …
2028 glDisable GL_TEXTURE_2D; 2137 glDisable GL_TEXTURE_2D;
2029} 2138}
2030 2139
2031############################################################################# 2140#############################################################################
2032 2141
2033package CFClient::UI::Image; 2142package CFPlus::UI::Image;
2034 2143
2035our @ISA = CFClient::UI::Base::; 2144our @ISA = CFPlus::UI::Base::;
2036 2145
2037use CFClient::OpenGL; 2146use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2147
2040our %loaded_images; 2148our %texture_cache;
2041 2149
2042sub new { 2150sub new {
2043 my $class = shift; 2151 my $class = shift;
2044 2152
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2153 my $self = $class->SUPER::new (
2154 can_events => 0,
2155 @_,
2156 );
2046 2157
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2158 $self->{path} || $self->{tex}
2159 or Carp::croak "'path' or 'tex' attributes required";
2048 2160
2049 $loaded_images{$self->{image}} ||= 2161 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2163
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2164 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2165
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2167
2058 $self 2168 $self
2059} 2169}
2060 2170
2171sub STORABLE_freeze {
2172 my ($self, $cloning) = @_;
2173
2174 $self->{path}
2175 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2176
2177 $self->{path}
2178}
2179
2180sub STORABLE_attach {
2181 my ($self, $cloning, $path) = @_;
2182
2183 $self->new (path => $path)
2184}
2185
2061sub size_request { 2186sub size_request {
2062 my ($self) = @_; 2187 my ($self) = @_;
2063 2188
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2065} 2190}
2066 2191
2067sub _draw { 2192sub _draw {
2068 my ($self) = @_; 2193 my ($self) = @_;
2069 2194
… …
2079 } 2204 }
2080 2205
2081 glEnable GL_TEXTURE_2D; 2206 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2208
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2209 $tex->draw_quad (0, 0, $w, $h);
2085 2210
2086 glDisable GL_TEXTURE_2D; 2211 glDisable GL_TEXTURE_2D;
2087} 2212}
2088 2213
2089############################################################################# 2214#############################################################################
2090 2215
2216package CFPlus::UI::ImageButton;
2217
2218our @ISA = CFPlus::UI::Image::;
2219
2220use CFPlus::OpenGL;
2221
2222my %textures;
2223
2224sub new {
2225 my $class = shift;
2226
2227 my $self = $class->SUPER::new (
2228 padding_x => 4,
2229 padding_y => 4,
2230 fg => [1, 1, 1],
2231 active_fg => [0, 0, 1],
2232 can_hover => 1,
2233 align => 0,
2234 valign => 0,
2235 can_events => 1,
2236 @_
2237 );
2238}
2239
2240sub invoke_button_up {
2241 my ($self, $ev, $x, $y) = @_;
2242
2243 $self->emit ("activate")
2244 if $x >= 0 && $x < $self->{w}
2245 && $y >= 0 && $y < $self->{h};
2246
2247 1
2248}
2249
2250#############################################################################
2251
2091package CFClient::UI::VGauge; 2252package CFPlus::UI::VGauge;
2092 2253
2093our @ISA = CFClient::UI::Base::; 2254our @ISA = CFPlus::UI::Base::;
2094 2255
2095use List::Util qw(min max); 2256use List::Util qw(min max);
2096 2257
2097use CFClient::OpenGL; 2258use CFPlus::OpenGL;
2098 2259
2099my %tex = ( 2260my %tex = (
2100 food => [ 2261 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2262 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2263 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2264 ],
2104 grace => [ 2265 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2266 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2267 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2268 ],
2108 hp => [ 2269 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2270 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2271 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2272 ],
2112 mana => [ 2273 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2274 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2275 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2276 ],
2116); 2277);
2117 2278
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2279# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2339 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2340 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2341
2181 my $h1 = $self->{h} * (1 - $ycut1); 2342 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2343 my $h2 = $self->{h} * (1 - $ycut2);
2344 my $h3 = $self->{h};
2345
2346 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2347
2184 glEnable GL_BLEND; 2348 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2349 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2350 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2351 glEnable GL_TEXTURE_2D;
… …
2206 2370
2207 if ($t3) { 2371 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2372 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2373 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2374 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2375 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2376 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2377 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2378 glEnd;
2215 } 2379 }
2216 2380
2217 glDisable GL_BLEND; 2381 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2382 glDisable GL_TEXTURE_2D;
2219} 2383}
2220 2384
2221############################################################################# 2385#############################################################################
2222 2386
2223package CFClient::UI::Gauge; 2387package CFPlus::UI::Gauge;
2224 2388
2225our @ISA = CFClient::UI::VBox::; 2389our @ISA = CFPlus::UI::VBox::;
2226 2390
2227sub new { 2391sub new {
2228 my ($class, %arg) = @_; 2392 my ($class, %arg) = @_;
2229 2393
2230 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2396 can_hover => 1,
2233 can_events => 1, 2397 can_events => 1,
2234 %arg, 2398 %arg,
2235 ); 2399 );
2236 2400
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2401 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2402 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2403 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2404
2241 $self 2405 $self
2242} 2406}
2243 2407
2244sub set_fontsize { 2408sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2429 $self->{value}->set_text ($val);
2266} 2430}
2267 2431
2268############################################################################# 2432#############################################################################
2269 2433
2270package CFClient::UI::Slider; 2434package CFPlus::UI::Slider;
2271 2435
2272use strict; 2436use strict;
2273 2437
2274use CFClient::OpenGL; 2438use CFPlus::OpenGL;
2275 2439
2276our @ISA = CFClient::UI::DrawBG::; 2440our @ISA = CFPlus::UI::DrawBG::;
2277 2441
2278my @tex = 2442my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2444 qw(s1_slider.png s1_slider_bg.png);
2281 2445
2282sub new { 2446sub new {
2283 my $class = shift; 2447 my $class = shift;
2284 2448
… …
2305 $self->update; 2469 $self->update;
2306 2470
2307 $self 2471 $self
2308} 2472}
2309 2473
2310sub changed { }
2311
2312sub set_range { 2474sub set_range {
2313 my ($self, $range) = @_; 2475 my ($self, $range) = @_;
2314 2476
2315 ($range, $self->{range}) = ($self->{range}, $range); 2477 ($range, $self->{range}) = ($self->{range}, $range);
2316 2478
… …
2336 if $unit; 2498 if $unit;
2337 2499
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2500 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2501
2340 if ($value != $old_value) { 2502 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2503 $self->emit (changed => $value);
2342 $self->update; 2504 $self->update;
2343 } 2505 }
2344} 2506}
2345 2507
2346sub size_request { 2508sub size_request {
2347 my ($self) = @_; 2509 my ($self) = @_;
2348 2510
2349 ($self->{req_w}, $self->{req_h}) 2511 ($self->{req_w}, $self->{req_h})
2350} 2512}
2351 2513
2352sub button_down { 2514sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2515 my ($self, $ev, $x, $y) = @_;
2354 2516
2355 $self->SUPER::button_down ($ev, $x, $y); 2517 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2518
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2519 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2520
2359 $self->mouse_motion ($ev, $x, $y) 2521 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2522}
2361 2523
2362sub mouse_motion { 2524sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2525 my ($self, $ev, $x, $y) = @_;
2364 2526
2365 if ($GRAB == $self) { 2527 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2528 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2529
… …
2373 } else { 2535 } else {
2374 return 0; 2536 return 0;
2375 } 2537 }
2376 2538
2377 1 2539 1
2540}
2541
2542sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_;
2544
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2548
2549 ! ! $delta
2378} 2550}
2379 2551
2380sub update { 2552sub update {
2381 my ($self) = @_; 2553 my ($self) = @_;
2382 2554
… …
2431 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2432} 2604}
2433 2605
2434############################################################################# 2606#############################################################################
2435 2607
2436package CFClient::UI::ValSlider; 2608package CFPlus::UI::ValSlider;
2437 2609
2438our @ISA = CFClient::UI::HBox::; 2610our @ISA = CFPlus::UI::HBox::;
2439 2611
2440sub new { 2612sub new {
2441 my ($class, %arg) = @_; 2613 my ($class, %arg) = @_;
2442 2614
2443 my $range = delete $arg{range}; 2615 my $range = delete $arg{range};
2444 2616
2445 my $self = $class->SUPER::new ( 2617 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2618 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2619 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2620 to_value => sub { shift },
2449 from_value => sub { shift }, 2621 from_value => sub { shift },
2450 %arg, 2622 %arg,
2451 ); 2623 );
2452 2624
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2644sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2645sub set_value { shift->{slider}->set_value (@_) }
2474 2646
2475############################################################################# 2647#############################################################################
2476 2648
2477package CFClient::UI::TextScroller; 2649package CFPlus::UI::TextScroller;
2478 2650
2479our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFPlus::UI::HBox::;
2480 2652
2481use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2482 2654
2483sub new { 2655sub new {
2484 my $class = shift; 2656 my $class = shift;
2485 2657
2486 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2487 fontsize => 1, 2659 fontsize => 1,
2488 can_events => 0, 2660 can_events => 1,
2489 indent => 0, 2661 indent => 0,
2490 #font => default_font 2662 #font => default_font
2491 @_, 2663 @_,
2492 2664
2493 layout => (new CFClient::Layout 1), 2665 layout => (new CFPlus::Layout),
2494 par => [], 2666 par => [],
2495 height => 0, 2667 height => 0,
2496 children => [ 2668 children => [
2497 (new CFClient::UI::Empty expand => 1), 2669 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2670 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2671 ],
2500 ); 2672 );
2501 2673
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2674 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2675
… …
2509 2681
2510 $self->{fontsize} = $fontsize; 2682 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2683 $self->reflow;
2512} 2684}
2513 2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 my ($empty, $slider) = @{ $self->{children} };
2690
2691 local $self->{children} = [$empty, $slider];
2692 $self->SUPER::size_request
2693}
2694
2514sub size_allocate { 2695sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2696 my ($self, $w, $h) = @_;
2516 2697
2517 $self->SUPER::size_allocate ($w, $h); 2698 my ($empty, $slider, @other) = @{ $self->{children} };
2699 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2700
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2701 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2702 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2703 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2704 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2705
2524 $self->reflow; 2706 $self->reflow;
2525}
2526 2707
2527sub text_size { 2708 local $self->{children} = [$empty, $slider];
2709 $self->SUPER::invoke_size_allocate ($w, $h)
2710}
2711
2712sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 2713 my ($self, $ev) = @_;
2714
2715 return 0 unless $ev->{dy}; # only vertical movements
2716
2717 $self->{children}[1]->emit (mouse_wheel => $ev);
2718
2719 1
2720}
2721
2722sub get_layout {
2723 my ($self, $para) = @_;
2529 2724
2530 my $layout = $self->{layout}; 2725 my $layout = $self->{layout};
2531 2726
2727 $layout->set_font ($self->{font}) if $self->{font};
2728 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2729 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2730 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2731 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2732 $layout->set_markup ($para->{markup});
2733
2734 $layout->set_shapes (
2735 map
2736 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2737 @{$para->{widget}}
2536 2738 );
2739
2537 $layout->size 2740 $layout
2538} 2741}
2539 2742
2540sub reflow { 2743sub reflow {
2541 my ($self) = @_; 2744 my ($self) = @_;
2542 2745
… …
2551 $self->{children}[1]->set_value ($offset); 2754 $self->{children}[1]->set_value ($offset);
2552} 2755}
2553 2756
2554sub clear { 2757sub clear {
2555 my ($self) = @_; 2758 my ($self) = @_;
2759
2760 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other;
2556 2762
2557 $self->{par} = []; 2763 $self->{par} = [];
2558 $self->{height} = 0; 2764 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2765 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2766}
2561 2767
2562sub add_paragraph { 2768sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2769 my $self = shift;
2564 2770
2565 for my $line (split /\n/, $text) { 2771 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 2772 $para = {
2567 $self->{height} += $h; 2773 fg => [1, 1, 1, 1],
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2774 indent => 0,
2569 } 2775 markup => "",
2776 widget => [],
2777 ref $para ? %$para : (markup => $para),
2778 w => 1e10,
2779 wrapped => 1,
2780 };
2570 2781
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para;
2784 }
2785
2786 $self->{need_reflow}++;
2787 $self->update;
2788}
2789
2790sub scroll_to_bottom {
2791 my ($self) = @_;
2792
2793 $self->{scroll_to_bottom} = 1;
2794 $self->update;
2572} 2795}
2573 2796
2574sub update { 2797sub update {
2575 my ($self) = @_; 2798 my ($self) = @_;
2576 2799
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2808
2586 if (delete $self->{need_reflow}) { 2809 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2810 my $height = 0;
2588 2811
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2812 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2814 my $layout = $self->get_layout ($para);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size; 2815 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2816
2600 $_->[1] = $h; 2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2601 } 2820 }
2602 2821
2603 $height += $_->[1]; 2822 $height += $para->{h};
2604 } 2823 }
2605 2824
2606 $self->{height} = $height; 2825 $self->{height} = $height;
2607 2826
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2609 2828
2610 delete $self->{texture}; 2829 delete $self->{texture};
2611 } 2830 }
2612 2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2837 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2838 glClear GL_COLOR_BUFFER_BIT;
2616 2839
2617 my $top = int $self->{children}[1]{range}[0]; 2840 my $top = int $self->{children}[1]{range}[0];
2618 2841
2619 my $y0 = $top; 2842 my $y0 = $top;
2620 my $y1 = $top + $H; 2843 my $y1 = $top + $H;
2621 2844
2622 my $y = 0; 2845 my $y = 0;
2623 2846
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 2847 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2848 my $h = $para->{h};
2634 2849
2635 if ($y0 < $y + $h && $y < $y1) { 2850 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] });
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2851
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2852 my $layout = $self->get_layout ($para);
2642 2853
2643 glRasterPos $par->[3], $y - $y0; 2854 $layout->render ($para->{indent}, $y - $y0);
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2855
2856 if (my @w = @{ $para->{widget} }) {
2857 my @s = $layout->get_shapes;
2858
2859 for (@w) {
2860 my ($dx, $dy) = splice @s, 0, 2, ();
2861
2862 $_->{x} = $dx + $para->{indent};
2863 $_->{y} = $dy + $y - $y0;
2864
2865 $_->draw;
2866 }
2867 }
2645 } 2868 }
2646 2869
2647 $y += $h; 2870 $y += $h;
2648 } 2871 }
2649
2650 glDisable GL_BLEND;
2651 }; 2872 };
2652 }); 2873 });
2874}
2875
2876sub reconfigure {
2877 my ($self) = @_;
2878
2879 $self->SUPER::reconfigure;
2880
2881 $_->{w} = 1e10 for @{ $self->{par} };
2882 $self->reflow;
2653} 2883}
2654 2884
2655sub _draw { 2885sub _draw {
2656 my ($self) = @_; 2886 my ($self) = @_;
2657 2887
… …
2660 glColor 0, 0, 0, 1; 2890 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2891 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 2892 glDisable GL_TEXTURE_2D;
2663 2893
2664 $self->{children}[1]->draw; 2894 $self->{children}[1]->draw;
2665
2666} 2895}
2667 2896
2668############################################################################# 2897#############################################################################
2669 2898
2670package CFClient::UI::Animator; 2899package CFPlus::UI::Animator;
2671 2900
2672use CFClient::OpenGL; 2901use CFPlus::OpenGL;
2673 2902
2674our @ISA = CFClient::UI::Bin::; 2903our @ISA = CFPlus::UI::Bin::;
2675 2904
2676sub moveto { 2905sub moveto {
2677 my ($self, $x, $y) = @_; 2906 my ($self, $x, $y) = @_;
2678 2907
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 2936 glPopMatrix;
2708} 2937}
2709 2938
2710############################################################################# 2939#############################################################################
2711 2940
2712package CFClient::UI::Flopper; 2941package CFPlus::UI::Flopper;
2713 2942
2714our @ISA = CFClient::UI::Button::; 2943our @ISA = CFPlus::UI::Button::;
2715 2944
2716sub new { 2945sub new {
2717 my $class = shift; 2946 my $class = shift;
2718 2947
2719 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 2960 $self->{other}->toggle_visibility;
2732} 2961}
2733 2962
2734############################################################################# 2963#############################################################################
2735 2964
2736package CFClient::UI::Tooltip; 2965package CFPlus::UI::Tooltip;
2737 2966
2738our @ISA = CFClient::UI::Bin::; 2967our @ISA = CFPlus::UI::Bin::;
2739 2968
2740use CFClient::OpenGL; 2969use CFPlus::OpenGL;
2741 2970
2742sub new { 2971sub new {
2743 my $class = shift; 2972 my $class = shift;
2744 2973
2745 $class->SUPER::new ( 2974 $class->SUPER::new (
… …
2748 ) 2977 )
2749} 2978}
2750 2979
2751sub set_tooltip_from { 2980sub set_tooltip_from {
2752 my ($self, $widget) = @_; 2981 my ($self, $widget) = @_;
2982
2983 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/;
2753 2985
2754 my $tooltip = $widget->{tooltip}; 2986 my $tooltip = $widget->{tooltip};
2755 2987
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 2988 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 2989 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 2993 }
2762 2994
2763 $tooltip =~ s/^\n+//; 2995 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 2996 $tooltip =~ s/\n+$//;
2765 2997
2766 $self->add (new CFClient::UI::Label 2998 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 2999 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3001 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3002 fg => [0, 0, 0, 1],
2771 ellipsise => 0, 3003 ellipsise => 0,
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3011 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3012
2781 ($w + 4, $h + 4) 3013 ($w + 4, $h + 4)
2782} 3014}
2783 3015
2784sub size_allocate { 3016sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3017 my ($self, $w, $h) = @_;
2786 3018
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3019 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3020}
2789 3021
2790sub visibility_change { 3022sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3023 my ($self, $visible) = @_;
2792 3024
2793 return unless $visible; 3025 return unless $visible;
2794 3026
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3027 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3028 my $widget = $self->{owner}
2797 or return; 3029 or return;
2798 3030
3031 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3032 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3033
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3034 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3035 if $x + $self->{w} > $self->{root}{w};
2803 3036
2804 $self->move_abs ($x, $y); 3037 $self->move_abs ($x, $y);
3038 } else {
3039 $self->hide;
3040 }
2805 }); 3041 });
2806} 3042}
2807 3043
2808sub _draw { 3044sub _draw {
2809 my ($self) = @_; 3045 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3069 $self->SUPER::_draw;
2834} 3070}
2835 3071
2836############################################################################# 3072#############################################################################
2837 3073
2838package CFClient::UI::Face; 3074package CFPlus::UI::Face;
2839 3075
2840our @ISA = CFClient::UI::Base::; 3076our @ISA = CFPlus::UI::DrawBG::;
2841 3077
2842use CFClient::OpenGL; 3078use CFPlus::OpenGL;
2843 3079
2844sub new { 3080sub new {
2845 my $class = shift; 3081 my $class = shift;
2846 3082
2847 my $self = $class->SUPER::new ( 3083 my $self = $class->SUPER::new (
… …
2882sub _draw { 3118sub _draw {
2883 my ($self) = @_; 3119 my ($self) = @_;
2884 3120
2885 return unless $::CONN; 3121 return unless $::CONN;
2886 3122
3123 $self->SUPER::_draw;
3124
2887 my $face; 3125 my $face;
2888 3126
2889 if ($self->{frame}) { 3127 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3128 my $anim = $::CONN->{anim}[$self->{anim}];
2891 3129
… …
2913 $self->SUPER::destroy; 3151 $self->SUPER::destroy;
2914} 3152}
2915 3153
2916############################################################################# 3154#############################################################################
2917 3155
2918package CFClient::UI::Buttonbar; 3156package CFPlus::UI::Buttonbar;
2919 3157
2920our @ISA = CFClient::UI::HBox::; 3158our @ISA = CFPlus::UI::HBox::;
2921 3159
2922# TODO: should actualyl wrap buttons and other goodies. 3160# TODO: should actualyl wrap buttons and other goodies.
2923 3161
2924############################################################################# 3162#############################################################################
2925 3163
2926package CFClient::UI::Menu; 3164package CFPlus::UI::Menu;
2927 3165
2928our @ISA = CFClient::UI::FancyFrame::; 3166our @ISA = CFPlus::UI::FancyFrame::;
2929 3167
2930use CFClient::OpenGL; 3168use CFPlus::OpenGL;
2931 3169
2932sub new { 3170sub new {
2933 my $class = shift; 3171 my $class = shift;
2934 3172
2935 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2936 items => [], 3174 items => [],
2937 z => 100, 3175 z => 100,
2938 @_, 3176 @_,
2939 ); 3177 );
2940 3178
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3179 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3180
2943 for my $item (@{ $self->{items} }) { 3181 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3182 my ($widget, $cb, $tooltip) = @$item;
2945 3183
2946 # handle various types of items, only text for now 3184 # handle various types of items, only text for now
2947 if (!ref $widget) { 3185 if (!ref $widget) {
3186 if ($widget =~ /\t/) {
3187 my ($left, $right) = split /\t/, $widget, 2;
3188
2948 $widget = new CFClient::UI::Label 3189 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3190 can_hover => 1,
2950 can_events => 1, 3191 can_events => 1,
3192 tooltip => $tooltip,
3193 children => [
3194 (new CFPlus::UI::Label markup => $left, expand => 1),
3195 (new CFPlus::UI::Label markup => $right, align => +1),
3196 ],
3197 ;
3198
3199 } else {
3200 $widget = new CFPlus::UI::Label
3201 can_hover => 1,
3202 can_events => 1,
2951 markup => $widget, 3203 markup => $widget,
2952 tooltip => $tooltip 3204 tooltip => $tooltip;
3205 }
2953 } 3206 }
2954 3207
2955 $self->{item}{$widget} = $item; 3208 $self->{item}{$widget} = $item;
2956 3209
2957 $self->{vbox}->add ($widget); 3210 $self->{vbox}->add ($widget);
… …
2962 3215
2963# popup given the event (must be a mouse button down event currently) 3216# popup given the event (must be a mouse button down event currently)
2964sub popup { 3217sub popup {
2965 my ($self, $ev) = @_; 3218 my ($self, $ev) = @_;
2966 3219
2967 $self->_emit ("popdown"); 3220 $self->emit ("popdown");
2968 3221
2969 # maybe save $GRAB? must be careful about events... 3222 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3223 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3224 $self->{button} = $ev->{button};
2972 3225
2973 $self->show; 3226 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3227 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3228}
2976 3229
2977sub mouse_motion { 3230sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3231 my ($self, $ev, $x, $y) = @_;
2979 3232
2980 # TODO: should use vbox->find_widget or so 3233 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3234 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3235 $self->{hover} = $self->{item}{$HOVER};
2983 3236
2984 0 3237 0
2985} 3238}
2986 3239
2987sub button_up { 3240sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3241 my ($self, $ev, $x, $y) = @_;
2989 3242
2990 if ($ev->{button} == $self->{button}) { 3243 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3244 undef $GRAB;
2992 $self->hide; 3245 $self->hide;
2993 3246
2994 $self->_emit ("popdown"); 3247 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3248 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3249 } else {
2997 return 0 3250 return 0
2998 } 3251 }
2999 3252
3000 1 3253 1
3001} 3254}
3002 3255
3003############################################################################# 3256#############################################################################
3004 3257
3005package CFClient::UI::Multiplexer; 3258package CFPlus::UI::Multiplexer;
3006 3259
3007our @ISA = CFClient::UI::Container::; 3260our @ISA = CFPlus::UI::Container::;
3008 3261
3009sub new { 3262sub new {
3010 my $class = shift; 3263 my $class = shift;
3011 3264
3012 my $self = $class->SUPER::new ( 3265 my $self = $class->SUPER::new (
… …
3026 3279
3027 $self->{current} = $self->{children}[0] 3280 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3281 if @{ $self->{children} };
3029} 3282}
3030 3283
3284sub get_current_page {
3285 my ($self) = @_;
3286
3287 $self->{current}
3288}
3289
3031sub set_current_page { 3290sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3291 my ($self, $page_or_widget) = @_;
3033 3292
3034 my $widget = ref $page_or_widget 3293 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3294 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3295 : $self->{children}[$page_or_widget];
3037 3296
3038 $self->{current} = $widget; 3297 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3298 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3299
3041 $self->_emit (page_changed => $self->{current}); 3300 $self->emit (page_changed => $self->{current});
3042 3301
3043 $self->realloc; 3302 $self->realloc;
3044} 3303}
3045 3304
3046sub visible_children { 3305sub visible_children {
… …
3051 my ($self) = @_; 3310 my ($self) = @_;
3052 3311
3053 $self->{current}->size_request 3312 $self->{current}->size_request
3054} 3313}
3055 3314
3056sub size_allocate { 3315sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3316 my ($self, $w, $h) = @_;
3058 3317
3059 $self->{current}->configure (0, 0, $w, $h); 3318 $self->{current}->configure (0, 0, $w, $h);
3319
3320 1
3060} 3321}
3061 3322
3062sub _draw { 3323sub _draw {
3063 my ($self) = @_; 3324 my ($self) = @_;
3064 3325
3065 $self->{current}->draw; 3326 $self->{current}->draw;
3066} 3327}
3067 3328
3068############################################################################# 3329#############################################################################
3069 3330
3070package CFClient::UI::Notebook; 3331package CFPlus::UI::Notebook;
3071 3332
3072our @ISA = CFClient::UI::VBox::; 3333our @ISA = CFPlus::UI::VBox::;
3073 3334
3074sub new { 3335sub new {
3075 my $class = shift; 3336 my $class = shift;
3076 3337
3077 my $self = $class->SUPER::new ( 3338 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3339 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3340 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3341 # filter => # will be put between multiplexer and $self
3081 @_, 3342 @_,
3082 ); 3343 );
3083 3344
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3345 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3090sub add { 3351sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3352 my ($self, $title, $widget, $tooltip) = @_;
3092 3353
3093 Scalar::Util::weaken $self; 3354 Scalar::Util::weaken $self;
3094 3355
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3356 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3357 markup => $title,
3097 tooltip => $tooltip, 3358 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3359 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3360 );
3100 3361
3101 $self->{multiplexer}->add ($widget); 3362 $self->{multiplexer}->add ($widget);
3102} 3363}
3103 3364
3365sub get_current_page {
3366 my ($self) = @_;
3367
3368 $self->{multiplexer}->get_current_page
3369}
3370
3104sub set_current_page { 3371sub set_current_page {
3105 my ($self, $page) = @_; 3372 my ($self, $page) = @_;
3106 3373
3107 $self->{multiplexer}->set_current_page ($page); 3374 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3375 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3376}
3110 3377
3111############################################################################# 3378#############################################################################
3112 3379
3113package CFClient::UI::Combobox; 3380package CFPlus::UI::Selector;
3114 3381
3115use utf8; 3382use utf8;
3116 3383
3117our @ISA = CFClient::UI::Button::; 3384our @ISA = CFPlus::UI::Button::;
3118 3385
3119sub new { 3386sub new {
3120 my $class = shift; 3387 my $class = shift;
3121 3388
3122 my $self = $class->SUPER::new ( 3389 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3395 $self->_set_value ($self->{value});
3129 3396
3130 $self 3397 $self
3131} 3398}
3132 3399
3133sub button_down { 3400sub invoke_button_down {
3134 my ($self, $ev) = @_; 3401 my ($self, $ev) = @_;
3135 3402
3136 my @menu_items; 3403 my @menu_items;
3137 3404
3138 for (@{ $self->{options} }) { 3405 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3406 my ($value, $title, $tooltip) = @$_;
3140 3407
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3408 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3409 }
3143 3410
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3411 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3412}
3146 3413
3147sub _set_value { 3414sub _set_value {
3148 my ($self, $value) = @_; 3415 my ($self, $value) = @_;
3149 3416
… …
3159 my ($self, $value) = @_; 3426 my ($self, $value) = @_;
3160 3427
3161 return unless $self->{value} ne $value; 3428 return unless $self->{value} ne $value;
3162 3429
3163 $self->_set_value ($value); 3430 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3431 $self->emit (changed => $value);
3165} 3432}
3166 3433
3167############################################################################# 3434#############################################################################
3168 3435
3169package CFClient::UI::Statusbox; 3436package CFPlus::UI::Statusbox;
3170 3437
3171our @ISA = CFClient::UI::VBox::; 3438our @ISA = CFPlus::UI::VBox::;
3172 3439
3173sub new { 3440sub new {
3174 my $class = shift; 3441 my $class = shift;
3175 3442
3176 my $self = $class->SUPER::new ( 3443 my $self = $class->SUPER::new (
… …
3188sub reorder { 3455sub reorder {
3189 my ($self) = @_; 3456 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3457 my $NOW = Time::HiRes::time;
3191 3458
3192 # freeze display when hovering over any label 3459 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3460 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3461 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3462 values %{ $self->{item} };
3196 3463
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3464 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3465 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3466 }
… …
3220 for ($short) { 3487 for ($short) {
3221 s/^\s+//; 3488 s/^\s+//;
3222 s/\s+/ /g; 3489 s/\s+/ /g;
3223 } 3490 }
3224 3491
3225 new CFClient::UI::Label 3492 new CFPlus::UI::Label
3226 markup => $short, 3493 markup => $short,
3227 tooltip => $item->{tooltip}, 3494 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3495 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3496 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3497 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3551 count => 1,
3285 %arg, 3552 %arg,
3286 }; 3553 };
3287 } 3554 }
3288 3555
3556 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3557 $self->reorder;
3558 });
3290} 3559}
3291 3560
3292sub reconfigure { 3561sub reconfigure {
3293 my ($self) = @_; 3562 my ($self) = @_;
3294 3563
… …
3307 $self->SUPER::destroy; 3576 $self->SUPER::destroy;
3308} 3577}
3309 3578
3310############################################################################# 3579#############################################################################
3311 3580
3312package CFClient::UI::Inventory; 3581package CFPlus::UI::Inventory;
3313 3582
3314our @ISA = CFClient::UI::ScrolledWindow::; 3583our @ISA = CFPlus::UI::Table::;
3315 3584
3316sub new { 3585sub new {
3317 my $class = shift; 3586 my $class = shift;
3318 3587
3319 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3589 col_expand => [0, 1, 0],
3590 items => [],
3321 @_, 3591 @_,
3322 ); 3592 );
3323 3593
3594 $self->set_sort_order (undef);
3595
3324 $self 3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3325} 3632}
3326 3633
3327sub set_items { 3634sub set_items {
3328 my ($self, $items) = @_; 3635 my ($self, $items) = @_;
3329 3636
3330 $self->{child}->clear; 3637 $self->{items} = [$items ? values %$items : ()];
3331 return unless $items; 3638 $self->update_items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350} 3639}
3351 3640
3352############################################################################# 3641#############################################################################
3353 3642
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList; 3643package CFPlus::UI::SpellList;
3552 3644
3553our @ISA = CFClient::UI::Table::; 3645our @ISA = CFPlus::UI::Table::;
3554 3646
3555sub new { 3647sub new {
3556 my $class = shift; 3648 my $class = shift;
3557 3649
3558 my $self = $class->SUPER::new ( 3650 my $self = $class->SUPER::new (
… …
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577 3669
3578sub rebuild_spell_list { 3670sub rebuild_spell_list {
3579 my ($self) = @_; 3671 my ($self) = @_;
3580 3672
3581 $CFClient::UI::ROOT->on_refresh ($self => sub { 3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear; 3674 $self->clear;
3583 3675
3584 return unless $::CONN; 3676 return unless $::CONN;
3585 3677
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591 3683
3592 my $row = 0; 3684 my $row = 0;
3593 3685
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_}; 3687 my $spell = $self->{spell}{$_};
… …
3602 if ($ev->{button} == 1) { 3694 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}"); 3695 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) { 3696 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3697 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3698 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu 3699 (new CFPlus::UI::Menu
3608 items => [ 3700 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ], 3703 ],
3612 )->popup ($ev); 3704 )->popup ($ev);
3613 } else { 3705 } else {
3614 return 0; 3706 return 0;
… …
3618 }; 3710 };
3619 3711
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621 3713
3622 #TODO: add path info to tooltip 3714 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3624 3716
3625 $self->add (0, $row, new CFClient::UI::Face 3717 $self->add (0, $row, new CFPlus::UI::Face
3626 face => $spell->{face}, 3718 face => $spell->{face},
3627 can_hover => 1, 3719 can_hover => 1,
3628 can_events => 1, 3720 can_events => 1,
3629 tooltip => $tooltip, 3721 tooltip => $tooltip,
3630 on_button_down => $spell_cb, 3722 on_button_down => $spell_cb,
3631 ); 3723 );
3632 3724
3633 $self->add (1, $row, new CFClient::UI::Label 3725 $self->add (1, $row, new CFPlus::UI::Label
3634 expand => 1, 3726 expand => 1,
3635 text => $spell->{name}, 3727 text => $spell->{name},
3636 can_hover => 1, 3728 can_hover => 1,
3637 can_events => 1, 3729 can_events => 1,
3638 tooltip => $tooltip, 3730 tooltip => $tooltip,
3639 on_button_down => $spell_cb, 3731 on_button_down => $spell_cb,
3640 ); 3732 );
3641 3733
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 } 3738 }
3647 }); 3739 });
3648} 3740}
3649 3741
3650sub add_spell { 3742sub add_spell {
… …
3668 $self->rebuild_spell_list; 3760 $self->rebuild_spell_list;
3669} 3761}
3670 3762
3671############################################################################# 3763#############################################################################
3672 3764
3673package CFClient::UI::Root; 3765package CFPlus::UI::Root;
3674 3766
3675our @ISA = CFClient::UI::Container::; 3767our @ISA = CFPlus::UI::Container::;
3676 3768
3677use List::Util qw(min max); 3769use List::Util qw(min max);
3678 3770
3679use CFClient::OpenGL; 3771use CFPlus::OpenGL;
3680 3772
3681sub new { 3773sub new {
3682 my $class = shift; 3774 my $class = shift;
3683 3775
3684 my $self = $class->SUPER::new ( 3776 my $self = $class->SUPER::new (
… …
3709 $coord = $max - $size if $coord > $max - $size; 3801 $coord = $max - $size if $coord > $max - $size;
3710 3802
3711 int $coord + 0.5 3803 int $coord + 0.5
3712} 3804}
3713 3805
3714sub size_allocate { 3806sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3807 my ($self, $w, $h) = @_;
3716 3808
3717 for my $child ($self->children) { 3809 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3810 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3811
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3815 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3816 $Y = _to_pixel $Y, $H, $self->{h};
3725 3817
3726 $child->configure ($X, $Y, $W, $H); 3818 $child->configure ($X, $Y, $W, $H);
3727 } 3819 }
3820
3821 1
3728} 3822}
3729 3823
3730sub coord2local { 3824sub coord2local {
3731 my ($self, $x, $y) = @_; 3825 my ($self, $x, $y) = @_;
3732 3826
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3952 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 3953
3860 $w = 0 if $w < 0; 3954 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 3955 $h = 0 if $h < 0;
3862 3956
3957 $w = max $widget->{min_w}, $w;
3958 $h = max $widget->{min_h}, $h;
3959
3960# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962
3963 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3965
3863 $w = int $w + 0.5; 3966 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 3967 $h = int $h + 0.5;
3865 3968
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3969 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 3970 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3993 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 3994 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 3995 glLoadIdentity;
3893 3996
3894 { 3997 {
3895 package CFClient::UI::Base; 3998 package CFPlus::UI::Base;
3896 3999
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4000 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4001 (0, 0, $self->{w}, $self->{h});
3899 } 4002 }
3900 4003
3901 $self->_draw; 4004 $self->_draw;
3902} 4005}
3903 4006
3904############################################################################# 4007#############################################################################
3905 4008
3906package CFClient::UI; 4009package CFPlus::UI;
3907 4010
3908$ROOT = new CFClient::UI::Root; 4011$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4012$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4013
39111 40141
3912 4015

Diff Legend

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