ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC

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

Diff Legend

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