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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.360 by root, Fri Dec 8 22:25:32 2006 UTC

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

Diff Legend

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