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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->cb->();
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
98 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
100 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $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; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
193 reconfigure_widgets; 207 reconfigure_widgets;
194} 208}
195 209
196############################################################################# 210#############################################################################
197 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
198package CFClient::UI::Base; 220package CFPlus::UI::Base;
199 221
200use strict; 222use strict;
201 223
202use CFClient::OpenGL; 224use CFPlus::OpenGL;
203 225
204sub new { 226sub new {
205 my $class = shift; 227 my $class = shift;
206 228
207 my $self = bless { 229 my $self = bless {
… …
212 h => undef, 234 h => undef,
213 can_events => 1, 235 can_events => 1,
214 @_ 236 @_
215 }, $class; 237 }, $class;
216 238
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 240
219 for (keys %$self) { 241 for (keys %$self) {
220 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
222 } 244 }
223 } 245 }
224 246
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 248 $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}; 249 $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}; 250 $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}; 251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 252
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 255
234 $self->show if $layout->{show}; 256 $self->show if $layout->{show};
… …
239 261
240sub destroy { 262sub destroy {
241 my ($self) = @_; 263 my ($self) = @_;
242 264
243 $self->hide; 265 $self->hide;
266 $self->emit ("destroy");
244 %$self = (); 267 %$self = ();
245} 268}
246 269
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
509sub disconnect_all {
510 my ($self, $signal) = @_;
511
512 delete $self->{signal_cb}{$signal};
513}
514
515my %has_coords = (
516 button_down => 1,
517 button_up => 1,
518 mouse_motion => 1,
519 mouse_wheel => 1,
520);
475 521
476sub emit { 522sub emit {
477 my ($self, $signal, @args) = @_; 523 my ($self, $signal, @args) = @_;
478 524
479 #d##TODO# stop propagating at first true, do not use sum 525 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 526 # and needlessly verbose code, either.
527 my @append
528 = $has_coords{$signal}
529 ? $args[0]->xy ($self)
530 : ();
531
532 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
533
534 for my $cb (
535 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 542 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 543}
484 544
485sub find_widget { 545sub find_widget {
486 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
487 547
… …
495} 555}
496 556
497sub set_parent { 557sub set_parent {
498 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
499 559
500 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 561 $self->set_visible if $parent->{visible};
502} 562}
503 563
504sub realloc { 564sub realloc {
505 my ($self) = @_; 565 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 631 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 632 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 633 glVertex 0 , $self->{h} - 1;
574 glEnd; 634 glEnd;
575 glPopMatrix; 635 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 637 }
578 638
579 $self->_draw; 639 $self->_draw;
580 glPopMatrix; 640 glPopMatrix;
581} 641}
… …
584 my ($self) = @_; 644 my ($self) = @_;
585 645
586 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
587} 647}
588 648
649my $cntx;#d#
589sub DESTROY { 650sub DESTROY {
590 my ($self) = @_; 651 my ($self) = @_;
591 652
592 delete $WIDGET{$self+0}; 653 return if CFPlus::in_destruct;
593 654
594 eval { $self->destroy }; 655 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657
658 delete $WIDGET{$self+0};
596} 659}
597 660
598############################################################################# 661#############################################################################
599 662
600package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
601 664
602our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
603 666
604use strict; 667use strict;
605use CFClient::OpenGL; 668use CFPlus::OpenGL;
606 669
607sub new { 670sub new {
608 my $class = shift; 671 my $class = shift;
609 672
610 # range [value, low, high, page] 673 # range [value, low, high, page]
… …
641 } 704 }
642} 705}
643 706
644############################################################################# 707#############################################################################
645 708
646package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
647 710
648our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
649 712
650sub new { 713sub new {
651 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
653} 716}
… …
660 723
661sub draw { } 724sub draw { }
662 725
663############################################################################# 726#############################################################################
664 727
665package CFClient::UI::Container; 728package CFPlus::UI::Container;
666 729
667our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
668 731
669sub new { 732sub new {
670 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
671 734
672 my $children = delete $arg{children}; 735 my $children = delete $arg{children};
… …
681 if $children; 744 if $children;
682 745
683 $self 746 $self
684} 747}
685 748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
755}
756
686sub add { 757sub add {
687 my ($self, @widgets) = @_; 758 my ($self, @widgets) = @_;
688 759
689 $_->set_parent ($self) 760 $_->set_parent ($self)
690 for @widgets; 761 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 821 $_->draw for @{$self->{children}};
751} 822}
752 823
753############################################################################# 824#############################################################################
754 825
755package CFClient::UI::Bin; 826package CFPlus::UI::Bin;
756 827
757our @ISA = CFClient::UI::Container::; 828our @ISA = CFPlus::UI::Container::;
758 829
759sub new { 830sub new {
760 my ($class, %arg) = @_; 831 my ($class, %arg) = @_;
761 832
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 834
764 $class->SUPER::new (children => [$child], %arg) 835 $class->SUPER::new (children => [$child], %arg)
765} 836}
766 837
767sub add { 838sub add {
… …
774sub remove { 845sub remove {
775 my ($self, $widget) = @_; 846 my ($self, $widget) = @_;
776 847
777 $self->SUPER::remove ($widget); 848 $self->SUPER::remove ($widget);
778 849
779 $self->{children} = [new CFClient::UI::Empty] 850 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 851 unless @{$self->{children}};
781} 852}
782 853
783sub child { $_[0]->{children}[0] } 854sub child { $_[0]->{children}[0] }
784 855
… …
796 867
797############################################################################# 868#############################################################################
798 869
799# back-buffered drawing area 870# back-buffered drawing area
800 871
801package CFClient::UI::Window; 872package CFPlus::UI::Window;
802 873
803our @ISA = CFClient::UI::Bin::; 874our @ISA = CFPlus::UI::Bin::;
804 875
805use CFClient::OpenGL; 876use CFPlus::OpenGL;
806 877
807sub new { 878sub new {
808 my ($class, %arg) = @_; 879 my ($class, %arg) = @_;
809 880
810 my $self = $class->SUPER::new (%arg); 881 my $self = $class->SUPER::new (%arg);
… …
832} 903}
833 904
834sub render_child { 905sub render_child {
835 my ($self) = @_; 906 my ($self) = @_;
836 907
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 908 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 909 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
840 911
841 { 912 {
842 package CFClient::UI::Base; 913 package CFPlus::UI::Base;
843 914
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
846 } 919 }
847
848 $self->_render;
849 }; 920 };
850} 921}
851 922
852sub _draw { 923sub _draw {
853 my ($self) = @_; 924 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 925
857 my $tex = $self->{texture} 926 my $tex = $self->{texture}
858 or return; 927 or return;
859 928
860 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
863 932
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
865 934
866 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
867} 936}
868 937
869############################################################################# 938#############################################################################
870 939
871package CFClient::UI::ViewPort; 940package CFPlus::UI::ViewPort;
872 941
873our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
874 943
875sub new { 944sub new {
876 my $class = shift; 945 my $class = shift;
877 946
878 $class->SUPER::new ( 947 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1009 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1011 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1013 }
945} 1014}
946 1015
947sub _render { 1016sub _render {
948 my ($self) = @_; 1017 my ($self) = @_;
949 1018
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1019 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}; 1020 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1021
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1023
955 $self->SUPER::_render; 1024 $self->SUPER::_render;
956} 1025}
957 1026
958############################################################################# 1027#############################################################################
959 1028
960package CFClient::UI::ScrolledWindow; 1029package CFPlus::UI::ScrolledWindow;
961 1030
962our @ISA = CFClient::UI::HBox::; 1031our @ISA = CFPlus::UI::HBox::;
963 1032
964sub new { 1033sub new {
965 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
966 1035
967 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
968 1037
969 my $self; 1038 my $self;
970 1039
971 my $slider = new CFClient::UI::Slider 1040 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1041 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1042 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1043 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1044 $self->{vp}->set_offset (0, $_[1]);
976 }, 1045 },
977 ; 1046 ;
978 1047
979 $self = $class->SUPER::new ( 1048 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
981 slider => $slider, 1051 slider => $slider,
982 %arg, 1052 %arg,
983 ); 1053 );
984 1054
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1055 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1056 $self->add ($child) if $child;
… …
994 my ($self, $widget) = @_; 1064 my ($self, $widget) = @_;
995 1065
996 $self->{vp}->add ($self->{child} = $widget); 1066 $self->{vp}->add ($self->{child} = $widget);
997} 1067}
998 1068
1069sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_;
1071
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev);
1075
1076 1
1077}
1078
999sub update_slider { 1079sub update_slider {
1000 my ($self) = @_; 1080 my ($self) = @_;
1001 1081
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1083}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1098 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1099}
1020 1100
1021############################################################################# 1101#############################################################################
1022 1102
1023package CFClient::UI::Frame; 1103package CFPlus::UI::Frame;
1024 1104
1025our @ISA = CFClient::UI::Bin::; 1105our @ISA = CFPlus::UI::Bin::;
1026 1106
1027use CFClient::OpenGL; 1107use CFPlus::OpenGL;
1028 1108
1029sub new { 1109sub new {
1030 my $class = shift; 1110 my $class = shift;
1031 1111
1032 $class->SUPER::new ( 1112 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1138 $self->SUPER::_draw;
1059} 1139}
1060 1140
1061############################################################################# 1141#############################################################################
1062 1142
1063package CFClient::UI::FancyFrame; 1143package CFPlus::UI::FancyFrame;
1064 1144
1065our @ISA = CFClient::UI::Bin::; 1145our @ISA = CFPlus::UI::Bin::;
1066 1146
1067use CFClient::OpenGL; 1147use CFPlus::OpenGL;
1148
1149sub new {
1150 my ($class, %arg) = @_;
1151
1152 if ((exists $arg{label}) && !ref $arg{label}) {
1153 $arg{label} = new CFPlus::UI::Label
1154 align => 1,
1155 valign => 0,
1156 text => $arg{label},
1157 fontsize => ($arg{border} || 0.8) * 0.75;
1158 }
1159
1160 my $self = $class->SUPER::new (
1161 # label => "",
1162 fg => [0.6, 0.3, 0.1],
1163 border => 0.8,
1164 style => 'single',
1165 %arg,
1166 );
1167
1168 $self
1169}
1170
1171sub add {
1172 my ($self, @widgets) = @_;
1173
1174 $self->SUPER::add (@widgets);
1175 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1176}
1177
1178sub border {
1179 int $_[0]{border} * $::FONTSIZE
1180}
1181
1182sub size_request {
1183 my ($self) = @_;
1184
1185 ($self->{label_w}, undef) = $self->{label}->size_request
1186 if $self->{label};
1187
1188 my ($w, $h) = $self->SUPER::size_request;
1189
1190 (
1191 $w + $self->border * 2,
1192 $h + $self->border * 2,
1193 )
1194}
1195
1196sub invoke_size_allocate {
1197 my ($self, $w, $h) = @_;
1198
1199 my $border = $self->border;
1200
1201 $w -= List::Util::max 0, $border * 2;
1202 $h -= List::Util::max 0, $border * 2;
1203
1204 if (my $label = $self->{label}) {
1205 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1206 $label->{h} = List::Util::min $h, $border;
1207 $label->invoke_size_allocate ($label->{w}, $label->{h});
1208 }
1209
1210 $self->child->configure ($border, $border, $w, $h);
1211
1212 1
1213}
1214
1215sub _draw {
1216 my ($self) = @_;
1217
1218 my $child = $self->{children}[0];
1219
1220 my $border = $self->border;
1221 my ($w, $h) = ($self->{w}, $self->{h});
1222
1223 $child->draw;
1224
1225 glColor @{$self->{fg}};
1226 glBegin GL_LINE_STRIP;
1227 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1233 glEnd;
1234
1235 if ($self->{label}) {
1236 glTranslate $border * 2, 0;
1237 $self->{label}->_draw;
1238 }
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::Toplevel;
1244
1245our @ISA = CFPlus::UI::Bin::;
1246
1247use CFPlus::OpenGL;
1068 1248
1069my $bg = 1249my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1251 mipmap => 1, wrap => 1;
1072 1252
1073my @border = 1253my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1254 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); 1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1256
1077sub new { 1257sub new {
1078 my ($class, %arg) = @_; 1258 my ($class, %arg) = @_;
1079 1259
1080 my $self = $class->SUPER::new ( 1260 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1261 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1262 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1263 border => 0.6,
1084 can_events => 1, 1264 can_events => 1,
1085 min_w => 16, 1265 min_w => 64,
1086 min_h => 16, 1266 min_h => 32,
1087 %arg, 1267 %arg,
1088 ); 1268 );
1089 1269
1090 $self->{title_widget} = new CFClient::UI::Label 1270 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1271 align => 0,
1092 valign => 1, 1272 valign => 1,
1093 text => $self->{title}, 1273 text => $self->{title},
1094 fontsize => $self->{border}, 1274 fontsize => $self->{border},
1095 if exists $self->{title}; 1275 if exists $self->{title};
1096 1276
1097 if ($self->{has_close_button}) { 1277 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1278 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1279 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1280 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1281 on_activate => sub { $self->emit ("delete") };
1102 1282
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1284 }
1105 1285
1106 $self 1286 $self
1107} 1287}
1108 1288
1109sub add { 1289sub add {
1110 my ($self, @widgets) = @_; 1290 my ($self, @widgets) = @_;
1111 1291
1112 $self->SUPER::add (@widgets); 1292 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1293 $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}; 1294 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1295}
1116 1296
1117sub border { 1297sub border {
1118 int $_[0]{border} * $::FONTSIZE 1298 int $_[0]{border} * $::FONTSIZE
1119} 1299}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1332 $self->child->configure ($border, $border, $w, $h);
1153 1333
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1335 if $self->{close_button};
1156 1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1344
1157 1 1345 1
1158} 1346}
1159 1347
1160sub invoke_button_down { 1348sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1408
1221 ! ! $self->{motion} 1409 ! ! $self->{motion}
1222} 1410}
1223 1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
1418}
1419
1224sub _draw { 1420sub _draw {
1225 my ($self) = @_; 1421 my ($self) = @_;
1226 1422
1227 my $child = $self->{children}[0]; 1423 my $child = $self->{children}[0];
1228 1424
… …
1265 if $self->{close_button}; 1461 if $self->{close_button};
1266} 1462}
1267 1463
1268############################################################################# 1464#############################################################################
1269 1465
1270package CFClient::UI::Table; 1466package CFPlus::UI::Table;
1271 1467
1272our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
1273 1469
1274use List::Util qw(max sum); 1470use List::Util qw(max sum);
1275 1471
1276use CFClient::OpenGL; 1472use CFPlus::OpenGL;
1277 1473
1278sub new { 1474sub new {
1279 my $class = shift; 1475 my $class = shift;
1280 1476
1281 $class->SUPER::new ( 1477 $class->SUPER::new (
… …
1287sub children { 1483sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1485}
1290 1486
1291sub add { 1487sub add {
1292 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
1293 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1492 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
1296 1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1498 $self->realloc;
1298} 1499}
1299 1500
1300sub remove { 1501sub remove {
1301 my ($self, $child) = @_; 1502 my ($self, $child) = @_;
… …
1366 1567
1367 # linearly scale sizes 1568 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1571
1371 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1372 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1373 1574
1374 my $y; 1575 my $y;
1375 1576
1376 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1420 } 1621 }
1421} 1622}
1422 1623
1423############################################################################# 1624#############################################################################
1424 1625
1425package CFClient::UI::Box; 1626package CFPlus::UI::Box;
1426 1627
1427our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1428 1629
1429sub size_request { 1630sub size_request {
1430 my ($self) = @_; 1631 my ($self) = @_;
1431 1632
1432 $self->{vertical} 1633 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1666 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1667 for 0 .. $#children;
1467 } 1668 }
1468 } 1669 }
1469 1670
1470 CFClient::UI::harmonize \@req; 1671 CFPlus::UI::harmonize \@req;
1471 1672
1472 my $pos = 0; 1673 my $pos = 0;
1473 for (0 .. $#children) { 1674 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1675 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1676 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1681 1
1481} 1682}
1482 1683
1483############################################################################# 1684#############################################################################
1484 1685
1485package CFClient::UI::HBox; 1686package CFPlus::UI::HBox;
1486 1687
1487our @ISA = CFClient::UI::Box::; 1688our @ISA = CFPlus::UI::Box::;
1488 1689
1489sub new { 1690sub new {
1490 my $class = shift; 1691 my $class = shift;
1491 1692
1492 $class->SUPER::new ( 1693 $class->SUPER::new (
… …
1495 ) 1696 )
1496} 1697}
1497 1698
1498############################################################################# 1699#############################################################################
1499 1700
1500package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1501 1702
1502our @ISA = CFClient::UI::Box::; 1703our @ISA = CFPlus::UI::Box::;
1503 1704
1504sub new { 1705sub new {
1505 my $class = shift; 1706 my $class = shift;
1506 1707
1507 $class->SUPER::new ( 1708 $class->SUPER::new (
… …
1510 ) 1711 )
1511} 1712}
1512 1713
1513############################################################################# 1714#############################################################################
1514 1715
1515package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1516 1717
1517our @ISA = CFClient::UI::DrawBG::; 1718our @ISA = CFPlus::UI::DrawBG::;
1518 1719
1519use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1520 1721
1521sub new { 1722sub new {
1522 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1523 1724
1524 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1728 #active_bg => none
1528 #font => default_font 1729 #font => default_font
1529 #text => initial text 1730 #text => initial text
1530 #markup => initial narkup 1731 #markup => initial narkup
1531 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1532 ellipsise => 3, # end 1734 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1736 fontsize => 1,
1535 align => -1, 1737 align => -1,
1536 valign => -1, 1738 valign => -1,
1537 padding_x => 2, 1739 padding_x => 2,
1538 padding_y => 2, 1740 padding_y => 2,
1539 can_events => 0, 1741 can_events => 0,
1540 %arg 1742 %arg
1541 ); 1743 );
1542 1744
1543 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1748 $self->{template} = $layout;
1547 } 1749 }
1548 1750
1549 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1553 } 1755 }
1554 1756
1555 $self 1757 $self
1556} 1758}
1557 1759
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1760sub update {
1569 my ($self) = @_; 1761 my ($self) = @_;
1570 1762
1571 delete $self->{texture}; 1763 delete $self->{texture};
1572 $self->SUPER::update; 1764 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1584 1776
1585 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1587 1779
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1590 1781
1591 delete $self->{size_req}; 1782 delete $self->{size_req};
1592 $self->realloc; 1783 $self->realloc;
1593 $self->update; 1784 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1601 1792
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1794
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1606 1796
1607 delete $self->{size_req}; 1797 delete $self->{size_req};
1608 $self->realloc; 1798 $self->realloc;
1609 $self->update; 1799 $self->update;
… …
1621 1811
1622 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1623 1813
1624 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1815 $self->{template}->set_font ($self->{font}) if $self->{font};
1816 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1818
1628 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1629 1820
1630 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
… …
1654 1845
1655sub set_fontsize { 1846sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1657 1848
1658 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1659 delete $self->{texture}; 1851 delete $self->{texture};
1660 1852
1661 $self->realloc; 1853 $self->realloc;
1662} 1854}
1663 1855
1664sub reconfigure { 1856sub reconfigure {
1665 my ($self) = @_; 1857 my ($self) = @_;
1666 1858
1667 delete $self->{size_req}; 1859 delete $self->{size_req};
1860 delete $self->{texture};
1668 1861
1669 $self->SUPER::reconfigure; 1862 $self->SUPER::reconfigure;
1670} 1863}
1671 1864
1672sub _draw { 1865sub _draw {
1673 my ($self) = @_; 1866 my ($self) = @_;
1674 1867
1675 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1676 1869
1677 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1877
1685 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1686 }; 1879 };
1687 1880
1688 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1692 1885
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1889 };
1697 1890
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1893
1703 if ($tex->{format} == GL_ALPHA) { 1894 $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} 1895}
1714 1896
1715############################################################################# 1897#############################################################################
1716 1898
1717package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1718 1900
1719our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1720 1902
1721use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1722 1904
1723sub new { 1905sub new {
1724 my $class = shift; 1906 my $class = shift;
1725 1907
1726 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1731 can_hover => 1, 1913 can_hover => 1,
1732 can_focus => 1, 1914 can_focus => 1,
1733 valign => 0, 1915 valign => 0,
1734 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1735 #text => ... 1918 #text => ...
1736 #hidden => "*", 1919 #hidden => "*",
1737 @_ 1920 @_
1738 ) 1921 )
1739} 1922}
… …
1788 1971
1789 if ($uni == 8) { 1972 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1798 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1800 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1801 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 1988 $self->emit ('escape');
1803 } elsif ($uni) { 1989 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 1991 } else {
1806 return 0; 1992 return 0;
1807 } 1993 }
1808 1994
1809 $self->_set_text ($text); 1995 $self->_set_text ($text);
1810 1996
1811 $self->realloc; 1997 $self->realloc;
1998 $self->update;
1812 1999
1813 1 2000 1
1814} 2001}
1815 2002
1816sub invoke_focus_in { 2003sub invoke_focus_in {
… …
1828 2015
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2016 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2017
1831 # byte-index to char-index 2018 # byte-index to char-index
1832 my $text = $self->{text}; 2019 my $text = $self->{text};
1833 utf8::encode $text; 2020 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2021 $self->{cursor} = length $text;
1835 2022
1836 $self->_set_text ($self->{text}); 2023 $self->_set_text ($self->{text});
1837 $self->update; 2024 $self->update;
1838 2025
1839 1 2026 1
… …
1878 utf8::encode $text; 2065 utf8::encode $text;
1879 2066
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2068 }
1882 2069
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2070 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2071 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}; 2072 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2073 glEnd;
1888 } 2074 }
1889} 2075}
1890 2076
2077#############################################################################
2078
1891package CFClient::UI::Entry; 2079package CFPlus::UI::Entry;
1892 2080
1893our @ISA = CFClient::UI::EntryBase::; 2081our @ISA = CFPlus::UI::EntryBase::;
1894 2082
1895use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1896 2084
1897sub invoke_key_down { 2085sub invoke_key_down {
1898 my ($self, $ev) = @_; 2086 my ($self, $ev) = @_;
1899 2087
1900 my $sym = $ev->{sym}; 2088 my $sym = $ev->{sym};
1901 2089
1902 if ($sym == 13) { 2090 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2091 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2092 my $txt = $self->get_text;
1905 2093
1906 $self->{history_pointer} = -1; 2094 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2095 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2096 $self->emit (activate => $txt);
1909 $self->update; 2097 $self->update;
1910 2098
1911 } elsif ($sym == CFClient::SDLK_UP) { 2099 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2100 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2101 $self->{history_saveback} = $self->get_text;
1914 } 2102 }
1915 if (@{$self->{history} || []} > 0) { 2103 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2104 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2106 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2107 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2108 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2109 }
1922 2110
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2111 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2112 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2113 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2114
1927 if ($self->{history_pointer} >= 0) { 2115 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2116 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2125 1
1938} 2126}
1939 2127
1940############################################################################# 2128#############################################################################
1941 2129
2130package CFPlus::UI::TextEdit;
2131
2132our @ISA = CFPlus::UI::EntryBase::;
2133
2134use CFPlus::OpenGL;
2135
2136sub move_cursor_ver {
2137 my ($self, $dy) = @_;
2138
2139 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2140
2141 $y += $dy;
2142
2143 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2144 $self->{cursor} = $index;
2145 delete $self->{cur_h};
2146 $self->update;
2147 return;
2148 }
2149}
2150
2151sub invoke_key_down {
2152 my ($self, $ev) = @_;
2153
2154 my $sym = $ev->{sym};
2155
2156 if ($sym == CFPlus::SDLK_UP) {
2157 $self->move_cursor_ver (-1);
2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
2159 $self->move_cursor_ver (+1);
2160 } else {
2161 return $self->SUPER::invoke_key_down ($ev)
2162 }
2163
2164 1
2165}
2166
2167#############################################################################
2168
1942package CFClient::UI::Button; 2169package CFPlus::UI::Button;
1943 2170
1944our @ISA = CFClient::UI::Label::; 2171our @ISA = CFPlus::UI::Label::;
1945 2172
1946use CFClient::OpenGL; 2173use CFPlus::OpenGL;
1947 2174
1948my @tex = 2175my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2177 qw(b1_button_active.png);
1951 2178
1952sub new { 2179sub new {
1953 my $class = shift; 2180 my $class = shift;
1954 2181
… …
1991 $self->SUPER::_draw; 2218 $self->SUPER::_draw;
1992} 2219}
1993 2220
1994############################################################################# 2221#############################################################################
1995 2222
2223package CFPlus::UI::CheckBox;
2224
2225our @ISA = CFPlus::UI::DrawBG::;
2226
2227my @tex =
2228 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2229 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2230
2231use CFPlus::OpenGL;
2232
2233sub new {
2234 my $class = shift;
2235
2236 $class->SUPER::new (
2237 padding_x => 2,
2238 padding_y => 2,
2239 fg => [1, 1, 1],
2240 active_fg => [1, 1, 0],
2241 bg => [0, 0, 0, 0.2],
2242 active_bg => [1, 1, 1, 0.5],
2243 state => 0,
2244 can_hover => 1,
2245 @_
2246 )
2247}
2248
2249sub size_request {
2250 my ($self) = @_;
2251
2252 (6) x 2
2253}
2254
2255sub toggle {
2256 my ($self) = @_;
2257
2258 $self->{state} = !$self->{state};
2259 $self->emit (changed => $self->{state});
2260 $self->update;
2261}
2262
2263sub invoke_button_down {
2264 my ($self, $ev, $x, $y) = @_;
2265
2266 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2267 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2268 $self->toggle;
2269 } else {
2270 return 0
2271 }
2272
2273 1
2274}
2275
2276sub _draw {
2277 my ($self) = @_;
2278
2279 $self->SUPER::_draw;
2280
2281 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2282
2283 my ($w, $h) = @$self{qw(w h)};
2284
2285 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2286
2287 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2288
2289 my $tex = $self->{state} ? $tex[1] : $tex[0];
2290
2291 glEnable GL_TEXTURE_2D;
2292 $tex->draw_quad_alpha (0, 0, $s, $s);
2293 glDisable GL_TEXTURE_2D;
2294}
2295
2296#############################################################################
2297
2298package CFPlus::UI::Image;
2299
2300our @ISA = CFPlus::UI::Base::;
2301
2302use CFPlus::OpenGL;
2303
2304our %texture_cache;
2305
2306sub new {
2307 my $class = shift;
2308
2309 my $self = $class->SUPER::new (
2310 can_events => 0,
2311 @_,
2312 );
2313
2314 $self->{path} || $self->{tex}
2315 or Carp::croak "'path' or 'tex' attributes required";
2316
2317 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2318 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2319
2320 CFPlus::weaken $texture_cache{$self->{path}};
2321
2322 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2323
2324 $self
2325}
2326
2327sub STORABLE_freeze {
2328 my ($self, $cloning) = @_;
2329
2330 $self->{path}
2331 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2332
2333 $self->{path}
2334}
2335
2336sub STORABLE_attach {
2337 my ($self, $cloning, $path) = @_;
2338
2339 $self->new (path => $path)
2340}
2341
2342sub size_request {
2343 my ($self) = @_;
2344
2345 ($self->{tex}{w}, $self->{tex}{h})
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 my $tex = $self->{tex};
2352
2353 my ($w, $h) = ($self->{w}, $self->{h});
2354
2355 if ($self->{rot90}) {
2356 glRotate 90, 0, 0, 1;
2357 glTranslate 0, -$self->{w}, 0;
2358
2359 ($w, $h) = ($h, $w);
2360 }
2361
2362 glEnable GL_TEXTURE_2D;
2363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2364
2365 $tex->draw_quad (0, 0, $w, $h);
2366
2367 glDisable GL_TEXTURE_2D;
2368}
2369
2370#############################################################################
2371
1996package CFClient::UI::ImageButton; 2372package CFPlus::UI::ImageButton;
1997 2373
1998our @ISA = CFClient::UI::Image::; 2374our @ISA = CFPlus::UI::Image::;
1999 2375
2000use CFClient::OpenGL; 2376use CFPlus::OpenGL;
2001 2377
2002my %textures; 2378my %textures;
2003 2379
2004sub new { 2380sub new {
2005 my $class = shift; 2381 my $class = shift;
… …
2027 1 2403 1
2028} 2404}
2029 2405
2030############################################################################# 2406#############################################################################
2031 2407
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; 2408package CFPlus::UI::VGauge;
2101 2409
2102our @ISA = CFClient::UI::Base::; 2410our @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 2411
2163use List::Util qw(min max); 2412use List::Util qw(min max);
2164 2413
2165use CFClient::OpenGL; 2414use CFPlus::OpenGL;
2166 2415
2167my %tex = ( 2416my %tex = (
2168 food => [ 2417 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2419 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2420 ],
2172 grace => [ 2421 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 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/ 2423 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2424 ],
2176 hp => [ 2425 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2427 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2428 ],
2180 mana => [ 2429 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2430 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/ 2431 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2432 ],
2184); 2433);
2185 2434
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2435# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2495 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2496 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2497
2249 my $h1 = $self->{h} * (1 - $ycut1); 2498 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2499 my $h2 = $self->{h} * (1 - $ycut2);
2500 my $h3 = $self->{h};
2501
2502 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2503
2252 glEnable GL_BLEND; 2504 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2505 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2506 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2507 glEnable GL_TEXTURE_2D;
… …
2274 2526
2275 if ($t3) { 2527 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2528 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2529 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2530 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2531 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2532 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2533 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2534 glEnd;
2283 } 2535 }
2284 2536
2285 glDisable GL_BLEND; 2537 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
2287} 2539}
2288 2540
2289############################################################################# 2541#############################################################################
2290 2542
2291package CFClient::UI::Gauge; 2543package CFPlus::UI::Gauge;
2292 2544
2293our @ISA = CFClient::UI::VBox::; 2545our @ISA = CFPlus::UI::VBox::;
2294 2546
2295sub new { 2547sub new {
2296 my ($class, %arg) = @_; 2548 my ($class, %arg) = @_;
2297 2549
2298 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2552 can_hover => 1,
2301 can_events => 1, 2553 can_events => 1,
2302 %arg, 2554 %arg,
2303 ); 2555 );
2304 2556
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2557 $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); 2558 $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"); 2559 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2560
2309 $self 2561 $self
2310} 2562}
2311 2563
2312sub set_fontsize { 2564sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2585 $self->{value}->set_text ($val);
2334} 2586}
2335 2587
2336############################################################################# 2588#############################################################################
2337 2589
2338package CFClient::UI::Slider; 2590package CFPlus::UI::Slider;
2339 2591
2340use strict; 2592use strict;
2341 2593
2342use CFClient::OpenGL; 2594use CFPlus::OpenGL;
2343 2595
2344our @ISA = CFClient::UI::DrawBG::; 2596our @ISA = CFPlus::UI::DrawBG::;
2345 2597
2346my @tex = 2598my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2600 qw(s1_slider.png s1_slider_bg.png);
2349 2601
2350sub new { 2602sub new {
2351 my $class = shift; 2603 my $class = shift;
2352 2604
… …
2441 } 2693 }
2442 2694
2443 1 2695 1
2444} 2696}
2445 2697
2698sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_;
2700
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2704
2705 ! ! $delta
2706}
2707
2446sub update { 2708sub update {
2447 my ($self) = @_; 2709 my ($self) = @_;
2448 2710
2449 delete $self->{knob_w}; 2711 delete $self->{knob_w};
2450 $self->SUPER::update; 2712 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2498} 2760}
2499 2761
2500############################################################################# 2762#############################################################################
2501 2763
2502package CFClient::UI::ValSlider; 2764package CFPlus::UI::ValSlider;
2503 2765
2504our @ISA = CFClient::UI::HBox::; 2766our @ISA = CFPlus::UI::HBox::;
2505 2767
2506sub new { 2768sub new {
2507 my ($class, %arg) = @_; 2769 my ($class, %arg) = @_;
2508 2770
2509 my $range = delete $arg{range}; 2771 my $range = delete $arg{range};
2510 2772
2511 my $self = $class->SUPER::new ( 2773 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2774 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2775 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2776 to_value => sub { shift },
2515 from_value => sub { shift }, 2777 from_value => sub { shift },
2516 %arg, 2778 %arg,
2517 ); 2779 );
2518 2780
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2800sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2801sub set_value { shift->{slider}->set_value (@_) }
2540 2802
2541############################################################################# 2803#############################################################################
2542 2804
2543package CFClient::UI::TextScroller; 2805package CFPlus::UI::TextScroller;
2544 2806
2545our @ISA = CFClient::UI::HBox::; 2807our @ISA = CFPlus::UI::HBox::;
2546 2808
2547use CFClient::OpenGL; 2809use CFPlus::OpenGL;
2548 2810
2549sub new { 2811sub new {
2550 my $class = shift; 2812 my $class = shift;
2551 2813
2552 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
2553 fontsize => 1, 2815 fontsize => 1,
2554 can_events => 0, 2816 can_events => 1,
2555 indent => 0, 2817 indent => 0,
2556 #font => default_font 2818 #font => default_font
2557 @_, 2819 @_,
2558 2820
2559 layout => (new CFClient::Layout 1), 2821 layout => (new CFPlus::Layout),
2560 par => [], 2822 par => [],
2561 height => 0, 2823 height => 0,
2562 children => [ 2824 children => [
2563 (new CFClient::UI::Empty expand => 1), 2825 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2826 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2827 ],
2566 ); 2828 );
2567 2829
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 2830 $self->{children}[1]->connect (changed => sub { $self->update });
2569 2831
… …
2599 2861
2600 $self->reflow; 2862 $self->reflow;
2601 2863
2602 local $self->{children} = [$empty, $slider]; 2864 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h) 2865 $self->SUPER::invoke_size_allocate ($w, $h)
2866}
2867
2868sub invoke_mouse_wheel {
2869 my ($self, $ev) = @_;
2870
2871 return 0 unless $ev->{dy}; # only vertical movements
2872
2873 $self->{children}[1]->emit (mouse_wheel => $ev);
2874
2875 1
2604} 2876}
2605 2877
2606sub get_layout { 2878sub get_layout {
2607 my ($self, $para) = @_; 2879 my ($self, $para) = @_;
2608 2880
… …
2636 2908
2637 # todo: base offset on lines or so, not on pixels 2909 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset); 2910 $self->{children}[1]->set_value ($offset);
2639} 2911}
2640 2912
2913sub current_paragraph {
2914 my ($self) = @_;
2915
2916 $self->{top_paragraph} - 1
2917}
2918
2919sub scroll_to {
2920 my ($self, $para) = @_;
2921
2922 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2923
2924 $self->{scroll_to} = $para;
2925 $self->update;
2926}
2927
2641sub clear { 2928sub clear {
2642 my ($self) = @_; 2929 my ($self) = @_;
2643 2930
2644 my (undef, undef, @other) = @{ $self->{children} }; 2931 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other; 2932 $self->remove ($_) for @other;
… …
2648 $self->{height} = 0; 2935 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2936 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 2937}
2651 2938
2652sub add_paragraph { 2939sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 2940 my $self = shift;
2654 2941
2655 my ($text, @w) = ref $para ? @$para : $para; 2942 for my $para (@_) {
2656
2657 $para = { 2943 $para = {
2944 fg => [1, 1, 1, 1],
2945 indent => 0,
2946 markup => "",
2947 widget => [],
2948 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 2949 w => 1e10,
2659 wrapped => 1, 2950 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 2951 };
2665 2952
2666 $self->add (@w) if @w; 2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 push @{$self->{par}}, $para; 2954 push @{$self->{par}}, $para;
2955 }
2668 2956
2669 $self->{need_reflow}++; 2957 $self->{need_reflow}++;
2670 $self->update; 2958 $self->update;
2671} 2959}
2672 2960
2673sub scroll_to_bottom { 2961sub scroll_to_bottom {
2674 my ($self) = @_; 2962 my ($self) = @_;
2675 2963
2676 $self->{scroll_to_bottom} = 1; 2964 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 2965 $self->update;
2678} 2966}
2679 2967
2968sub force_uptodate {
2969 my ($self) = @_;
2970
2971 if (delete $self->{need_reflow}) {
2972 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2973
2974 my $height = 0;
2975
2976 for my $para (@{$self->{par}}) {
2977 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2978 my $layout = $self->get_layout ($para);
2979 my ($w, $h) = $layout->size;
2980
2981 $para->{w} = $w + $para->{indent};
2982 $para->{h} = $h;
2983 $para->{wrapped} = $layout->has_wrapped;
2984 }
2985
2986 $para->{y} = $height;
2987 $height += $para->{h};
2988 }
2989
2990 $self->{height} = $height;
2991 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2992
2993 delete $self->{texture};
2994 }
2995
2996 if (my $paridx = delete $self->{scroll_to}) {
2997 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2998 }
2999}
3000
2680sub update { 3001sub update {
2681 my ($self) = @_; 3002 my ($self) = @_;
2682 3003
2683 $self->SUPER::update; 3004 $self->SUPER::update;
2684 3005
2685 return unless $self->{h} > 0; 3006 return unless $self->{h} > 0;
2686 3007
2687 delete $self->{texture}; 3008 delete $self->{texture};
2688 3009
2689 $ROOT->on_post_alloc ($self => sub { 3010 $ROOT->on_post_alloc ($self => sub {
3011 $self->force_uptodate;
3012
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3013 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3014
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 { 3015 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3016 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3017 glClear GL_COLOR_BUFFER_BIT;
2722 3018
3019 package CFPlus::UI::Base;
3020 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3021 (0, 0, $self->{w}, $self->{h});
3022
3023 my $top = int $self->{children}[1]{range}[0];
3024
3025 my $paridx = 0;
3026 my $top_paragraph;
2723 my $top = int $self->{children}[1]{range}[0]; 3027 my $top = int $self->{children}[1]{range}[0];
2724 3028
2725 my $y0 = $top; 3029 my $y0 = $top;
2726 my $y1 = $top + $H; 3030 my $y1 = $top + $H;
2727 3031
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}}) { 3032 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3033 my $h = $para->{h};
3034 my $y = $para->{y};
2736 3035
2737 if ($y0 < $y + $h && $y < $y1) { 3036 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3037 my $layout = $self->get_layout ($para);
2740 3038
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3039 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 3040
2746 if (my @w = @{ $para->{widget} }) { 3041 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3042 my @s = $layout->get_shapes;
2748 3043
2749 glDisable GL_BLEND;
2750 for (@w) { 3044 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3045 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3046
2753 $_->{x} = $dx + $para->{indent}; 3047 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3048 $_->{y} = $dy + $y - $y0;
2755 3049
2756 $_->draw; 3050 $_->draw;
2757 } 3051 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3052 }
2761 } 3053 }
2762 3054
2763 $y += $h; 3055 $paridx++;
3056 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3057 }
2765 3058
2766 glDisable GL_BLEND; 3059 $self->{top_paragraph} = $top_paragraph;
2767 }; 3060 };
2768 }); 3061 });
2769} 3062}
2770 3063
2771sub reconfigure { 3064sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3082 $self->{children}[1]->draw;
2790} 3083}
2791 3084
2792############################################################################# 3085#############################################################################
2793 3086
2794package CFClient::UI::Animator; 3087package CFPlus::UI::Animator;
2795 3088
2796use CFClient::OpenGL; 3089use CFPlus::OpenGL;
2797 3090
2798our @ISA = CFClient::UI::Bin::; 3091our @ISA = CFPlus::UI::Bin::;
2799 3092
2800sub moveto { 3093sub moveto {
2801 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2802 3095
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3096 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3124 glPopMatrix;
2832} 3125}
2833 3126
2834############################################################################# 3127#############################################################################
2835 3128
2836package CFClient::UI::Flopper; 3129package CFPlus::UI::Flopper;
2837 3130
2838our @ISA = CFClient::UI::Button::; 3131our @ISA = CFPlus::UI::Button::;
2839 3132
2840sub new { 3133sub new {
2841 my $class = shift; 3134 my $class = shift;
2842 3135
2843 my $self = $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3148 $self->{other}->toggle_visibility;
2856} 3149}
2857 3150
2858############################################################################# 3151#############################################################################
2859 3152
2860package CFClient::UI::Tooltip; 3153package CFPlus::UI::Tooltip;
2861 3154
2862our @ISA = CFClient::UI::Bin::; 3155our @ISA = CFPlus::UI::Bin::;
2863 3156
2864use CFClient::OpenGL; 3157use CFPlus::OpenGL;
2865 3158
2866sub new { 3159sub new {
2867 my $class = shift; 3160 my $class = shift;
2868 3161
2869 $class->SUPER::new ( 3162 $class->SUPER::new (
… …
2872 ) 3165 )
2873} 3166}
2874 3167
2875sub set_tooltip_from { 3168sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3169 my ($self, $widget) = @_;
3170
3171 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3172 if $widget->{tooltip} =~ /^#(.*)$/;
2877 3173
2878 my $tooltip = $widget->{tooltip}; 3174 my $tooltip = $widget->{tooltip};
2879 3175
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3176 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3177 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2885 } 3181 }
2886 3182
2887 $tooltip =~ s/^\n+//; 3183 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3184 $tooltip =~ s/\n+$//;
2889 3185
2890 $self->add (new CFClient::UI::Label 3186 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 3187 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3188 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 3189 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3190 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3191 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3192 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3193 );
2898} 3194}
2899 3195
… …
2918 3214
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3215 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3216 my $widget = $self->{owner}
2921 or return; 3217 or return;
2922 3218
3219 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3220 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3221
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3222 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3223 if $x + $self->{w} > $self->{root}{w};
2927 3224
2928 $self->move_abs ($x, $y); 3225 $self->move_abs ($x, $y);
3226 } else {
3227 $self->hide;
3228 }
2929 }); 3229 });
2930} 3230}
2931 3231
2932sub _draw { 3232sub _draw {
2933 my ($self) = @_; 3233 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3257 $self->SUPER::_draw;
2958} 3258}
2959 3259
2960############################################################################# 3260#############################################################################
2961 3261
2962package CFClient::UI::Face; 3262package CFPlus::UI::Face;
2963 3263
2964our @ISA = CFClient::UI::Base::; 3264our @ISA = CFPlus::UI::DrawBG::;
2965 3265
2966use CFClient::OpenGL; 3266use CFPlus::OpenGL;
2967 3267
2968sub new { 3268sub new {
2969 my $class = shift; 3269 my $class = shift;
2970 3270
2971 my $self = $class->SUPER::new ( 3271 my $self = $class->SUPER::new (
… …
2973 can_events => 0, 3273 can_events => 0,
2974 @_, 3274 @_,
2975 ); 3275 );
2976 3276
2977 if ($self->{anim} && $self->{animspeed}) { 3277 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self); 3278 CFPlus::weaken (my $widget = $self);
2979 3279
2980 $self->{timer} = Event->timer ( 3280 $self->{timer} = Event->timer (
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982 hard => 1, 3282 hard => 1,
2983 interval => $self->{animspeed}, 3283 interval => $self->{animspeed},
… …
3006sub _draw { 3306sub _draw {
3007 my ($self) = @_; 3307 my ($self) = @_;
3008 3308
3009 return unless $::CONN; 3309 return unless $::CONN;
3010 3310
3311 $self->SUPER::_draw;
3312
3011 my $face; 3313 my $face;
3012 3314
3013 if ($self->{frame}) { 3315 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}]; 3316 my $anim = $::CONN->{anim}[$self->{anim}];
3015 3317
… …
3037 $self->SUPER::destroy; 3339 $self->SUPER::destroy;
3038} 3340}
3039 3341
3040############################################################################# 3342#############################################################################
3041 3343
3042package CFClient::UI::Buttonbar; 3344package CFPlus::UI::Buttonbar;
3043 3345
3044our @ISA = CFClient::UI::HBox::; 3346our @ISA = CFPlus::UI::HBox::;
3045 3347
3046# TODO: should actualyl wrap buttons and other goodies. 3348# TODO: should actually wrap buttons and other goodies.
3047 3349
3048############################################################################# 3350#############################################################################
3049 3351
3050package CFClient::UI::Menu; 3352package CFPlus::UI::Menu;
3051 3353
3052our @ISA = CFClient::UI::FancyFrame::; 3354our @ISA = CFPlus::UI::Toplevel::;
3053 3355
3054use CFClient::OpenGL; 3356use CFPlus::OpenGL;
3055 3357
3056sub new { 3358sub new {
3057 my $class = shift; 3359 my $class = shift;
3058 3360
3059 my $self = $class->SUPER::new ( 3361 my $self = $class->SUPER::new (
3060 items => [], 3362 items => [],
3061 z => 100, 3363 z => 100,
3062 @_, 3364 @_,
3063 ); 3365 );
3064 3366
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3367 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3368
3067 for my $item (@{ $self->{items} }) { 3369 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3370 my ($widget, $cb, $tooltip) = @$item;
3069 3371
3070 # handle various types of items, only text for now 3372 # handle various types of items, only text for now
3071 if (!ref $widget) { 3373 if (!ref $widget) {
3374 if ($widget =~ /\t/) {
3375 my ($left, $right) = split /\t/, $widget, 2;
3376
3072 $widget = new CFClient::UI::Label 3377 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3378 can_hover => 1,
3074 can_events => 1, 3379 can_events => 1,
3380 tooltip => $tooltip,
3381 children => [
3382 (new CFPlus::UI::Label markup => $left, expand => 1),
3383 (new CFPlus::UI::Label markup => $right, align => +1),
3384 ],
3385 ;
3386
3387 } else {
3388 $widget = new CFPlus::UI::Label
3389 can_hover => 1,
3390 can_events => 1,
3075 markup => $widget, 3391 markup => $widget,
3076 tooltip => $tooltip 3392 tooltip => $tooltip;
3393 }
3077 } 3394 }
3078 3395
3079 $self->{item}{$widget} = $item; 3396 $self->{item}{$widget} = $item;
3080 3397
3081 $self->{vbox}->add ($widget); 3398 $self->{vbox}->add ($widget);
… …
3124 1 3441 1
3125} 3442}
3126 3443
3127############################################################################# 3444#############################################################################
3128 3445
3129package CFClient::UI::Multiplexer; 3446package CFPlus::UI::Multiplexer;
3130 3447
3131our @ISA = CFClient::UI::Container::; 3448our @ISA = CFPlus::UI::Container::;
3132 3449
3133sub new { 3450sub new {
3134 my $class = shift; 3451 my $class = shift;
3135 3452
3136 my $self = $class->SUPER::new ( 3453 my $self = $class->SUPER::new (
… …
3150 3467
3151 $self->{current} = $self->{children}[0] 3468 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3469 if @{ $self->{children} };
3153} 3470}
3154 3471
3472sub get_current_page {
3473 my ($self) = @_;
3474
3475 $self->{current}
3476}
3477
3155sub set_current_page { 3478sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3479 my ($self, $page_or_widget) = @_;
3157 3480
3158 my $widget = ref $page_or_widget 3481 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3482 ? $page_or_widget
… …
3191 $self->{current}->draw; 3514 $self->{current}->draw;
3192} 3515}
3193 3516
3194############################################################################# 3517#############################################################################
3195 3518
3196package CFClient::UI::Notebook; 3519package CFPlus::UI::Notebook;
3197 3520
3198our @ISA = CFClient::UI::VBox::; 3521our @ISA = CFPlus::UI::VBox::;
3199 3522
3200sub new { 3523sub new {
3201 my $class = shift; 3524 my $class = shift;
3202 3525
3203 my $self = $class->SUPER::new ( 3526 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3527 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3528 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3529 # filter => # will be put between multiplexer and $self
3207 @_, 3530 @_,
3208 ); 3531 );
3209 3532
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3533 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3214} 3537}
3215 3538
3216sub add { 3539sub add {
3217 my ($self, $title, $widget, $tooltip) = @_; 3540 my ($self, $title, $widget, $tooltip) = @_;
3218 3541
3219 Scalar::Util::weaken $self; 3542 CFPlus::weaken $self;
3220 3543
3221 $self->{buttonbar}->add (new CFClient::UI::Button 3544 $self->{buttonbar}->add (new CFPlus::UI::Button
3222 markup => $title, 3545 markup => $title,
3223 tooltip => $tooltip, 3546 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3547 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3548 );
3226 3549
3227 $self->{multiplexer}->add ($widget); 3550 $self->{multiplexer}->add ($widget);
3228} 3551}
3229 3552
3553sub get_current_page {
3554 my ($self) = @_;
3555
3556 $self->{multiplexer}->get_current_page
3557}
3558
3230sub set_current_page { 3559sub set_current_page {
3231 my ($self, $page) = @_; 3560 my ($self, $page) = @_;
3232 3561
3233 $self->{multiplexer}->set_current_page ($page); 3562 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3563 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3564}
3236 3565
3237############################################################################# 3566#############################################################################
3238 3567
3239package CFClient::UI::Combobox; 3568package CFPlus::UI::Selector;
3240 3569
3241use utf8; 3570use utf8;
3242 3571
3243our @ISA = CFClient::UI::Button::; 3572our @ISA = CFPlus::UI::Button::;
3244 3573
3245sub new { 3574sub new {
3246 my $class = shift; 3575 my $class = shift;
3247 3576
3248 my $self = $class->SUPER::new ( 3577 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3594 my ($value, $title, $tooltip) = @$_;
3266 3595
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3596 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3597 }
3269 3598
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3599 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3600}
3272 3601
3273sub _set_value { 3602sub _set_value {
3274 my ($self, $value) = @_; 3603 my ($self, $value) = @_;
3275 3604
… …
3290 $self->emit (changed => $value); 3619 $self->emit (changed => $value);
3291} 3620}
3292 3621
3293############################################################################# 3622#############################################################################
3294 3623
3295package CFClient::UI::Statusbox; 3624package CFPlus::UI::Statusbox;
3296 3625
3297our @ISA = CFClient::UI::VBox::; 3626our @ISA = CFPlus::UI::VBox::;
3298 3627
3299sub new { 3628sub new {
3300 my $class = shift; 3629 my $class = shift;
3301 3630
3302 my $self = $class->SUPER::new ( 3631 my $self = $class->SUPER::new (
3303 fontsize => 0.8, 3632 fontsize => 0.8,
3304 @_, 3633 @_,
3305 ); 3634 );
3306 3635
3307 Scalar::Util::weaken (my $this = $self); 3636 CFPlus::weaken (my $this = $self);
3308 3637
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3638 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310 3639
3311 $self 3640 $self
3312} 3641}
… …
3314sub reorder { 3643sub reorder {
3315 my ($self) = @_; 3644 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3645 my $NOW = Time::HiRes::time;
3317 3646
3318 # freeze display when hovering over any label 3647 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3648 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3649 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3650 values %{ $self->{item} };
3322 3651
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3652 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3653 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3654 }
… …
3346 for ($short) { 3675 for ($short) {
3347 s/^\s+//; 3676 s/^\s+//;
3348 s/\s+/ /g; 3677 s/\s+/ /g;
3349 } 3678 }
3350 3679
3351 new CFClient::UI::Label 3680 new CFPlus::UI::Label
3352 markup => $short, 3681 markup => $short,
3353 tooltip => $item->{tooltip}, 3682 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3683 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3684 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3685 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3410 count => 1, 3739 count => 1,
3411 %arg, 3740 %arg,
3412 }; 3741 };
3413 } 3742 }
3414 3743
3744 $ROOT->on_refresh (reorder => sub {
3415 $self->reorder; 3745 $self->reorder;
3746 });
3416} 3747}
3417 3748
3418sub reconfigure { 3749sub reconfigure {
3419 my ($self) = @_; 3750 my ($self) = @_;
3420 3751
… …
3433 $self->SUPER::destroy; 3764 $self->SUPER::destroy;
3434} 3765}
3435 3766
3436############################################################################# 3767#############################################################################
3437 3768
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3490 @_,
3491 )
3492}
3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
3602package CFClient::UI::Root; 3769package CFPlus::UI::Root;
3603 3770
3604our @ISA = CFClient::UI::Container::; 3771our @ISA = CFPlus::UI::Container::;
3605 3772
3606use List::Util qw(min max); 3773use List::Util qw(min max);
3607 3774
3608use CFClient::OpenGL; 3775use CFPlus::OpenGL;
3609 3776
3610sub new { 3777sub new {
3611 my $class = shift; 3778 my $class = shift;
3612 3779
3613 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3614 visible => 1, 3781 visible => 1,
3615 @_, 3782 @_,
3616 ); 3783 );
3617 3784
3618 Scalar::Util::weaken ($self->{root} = $self); 3785 CFPlus::weaken ($self->{root} = $self);
3619 3786
3620 $self 3787 $self
3621} 3788}
3622 3789
3623sub size_request { 3790sub size_request {
… …
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790 3957
3791 $w = 0 if $w < 0; 3958 $w = 0 if $w < 0;
3792 $h = 0 if $h < 0; 3959 $h = 0 if $h < 0;
3793 3960
3961 $w = max $widget->{min_w}, $w;
3962 $h = max $widget->{min_h}, $h;
3963
3964# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966
3967 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969
3794 $w = int $w + 0.5; 3970 $w = int $w + 0.5;
3795 $h = int $h + 0.5; 3971 $h = int $h + 0.5;
3796 3972
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3973 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w}; 3974 $widget->{old_w} = $widget->{w};
… …
3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3997 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822 glMatrixMode GL_MODELVIEW; 3998 glMatrixMode GL_MODELVIEW;
3823 glLoadIdentity; 3999 glLoadIdentity;
3824 4000
3825 { 4001 {
3826 package CFClient::UI::Base; 4002 package CFPlus::UI::Base;
3827 4003
3828 ($draw_x, $draw_y, $draw_w, $draw_h) = 4004 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h}); 4005 (0, 0, $self->{w}, $self->{h});
3830 }
3831 4006
3832 $self->_draw; 4007 $self->_draw;
4008 }
3833} 4009}
3834 4010
3835############################################################################# 4011#############################################################################
3836 4012
3837package CFClient::UI; 4013package CFPlus::UI;
3838 4014
3839$ROOT = new CFClient::UI::Root; 4015$ROOT = new CFPlus::UI::Root;
3840$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4016$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841 4017
38421 40181
3843 4019

Diff Legend

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