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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 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 do not like duplication
520 # and needlessly verbose code, either.
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 if ($self->{tooltip} =~ /Apply.*audio/) {
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
530 warn "3 $self->{parent}\n";#d#
531 }
532
533 #d##TODO# stop propagating at first true, do not use sum
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
463} 545}
464 546
465sub find_widget { 547sub find_widget {
466 my ($self, $x, $y) = @_; 548 my ($self, $x, $y) = @_;
467 549
… …
477sub set_parent { 559sub set_parent {
478 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
479 561
480 Scalar::Util::weaken ($self->{parent} = $parent); 562 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 563 $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} 564}
506 565
507sub realloc { 566sub realloc {
508 my ($self) = @_; 567 my ($self) = @_;
509 568
… …
542 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
543 602
544 # update screen rectangle 603 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 606
550 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 610
… …
576 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
579 glEnd; 636 glEnd;
580 glPopMatrix; 637 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 639 }
583 640
584 $self->_draw; 641 $self->_draw;
585 glPopMatrix; 642 glPopMatrix;
586} 643}
… …
592} 649}
593 650
594sub DESTROY { 651sub DESTROY {
595 my ($self) = @_; 652 my ($self) = @_;
596 653
654 return if CFPlus::in_destruct;
655
597 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
598 657
599 eval { $self->destroy }; 658 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601} 660}
602 661
603############################################################################# 662#############################################################################
604 663
605package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
606 665
607our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
608 667
609use strict; 668use strict;
610use CFClient::OpenGL; 669use CFPlus::OpenGL;
611 670
612sub new { 671sub new {
613 my $class = shift; 672 my $class = shift;
614 673
615 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
646 } 705 }
647} 706}
648 707
649############################################################################# 708#############################################################################
650 709
651package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
652 711
653our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
654 713
655sub new { 714sub new {
656 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
658} 717}
… …
665 724
666sub draw { } 725sub draw { }
667 726
668############################################################################# 727#############################################################################
669 728
670package CFClient::UI::Container; 729package CFPlus::UI::Container;
671 730
672our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
673 732
674sub new { 733sub new {
675 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
676 735
677 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
686 if $children; 745 if $children;
687 746
688 $self 747 $self
689} 748}
690 749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
756}
757
691sub add { 758sub add {
692 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
693 760
694 $_->set_parent ($self) 761 $_->set_parent ($self)
695 for @widgets; 762 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
756} 823}
757 824
758############################################################################# 825#############################################################################
759 826
760package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
761 828
762our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
763 830
764sub new { 831sub new {
765 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
766 833
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 835
769 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
770} 837}
771 838
772sub add { 839sub add {
… …
779sub remove { 846sub remove {
780 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
781 848
782 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
783 850
784 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 852 unless @{$self->{children}};
786} 853}
787 854
788sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
789 856
790sub size_request { 857sub size_request {
791 $_[0]{children}[0]->size_request 858 $_[0]{children}[0]->size_request
792} 859}
793 860
794sub size_allocate { 861sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
796 863
797 $self->{children}[0]->configure (0, 0, $w, $h); 864 $self->{children}[0]->configure (0, 0, $w, $h);
865
866 1
798} 867}
799 868
800############################################################################# 869#############################################################################
801 870
802# back-buffered drawing area 871# back-buffered drawing area
803 872
804package CFClient::UI::Window; 873package CFPlus::UI::Window;
805 874
806our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
807 876
808use CFClient::OpenGL; 877use CFPlus::OpenGL;
809 878
810sub new { 879sub new {
811 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
812 881
813 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
818 887
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 888 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 889 $self->SUPER::update;
821} 890}
822 891
823sub size_allocate { 892sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
825 894
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 895 $self->update;
896
897 $self->SUPER::invoke_size_allocate ($w, $h)
828} 898}
829 899
830sub _render { 900sub _render {
831 my ($self) = @_; 901 my ($self) = @_;
832 902
… …
834} 904}
835 905
836sub render_child { 906sub render_child {
837 my ($self) = @_; 907 my ($self) = @_;
838 908
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 909 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
842 912
843 { 913 {
844 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
845 915
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
848 } 920 }
849
850 $self->_render;
851 }; 921 };
852} 922}
853 923
854sub _draw { 924sub _draw {
855 my ($self) = @_; 925 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 926
859 my $tex = $self->{texture} 927 my $tex = $self->{texture}
860 or return; 928 or return;
861 929
862 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 932 glColor 0, 0, 0, 1;
865 933
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
867 935
868 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
869} 937}
870 938
871############################################################################# 939#############################################################################
872 940
873package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
874 942
875our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
876 944
877sub new { 945sub new {
878 my $class = shift; 946 my $class = shift;
879 947
880 $class->SUPER::new ( 948 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 961 $h = 10 if $self->{scroll_y};
894 962
895 ($w, $h) 963 ($w, $h)
896} 964}
897 965
898sub size_allocate { 966sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
900 968
901 my $child = $self->child; 969 my $child = $self->child;
902 970
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 971 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 972 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 973
906 $self->child->configure (0, 0, $w, $h); 974 $self->child->configure (0, 0, $w, $h);
907 $self->update; 975 $self->update;
976
977 1
908} 978}
909 979
910sub set_offset { 980sub set_offset {
911 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
912 982
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1010 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1012 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1014 }
945} 1015}
946 1016
947sub _render { 1017sub _render {
948 my ($self) = @_; 1018 my ($self) = @_;
949 1019
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1020 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}; 1021 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1022
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1024
955 $self->SUPER::_render; 1025 $self->SUPER::_render;
956} 1026}
957 1027
958############################################################################# 1028#############################################################################
959 1029
960package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
961 1031
962our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
963 1033
964sub new { 1034sub new {
965 my ($class, %arg) = @_; 1035 my ($class, %arg) = @_;
966 1036
967 my $child = delete $arg{child}; 1037 my $child = delete $arg{child};
968 1038
969 my $self; 1039 my $self;
970 1040
971 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1042 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1044 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
976 }, 1046 },
977 ; 1047 ;
978 1048
979 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
981 slider => $slider, 1052 slider => $slider,
982 %arg, 1053 %arg,
983 ); 1054 );
984 1055
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1057 $self->add ($child) if $child;
987 1058
988 $self 1059 $self
989} 1060}
990 1061
1062#TODO# update range on size_allocate depending on child
1063
991sub add { 1064sub add {
992 my ($self, $widget) = @_; 1065 my ($self, $widget) = @_;
993 1066
994 $self->{vp}->add ($self->{child} = $widget); 1067 $self->{vp}->add ($self->{child} = $widget);
995} 1068}
996 1069
1070sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_;
1072
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev);
1076
1077 1
1078}
1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1084}
1085
997sub update { 1086sub update {
998 my ($self) = @_; 1087 my ($self) = @_;
999 1088
1000 $self->SUPER::update; 1089 $self->SUPER::update;
1001 1090
1002 # todo: overwrite size_allocate of child 1091 $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} 1092}
1006 1093
1007sub size_allocate { 1094sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
1009 1096
1097 $self->update_slider;
1098
1010 $self->SUPER::size_allocate ($w, $h); 1099 $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} 1100}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1101
1019############################################################################# 1102#############################################################################
1020 1103
1021package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1022 1105
1023our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1024 1107
1025use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1026 1109
1027sub new { 1110sub new {
1028 my $class = shift; 1111 my $class = shift;
1029 1112
1030 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1057} 1140}
1058 1141
1059############################################################################# 1142#############################################################################
1060 1143
1061package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1062 1145
1063our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1064 1147
1065use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1149
1150sub new {
1151 my ($class, %arg) = @_;
1152
1153 if ((exists $arg{label}) && !ref $arg{label}) {
1154 $arg{label} = new CFPlus::UI::Label
1155 align => 1,
1156 valign => 0,
1157 text => $arg{label},
1158 fontsize => ($arg{border} || 0.8) * 0.75;
1159 }
1160
1161 my $self = $class->SUPER::new (
1162 # label => "",
1163 fg => [0.6, 0.3, 0.1],
1164 border => 0.8,
1165 style => 'single',
1166 %arg,
1167 );
1168
1169 $self
1170}
1171
1172sub add {
1173 my ($self, @widgets) = @_;
1174
1175 $self->SUPER::add (@widgets);
1176 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1177}
1178
1179sub border {
1180 int $_[0]{border} * $::FONTSIZE
1181}
1182
1183sub size_request {
1184 my ($self) = @_;
1185
1186 ($self->{label_w}, undef) = $self->{label}->size_request
1187 if $self->{label};
1188
1189 my ($w, $h) = $self->SUPER::size_request;
1190
1191 (
1192 $w + $self->border * 2,
1193 $h + $self->border * 2,
1194 )
1195}
1196
1197sub invoke_size_allocate {
1198 my ($self, $w, $h) = @_;
1199
1200 my $border = $self->border;
1201
1202 $w -= List::Util::max 0, $border * 2;
1203 $h -= List::Util::max 0, $border * 2;
1204
1205 if (my $label = $self->{label}) {
1206 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1207 $label->{h} = List::Util::min $h, $border;
1208 $label->invoke_size_allocate ($label->{w}, $label->{h});
1209 }
1210
1211 $self->child->configure ($border, $border, $w, $h);
1212
1213 1
1214}
1215
1216sub _draw {
1217 my ($self) = @_;
1218
1219 my $child = $self->{children}[0];
1220
1221 my $border = $self->border;
1222 my ($w, $h) = ($self->{w}, $self->{h});
1223
1224 $child->draw;
1225
1226 glColor @{$self->{fg}};
1227 glBegin GL_LINE_STRIP;
1228 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1230 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1232 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1233 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1234 glEnd;
1235
1236 if ($self->{label}) {
1237 glTranslate $border * 2, 0;
1238 $self->{label}->_draw;
1239 }
1240}
1241
1242#############################################################################
1243
1244package CFPlus::UI::Toplevel;
1245
1246our @ISA = CFPlus::UI::Bin::;
1247
1248use CFPlus::OpenGL;
1066 1249
1067my $bg = 1250my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1251 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1252 mipmap => 1, wrap => 1;
1070 1253
1071my @border = 1254my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1255 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); 1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1257
1075sub new { 1258sub new {
1076 my ($class, %arg) = @_; 1259 my ($class, %arg) = @_;
1077 1260
1078 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1264 border => 0.6,
1082 can_events => 1, 1265 can_events => 1,
1083 min_w => 16, 1266 min_w => 64,
1084 min_h => 16, 1267 min_h => 32,
1085 %arg, 1268 %arg,
1086 ); 1269 );
1087 1270
1088 $self->{title_widget} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1272 align => 0,
1090 valign => 1, 1273 valign => 1,
1091 text => $self->{title}, 1274 text => $self->{title},
1092 fontsize => $self->{border}, 1275 fontsize => $self->{border},
1093 if exists $self->{title}; 1276 if exists $self->{title};
1094 1277
1095 unless ($self->{no_close_button}) { 1278 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1279 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1280 new CFPlus::UI::ImageButton
1098 image => 'x1_close.png', 1281 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1282 on_activate => sub { $self->emit ("delete") };
1100 1283
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1284 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1285 }
1103 1286
1104 $self 1287 $self
1105} 1288}
1106 1289
1107sub add { 1290sub add {
1108 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1109 1292
1110 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1296}
1114 1297
1115sub border { 1298sub border {
1116 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1117} 1300}
… …
1120 my ($self) = @_; 1303 my ($self) = @_;
1121 1304
1122 $self->{title_widget}->size_request 1305 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1306 if $self->{title_widget};
1124 1307
1125 $self->{close_btn}->size_request 1308 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1309 if $self->{close_button};
1127 1310
1128 my ($w, $h) = $self->SUPER::size_request; 1311 my ($w, $h) = $self->SUPER::size_request;
1129 1312
1130 ( 1313 (
1131 $w + $self->border * 2, 1314 $w + $self->border * 2,
1132 $h + $self->border * 2, 1315 $h + $self->border * 2,
1133 ) 1316 )
1134} 1317}
1135 1318
1136sub size_allocate { 1319sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1320 my ($self, $w, $h) = @_;
1138 1321
1139 if ($self->{title_widget}) { 1322 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1323 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1324 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1325 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1326 }
1144 1327
1145 my $border = $self->border; 1328 my $border = $self->border;
1146 1329
1147 $h -= List::Util::max 0, $border * 2; 1330 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1331 $w -= List::Util::max 0, $border * 2;
1149 1332
1150 $self->child->configure ($border, $border, $w, $h); 1333 $self->child->configure ($border, $border, $w, $h);
1151 1334
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1335 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1336 if $self->{close_button};
1154}
1155 1337
1338 1
1339}
1340
1341sub invoke_delete {
1342 my ($self) = @_;
1343
1344 $self->hide;
1345
1346 1
1347}
1348
1156sub button_down { 1349sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1350 my ($self, $ev, $x, $y) = @_;
1158 1351
1159 my ($w, $h) = @$self{qw(w h)}; 1352 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1353 my $border = $self->border;
1161 1354
… …
1192 1385
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1386 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1387
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1388 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1389 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1390 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1391 };
1199 } else { 1392 } else {
1200 return 0; 1393 return 0;
1201 } 1394 }
1202 1395
1203 1 1396 1
1204} 1397}
1205 1398
1206sub button_up { 1399sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1400 my ($self, $ev, $x, $y) = @_;
1208 1401
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1402 ! ! delete $self->{motion}
1213} 1403}
1214 1404
1215sub mouse_motion { 1405sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1217 1407
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1409
1220 !!$self->{motion} 1410 ! ! $self->{motion}
1411}
1412
1413sub invoke_visibility_change {
1414 my ($self, $visible) = @_;
1415
1416 delete $self->{motion} unless $visible;
1417
1418 0
1221} 1419}
1222 1420
1223sub _draw { 1421sub _draw {
1224 my ($self) = @_; 1422 my ($self) = @_;
1225 1423
… …
1258 $self->{title_widget}->_draw; 1456 $self->{title_widget}->_draw;
1259 1457
1260 glTranslate 0, - ($border - $self->{h}); 1458 glTranslate 0, - ($border - $self->{h});
1261 } 1459 }
1262 1460
1263 $self->{close_btn}->draw 1461 $self->{close_button}->draw
1264 if $self->{close_btn}; 1462 if $self->{close_button};
1265} 1463}
1266 1464
1267############################################################################# 1465#############################################################################
1268 1466
1269package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1270 1468
1271our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1272 1470
1273use List::Util qw(max sum); 1471use List::Util qw(max sum);
1274 1472
1275use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1276 1474
1277sub new { 1475sub new {
1278 my $class = shift; 1476 my $class = shift;
1279 1477
1280 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1286sub children { 1484sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288} 1486}
1289 1487
1290sub add { 1488sub add {
1291 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1292 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1293 $child->set_parent ($self); 1493 $child->set_parent ($self);
1294 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1295 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1296 $self->realloc; 1499 $self->realloc;
1297} 1500}
1298 1501
1299sub remove { 1502sub remove {
1300 my ($self, $child) = @_; 1503 my ($self, $child) = @_;
… …
1348 (sum @$ws), 1551 (sum @$ws),
1349 (sum @$hs), 1552 (sum @$hs),
1350 ) 1553 )
1351} 1554}
1352 1555
1353sub size_allocate { 1556sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1557 my ($self, $w, $h) = @_;
1355 1558
1356 my ($ws, $hs) = $self->get_wh; 1559 my ($ws, $hs) = $self->get_wh;
1357 1560
1358 my $req_w = (sum @$ws) || 1; 1561 my $req_w = (sum @$ws) || 1;
… …
1365 1568
1366 # linearly scale sizes 1569 # linearly scale sizes
1367 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369 1572
1370 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1371 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1372 1575
1373 my $y; 1576 my $y;
1374 1577
1375 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1376 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1390 } 1593 }
1391 1594
1392 $y += $row_h; 1595 $y += $row_h;
1393 } 1596 }
1394 1597
1598 1
1395} 1599}
1396 1600
1397sub find_widget { 1601sub find_widget {
1398 my ($self, $x, $y) = @_; 1602 my ($self, $x, $y) = @_;
1399 1603
… …
1418 } 1622 }
1419} 1623}
1420 1624
1421############################################################################# 1625#############################################################################
1422 1626
1423package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1424 1628
1425our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1426 1630
1427sub size_request { 1631sub size_request {
1428 my ($self) = @_; 1632 my ($self) = @_;
1429 1633
1430 $self->{vertical} 1634 $self->{vertical}
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1640 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1641 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1642 )
1439} 1643}
1440 1644
1441sub size_allocate { 1645sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1646 my ($self, $w, $h) = @_;
1443 1647
1444 my $space = $self->{vertical} ? $h : $w; 1648 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1649 my @children = $self->visible_children;
1446 1650
1447 my @req; 1651 my @req;
1448 1652
1449 if ($self->{homogeneous}) { 1653 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1654 @req = ($space / (@children || 1)) x @children;
1451 } else { 1655 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1656 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1657 my $req = List::Util::sum @req;
1454 1658
1455 if ($req > $space) { 1659 if ($req > $space) {
1456 # ah well, not enough space 1660 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1661 $_ *= $space / $req for @req;
1458 } else { 1662 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1663 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1664
1461 $space = ($space - $req) / $expand; # remaining space to give away 1665 $space = ($space - $req) / $expand; # remaining space to give away
1462 1666
1463 $req[$_] += $space * $children->[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1668 for 0 .. $#children;
1465 } 1669 }
1466 } 1670 }
1467 1671
1468 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1469 1673
1470 my $pos = 0; 1674 my $pos = 0;
1471 for (0 .. $#$children) { 1675 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1677 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1678
1475 $pos += $alloc; 1679 $pos += $alloc;
1476 } 1680 }
1477 1681
1478 1 1682 1
1479} 1683}
1480 1684
1481############################################################################# 1685#############################################################################
1482 1686
1483package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1484 1688
1485our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1486 1690
1487sub new { 1691sub new {
1488 my $class = shift; 1692 my $class = shift;
1489 1693
1490 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1493 ) 1697 )
1494} 1698}
1495 1699
1496############################################################################# 1700#############################################################################
1497 1701
1498package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1499 1703
1500our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1501 1705
1502sub new { 1706sub new {
1503 my $class = shift; 1707 my $class = shift;
1504 1708
1505 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1508 ) 1712 )
1509} 1713}
1510 1714
1511############################################################################# 1715#############################################################################
1512 1716
1513package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1514 1718
1515our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1516 1720
1517use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1518 1722
1519sub new { 1723sub new {
1520 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1521 1725
1522 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1729 #active_bg => none
1526 #font => default_font 1730 #font => default_font
1527 #text => initial text 1731 #text => initial text
1528 #markup => initial narkup 1732 #markup => initial narkup
1529 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1530 ellipsise => 3, # end 1735 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1737 fontsize => 1,
1533 align => -1, 1738 align => -1,
1534 valign => -1, 1739 valign => -1,
1535 padding_x => 2, 1740 padding_x => 2,
1536 padding_y => 2, 1741 padding_y => 2,
1537 can_events => 0, 1742 can_events => 0,
1538 %arg 1743 %arg
1539 ); 1744 );
1540 1745
1541 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1749 $self->{template} = $layout;
1545 } 1750 }
1546 1751
1547 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1551 } 1756 }
1552 1757
1553 $self 1758 $self
1554} 1759}
1555 1760
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1761sub update {
1567 my ($self) = @_; 1762 my ($self) = @_;
1568 1763
1569 delete $self->{texture}; 1764 delete $self->{texture};
1570 $self->SUPER::update; 1765 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1776 my ($self, $text) = @_;
1582 1777
1583 return if $self->{text} eq "T$text"; 1778 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1779 $self->{text} = "T$text";
1585 1780
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1781 $self->{layout}->set_text ($text);
1588 1782
1589 delete $self->{size_req}; 1783 delete $self->{size_req};
1590 $self->realloc; 1784 $self->realloc;
1591 $self->update; 1785 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1791 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1792 $self->{text} = "M$markup";
1599 1793
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1794 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1795
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1796 $self->{layout}->set_markup ($markup);
1604 1797
1605 delete $self->{size_req}; 1798 delete $self->{size_req};
1606 $self->realloc; 1799 $self->realloc;
1607 $self->update; 1800 $self->update;
… …
1619 1812
1620 my ($w, $h) = $self->{layout}->size; 1813 my ($w, $h) = $self->{layout}->size;
1621 1814
1622 if (exists $self->{template}) { 1815 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1816 $self->{template}->set_font ($self->{font}) if $self->{font};
1817 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1819
1626 my ($w2, $h2) = $self->{template}->size; 1820 my ($w2, $h2) = $self->{template}->size;
1627 1821
1628 $w = List::Util::max $w, $w2; 1822 $w = List::Util::max $w, $w2;
… …
1633 }; 1827 };
1634 1828
1635 @{ $self->{size_req} } 1829 @{ $self->{size_req} }
1636} 1830}
1637 1831
1832sub baseline_shift {
1833 $_[0]{layout}->descent
1834}
1835
1638sub size_allocate { 1836sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1837 my ($self, $w, $h) = @_;
1640 1838
1641 delete $self->{ox}; 1839 delete $self->{ox};
1642 1840
1643 delete $self->{texture} 1841 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1842 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1843
1844 1
1645} 1845}
1646 1846
1647sub set_fontsize { 1847sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1848 my ($self, $fontsize) = @_;
1649 1849
1650 $self->{fontsize} = $fontsize; 1850 $self->{fontsize} = $fontsize;
1851 delete $self->{size_req};
1651 delete $self->{texture}; 1852 delete $self->{texture};
1652 1853
1653 $self->realloc; 1854 $self->realloc;
1654} 1855}
1655 1856
1656sub reconfigure { 1857sub reconfigure {
1657 my ($self) = @_; 1858 my ($self) = @_;
1658 1859
1659 delete $self->{size_req}; 1860 delete $self->{size_req};
1861 delete $self->{texture};
1660 1862
1661 $self->SUPER::reconfigure; 1863 $self->SUPER::reconfigure;
1662} 1864}
1663 1865
1664sub _draw { 1866sub _draw {
1665 my ($self) = @_; 1867 my ($self) = @_;
1666 1868
1667 $self->SUPER::_draw; # draw background, if applicable 1869 $self->SUPER::_draw; # draw background, if applicable
1668 1870
1669 my $tex = $self->{texture} ||= do { 1871 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1872 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1873 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1874 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1875 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1876 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1877 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1878
1677 new_from_layout CFClient::Texture $self->{layout} 1879 [$self->{layout}->size]
1678 }; 1880 };
1679 1881
1680 unless (exists $self->{ox}) { 1882 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1885 : ($self->{w} - $size->[0]) * 0.5);
1684 1886
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1889 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1890 };
1689 1891
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1894
1695 if ($tex->{format} == GL_ALPHA) { 1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1896}
1706 1897
1707############################################################################# 1898#############################################################################
1708 1899
1709package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1710 1901
1711our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1712 1903
1713use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1714 1905
1715sub new { 1906sub new {
1716 my $class = shift; 1907 my $class = shift;
1717 1908
1718 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1742 1933
1743 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1936 delete $self->{size_req};
1746 1937
1747 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1748 1939
1749 $self->realloc; 1940 $self->realloc;
1750 $self->update; 1941 $self->update;
1751} 1942}
1752 1943
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1768 1959
1769 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1770} 1961}
1771 1962
1772sub key_down { 1963sub invoke_key_down {
1773 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1774 1965
1775 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1780 1971
1781 if ($uni == 8) { 1972 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1790 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1792 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1793 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1988 $self->emit ('escape');
1795 } elsif ($uni) { 1989 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1991 } else {
1798 return 0; 1992 return 0;
1799 } 1993 }
… …
1803 $self->realloc; 1997 $self->realloc;
1804 1998
1805 1 1999 1
1806} 2000}
1807 2001
1808sub focus_in { 2002sub invoke_focus_in {
1809 my ($self) = @_; 2003 my ($self) = @_;
1810 2004
1811 $self->{last_activity} = $::NOW; 2005 $self->{last_activity} = $::NOW;
1812 2006
1813 $self->SUPER::focus_in; 2007 $self->SUPER::invoke_focus_in
1814} 2008}
1815 2009
1816sub button_down { 2010sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 2011 my ($self, $ev, $x, $y) = @_;
1818 2012
1819 $self->SUPER::button_down ($ev, $x, $y); 2013 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 2014
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2016
1823 # byte-index to char-index 2017 # byte-index to char-index
1824 my $text = $self->{text}; 2018 my $text = $self->{text};
1825 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1827 2021
1828 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1829 $self->update; 2023 $self->update;
1830 2024
1831 1 2025 1
1832} 2026}
1833 2027
1834sub mouse_motion { 2028sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 2029 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2030# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 2031
1838 0 2032 1
1839} 2033}
1840 2034
1841sub _draw { 2035sub _draw {
1842 my ($self) = @_; 2036 my ($self) = @_;
1843 2037
… …
1870 utf8::encode $text; 2064 utf8::encode $text;
1871 2065
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2066 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2067 }
1874 2068
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2069 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2070 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2072 glEnd;
1880 } 2073 }
1881} 2074}
1882 2075
1883package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1884 2077
1885our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1886 2079
1887use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1888 2081
1889sub key_down { 2082sub invoke_key_down {
1890 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1891 2084
1892 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
1893 2086
1894 if ($sym == 13) { 2087 if ($sym == 13) {
1895 unshift @{$self->{history}}, 2088 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2089 my $txt = $self->get_text;
2090
1897 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 2093 $self->emit (activate => $txt);
1900 $self->update; 2094 $self->update;
1901 2095
1902 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1905 } 2099 }
1906 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2104 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2106 }
1913 2107
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2111
1918 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 2114 } else {
1921 $self->set_text ($self->{history_saveback}); 2115 $self->set_text ($self->{history_saveback});
1922 } 2116 }
1923 2117
1924 } else { 2118 } else {
1925 return $self->SUPER::key_down ($ev) 2119 return $self->SUPER::invoke_key_down ($ev)
1926 } 2120 }
1927 2121
1928 1 2122 1
1929} 2123}
1930 2124
1931############################################################################# 2125#############################################################################
1932 2126
1933package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1934 2128
1935our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1936 2130
1937use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1938 2132
1939my @tex = 2133my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1942 2136
1943sub new { 2137sub new {
1944 my $class = shift; 2138 my $class = shift;
1945 2139
… …
1954 can_events => 1, 2148 can_events => 1,
1955 @_ 2149 @_
1956 ) 2150 )
1957} 2151}
1958 2152
1959sub activate { }
1960
1961sub button_up { 2153sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2154 my ($self, $ev, $x, $y) = @_;
1963 2155
1964 $self->emit ("activate") 2156 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2157 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2158 && $y >= 0 && $y < $self->{h};
… …
1984 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1985} 2177}
1986 2178
1987############################################################################# 2179#############################################################################
1988 2180
2181package CFPlus::UI::CheckBox;
2182
2183our @ISA = CFPlus::UI::DrawBG::;
2184
2185my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2188
2189use CFPlus::OpenGL;
2190
2191sub new {
2192 my $class = shift;
2193
2194 $class->SUPER::new (
2195 padding_x => 2,
2196 padding_y => 2,
2197 fg => [1, 1, 1],
2198 active_fg => [1, 1, 0],
2199 bg => [0, 0, 0, 0.2],
2200 active_bg => [1, 1, 1, 0.5],
2201 state => 0,
2202 can_hover => 1,
2203 @_
2204 )
2205}
2206
2207sub size_request {
2208 my ($self) = @_;
2209
2210 (6) x 2
2211}
2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
2221sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_;
2223
2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2226 $self->toggle;
2227 } else {
2228 return 0
2229 }
2230
2231 1
2232}
2233
2234sub _draw {
2235 my ($self) = @_;
2236
2237 $self->SUPER::_draw;
2238
2239 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2240
2241 my ($w, $h) = @$self{qw(w h)};
2242
2243 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2244
2245 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2246
2247 my $tex = $self->{state} ? $tex[1] : $tex[0];
2248
2249 glEnable GL_TEXTURE_2D;
2250 $tex->draw_quad_alpha (0, 0, $s, $s);
2251 glDisable GL_TEXTURE_2D;
2252}
2253
2254#############################################################################
2255
2256package CFPlus::UI::Image;
2257
2258our @ISA = CFPlus::UI::Base::;
2259
2260use CFPlus::OpenGL;
2261
2262our %texture_cache;
2263
2264sub new {
2265 my $class = shift;
2266
2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
2271
2272 $self->{path} || $self->{tex}
2273 or Carp::croak "'path' or 'tex' attributes required";
2274
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277
2278 Scalar::Util::weaken $texture_cache{$self->{path}};
2279
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281
2282 $self
2283}
2284
2285sub STORABLE_freeze {
2286 my ($self, $cloning) = @_;
2287
2288 $self->{path}
2289 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2290
2291 $self->{path}
2292}
2293
2294sub STORABLE_attach {
2295 my ($self, $cloning, $path) = @_;
2296
2297 $self->new (path => $path)
2298}
2299
2300sub size_request {
2301 my ($self) = @_;
2302
2303 ($self->{tex}{w}, $self->{tex}{h})
2304}
2305
2306sub _draw {
2307 my ($self) = @_;
2308
2309 my $tex = $self->{tex};
2310
2311 my ($w, $h) = ($self->{w}, $self->{h});
2312
2313 if ($self->{rot90}) {
2314 glRotate 90, 0, 0, 1;
2315 glTranslate 0, -$self->{w}, 0;
2316
2317 ($w, $h) = ($h, $w);
2318 }
2319
2320 glEnable GL_TEXTURE_2D;
2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2322
2323 $tex->draw_quad (0, 0, $w, $h);
2324
2325 glDisable GL_TEXTURE_2D;
2326}
2327
2328#############################################################################
2329
1989package CFClient::UI::ImageButton; 2330package CFPlus::UI::ImageButton;
1990 2331
1991our @ISA = CFClient::UI::Image::; 2332our @ISA = CFPlus::UI::Image::;
1992 2333
1993use CFClient::OpenGL; 2334use CFPlus::OpenGL;
1994 2335
1995my %textures; 2336my %textures;
1996 2337
1997sub new { 2338sub new {
1998 my $class = shift; 2339 my $class = shift;
… …
2008 can_events => 1, 2349 can_events => 1,
2009 @_ 2350 @_
2010 ); 2351 );
2011} 2352}
2012 2353
2013sub activate { }
2014
2015sub button_up { 2354sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2355 my ($self, $ev, $x, $y) = @_;
2017 2356
2018 $self->emit ("activate") 2357 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2358 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2359 && $y >= 0 && $y < $self->{h};
… …
2022 1 2361 1
2023} 2362}
2024 2363
2025############################################################################# 2364#############################################################################
2026 2365
2027package CFClient::UI::CheckBox;
2028
2029our @ISA = CFClient::UI::DrawBG::;
2030
2031my @tex =
2032 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035use CFClient::OpenGL;
2036
2037sub new {
2038 my $class = shift;
2039
2040 $class->SUPER::new (
2041 padding_x => 2,
2042 padding_y => 2,
2043 fg => [1, 1, 1],
2044 active_fg => [1, 1, 0],
2045 bg => [0, 0, 0, 0.2],
2046 active_bg => [1, 1, 1, 0.5],
2047 state => 0,
2048 can_hover => 1,
2049 @_
2050 )
2051}
2052
2053sub size_request {
2054 my ($self) = @_;
2055
2056 (6) x 2
2057}
2058
2059sub button_down {
2060 my ($self, $ev, $x, $y) = @_;
2061
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
2070 1
2071}
2072
2073sub _draw {
2074 my ($self) = @_;
2075
2076 $self->SUPER::_draw;
2077
2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088 glEnable GL_TEXTURE_2D;
2089 $tex->draw_quad_alpha (0, 0, $s, $s);
2090 glDisable GL_TEXTURE_2D;
2091}
2092
2093#############################################################################
2094
2095package CFClient::UI::Image; 2366package CFPlus::UI::VGauge;
2096 2367
2097our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2098
2099use CFClient::OpenGL;
2100use Carp qw/confess/;
2101
2102our %loaded_images;
2103
2104sub new {
2105 my $class = shift;
2106
2107 my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111 $loaded_images{$self->{image}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116 Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119
2120 $self
2121}
2122
2123sub size_request {
2124 my ($self) = @_;
2125
2126 ($self->{tex}->{w}, $self->{tex}->{h})
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131
2132 my $tex = $self->{tex};
2133
2134 my ($w, $h) = ($self->{w}, $self->{h});
2135
2136 if ($self->{rot90}) {
2137 glRotate 90, 0, 0, 1;
2138 glTranslate 0, -$self->{w}, 0;
2139
2140 ($w, $h) = ($h, $w);
2141 }
2142
2143 glEnable GL_TEXTURE_2D;
2144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146 $tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148 glDisable GL_TEXTURE_2D;
2149}
2150
2151#############################################################################
2152
2153package CFClient::UI::VGauge;
2154
2155our @ISA = CFClient::UI::Base::;
2156 2369
2157use List::Util qw(min max); 2370use List::Util qw(min max);
2158 2371
2159use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2160 2373
2161my %tex = ( 2374my %tex = (
2162 food => [ 2375 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2378 ],
2166 grace => [ 2379 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2381 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169 ], 2382 ],
2170 hp => [ 2383 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2386 ],
2174 mana => [ 2387 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2389 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177 ], 2390 ],
2178); 2391);
2179 2392
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2453 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2454 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2455
2243 my $h1 = $self->{h} * (1 - $ycut1); 2456 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2457 my $h2 = $self->{h} * (1 - $ycut2);
2458 my $h3 = $self->{h};
2459
2460 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2461
2246 glEnable GL_BLEND; 2462 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2463 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2464 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2465 glEnable GL_TEXTURE_2D;
… …
2268 2484
2269 if ($t3) { 2485 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2486 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2487 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2488 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2489 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2490 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2491 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2492 glEnd;
2277 } 2493 }
2278 2494
2279 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2281} 2497}
2282 2498
2283############################################################################# 2499#############################################################################
2284 2500
2285package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2286 2502
2287our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2288 2504
2289sub new { 2505sub new {
2290 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2291 2507
2292 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2510 can_hover => 1,
2295 can_events => 1, 2511 can_events => 1,
2296 %arg, 2512 %arg,
2297 ); 2513 );
2298 2514
2299 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2515 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2300 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2516 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2301 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2517 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302 2518
2303 $self 2519 $self
2304} 2520}
2305 2521
2306sub set_fontsize { 2522sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2328} 2544}
2329 2545
2330############################################################################# 2546#############################################################################
2331 2547
2332package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2333 2549
2334use strict; 2550use strict;
2335 2551
2336use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2337 2553
2338our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2339 2555
2340my @tex = 2556my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2343 2559
2344sub new { 2560sub new {
2345 my $class = shift; 2561 my $class = shift;
2346 2562
… …
2367 $self->update; 2583 $self->update;
2368 2584
2369 $self 2585 $self
2370} 2586}
2371 2587
2372sub changed { }
2373
2374sub set_range { 2588sub set_range {
2375 my ($self, $range) = @_; 2589 my ($self, $range) = @_;
2376 2590
2377 ($range, $self->{range}) = ($self->{range}, $range); 2591 ($range, $self->{range}) = ($self->{range}, $range);
2378 2592
… …
2398 if $unit; 2612 if $unit;
2399 2613
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2614 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2615
2402 if ($value != $old_value) { 2616 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2617 $self->emit (changed => $value);
2404 $self->update; 2618 $self->update;
2405 } 2619 }
2406} 2620}
2407 2621
2408sub size_request { 2622sub size_request {
2409 my ($self) = @_; 2623 my ($self) = @_;
2410 2624
2411 ($self->{req_w}, $self->{req_h}) 2625 ($self->{req_w}, $self->{req_h})
2412} 2626}
2413 2627
2414sub button_down { 2628sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2629 my ($self, $ev, $x, $y) = @_;
2416 2630
2417 $self->SUPER::button_down ($ev, $x, $y); 2631 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2632
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2633 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2634
2421 $self->mouse_motion ($ev, $x, $y) 2635 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2636}
2423 2637
2424sub mouse_motion { 2638sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2639 my ($self, $ev, $x, $y) = @_;
2426 2640
2427 if ($GRAB == $self) { 2641 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2642 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2643
… …
2435 } else { 2649 } else {
2436 return 0; 2650 return 0;
2437 } 2651 }
2438 2652
2439 1 2653 1
2654}
2655
2656sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_;
2658
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2662
2663 ! ! $delta
2440} 2664}
2441 2665
2442sub update { 2666sub update {
2443 my ($self) = @_; 2667 my ($self) = @_;
2444 2668
… …
2493 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2494} 2718}
2495 2719
2496############################################################################# 2720#############################################################################
2497 2721
2498package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2499 2723
2500our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2501 2725
2502sub new { 2726sub new {
2503 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2504 2728
2505 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2506 2730
2507 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 2734 to_value => sub { shift },
2511 from_value => sub { shift }, 2735 from_value => sub { shift },
2512 %arg, 2736 %arg,
2513 ); 2737 );
2514 2738
… …
2534sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2536 2760
2537############################################################################# 2761#############################################################################
2538 2762
2539package CFClient::UI::TextScroller; 2763package CFPlus::UI::TextScroller;
2540 2764
2541our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2542 2766
2543use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2544 2768
2545sub new { 2769sub new {
2546 my $class = shift; 2770 my $class = shift;
2547 2771
2548 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2549 fontsize => 1, 2773 fontsize => 1,
2550 can_events => 0, 2774 can_events => 1,
2551 indent => 0, 2775 indent => 0,
2552 #font => default_font 2776 #font => default_font
2553 @_, 2777 @_,
2554 2778
2555 layout => (new CFClient::Layout 1), 2779 layout => (new CFPlus::Layout),
2556 par => [], 2780 par => [],
2557 height => 0, 2781 height => 0,
2558 children => [ 2782 children => [
2559 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2561 ], 2785 ],
2562 ); 2786 );
2563 2787
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2565 2789
… …
2571 2795
2572 $self->{fontsize} = $fontsize; 2796 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2797 $self->reflow;
2574} 2798}
2575 2799
2800sub size_request {
2801 my ($self) = @_;
2802
2803 my ($empty, $slider) = @{ $self->{children} };
2804
2805 local $self->{children} = [$empty, $slider];
2806 $self->SUPER::size_request
2807}
2808
2576sub size_allocate { 2809sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2810 my ($self, $w, $h) = @_;
2578 2811
2579 $self->SUPER::size_allocate ($w, $h); 2812 my ($empty, $slider, @other) = @{ $self->{children} };
2813 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2814
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2815 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2816 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2817 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2818 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2819
2586 $self->reflow; 2820 $self->reflow;
2587}
2588 2821
2589sub text_size { 2822 local $self->{children} = [$empty, $slider];
2823 $self->SUPER::invoke_size_allocate ($w, $h)
2824}
2825
2826sub invoke_mouse_wheel {
2590 my ($self, $text, $indent) = @_; 2827 my ($self, $ev) = @_;
2828
2829 return 0 unless $ev->{dy}; # only vertical movements
2830
2831 $self->{children}[1]->emit (mouse_wheel => $ev);
2832
2833 1
2834}
2835
2836sub get_layout {
2837 my ($self, $para) = @_;
2591 2838
2592 my $layout = $self->{layout}; 2839 my $layout = $self->{layout};
2593 2840
2841 $layout->set_font ($self->{font}) if $self->{font};
2842 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2843 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2844 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2845 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2846 $layout->set_markup ($para->{markup});
2847
2848 $layout->set_shapes (
2849 map
2850 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2851 @{$para->{widget}}
2598 2852 );
2853
2599 $layout->size 2854 $layout
2600} 2855}
2601 2856
2602sub reflow { 2857sub reflow {
2603 my ($self) = @_; 2858 my ($self) = @_;
2604 2859
… …
2611 2866
2612 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2614} 2869}
2615 2870
2871sub current_paragraph {
2872 my ($self) = @_;
2873
2874 $self->{top_paragraph} - 1
2875}
2876
2877sub scroll_to {
2878 my ($self, $para) = @_;
2879
2880 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2881
2882 $self->{scroll_to} = $para;
2883 $self->update;
2884}
2885
2616sub clear { 2886sub clear {
2617 my ($self) = @_; 2887 my ($self) = @_;
2888
2889 my (undef, undef, @other) = @{ $self->{children} };
2890 $self->remove ($_) for @other;
2618 2891
2619 $self->{par} = []; 2892 $self->{par} = [];
2620 $self->{height} = 0; 2893 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2895}
2623 2896
2624sub add_paragraph { 2897sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2898 my $self = shift;
2626 2899
2627 for my $line (split /\n/, $text) { 2900 for my $para (@_) {
2628 my ($w, $h) = $self->text_size ($line); 2901 $para = {
2902 fg => [1, 1, 1, 1],
2903 indent => 0,
2904 markup => "",
2905 widget => [],
2906 ref $para ? %$para : (markup => $para),
2907 w => 1e10,
2908 wrapped => 1,
2909 };
2910
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para;
2913 }
2914
2915 $self->{need_reflow}++;
2916 $self->update;
2917}
2918
2919sub scroll_to_bottom {
2920 my ($self) = @_;
2921
2922 $self->{scroll_to} = $#{$self->{par}};
2923 $self->update;
2924}
2925
2926sub force_uptodate {
2927 my ($self) = @_;
2928
2929 if (delete $self->{need_reflow}) {
2930 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2931
2932 my $height = 0;
2933
2934 for my $para (@{$self->{par}}) {
2935 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2936 my $layout = $self->get_layout ($para);
2937 my ($w, $h) = $layout->size;
2938
2939 $para->{w} = $w + $para->{indent};
2940 $para->{h} = $h;
2941 $para->{wrapped} = $layout->has_wrapped;
2942 }
2943
2944 $para->{y} = $height;
2945 $height += $para->{h};
2946 }
2947
2629 $self->{height} += $h; 2948 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 2950
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2951 delete $self->{texture};
2952 }
2953
2954 if (my $paridx = delete $self->{scroll_to}) {
2955 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2956 }
2634} 2957}
2635 2958
2636sub update { 2959sub update {
2637 my ($self) = @_; 2960 my ($self) = @_;
2638 2961
… …
2641 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2642 2965
2643 delete $self->{texture}; 2966 delete $self->{texture};
2644 2967
2645 $ROOT->on_post_alloc ($self => sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2972
2648 if (delete $self->{need_reflow}) {
2649 my $height = 0;
2650
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2667
2668 $self->{height} = $height;
2669
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2671
2672 delete $self->{texture};
2673 }
2674
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2974 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2678 2976
2977 package CFPlus::UI::Base;
2978 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2979 (0, 0, $self->{w}, $self->{h});
2980
2981 my $top = int $self->{children}[1]{range}[0];
2982
2983 my $paridx = 0;
2984 my $top_paragraph;
2679 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2680 2986
2681 my $y0 = $top; 2987 my $y0 = $top;
2682 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2683 2989
2684 my $y = 0;
2685
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2696 2993
2697 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 2995 my $layout = $self->get_layout ($para);
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2996
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2997 $layout->render ($para->{indent}, $y - $y0);
2704 2998
2705 glRasterPos $par->[3], $y - $y0; 2999 if (my @w = @{ $para->{widget} }) {
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3000 my @s = $layout->get_shapes;
3001
3002 for (@w) {
3003 my ($dx, $dy) = splice @s, 0, 2, ();
3004
3005 $_->{x} = $dx + $para->{indent};
3006 $_->{y} = $dy + $y - $y0;
3007
3008 $_->draw;
3009 }
3010 }
2707 } 3011 }
2708 3012
2709 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3015 }
2711 3016
2712 glDisable GL_BLEND; 3017 $self->{top_paragraph} = $top_paragraph;
2713 }; 3018 };
2714 }); 3019 });
3020}
3021
3022sub reconfigure {
3023 my ($self) = @_;
3024
3025 $self->SUPER::reconfigure;
3026
3027 $_->{w} = 1e10 for @{ $self->{par} };
3028 $self->reflow;
2715} 3029}
2716 3030
2717sub _draw { 3031sub _draw {
2718 my ($self) = @_; 3032 my ($self) = @_;
2719 3033
… …
2722 glColor 0, 0, 0, 1; 3036 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3037 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 3038 glDisable GL_TEXTURE_2D;
2725 3039
2726 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2727
2728} 3041}
2729 3042
2730############################################################################# 3043#############################################################################
2731 3044
2732package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2733 3046
2734use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2735 3048
2736our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2737 3050
2738sub moveto { 3051sub moveto {
2739 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2740 3053
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3082 glPopMatrix;
2770} 3083}
2771 3084
2772############################################################################# 3085#############################################################################
2773 3086
2774package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2775 3088
2776our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2777 3090
2778sub new { 3091sub new {
2779 my $class = shift; 3092 my $class = shift;
2780 3093
2781 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2794} 3107}
2795 3108
2796############################################################################# 3109#############################################################################
2797 3110
2798package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2799 3112
2800our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2801 3114
2802use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2803 3116
2804sub new { 3117sub new {
2805 my $class = shift; 3118 my $class = shift;
2806 3119
2807 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2810 ) 3123 )
2811} 3124}
2812 3125
2813sub set_tooltip_from { 3126sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2815 3131
2816 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2817 3133
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2823 } 3139 }
2824 3140
2825 $tooltip =~ s/^\n+//; 3141 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3142 $tooltip =~ s/\n+$//;
2827 3143
2828 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2829 markup => $tooltip, 3145 markup => $tooltip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 3147 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3149 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3151 );
2836} 3152}
2837 3153
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3157 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3158
2843 ($w + 4, $h + 4) 3159 ($w + 4, $h + 4)
2844} 3160}
2845 3161
2846sub size_allocate { 3162sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3163 my ($self, $w, $h) = @_;
2848 3164
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3165 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3166}
2851 3167
2852sub visibility_change { 3168sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3169 my ($self, $visible) = @_;
2854 3170
2855 return unless $visible; 3171 return unless $visible;
2856 3172
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2859 or return; 3175 or return;
2860 3176
3177 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3179
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3181 if $x + $self->{w} > $self->{root}{w};
2865 3182
2866 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2867 }); 3187 });
2868} 3188}
2869 3189
2870sub _draw { 3190sub _draw {
2871 my ($self) = @_; 3191 my ($self) = @_;
… …
2895 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2896} 3216}
2897 3217
2898############################################################################# 3218#############################################################################
2899 3219
2900package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2901 3221
2902our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2903 3223
2904use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2905 3225
2906sub new { 3226sub new {
2907 my $class = shift; 3227 my $class = shift;
2908 3228
2909 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
2944sub _draw { 3264sub _draw {
2945 my ($self) = @_; 3265 my ($self) = @_;
2946 3266
2947 return unless $::CONN; 3267 return unless $::CONN;
2948 3268
3269 $self->SUPER::_draw;
3270
2949 my $face; 3271 my $face;
2950 3272
2951 if ($self->{frame}) { 3273 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
2953 3275
… …
2975 $self->SUPER::destroy; 3297 $self->SUPER::destroy;
2976} 3298}
2977 3299
2978############################################################################# 3300#############################################################################
2979 3301
2980package CFClient::UI::Buttonbar; 3302package CFPlus::UI::Buttonbar;
2981 3303
2982our @ISA = CFClient::UI::HBox::; 3304our @ISA = CFPlus::UI::HBox::;
2983 3305
2984# TODO: should actualyl wrap buttons and other goodies. 3306# TODO: should actually wrap buttons and other goodies.
2985 3307
2986############################################################################# 3308#############################################################################
2987 3309
2988package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
2989 3311
2990our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
2991 3313
2992use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2993 3315
2994sub new { 3316sub new {
2995 my $class = shift; 3317 my $class = shift;
2996 3318
2997 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2998 items => [], 3320 items => [],
2999 z => 100, 3321 z => 100,
3000 @_, 3322 @_,
3001 ); 3323 );
3002 3324
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004 3326
3005 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
3007 3329
3008 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
3009 if (!ref $widget) { 3331 if (!ref $widget) {
3332 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2;
3334
3010 $widget = new CFClient::UI::Label 3335 $widget = new CFPlus::UI::HBox
3011 can_hover => 1, 3336 can_hover => 1,
3012 can_events => 1, 3337 can_events => 1,
3338 tooltip => $tooltip,
3339 children => [
3340 (new CFPlus::UI::Label markup => $left, expand => 1),
3341 (new CFPlus::UI::Label markup => $right, align => +1),
3342 ],
3343 ;
3344
3345 } else {
3346 $widget = new CFPlus::UI::Label
3347 can_hover => 1,
3348 can_events => 1,
3013 markup => $widget, 3349 markup => $widget,
3014 tooltip => $tooltip 3350 tooltip => $tooltip;
3351 }
3015 } 3352 }
3016 3353
3017 $self->{item}{$widget} = $item; 3354 $self->{item}{$widget} = $item;
3018 3355
3019 $self->{vbox}->add ($widget); 3356 $self->{vbox}->add ($widget);
… …
3024 3361
3025# popup given the event (must be a mouse button down event currently) 3362# popup given the event (must be a mouse button down event currently)
3026sub popup { 3363sub popup {
3027 my ($self, $ev) = @_; 3364 my ($self, $ev) = @_;
3028 3365
3029 $self->_emit ("popdown"); 3366 $self->emit ("popdown");
3030 3367
3031 # maybe save $GRAB? must be careful about events... 3368 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3369 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3370 $self->{button} = $ev->{button};
3034 3371
3035 $self->show; 3372 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3373 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3374}
3038 3375
3039sub mouse_motion { 3376sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3377 my ($self, $ev, $x, $y) = @_;
3041 3378
3042 # TODO: should use vbox->find_widget or so 3379 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3380 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3381 $self->{hover} = $self->{item}{$HOVER};
3045 3382
3046 0 3383 0
3047} 3384}
3048 3385
3049sub button_up { 3386sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3387 my ($self, $ev, $x, $y) = @_;
3051 3388
3052 if ($ev->{button} == $self->{button}) { 3389 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3390 undef $GRAB;
3054 $self->hide; 3391 $self->hide;
3055 3392
3056 $self->_emit ("popdown"); 3393 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3394 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3395 } else {
3059 return 0 3396 return 0
3060 } 3397 }
3061 3398
3062 1 3399 1
3063} 3400}
3064 3401
3065############################################################################# 3402#############################################################################
3066 3403
3067package CFClient::UI::Multiplexer; 3404package CFPlus::UI::Multiplexer;
3068 3405
3069our @ISA = CFClient::UI::Container::; 3406our @ISA = CFPlus::UI::Container::;
3070 3407
3071sub new { 3408sub new {
3072 my $class = shift; 3409 my $class = shift;
3073 3410
3074 my $self = $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
… …
3088 3425
3089 $self->{current} = $self->{children}[0] 3426 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3427 if @{ $self->{children} };
3091} 3428}
3092 3429
3430sub get_current_page {
3431 my ($self) = @_;
3432
3433 $self->{current}
3434}
3435
3093sub set_current_page { 3436sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3437 my ($self, $page_or_widget) = @_;
3095 3438
3096 my $widget = ref $page_or_widget 3439 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3440 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3441 : $self->{children}[$page_or_widget];
3099 3442
3100 $self->{current} = $widget; 3443 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3444 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3445
3103 $self->_emit (page_changed => $self->{current}); 3446 $self->emit (page_changed => $self->{current});
3104 3447
3105 $self->realloc; 3448 $self->realloc;
3106} 3449}
3107 3450
3108sub visible_children { 3451sub visible_children {
… …
3113 my ($self) = @_; 3456 my ($self) = @_;
3114 3457
3115 $self->{current}->size_request 3458 $self->{current}->size_request
3116} 3459}
3117 3460
3118sub size_allocate { 3461sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3462 my ($self, $w, $h) = @_;
3120 3463
3121 $self->{current}->configure (0, 0, $w, $h); 3464 $self->{current}->configure (0, 0, $w, $h);
3465
3466 1
3122} 3467}
3123 3468
3124sub _draw { 3469sub _draw {
3125 my ($self) = @_; 3470 my ($self) = @_;
3126 3471
3127 $self->{current}->draw; 3472 $self->{current}->draw;
3128} 3473}
3129 3474
3130############################################################################# 3475#############################################################################
3131 3476
3132package CFClient::UI::Notebook; 3477package CFPlus::UI::Notebook;
3133 3478
3134our @ISA = CFClient::UI::VBox::; 3479our @ISA = CFPlus::UI::VBox::;
3135 3480
3136sub new { 3481sub new {
3137 my $class = shift; 3482 my $class = shift;
3138 3483
3139 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3485 buttonbar => (new CFPlus::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self 3487 # filter => # will be put between multiplexer and $self
3143 @_, 3488 @_,
3144 ); 3489 );
3145 3490
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3152sub add { 3497sub add {
3153 my ($self, $title, $widget, $tooltip) = @_; 3498 my ($self, $title, $widget, $tooltip) = @_;
3154 3499
3155 Scalar::Util::weaken $self; 3500 Scalar::Util::weaken $self;
3156 3501
3157 $self->{buttonbar}->add (new CFClient::UI::Button 3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3158 markup => $title, 3503 markup => $title,
3159 tooltip => $tooltip, 3504 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) }, 3505 on_activate => sub { $self->set_current_page ($widget) },
3161 ); 3506 );
3162 3507
3163 $self->{multiplexer}->add ($widget); 3508 $self->{multiplexer}->add ($widget);
3164} 3509}
3165 3510
3511sub get_current_page {
3512 my ($self) = @_;
3513
3514 $self->{multiplexer}->get_current_page
3515}
3516
3166sub set_current_page { 3517sub set_current_page {
3167 my ($self, $page) = @_; 3518 my ($self, $page) = @_;
3168 3519
3169 $self->{multiplexer}->set_current_page ($page); 3520 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3521 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3522}
3172 3523
3173############################################################################# 3524#############################################################################
3174 3525
3175package CFClient::UI::Combobox; 3526package CFPlus::UI::Selector;
3176 3527
3177use utf8; 3528use utf8;
3178 3529
3179our @ISA = CFClient::UI::Button::; 3530our @ISA = CFPlus::UI::Button::;
3180 3531
3181sub new { 3532sub new {
3182 my $class = shift; 3533 my $class = shift;
3183 3534
3184 my $self = $class->SUPER::new ( 3535 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 3541 $self->_set_value ($self->{value});
3191 3542
3192 $self 3543 $self
3193} 3544}
3194 3545
3195sub button_down { 3546sub invoke_button_down {
3196 my ($self, $ev) = @_; 3547 my ($self, $ev) = @_;
3197 3548
3198 my @menu_items; 3549 my @menu_items;
3199 3550
3200 for (@{ $self->{options} }) { 3551 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 3552 my ($value, $title, $tooltip) = @$_;
3202 3553
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3554 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 3555 }
3205 3556
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3557 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 3558}
3208 3559
3209sub _set_value { 3560sub _set_value {
3210 my ($self, $value) = @_; 3561 my ($self, $value) = @_;
3211 3562
… …
3221 my ($self, $value) = @_; 3572 my ($self, $value) = @_;
3222 3573
3223 return unless $self->{value} ne $value; 3574 return unless $self->{value} ne $value;
3224 3575
3225 $self->_set_value ($value); 3576 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3577 $self->emit (changed => $value);
3227} 3578}
3228 3579
3229############################################################################# 3580#############################################################################
3230 3581
3231package CFClient::UI::Statusbox; 3582package CFPlus::UI::Statusbox;
3232 3583
3233our @ISA = CFClient::UI::VBox::; 3584our @ISA = CFPlus::UI::VBox::;
3234 3585
3235sub new { 3586sub new {
3236 my $class = shift; 3587 my $class = shift;
3237 3588
3238 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
… …
3250sub reorder { 3601sub reorder {
3251 my ($self) = @_; 3602 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 3603 my $NOW = Time::HiRes::time;
3253 3604
3254 # freeze display when hovering over any label 3605 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 3606 return if $CFPlus::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 3608 values %{ $self->{item} };
3258 3609
3259 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 3612 }
… …
3282 for ($short) { 3633 for ($short) {
3283 s/^\s+//; 3634 s/^\s+//;
3284 s/\s+/ /g; 3635 s/\s+/ /g;
3285 } 3636 }
3286 3637
3287 new CFClient::UI::Label 3638 new CFPlus::UI::Label
3288 markup => $short, 3639 markup => $short,
3289 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3346 count => 1, 3697 count => 1,
3347 %arg, 3698 %arg,
3348 }; 3699 };
3349 } 3700 }
3350 3701
3702 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3703 $self->reorder;
3704 });
3352} 3705}
3353 3706
3354sub reconfigure { 3707sub reconfigure {
3355 my ($self) = @_; 3708 my ($self) = @_;
3356 3709
… …
3369 $self->SUPER::destroy; 3722 $self->SUPER::destroy;
3370} 3723}
3371 3724
3372############################################################################# 3725#############################################################################
3373 3726
3374package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3375 3728
3376our @ISA = CFClient::UI::ScrolledWindow::; 3729our @ISA = CFPlus::UI::Table::;
3377 3730
3378sub new { 3731sub new {
3379 my $class = shift; 3732 my $class = shift;
3380 3733
3381 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3735 col_expand => [0, 1, 0],
3736 items => [],
3383 @_, 3737 @_,
3384 ); 3738 );
3385 3739
3740 $self->set_sort_order (undef);
3741
3386 $self 3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3387} 3778}
3388 3779
3389sub set_items { 3780sub set_items {
3390 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3391 3782
3392 $self->{child}->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3393 return unless $items; 3784 $self->update_items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412} 3785}
3413 3786
3414############################################################################# 3787#############################################################################
3415 3788
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList; 3789package CFPlus::UI::SpellList;
3615 3790
3616our @ISA = CFClient::UI::Table::; 3791our @ISA = CFPlus::UI::Table::;
3617 3792
3618sub new { 3793sub new {
3619 my $class = shift; 3794 my $class = shift;
3620 3795
3621 my $self = $class->SUPER::new ( 3796 my $self = $class->SUPER::new (
… …
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640 3815
3641sub rebuild_spell_list { 3816sub rebuild_spell_list {
3642 my ($self) = @_; 3817 my ($self) = @_;
3643 3818
3644 $CFClient::UI::ROOT->on_refresh ($self => sub { 3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear; 3820 $self->clear;
3646 3821
3647 return unless $::CONN; 3822 return unless $::CONN;
3648 3823
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654 3829
3655 my $row = 0; 3830 my $row = 0;
3656 3831
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_}; 3833 my $spell = $self->{spell}{$_};
… …
3665 if ($ev->{button} == 1) { 3840 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}"); 3841 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) { 3842 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}"); 3843 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) { 3844 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu 3845 (new CFPlus::UI::Menu
3671 items => [ 3846 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ], 3849 ],
3675 )->popup ($ev); 3850 )->popup ($ev);
3676 } else { 3851 } else {
3677 return 0; 3852 return 0;
3678 } 3853 }
3679 3854
3680 1 3855 1
3681 }; 3856 };
3682 3857
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3684 3859
3685 #TODO: add path info to tooltip 3860 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3687 3862
3688 $self->add (0, $row, new CFClient::UI::Face 3863 $self->add (0, $row, new CFPlus::UI::Face
3689 face => $spell->{face}, 3864 face => $spell->{face},
3690 can_hover => 1, 3865 can_hover => 1,
3691 can_events => 1, 3866 can_events => 1,
3692 tooltip => $tooltip, 3867 tooltip => $tooltip,
3693 on_button_down => $spell_cb, 3868 on_button_down => $spell_cb,
3694 ); 3869 );
3695 3870
3696 $self->add (1, $row, new CFClient::UI::Label 3871 $self->add (1, $row, new CFPlus::UI::Label
3697 expand => 1, 3872 expand => 1,
3698 text => $spell->{name}, 3873 text => $spell->{name},
3699 can_hover => 1, 3874 can_hover => 1,
3700 can_events => 1, 3875 can_events => 1,
3701 tooltip => $tooltip, 3876 tooltip => $tooltip,
3702 on_button_down => $spell_cb, 3877 on_button_down => $spell_cb,
3703 ); 3878 );
3704 3879
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 } 3884 }
3710 }); 3885 });
3711} 3886}
3712 3887
3713sub add_spell { 3888sub add_spell {
… …
3731 $self->rebuild_spell_list; 3906 $self->rebuild_spell_list;
3732} 3907}
3733 3908
3734############################################################################# 3909#############################################################################
3735 3910
3736package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3737 3912
3738our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3739 3914
3740use List::Util qw(min max); 3915use List::Util qw(min max);
3741 3916
3742use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3743 3918
3744sub new { 3919sub new {
3745 my $class = shift; 3920 my $class = shift;
3746 3921
3747 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3772 $coord = $max - $size if $coord > $max - $size; 3947 $coord = $max - $size if $coord > $max - $size;
3773 3948
3774 int $coord + 0.5 3949 int $coord + 0.5
3775} 3950}
3776 3951
3777sub size_allocate { 3952sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3953 my ($self, $w, $h) = @_;
3779 3954
3780 for my $child ($self->children) { 3955 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3957
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3961 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3962 $Y = _to_pixel $Y, $H, $self->{h};
3788 3963
3789 $child->configure ($X, $Y, $W, $H); 3964 $child->configure ($X, $Y, $W, $H);
3790 } 3965 }
3966
3967 1
3791} 3968}
3792 3969
3793sub coord2local { 3970sub coord2local {
3794 my ($self, $x, $y) = @_; 3971 my ($self, $x, $y) = @_;
3795 3972
… …
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922 4099
3923 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3924 $h = 0 if $h < 0; 4101 $h = 0 if $h < 0;
3925 4102
4103 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h;
4105
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111
3926 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3927 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3928 4114
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w}; 4116 $widget->{old_w} = $widget->{w};
… …
3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3955 glLoadIdentity; 4141 glLoadIdentity;
3956 4142
3957 { 4143 {
3958 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3959 4145
3960 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3962 }
3963 4148
3964 $self->_draw; 4149 $self->_draw;
4150 }
3965} 4151}
3966 4152
3967############################################################################# 4153#############################################################################
3968 4154
3969package CFClient::UI; 4155package CFPlus::UI;
3970 4156
3971$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3972$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973 4159
39741 41601
3975 4161

Diff Legend

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