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.301 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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