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.315 by root, Wed Jun 28 21:17:01 2006 UTC vs.
Revision 1.358 by root, Fri Dec 8 14:59:54 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
79sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 82 if $FOCUS;
82} 83}
83 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
84sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
90 106
91 $GRAB = $widget; 107 $GRAB = $widget;
92 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
93 109
94 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
95 } 111 }
96 112
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
98 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
100 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
101} 123}
102 124
103sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
104 my ($ev) = @_; 126 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 127
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 129
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 131
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
112 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 134
114 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 137 $grab->update if $grab;
117 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
118 139
140 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 141 $TOOLTIP_WATCHER->cb->();
120 } 142 }
121} 143}
122 144
123sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
124 my ($ev) = @_; 146 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
126 148
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 150
129 if ($widget != $HOVER) { 151 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 152
132 $hover->update if $hover && $hover->{can_hover}; 153 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 154 if $HOVER;
140} 155}
141 156
142# convert position array to integers 157# convert position array to integers
143sub harmonize { 158sub harmonize {
… …
193 reconfigure_widgets; 208 reconfigure_widgets;
194} 209}
195 210
196############################################################################# 211#############################################################################
197 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
198package CFClient::UI::Base; 221package CFPlus::UI::Base;
199 222
200use strict; 223use strict;
201 224
202use CFClient::OpenGL; 225use CFPlus::OpenGL;
203 226
204sub new { 227sub new {
205 my $class = shift; 228 my $class = shift;
206 229
207 my $self = bless { 230 my $self = bless {
… …
212 h => undef, 235 h => undef,
213 can_events => 1, 236 can_events => 1,
214 @_ 237 @_
215 }, $class; 238 }, $class;
216 239
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 241
219 for (keys %$self) { 242 for (keys %$self) {
220 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
222 } 245 }
223 } 246 }
224 247
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 253
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 256
234 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
278 delete $self->{root}; 301 delete $self->{root};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->emit ("focus_out"); 309 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
288} 311}
… …
345 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
346 369
347 if ($self->{aspect}) { 370 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
349 372
350 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 375
353 # use alignment to adjust x, y 376 # use alignment to adjust x, y
354 377
355 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
397 420
398 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
399 422
400 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
401 424
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 428 }
406} 429}
407 430
408# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
409sub coord2local { 432sub coord2local {
410 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
411 434
435 Carp::confess unless $self->{parent};#d#
436
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 438}
414 439
415# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
416sub coord2global { 441sub coord2global {
417 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
418 443
444 Carp::confess unless $self->{parent};#d#
445
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 447}
421 448
422sub invoke_focus_in { 449sub invoke_focus_in {
423 my ($self) = @_; 450 my ($self) = @_;
424 451
425 return if $FOCUS == $self; 452 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
427 454
428 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
429 456
430 $focus->update if $focus; 457 $self->update;
431 $FOCUS->update;
432 458
433 0 459 0
434} 460}
435 461
436sub invoke_focus_out { 462sub invoke_focus_out {
437 my ($self) = @_; 463 my ($self) = @_;
438 464
439 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
440 466
441 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
442 468
443 $focus->update if $focus; #? 469 $self->update;
444 470
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 472 unless $FOCUS;
447 473
448 0 474 0
449} 475}
450 476
451sub grab_focus { 477sub grab_focus {
452 my ($self) = @_; 478 my ($self) = @_;
453 479
480 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 481 $self->emit ("focus_in");
455} 482}
456 483
457sub invoke_mouse_motion { 1 } 484sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 485sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 486sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
461 489
462sub invoke_button_down { 490sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
464 492
465 $self->grab_focus; 493 $self->grab_focus;
466 494
467 1 495 0
468} 496}
469 497
470sub connect { 498sub connect {
471 my ($self, $signal, $cb) = @_; 499 my ($self, $signal, $cb) = @_;
472 500
473 push @{ $self->{signal_cb}{$signal} }, $cb; 501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
474} 507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
475 515
476sub emit { 516sub emit {
477 my ($self, $signal, @args) = @_; 517 my ($self, $signal, @args) = @_;
478 518
519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, either.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
479 #d##TODO# stop propagating at first true, do not use sum 528 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 532}
484 533
485sub find_widget { 534sub find_widget {
486 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
487 536
… …
571 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
574 glEnd; 623 glEnd;
575 glPopMatrix; 624 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 626 }
578 627
579 $self->_draw; 628 $self->_draw;
580 glPopMatrix; 629 glPopMatrix;
581} 630}
… …
587} 636}
588 637
589sub DESTROY { 638sub DESTROY {
590 my ($self) = @_; 639 my ($self) = @_;
591 640
641 return if CFPlus::in_destruct;
642
592 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
593 644
594 eval { $self->destroy }; 645 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 647}
597 648
598############################################################################# 649#############################################################################
599 650
600package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
601 652
602our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
603 654
604use strict; 655use strict;
605use CFClient::OpenGL; 656use CFPlus::OpenGL;
606 657
607sub new { 658sub new {
608 my $class = shift; 659 my $class = shift;
609 660
610 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
641 } 692 }
642} 693}
643 694
644############################################################################# 695#############################################################################
645 696
646package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
647 698
648our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
649 700
650sub new { 701sub new {
651 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
653} 704}
… …
660 711
661sub draw { } 712sub draw { }
662 713
663############################################################################# 714#############################################################################
664 715
665package CFClient::UI::Container; 716package CFPlus::UI::Container;
666 717
667our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
668 719
669sub new { 720sub new {
670 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
671 722
672 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
681 if $children; 732 if $children;
682 733
683 $self 734 $self
684} 735}
685 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
686sub add { 745sub add {
687 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
688 747
689 $_->set_parent ($self) 748 $_->set_parent ($self)
690 for @widgets; 749 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
751} 810}
752 811
753############################################################################# 812#############################################################################
754 813
755package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
756 815
757our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
758 817
759sub new { 818sub new {
760 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
761 820
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 822
764 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
765} 824}
766 825
767sub add { 826sub add {
… …
774sub remove { 833sub remove {
775 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
776 835
777 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
778 837
779 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 839 unless @{$self->{children}};
781} 840}
782 841
783sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
784 843
… …
796 855
797############################################################################# 856#############################################################################
798 857
799# back-buffered drawing area 858# back-buffered drawing area
800 859
801package CFClient::UI::Window; 860package CFPlus::UI::Window;
802 861
803our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
804 863
805use CFClient::OpenGL; 864use CFPlus::OpenGL;
806 865
807sub new { 866sub new {
808 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
809 868
810 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
832} 891}
833 892
834sub render_child { 893sub render_child {
835 my ($self) = @_; 894 my ($self) = @_;
836 895
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
840 899
841 { 900 {
842 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
843 902
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
846 } 907 }
847
848 $self->_render;
849 }; 908 };
850} 909}
851 910
852sub _draw { 911sub _draw {
853 my ($self) = @_; 912 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 913
857 my $tex = $self->{texture} 914 my $tex = $self->{texture}
858 or return; 915 or return;
859 916
860 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
863 920
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
865 922
866 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
867} 924}
868 925
869############################################################################# 926#############################################################################
870 927
871package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
872 929
873our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
874 931
875sub new { 932sub new {
876 my $class = shift; 933 my $class = shift;
877 934
878 $class->SUPER::new ( 935 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 997 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 999 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1001 }
945} 1002}
946 1003
947sub _render { 1004sub _render {
948 my ($self) = @_; 1005 my ($self) = @_;
949 1006
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1009
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1011
955 $self->SUPER::_render; 1012 $self->SUPER::_render;
956} 1013}
957 1014
958############################################################################# 1015#############################################################################
959 1016
960package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
961 1018
962our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
963 1020
964sub new { 1021sub new {
965 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
966 1023
967 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
968 1025
969 my $self; 1026 my $self;
970 1027
971 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1029 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1031 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
976 }, 1033 },
977 ; 1034 ;
978 1035
979 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
981 slider => $slider, 1039 slider => $slider,
982 %arg, 1040 %arg,
983 ); 1041 );
984 1042
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
… …
994 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
995 1053
996 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
997} 1055}
998 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
999sub update_slider { 1067sub update_slider {
1000 my ($self) = @_; 1068 my ($self) = @_;
1001 1069
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1071}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1087}
1020 1088
1021############################################################################# 1089#############################################################################
1022 1090
1023package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1024 1092
1025our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1026 1094
1027use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1028 1096
1029sub new { 1097sub new {
1030 my $class = shift; 1098 my $class = shift;
1031 1099
1032 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1059} 1127}
1060 1128
1061############################################################################# 1129#############################################################################
1062 1130
1063package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1064 1132
1065our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1066 1134
1067use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1136
1137sub new {
1138 my ($class, %arg) = @_;
1139
1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1068 1236
1069my $bg = 1237my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1239 mipmap => 1, wrap => 1;
1072 1240
1073my @border = 1241my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1244
1077sub new { 1245sub new {
1078 my ($class, %arg) = @_; 1246 my ($class, %arg) = @_;
1079 1247
1080 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1251 border => 0.6,
1084 can_events => 1, 1252 can_events => 1,
1085 min_w => 16, 1253 min_w => 64,
1086 min_h => 16, 1254 min_h => 32,
1087 %arg, 1255 %arg,
1088 ); 1256 );
1089 1257
1090 $self->{title_widget} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1259 align => 0,
1092 valign => 1, 1260 valign => 1,
1093 text => $self->{title}, 1261 text => $self->{title},
1094 fontsize => $self->{border}, 1262 fontsize => $self->{border},
1095 if exists $self->{title}; 1263 if exists $self->{title};
1096 1264
1097 if ($self->{has_close_button}) { 1265 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1266 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1267 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1268 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1269 on_activate => sub { $self->emit ("delete") };
1102 1270
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1272 }
1105 1273
1106 $self 1274 $self
1107} 1275}
1108 1276
1109sub add { 1277sub add {
1110 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1111 1279
1112 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1283}
1116 1284
1117sub border { 1285sub border {
1118 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1119} 1287}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1320 $self->child->configure ($border, $border, $w, $h);
1153 1321
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1323 if $self->{close_button};
1156 1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1332
1157 1 1333 1
1158} 1334}
1159 1335
1160sub invoke_button_down { 1336sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1396
1221 ! ! $self->{motion} 1397 ! ! $self->{motion}
1222} 1398}
1223 1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1406}
1407
1224sub _draw { 1408sub _draw {
1225 my ($self) = @_; 1409 my ($self) = @_;
1226 1410
1227 my $child = $self->{children}[0]; 1411 my $child = $self->{children}[0];
1228 1412
… …
1265 if $self->{close_button}; 1449 if $self->{close_button};
1266} 1450}
1267 1451
1268############################################################################# 1452#############################################################################
1269 1453
1270package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1271 1455
1272our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1273 1457
1274use List::Util qw(max sum); 1458use List::Util qw(max sum);
1275 1459
1276use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1277 1461
1278sub new { 1462sub new {
1279 my $class = shift; 1463 my $class = shift;
1280 1464
1281 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1287sub children { 1471sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1473}
1290 1474
1291sub add { 1475sub add {
1292 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1293 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1480 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1296 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1486 $self->realloc;
1298} 1487}
1299 1488
1300sub remove { 1489sub remove {
1301 my ($self, $child) = @_; 1490 my ($self, $child) = @_;
… …
1366 1555
1367 # linearly scale sizes 1556 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1559
1371 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1372 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1373 1562
1374 my $y; 1563 my $y;
1375 1564
1376 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1420 } 1609 }
1421} 1610}
1422 1611
1423############################################################################# 1612#############################################################################
1424 1613
1425package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1426 1615
1427our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1428 1617
1429sub size_request { 1618sub size_request {
1430 my ($self) = @_; 1619 my ($self) = @_;
1431 1620
1432 $self->{vertical} 1621 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1655 for 0 .. $#children;
1467 } 1656 }
1468 } 1657 }
1469 1658
1470 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1471 1660
1472 my $pos = 0; 1661 my $pos = 0;
1473 for (0 .. $#children) { 1662 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1669 1
1481} 1670}
1482 1671
1483############################################################################# 1672#############################################################################
1484 1673
1485package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1486 1675
1487our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1488 1677
1489sub new { 1678sub new {
1490 my $class = shift; 1679 my $class = shift;
1491 1680
1492 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1495 ) 1684 )
1496} 1685}
1497 1686
1498############################################################################# 1687#############################################################################
1499 1688
1500package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1501 1690
1502our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1503 1692
1504sub new { 1693sub new {
1505 my $class = shift; 1694 my $class = shift;
1506 1695
1507 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1510 ) 1699 )
1511} 1700}
1512 1701
1513############################################################################# 1702#############################################################################
1514 1703
1515package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1516 1705
1517our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1518 1707
1519use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1520 1709
1521sub new { 1710sub new {
1522 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1523 1712
1524 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1716 #active_bg => none
1528 #font => default_font 1717 #font => default_font
1529 #text => initial text 1718 #text => initial text
1530 #markup => initial narkup 1719 #markup => initial narkup
1531 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1532 ellipsise => 3, # end 1722 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1724 fontsize => 1,
1535 align => -1, 1725 align => -1,
1536 valign => -1, 1726 valign => -1,
1537 padding_x => 2, 1727 padding_x => 2,
1538 padding_y => 2, 1728 padding_y => 2,
1539 can_events => 0, 1729 can_events => 0,
1540 %arg 1730 %arg
1541 ); 1731 );
1542 1732
1543 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1736 $self->{template} = $layout;
1547 } 1737 }
1548 1738
1549 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1553 } 1743 }
1554 1744
1555 $self 1745 $self
1556} 1746}
1557 1747
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1748sub update {
1569 my ($self) = @_; 1749 my ($self) = @_;
1570 1750
1571 delete $self->{texture}; 1751 delete $self->{texture};
1572 $self->SUPER::update; 1752 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1584 1764
1585 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1587 1767
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1590 1769
1591 delete $self->{size_req}; 1770 delete $self->{size_req};
1592 $self->realloc; 1771 $self->realloc;
1593 $self->update; 1772 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1601 1780
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1782
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1606 1784
1607 delete $self->{size_req}; 1785 delete $self->{size_req};
1608 $self->realloc; 1786 $self->realloc;
1609 $self->update; 1787 $self->update;
… …
1621 1799
1622 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1623 1801
1624 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1806
1628 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1629 1808
1630 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
… …
1654 1833
1655sub set_fontsize { 1834sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1657 1836
1658 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1659 delete $self->{texture}; 1839 delete $self->{texture};
1660 1840
1661 $self->realloc; 1841 $self->realloc;
1662} 1842}
1663 1843
1664sub reconfigure { 1844sub reconfigure {
1665 my ($self) = @_; 1845 my ($self) = @_;
1666 1846
1667 delete $self->{size_req}; 1847 delete $self->{size_req};
1848 delete $self->{texture};
1668 1849
1669 $self->SUPER::reconfigure; 1850 $self->SUPER::reconfigure;
1670} 1851}
1671 1852
1672sub _draw { 1853sub _draw {
1673 my ($self) = @_; 1854 my ($self) = @_;
1674 1855
1675 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1676 1857
1677 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1865
1685 new_from_layout CFClient::Texture $self->{layout} 1866 [$self->{layout}->size]
1686 }; 1867 };
1687 1868
1688 unless (exists $self->{ox}) { 1869 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1692 1873
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1877 };
1697 1878
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1881
1703 if ($tex->{format} == GL_ALPHA) { 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1883}
1714 1884
1715############################################################################# 1885#############################################################################
1716 1886
1717package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1718 1888
1719our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1720 1890
1721use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1722 1892
1723sub new { 1893sub new {
1724 my $class = shift; 1894 my $class = shift;
1725 1895
1726 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 1900 active_fg => [0, 0, 0],
1731 can_hover => 1, 1901 can_hover => 1,
1732 can_focus => 1, 1902 can_focus => 1,
1733 valign => 0, 1903 valign => 0,
1734 can_events => 1, 1904 can_events => 1,
1905 ellipsise => 0,
1735 #text => ... 1906 #text => ...
1736 #hidden => "*", 1907 #hidden => "*",
1737 @_ 1908 @_
1738 ) 1909 )
1739} 1910}
… …
1788 1959
1789 if ($uni == 8) { 1960 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 1962 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 1963 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 1964 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 1965 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 1966 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1967 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 1968 } elsif ($sym == CFPlus::SDLK_HOME) {
1798 $self->{cursor} = 0; 1969 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) { 1970 } elsif ($sym == CFPlus::SDLK_END) {
1800 $self->{cursor} = length $text; 1971 $self->{cursor} = length $text;
1972 } elsif ($uni == 21) { # ctrl-u
1973 $text = "";
1974 $self->{cursor} = 0;
1801 } elsif ($uni == 27) { 1975 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 1976 $self->emit ('escape');
1803 } elsif ($uni) { 1977 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 1978 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 1979 } else {
1806 return 0; 1980 return 0;
1807 } 1981 }
1808 1982
1809 $self->_set_text ($text); 1983 $self->_set_text ($text);
1810 1984
1811 $self->realloc; 1985 $self->realloc;
1986 $self->update;
1812 1987
1813 1 1988 1
1814} 1989}
1815 1990
1816sub invoke_focus_in { 1991sub invoke_focus_in {
… …
1828 2003
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2004 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2005
1831 # byte-index to char-index 2006 # byte-index to char-index
1832 my $text = $self->{text}; 2007 my $text = $self->{text};
1833 utf8::encode $text; 2008 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2009 $self->{cursor} = length $text;
1835 2010
1836 $self->_set_text ($self->{text}); 2011 $self->_set_text ($self->{text});
1837 $self->update; 2012 $self->update;
1838 2013
1839 1 2014 1
… …
1878 utf8::encode $text; 2053 utf8::encode $text;
1879 2054
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2055 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2056 }
1882 2057
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2058 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2059 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2060 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2061 glEnd;
1888 } 2062 }
1889} 2063}
1890 2064
2065#############################################################################
2066
1891package CFClient::UI::Entry; 2067package CFPlus::UI::Entry;
1892 2068
1893our @ISA = CFClient::UI::EntryBase::; 2069our @ISA = CFPlus::UI::EntryBase::;
1894 2070
1895use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1896 2072
1897sub invoke_key_down { 2073sub invoke_key_down {
1898 my ($self, $ev) = @_; 2074 my ($self, $ev) = @_;
1899 2075
1900 my $sym = $ev->{sym}; 2076 my $sym = $ev->{sym};
… …
1906 $self->{history_pointer} = -1; 2082 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2083 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2084 $self->emit (activate => $txt);
1909 $self->update; 2085 $self->update;
1910 2086
1911 } elsif ($sym == CFClient::SDLK_UP) { 2087 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2088 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2089 $self->{history_saveback} = $self->get_text;
1914 } 2090 }
1915 if (@{$self->{history} || []} > 0) { 2091 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2092 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2094 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2095 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2096 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2097 }
1922 2098
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2099 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2100 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2101 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2102
1927 if ($self->{history_pointer} >= 0) { 2103 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2104 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2113 1
1938} 2114}
1939 2115
1940############################################################################# 2116#############################################################################
1941 2117
2118package CFPlus::UI::TextEdit;
2119
2120our @ISA = CFPlus::UI::EntryBase::;
2121
2122use CFPlus::OpenGL;
2123
2124sub move_cursor_ver {
2125 my ($self, $dy) = @_;
2126
2127 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2128
2129 do {
2130 if (defined (my $index = $self->{layout}->line_x_to_index ($y + $dy, $x))) {
2131 $self->{cursor} = $index;
2132 delete $self->{cur_h};
2133 $self->update;
2134 return;
2135 }
2136 } while --$x >= 0;
2137}
2138
2139sub invoke_key_down {
2140 my ($self, $ev) = @_;
2141
2142 my $sym = $ev->{sym};
2143
2144 if ($sym == CFPlus::SDLK_UP) {
2145 $self->move_cursor_ver (-1);
2146 } elsif ($sym == CFPlus::SDLK_DOWN) {
2147 $self->move_cursor_ver (+1);
2148 } else {
2149 return $self->SUPER::invoke_key_down ($ev)
2150 }
2151
2152 1
2153}
2154
2155#############################################################################
2156
1942package CFClient::UI::Button; 2157package CFPlus::UI::Button;
1943 2158
1944our @ISA = CFClient::UI::Label::; 2159our @ISA = CFPlus::UI::Label::;
1945 2160
1946use CFClient::OpenGL; 2161use CFPlus::OpenGL;
1947 2162
1948my @tex = 2163my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2165 qw(b1_button_active.png);
1951 2166
1952sub new { 2167sub new {
1953 my $class = shift; 2168 my $class = shift;
1954 2169
… …
1991 $self->SUPER::_draw; 2206 $self->SUPER::_draw;
1992} 2207}
1993 2208
1994############################################################################# 2209#############################################################################
1995 2210
2211package CFPlus::UI::CheckBox;
2212
2213our @ISA = CFPlus::UI::DrawBG::;
2214
2215my @tex =
2216 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2217 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2218
2219use CFPlus::OpenGL;
2220
2221sub new {
2222 my $class = shift;
2223
2224 $class->SUPER::new (
2225 padding_x => 2,
2226 padding_y => 2,
2227 fg => [1, 1, 1],
2228 active_fg => [1, 1, 0],
2229 bg => [0, 0, 0, 0.2],
2230 active_bg => [1, 1, 1, 0.5],
2231 state => 0,
2232 can_hover => 1,
2233 @_
2234 )
2235}
2236
2237sub size_request {
2238 my ($self) = @_;
2239
2240 (6) x 2
2241}
2242
2243sub toggle {
2244 my ($self) = @_;
2245
2246 $self->{state} = !$self->{state};
2247 $self->emit (changed => $self->{state});
2248 $self->update;
2249}
2250
2251sub invoke_button_down {
2252 my ($self, $ev, $x, $y) = @_;
2253
2254 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2255 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2256 $self->toggle;
2257 } else {
2258 return 0
2259 }
2260
2261 1
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266
2267 $self->SUPER::_draw;
2268
2269 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2270
2271 my ($w, $h) = @$self{qw(w h)};
2272
2273 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2274
2275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2276
2277 my $tex = $self->{state} ? $tex[1] : $tex[0];
2278
2279 glEnable GL_TEXTURE_2D;
2280 $tex->draw_quad_alpha (0, 0, $s, $s);
2281 glDisable GL_TEXTURE_2D;
2282}
2283
2284#############################################################################
2285
2286package CFPlus::UI::Image;
2287
2288our @ISA = CFPlus::UI::Base::;
2289
2290use CFPlus::OpenGL;
2291
2292our %texture_cache;
2293
2294sub new {
2295 my $class = shift;
2296
2297 my $self = $class->SUPER::new (
2298 can_events => 0,
2299 @_,
2300 );
2301
2302 $self->{path} || $self->{tex}
2303 or Carp::croak "'path' or 'tex' attributes required";
2304
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2307
2308 Scalar::Util::weaken $texture_cache{$self->{path}};
2309
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311
2312 $self
2313}
2314
2315sub STORABLE_freeze {
2316 my ($self, $cloning) = @_;
2317
2318 $self->{path}
2319 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2320
2321 $self->{path}
2322}
2323
2324sub STORABLE_attach {
2325 my ($self, $cloning, $path) = @_;
2326
2327 $self->new (path => $path)
2328}
2329
2330sub size_request {
2331 my ($self) = @_;
2332
2333 ($self->{tex}{w}, $self->{tex}{h})
2334}
2335
2336sub _draw {
2337 my ($self) = @_;
2338
2339 my $tex = $self->{tex};
2340
2341 my ($w, $h) = ($self->{w}, $self->{h});
2342
2343 if ($self->{rot90}) {
2344 glRotate 90, 0, 0, 1;
2345 glTranslate 0, -$self->{w}, 0;
2346
2347 ($w, $h) = ($h, $w);
2348 }
2349
2350 glEnable GL_TEXTURE_2D;
2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2352
2353 $tex->draw_quad (0, 0, $w, $h);
2354
2355 glDisable GL_TEXTURE_2D;
2356}
2357
2358#############################################################################
2359
1996package CFClient::UI::ImageButton; 2360package CFPlus::UI::ImageButton;
1997 2361
1998our @ISA = CFClient::UI::Image::; 2362our @ISA = CFPlus::UI::Image::;
1999 2363
2000use CFClient::OpenGL; 2364use CFPlus::OpenGL;
2001 2365
2002my %textures; 2366my %textures;
2003 2367
2004sub new { 2368sub new {
2005 my $class = shift; 2369 my $class = shift;
… …
2027 1 2391 1
2028} 2392}
2029 2393
2030############################################################################# 2394#############################################################################
2031 2395
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2396package CFPlus::UI::VGauge;
2101 2397
2102our @ISA = CFClient::UI::Base::; 2398our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2399
2163use List::Util qw(min max); 2400use List::Util qw(min max);
2164 2401
2165use CFClient::OpenGL; 2402use CFPlus::OpenGL;
2166 2403
2167my %tex = ( 2404my %tex = (
2168 food => [ 2405 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2406 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2407 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2408 ],
2172 grace => [ 2409 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2410 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2411 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2412 ],
2176 hp => [ 2413 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2414 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2415 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2416 ],
2180 mana => [ 2417 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2419 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2420 ],
2184); 2421);
2185 2422
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2423# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2483 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2484 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2485
2249 my $h1 = $self->{h} * (1 - $ycut1); 2486 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2487 my $h2 = $self->{h} * (1 - $ycut2);
2488 my $h3 = $self->{h};
2489
2490 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2491
2252 glEnable GL_BLEND; 2492 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2493 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2494 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2495 glEnable GL_TEXTURE_2D;
… …
2274 2514
2275 if ($t3) { 2515 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2516 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2517 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2518 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2519 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2520 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2521 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2522 glEnd;
2283 } 2523 }
2284 2524
2285 glDisable GL_BLEND; 2525 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2526 glDisable GL_TEXTURE_2D;
2287} 2527}
2288 2528
2289############################################################################# 2529#############################################################################
2290 2530
2291package CFClient::UI::Gauge; 2531package CFPlus::UI::Gauge;
2292 2532
2293our @ISA = CFClient::UI::VBox::; 2533our @ISA = CFPlus::UI::VBox::;
2294 2534
2295sub new { 2535sub new {
2296 my ($class, %arg) = @_; 2536 my ($class, %arg) = @_;
2297 2537
2298 my $self = $class->SUPER::new ( 2538 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2540 can_hover => 1,
2301 can_events => 1, 2541 can_events => 1,
2302 %arg, 2542 %arg,
2303 ); 2543 );
2304 2544
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2545 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2546 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2547 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2548
2309 $self 2549 $self
2310} 2550}
2311 2551
2312sub set_fontsize { 2552sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2573 $self->{value}->set_text ($val);
2334} 2574}
2335 2575
2336############################################################################# 2576#############################################################################
2337 2577
2338package CFClient::UI::Slider; 2578package CFPlus::UI::Slider;
2339 2579
2340use strict; 2580use strict;
2341 2581
2342use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2343 2583
2344our @ISA = CFClient::UI::DrawBG::; 2584our @ISA = CFPlus::UI::DrawBG::;
2345 2585
2346my @tex = 2586my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2587 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2588 qw(s1_slider.png s1_slider_bg.png);
2349 2589
2350sub new { 2590sub new {
2351 my $class = shift; 2591 my $class = shift;
2352 2592
… …
2441 } 2681 }
2442 2682
2443 1 2683 1
2444} 2684}
2445 2685
2686sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_;
2688
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2692
2693 ! ! $delta
2694}
2695
2446sub update { 2696sub update {
2447 my ($self) = @_; 2697 my ($self) = @_;
2448 2698
2449 delete $self->{knob_w}; 2699 delete $self->{knob_w};
2450 $self->SUPER::update; 2700 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2747 glDisable GL_TEXTURE_2D;
2498} 2748}
2499 2749
2500############################################################################# 2750#############################################################################
2501 2751
2502package CFClient::UI::ValSlider; 2752package CFPlus::UI::ValSlider;
2503 2753
2504our @ISA = CFClient::UI::HBox::; 2754our @ISA = CFPlus::UI::HBox::;
2505 2755
2506sub new { 2756sub new {
2507 my ($class, %arg) = @_; 2757 my ($class, %arg) = @_;
2508 2758
2509 my $range = delete $arg{range}; 2759 my $range = delete $arg{range};
2510 2760
2511 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2762 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2763 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2764 to_value => sub { shift },
2515 from_value => sub { shift }, 2765 from_value => sub { shift },
2516 %arg, 2766 %arg,
2517 ); 2767 );
2518 2768
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2788sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2789sub set_value { shift->{slider}->set_value (@_) }
2540 2790
2541############################################################################# 2791#############################################################################
2542 2792
2543package CFClient::UI::TextScroller; 2793package CFPlus::UI::TextScroller;
2544 2794
2545our @ISA = CFClient::UI::HBox::; 2795our @ISA = CFPlus::UI::HBox::;
2546 2796
2547use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2548 2798
2549sub new { 2799sub new {
2550 my $class = shift; 2800 my $class = shift;
2551 2801
2552 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2553 fontsize => 1, 2803 fontsize => 1,
2554 can_events => 0, 2804 can_events => 1,
2555 indent => 0, 2805 indent => 0,
2556 #font => default_font 2806 #font => default_font
2557 @_, 2807 @_,
2558 2808
2559 layout => (new CFClient::Layout 1), 2809 layout => (new CFPlus::Layout),
2560 par => [], 2810 par => [],
2561 height => 0, 2811 height => 0,
2562 children => [ 2812 children => [
2563 (new CFClient::UI::Empty expand => 1), 2813 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2814 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2815 ],
2566 ); 2816 );
2567 2817
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 2818 $self->{children}[1]->connect (changed => sub { $self->update });
2569 2819
… …
2599 2849
2600 $self->reflow; 2850 $self->reflow;
2601 2851
2602 local $self->{children} = [$empty, $slider]; 2852 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h) 2853 $self->SUPER::invoke_size_allocate ($w, $h)
2854}
2855
2856sub invoke_mouse_wheel {
2857 my ($self, $ev) = @_;
2858
2859 return 0 unless $ev->{dy}; # only vertical movements
2860
2861 $self->{children}[1]->emit (mouse_wheel => $ev);
2862
2863 1
2604} 2864}
2605 2865
2606sub get_layout { 2866sub get_layout {
2607 my ($self, $para) = @_; 2867 my ($self, $para) = @_;
2608 2868
… …
2636 2896
2637 # todo: base offset on lines or so, not on pixels 2897 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset); 2898 $self->{children}[1]->set_value ($offset);
2639} 2899}
2640 2900
2901sub current_paragraph {
2902 my ($self) = @_;
2903
2904 $self->{top_paragraph} - 1
2905}
2906
2907sub scroll_to {
2908 my ($self, $para) = @_;
2909
2910 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2911
2912 $self->{scroll_to} = $para;
2913 $self->update;
2914}
2915
2641sub clear { 2916sub clear {
2642 my ($self) = @_; 2917 my ($self) = @_;
2643 2918
2644 my (undef, undef, @other) = @{ $self->{children} }; 2919 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other; 2920 $self->remove ($_) for @other;
… …
2648 $self->{height} = 0; 2923 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2924 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 2925}
2651 2926
2652sub add_paragraph { 2927sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 2928 my $self = shift;
2654 2929
2655 my ($text, @w) = ref $para ? @$para : $para; 2930 for my $para (@_) {
2656
2657 $para = { 2931 $para = {
2932 fg => [1, 1, 1, 1],
2933 indent => 0,
2934 markup => "",
2935 widget => [],
2936 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 2937 w => 1e10,
2659 wrapped => 1, 2938 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 2939 };
2665 2940
2666 $self->add (@w) if @w; 2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 push @{$self->{par}}, $para; 2942 push @{$self->{par}}, $para;
2943 }
2668 2944
2669 $self->{need_reflow}++; 2945 $self->{need_reflow}++;
2670 $self->update; 2946 $self->update;
2671} 2947}
2672 2948
2673sub scroll_to_bottom { 2949sub scroll_to_bottom {
2674 my ($self) = @_; 2950 my ($self) = @_;
2675 2951
2676 $self->{scroll_to_bottom} = 1; 2952 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 2953 $self->update;
2678} 2954}
2679 2955
2956sub force_uptodate {
2957 my ($self) = @_;
2958
2959 if (delete $self->{need_reflow}) {
2960 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2961
2962 my $height = 0;
2963
2964 for my $para (@{$self->{par}}) {
2965 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2966 my $layout = $self->get_layout ($para);
2967 my ($w, $h) = $layout->size;
2968
2969 $para->{w} = $w + $para->{indent};
2970 $para->{h} = $h;
2971 $para->{wrapped} = $layout->has_wrapped;
2972 }
2973
2974 $para->{y} = $height;
2975 $height += $para->{h};
2976 }
2977
2978 $self->{height} = $height;
2979 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2980
2981 delete $self->{texture};
2982 }
2983
2984 if (my $paridx = delete $self->{scroll_to}) {
2985 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2986 }
2987}
2988
2680sub update { 2989sub update {
2681 my ($self) = @_; 2990 my ($self) = @_;
2682 2991
2683 $self->SUPER::update; 2992 $self->SUPER::update;
2684 2993
2685 return unless $self->{h} > 0; 2994 return unless $self->{h} > 0;
2686 2995
2687 delete $self->{texture}; 2996 delete $self->{texture};
2688 2997
2689 $ROOT->on_post_alloc ($self => sub { 2998 $ROOT->on_post_alloc ($self => sub {
2999 $self->force_uptodate;
3000
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3001 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3002
2692 if (delete $self->{need_reflow}) {
2693 my $height = 0;
2694
2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2707
2708 $self->{height} = $height;
2709
2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3003 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3004 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3005 glClear GL_COLOR_BUFFER_BIT;
2722 3006
3007 package CFPlus::UI::Base;
3008 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3009 (0, 0, $self->{w}, $self->{h});
3010
3011 my $top = int $self->{children}[1]{range}[0];
3012
3013 my $paridx = 0;
3014 my $top_paragraph;
2723 my $top = int $self->{children}[1]{range}[0]; 3015 my $top = int $self->{children}[1]{range}[0];
2724 3016
2725 my $y0 = $top; 3017 my $y0 = $top;
2726 my $y1 = $top + $H; 3018 my $y1 = $top + $H;
2727 3019
2728 my $y = 0;
2729
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 3020 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3021 my $h = $para->{h};
3022 my $y = $para->{y};
2736 3023
2737 if ($y0 < $y + $h && $y < $y1) { 3024 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3025 my $layout = $self->get_layout ($para);
2740 3026
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3027 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 3028
2746 if (my @w = @{ $para->{widget} }) { 3029 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3030 my @s = $layout->get_shapes;
2748 3031
2749 glDisable GL_BLEND;
2750 for (@w) { 3032 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3033 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3034
2753 $_->{x} = $dx + $para->{indent}; 3035 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3036 $_->{y} = $dy + $y - $y0;
2755 3037
2756 $_->draw; 3038 $_->draw;
2757 } 3039 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3040 }
2761 } 3041 }
2762 3042
2763 $y += $h; 3043 $paridx++;
3044 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3045 }
2765 3046
2766 glDisable GL_BLEND; 3047 $self->{top_paragraph} = $top_paragraph;
2767 }; 3048 };
2768 }); 3049 });
2769} 3050}
2770 3051
2771sub reconfigure { 3052sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3070 $self->{children}[1]->draw;
2790} 3071}
2791 3072
2792############################################################################# 3073#############################################################################
2793 3074
2794package CFClient::UI::Animator; 3075package CFPlus::UI::Animator;
2795 3076
2796use CFClient::OpenGL; 3077use CFPlus::OpenGL;
2797 3078
2798our @ISA = CFClient::UI::Bin::; 3079our @ISA = CFPlus::UI::Bin::;
2799 3080
2800sub moveto { 3081sub moveto {
2801 my ($self, $x, $y) = @_; 3082 my ($self, $x, $y) = @_;
2802 3083
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3084 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3112 glPopMatrix;
2832} 3113}
2833 3114
2834############################################################################# 3115#############################################################################
2835 3116
2836package CFClient::UI::Flopper; 3117package CFPlus::UI::Flopper;
2837 3118
2838our @ISA = CFClient::UI::Button::; 3119our @ISA = CFPlus::UI::Button::;
2839 3120
2840sub new { 3121sub new {
2841 my $class = shift; 3122 my $class = shift;
2842 3123
2843 my $self = $class->SUPER::new ( 3124 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3136 $self->{other}->toggle_visibility;
2856} 3137}
2857 3138
2858############################################################################# 3139#############################################################################
2859 3140
2860package CFClient::UI::Tooltip; 3141package CFPlus::UI::Tooltip;
2861 3142
2862our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2863 3144
2864use CFClient::OpenGL; 3145use CFPlus::OpenGL;
2865 3146
2866sub new { 3147sub new {
2867 my $class = shift; 3148 my $class = shift;
2868 3149
2869 $class->SUPER::new ( 3150 $class->SUPER::new (
… …
2872 ) 3153 )
2873} 3154}
2874 3155
2875sub set_tooltip_from { 3156sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3157 my ($self, $widget) = @_;
3158
3159 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3160 if $widget->{tooltip} =~ /^#(.*)$/;
2877 3161
2878 my $tooltip = $widget->{tooltip}; 3162 my $tooltip = $widget->{tooltip};
2879 3163
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3164 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3165 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2885 } 3169 }
2886 3170
2887 $tooltip =~ s/^\n+//; 3171 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3172 $tooltip =~ s/\n+$//;
2889 3173
2890 $self->add (new CFClient::UI::Label 3174 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 3175 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3176 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 3177 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3178 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3179 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3180 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3181 );
2898} 3182}
2899 3183
… …
2918 3202
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3203 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3204 my $widget = $self->{owner}
2921 or return; 3205 or return;
2922 3206
3207 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3208 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3209
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3210 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3211 if $x + $self->{w} > $self->{root}{w};
2927 3212
2928 $self->move_abs ($x, $y); 3213 $self->move_abs ($x, $y);
3214 } else {
3215 $self->hide;
3216 }
2929 }); 3217 });
2930} 3218}
2931 3219
2932sub _draw { 3220sub _draw {
2933 my ($self) = @_; 3221 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3245 $self->SUPER::_draw;
2958} 3246}
2959 3247
2960############################################################################# 3248#############################################################################
2961 3249
2962package CFClient::UI::Face; 3250package CFPlus::UI::Face;
2963 3251
2964our @ISA = CFClient::UI::Base::; 3252our @ISA = CFPlus::UI::DrawBG::;
2965 3253
2966use CFClient::OpenGL; 3254use CFPlus::OpenGL;
2967 3255
2968sub new { 3256sub new {
2969 my $class = shift; 3257 my $class = shift;
2970 3258
2971 my $self = $class->SUPER::new ( 3259 my $self = $class->SUPER::new (
… …
3006sub _draw { 3294sub _draw {
3007 my ($self) = @_; 3295 my ($self) = @_;
3008 3296
3009 return unless $::CONN; 3297 return unless $::CONN;
3010 3298
3299 $self->SUPER::_draw;
3300
3011 my $face; 3301 my $face;
3012 3302
3013 if ($self->{frame}) { 3303 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}]; 3304 my $anim = $::CONN->{anim}[$self->{anim}];
3015 3305
… …
3037 $self->SUPER::destroy; 3327 $self->SUPER::destroy;
3038} 3328}
3039 3329
3040############################################################################# 3330#############################################################################
3041 3331
3042package CFClient::UI::Buttonbar; 3332package CFPlus::UI::Buttonbar;
3043 3333
3044our @ISA = CFClient::UI::HBox::; 3334our @ISA = CFPlus::UI::HBox::;
3045 3335
3046# TODO: should actualyl wrap buttons and other goodies. 3336# TODO: should actually wrap buttons and other goodies.
3047 3337
3048############################################################################# 3338#############################################################################
3049 3339
3050package CFClient::UI::Menu; 3340package CFPlus::UI::Menu;
3051 3341
3052our @ISA = CFClient::UI::FancyFrame::; 3342our @ISA = CFPlus::UI::Toplevel::;
3053 3343
3054use CFClient::OpenGL; 3344use CFPlus::OpenGL;
3055 3345
3056sub new { 3346sub new {
3057 my $class = shift; 3347 my $class = shift;
3058 3348
3059 my $self = $class->SUPER::new ( 3349 my $self = $class->SUPER::new (
3060 items => [], 3350 items => [],
3061 z => 100, 3351 z => 100,
3062 @_, 3352 @_,
3063 ); 3353 );
3064 3354
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3355 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3356
3067 for my $item (@{ $self->{items} }) { 3357 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3358 my ($widget, $cb, $tooltip) = @$item;
3069 3359
3070 # handle various types of items, only text for now 3360 # handle various types of items, only text for now
3071 if (!ref $widget) { 3361 if (!ref $widget) {
3362 if ($widget =~ /\t/) {
3363 my ($left, $right) = split /\t/, $widget, 2;
3364
3072 $widget = new CFClient::UI::Label 3365 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3366 can_hover => 1,
3074 can_events => 1, 3367 can_events => 1,
3368 tooltip => $tooltip,
3369 children => [
3370 (new CFPlus::UI::Label markup => $left, expand => 1),
3371 (new CFPlus::UI::Label markup => $right, align => +1),
3372 ],
3373 ;
3374
3375 } else {
3376 $widget = new CFPlus::UI::Label
3377 can_hover => 1,
3378 can_events => 1,
3075 markup => $widget, 3379 markup => $widget,
3076 tooltip => $tooltip 3380 tooltip => $tooltip;
3381 }
3077 } 3382 }
3078 3383
3079 $self->{item}{$widget} = $item; 3384 $self->{item}{$widget} = $item;
3080 3385
3081 $self->{vbox}->add ($widget); 3386 $self->{vbox}->add ($widget);
… …
3124 1 3429 1
3125} 3430}
3126 3431
3127############################################################################# 3432#############################################################################
3128 3433
3129package CFClient::UI::Multiplexer; 3434package CFPlus::UI::Multiplexer;
3130 3435
3131our @ISA = CFClient::UI::Container::; 3436our @ISA = CFPlus::UI::Container::;
3132 3437
3133sub new { 3438sub new {
3134 my $class = shift; 3439 my $class = shift;
3135 3440
3136 my $self = $class->SUPER::new ( 3441 my $self = $class->SUPER::new (
… …
3150 3455
3151 $self->{current} = $self->{children}[0] 3456 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3457 if @{ $self->{children} };
3153} 3458}
3154 3459
3460sub get_current_page {
3461 my ($self) = @_;
3462
3463 $self->{current}
3464}
3465
3155sub set_current_page { 3466sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3467 my ($self, $page_or_widget) = @_;
3157 3468
3158 my $widget = ref $page_or_widget 3469 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3470 ? $page_or_widget
… …
3191 $self->{current}->draw; 3502 $self->{current}->draw;
3192} 3503}
3193 3504
3194############################################################################# 3505#############################################################################
3195 3506
3196package CFClient::UI::Notebook; 3507package CFPlus::UI::Notebook;
3197 3508
3198our @ISA = CFClient::UI::VBox::; 3509our @ISA = CFPlus::UI::VBox::;
3199 3510
3200sub new { 3511sub new {
3201 my $class = shift; 3512 my $class = shift;
3202 3513
3203 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3515 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3516 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3517 # filter => # will be put between multiplexer and $self
3207 @_, 3518 @_,
3208 ); 3519 );
3209 3520
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3521 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3216sub add { 3527sub add {
3217 my ($self, $title, $widget, $tooltip) = @_; 3528 my ($self, $title, $widget, $tooltip) = @_;
3218 3529
3219 Scalar::Util::weaken $self; 3530 Scalar::Util::weaken $self;
3220 3531
3221 $self->{buttonbar}->add (new CFClient::UI::Button 3532 $self->{buttonbar}->add (new CFPlus::UI::Button
3222 markup => $title, 3533 markup => $title,
3223 tooltip => $tooltip, 3534 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3535 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3536 );
3226 3537
3227 $self->{multiplexer}->add ($widget); 3538 $self->{multiplexer}->add ($widget);
3228} 3539}
3229 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{multiplexer}->get_current_page
3545}
3546
3230sub set_current_page { 3547sub set_current_page {
3231 my ($self, $page) = @_; 3548 my ($self, $page) = @_;
3232 3549
3233 $self->{multiplexer}->set_current_page ($page); 3550 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3551 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3552}
3236 3553
3237############################################################################# 3554#############################################################################
3238 3555
3239package CFClient::UI::Combobox; 3556package CFPlus::UI::Selector;
3240 3557
3241use utf8; 3558use utf8;
3242 3559
3243our @ISA = CFClient::UI::Button::; 3560our @ISA = CFPlus::UI::Button::;
3244 3561
3245sub new { 3562sub new {
3246 my $class = shift; 3563 my $class = shift;
3247 3564
3248 my $self = $class->SUPER::new ( 3565 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3582 my ($value, $title, $tooltip) = @$_;
3266 3583
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3584 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3585 }
3269 3586
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3587 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3588}
3272 3589
3273sub _set_value { 3590sub _set_value {
3274 my ($self, $value) = @_; 3591 my ($self, $value) = @_;
3275 3592
… …
3290 $self->emit (changed => $value); 3607 $self->emit (changed => $value);
3291} 3608}
3292 3609
3293############################################################################# 3610#############################################################################
3294 3611
3295package CFClient::UI::Statusbox; 3612package CFPlus::UI::Statusbox;
3296 3613
3297our @ISA = CFClient::UI::VBox::; 3614our @ISA = CFPlus::UI::VBox::;
3298 3615
3299sub new { 3616sub new {
3300 my $class = shift; 3617 my $class = shift;
3301 3618
3302 my $self = $class->SUPER::new ( 3619 my $self = $class->SUPER::new (
… …
3314sub reorder { 3631sub reorder {
3315 my ($self) = @_; 3632 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3633 my $NOW = Time::HiRes::time;
3317 3634
3318 # freeze display when hovering over any label 3635 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3636 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3637 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3638 values %{ $self->{item} };
3322 3639
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3640 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3641 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3642 }
… …
3346 for ($short) { 3663 for ($short) {
3347 s/^\s+//; 3664 s/^\s+//;
3348 s/\s+/ /g; 3665 s/\s+/ /g;
3349 } 3666 }
3350 3667
3351 new CFClient::UI::Label 3668 new CFPlus::UI::Label
3352 markup => $short, 3669 markup => $short,
3353 tooltip => $item->{tooltip}, 3670 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3671 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3672 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3673 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3435 $self->SUPER::destroy; 3752 $self->SUPER::destroy;
3436} 3753}
3437 3754
3438############################################################################# 3755#############################################################################
3439 3756
3440package CFClient::UI::Inventory; 3757package CFPlus::UI::Inventory;
3441 3758
3442our @ISA = CFClient::UI::ScrolledWindow::; 3759our @ISA = CFPlus::UI::Table::;
3443 3760
3444sub new { 3761sub new {
3445 my $class = shift; 3762 my $class = shift;
3446 3763
3447 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3448 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3765 col_expand => [0, 1, 0],
3766 items => [],
3449 @_, 3767 @_,
3450 ); 3768 );
3451 3769
3770 $self->set_sort_order (undef);
3771
3452 $self 3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3453} 3808}
3454 3809
3455sub set_items { 3810sub set_items {
3456 my ($self, $items) = @_; 3811 my ($self, $items) = @_;
3457 3812
3458 $self->{child}->clear; 3813 $self->{items} = [$items ? values %$items : ()];
3459 return unless $items; 3814 $self->update_items;
3460
3461 my @items = sort {
3462 ($a->{type} <=> $b->{type})
3463 or ($a->{name} cmp $b->{name})
3464 } values %$items;
3465
3466 $self->{real_items} = \@items;
3467
3468 my $row = 0;
3469 for my $item (@items) {
3470 CFClient::Item::update_widgets $item;
3471
3472 $self->{child}->add (0, $row, $item->{face_widget});
3473 $self->{child}->add (1, $row, $item->{desc_widget});
3474 $self->{child}->add (2, $row, $item->{weight_widget});
3475
3476 $row++;
3477 }
3478} 3815}
3479 3816
3480############################################################################# 3817#############################################################################
3481 3818
3482package CFClient::UI::SpellList; 3819package CFPlus::UI::SpellList;
3483 3820
3484our @ISA = CFClient::UI::Table::; 3821our @ISA = CFPlus::UI::Table::;
3485 3822
3486sub new { 3823sub new {
3487 my $class = shift; 3824 my $class = shift;
3488 3825
3489 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
… …
3507 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); 3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3508 3845
3509sub rebuild_spell_list { 3846sub rebuild_spell_list {
3510 my ($self) = @_; 3847 my ($self) = @_;
3511 3848
3512 $CFClient::UI::ROOT->on_refresh ($self => sub { 3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3513 $self->clear; 3850 $self->clear;
3514 3851
3515 return unless $::CONN; 3852 return unless $::CONN;
3516 3853
3517 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3518 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3519 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3520 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3521 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3522 3859
3523 my $row = 0; 3860 my $row = 0;
3524 3861
3525 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3526 my $spell = $self->{spell}{$_}; 3863 my $spell = $self->{spell}{$_};
… …
3533 if ($ev->{button} == 1) { 3870 if ($ev->{button} == 1) {
3534 $::CONN->user_send ("cast $spell->{name}"); 3871 $::CONN->user_send ("cast $spell->{name}");
3535 } elsif ($ev->{button} == 2) { 3872 } elsif ($ev->{button} == 2) {
3536 $::CONN->user_send ("invoke $spell->{name}"); 3873 $::CONN->user_send ("invoke $spell->{name}");
3537 } elsif ($ev->{button} == 3) { 3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3538 (new CFClient::UI::Menu 3876 (new CFPlus::UI::Menu
3539 items => [ 3877 items => [
3540 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3541 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3542 ], 3880 ],
3543 )->popup ($ev); 3881 )->popup ($ev);
3544 } else { 3882 } else {
3545 return 0; 3883 return 0;
3546 } 3884 }
3547 3885
3548 1 3886 1
3549 }; 3887 };
3550 3888
3551 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3552 3890
3553 #TODO: add path info to tooltip 3891 #TODO: add path info to tooltip
3554 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); 3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3555 3893
3556 $self->add (0, $row, new CFClient::UI::Face 3894 $self->add (0, $row, new CFPlus::UI::Face
3557 face => $spell->{face}, 3895 face => $spell->{face},
3558 can_hover => 1, 3896 can_hover => 1,
3559 can_events => 1, 3897 can_events => 1,
3560 tooltip => $tooltip, 3898 tooltip => $tooltip,
3561 on_button_down => $spell_cb, 3899 on_button_down => $spell_cb,
3562 ); 3900 );
3563 3901
3564 $self->add (1, $row, new CFClient::UI::Label 3902 $self->add (1, $row, new CFPlus::UI::Label
3565 expand => 1, 3903 expand => 1,
3566 text => $spell->{name}, 3904 text => $spell->{name},
3567 can_hover => 1, 3905 can_hover => 1,
3568 can_events => 1, 3906 can_events => 1,
3569 tooltip => $tooltip, 3907 tooltip => $tooltip,
3570 on_button_down => $spell_cb, 3908 on_button_down => $spell_cb,
3571 ); 3909 );
3572 3910
3573 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); 3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3574 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3575 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3576 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3577 } 3915 }
3578 }); 3916 });
3579} 3917}
3580 3918
3581sub add_spell { 3919sub add_spell {
… …
3599 $self->rebuild_spell_list; 3937 $self->rebuild_spell_list;
3600} 3938}
3601 3939
3602############################################################################# 3940#############################################################################
3603 3941
3604package CFClient::UI::Root; 3942package CFPlus::UI::Root;
3605 3943
3606our @ISA = CFClient::UI::Container::; 3944our @ISA = CFPlus::UI::Container::;
3607 3945
3608use List::Util qw(min max); 3946use List::Util qw(min max);
3609 3947
3610use CFClient::OpenGL; 3948use CFPlus::OpenGL;
3611 3949
3612sub new { 3950sub new {
3613 my $class = shift; 3951 my $class = shift;
3614 3952
3615 my $self = $class->SUPER::new ( 3953 my $self = $class->SUPER::new (
… …
3791 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4129 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3792 4130
3793 $w = 0 if $w < 0; 4131 $w = 0 if $w < 0;
3794 $h = 0 if $h < 0; 4132 $h = 0 if $h < 0;
3795 4133
4134 $w = max $widget->{min_w}, $w;
4135 $h = max $widget->{min_h}, $h;
4136
4137# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4138# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4139
4140 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4141 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4142
3796 $w = int $w + 0.5; 4143 $w = int $w + 0.5;
3797 $h = int $h + 0.5; 4144 $h = int $h + 0.5;
3798 4145
3799 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4146 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3800 $widget->{old_w} = $widget->{w}; 4147 $widget->{old_w} = $widget->{w};
… …
3823 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4170 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3824 glMatrixMode GL_MODELVIEW; 4171 glMatrixMode GL_MODELVIEW;
3825 glLoadIdentity; 4172 glLoadIdentity;
3826 4173
3827 { 4174 {
3828 package CFClient::UI::Base; 4175 package CFPlus::UI::Base;
3829 4176
3830 ($draw_x, $draw_y, $draw_w, $draw_h) = 4177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3831 (0, 0, $self->{w}, $self->{h}); 4178 (0, 0, $self->{w}, $self->{h});
3832 }
3833 4179
3834 $self->_draw; 4180 $self->_draw;
4181 }
3835} 4182}
3836 4183
3837############################################################################# 4184#############################################################################
3838 4185
3839package CFClient::UI; 4186package CFPlus::UI;
3840 4187
3841$ROOT = new CFClient::UI::Root; 4188$ROOT = new CFPlus::UI::Root;
3842$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4189$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3843 4190
38441 41911
3845 4192

Diff Legend

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