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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 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};
… …
239 262
240sub destroy { 263sub destroy {
241 my ($self) = @_; 264 my ($self) = @_;
242 265
243 $self->hide; 266 $self->hide;
267 $self->emit ("destroy");
244 %$self = (); 268 %$self = ();
245} 269}
246 270
247sub show { 271sub show {
248 my ($self) = @_; 272 my ($self) = @_;
249 273
250 return if $self->{parent}; 274 return if $self->{parent};
251 275
252 $CFClient::UI::ROOT->add ($self); 276 $CFPlus::UI::ROOT->add ($self);
253} 277}
254 278
255sub set_visible { 279sub set_visible {
256 my ($self) = @_; 280 my ($self) = @_;
257 281
… …
278 delete $self->{root}; 302 delete $self->{root};
279 303
280 undef $GRAB if $GRAB == $self; 304 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 305 undef $HOVER if $HOVER == $self;
282 306
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 307 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 308 if $TOOLTIP->{owner} == $self;
285 309
286 $self->emit ("focus_out"); 310 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 311 $self->emit (visibility_change => 0);
288} 312}
… …
345 my ($self, $x, $y, $w, $h) = @_; 369 my ($self, $x, $y, $w, $h) = @_;
346 370
347 if ($self->{aspect}) { 371 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 372 my ($ow, $oh) = ($w, $h);
349 373
350 $w = List::Util::min $w, int $h * $self->{aspect}; 374 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 375 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 376
353 # use alignment to adjust x, y 377 # use alignment to adjust x, y
354 378
355 $x += int 0.5 * ($ow - $w); 379 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 380 $y += int 0.5 * ($oh - $h);
… …
397 421
398 return if $self->{tooltip} eq $tooltip; 422 return if $self->{tooltip} eq $tooltip;
399 423
400 $self->{tooltip} = $tooltip; 424 $self->{tooltip} = $tooltip;
401 425
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 426 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 427 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 428 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 429 }
406} 430}
407 431
408# translate global coordinates to local coordinate system 432# translate global coordinates to local coordinate system
409sub coord2local { 433sub coord2local {
410 my ($self, $x, $y) = @_; 434 my ($self, $x, $y) = @_;
411 435
436 Carp::confess unless $self->{parent};#d#
437
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 438 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 439}
414 440
415# translate local coordinates to global coordinate system 441# translate local coordinates to global coordinate system
416sub coord2global { 442sub coord2global {
417 my ($self, $x, $y) = @_; 443 my ($self, $x, $y) = @_;
418 444
445 Carp::confess unless $self->{parent};#d#
446
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 447 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 448}
421 449
422sub invoke_focus_in { 450sub invoke_focus_in {
423 my ($self) = @_; 451 my ($self) = @_;
424 452
425 return if $FOCUS == $self; 453 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 454 return unless $self->{can_focus};
427 455
428 my $focus = $FOCUS; $FOCUS = $self; 456 $FOCUS = $self;
429 457
430 $focus->update if $focus; 458 $self->update;
431 $FOCUS->update;
432 459
433 0 460 0
434} 461}
435 462
436sub invoke_focus_out { 463sub invoke_focus_out {
437 my ($self) = @_; 464 my ($self) = @_;
438 465
439 return unless $FOCUS == $self; 466 return unless $FOCUS == $self;
440 467
441 my $focus = $FOCUS; undef $FOCUS; 468 undef $FOCUS;
442 469
443 $focus->update if $focus; #? 470 $self->update;
444 471
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 472 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 473 unless $FOCUS;
447 474
448 0 475 0
449} 476}
450 477
451sub grab_focus { 478sub grab_focus {
452 my ($self) = @_; 479 my ($self) = @_;
453 480
481 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 482 $self->emit ("focus_in");
455} 483}
456 484
457sub invoke_mouse_motion { 1 } 485sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 486sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 487sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 488sub invoke_key_up { 0 }
489sub invoke_mouse_wheel { 0 }
461 490
462sub invoke_button_down { 491sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 492 my ($self, $ev, $x, $y) = @_;
464 493
465 $self->grab_focus; 494 $self->grab_focus;
466 495
467 1 496 0
468} 497}
469 498
470sub connect { 499sub connect {
471 my ($self, $signal, $cb) = @_; 500 my ($self, $signal, $cb) = @_;
472 501
473 push @{ $self->{signal_cb}{$signal} }, $cb; 502 push @{ $self->{signal_cb}{$signal} }, $cb;
503
504 defined wantarray and CFPlus::guard {
505 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
506 @{ $self->{signal_cb}{$signal} };
507 }
474} 508}
509
510sub disconnect_all {
511 my ($self, $signal) = @_;
512
513 delete $self->{signal_cb}{$signal};
514}
515
516my %has_coords = (
517 button_down => 1,
518 button_up => 1,
519 mouse_motion => 1,
520 mouse_wheel => 1,
521);
475 522
476sub emit { 523sub emit {
477 my ($self, $signal, @args) = @_; 524 my ($self, $signal, @args) = @_;
478 525
526 # I do not really like this solution, but I do not like duplication
527 # and needlessly verbose code, either.
528 my @append
529 = $has_coords{$signal}
530 ? $args[0]->xy ($self)
531 : ();
532
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534
479 #d##TODO# stop propagating at first true, do not use sum 535 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 539}
484 540
485sub find_widget { 541sub find_widget {
486 my ($self, $x, $y) = @_; 542 my ($self, $x, $y) = @_;
487 543
… …
571 glVertex $self->{w} - 1, 0; 627 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 628 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 629 glVertex 0 , $self->{h} - 1;
574 glEnd; 630 glEnd;
575 glPopMatrix; 631 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 633 }
578 634
579 $self->_draw; 635 $self->_draw;
580 glPopMatrix; 636 glPopMatrix;
581} 637}
… …
587} 643}
588 644
589sub DESTROY { 645sub DESTROY {
590 my ($self) = @_; 646 my ($self) = @_;
591 647
592 delete $WIDGET{$self+0}; 648 return if CFPlus::in_destruct;
593 649
594 eval { $self->destroy }; 650 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652
653 delete $WIDGET{$self+0};
596} 654}
597 655
598############################################################################# 656#############################################################################
599 657
600package CFClient::UI::DrawBG; 658package CFPlus::UI::DrawBG;
601 659
602our @ISA = CFClient::UI::Base::; 660our @ISA = CFPlus::UI::Base::;
603 661
604use strict; 662use strict;
605use CFClient::OpenGL; 663use CFPlus::OpenGL;
606 664
607sub new { 665sub new {
608 my $class = shift; 666 my $class = shift;
609 667
610 # range [value, low, high, page] 668 # range [value, low, high, page]
… …
641 } 699 }
642} 700}
643 701
644############################################################################# 702#############################################################################
645 703
646package CFClient::UI::Empty; 704package CFPlus::UI::Empty;
647 705
648our @ISA = CFClient::UI::Base::; 706our @ISA = CFPlus::UI::Base::;
649 707
650sub new { 708sub new {
651 my ($class, %arg) = @_; 709 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 710 $class->SUPER::new (can_events => 0, %arg);
653} 711}
… …
660 718
661sub draw { } 719sub draw { }
662 720
663############################################################################# 721#############################################################################
664 722
665package CFClient::UI::Container; 723package CFPlus::UI::Container;
666 724
667our @ISA = CFClient::UI::Base::; 725our @ISA = CFPlus::UI::Base::;
668 726
669sub new { 727sub new {
670 my ($class, %arg) = @_; 728 my ($class, %arg) = @_;
671 729
672 my $children = delete $arg{children}; 730 my $children = delete $arg{children};
… …
681 if $children; 739 if $children;
682 740
683 $self 741 $self
684} 742}
685 743
744sub realloc {
745 my ($self) = @_;
746
747 $self->{force_realloc} = 1;
748 $self->{force_size_alloc} = 1;
749 $self->SUPER::realloc;
750}
751
686sub add { 752sub add {
687 my ($self, @widgets) = @_; 753 my ($self, @widgets) = @_;
688 754
689 $_->set_parent ($self) 755 $_->set_parent ($self)
690 for @widgets; 756 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 816 $_->draw for @{$self->{children}};
751} 817}
752 818
753############################################################################# 819#############################################################################
754 820
755package CFClient::UI::Bin; 821package CFPlus::UI::Bin;
756 822
757our @ISA = CFClient::UI::Container::; 823our @ISA = CFPlus::UI::Container::;
758 824
759sub new { 825sub new {
760 my ($class, %arg) = @_; 826 my ($class, %arg) = @_;
761 827
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 828 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 829
764 $class->SUPER::new (children => [$child], %arg) 830 $class->SUPER::new (children => [$child], %arg)
765} 831}
766 832
767sub add { 833sub add {
… …
774sub remove { 840sub remove {
775 my ($self, $widget) = @_; 841 my ($self, $widget) = @_;
776 842
777 $self->SUPER::remove ($widget); 843 $self->SUPER::remove ($widget);
778 844
779 $self->{children} = [new CFClient::UI::Empty] 845 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 846 unless @{$self->{children}};
781} 847}
782 848
783sub child { $_[0]->{children}[0] } 849sub child { $_[0]->{children}[0] }
784 850
… …
796 862
797############################################################################# 863#############################################################################
798 864
799# back-buffered drawing area 865# back-buffered drawing area
800 866
801package CFClient::UI::Window; 867package CFPlus::UI::Window;
802 868
803our @ISA = CFClient::UI::Bin::; 869our @ISA = CFPlus::UI::Bin::;
804 870
805use CFClient::OpenGL; 871use CFPlus::OpenGL;
806 872
807sub new { 873sub new {
808 my ($class, %arg) = @_; 874 my ($class, %arg) = @_;
809 875
810 my $self = $class->SUPER::new (%arg); 876 my $self = $class->SUPER::new (%arg);
… …
832} 898}
833 899
834sub render_child { 900sub render_child {
835 my ($self) = @_; 901 my ($self) = @_;
836 902
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 903 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 904 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 905 glClear GL_COLOR_BUFFER_BIT;
840 906
841 { 907 {
842 package CFClient::UI::Base; 908 package CFPlus::UI::Base;
843 909
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 910 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 911 (0, 0, $self->{w}, $self->{h});
912
913 $self->_render;
846 } 914 }
847
848 $self->_render;
849 }; 915 };
850} 916}
851 917
852sub _draw { 918sub _draw {
853 my ($self) = @_; 919 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 920
857 my $tex = $self->{texture} 921 my $tex = $self->{texture}
858 or return; 922 or return;
859 923
860 glEnable GL_TEXTURE_2D; 924 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 926 glColor 0, 0, 0, 1;
863 927
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 928 $tex->draw_quad_alpha_premultiplied (0, 0);
865 929
866 glDisable GL_TEXTURE_2D; 930 glDisable GL_TEXTURE_2D;
867} 931}
868 932
869############################################################################# 933#############################################################################
870 934
871package CFClient::UI::ViewPort; 935package CFPlus::UI::ViewPort;
872 936
873our @ISA = CFClient::UI::Window::; 937our @ISA = CFPlus::UI::Window::;
874 938
875sub new { 939sub new {
876 my $class = shift; 940 my $class = shift;
877 941
878 $class->SUPER::new ( 942 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1004 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1006 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1007 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1008 }
945} 1009}
946 1010
947sub _render { 1011sub _render {
948 my ($self) = @_; 1012 my ($self) = @_;
949 1013
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1014 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1015 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1016
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1017 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1018
955 $self->SUPER::_render; 1019 $self->SUPER::_render;
956} 1020}
957 1021
958############################################################################# 1022#############################################################################
959 1023
960package CFClient::UI::ScrolledWindow; 1024package CFPlus::UI::ScrolledWindow;
961 1025
962our @ISA = CFClient::UI::HBox::; 1026our @ISA = CFPlus::UI::HBox::;
963 1027
964sub new { 1028sub new {
965 my ($class, %arg) = @_; 1029 my ($class, %arg) = @_;
966 1030
967 my $child = delete $arg{child}; 1031 my $child = delete $arg{child};
968 1032
969 my $self; 1033 my $self;
970 1034
971 my $slider = new CFClient::UI::Slider 1035 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1036 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1037 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1038 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1039 $self->{vp}->set_offset (0, $_[1]);
976 }, 1040 },
977 ; 1041 ;
978 1042
979 $self = $class->SUPER::new ( 1043 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1044 vp => (new CFPlus::UI::ViewPort expand => 1),
1045 can_events => 1,
981 slider => $slider, 1046 slider => $slider,
982 %arg, 1047 %arg,
983 ); 1048 );
984 1049
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1050 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1051 $self->add ($child) if $child;
987 1052
988 $self 1053 $self
989} 1054}
990 1055
1056#TODO# update range on size_allocate depending on child
1057
991sub add { 1058sub add {
992 my ($self, $widget) = @_; 1059 my ($self, $widget) = @_;
993 1060
994 $self->{vp}->add ($self->{child} = $widget); 1061 $self->{vp}->add ($self->{child} = $widget);
995} 1062}
996 1063
1064sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_;
1066
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev);
1070
1071 1
1072}
1073
1074sub update_slider {
1075 my ($self) = @_;
1076
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1078}
1079
997sub update { 1080sub update {
998 my ($self) = @_; 1081 my ($self) = @_;
999 1082
1000 $self->SUPER::update; 1083 $self->SUPER::update;
1001 1084
1002 # todo: overwrite size_allocate of child 1085 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1086}
1006 1087
1007sub invoke_size_allocate { 1088sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1089 my ($self, $w, $h) = @_;
1009 1090
1010 my $child = $self->{vp}->child; 1091 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1092
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1093 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1094}
1015 1095
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1096#############################################################################
1020 1097
1021package CFClient::UI::Frame; 1098package CFPlus::UI::Frame;
1022 1099
1023our @ISA = CFClient::UI::Bin::; 1100our @ISA = CFPlus::UI::Bin::;
1024 1101
1025use CFClient::OpenGL; 1102use CFPlus::OpenGL;
1026 1103
1027sub new { 1104sub new {
1028 my $class = shift; 1105 my $class = shift;
1029 1106
1030 $class->SUPER::new ( 1107 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1133 $self->SUPER::_draw;
1057} 1134}
1058 1135
1059############################################################################# 1136#############################################################################
1060 1137
1061package CFClient::UI::FancyFrame; 1138package CFPlus::UI::FancyFrame;
1062 1139
1063our @ISA = CFClient::UI::Bin::; 1140our @ISA = CFPlus::UI::Bin::;
1064 1141
1065use CFClient::OpenGL; 1142use CFPlus::OpenGL;
1143
1144sub new {
1145 my ($class, %arg) = @_;
1146
1147 if ((exists $arg{label}) && !ref $arg{label}) {
1148 $arg{label} = new CFPlus::UI::Label
1149 align => 1,
1150 valign => 0,
1151 text => $arg{label},
1152 fontsize => ($arg{border} || 0.8) * 0.75;
1153 }
1154
1155 my $self = $class->SUPER::new (
1156 # label => "",
1157 fg => [0.6, 0.3, 0.1],
1158 border => 0.8,
1159 style => 'single',
1160 %arg,
1161 );
1162
1163 $self
1164}
1165
1166sub add {
1167 my ($self, @widgets) = @_;
1168
1169 $self->SUPER::add (@widgets);
1170 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1171}
1172
1173sub border {
1174 int $_[0]{border} * $::FONTSIZE
1175}
1176
1177sub size_request {
1178 my ($self) = @_;
1179
1180 ($self->{label_w}, undef) = $self->{label}->size_request
1181 if $self->{label};
1182
1183 my ($w, $h) = $self->SUPER::size_request;
1184
1185 (
1186 $w + $self->border * 2,
1187 $h + $self->border * 2,
1188 )
1189}
1190
1191sub invoke_size_allocate {
1192 my ($self, $w, $h) = @_;
1193
1194 my $border = $self->border;
1195
1196 $w -= List::Util::max 0, $border * 2;
1197 $h -= List::Util::max 0, $border * 2;
1198
1199 if (my $label = $self->{label}) {
1200 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1201 $label->{h} = List::Util::min $h, $border;
1202 $label->invoke_size_allocate ($label->{w}, $label->{h});
1203 }
1204
1205 $self->child->configure ($border, $border, $w, $h);
1206
1207 1
1208}
1209
1210sub _draw {
1211 my ($self) = @_;
1212
1213 my $child = $self->{children}[0];
1214
1215 my $border = $self->border;
1216 my ($w, $h) = ($self->{w}, $self->{h});
1217
1218 $child->draw;
1219
1220 glColor @{$self->{fg}};
1221 glBegin GL_LINE_STRIP;
1222 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1223 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1224 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1225 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1226 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1227 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1228 glEnd;
1229
1230 if ($self->{label}) {
1231 glTranslate $border * 2, 0;
1232 $self->{label}->_draw;
1233 }
1234}
1235
1236#############################################################################
1237
1238package CFPlus::UI::Toplevel;
1239
1240our @ISA = CFPlus::UI::Bin::;
1241
1242use CFPlus::OpenGL;
1066 1243
1067my $bg = 1244my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1245 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1246 mipmap => 1, wrap => 1;
1070 1247
1071my @border = 1248my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1250 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1251
1075sub new { 1252sub new {
1076 my ($class, %arg) = @_; 1253 my ($class, %arg) = @_;
1077 1254
1078 my $self = $class->SUPER::new ( 1255 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1256 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1257 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1258 border => 0.6,
1082 can_events => 1, 1259 can_events => 1,
1083 min_w => 16, 1260 min_w => 64,
1084 min_h => 16, 1261 min_h => 32,
1085 %arg, 1262 %arg,
1086 ); 1263 );
1087 1264
1088 $self->{title_widget} = new CFClient::UI::Label 1265 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1266 align => 0,
1090 valign => 1, 1267 valign => 1,
1091 text => $self->{title}, 1268 text => $self->{title},
1092 fontsize => $self->{border}, 1269 fontsize => $self->{border},
1093 if exists $self->{title}; 1270 if exists $self->{title};
1094 1271
1095 if ($self->{has_close_button}) { 1272 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1273 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1274 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1275 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1276 on_activate => sub { $self->emit ("delete") };
1100 1277
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1278 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1279 }
1103 1280
1104 $self 1281 $self
1105} 1282}
1106 1283
1107sub add { 1284sub add {
1108 my ($self, @widgets) = @_; 1285 my ($self, @widgets) = @_;
1109 1286
1110 $self->SUPER::add (@widgets); 1287 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1288 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1289 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1290}
1114 1291
1115sub border { 1292sub border {
1116 int $_[0]{border} * $::FONTSIZE 1293 int $_[0]{border} * $::FONTSIZE
1117} 1294}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1327 $self->child->configure ($border, $border, $w, $h);
1151 1328
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1329 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1330 if $self->{close_button};
1154 1331
1332 1
1333}
1334
1335sub invoke_delete {
1336 my ($self) = @_;
1337
1338 $self->hide;
1339
1155 1 1340 1
1156} 1341}
1157 1342
1158sub invoke_button_down { 1343sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1344 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1402 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1403
1219 ! ! $self->{motion} 1404 ! ! $self->{motion}
1220} 1405}
1221 1406
1407sub invoke_visibility_change {
1408 my ($self, $visible) = @_;
1409
1410 delete $self->{motion} unless $visible;
1411
1412 0
1413}
1414
1222sub _draw { 1415sub _draw {
1223 my ($self) = @_; 1416 my ($self) = @_;
1224 1417
1225 my $child = $self->{children}[0]; 1418 my $child = $self->{children}[0];
1226 1419
… …
1263 if $self->{close_button}; 1456 if $self->{close_button};
1264} 1457}
1265 1458
1266############################################################################# 1459#############################################################################
1267 1460
1268package CFClient::UI::Table; 1461package CFPlus::UI::Table;
1269 1462
1270our @ISA = CFClient::UI::Base::; 1463our @ISA = CFPlus::UI::Base::;
1271 1464
1272use List::Util qw(max sum); 1465use List::Util qw(max sum);
1273 1466
1274use CFClient::OpenGL; 1467use CFPlus::OpenGL;
1275 1468
1276sub new { 1469sub new {
1277 my $class = shift; 1470 my $class = shift;
1278 1471
1279 $class->SUPER::new ( 1472 $class->SUPER::new (
… …
1285sub children { 1478sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1480}
1288 1481
1289sub add { 1482sub add {
1290 my ($self, $x, $y, $child) = @_; 1483 my ($self) = shift;
1291 1484
1485 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1487 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1488 $self->{children}[$y][$x] = $child;
1489 }
1294 1490
1491 $self->{force_realloc} = 1;
1492 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1493 $self->realloc;
1296} 1494}
1297 1495
1298sub remove { 1496sub remove {
1299 my ($self, $child) = @_; 1497 my ($self, $child) = @_;
… …
1364 1562
1365 # linearly scale sizes 1563 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1566
1369 CFClient::UI::harmonize $ws; 1567 CFPlus::UI::harmonize $ws;
1370 CFClient::UI::harmonize $hs; 1568 CFPlus::UI::harmonize $hs;
1371 1569
1372 my $y; 1570 my $y;
1373 1571
1374 for my $r (0 .. $#{$self->{children}}) { 1572 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1573 my $row = $self->{children}[$r]
… …
1418 } 1616 }
1419} 1617}
1420 1618
1421############################################################################# 1619#############################################################################
1422 1620
1423package CFClient::UI::Box; 1621package CFPlus::UI::Box;
1424 1622
1425our @ISA = CFClient::UI::Container::; 1623our @ISA = CFPlus::UI::Container::;
1426 1624
1427sub size_request { 1625sub size_request {
1428 my ($self) = @_; 1626 my ($self) = @_;
1429 1627
1430 $self->{vertical} 1628 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1661 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1662 for 0 .. $#children;
1465 } 1663 }
1466 } 1664 }
1467 1665
1468 CFClient::UI::harmonize \@req; 1666 CFPlus::UI::harmonize \@req;
1469 1667
1470 my $pos = 0; 1668 my $pos = 0;
1471 for (0 .. $#children) { 1669 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1670 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1671 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1676 1
1479} 1677}
1480 1678
1481############################################################################# 1679#############################################################################
1482 1680
1483package CFClient::UI::HBox; 1681package CFPlus::UI::HBox;
1484 1682
1485our @ISA = CFClient::UI::Box::; 1683our @ISA = CFPlus::UI::Box::;
1486 1684
1487sub new { 1685sub new {
1488 my $class = shift; 1686 my $class = shift;
1489 1687
1490 $class->SUPER::new ( 1688 $class->SUPER::new (
… …
1493 ) 1691 )
1494} 1692}
1495 1693
1496############################################################################# 1694#############################################################################
1497 1695
1498package CFClient::UI::VBox; 1696package CFPlus::UI::VBox;
1499 1697
1500our @ISA = CFClient::UI::Box::; 1698our @ISA = CFPlus::UI::Box::;
1501 1699
1502sub new { 1700sub new {
1503 my $class = shift; 1701 my $class = shift;
1504 1702
1505 $class->SUPER::new ( 1703 $class->SUPER::new (
… …
1508 ) 1706 )
1509} 1707}
1510 1708
1511############################################################################# 1709#############################################################################
1512 1710
1513package CFClient::UI::Label; 1711package CFPlus::UI::Label;
1514 1712
1515our @ISA = CFClient::UI::DrawBG::; 1713our @ISA = CFPlus::UI::DrawBG::;
1516 1714
1517use CFClient::OpenGL; 1715use CFPlus::OpenGL;
1518 1716
1519sub new { 1717sub new {
1520 my ($class, %arg) = @_; 1718 my ($class, %arg) = @_;
1521 1719
1522 my $self = $class->SUPER::new ( 1720 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1723 #active_bg => none
1526 #font => default_font 1724 #font => default_font
1527 #text => initial text 1725 #text => initial text
1528 #markup => initial narkup 1726 #markup => initial narkup
1529 #max_w => maximum pixel width 1727 #max_w => maximum pixel width
1728 #style => 0, # render flags
1530 ellipsise => 3, # end 1729 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1730 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1731 fontsize => 1,
1533 align => -1, 1732 align => -1,
1534 valign => -1, 1733 valign => -1,
1535 padding_x => 2, 1734 padding_x => 2,
1536 padding_y => 2, 1735 padding_y => 2,
1537 can_events => 0, 1736 can_events => 0,
1538 %arg 1737 %arg
1539 ); 1738 );
1540 1739
1541 if (exists $self->{template}) { 1740 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1741 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1742 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1743 $self->{template} = $layout;
1545 } 1744 }
1546 1745
1547 if (exists $self->{markup}) { 1746 if (exists $self->{markup}) {
… …
1551 } 1750 }
1552 1751
1553 $self 1752 $self
1554} 1753}
1555 1754
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1755sub update {
1567 my ($self) = @_; 1756 my ($self) = @_;
1568 1757
1569 delete $self->{texture}; 1758 delete $self->{texture};
1570 $self->SUPER::update; 1759 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1770 my ($self, $text) = @_;
1582 1771
1583 return if $self->{text} eq "T$text"; 1772 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1773 $self->{text} = "T$text";
1585 1774
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1775 $self->{layout}->set_text ($text);
1588 1776
1589 delete $self->{size_req}; 1777 delete $self->{size_req};
1590 $self->realloc; 1778 $self->realloc;
1591 $self->update; 1779 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1785 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1786 $self->{text} = "M$markup";
1599 1787
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1788 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1789
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1790 $self->{layout}->set_markup ($markup);
1604 1791
1605 delete $self->{size_req}; 1792 delete $self->{size_req};
1606 $self->realloc; 1793 $self->realloc;
1607 $self->update; 1794 $self->update;
… …
1619 1806
1620 my ($w, $h) = $self->{layout}->size; 1807 my ($w, $h) = $self->{layout}->size;
1621 1808
1622 if (exists $self->{template}) { 1809 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1810 $self->{template}->set_font ($self->{font}) if $self->{font};
1811 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1812 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1813
1626 my ($w2, $h2) = $self->{template}->size; 1814 my ($w2, $h2) = $self->{template}->size;
1627 1815
1628 $w = List::Util::max $w, $w2; 1816 $w = List::Util::max $w, $w2;
… …
1652 1840
1653sub set_fontsize { 1841sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1842 my ($self, $fontsize) = @_;
1655 1843
1656 $self->{fontsize} = $fontsize; 1844 $self->{fontsize} = $fontsize;
1845 delete $self->{size_req};
1657 delete $self->{texture}; 1846 delete $self->{texture};
1658 1847
1659 $self->realloc; 1848 $self->realloc;
1660} 1849}
1661 1850
1662sub reconfigure { 1851sub reconfigure {
1663 my ($self) = @_; 1852 my ($self) = @_;
1664 1853
1665 delete $self->{size_req}; 1854 delete $self->{size_req};
1855 delete $self->{texture};
1666 1856
1667 $self->SUPER::reconfigure; 1857 $self->SUPER::reconfigure;
1668} 1858}
1669 1859
1670sub _draw { 1860sub _draw {
1671 my ($self) = @_; 1861 my ($self) = @_;
1672 1862
1673 $self->SUPER::_draw; # draw background, if applicable 1863 $self->SUPER::_draw; # draw background, if applicable
1674 1864
1675 my $tex = $self->{texture} ||= do { 1865 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1866 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1867 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1868 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1869 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1870 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1871 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1872
1683 new_from_layout CFClient::Texture $self->{layout} 1873 [$self->{layout}->size]
1684 }; 1874 };
1685 1875
1686 unless (exists $self->{ox}) { 1876 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1877 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1878 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1879 : ($self->{w} - $size->[0]) * 0.5);
1690 1880
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1883 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1884 };
1695 1885
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1886 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1887 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1888
1701 if ($tex->{format} == GL_ALPHA) { 1889 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 1890}
1712 1891
1713############################################################################# 1892#############################################################################
1714 1893
1715package CFClient::UI::EntryBase; 1894package CFPlus::UI::EntryBase;
1716 1895
1717our @ISA = CFClient::UI::Label::; 1896our @ISA = CFPlus::UI::Label::;
1718 1897
1719use CFClient::OpenGL; 1898use CFPlus::OpenGL;
1720 1899
1721sub new { 1900sub new {
1722 my $class = shift; 1901 my $class = shift;
1723 1902
1724 $class->SUPER::new ( 1903 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 1907 active_fg => [0, 0, 0],
1729 can_hover => 1, 1908 can_hover => 1,
1730 can_focus => 1, 1909 can_focus => 1,
1731 valign => 0, 1910 valign => 0,
1732 can_events => 1, 1911 can_events => 1,
1912 ellipsise => 0,
1733 #text => ... 1913 #text => ...
1734 #hidden => "*", 1914 #hidden => "*",
1735 @_ 1915 @_
1736 ) 1916 )
1737} 1917}
… …
1786 1966
1787 if ($uni == 8) { 1967 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 1969 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 1970 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 1971 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 1972 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 1973 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1974 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 1975 } elsif ($sym == CFPlus::SDLK_HOME) {
1796 $self->{cursor} = 0; 1976 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) { 1977 } elsif ($sym == CFPlus::SDLK_END) {
1798 $self->{cursor} = length $text; 1978 $self->{cursor} = length $text;
1979 } elsif ($uni == 21) { # ctrl-u
1980 $text = "";
1981 $self->{cursor} = 0;
1799 } elsif ($uni == 27) { 1982 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 1983 $self->emit ('escape');
1801 } elsif ($uni) { 1984 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 1985 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 1986 } else {
1804 return 0; 1987 return 0;
1805 } 1988 }
1806 1989
1807 $self->_set_text ($text); 1990 $self->_set_text ($text);
1808 1991
1809 $self->realloc; 1992 $self->realloc;
1993 $self->update;
1810 1994
1811 1 1995 1
1812} 1996}
1813 1997
1814sub invoke_focus_in { 1998sub invoke_focus_in {
… …
1826 2010
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2011 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2012
1829 # byte-index to char-index 2013 # byte-index to char-index
1830 my $text = $self->{text}; 2014 my $text = $self->{text};
1831 utf8::encode $text; 2015 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2016 $self->{cursor} = length $text;
1833 2017
1834 $self->_set_text ($self->{text}); 2018 $self->_set_text ($self->{text});
1835 $self->update; 2019 $self->update;
1836 2020
1837 1 2021 1
… …
1876 utf8::encode $text; 2060 utf8::encode $text;
1877 2061
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2062 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2063 }
1880 2064
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2065 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2066 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2067 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2068 glEnd;
1886 } 2069 }
1887} 2070}
1888 2071
2072#############################################################################
2073
1889package CFClient::UI::Entry; 2074package CFPlus::UI::Entry;
1890 2075
1891our @ISA = CFClient::UI::EntryBase::; 2076our @ISA = CFPlus::UI::EntryBase::;
1892 2077
1893use CFClient::OpenGL; 2078use CFPlus::OpenGL;
1894 2079
1895sub invoke_key_down { 2080sub invoke_key_down {
1896 my ($self, $ev) = @_; 2081 my ($self, $ev) = @_;
1897 2082
1898 my $sym = $ev->{sym}; 2083 my $sym = $ev->{sym};
1899 2084
1900 if ($sym == 13) { 2085 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2086 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2087 my $txt = $self->get_text;
1903 2088
1904 $self->{history_pointer} = -1; 2089 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2090 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2091 $self->emit (activate => $txt);
1907 $self->update; 2092 $self->update;
1908 2093
1909 } elsif ($sym == CFClient::SDLK_UP) { 2094 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2095 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2096 $self->{history_saveback} = $self->get_text;
1912 } 2097 }
1913 if (@{$self->{history} || []} > 0) { 2098 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2099 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2101 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2102 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2103 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2104 }
1920 2105
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2106 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2107 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2108 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2109
1925 if ($self->{history_pointer} >= 0) { 2110 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2111 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2120 1
1936} 2121}
1937 2122
1938############################################################################# 2123#############################################################################
1939 2124
2125package CFPlus::UI::TextEdit;
2126
2127our @ISA = CFPlus::UI::EntryBase::;
2128
2129use CFPlus::OpenGL;
2130
2131sub move_cursor_ver {
2132 my ($self, $dy) = @_;
2133
2134 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2135
2136 $y += $dy;
2137
2138 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2139 $self->{cursor} = $index;
2140 delete $self->{cur_h};
2141 $self->update;
2142 return;
2143 }
2144}
2145
2146sub invoke_key_down {
2147 my ($self, $ev) = @_;
2148
2149 my $sym = $ev->{sym};
2150
2151 if ($sym == CFPlus::SDLK_UP) {
2152 $self->move_cursor_ver (-1);
2153 } elsif ($sym == CFPlus::SDLK_DOWN) {
2154 $self->move_cursor_ver (+1);
2155 } else {
2156 return $self->SUPER::invoke_key_down ($ev)
2157 }
2158
2159 1
2160}
2161
2162#############################################################################
2163
1940package CFClient::UI::Button; 2164package CFPlus::UI::Button;
1941 2165
1942our @ISA = CFClient::UI::Label::; 2166our @ISA = CFPlus::UI::Label::;
1943 2167
1944use CFClient::OpenGL; 2168use CFPlus::OpenGL;
1945 2169
1946my @tex = 2170my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2172 qw(b1_button_active.png);
1949 2173
1950sub new { 2174sub new {
1951 my $class = shift; 2175 my $class = shift;
1952 2176
… …
1989 $self->SUPER::_draw; 2213 $self->SUPER::_draw;
1990} 2214}
1991 2215
1992############################################################################# 2216#############################################################################
1993 2217
2218package CFPlus::UI::CheckBox;
2219
2220our @ISA = CFPlus::UI::DrawBG::;
2221
2222my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2225
2226use CFPlus::OpenGL;
2227
2228sub new {
2229 my $class = shift;
2230
2231 $class->SUPER::new (
2232 padding_x => 2,
2233 padding_y => 2,
2234 fg => [1, 1, 1],
2235 active_fg => [1, 1, 0],
2236 bg => [0, 0, 0, 0.2],
2237 active_bg => [1, 1, 1, 0.5],
2238 state => 0,
2239 can_hover => 1,
2240 @_
2241 )
2242}
2243
2244sub size_request {
2245 my ($self) = @_;
2246
2247 (6) x 2
2248}
2249
2250sub toggle {
2251 my ($self) = @_;
2252
2253 $self->{state} = !$self->{state};
2254 $self->emit (changed => $self->{state});
2255 $self->update;
2256}
2257
2258sub invoke_button_down {
2259 my ($self, $ev, $x, $y) = @_;
2260
2261 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2262 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2263 $self->toggle;
2264 } else {
2265 return 0
2266 }
2267
2268 1
2269}
2270
2271sub _draw {
2272 my ($self) = @_;
2273
2274 $self->SUPER::_draw;
2275
2276 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2277
2278 my ($w, $h) = @$self{qw(w h)};
2279
2280 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2281
2282 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2283
2284 my $tex = $self->{state} ? $tex[1] : $tex[0];
2285
2286 glEnable GL_TEXTURE_2D;
2287 $tex->draw_quad_alpha (0, 0, $s, $s);
2288 glDisable GL_TEXTURE_2D;
2289}
2290
2291#############################################################################
2292
2293package CFPlus::UI::Image;
2294
2295our @ISA = CFPlus::UI::Base::;
2296
2297use CFPlus::OpenGL;
2298
2299our %texture_cache;
2300
2301sub new {
2302 my $class = shift;
2303
2304 my $self = $class->SUPER::new (
2305 can_events => 0,
2306 @_,
2307 );
2308
2309 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required";
2311
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314
2315 Scalar::Util::weaken $texture_cache{$self->{path}};
2316
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318
2319 $self
2320}
2321
2322sub STORABLE_freeze {
2323 my ($self, $cloning) = @_;
2324
2325 $self->{path}
2326 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2327
2328 $self->{path}
2329}
2330
2331sub STORABLE_attach {
2332 my ($self, $cloning, $path) = @_;
2333
2334 $self->new (path => $path)
2335}
2336
2337sub size_request {
2338 my ($self) = @_;
2339
2340 ($self->{tex}{w}, $self->{tex}{h})
2341}
2342
2343sub _draw {
2344 my ($self) = @_;
2345
2346 my $tex = $self->{tex};
2347
2348 my ($w, $h) = ($self->{w}, $self->{h});
2349
2350 if ($self->{rot90}) {
2351 glRotate 90, 0, 0, 1;
2352 glTranslate 0, -$self->{w}, 0;
2353
2354 ($w, $h) = ($h, $w);
2355 }
2356
2357 glEnable GL_TEXTURE_2D;
2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359
2360 $tex->draw_quad (0, 0, $w, $h);
2361
2362 glDisable GL_TEXTURE_2D;
2363}
2364
2365#############################################################################
2366
1994package CFClient::UI::ImageButton; 2367package CFPlus::UI::ImageButton;
1995 2368
1996our @ISA = CFClient::UI::Image::; 2369our @ISA = CFPlus::UI::Image::;
1997 2370
1998use CFClient::OpenGL; 2371use CFPlus::OpenGL;
1999 2372
2000my %textures; 2373my %textures;
2001 2374
2002sub new { 2375sub new {
2003 my $class = shift; 2376 my $class = shift;
… …
2025 1 2398 1
2026} 2399}
2027 2400
2028############################################################################# 2401#############################################################################
2029 2402
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2403package CFPlus::UI::VGauge;
2099 2404
2100our @ISA = CFClient::UI::Base::; 2405our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2406
2161use List::Util qw(min max); 2407use List::Util qw(min max);
2162 2408
2163use CFClient::OpenGL; 2409use CFPlus::OpenGL;
2164 2410
2165my %tex = ( 2411my %tex = (
2166 food => [ 2412 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2413 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2414 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2415 ],
2170 grace => [ 2416 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2418 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2419 ],
2174 hp => [ 2420 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2422 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2423 ],
2178 mana => [ 2424 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2425 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2426 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2427 ],
2182); 2428);
2183 2429
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2430# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2490 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2491 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2492
2247 my $h1 = $self->{h} * (1 - $ycut1); 2493 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2494 my $h2 = $self->{h} * (1 - $ycut2);
2495 my $h3 = $self->{h};
2496
2497 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2498
2250 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2500 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2501 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2502 glEnable GL_TEXTURE_2D;
… …
2272 2521
2273 if ($t3) { 2522 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2523 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2524 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2525 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2526 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2527 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2528 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2529 glEnd;
2281 } 2530 }
2282 2531
2283 glDisable GL_BLEND; 2532 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2285} 2534}
2286 2535
2287############################################################################# 2536#############################################################################
2288 2537
2289package CFClient::UI::Gauge; 2538package CFPlus::UI::Gauge;
2290 2539
2291our @ISA = CFClient::UI::VBox::; 2540our @ISA = CFPlus::UI::VBox::;
2292 2541
2293sub new { 2542sub new {
2294 my ($class, %arg) = @_; 2543 my ($class, %arg) = @_;
2295 2544
2296 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2547 can_hover => 1,
2299 can_events => 1, 2548 can_events => 1,
2300 %arg, 2549 %arg,
2301 ); 2550 );
2302 2551
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2552 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2553 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2554 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2555
2307 $self 2556 $self
2308} 2557}
2309 2558
2310sub set_fontsize { 2559sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2580 $self->{value}->set_text ($val);
2332} 2581}
2333 2582
2334############################################################################# 2583#############################################################################
2335 2584
2336package CFClient::UI::Slider; 2585package CFPlus::UI::Slider;
2337 2586
2338use strict; 2587use strict;
2339 2588
2340use CFClient::OpenGL; 2589use CFPlus::OpenGL;
2341 2590
2342our @ISA = CFClient::UI::DrawBG::; 2591our @ISA = CFPlus::UI::DrawBG::;
2343 2592
2344my @tex = 2593my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2595 qw(s1_slider.png s1_slider_bg.png);
2347 2596
2348sub new { 2597sub new {
2349 my $class = shift; 2598 my $class = shift;
2350 2599
… …
2439 } 2688 }
2440 2689
2441 1 2690 1
2442} 2691}
2443 2692
2693sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_;
2695
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2699
2700 ! ! $delta
2701}
2702
2444sub update { 2703sub update {
2445 my ($self) = @_; 2704 my ($self) = @_;
2446 2705
2447 delete $self->{knob_w}; 2706 delete $self->{knob_w};
2448 $self->SUPER::update; 2707 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2496} 2755}
2497 2756
2498############################################################################# 2757#############################################################################
2499 2758
2500package CFClient::UI::ValSlider; 2759package CFPlus::UI::ValSlider;
2501 2760
2502our @ISA = CFClient::UI::HBox::; 2761our @ISA = CFPlus::UI::HBox::;
2503 2762
2504sub new { 2763sub new {
2505 my ($class, %arg) = @_; 2764 my ($class, %arg) = @_;
2506 2765
2507 my $range = delete $arg{range}; 2766 my $range = delete $arg{range};
2508 2767
2509 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2769 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2770 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2771 to_value => sub { shift },
2513 from_value => sub { shift }, 2772 from_value => sub { shift },
2514 %arg, 2773 %arg,
2515 ); 2774 );
2516 2775
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2795sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2796sub set_value { shift->{slider}->set_value (@_) }
2538 2797
2539############################################################################# 2798#############################################################################
2540 2799
2541package CFClient::UI::TextScroller; 2800package CFPlus::UI::TextScroller;
2542 2801
2543our @ISA = CFClient::UI::HBox::; 2802our @ISA = CFPlus::UI::HBox::;
2544 2803
2545use CFClient::OpenGL; 2804use CFPlus::OpenGL;
2546 2805
2547sub new { 2806sub new {
2548 my $class = shift; 2807 my $class = shift;
2549 2808
2550 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2551 fontsize => 1, 2810 fontsize => 1,
2552 can_events => 0, 2811 can_events => 1,
2553 indent => 0, 2812 indent => 0,
2554 #font => default_font 2813 #font => default_font
2555 @_, 2814 @_,
2556 2815
2557 layout => (new CFClient::Layout 1), 2816 layout => (new CFPlus::Layout),
2558 par => [], 2817 par => [],
2559 height => 0, 2818 height => 0,
2560 children => [ 2819 children => [
2561 (new CFClient::UI::Empty expand => 1), 2820 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2821 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2822 ],
2564 ); 2823 );
2565 2824
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2825 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2826
… …
2597 2856
2598 $self->reflow; 2857 $self->reflow;
2599 2858
2600 local $self->{children} = [$empty, $slider]; 2859 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 2860 $self->SUPER::invoke_size_allocate ($w, $h)
2861}
2862
2863sub invoke_mouse_wheel {
2864 my ($self, $ev) = @_;
2865
2866 return 0 unless $ev->{dy}; # only vertical movements
2867
2868 $self->{children}[1]->emit (mouse_wheel => $ev);
2869
2870 1
2602} 2871}
2603 2872
2604sub get_layout { 2873sub get_layout {
2605 my ($self, $para) = @_; 2874 my ($self, $para) = @_;
2606 2875
… …
2634 2903
2635 # todo: base offset on lines or so, not on pixels 2904 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 2905 $self->{children}[1]->set_value ($offset);
2637} 2906}
2638 2907
2908sub current_paragraph {
2909 my ($self) = @_;
2910
2911 $self->{top_paragraph} - 1
2912}
2913
2914sub scroll_to {
2915 my ($self, $para) = @_;
2916
2917 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2918
2919 $self->{scroll_to} = $para;
2920 $self->update;
2921}
2922
2639sub clear { 2923sub clear {
2640 my ($self) = @_; 2924 my ($self) = @_;
2641 2925
2642 my (undef, undef, @other) = @{ $self->{children} }; 2926 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 2927 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 2930 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2931 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 2932}
2649 2933
2650sub add_paragraph { 2934sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 2935 my $self = shift;
2652 2936
2653 my ($text, @w) = ref $para ? @$para : $para; 2937 for my $para (@_) {
2654
2655 $para = { 2938 $para = {
2939 fg => [1, 1, 1, 1],
2940 indent => 0,
2941 markup => "",
2942 widget => [],
2943 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 2944 w => 1e10,
2657 wrapped => 1, 2945 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 2946 };
2663 2947
2664 $self->add (@w) if @w; 2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 2949 push @{$self->{par}}, $para;
2950 }
2666 2951
2667 $self->{need_reflow}++; 2952 $self->{need_reflow}++;
2668 $self->update; 2953 $self->update;
2669} 2954}
2670 2955
2671sub scroll_to_bottom { 2956sub scroll_to_bottom {
2672 my ($self) = @_; 2957 my ($self) = @_;
2673 2958
2674 $self->{scroll_to_bottom} = 1; 2959 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 2960 $self->update;
2676} 2961}
2677 2962
2963sub force_uptodate {
2964 my ($self) = @_;
2965
2966 if (delete $self->{need_reflow}) {
2967 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2968
2969 my $height = 0;
2970
2971 for my $para (@{$self->{par}}) {
2972 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2973 my $layout = $self->get_layout ($para);
2974 my ($w, $h) = $layout->size;
2975
2976 $para->{w} = $w + $para->{indent};
2977 $para->{h} = $h;
2978 $para->{wrapped} = $layout->has_wrapped;
2979 }
2980
2981 $para->{y} = $height;
2982 $height += $para->{h};
2983 }
2984
2985 $self->{height} = $height;
2986 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2987
2988 delete $self->{texture};
2989 }
2990
2991 if (my $paridx = delete $self->{scroll_to}) {
2992 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2993 }
2994}
2995
2678sub update { 2996sub update {
2679 my ($self) = @_; 2997 my ($self) = @_;
2680 2998
2681 $self->SUPER::update; 2999 $self->SUPER::update;
2682 3000
2683 return unless $self->{h} > 0; 3001 return unless $self->{h} > 0;
2684 3002
2685 delete $self->{texture}; 3003 delete $self->{texture};
2686 3004
2687 $ROOT->on_post_alloc ($self => sub { 3005 $ROOT->on_post_alloc ($self => sub {
3006 $self->force_uptodate;
3007
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3008 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3009
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3011 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3012 glClear GL_COLOR_BUFFER_BIT;
2720 3013
3014 package CFPlus::UI::Base;
3015 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3016 (0, 0, $self->{w}, $self->{h});
3017
3018 my $top = int $self->{children}[1]{range}[0];
3019
3020 my $paridx = 0;
3021 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3022 my $top = int $self->{children}[1]{range}[0];
2722 3023
2723 my $y0 = $top; 3024 my $y0 = $top;
2724 my $y1 = $top + $H; 3025 my $y1 = $top + $H;
2725 3026
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3027 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3028 my $h = $para->{h};
3029 my $y = $para->{y};
2734 3030
2735 if ($y0 < $y + $h && $y < $y1) { 3031 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3032 my $layout = $self->get_layout ($para);
2738 3033
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3034 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3035
2744 if (my @w = @{ $para->{widget} }) { 3036 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3037 my @s = $layout->get_shapes;
2746 3038
2747 for (@w) { 3039 for (@w) {
… …
2753 $_->draw; 3045 $_->draw;
2754 } 3046 }
2755 } 3047 }
2756 } 3048 }
2757 3049
2758 $y += $h; 3050 $paridx++;
3051 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3052 }
2760 3053
2761 glDisable GL_BLEND; 3054 $self->{top_paragraph} = $top_paragraph;
2762 }; 3055 };
2763 }); 3056 });
2764} 3057}
2765 3058
2766sub reconfigure { 3059sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3077 $self->{children}[1]->draw;
2785} 3078}
2786 3079
2787############################################################################# 3080#############################################################################
2788 3081
2789package CFClient::UI::Animator; 3082package CFPlus::UI::Animator;
2790 3083
2791use CFClient::OpenGL; 3084use CFPlus::OpenGL;
2792 3085
2793our @ISA = CFClient::UI::Bin::; 3086our @ISA = CFPlus::UI::Bin::;
2794 3087
2795sub moveto { 3088sub moveto {
2796 my ($self, $x, $y) = @_; 3089 my ($self, $x, $y) = @_;
2797 3090
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3091 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3119 glPopMatrix;
2827} 3120}
2828 3121
2829############################################################################# 3122#############################################################################
2830 3123
2831package CFClient::UI::Flopper; 3124package CFPlus::UI::Flopper;
2832 3125
2833our @ISA = CFClient::UI::Button::; 3126our @ISA = CFPlus::UI::Button::;
2834 3127
2835sub new { 3128sub new {
2836 my $class = shift; 3129 my $class = shift;
2837 3130
2838 my $self = $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3143 $self->{other}->toggle_visibility;
2851} 3144}
2852 3145
2853############################################################################# 3146#############################################################################
2854 3147
2855package CFClient::UI::Tooltip; 3148package CFPlus::UI::Tooltip;
2856 3149
2857our @ISA = CFClient::UI::Bin::; 3150our @ISA = CFPlus::UI::Bin::;
2858 3151
2859use CFClient::OpenGL; 3152use CFPlus::OpenGL;
2860 3153
2861sub new { 3154sub new {
2862 my $class = shift; 3155 my $class = shift;
2863 3156
2864 $class->SUPER::new ( 3157 $class->SUPER::new (
… …
2867 ) 3160 )
2868} 3161}
2869 3162
2870sub set_tooltip_from { 3163sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3164 my ($self, $widget) = @_;
3165
3166 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3167 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3168
2873 my $tooltip = $widget->{tooltip}; 3169 my $tooltip = $widget->{tooltip};
2874 3170
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3171 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3172 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3176 }
2881 3177
2882 $tooltip =~ s/^\n+//; 3178 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3179 $tooltip =~ s/\n+$//;
2884 3180
2885 $self->add (new CFClient::UI::Label 3181 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3182 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3183 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3184 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3185 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3186 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3187 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3188 );
2893} 3189}
2894 3190
… …
2913 3209
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3210 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3211 my $widget = $self->{owner}
2916 or return; 3212 or return;
2917 3213
3214 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3215 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3216
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3217 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3218 if $x + $self->{w} > $self->{root}{w};
2922 3219
2923 $self->move_abs ($x, $y); 3220 $self->move_abs ($x, $y);
3221 } else {
3222 $self->hide;
3223 }
2924 }); 3224 });
2925} 3225}
2926 3226
2927sub _draw { 3227sub _draw {
2928 my ($self) = @_; 3228 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3252 $self->SUPER::_draw;
2953} 3253}
2954 3254
2955############################################################################# 3255#############################################################################
2956 3256
2957package CFClient::UI::Face; 3257package CFPlus::UI::Face;
2958 3258
2959our @ISA = CFClient::UI::Base::; 3259our @ISA = CFPlus::UI::DrawBG::;
2960 3260
2961use CFClient::OpenGL; 3261use CFPlus::OpenGL;
2962 3262
2963sub new { 3263sub new {
2964 my $class = shift; 3264 my $class = shift;
2965 3265
2966 my $self = $class->SUPER::new ( 3266 my $self = $class->SUPER::new (
… …
3001sub _draw { 3301sub _draw {
3002 my ($self) = @_; 3302 my ($self) = @_;
3003 3303
3004 return unless $::CONN; 3304 return unless $::CONN;
3005 3305
3306 $self->SUPER::_draw;
3307
3006 my $face; 3308 my $face;
3007 3309
3008 if ($self->{frame}) { 3310 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}]; 3311 my $anim = $::CONN->{anim}[$self->{anim}];
3010 3312
… …
3032 $self->SUPER::destroy; 3334 $self->SUPER::destroy;
3033} 3335}
3034 3336
3035############################################################################# 3337#############################################################################
3036 3338
3037package CFClient::UI::Buttonbar; 3339package CFPlus::UI::Buttonbar;
3038 3340
3039our @ISA = CFClient::UI::HBox::; 3341our @ISA = CFPlus::UI::HBox::;
3040 3342
3041# TODO: should actualyl wrap buttons and other goodies. 3343# TODO: should actually wrap buttons and other goodies.
3042 3344
3043############################################################################# 3345#############################################################################
3044 3346
3045package CFClient::UI::Menu; 3347package CFPlus::UI::Menu;
3046 3348
3047our @ISA = CFClient::UI::FancyFrame::; 3349our @ISA = CFPlus::UI::Toplevel::;
3048 3350
3049use CFClient::OpenGL; 3351use CFPlus::OpenGL;
3050 3352
3051sub new { 3353sub new {
3052 my $class = shift; 3354 my $class = shift;
3053 3355
3054 my $self = $class->SUPER::new ( 3356 my $self = $class->SUPER::new (
3055 items => [], 3357 items => [],
3056 z => 100, 3358 z => 100,
3057 @_, 3359 @_,
3058 ); 3360 );
3059 3361
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3362 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3363
3062 for my $item (@{ $self->{items} }) { 3364 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3365 my ($widget, $cb, $tooltip) = @$item;
3064 3366
3065 # handle various types of items, only text for now 3367 # handle various types of items, only text for now
3066 if (!ref $widget) { 3368 if (!ref $widget) {
3369 if ($widget =~ /\t/) {
3370 my ($left, $right) = split /\t/, $widget, 2;
3371
3067 $widget = new CFClient::UI::Label 3372 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3373 can_hover => 1,
3069 can_events => 1, 3374 can_events => 1,
3375 tooltip => $tooltip,
3376 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1),
3379 ],
3380 ;
3381
3382 } else {
3383 $widget = new CFPlus::UI::Label
3384 can_hover => 1,
3385 can_events => 1,
3070 markup => $widget, 3386 markup => $widget,
3071 tooltip => $tooltip 3387 tooltip => $tooltip;
3388 }
3072 } 3389 }
3073 3390
3074 $self->{item}{$widget} = $item; 3391 $self->{item}{$widget} = $item;
3075 3392
3076 $self->{vbox}->add ($widget); 3393 $self->{vbox}->add ($widget);
… …
3119 1 3436 1
3120} 3437}
3121 3438
3122############################################################################# 3439#############################################################################
3123 3440
3124package CFClient::UI::Multiplexer; 3441package CFPlus::UI::Multiplexer;
3125 3442
3126our @ISA = CFClient::UI::Container::; 3443our @ISA = CFPlus::UI::Container::;
3127 3444
3128sub new { 3445sub new {
3129 my $class = shift; 3446 my $class = shift;
3130 3447
3131 my $self = $class->SUPER::new ( 3448 my $self = $class->SUPER::new (
… …
3145 3462
3146 $self->{current} = $self->{children}[0] 3463 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3464 if @{ $self->{children} };
3148} 3465}
3149 3466
3467sub get_current_page {
3468 my ($self) = @_;
3469
3470 $self->{current}
3471}
3472
3150sub set_current_page { 3473sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3474 my ($self, $page_or_widget) = @_;
3152 3475
3153 my $widget = ref $page_or_widget 3476 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3477 ? $page_or_widget
… …
3186 $self->{current}->draw; 3509 $self->{current}->draw;
3187} 3510}
3188 3511
3189############################################################################# 3512#############################################################################
3190 3513
3191package CFClient::UI::Notebook; 3514package CFPlus::UI::Notebook;
3192 3515
3193our @ISA = CFClient::UI::VBox::; 3516our @ISA = CFPlus::UI::VBox::;
3194 3517
3195sub new { 3518sub new {
3196 my $class = shift; 3519 my $class = shift;
3197 3520
3198 my $self = $class->SUPER::new ( 3521 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3522 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3524 # filter => # will be put between multiplexer and $self
3202 @_, 3525 @_,
3203 ); 3526 );
3204 3527
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3211sub add { 3534sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3535 my ($self, $title, $widget, $tooltip) = @_;
3213 3536
3214 Scalar::Util::weaken $self; 3537 Scalar::Util::weaken $self;
3215 3538
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3540 markup => $title,
3218 tooltip => $tooltip, 3541 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3542 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3543 );
3221 3544
3222 $self->{multiplexer}->add ($widget); 3545 $self->{multiplexer}->add ($widget);
3223} 3546}
3224 3547
3548sub get_current_page {
3549 my ($self) = @_;
3550
3551 $self->{multiplexer}->get_current_page
3552}
3553
3225sub set_current_page { 3554sub set_current_page {
3226 my ($self, $page) = @_; 3555 my ($self, $page) = @_;
3227 3556
3228 $self->{multiplexer}->set_current_page ($page); 3557 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3558 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3559}
3231 3560
3232############################################################################# 3561#############################################################################
3233 3562
3234package CFClient::UI::Combobox; 3563package CFPlus::UI::Selector;
3235 3564
3236use utf8; 3565use utf8;
3237 3566
3238our @ISA = CFClient::UI::Button::; 3567our @ISA = CFPlus::UI::Button::;
3239 3568
3240sub new { 3569sub new {
3241 my $class = shift; 3570 my $class = shift;
3242 3571
3243 my $self = $class->SUPER::new ( 3572 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3589 my ($value, $title, $tooltip) = @$_;
3261 3590
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3591 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3592 }
3264 3593
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3594 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3595}
3267 3596
3268sub _set_value { 3597sub _set_value {
3269 my ($self, $value) = @_; 3598 my ($self, $value) = @_;
3270 3599
… …
3285 $self->emit (changed => $value); 3614 $self->emit (changed => $value);
3286} 3615}
3287 3616
3288############################################################################# 3617#############################################################################
3289 3618
3290package CFClient::UI::Statusbox; 3619package CFPlus::UI::Statusbox;
3291 3620
3292our @ISA = CFClient::UI::VBox::; 3621our @ISA = CFPlus::UI::VBox::;
3293 3622
3294sub new { 3623sub new {
3295 my $class = shift; 3624 my $class = shift;
3296 3625
3297 my $self = $class->SUPER::new ( 3626 my $self = $class->SUPER::new (
… …
3309sub reorder { 3638sub reorder {
3310 my ($self) = @_; 3639 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3640 my $NOW = Time::HiRes::time;
3312 3641
3313 # freeze display when hovering over any label 3642 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3643 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3644 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3645 values %{ $self->{item} };
3317 3646
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3647 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3648 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3649 }
… …
3341 for ($short) { 3670 for ($short) {
3342 s/^\s+//; 3671 s/^\s+//;
3343 s/\s+/ /g; 3672 s/\s+/ /g;
3344 } 3673 }
3345 3674
3346 new CFClient::UI::Label 3675 new CFPlus::UI::Label
3347 markup => $short, 3676 markup => $short,
3348 tooltip => $item->{tooltip}, 3677 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3678 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3679 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3680 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3734 count => 1,
3406 %arg, 3735 %arg,
3407 }; 3736 };
3408 } 3737 }
3409 3738
3739 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3740 $self->reorder;
3741 });
3411} 3742}
3412 3743
3413sub reconfigure { 3744sub reconfigure {
3414 my ($self) = @_; 3745 my ($self) = @_;
3415 3746
… …
3428 $self->SUPER::destroy; 3759 $self->SUPER::destroy;
3429} 3760}
3430 3761
3431############################################################################# 3762#############################################################################
3432 3763
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 3764package CFPlus::UI::Root;
3806 3765
3807our @ISA = CFClient::UI::Container::; 3766our @ISA = CFPlus::UI::Container::;
3808 3767
3809use List::Util qw(min max); 3768use List::Util qw(min max);
3810 3769
3811use CFClient::OpenGL; 3770use CFPlus::OpenGL;
3812 3771
3813sub new { 3772sub new {
3814 my $class = shift; 3773 my $class = shift;
3815 3774
3816 my $self = $class->SUPER::new ( 3775 my $self = $class->SUPER::new (
… …
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 3952
3994 $w = 0 if $w < 0; 3953 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0; 3954 $h = 0 if $h < 0;
3996 3955
3956 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h;
3958
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964
3997 $w = int $w + 0.5; 3965 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 3966 $h = int $h + 0.5;
3999 3967
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 3969 $widget->{old_w} = $widget->{w};
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3992 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 3993 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 3994 glLoadIdentity;
4027 3995
4028 { 3996 {
4029 package CFClient::UI::Base; 3997 package CFPlus::UI::Base;
4030 3998
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 3999 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4000 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4001
4035 $self->_draw; 4002 $self->_draw;
4003 }
4036} 4004}
4037 4005
4038############################################################################# 4006#############################################################################
4039 4007
4040package CFClient::UI; 4008package CFPlus::UI;
4041 4009
4042$ROOT = new CFClient::UI::Root; 4010$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4011$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4012
40451 40131
4046 4014

Diff Legend

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