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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.342 by root, Sun Aug 13 14:38:35 2006 UTC

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

Diff Legend

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