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.318 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $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; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $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}; 252 $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}; 253 $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}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
… …
452 486
453 $FOCUS->emit ("focus_out") if $FOCUS; 487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
474} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552sub find_widget {
486 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
487 554
… …
495} 562}
496 563
497sub set_parent { 564sub set_parent {
498 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
499 566
500 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
574 glEnd; 641 glEnd;
575 glPopMatrix; 642 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 644 }
578 645
579 $self->_draw; 646 $self->_draw;
580 glPopMatrix; 647 glPopMatrix;
581} 648}
… …
584 my ($self) = @_; 651 my ($self) = @_;
585 652
586 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
587} 654}
588 655
656my $cntx;#d#
589sub DESTROY { 657sub DESTROY {
590 my ($self) = @_; 658 my ($self) = @_;
591 659
592 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
593 661
594 eval { $self->destroy }; 662 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
… …
774sub remove { 852sub remove {
775 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
776 854
777 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
778 856
779 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 858 unless @{$self->{children}};
781} 859}
782 860
783sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
784 862
… …
796 874
797############################################################################# 875#############################################################################
798 876
799# back-buffered drawing area 877# back-buffered drawing area
800 878
801package CFClient::UI::Window; 879package CFPlus::UI::Window;
802 880
803our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
804 882
805use CFClient::OpenGL; 883use CFPlus::OpenGL;
806 884
807sub new { 885sub new {
808 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
809 887
810 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
832} 910}
833 911
834sub render_child { 912sub render_child {
835 my ($self) = @_; 913 my ($self) = @_;
836 914
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
840 918
841 { 919 {
842 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
843 921
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
846 } 926 }
847
848 $self->_render;
849 }; 927 };
850} 928}
851 929
852sub _draw { 930sub _draw {
853 my ($self) = @_; 931 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 932
857 my $tex = $self->{texture} 933 my $tex = $self->{texture}
858 or return; 934 or return;
859 935
860 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
863 939
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
865 941
866 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
867} 943}
868 944
869############################################################################# 945#############################################################################
870 946
871package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
872 948
949use List::Util qw(min max);
950
873our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
874 952
875sub new { 953sub new {
876 my $class = shift; 954 my $class = shift;
877 955
878 $class->SUPER::new ( 956 $class->SUPER::new (
… …
908} 986}
909 987
910sub set_offset { 988sub set_offset {
911 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
912 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
915 997
998 $self->emit (changed => $x, $y);
916 $self->update; 999 $self->update;
1000 }
917} 1001}
918 1002
919# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 1004sub coord2local {
921 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1024 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1026 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1028 }
945} 1029}
946 1030
947sub _render { 1031sub _render {
948 my ($self) = @_; 1032 my ($self) = @_;
949 1033
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1036
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1038
955 $self->SUPER::_render; 1039 $self->SUPER::_render;
956} 1040}
957 1041
958############################################################################# 1042#############################################################################
959 1043
960package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
961 1045
962our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
963 1047
964sub new { 1048sub new {
965 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
966 1050
967 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
968 1052
969 my $self; 1053 my $self;
970 1054
971 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1065 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1067 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1070 },
977 ; 1071 ;
978 1072
979 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
981 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
982 %arg, 1081 %arg,
983 ); 1082 );
984 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
986 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
987 1101
988 $self 1102 $self
989} 1103}
990 1104
… …
997} 1111}
998 1112
999sub update_slider { 1113sub update_slider {
1000 my ($self) = @_; 1114 my ($self) = @_;
1001 1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1003} 1135}
1004 1136
1005sub update { 1137sub update {
1006 my ($self) = @_; 1138 my ($self) = @_;
1007 1139
1008 $self->SUPER::update; 1140 $self->SUPER::update;
1009
1010 $self->update_slider; 1141 $self->update_slider;
1142}
1143
1144sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_;
1146
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev);
1150
1151 1
1152}
1153
1154sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_;
1156
1157 if ($ev->{button} == 2) {
1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1011} 1195}
1012 1196
1013sub invoke_size_allocate { 1197sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1015 1199
1016 $self->update_slider; 1200 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1202}
1020 1203
1021############################################################################# 1204#############################################################################
1022 1205
1023package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1024 1207
1025our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1026 1209
1027use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1028 1211
1029sub new { 1212sub new {
1030 my $class = shift; 1213 my $class = shift;
1031 1214
1032 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1059} 1242}
1060 1243
1061############################################################################# 1244#############################################################################
1062 1245
1063package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1064 1247
1065our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1066 1249
1067use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1068 1351
1069my $bg = 1352my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1072 1355
1073my @border = 1356my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1359
1077sub new { 1360sub new {
1078 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1079 1362
1080 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1366 border => 0.6,
1084 can_events => 1, 1367 can_events => 1,
1085 min_w => 16, 1368 min_w => 64,
1086 min_h => 16, 1369 min_h => 32,
1087 %arg, 1370 %arg,
1088 ); 1371 );
1089 1372
1090 $self->{title_widget} = new CFClient::UI::Label 1373 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1374 align => 0,
1092 valign => 1, 1375 valign => 1,
1093 text => $self->{title}, 1376 text => $self->{title},
1094 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1095 if exists $self->{title}; 1378 if exists $self->{title};
1096 1379
1097 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1381 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1382 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1383 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1384 on_activate => sub { $self->emit ("delete") };
1102 1385
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1386 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1387 }
1105 1388
1106 $self 1389 $self
1107} 1390}
1108 1391
1109sub add { 1392sub add {
1110 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1111 1394
1112 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1398}
1116 1399
1117sub border { 1400sub border {
1118 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1119} 1402}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1510 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1511
1229 ! ! $self->{motion} 1512 ! ! $self->{motion}
1230} 1513}
1231 1514
1515sub invoke_visibility_change {
1516 my ($self, $visible) = @_;
1517
1518 delete $self->{motion} unless $visible;
1519
1520 0
1521}
1522
1232sub _draw { 1523sub _draw {
1233 my ($self) = @_; 1524 my ($self) = @_;
1234 1525
1235 my $child = $self->{children}[0]; 1526 my $child = $self->{children}[0];
1236 1527
… …
1273 if $self->{close_button}; 1564 if $self->{close_button};
1274} 1565}
1275 1566
1276############################################################################# 1567#############################################################################
1277 1568
1278package CFClient::UI::Table; 1569package CFPlus::UI::Table;
1279 1570
1280our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
1281 1572
1282use List::Util qw(max sum); 1573use List::Util qw(max sum);
1283 1574
1284use CFClient::OpenGL; 1575use CFPlus::OpenGL;
1285 1576
1286sub new { 1577sub new {
1287 my $class = shift; 1578 my $class = shift;
1288 1579
1289 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1290 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1291 @_, 1584 @_,
1292 ) 1585 )
1293} 1586}
1294 1587
1295sub children { 1588sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1590}
1298 1591
1592# TODO: store row/col info in child widget and use standard add/del
1299sub add { 1593sub add {
1300 my ($self, $x, $y, $child) = @_; 1594 my ($self) = shift;
1301 1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1598 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1600 }
1304 1601
1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1604 $self->realloc;
1306} 1605}
1307 1606
1308sub remove { 1607sub remove {
1309 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1310 1609
1311 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1312} 1615}
1313 1616
1314# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1315sub clear { 1618sub clear {
1316 my ($self) = @_; 1619 my ($self) = @_;
… …
1365 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1366 1669
1367 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1369 1672
1370 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1371 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1374 1677
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1679
1379 CFClient::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1380 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1381 1689
1382 my $y; 1690 my $y;
1383 1691
1384 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1428 } 1736 }
1429} 1737}
1430 1738
1431############################################################################# 1739#############################################################################
1432 1740
1433package CFClient::UI::Box; 1741package CFPlus::UI::Fixed;
1434 1742
1743use List::Util qw(min max);
1744
1435our @ISA = CFClient::UI::Container::; 1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1819}
1820
1821#############################################################################
1822
1823package CFPlus::UI::Box;
1824
1825our @ISA = CFPlus::UI::Container::;
1436 1826
1437sub size_request { 1827sub size_request {
1438 my ($self) = @_; 1828 my ($self) = @_;
1439 1829
1440 $self->{vertical} 1830 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1863 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1864 for 0 .. $#children;
1475 } 1865 }
1476 } 1866 }
1477 1867
1478 CFClient::UI::harmonize \@req; 1868 CFPlus::UI::harmonize \@req;
1479 1869
1480 my $pos = 0; 1870 my $pos = 0;
1481 for (0 .. $#children) { 1871 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1872 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1878 1
1489} 1879}
1490 1880
1491############################################################################# 1881#############################################################################
1492 1882
1493package CFClient::UI::HBox; 1883package CFPlus::UI::HBox;
1494 1884
1495our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1496 1886
1497sub new { 1887sub new {
1498 my $class = shift; 1888 my $class = shift;
1499 1889
1500 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1503 ) 1893 )
1504} 1894}
1505 1895
1506############################################################################# 1896#############################################################################
1507 1897
1508package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1509 1899
1510our @ISA = CFClient::UI::Box::; 1900our @ISA = CFPlus::UI::Box::;
1511 1901
1512sub new { 1902sub new {
1513 my $class = shift; 1903 my $class = shift;
1514 1904
1515 $class->SUPER::new ( 1905 $class->SUPER::new (
… …
1518 ) 1908 )
1519} 1909}
1520 1910
1521############################################################################# 1911#############################################################################
1522 1912
1523package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1524 1914
1525our @ISA = CFClient::UI::DrawBG::; 1915our @ISA = CFPlus::UI::DrawBG::;
1526 1916
1527use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1528 1918
1529sub new { 1919sub new {
1530 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1531 1921
1532 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1925 #active_bg => none
1536 #font => default_font 1926 #font => default_font
1537 #text => initial text 1927 #text => initial text
1538 #markup => initial narkup 1928 #markup => initial narkup
1539 #max_w => maximum pixel width 1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1540 ellipsise => 3, # end 1931 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1932 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1933 fontsize => 1,
1543 align => -1, 1934 align => -1,
1544 valign => -1, 1935 valign => -1,
1545 padding_x => 2, 1936 padding_x => 2,
1546 padding_y => 2, 1937 padding_y => 2,
1547 can_events => 0, 1938 can_events => 0,
1548 %arg 1939 %arg
1549 ); 1940 );
1550 1941
1551 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1945 $self->{template} = $layout;
1555 } 1946 }
1556 1947
1557 if (exists $self->{markup}) { 1948 if (exists $self->{markup}) {
… …
1561 } 1952 }
1562 1953
1563 $self 1954 $self
1564} 1955}
1565 1956
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1957sub update {
1577 my ($self) = @_; 1958 my ($self) = @_;
1578 1959
1579 delete $self->{texture}; 1960 delete $self->{texture};
1580 $self->SUPER::update; 1961 $self->SUPER::update;
… …
1591 my ($self, $text) = @_; 1972 my ($self, $text) = @_;
1592 1973
1593 return if $self->{text} eq "T$text"; 1974 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1975 $self->{text} = "T$text";
1595 1976
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1977 $self->{layout}->set_text ($text);
1598 1978
1599 delete $self->{size_req}; 1979 delete $self->{size_req};
1600 $self->realloc; 1980 $self->realloc;
1601 $self->update; 1981 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1987 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1988 $self->{text} = "M$markup";
1609 1989
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1990 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1991
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1992 $self->{layout}->set_markup ($markup);
1614 1993
1615 delete $self->{size_req}; 1994 delete $self->{size_req};
1616 $self->realloc; 1995 $self->realloc;
1617 $self->update; 1996 $self->update;
… …
1629 2008
1630 my ($w, $h) = $self->{layout}->size; 2009 my ($w, $h) = $self->{layout}->size;
1631 2010
1632 if (exists $self->{template}) { 2011 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 2012 $self->{template}->set_font ($self->{font}) if $self->{font};
2013 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 2015
1636 my ($w2, $h2) = $self->{template}->size; 2016 my ($w2, $h2) = $self->{template}->size;
1637 2017
1638 $w = List::Util::max $w, $w2; 2018 $w = List::Util::max $w, $w2;
… …
1672 2052
1673sub reconfigure { 2053sub reconfigure {
1674 my ($self) = @_; 2054 my ($self) = @_;
1675 2055
1676 delete $self->{size_req}; 2056 delete $self->{size_req};
2057 delete $self->{texture};
1677 2058
1678 $self->SUPER::reconfigure; 2059 $self->SUPER::reconfigure;
1679} 2060}
1680 2061
1681sub _draw { 2062sub _draw {
1682 my ($self) = @_; 2063 my ($self) = @_;
1683 2064
1684 $self->SUPER::_draw; # draw background, if applicable 2065 $self->SUPER::_draw; # draw background, if applicable
1685 2066
1686 my $tex = $self->{texture} ||= do { 2067 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 2068 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2069 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 2070 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2071 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2072 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2073 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 2074
1694 new_from_layout CFClient::Texture $self->{layout} 2075 [$self->{layout}->size]
1695 }; 2076 };
1696 2077
1697 unless (exists $self->{ox}) { 2078 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2079 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2080 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 2081 : ($self->{w} - $size->[0]) * 0.5);
1701 2082
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 2085 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 2086 };
1706 2087
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 2090
1712 if ($tex->{format} == GL_ALPHA) { 2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 2092}
1723 2093
1724############################################################################# 2094#############################################################################
1725 2095
1726package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1727 2097
1728our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1729 2099
1730use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1731 2101
1732sub new { 2102sub new {
1733 my $class = shift; 2103 my $class = shift;
1734 2104
1735 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1739 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1740 can_hover => 1, 2110 can_hover => 1,
1741 can_focus => 1, 2111 can_focus => 1,
1742 valign => 0, 2112 valign => 0,
1743 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
1744 #text => ... 2115 #text => ...
1745 #hidden => "*", 2116 #hidden => "*",
1746 @_ 2117 @_
1747 ) 2118 )
1748} 2119}
… …
1793 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1794 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1795 2166
1796 my $text = $self->get_text; 2167 my $text = $self->get_text;
1797 2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2170
1798 if ($uni == 8) { 2171 if ($uni == 8) {
1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1801 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1802 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1803 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1804 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1805 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1806 } elsif ($sym == CFClient::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1807 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1808 } elsif ($sym == CFClient::SDLK_END) {
1809 $self->{cursor} = length $text;
1810 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1811 $self->emit ('escape'); 2195 $self->emit ('escape');
1812 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1813 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else { 2200 } else {
1815 return 0; 2201 return 0;
1816 } 2202 }
1817 2203
1818 $self->_set_text ($text); 2204 $self->_set_text ($text);
1819 2205
1820 $self->realloc; 2206 $self->realloc;
2207 $self->update;
1821 2208
1822 1 2209 1
1823} 2210}
1824 2211
1825sub invoke_focus_in { 2212sub invoke_focus_in {
… …
1837 2224
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 2225 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 2226
1840 # byte-index to char-index 2227 # byte-index to char-index
1841 my $text = $self->{text}; 2228 my $text = $self->{text};
1842 utf8::encode $text; 2229 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 2230 $self->{cursor} = length $text;
1844 2231
1845 $self->_set_text ($self->{text}); 2232 $self->_set_text ($self->{text});
1846 $self->update; 2233 $self->update;
1847 2234
1848 1 2235 1
… …
1887 utf8::encode $text; 2274 utf8::encode $text;
1888 2275
1889 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890 } 2277 }
1891 2278
1892 glColor @{$self->{fg}};
1893 glBegin GL_LINES; 2279 glBegin GL_LINES;
1894 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896 glEnd; 2282 glEnd;
1897 } 2283 }
1898} 2284}
1899 2285
2286#############################################################################
2287
1900package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1901 2289
1902our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1903 2291
1904use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1905 2293
1906sub invoke_key_down { 2294sub invoke_key_down {
1907 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1908 2296
1909 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1910 2298
1911 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1912 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1913 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
1914 2302
1915 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1916 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1917 $self->emit (activate => $txt); 2305 $self->emit (activate => $txt);
1918 $self->update; 2306 $self->update;
1919 2307
1920 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1921 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1922 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1923 } 2311 }
1924 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1925 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1927 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1928 } 2316 }
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } 2318 }
1931 2319
1932 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1933 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1934 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935 2323
1936 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1937 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1946 1 2334 1
1947} 2335}
1948 2336
1949############################################################################# 2337#############################################################################
1950 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
1951package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1952 2379
1953our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1954 2381
1955use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1956 2383
1957my @tex = 2384my @tex =
1958 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959 qw(b1_button_active.png); 2386 qw(b1_button_active.png);
1960 2387
1961sub new { 2388sub new {
1962 my $class = shift; 2389 my $class = shift;
1963 2390
… …
2000 $self->SUPER::_draw; 2427 $self->SUPER::_draw;
2001} 2428}
2002 2429
2003############################################################################# 2430#############################################################################
2004 2431
2432package CFPlus::UI::CheckBox;
2433
2434our @ISA = CFPlus::UI::DrawBG::;
2435
2436my @tex =
2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2438 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2439
2440use CFPlus::OpenGL;
2441
2442sub new {
2443 my $class = shift;
2444
2445 $class->SUPER::new (
2446 padding_x => 2,
2447 padding_y => 2,
2448 fg => [1, 1, 1],
2449 active_fg => [1, 1, 0],
2450 bg => [0, 0, 0, 0.2],
2451 active_bg => [1, 1, 1, 0.5],
2452 state => 0,
2453 can_hover => 1,
2454 @_
2455 )
2456}
2457
2458sub size_request {
2459 my ($self) = @_;
2460
2461 (6) x 2
2462}
2463
2464sub toggle {
2465 my ($self) = @_;
2466
2467 $self->{state} = !$self->{state};
2468 $self->emit (changed => $self->{state});
2469 $self->update;
2470}
2471
2472sub invoke_button_down {
2473 my ($self, $ev, $x, $y) = @_;
2474
2475 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2476 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2477 $self->toggle;
2478 } else {
2479 return 0
2480 }
2481
2482 1
2483}
2484
2485sub _draw {
2486 my ($self) = @_;
2487
2488 $self->SUPER::_draw;
2489
2490 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2491
2492 my ($w, $h) = @$self{qw(w h)};
2493
2494 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2495
2496 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2497
2498 my $tex = $self->{state} ? $tex[1] : $tex[0];
2499
2500 glEnable GL_TEXTURE_2D;
2501 $tex->draw_quad_alpha (0, 0, $s, $s);
2502 glDisable GL_TEXTURE_2D;
2503}
2504
2505#############################################################################
2506
2507package CFPlus::UI::Image;
2508
2509our @ISA = CFPlus::UI::Base::;
2510
2511use CFPlus::OpenGL;
2512
2513our %texture_cache;
2514
2515sub new {
2516 my $class = shift;
2517
2518 my $self = $class->SUPER::new (
2519 can_events => 0,
2520 @_,
2521 );
2522
2523 $self->{path} || $self->{tex}
2524 or Carp::croak "'path' or 'tex' attributes required";
2525
2526 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2527 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2528
2529 CFPlus::weaken $texture_cache{$self->{path}};
2530
2531 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2532
2533 $self
2534}
2535
2536sub STORABLE_freeze {
2537 my ($self, $cloning) = @_;
2538
2539 $self->{path}
2540 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2541
2542 $self->{path}
2543}
2544
2545sub STORABLE_attach {
2546 my ($self, $cloning, $path) = @_;
2547
2548 $self->new (path => $path)
2549}
2550
2551sub size_request {
2552 my ($self) = @_;
2553
2554 ($self->{tex}{w}, $self->{tex}{h})
2555}
2556
2557sub _draw {
2558 my ($self) = @_;
2559
2560 my $tex = $self->{tex};
2561
2562 my ($w, $h) = ($self->{w}, $self->{h});
2563
2564 if ($self->{rot90}) {
2565 glRotate 90, 0, 0, 1;
2566 glTranslate 0, -$self->{w}, 0;
2567
2568 ($w, $h) = ($h, $w);
2569 }
2570
2571 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573
2574 $tex->draw_quad (0, 0, $w, $h);
2575
2576 glDisable GL_TEXTURE_2D;
2577}
2578
2579#############################################################################
2580
2005package CFClient::UI::ImageButton; 2581package CFPlus::UI::ImageButton;
2006 2582
2007our @ISA = CFClient::UI::Image::; 2583our @ISA = CFPlus::UI::Image::;
2008 2584
2009use CFClient::OpenGL; 2585use CFPlus::OpenGL;
2010 2586
2011my %textures; 2587my %textures;
2012 2588
2013sub new { 2589sub new {
2014 my $class = shift; 2590 my $class = shift;
… …
2036 1 2612 1
2037} 2613}
2038 2614
2039############################################################################# 2615#############################################################################
2040 2616
2041package CFClient::UI::CheckBox;
2042
2043our @ISA = CFClient::UI::DrawBG::;
2044
2045my @tex =
2046 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049use CFClient::OpenGL;
2050
2051sub new {
2052 my $class = shift;
2053
2054 $class->SUPER::new (
2055 padding_x => 2,
2056 padding_y => 2,
2057 fg => [1, 1, 1],
2058 active_fg => [1, 1, 0],
2059 bg => [0, 0, 0, 0.2],
2060 active_bg => [1, 1, 1, 0.5],
2061 state => 0,
2062 can_hover => 1,
2063 @_
2064 )
2065}
2066
2067sub size_request {
2068 my ($self) = @_;
2069
2070 (6) x 2
2071}
2072
2073sub invoke_button_down {
2074 my ($self, $ev, $x, $y) = @_;
2075
2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2078 $self->{state} = !$self->{state};
2079 $self->emit (changed => $self->{state});
2080 } else {
2081 return 0
2082 }
2083
2084 1
2085}
2086
2087sub _draw {
2088 my ($self) = @_;
2089
2090 $self->SUPER::_draw;
2091
2092 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2093
2094 my ($w, $h) = @$self{qw(w h)};
2095
2096 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2097
2098 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2099
2100 my $tex = $self->{state} ? $tex[1] : $tex[0];
2101
2102 glEnable GL_TEXTURE_2D;
2103 $tex->draw_quad_alpha (0, 0, $s, $s);
2104 glDisable GL_TEXTURE_2D;
2105}
2106
2107#############################################################################
2108
2109package CFClient::UI::Image; 2617package CFPlus::UI::VGauge;
2110 2618
2111our @ISA = CFClient::UI::Base::; 2619our @ISA = CFPlus::UI::Base::;
2112
2113use CFClient::OpenGL;
2114
2115our %texture_cache;
2116
2117sub new {
2118 my $class = shift;
2119
2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2124
2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2127
2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2130
2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2132
2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2134
2135 $self
2136}
2137
2138sub size_request {
2139 my ($self) = @_;
2140
2141 ($self->{tex}{w}, $self->{tex}{h})
2142}
2143
2144sub _draw {
2145 my ($self) = @_;
2146
2147 my $tex = $self->{tex};
2148
2149 my ($w, $h) = ($self->{w}, $self->{h});
2150
2151 if ($self->{rot90}) {
2152 glRotate 90, 0, 0, 1;
2153 glTranslate 0, -$self->{w}, 0;
2154
2155 ($w, $h) = ($h, $w);
2156 }
2157
2158 glEnable GL_TEXTURE_2D;
2159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2160
2161 $tex->draw_quad_alpha (0, 0, $w, $h);
2162
2163 glDisable GL_TEXTURE_2D;
2164}
2165
2166#############################################################################
2167
2168package CFClient::UI::VGauge;
2169
2170our @ISA = CFClient::UI::Base::;
2171 2620
2172use List::Util qw(min max); 2621use List::Util qw(min max);
2173 2622
2174use CFClient::OpenGL; 2623use CFPlus::OpenGL;
2175 2624
2176my %tex = ( 2625my %tex = (
2177 food => [ 2626 food => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2627 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2628 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2180 ], 2629 ],
2181 grace => [ 2630 grace => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2631 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2632 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2184 ], 2633 ],
2185 hp => [ 2634 hp => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2635 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2636 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2188 ], 2637 ],
2189 mana => [ 2638 mana => [
2190 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2639 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2640 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2192 ], 2641 ],
2193); 2642);
2194 2643
2195# eg. VGauge->new (gauge => 'food'), default gauge: food 2644# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2298 glDisable GL_TEXTURE_2D; 2747 glDisable GL_TEXTURE_2D;
2299} 2748}
2300 2749
2301############################################################################# 2750#############################################################################
2302 2751
2303package CFClient::UI::Gauge; 2752package CFPlus::UI::Gauge;
2304 2753
2305our @ISA = CFClient::UI::VBox::; 2754our @ISA = CFPlus::UI::VBox::;
2306 2755
2307sub new { 2756sub new {
2308 my ($class, %arg) = @_; 2757 my ($class, %arg) = @_;
2309 2758
2310 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
… …
2312 can_hover => 1, 2761 can_hover => 1,
2313 can_events => 1, 2762 can_events => 1,
2314 %arg, 2763 %arg,
2315 ); 2764 );
2316 2765
2317 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2766 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2318 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2767 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2319 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2768 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2320 2769
2321 $self 2770 $self
2322} 2771}
2323 2772
2324sub set_fontsize { 2773sub set_fontsize {
… …
2345 $self->{value}->set_text ($val); 2794 $self->{value}->set_text ($val);
2346} 2795}
2347 2796
2348############################################################################# 2797#############################################################################
2349 2798
2350package CFClient::UI::Slider; 2799package CFPlus::UI::Slider;
2351 2800
2352use strict; 2801use strict;
2353 2802
2354use CFClient::OpenGL; 2803use CFPlus::OpenGL;
2355 2804
2356our @ISA = CFClient::UI::DrawBG::; 2805our @ISA = CFPlus::UI::DrawBG::;
2357 2806
2358my @tex = 2807my @tex =
2359 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2808 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2360 qw(s1_slider.png s1_slider_bg.png); 2809 qw(s1_slider.png s1_slider_bg.png);
2361 2810
2362sub new { 2811sub new {
2363 my $class = shift; 2812 my $class = shift;
2364 2813
… …
2453 } 2902 }
2454 2903
2455 1 2904 1
2456} 2905}
2457 2906
2907sub invoke_mouse_wheel {
2908 my ($self, $ev) = @_;
2909
2910 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2911
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913
2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915
2916 ! ! $delta
2917}
2918
2458sub update { 2919sub update {
2459 my ($self) = @_; 2920 my ($self) = @_;
2460 2921
2461 delete $self->{knob_w}; 2922 delete $self->{knob_w};
2462 $self->SUPER::update; 2923 $self->SUPER::update;
… …
2509 glDisable GL_TEXTURE_2D; 2970 glDisable GL_TEXTURE_2D;
2510} 2971}
2511 2972
2512############################################################################# 2973#############################################################################
2513 2974
2514package CFClient::UI::ValSlider; 2975package CFPlus::UI::ValSlider;
2515 2976
2516our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2517 2978
2518sub new { 2979sub new {
2519 my ($class, %arg) = @_; 2980 my ($class, %arg) = @_;
2520 2981
2521 my $range = delete $arg{range}; 2982 my $range = delete $arg{range};
2522 2983
2523 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2524 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2985 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2525 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2986 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2526 to_value => sub { shift }, 2987 to_value => sub { shift },
2527 from_value => sub { shift }, 2988 from_value => sub { shift },
2528 %arg, 2989 %arg,
2529 ); 2990 );
2530 2991
… …
2550sub set_range { shift->{slider}->set_range (@_) } 3011sub set_range { shift->{slider}->set_range (@_) }
2551sub set_value { shift->{slider}->set_value (@_) } 3012sub set_value { shift->{slider}->set_value (@_) }
2552 3013
2553############################################################################# 3014#############################################################################
2554 3015
2555package CFClient::UI::TextScroller; 3016package CFPlus::UI::TextScroller;
2556 3017
2557our @ISA = CFClient::UI::HBox::; 3018our @ISA = CFPlus::UI::HBox::;
2558 3019
2559use CFClient::OpenGL; 3020use CFPlus::OpenGL;
2560 3021
2561sub new { 3022sub new {
2562 my $class = shift; 3023 my $class = shift;
2563 3024
2564 my $self = $class->SUPER::new ( 3025 my $self = $class->SUPER::new (
2565 fontsize => 1, 3026 fontsize => 1,
2566 can_events => 0, 3027 can_events => 1,
2567 indent => 0, 3028 indent => 0,
2568 #font => default_font 3029 #font => default_font
2569 @_, 3030 @_,
2570 3031
2571 layout => (new CFClient::Layout 1), 3032 layout => (new CFPlus::Layout),
2572 par => [], 3033 par => [],
3034 max_par => 0,
2573 height => 0, 3035 height => 0,
2574 children => [ 3036 children => [
2575 (new CFClient::UI::Empty expand => 1), 3037 (new CFPlus::UI::Empty expand => 1),
2576 (new CFClient::UI::Slider vertical => 1), 3038 (new CFPlus::UI::Slider vertical => 1),
2577 ], 3039 ],
2578 ); 3040 );
2579 3041
2580 $self->{children}[1]->connect (changed => sub { $self->update }); 3042 $self->{children}[1]->connect (changed => sub { $self->update });
2581 3043
… …
2611 3073
2612 $self->reflow; 3074 $self->reflow;
2613 3075
2614 local $self->{children} = [$empty, $slider]; 3076 local $self->{children} = [$empty, $slider];
2615 $self->SUPER::invoke_size_allocate ($w, $h) 3077 $self->SUPER::invoke_size_allocate ($w, $h)
3078}
3079
3080sub invoke_mouse_wheel {
3081 my ($self, $ev) = @_;
3082
3083 return 0 unless $ev->{dy}; # only vertical movements
3084
3085 $self->{children}[1]->emit (mouse_wheel => $ev);
3086
3087 1
2616} 3088}
2617 3089
2618sub get_layout { 3090sub get_layout {
2619 my ($self, $para) = @_; 3091 my ($self, $para) = @_;
2620 3092
… …
2648 3120
2649 # todo: base offset on lines or so, not on pixels 3121 # todo: base offset on lines or so, not on pixels
2650 $self->{children}[1]->set_value ($offset); 3122 $self->{children}[1]->set_value ($offset);
2651} 3123}
2652 3124
3125sub current_paragraph {
3126 my ($self) = @_;
3127
3128 $self->{top_paragraph} - 1
3129}
3130
3131sub scroll_to {
3132 my ($self, $para) = @_;
3133
3134 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3135
3136 $self->{scroll_to} = $para;
3137 $self->update;
3138}
3139
2653sub clear { 3140sub clear {
2654 my ($self) = @_; 3141 my ($self) = @_;
2655 3142
2656 my (undef, undef, @other) = @{ $self->{children} }; 3143 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other; 3144 $self->remove ($_) for @other;
… …
2660 $self->{height} = 0; 3147 $self->{height} = 0;
2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3148 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2662} 3149}
2663 3150
2664sub add_paragraph { 3151sub add_paragraph {
2665 my ($self, $color, $para, $indent) = @_; 3152 my $self = shift;
2666 3153
2667 my ($text, @w) = ref $para ? @$para : $para; 3154 for my $para (@_) {
2668
2669 $para = { 3155 $para = {
3156 fg => [1, 1, 1, 1],
3157 indent => 0,
3158 markup => "",
3159 widget => [],
3160 ref $para ? %$para : (markup => $para),
2670 w => 1e10, 3161 w => 1e10,
2671 wrapped => 1, 3162 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2676 }; 3163 };
2677 3164
2678 $self->add (@w) if @w; 3165 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2679 push @{$self->{par}}, $para; 3166 push @{$self->{par}}, $para;
3167 }
3168
3169 if (my $max = $self->{max_par}) {
3170 shift @{$self->{par}} while @{$self->{par}} > $max;
3171 }
2680 3172
2681 $self->{need_reflow}++; 3173 $self->{need_reflow}++;
2682 $self->update; 3174 $self->update;
2683} 3175}
2684 3176
2685sub scroll_to_bottom { 3177sub scroll_to_bottom {
2686 my ($self) = @_; 3178 my ($self) = @_;
2687 3179
2688 $self->{scroll_to_bottom} = 1; 3180 $self->{scroll_to} = $#{$self->{par}};
2689 $self->update; 3181 $self->update;
2690} 3182}
2691 3183
3184sub force_uptodate {
3185 my ($self) = @_;
3186
3187 if (delete $self->{need_reflow}) {
3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3189
3190 my $height = 0;
3191
3192 for my $para (@{$self->{par}}) {
3193 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3194 my $layout = $self->get_layout ($para);
3195 my ($w, $h) = $layout->size;
3196
3197 $para->{w} = $w + $para->{indent};
3198 $para->{h} = $h;
3199 $para->{wrapped} = $layout->has_wrapped;
3200 }
3201
3202 $para->{y} = $height;
3203 $height += $para->{h};
3204 }
3205
3206 $self->{height} = $height;
3207 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3208
3209 delete $self->{texture};
3210 }
3211
3212 if (my $paridx = delete $self->{scroll_to}) {
3213 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3214 }
3215}
3216
2692sub update { 3217sub update {
2693 my ($self) = @_; 3218 my ($self) = @_;
2694 3219
2695 $self->SUPER::update; 3220 $self->SUPER::update;
2696 3221
2697 return unless $self->{h} > 0; 3222 return unless $self->{h} > 0;
2698 3223
2699 delete $self->{texture}; 3224 delete $self->{texture};
2700 3225
2701 $ROOT->on_post_alloc ($self => sub { 3226 $ROOT->on_post_alloc ($self => sub {
3227 $self->force_uptodate;
3228
2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3229 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2703 3230
2704 if (delete $self->{need_reflow}) {
2705 my $height = 0;
2706
2707 for my $para (@{$self->{par}}) {
2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2709 my $layout = $self->get_layout ($para);
2710 my ($w, $h) = $layout->size;
2711
2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2715 }
2716
2717 $height += $para->{h};
2718 }
2719
2720 $self->{height} = $height;
2721
2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2723
2724 delete $self->{texture};
2725 }
2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2729 }
2730
2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3231 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2732 glClearColor 0, 0, 0, 0; 3232 glClearColor 0, 0, 0, 0;
2733 glClear GL_COLOR_BUFFER_BIT; 3233 glClear GL_COLOR_BUFFER_BIT;
2734 3234
3235 package CFPlus::UI::Base;
3236 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3237 (0, 0, $self->{w}, $self->{h});
3238
3239 my $top = int $self->{children}[1]{range}[0];
3240
3241 my $paridx = 0;
3242 my $top_paragraph;
2735 my $top = int $self->{children}[1]{range}[0]; 3243 my $top = int $self->{children}[1]{range}[0];
2736 3244
2737 my $y0 = $top; 3245 my $y0 = $top;
2738 my $y1 = $top + $H; 3246 my $y1 = $top + $H;
2739 3247
2740 my $y = 0;
2741
2742 glEnable GL_BLEND;
2743 #TODO# not correct in windows where rgba is forced off
2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2745
2746 for my $para (@{$self->{par}}) { 3248 for my $para (@{$self->{par}}) {
2747 my $h = $para->{h}; 3249 my $h = $para->{h};
3250 my $y = $para->{y};
2748 3251
2749 if ($y0 < $y + $h && $y < $y1) { 3252 if ($y0 < $y + $h && $y < $y1) {
2750
2751 my $layout = $self->get_layout ($para); 3253 my $layout = $self->get_layout ($para);
2752 3254
2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2754
2755 glRasterPos $para->{indent}, $y - $y0; 3255 $layout->render ($para->{indent}, $y - $y0);
2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757 3256
2758 if (my @w = @{ $para->{widget} }) { 3257 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes; 3258 my @s = $layout->get_shapes;
2760 3259
2761 glDisable GL_BLEND;
2762 for (@w) { 3260 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, (); 3261 my ($dx, $dy) = splice @s, 0, 2, ();
2764 3262
2765 $_->{x} = $dx + $para->{indent}; 3263 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0; 3264 $_->{y} = $dy + $y - $y0;
2767 3265
2768 $_->draw; 3266 $_->draw;
2769 } 3267 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 } 3268 }
2773 } 3269 }
2774 3270
2775 $y += $h; 3271 $paridx++;
3272 $top_paragraph ||= $paridx if $y >= $top;
2776 } 3273 }
2777 3274
2778 glDisable GL_BLEND; 3275 $self->{top_paragraph} = $top_paragraph;
2779 }; 3276 };
2780 }); 3277 });
2781} 3278}
2782 3279
2783sub reconfigure { 3280sub reconfigure {
… …
2801 $self->{children}[1]->draw; 3298 $self->{children}[1]->draw;
2802} 3299}
2803 3300
2804############################################################################# 3301#############################################################################
2805 3302
2806package CFClient::UI::Animator; 3303package CFPlus::UI::Animator;
2807 3304
2808use CFClient::OpenGL; 3305use CFPlus::OpenGL;
2809 3306
2810our @ISA = CFClient::UI::Bin::; 3307our @ISA = CFPlus::UI::Bin::;
2811 3308
2812sub moveto { 3309sub moveto {
2813 my ($self, $x, $y) = @_; 3310 my ($self, $x, $y) = @_;
2814 3311
2815 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3312 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2843 glPopMatrix; 3340 glPopMatrix;
2844} 3341}
2845 3342
2846############################################################################# 3343#############################################################################
2847 3344
2848package CFClient::UI::Flopper; 3345package CFPlus::UI::Flopper;
2849 3346
2850our @ISA = CFClient::UI::Button::; 3347our @ISA = CFPlus::UI::Button::;
2851 3348
2852sub new { 3349sub new {
2853 my $class = shift; 3350 my $class = shift;
2854 3351
2855 my $self = $class->SUPER::new ( 3352 my $self = $class->SUPER::new (
… …
2867 $self->{other}->toggle_visibility; 3364 $self->{other}->toggle_visibility;
2868} 3365}
2869 3366
2870############################################################################# 3367#############################################################################
2871 3368
2872package CFClient::UI::Tooltip; 3369package CFPlus::UI::Tooltip;
2873 3370
2874our @ISA = CFClient::UI::Bin::; 3371our @ISA = CFPlus::UI::Bin::;
2875 3372
2876use CFClient::OpenGL; 3373use CFPlus::OpenGL;
2877 3374
2878sub new { 3375sub new {
2879 my $class = shift; 3376 my $class = shift;
2880 3377
2881 $class->SUPER::new ( 3378 $class->SUPER::new (
… …
2884 ) 3381 )
2885} 3382}
2886 3383
2887sub set_tooltip_from { 3384sub set_tooltip_from {
2888 my ($self, $widget) = @_; 3385 my ($self, $widget) = @_;
3386
3387 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3388 if $widget->{tooltip} =~ /^#(.*)$/;
2889 3389
2890 my $tooltip = $widget->{tooltip}; 3390 my $tooltip = $widget->{tooltip};
2891 3391
2892 if ($ENV{CFPLUS_DEBUG} & 2) { 3392 if ($ENV{CFPLUS_DEBUG} & 2) {
2893 $tooltip .= "\n\n" . (ref $widget) . "\n" 3393 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2897 } 3397 }
2898 3398
2899 $tooltip =~ s/^\n+//; 3399 $tooltip =~ s/^\n+//;
2900 $tooltip =~ s/\n+$//; 3400 $tooltip =~ s/\n+$//;
2901 3401
2902 $self->add (new CFClient::UI::Label 3402 $self->add (new CFPlus::UI::Label
2903 markup => $tooltip, 3403 markup => $tooltip,
2904 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3404 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2905 fontsize => 0.8, 3405 fontsize => 0.8,
2906 fg => [0, 0, 0, 1], 3406 style => 1, # FLAG_INVERSE
2907 ellipsise => 0, 3407 ellipsise => 0,
2908 font => ($widget->{tooltip_font} || $::FONT_PROP), 3408 font => ($widget->{tooltip_font} || $::FONT_PROP),
2909 ); 3409 );
2910} 3410}
2911 3411
… …
2930 3430
2931 $self->{root}->on_post_alloc ("move_$self" => sub { 3431 $self->{root}->on_post_alloc ("move_$self" => sub {
2932 my $widget = $self->{owner} 3432 my $widget = $self->{owner}
2933 or return; 3433 or return;
2934 3434
3435 if ($widget->{visible}) {
2935 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3436 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2936 3437
2937 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3438 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2938 if $x + $self->{w} > $self->{root}{w}; 3439 if $x + $self->{w} > $self->{root}{w};
2939 3440
2940 $self->move_abs ($x, $y); 3441 $self->move_abs ($x, $y);
3442 } else {
3443 $self->hide;
3444 }
2941 }); 3445 });
2942} 3446}
2943 3447
2944sub _draw { 3448sub _draw {
2945 my ($self) = @_; 3449 my ($self) = @_;
… …
2969 $self->SUPER::_draw; 3473 $self->SUPER::_draw;
2970} 3474}
2971 3475
2972############################################################################# 3476#############################################################################
2973 3477
2974package CFClient::UI::Face; 3478package CFPlus::UI::Face;
2975 3479
2976our @ISA = CFClient::UI::Base::; 3480our @ISA = CFPlus::UI::DrawBG::;
2977 3481
2978use CFClient::OpenGL; 3482use CFPlus::OpenGL;
2979 3483
2980sub new { 3484sub new {
2981 my $class = shift; 3485 my $class = shift;
2982 3486
2983 my $self = $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3488 size_w => 32,
3489 size_h => 8,
2984 aspect => 1, 3490 aspect => 1,
2985 can_events => 0, 3491 can_events => 0,
2986 @_, 3492 @_,
2987 ); 3493 );
2988 3494
2989 if ($self->{anim} && $self->{animspeed}) { 3495 if ($self->{anim} && $self->{animspeed}) {
2990 Scalar::Util::weaken (my $widget = $self); 3496 CFPlus::weaken (my $widget = $self);
2991 3497
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2992 $self->{timer} = Event->timer ( 3500 $self->{timer} = Event->timer (
2993 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2994 hard => 1, 3501 parked => 1,
2995 interval => $self->{animspeed},
2996 cb => sub { 3502 cb => sub {
3503 return unless $::CONN;
3504
3505 if (!$widget) {#d#
3506 warn "animation widget timer active but widgetd estroyed\n";#d#
3507 warn $_[0]->w->active;#d#
3508 }#d#
3509
2997 ++$widget->{frame}; 3510 ++$widget->{frame};
3511 $widget->update_face;
2998 $widget->update; 3512 $widget->update;
3513
3514 $widget->update_timer;
2999 }, 3515 },
3000 ); 3516 );
3517
3518 $self->update_face;
3519 $self->update_timer;
3001 } 3520 }
3002 3521
3003 $self 3522 $self
3004} 3523}
3005 3524
3525sub update_timer {
3526 my ($self) = @_;
3527
3528 return unless $self->{timer};
3529
3530 if ($self->{visible}) {
3531 $self->{timer}->at (
3532 $self->{anim_start}
3533 + $self->{animspeed}
3534 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3535 );
3536 $self->{timer}->start;
3537 } else {
3538 $self->{timer}->stop;
3539 }
3540}
3541
3542sub update_face {
3543 my ($self) = @_;
3544
3545 return unless $::CONN;
3546
3547 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3548 if ($anim && @$anim) {
3549 delete $self->{wait_face};
3550 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3551 }
3552 }
3553}
3554
3006sub size_request { 3555sub size_request {
3007 (32, 8) 3556 my ($self) = @_;
3557
3558 if ($::CONN) {
3559 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3560 if (my $tex = $::CONN->{texture}[$faceid]) {
3561 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3562 } else {
3563 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3564 $self->realloc;
3565 });
3566 }
3567 }
3568 }
3569
3570 ($self->{size_w} || 8, $self->{size_h} || 8)
3008} 3571}
3009 3572
3010sub update { 3573sub update {
3011 my ($self) = @_; 3574 my ($self) = @_;
3012 3575
3013 return unless $self->{visible}; 3576 return unless $self->{visible};
3014 3577
3015 $self->SUPER::update; 3578 $self->SUPER::update;
3016} 3579}
3017 3580
3581sub invoke_visibility_change {
3582 my ($self) = @_;
3583
3584 $self->update_timer;
3585
3586 0
3587}
3588
3018sub _draw { 3589sub _draw {
3019 my ($self) = @_; 3590 my ($self) = @_;
3020 3591
3021 return unless $::CONN; 3592 return unless $::CONN;
3022 3593
3023 my $face; 3594 $self->SUPER::_draw;
3024 3595
3025 if ($self->{frame}) {
3026 my $anim = $::CONN->{anim}[$self->{anim}]; 3596 my $faceid = $::CONN->{faceid}[$self->{face}]
3027 3597 or return;
3028 $face = $anim->[ $self->{frame} % @$anim ]
3029 if $anim && @$anim;
3030 }
3031 3598
3032 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3599 my $tex = $::CONN->{texture}[$faceid];
3033 3600
3034 if ($tex) { 3601 if ($tex) {
3035 glEnable GL_TEXTURE_2D; 3602 glEnable GL_TEXTURE_2D;
3036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3037 glColor 0, 0, 0, 1; 3604 glColor 0, 0, 0, 1;
… …
3041} 3608}
3042 3609
3043sub destroy { 3610sub destroy {
3044 my ($self) = @_; 3611 my ($self) = @_;
3045 3612
3046 $self->{timer}->cancel 3613 (delete $self->{timer})->cancel
3047 if $self->{timer}; 3614 if $self->{timer};
3048 3615
3049 $self->SUPER::destroy; 3616 $self->SUPER::destroy;
3050} 3617}
3051 3618
3052############################################################################# 3619#############################################################################
3053 3620
3054package CFClient::UI::Buttonbar; 3621package CFPlus::UI::Buttonbar;
3055 3622
3056our @ISA = CFClient::UI::HBox::; 3623our @ISA = CFPlus::UI::HBox::;
3057 3624
3058# TODO: should actualyl wrap buttons and other goodies. 3625# TODO: should actually wrap buttons and other goodies.
3059 3626
3060############################################################################# 3627#############################################################################
3061 3628
3062package CFClient::UI::Menu; 3629package CFPlus::UI::Menu;
3063 3630
3064our @ISA = CFClient::UI::FancyFrame::; 3631our @ISA = CFPlus::UI::Toplevel::;
3065 3632
3066use CFClient::OpenGL; 3633use CFPlus::OpenGL;
3067 3634
3068sub new { 3635sub new {
3069 my $class = shift; 3636 my $class = shift;
3070 3637
3071 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3072 items => [], 3639 items => [],
3073 z => 100, 3640 z => 100,
3074 @_, 3641 @_,
3075 ); 3642 );
3076 3643
3077 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3644 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3078 3645
3079 for my $item (@{ $self->{items} }) { 3646 for my $item (@{ $self->{items} }) {
3080 my ($widget, $cb, $tooltip) = @$item; 3647 my ($widget, $cb, $tooltip) = @$item;
3081 3648
3082 # handle various types of items, only text for now 3649 # handle various types of items, only text for now
3083 if (!ref $widget) { 3650 if (!ref $widget) {
3651 if ($widget =~ /\t/) {
3652 my ($left, $right) = split /\t/, $widget, 2;
3653
3084 $widget = new CFClient::UI::Label 3654 $widget = new CFPlus::UI::HBox
3085 can_hover => 1, 3655 can_hover => 1,
3086 can_events => 1, 3656 can_events => 1,
3657 tooltip => $tooltip,
3658 children => [
3659 (new CFPlus::UI::Label markup => $left, expand => 1),
3660 (new CFPlus::UI::Label markup => $right, align => +1),
3661 ],
3662 ;
3663
3664 } else {
3665 $widget = new CFPlus::UI::Label
3666 can_hover => 1,
3667 can_events => 1,
3087 markup => $widget, 3668 markup => $widget,
3088 tooltip => $tooltip 3669 tooltip => $tooltip;
3670 }
3089 } 3671 }
3090 3672
3091 $self->{item}{$widget} = $item; 3673 $self->{item}{$widget} = $item;
3092 3674
3093 $self->{vbox}->add ($widget); 3675 $self->{vbox}->add ($widget);
… …
3136 1 3718 1
3137} 3719}
3138 3720
3139############################################################################# 3721#############################################################################
3140 3722
3141package CFClient::UI::Multiplexer; 3723package CFPlus::UI::Multiplexer;
3142 3724
3143our @ISA = CFClient::UI::Container::; 3725our @ISA = CFPlus::UI::Container::;
3144 3726
3145sub new { 3727sub new {
3146 my $class = shift; 3728 my $class = shift;
3147 3729
3148 my $self = $class->SUPER::new ( 3730 my $self = $class->SUPER::new (
… …
3162 3744
3163 $self->{current} = $self->{children}[0] 3745 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} }; 3746 if @{ $self->{children} };
3165} 3747}
3166 3748
3749sub get_current_page {
3750 my ($self) = @_;
3751
3752 $self->{current}
3753}
3754
3167sub set_current_page { 3755sub set_current_page {
3168 my ($self, $page_or_widget) = @_; 3756 my ($self, $page_or_widget) = @_;
3169 3757
3170 my $widget = ref $page_or_widget 3758 my $widget = ref $page_or_widget
3171 ? $page_or_widget 3759 ? $page_or_widget
… …
3203 $self->{current}->draw; 3791 $self->{current}->draw;
3204} 3792}
3205 3793
3206############################################################################# 3794#############################################################################
3207 3795
3208package CFClient::UI::Notebook; 3796package CFPlus::UI::Notebook;
3209 3797
3210our @ISA = CFClient::UI::VBox::; 3798our @ISA = CFPlus::UI::VBox::;
3211 3799
3212sub new { 3800sub new {
3213 my $class = shift; 3801 my $class = shift;
3214 3802
3215 my $self = $class->SUPER::new ( 3803 my $self = $class->SUPER::new (
3216 buttonbar => (new CFClient::UI::Buttonbar), 3804 buttonbar => (new CFPlus::UI::Buttonbar),
3217 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3805 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3218 # filter => # will be put between multiplexer and $self 3806 # filter => # will be put between multiplexer and $self
3219 @_, 3807 @_,
3220 ); 3808 );
3221 3809
3222 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3810 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3226} 3814}
3227 3815
3228sub add { 3816sub add {
3229 my ($self, $title, $widget, $tooltip) = @_; 3817 my ($self, $title, $widget, $tooltip) = @_;
3230 3818
3231 Scalar::Util::weaken $self; 3819 CFPlus::weaken $self;
3232 3820
3233 $self->{buttonbar}->add (new CFClient::UI::Button 3821 $self->{buttonbar}->add (new CFPlus::UI::Button
3234 markup => $title, 3822 markup => $title,
3235 tooltip => $tooltip, 3823 tooltip => $tooltip,
3236 on_activate => sub { $self->set_current_page ($widget) }, 3824 on_activate => sub { $self->set_current_page ($widget) },
3237 ); 3825 );
3238 3826
3239 $self->{multiplexer}->add ($widget); 3827 $self->{multiplexer}->add ($widget);
3240} 3828}
3241 3829
3830sub get_current_page {
3831 my ($self) = @_;
3832
3833 $self->{multiplexer}->get_current_page
3834}
3835
3242sub set_current_page { 3836sub set_current_page {
3243 my ($self, $page) = @_; 3837 my ($self, $page) = @_;
3244 3838
3245 $self->{multiplexer}->set_current_page ($page); 3839 $self->{multiplexer}->set_current_page ($page);
3246 $self->emit (page_changed => $self->{multiplexer}{current}); 3840 $self->emit (page_changed => $self->{multiplexer}{current});
3247} 3841}
3248 3842
3249############################################################################# 3843#############################################################################
3250 3844
3251package CFClient::UI::Combobox; 3845package CFPlus::UI::Selector;
3252 3846
3253use utf8; 3847use utf8;
3254 3848
3255our @ISA = CFClient::UI::Button::; 3849our @ISA = CFPlus::UI::Button::;
3256 3850
3257sub new { 3851sub new {
3258 my $class = shift; 3852 my $class = shift;
3259 3853
3260 my $self = $class->SUPER::new ( 3854 my $self = $class->SUPER::new (
… …
3277 my ($value, $title, $tooltip) = @$_; 3871 my ($value, $title, $tooltip) = @$_;
3278 3872
3279 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3873 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280 } 3874 }
3281 3875
3282 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3876 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283} 3877}
3284 3878
3285sub _set_value { 3879sub _set_value {
3286 my ($self, $value) = @_; 3880 my ($self, $value) = @_;
3287 3881
… …
3302 $self->emit (changed => $value); 3896 $self->emit (changed => $value);
3303} 3897}
3304 3898
3305############################################################################# 3899#############################################################################
3306 3900
3307package CFClient::UI::Statusbox; 3901package CFPlus::UI::Statusbox;
3308 3902
3309our @ISA = CFClient::UI::VBox::; 3903our @ISA = CFPlus::UI::VBox::;
3310 3904
3311sub new { 3905sub new {
3312 my $class = shift; 3906 my $class = shift;
3313 3907
3314 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3315 fontsize => 0.8, 3909 fontsize => 0.8,
3316 @_, 3910 @_,
3317 ); 3911 );
3318 3912
3319 Scalar::Util::weaken (my $this = $self); 3913 CFPlus::weaken (my $this = $self);
3320 3914
3321 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3915 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3322 3916
3323 $self 3917 $self
3324} 3918}
… …
3326sub reorder { 3920sub reorder {
3327 my ($self) = @_; 3921 my ($self) = @_;
3328 my $NOW = Time::HiRes::time; 3922 my $NOW = Time::HiRes::time;
3329 3923
3330 # freeze display when hovering over any label 3924 # freeze display when hovering over any label
3331 return if $CFClient::UI::TOOLTIP->{owner} 3925 return if $CFPlus::UI::TOOLTIP->{owner}
3332 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3926 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3333 values %{ $self->{item} }; 3927 values %{ $self->{item} };
3334 3928
3335 while (my ($k, $v) = each %{ $self->{item} }) { 3929 while (my ($k, $v) = each %{ $self->{item} }) {
3336 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3930 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3337 } 3931 }
… …
3358 for ($short) { 3952 for ($short) {
3359 s/^\s+//; 3953 s/^\s+//;
3360 s/\s+/ /g; 3954 s/\s+/ /g;
3361 } 3955 }
3362 3956
3363 new CFClient::UI::Label 3957 new CFPlus::UI::Label
3364 markup => $short, 3958 markup => $short,
3365 tooltip => $item->{tooltip}, 3959 tooltip => $item->{tooltip},
3366 tooltip_font => $::FONT_PROP, 3960 tooltip_font => $::FONT_PROP,
3367 tooltip_width => 0.67, 3961 tooltip_width => 0.67,
3368 fontsize => $item->{fontsize} || $self->{fontsize}, 3962 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3447 $self->SUPER::destroy; 4041 $self->SUPER::destroy;
3448} 4042}
3449 4043
3450############################################################################# 4044#############################################################################
3451 4045
3452package CFClient::UI::Inventory;
3453
3454our @ISA = CFClient::UI::Table::;
3455
3456sub new {
3457 my $class = shift;
3458
3459 my $self = $class->SUPER::new (
3460 col_expand => [0, 1, 0],
3461 @_,
3462 );
3463
3464 $self
3465}
3466
3467sub set_items {
3468 my ($self, $items) = @_;
3469
3470 $self->clear;
3471 return unless $items;
3472
3473 my @items = sort {
3474 ($a->{type} <=> $b->{type})
3475 or ($a->{name} cmp $b->{name})
3476 } values %$items;
3477
3478 $self->{real_items} = \@items;
3479
3480 my $row = 0;
3481 for my $item (@items) {
3482 CFClient::Item::update_widgets $item;
3483
3484 $self->add (0, $row, $item->{face_widget});
3485 $self->add (1, $row, $item->{desc_widget});
3486 $self->add (2, $row, $item->{weight_widget});
3487
3488 $row++;
3489 }
3490}
3491
3492#############################################################################
3493
3494package CFClient::UI::SpellList;
3495
3496our @ISA = CFClient::UI::Table::;
3497
3498sub new {
3499 my $class = shift;
3500
3501 my $self = $class->SUPER::new (
3502 binding => [],
3503 commands => [],
3504 @_,
3505 )
3506}
3507
3508my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3514my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3515 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3516my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3517 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3518my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3519 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520
3521sub rebuild_spell_list {
3522 my ($self) = @_;
3523
3524 $CFClient::UI::ROOT->on_refresh ($self => sub {
3525 $self->clear;
3526
3527 return unless $::CONN;
3528
3529 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534
3535 my $row = 0;
3536
3537 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538 my $spell = $self->{spell}{$_};
3539
3540 $row++;
3541
3542 my $spell_cb = sub {
3543 my ($widget, $ev) = @_;
3544
3545 if ($ev->{button} == 1) {
3546 $::CONN->user_send ("cast $spell->{name}");
3547 } elsif ($ev->{button} == 2) {
3548 $::CONN->user_send ("invoke $spell->{name}");
3549 } elsif ($ev->{button} == 3) {
3550 (new CFClient::UI::Menu
3551 items => [
3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554 ],
3555 )->popup ($ev);
3556 } else {
3557 return 0;
3558 }
3559
3560 1
3561 };
3562
3563 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565 #TODO: add path info to tooltip
3566 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3567
3568 $self->add (0, $row, new CFClient::UI::Face
3569 face => $spell->{face},
3570 can_hover => 1,
3571 can_events => 1,
3572 tooltip => $tooltip,
3573 on_button_down => $spell_cb,
3574 );
3575
3576 $self->add (1, $row, new CFClient::UI::Label
3577 expand => 1,
3578 text => $spell->{name},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $tooltip,
3582 on_button_down => $spell_cb,
3583 );
3584
3585 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589 }
3590 });
3591}
3592
3593sub add_spell {
3594 my ($self, $spell) = @_;
3595
3596 $self->{spell}->{$spell->{name}} = $spell;
3597 $self->rebuild_spell_list;
3598}
3599
3600sub remove_spell {
3601 my ($self, $spell) = @_;
3602
3603 delete $self->{spell}->{$spell->{name}};
3604 $self->rebuild_spell_list;
3605}
3606
3607sub clear_spells {
3608 my ($self) = @_;
3609
3610 $self->{spell} = {};
3611 $self->rebuild_spell_list;
3612}
3613
3614#############################################################################
3615
3616package CFClient::UI::Root; 4046package CFPlus::UI::Root;
3617 4047
3618our @ISA = CFClient::UI::Container::; 4048our @ISA = CFPlus::UI::Container::;
3619 4049
3620use List::Util qw(min max); 4050use List::Util qw(min max);
3621 4051
3622use CFClient::OpenGL; 4052use CFPlus::OpenGL;
3623 4053
3624sub new { 4054sub new {
3625 my $class = shift; 4055 my $class = shift;
3626 4056
3627 my $self = $class->SUPER::new ( 4057 my $self = $class->SUPER::new (
3628 visible => 1, 4058 visible => 1,
3629 @_, 4059 @_,
3630 ); 4060 );
3631 4061
3632 Scalar::Util::weaken ($self->{root} = $self); 4062 CFPlus::weaken ($self->{root} = $self);
3633 4063
3634 $self 4064 $self
3635} 4065}
3636 4066
3637sub size_request { 4067sub size_request {
… …
3803 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4233 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3804 4234
3805 $w = 0 if $w < 0; 4235 $w = 0 if $w < 0;
3806 $h = 0 if $h < 0; 4236 $h = 0 if $h < 0;
3807 4237
4238 $w = max $widget->{min_w}, $w;
4239 $h = max $widget->{min_h}, $h;
4240
4241# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4242# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4243
4244 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4245 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4246
3808 $w = int $w + 0.5; 4247 $w = int $w + 0.5;
3809 $h = int $h + 0.5; 4248 $h = int $h + 0.5;
3810 4249
3811 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4250 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3812 $widget->{old_w} = $widget->{w}; 4251 $widget->{old_w} = $widget->{w};
… …
3835 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4274 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3836 glMatrixMode GL_MODELVIEW; 4275 glMatrixMode GL_MODELVIEW;
3837 glLoadIdentity; 4276 glLoadIdentity;
3838 4277
3839 { 4278 {
3840 package CFClient::UI::Base; 4279 package CFPlus::UI::Base;
3841 4280
3842 ($draw_x, $draw_y, $draw_w, $draw_h) = 4281 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3843 (0, 0, $self->{w}, $self->{h}); 4282 (0, 0, $self->{w}, $self->{h});
3844 }
3845 4283
3846 $self->_draw; 4284 $self->_draw;
4285 }
3847} 4286}
3848 4287
3849############################################################################# 4288#############################################################################
3850 4289
3851package CFClient::UI; 4290package CFPlus::UI;
3852 4291
3853$ROOT = new CFClient::UI::Root; 4292$ROOT = new CFPlus::UI::Root;
3854$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4293$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3855 4294
38561 42951
3857 4296

Diff Legend

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