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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.342 by root, Sun Aug 13 14:38:35 2006 UTC

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

Diff Legend

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