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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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