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

Diff Legend

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