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.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 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}
… …
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) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
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
873our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
874 950
875sub new { 951sub new {
876 my $class = shift; 952 my $class = shift;
877 953
878 $class->SUPER::new ( 954 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1016 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1018 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1020 }
945} 1021}
946 1022
947sub _render { 1023sub _render {
948 my ($self) = @_; 1024 my ($self) = @_;
949 1025
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 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}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1028
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1030
955 $self->SUPER::_render; 1031 $self->SUPER::_render;
956} 1032}
957 1033
958############################################################################# 1034#############################################################################
959 1035
960package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
961 1037
962our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::HBox::;
963 1039
964sub new { 1040sub new {
965 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
966 1042
967 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
968 1044
969 my $self; 1045 my $self;
970 1046
971 my $slider = new CFClient::UI::Slider 1047 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1048 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1050 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1051 $self->{vp}->set_offset (0, $_[1]);
976 }, 1052 },
977 ; 1053 ;
978 1054
979 $self = $class->SUPER::new ( 1055 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1056 vp => (new CFPlus::UI::ViewPort expand => 1),
1057 can_events => 1,
981 slider => $slider, 1058 slider => $slider,
982 %arg, 1059 %arg,
983 ); 1060 );
984 1061
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1063 $self->add ($child) if $child;
987 1064
988 $self 1065 $self
989} 1066}
990 1067
1068#TODO# update range on size_allocate depending on child
1069
991sub add { 1070sub add {
992 my ($self, $widget) = @_; 1071 my ($self, $widget) = @_;
993 1072
994 $self->{vp}->add ($self->{child} = $widget); 1073 $self->{vp}->add ($self->{child} = $widget);
995} 1074}
996 1075
1076sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_;
1078
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $self->{slider}->emit (mouse_wheel => $ev);
1082
1083 1
1084}
1085
1086sub update_slider {
1087 my ($self) = @_;
1088
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1090}
1091
997sub update { 1092sub update {
998 my ($self) = @_; 1093 my ($self) = @_;
999 1094
1000 $self->SUPER::update; 1095 $self->SUPER::update;
1001 1096
1002 # todo: overwrite size_allocate of child 1097 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1098}
1006 1099
1007sub invoke_size_allocate { 1100sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1101 my ($self, $w, $h) = @_;
1009 1102
1010 my $child = $self->{vp}->child; 1103 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1104
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1105 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1106}
1015 1107
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1108#############################################################################
1020 1109
1021package CFClient::UI::Frame; 1110package CFPlus::UI::Frame;
1022 1111
1023our @ISA = CFClient::UI::Bin::; 1112our @ISA = CFPlus::UI::Bin::;
1024 1113
1025use CFClient::OpenGL; 1114use CFPlus::OpenGL;
1026 1115
1027sub new { 1116sub new {
1028 my $class = shift; 1117 my $class = shift;
1029 1118
1030 $class->SUPER::new ( 1119 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1145 $self->SUPER::_draw;
1057} 1146}
1058 1147
1059############################################################################# 1148#############################################################################
1060 1149
1061package CFClient::UI::FancyFrame; 1150package CFPlus::UI::FancyFrame;
1062 1151
1063our @ISA = CFClient::UI::Bin::; 1152our @ISA = CFPlus::UI::Bin::;
1064 1153
1065use CFClient::OpenGL; 1154use CFPlus::OpenGL;
1155
1156sub new {
1157 my ($class, %arg) = @_;
1158
1159 if ((exists $arg{label}) && !ref $arg{label}) {
1160 $arg{label} = new CFPlus::UI::Label
1161 align => 1,
1162 valign => 0,
1163 text => $arg{label},
1164 fontsize => ($arg{border} || 0.8) * 0.75;
1165 }
1166
1167 my $self = $class->SUPER::new (
1168 # label => "",
1169 fg => [0.6, 0.3, 0.1],
1170 border => 0.8,
1171 style => 'single',
1172 %arg,
1173 );
1174
1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1183}
1184
1185sub border {
1186 int $_[0]{border} * $::FONTSIZE
1187}
1188
1189sub size_request {
1190 my ($self) = @_;
1191
1192 ($self->{label_w}, undef) = $self->{label}->size_request
1193 if $self->{label};
1194
1195 my ($w, $h) = $self->SUPER::size_request;
1196
1197 (
1198 $w + $self->border * 2,
1199 $h + $self->border * 2,
1200 )
1201}
1202
1203sub invoke_size_allocate {
1204 my ($self, $w, $h) = @_;
1205
1206 my $border = $self->border;
1207
1208 $w -= List::Util::max 0, $border * 2;
1209 $h -= List::Util::max 0, $border * 2;
1210
1211 if (my $label = $self->{label}) {
1212 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1213 $label->{h} = List::Util::min $h, $border;
1214 $label->invoke_size_allocate ($label->{w}, $label->{h});
1215 }
1216
1217 $self->child->configure ($border, $border, $w, $h);
1218
1219 1
1220}
1221
1222sub _draw {
1223 my ($self) = @_;
1224
1225 my $child = $self->{children}[0];
1226
1227 my $border = $self->border;
1228 my ($w, $h) = ($self->{w}, $self->{h});
1229
1230 $child->draw;
1231
1232 glColor @{$self->{fg}};
1233 glBegin GL_LINE_STRIP;
1234 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1235 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1236 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1237 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1238 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1239 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1240 glEnd;
1241
1242 if ($self->{label}) {
1243 glTranslate $border * 2, 0;
1244 $self->{label}->_draw;
1245 }
1246}
1247
1248#############################################################################
1249
1250package CFPlus::UI::Toplevel;
1251
1252our @ISA = CFPlus::UI::Bin::;
1253
1254use CFPlus::OpenGL;
1066 1255
1067my $bg = 1256my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1257 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1258 mipmap => 1, wrap => 1;
1070 1259
1071my @border = 1260my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1263
1075sub new { 1264sub new {
1076 my ($class, %arg) = @_; 1265 my ($class, %arg) = @_;
1077 1266
1078 my $self = $class->SUPER::new ( 1267 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1268 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1269 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1270 border => 0.6,
1082 can_events => 1, 1271 can_events => 1,
1083 min_w => 16, 1272 min_w => 64,
1084 min_h => 16, 1273 min_h => 32,
1085 %arg, 1274 %arg,
1086 ); 1275 );
1087 1276
1088 $self->{title_widget} = new CFClient::UI::Label 1277 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1278 align => 0,
1090 valign => 1, 1279 valign => 1,
1091 text => $self->{title}, 1280 text => $self->{title},
1092 fontsize => $self->{border}, 1281 fontsize => $self->{border},
1093 if exists $self->{title}; 1282 if exists $self->{title};
1094 1283
1095 if ($self->{has_close_button}) { 1284 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1285 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1286 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1287 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1288 on_activate => sub { $self->emit ("delete") };
1100 1289
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1290 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1291 }
1103 1292
1104 $self 1293 $self
1105} 1294}
1106 1295
1107sub add { 1296sub add {
1108 my ($self, @widgets) = @_; 1297 my ($self, @widgets) = @_;
1109 1298
1110 $self->SUPER::add (@widgets); 1299 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1300 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1301 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1302}
1114 1303
1115sub border { 1304sub border {
1116 int $_[0]{border} * $::FONTSIZE 1305 int $_[0]{border} * $::FONTSIZE
1117} 1306}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1339 $self->child->configure ($border, $border, $w, $h);
1151 1340
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1341 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1342 if $self->{close_button};
1154 1343
1344 1
1345}
1346
1347sub invoke_delete {
1348 my ($self) = @_;
1349
1350 $self->hide;
1351
1155 1 1352 1
1156} 1353}
1157 1354
1158sub invoke_button_down { 1355sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1356 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1414 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1415
1219 ! ! $self->{motion} 1416 ! ! $self->{motion}
1220} 1417}
1221 1418
1419sub invoke_visibility_change {
1420 my ($self, $visible) = @_;
1421
1422 delete $self->{motion} unless $visible;
1423
1424 0
1425}
1426
1222sub _draw { 1427sub _draw {
1223 my ($self) = @_; 1428 my ($self) = @_;
1224 1429
1225 my $child = $self->{children}[0]; 1430 my $child = $self->{children}[0];
1226 1431
… …
1263 if $self->{close_button}; 1468 if $self->{close_button};
1264} 1469}
1265 1470
1266############################################################################# 1471#############################################################################
1267 1472
1268package CFClient::UI::Table; 1473package CFPlus::UI::Table;
1269 1474
1270our @ISA = CFClient::UI::Base::; 1475our @ISA = CFPlus::UI::Base::;
1271 1476
1272use List::Util qw(max sum); 1477use List::Util qw(max sum);
1273 1478
1274use CFClient::OpenGL; 1479use CFPlus::OpenGL;
1275 1480
1276sub new { 1481sub new {
1277 my $class = shift; 1482 my $class = shift;
1278 1483
1279 $class->SUPER::new ( 1484 $class->SUPER::new (
… …
1285sub children { 1490sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1492}
1288 1493
1289sub add { 1494sub add {
1290 my ($self, $x, $y, $child) = @_; 1495 my ($self) = shift;
1291 1496
1497 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1499 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1500 $self->{children}[$y][$x] = $child;
1501 }
1294 1502
1503 $self->{force_realloc} = 1;
1504 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1505 $self->realloc;
1296} 1506}
1297 1507
1298sub remove { 1508sub remove {
1299 my ($self, $child) = @_; 1509 my ($self, $child) = @_;
… …
1364 1574
1365 # linearly scale sizes 1575 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1578
1369 CFClient::UI::harmonize $ws; 1579 CFPlus::UI::harmonize $ws;
1370 CFClient::UI::harmonize $hs; 1580 CFPlus::UI::harmonize $hs;
1371 1581
1372 my $y; 1582 my $y;
1373 1583
1374 for my $r (0 .. $#{$self->{children}}) { 1584 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1585 my $row = $self->{children}[$r]
… …
1418 } 1628 }
1419} 1629}
1420 1630
1421############################################################################# 1631#############################################################################
1422 1632
1423package CFClient::UI::Box; 1633package CFPlus::UI::Box;
1424 1634
1425our @ISA = CFClient::UI::Container::; 1635our @ISA = CFPlus::UI::Container::;
1426 1636
1427sub size_request { 1637sub size_request {
1428 my ($self) = @_; 1638 my ($self) = @_;
1429 1639
1430 $self->{vertical} 1640 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1673 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1674 for 0 .. $#children;
1465 } 1675 }
1466 } 1676 }
1467 1677
1468 CFClient::UI::harmonize \@req; 1678 CFPlus::UI::harmonize \@req;
1469 1679
1470 my $pos = 0; 1680 my $pos = 0;
1471 for (0 .. $#children) { 1681 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1682 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1683 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1688 1
1479} 1689}
1480 1690
1481############################################################################# 1691#############################################################################
1482 1692
1483package CFClient::UI::HBox; 1693package CFPlus::UI::HBox;
1484 1694
1485our @ISA = CFClient::UI::Box::; 1695our @ISA = CFPlus::UI::Box::;
1486 1696
1487sub new { 1697sub new {
1488 my $class = shift; 1698 my $class = shift;
1489 1699
1490 $class->SUPER::new ( 1700 $class->SUPER::new (
… …
1493 ) 1703 )
1494} 1704}
1495 1705
1496############################################################################# 1706#############################################################################
1497 1707
1498package CFClient::UI::VBox; 1708package CFPlus::UI::VBox;
1499 1709
1500our @ISA = CFClient::UI::Box::; 1710our @ISA = CFPlus::UI::Box::;
1501 1711
1502sub new { 1712sub new {
1503 my $class = shift; 1713 my $class = shift;
1504 1714
1505 $class->SUPER::new ( 1715 $class->SUPER::new (
… …
1508 ) 1718 )
1509} 1719}
1510 1720
1511############################################################################# 1721#############################################################################
1512 1722
1513package CFClient::UI::Label; 1723package CFPlus::UI::Label;
1514 1724
1515our @ISA = CFClient::UI::DrawBG::; 1725our @ISA = CFPlus::UI::DrawBG::;
1516 1726
1517use CFClient::OpenGL; 1727use CFPlus::OpenGL;
1518 1728
1519sub new { 1729sub new {
1520 my ($class, %arg) = @_; 1730 my ($class, %arg) = @_;
1521 1731
1522 my $self = $class->SUPER::new ( 1732 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1735 #active_bg => none
1526 #font => default_font 1736 #font => default_font
1527 #text => initial text 1737 #text => initial text
1528 #markup => initial narkup 1738 #markup => initial narkup
1529 #max_w => maximum pixel width 1739 #max_w => maximum pixel width
1740 #style => 0, # render flags
1530 ellipsise => 3, # end 1741 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1742 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1743 fontsize => 1,
1533 align => -1, 1744 align => -1,
1534 valign => -1, 1745 valign => -1,
1535 padding_x => 2, 1746 padding_x => 2,
1536 padding_y => 2, 1747 padding_y => 2,
1537 can_events => 0, 1748 can_events => 0,
1538 %arg 1749 %arg
1539 ); 1750 );
1540 1751
1541 if (exists $self->{template}) { 1752 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1753 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1754 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1755 $self->{template} = $layout;
1545 } 1756 }
1546 1757
1547 if (exists $self->{markup}) { 1758 if (exists $self->{markup}) {
… …
1551 } 1762 }
1552 1763
1553 $self 1764 $self
1554} 1765}
1555 1766
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1767sub update {
1567 my ($self) = @_; 1768 my ($self) = @_;
1568 1769
1569 delete $self->{texture}; 1770 delete $self->{texture};
1570 $self->SUPER::update; 1771 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1582 1783
1583 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1585 1786
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1588 1788
1589 delete $self->{size_req}; 1789 delete $self->{size_req};
1590 $self->realloc; 1790 $self->realloc;
1591 $self->update; 1791 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1599 1799
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1801
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1604 1803
1605 delete $self->{size_req}; 1804 delete $self->{size_req};
1606 $self->realloc; 1805 $self->realloc;
1607 $self->update; 1806 $self->update;
… …
1619 1818
1620 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1621 1820
1622 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1822 $self->{template}->set_font ($self->{font}) if $self->{font};
1823 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1825
1626 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1627 1827
1628 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
… …
1652 1852
1653sub set_fontsize { 1853sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1655 1855
1656 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1657 delete $self->{texture}; 1858 delete $self->{texture};
1658 1859
1659 $self->realloc; 1860 $self->realloc;
1660} 1861}
1661 1862
1662sub reconfigure { 1863sub reconfigure {
1663 my ($self) = @_; 1864 my ($self) = @_;
1664 1865
1665 delete $self->{size_req}; 1866 delete $self->{size_req};
1867 delete $self->{texture};
1666 1868
1667 $self->SUPER::reconfigure; 1869 $self->SUPER::reconfigure;
1668} 1870}
1669 1871
1670sub _draw { 1872sub _draw {
1671 my ($self) = @_; 1873 my ($self) = @_;
1672 1874
1673 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1674 1876
1675 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1884
1683 new_from_layout CFClient::Texture $self->{layout} 1885 [$self->{layout}->size]
1684 }; 1886 };
1685 1887
1686 unless (exists $self->{ox}) { 1888 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1891 : ($self->{w} - $size->[0]) * 0.5);
1690 1892
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1895 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1896 };
1695 1897
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1898 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1899 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1900
1701 if ($tex->{format} == GL_ALPHA) { 1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 1902}
1712 1903
1713############################################################################# 1904#############################################################################
1714 1905
1715package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1716 1907
1717our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1718 1909
1719use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1720 1911
1721sub new { 1912sub new {
1722 my $class = shift; 1913 my $class = shift;
1723 1914
1724 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1729 can_hover => 1, 1920 can_hover => 1,
1730 can_focus => 1, 1921 can_focus => 1,
1731 valign => 0, 1922 valign => 0,
1732 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1733 #text => ... 1925 #text => ...
1734 #hidden => "*", 1926 #hidden => "*",
1735 @_ 1927 @_
1736 ) 1928 )
1737} 1929}
… …
1782 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1784 1976
1785 my $text = $self->get_text; 1977 my $text = $self->get_text;
1786 1978
1979 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1980
1787 if ($uni == 8) { 1981 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 1989 } elsif ($sym == CFPlus::SDLK_HOME) {
1990 # what a hack
1991 $self->{cursor} =
1992 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1993 ? length $1
1994 : 0;
1995 } elsif ($sym == CFPlus::SDLK_END) {
1996 # uh, again
1997 $self->{cursor} =
1998 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1999 ? $self->{cursor} + length $1
2000 : length $self->{text};
2001 } elsif ($uni == 21) { # ctrl-u
2002 $text = "";
1796 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2005 $self->emit ('escape');
1801 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2010 } else {
1804 return 0; 2011 return 0;
1805 } 2012 }
1806 2013
1807 $self->_set_text ($text); 2014 $self->_set_text ($text);
1808 2015
1809 $self->realloc; 2016 $self->realloc;
2017 $self->update;
1810 2018
1811 1 2019 1
1812} 2020}
1813 2021
1814sub invoke_focus_in { 2022sub invoke_focus_in {
… …
1826 2034
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2036
1829 # byte-index to char-index 2037 # byte-index to char-index
1830 my $text = $self->{text}; 2038 my $text = $self->{text};
1831 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1833 2041
1834 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1835 $self->update; 2043 $self->update;
1836 2044
1837 1 2045 1
… …
1876 utf8::encode $text; 2084 utf8::encode $text;
1877 2085
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2086 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2087 }
1880 2088
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2089 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2090 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2091 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2092 glEnd;
1886 } 2093 }
1887} 2094}
1888 2095
2096#############################################################################
2097
1889package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1890 2099
1891our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1892 2101
1893use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1894 2103
1895sub invoke_key_down { 2104sub invoke_key_down {
1896 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1897 2106
1898 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1899 2108
1900 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
1903 2112
1904 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2115 $self->emit (activate => $txt);
1907 $self->update; 2116 $self->update;
1908 2117
1909 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1912 } 2121 }
1913 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2126 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2128 }
1920 2129
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2133
1925 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2144 1
1936} 2145}
1937 2146
1938############################################################################# 2147#############################################################################
1939 2148
2149package CFPlus::UI::TextEdit;
2150
2151our @ISA = CFPlus::UI::EntryBase::;
2152
2153use CFPlus::OpenGL;
2154
2155sub move_cursor_ver {
2156 my ($self, $dy) = @_;
2157
2158 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2159
2160 $y += $dy;
2161
2162 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2163 $self->{cursor} = $index;
2164 delete $self->{cur_h};
2165 $self->update;
2166 return;
2167 }
2168}
2169
2170sub invoke_key_down {
2171 my ($self, $ev) = @_;
2172
2173 my $sym = $ev->{sym};
2174
2175 if ($sym == CFPlus::SDLK_UP) {
2176 $self->move_cursor_ver (-1);
2177 } elsif ($sym == CFPlus::SDLK_DOWN) {
2178 $self->move_cursor_ver (+1);
2179 } else {
2180 return $self->SUPER::invoke_key_down ($ev)
2181 }
2182
2183 1
2184}
2185
2186#############################################################################
2187
1940package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1941 2189
1942our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1943 2191
1944use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1945 2193
1946my @tex = 2194my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1949 2197
1950sub new { 2198sub new {
1951 my $class = shift; 2199 my $class = shift;
1952 2200
… …
1989 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1990} 2238}
1991 2239
1992############################################################################# 2240#############################################################################
1993 2241
2242package CFPlus::UI::CheckBox;
2243
2244our @ISA = CFPlus::UI::DrawBG::;
2245
2246my @tex =
2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2249
2250use CFPlus::OpenGL;
2251
2252sub new {
2253 my $class = shift;
2254
2255 $class->SUPER::new (
2256 padding_x => 2,
2257 padding_y => 2,
2258 fg => [1, 1, 1],
2259 active_fg => [1, 1, 0],
2260 bg => [0, 0, 0, 0.2],
2261 active_bg => [1, 1, 1, 0.5],
2262 state => 0,
2263 can_hover => 1,
2264 @_
2265 )
2266}
2267
2268sub size_request {
2269 my ($self) = @_;
2270
2271 (6) x 2
2272}
2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
2282sub invoke_button_down {
2283 my ($self, $ev, $x, $y) = @_;
2284
2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2287 $self->toggle;
2288 } else {
2289 return 0
2290 }
2291
2292 1
2293}
2294
2295sub _draw {
2296 my ($self) = @_;
2297
2298 $self->SUPER::_draw;
2299
2300 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2301
2302 my ($w, $h) = @$self{qw(w h)};
2303
2304 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2305
2306 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2307
2308 my $tex = $self->{state} ? $tex[1] : $tex[0];
2309
2310 glEnable GL_TEXTURE_2D;
2311 $tex->draw_quad_alpha (0, 0, $s, $s);
2312 glDisable GL_TEXTURE_2D;
2313}
2314
2315#############################################################################
2316
2317package CFPlus::UI::Image;
2318
2319our @ISA = CFPlus::UI::Base::;
2320
2321use CFPlus::OpenGL;
2322
2323our %texture_cache;
2324
2325sub new {
2326 my $class = shift;
2327
2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
2332
2333 $self->{path} || $self->{tex}
2334 or Carp::croak "'path' or 'tex' attributes required";
2335
2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2337 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2338
2339 CFPlus::weaken $texture_cache{$self->{path}};
2340
2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2342
2343 $self
2344}
2345
2346sub STORABLE_freeze {
2347 my ($self, $cloning) = @_;
2348
2349 $self->{path}
2350 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2351
2352 $self->{path}
2353}
2354
2355sub STORABLE_attach {
2356 my ($self, $cloning, $path) = @_;
2357
2358 $self->new (path => $path)
2359}
2360
2361sub size_request {
2362 my ($self) = @_;
2363
2364 ($self->{tex}{w}, $self->{tex}{h})
2365}
2366
2367sub _draw {
2368 my ($self) = @_;
2369
2370 my $tex = $self->{tex};
2371
2372 my ($w, $h) = ($self->{w}, $self->{h});
2373
2374 if ($self->{rot90}) {
2375 glRotate 90, 0, 0, 1;
2376 glTranslate 0, -$self->{w}, 0;
2377
2378 ($w, $h) = ($h, $w);
2379 }
2380
2381 glEnable GL_TEXTURE_2D;
2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2383
2384 $tex->draw_quad (0, 0, $w, $h);
2385
2386 glDisable GL_TEXTURE_2D;
2387}
2388
2389#############################################################################
2390
1994package CFClient::UI::ImageButton; 2391package CFPlus::UI::ImageButton;
1995 2392
1996our @ISA = CFClient::UI::Image::; 2393our @ISA = CFPlus::UI::Image::;
1997 2394
1998use CFClient::OpenGL; 2395use CFPlus::OpenGL;
1999 2396
2000my %textures; 2397my %textures;
2001 2398
2002sub new { 2399sub new {
2003 my $class = shift; 2400 my $class = shift;
… …
2025 1 2422 1
2026} 2423}
2027 2424
2028############################################################################# 2425#############################################################################
2029 2426
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2427package CFPlus::UI::VGauge;
2099 2428
2100our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2430
2161use List::Util qw(min max); 2431use List::Util qw(min max);
2162 2432
2163use CFClient::OpenGL; 2433use CFPlus::OpenGL;
2164 2434
2165my %tex = ( 2435my %tex = (
2166 food => [ 2436 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2439 ],
2170 grace => [ 2440 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2442 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2443 ],
2174 hp => [ 2444 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2447 ],
2178 mana => [ 2448 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2450 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2451 ],
2182); 2452);
2183 2453
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2516
2247 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2518 my $h2 = $self->{h} * (1 - $ycut2);
2519 my $h3 = $self->{h};
2520
2521 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2522
2250 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2524 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2525 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
… …
2272 2545
2273 if ($t3) { 2546 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2553 glEnd;
2281 } 2554 }
2282 2555
2283 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
2285} 2558}
2286 2559
2287############################################################################# 2560#############################################################################
2288 2561
2289package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
2290 2563
2291our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
2292 2565
2293sub new { 2566sub new {
2294 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
2295 2568
2296 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2571 can_hover => 1,
2299 can_events => 1, 2572 can_events => 1,
2300 %arg, 2573 %arg,
2301 ); 2574 );
2302 2575
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2576 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2577 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2578 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2579
2307 $self 2580 $self
2308} 2581}
2309 2582
2310sub set_fontsize { 2583sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2332} 2605}
2333 2606
2334############################################################################# 2607#############################################################################
2335 2608
2336package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2337 2610
2338use strict; 2611use strict;
2339 2612
2340use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2341 2614
2342our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2343 2616
2344my @tex = 2617my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2347 2620
2348sub new { 2621sub new {
2349 my $class = shift; 2622 my $class = shift;
2350 2623
… …
2439 } 2712 }
2440 2713
2441 1 2714 1
2442} 2715}
2443 2716
2717sub invoke_mouse_wheel {
2718 my ($self, $ev) = @_;
2719
2720 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2721
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725
2726 ! ! $delta
2727}
2728
2444sub update { 2729sub update {
2445 my ($self) = @_; 2730 my ($self) = @_;
2446 2731
2447 delete $self->{knob_w}; 2732 delete $self->{knob_w};
2448 $self->SUPER::update; 2733 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2496} 2781}
2497 2782
2498############################################################################# 2783#############################################################################
2499 2784
2500package CFClient::UI::ValSlider; 2785package CFPlus::UI::ValSlider;
2501 2786
2502our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2503 2788
2504sub new { 2789sub new {
2505 my ($class, %arg) = @_; 2790 my ($class, %arg) = @_;
2506 2791
2507 my $range = delete $arg{range}; 2792 my $range = delete $arg{range};
2508 2793
2509 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2797 to_value => sub { shift },
2513 from_value => sub { shift }, 2798 from_value => sub { shift },
2514 %arg, 2799 %arg,
2515 ); 2800 );
2516 2801
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2821sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2822sub set_value { shift->{slider}->set_value (@_) }
2538 2823
2539############################################################################# 2824#############################################################################
2540 2825
2541package CFClient::UI::TextScroller; 2826package CFPlus::UI::TextScroller;
2542 2827
2543our @ISA = CFClient::UI::HBox::; 2828our @ISA = CFPlus::UI::HBox::;
2544 2829
2545use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2546 2831
2547sub new { 2832sub new {
2548 my $class = shift; 2833 my $class = shift;
2549 2834
2550 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2551 fontsize => 1, 2836 fontsize => 1,
2552 can_events => 0, 2837 can_events => 1,
2553 indent => 0, 2838 indent => 0,
2554 #font => default_font 2839 #font => default_font
2555 @_, 2840 @_,
2556 2841
2557 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2558 par => [], 2843 par => [],
2844 max_par => 0,
2559 height => 0, 2845 height => 0,
2560 children => [ 2846 children => [
2561 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2849 ],
2564 ); 2850 );
2565 2851
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2853
… …
2597 2883
2598 $self->reflow; 2884 $self->reflow;
2599 2885
2600 local $self->{children} = [$empty, $slider]; 2886 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 2887 $self->SUPER::invoke_size_allocate ($w, $h)
2888}
2889
2890sub invoke_mouse_wheel {
2891 my ($self, $ev) = @_;
2892
2893 return 0 unless $ev->{dy}; # only vertical movements
2894
2895 $self->{children}[1]->emit (mouse_wheel => $ev);
2896
2897 1
2602} 2898}
2603 2899
2604sub get_layout { 2900sub get_layout {
2605 my ($self, $para) = @_; 2901 my ($self, $para) = @_;
2606 2902
… …
2634 2930
2635 # todo: base offset on lines or so, not on pixels 2931 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 2932 $self->{children}[1]->set_value ($offset);
2637} 2933}
2638 2934
2935sub current_paragraph {
2936 my ($self) = @_;
2937
2938 $self->{top_paragraph} - 1
2939}
2940
2941sub scroll_to {
2942 my ($self, $para) = @_;
2943
2944 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2945
2946 $self->{scroll_to} = $para;
2947 $self->update;
2948}
2949
2639sub clear { 2950sub clear {
2640 my ($self) = @_; 2951 my ($self) = @_;
2641 2952
2642 my (undef, undef, @other) = @{ $self->{children} }; 2953 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 2954 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 2957 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2958 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 2959}
2649 2960
2650sub add_paragraph { 2961sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 2962 my $self = shift;
2652 2963
2653 my ($text, @w) = ref $para ? @$para : $para; 2964 for my $para (@_) {
2654
2655 $para = { 2965 $para = {
2966 fg => [1, 1, 1, 1],
2967 indent => 0,
2968 markup => "",
2969 widget => [],
2970 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 2971 w => 1e10,
2657 wrapped => 1, 2972 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 2973 };
2663 2974
2664 $self->add (@w) if @w; 2975 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 2976 push @{$self->{par}}, $para;
2977 }
2978
2979 if (my $max = $self->{max_par}) {
2980 shift @{$self->{par}} while @{$self->{par}} > $max;
2981 }
2666 2982
2667 $self->{need_reflow}++; 2983 $self->{need_reflow}++;
2668 $self->update; 2984 $self->update;
2669} 2985}
2670 2986
2671sub scroll_to_bottom { 2987sub scroll_to_bottom {
2672 my ($self) = @_; 2988 my ($self) = @_;
2673 2989
2674 $self->{scroll_to_bottom} = 1; 2990 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 2991 $self->update;
2676} 2992}
2677 2993
2994sub force_uptodate {
2995 my ($self) = @_;
2996
2997 if (delete $self->{need_reflow}) {
2998 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2999
3000 my $height = 0;
3001
3002 for my $para (@{$self->{par}}) {
3003 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3004 my $layout = $self->get_layout ($para);
3005 my ($w, $h) = $layout->size;
3006
3007 $para->{w} = $w + $para->{indent};
3008 $para->{h} = $h;
3009 $para->{wrapped} = $layout->has_wrapped;
3010 }
3011
3012 $para->{y} = $height;
3013 $height += $para->{h};
3014 }
3015
3016 $self->{height} = $height;
3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3018
3019 delete $self->{texture};
3020 }
3021
3022 if (my $paridx = delete $self->{scroll_to}) {
3023 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3024 }
3025}
3026
2678sub update { 3027sub update {
2679 my ($self) = @_; 3028 my ($self) = @_;
2680 3029
2681 $self->SUPER::update; 3030 $self->SUPER::update;
2682 3031
2683 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2684 3033
2685 delete $self->{texture}; 3034 delete $self->{texture};
2686 3035
2687 $ROOT->on_post_alloc ($self => sub { 3036 $ROOT->on_post_alloc ($self => sub {
3037 $self->force_uptodate;
3038
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3040
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3042 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2720 3044
3045 package CFPlus::UI::Base;
3046 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3047 (0, 0, $self->{w}, $self->{h});
3048
3049 my $top = int $self->{children}[1]{range}[0];
3050
3051 my $paridx = 0;
3052 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3053 my $top = int $self->{children}[1]{range}[0];
2722 3054
2723 my $y0 = $top; 3055 my $y0 = $top;
2724 my $y1 = $top + $H; 3056 my $y1 = $top + $H;
2725 3057
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2734 3061
2735 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3063 my $layout = $self->get_layout ($para);
2738 3064
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3065 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3066
2744 if (my @w = @{ $para->{widget} }) { 3067 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3068 my @s = $layout->get_shapes;
2746 3069
2747 glDisable GL_BLEND;
2748 for (@w) { 3070 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, (); 3071 my ($dx, $dy) = splice @s, 0, 2, ();
2750 3072
2751 $_->{x} = $dx + $para->{indent}; 3073 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0; 3074 $_->{y} = $dy + $y - $y0;
2753 3075
2754 $_->draw; 3076 $_->draw;
2755 } 3077 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 } 3078 }
2759 } 3079 }
2760 3080
2761 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3083 }
2763 3084
2764 glDisable GL_BLEND; 3085 $self->{top_paragraph} = $top_paragraph;
2765 }; 3086 };
2766 }); 3087 });
2767} 3088}
2768 3089
2769sub reconfigure { 3090sub reconfigure {
… …
2787 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2788} 3109}
2789 3110
2790############################################################################# 3111#############################################################################
2791 3112
2792package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2793 3114
2794use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2795 3116
2796our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2797 3118
2798sub moveto { 3119sub moveto {
2799 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2800 3121
2801 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2829 glPopMatrix; 3150 glPopMatrix;
2830} 3151}
2831 3152
2832############################################################################# 3153#############################################################################
2833 3154
2834package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2835 3156
2836our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2837 3158
2838sub new { 3159sub new {
2839 my $class = shift; 3160 my $class = shift;
2840 3161
2841 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
… …
2853 $self->{other}->toggle_visibility; 3174 $self->{other}->toggle_visibility;
2854} 3175}
2855 3176
2856############################################################################# 3177#############################################################################
2857 3178
2858package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2859 3180
2860our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2861 3182
2862use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2863 3184
2864sub new { 3185sub new {
2865 my $class = shift; 3186 my $class = shift;
2866 3187
2867 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2870 ) 3191 )
2871} 3192}
2872 3193
2873sub set_tooltip_from { 3194sub set_tooltip_from {
2874 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
3196
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
2875 3199
2876 my $tooltip = $widget->{tooltip}; 3200 my $tooltip = $widget->{tooltip};
2877 3201
2878 if ($ENV{CFPLUS_DEBUG} & 2) { 3202 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n" 3203 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2883 } 3207 }
2884 3208
2885 $tooltip =~ s/^\n+//; 3209 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//; 3210 $tooltip =~ s/\n+$//;
2887 3211
2888 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2889 markup => $tooltip, 3213 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8, 3215 fontsize => 0.8,
2892 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2893 ellipsise => 0, 3217 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 ); 3219 );
2896} 3220}
2897 3221
… …
2916 3240
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3241 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3242 my $widget = $self->{owner}
2919 or return; 3243 or return;
2920 3244
3245 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3246 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3247
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3248 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3249 if $x + $self->{w} > $self->{root}{w};
2925 3250
2926 $self->move_abs ($x, $y); 3251 $self->move_abs ($x, $y);
3252 } else {
3253 $self->hide;
3254 }
2927 }); 3255 });
2928} 3256}
2929 3257
2930sub _draw { 3258sub _draw {
2931 my ($self) = @_; 3259 my ($self) = @_;
… …
2955 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2956} 3284}
2957 3285
2958############################################################################# 3286#############################################################################
2959 3287
2960package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2961 3289
2962our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2963 3291
2964use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2965 3293
2966sub new { 3294sub new {
2967 my $class = shift; 3295 my $class = shift;
2968 3296
2969 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2971 can_events => 0, 3299 can_events => 0,
2972 @_, 3300 @_,
2973 ); 3301 );
2974 3302
2975 if ($self->{anim} && $self->{animspeed}) { 3303 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self); 3304 CFPlus::weaken (my $widget = $self);
2977 3305
2978 $self->{timer} = Event->timer ( 3306 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1, 3308 hard => 1,
2981 interval => $self->{animspeed}, 3309 interval => $self->{animspeed},
… …
3004sub _draw { 3332sub _draw {
3005 my ($self) = @_; 3333 my ($self) = @_;
3006 3334
3007 return unless $::CONN; 3335 return unless $::CONN;
3008 3336
3337 $self->SUPER::_draw;
3338
3009 my $face; 3339 my $face;
3010 3340
3011 if ($self->{frame}) { 3341 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}]; 3342 my $anim = $::CONN->{anim}[$self->{anim}];
3013 3343
… …
3035 $self->SUPER::destroy; 3365 $self->SUPER::destroy;
3036} 3366}
3037 3367
3038############################################################################# 3368#############################################################################
3039 3369
3040package CFClient::UI::Buttonbar; 3370package CFPlus::UI::Buttonbar;
3041 3371
3042our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
3043 3373
3044# TODO: should actualyl wrap buttons and other goodies. 3374# TODO: should actually wrap buttons and other goodies.
3045 3375
3046############################################################################# 3376#############################################################################
3047 3377
3048package CFClient::UI::Menu; 3378package CFPlus::UI::Menu;
3049 3379
3050our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
3051 3381
3052use CFClient::OpenGL; 3382use CFPlus::OpenGL;
3053 3383
3054sub new { 3384sub new {
3055 my $class = shift; 3385 my $class = shift;
3056 3386
3057 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
3058 items => [], 3388 items => [],
3059 z => 100, 3389 z => 100,
3060 @_, 3390 @_,
3061 ); 3391 );
3062 3392
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064 3394
3065 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
3067 3397
3068 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
3069 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
3070 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
3071 can_hover => 1, 3404 can_hover => 1,
3072 can_events => 1, 3405 can_events => 1,
3406 tooltip => $tooltip,
3407 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1),
3410 ],
3411 ;
3412
3413 } else {
3414 $widget = new CFPlus::UI::Label
3415 can_hover => 1,
3416 can_events => 1,
3073 markup => $widget, 3417 markup => $widget,
3074 tooltip => $tooltip 3418 tooltip => $tooltip;
3419 }
3075 } 3420 }
3076 3421
3077 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
3078 3423
3079 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
3122 1 3467 1
3123} 3468}
3124 3469
3125############################################################################# 3470#############################################################################
3126 3471
3127package CFClient::UI::Multiplexer; 3472package CFPlus::UI::Multiplexer;
3128 3473
3129our @ISA = CFClient::UI::Container::; 3474our @ISA = CFPlus::UI::Container::;
3130 3475
3131sub new { 3476sub new {
3132 my $class = shift; 3477 my $class = shift;
3133 3478
3134 my $self = $class->SUPER::new ( 3479 my $self = $class->SUPER::new (
… …
3148 3493
3149 $self->{current} = $self->{children}[0] 3494 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} }; 3495 if @{ $self->{children} };
3151} 3496}
3152 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{current}
3502}
3503
3153sub set_current_page { 3504sub set_current_page {
3154 my ($self, $page_or_widget) = @_; 3505 my ($self, $page_or_widget) = @_;
3155 3506
3156 my $widget = ref $page_or_widget 3507 my $widget = ref $page_or_widget
3157 ? $page_or_widget 3508 ? $page_or_widget
… …
3189 $self->{current}->draw; 3540 $self->{current}->draw;
3190} 3541}
3191 3542
3192############################################################################# 3543#############################################################################
3193 3544
3194package CFClient::UI::Notebook; 3545package CFPlus::UI::Notebook;
3195 3546
3196our @ISA = CFClient::UI::VBox::; 3547our @ISA = CFPlus::UI::VBox::;
3197 3548
3198sub new { 3549sub new {
3199 my $class = shift; 3550 my $class = shift;
3200 3551
3201 my $self = $class->SUPER::new ( 3552 my $self = $class->SUPER::new (
3202 buttonbar => (new CFClient::UI::Buttonbar), 3553 buttonbar => (new CFPlus::UI::Buttonbar),
3203 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3204 # filter => # will be put between multiplexer and $self 3555 # filter => # will be put between multiplexer and $self
3205 @_, 3556 @_,
3206 ); 3557 );
3207 3558
3208 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3212} 3563}
3213 3564
3214sub add { 3565sub add {
3215 my ($self, $title, $widget, $tooltip) = @_; 3566 my ($self, $title, $widget, $tooltip) = @_;
3216 3567
3217 Scalar::Util::weaken $self; 3568 CFPlus::weaken $self;
3218 3569
3219 $self->{buttonbar}->add (new CFClient::UI::Button 3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3220 markup => $title, 3571 markup => $title,
3221 tooltip => $tooltip, 3572 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) }, 3573 on_activate => sub { $self->set_current_page ($widget) },
3223 ); 3574 );
3224 3575
3225 $self->{multiplexer}->add ($widget); 3576 $self->{multiplexer}->add ($widget);
3226} 3577}
3227 3578
3579sub get_current_page {
3580 my ($self) = @_;
3581
3582 $self->{multiplexer}->get_current_page
3583}
3584
3228sub set_current_page { 3585sub set_current_page {
3229 my ($self, $page) = @_; 3586 my ($self, $page) = @_;
3230 3587
3231 $self->{multiplexer}->set_current_page ($page); 3588 $self->{multiplexer}->set_current_page ($page);
3232 $self->emit (page_changed => $self->{multiplexer}{current}); 3589 $self->emit (page_changed => $self->{multiplexer}{current});
3233} 3590}
3234 3591
3235############################################################################# 3592#############################################################################
3236 3593
3237package CFClient::UI::Combobox; 3594package CFPlus::UI::Selector;
3238 3595
3239use utf8; 3596use utf8;
3240 3597
3241our @ISA = CFClient::UI::Button::; 3598our @ISA = CFPlus::UI::Button::;
3242 3599
3243sub new { 3600sub new {
3244 my $class = shift; 3601 my $class = shift;
3245 3602
3246 my $self = $class->SUPER::new ( 3603 my $self = $class->SUPER::new (
… …
3263 my ($value, $title, $tooltip) = @$_; 3620 my ($value, $title, $tooltip) = @$_;
3264 3621
3265 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266 } 3623 }
3267 3624
3268 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269} 3626}
3270 3627
3271sub _set_value { 3628sub _set_value {
3272 my ($self, $value) = @_; 3629 my ($self, $value) = @_;
3273 3630
… …
3288 $self->emit (changed => $value); 3645 $self->emit (changed => $value);
3289} 3646}
3290 3647
3291############################################################################# 3648#############################################################################
3292 3649
3293package CFClient::UI::Statusbox; 3650package CFPlus::UI::Statusbox;
3294 3651
3295our @ISA = CFClient::UI::VBox::; 3652our @ISA = CFPlus::UI::VBox::;
3296 3653
3297sub new { 3654sub new {
3298 my $class = shift; 3655 my $class = shift;
3299 3656
3300 my $self = $class->SUPER::new ( 3657 my $self = $class->SUPER::new (
3301 fontsize => 0.8, 3658 fontsize => 0.8,
3302 @_, 3659 @_,
3303 ); 3660 );
3304 3661
3305 Scalar::Util::weaken (my $this = $self); 3662 CFPlus::weaken (my $this = $self);
3306 3663
3307 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3664 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308 3665
3309 $self 3666 $self
3310} 3667}
… …
3312sub reorder { 3669sub reorder {
3313 my ($self) = @_; 3670 my ($self) = @_;
3314 my $NOW = Time::HiRes::time; 3671 my $NOW = Time::HiRes::time;
3315 3672
3316 # freeze display when hovering over any label 3673 # freeze display when hovering over any label
3317 return if $CFClient::UI::TOOLTIP->{owner} 3674 return if $CFPlus::UI::TOOLTIP->{owner}
3318 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319 values %{ $self->{item} }; 3676 values %{ $self->{item} };
3320 3677
3321 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
3322 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323 } 3680 }
… …
3344 for ($short) { 3701 for ($short) {
3345 s/^\s+//; 3702 s/^\s+//;
3346 s/\s+/ /g; 3703 s/\s+/ /g;
3347 } 3704 }
3348 3705
3349 new CFClient::UI::Label 3706 new CFPlus::UI::Label
3350 markup => $short, 3707 markup => $short,
3351 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
3352 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
3353 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
3354 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3408 count => 1, 3765 count => 1,
3409 %arg, 3766 %arg,
3410 }; 3767 };
3411 } 3768 }
3412 3769
3770 $ROOT->on_refresh (reorder => sub {
3413 $self->reorder; 3771 $self->reorder;
3772 });
3414} 3773}
3415 3774
3416sub reconfigure { 3775sub reconfigure {
3417 my ($self) = @_; 3776 my ($self) = @_;
3418 3777
… …
3431 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3432} 3791}
3433 3792
3434############################################################################# 3793#############################################################################
3435 3794
3436package CFClient::UI::Inventory;
3437
3438our @ISA = CFClient::UI::ScrolledWindow::;
3439
3440sub new {
3441 my $class = shift;
3442
3443 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3445 @_,
3446 );
3447
3448 $self
3449}
3450
3451sub set_items {
3452 my ($self, $items) = @_;
3453
3454 $self->{child}->clear;
3455 return unless $items;
3456
3457 my @items = sort {
3458 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name})
3460 } @$items;
3461
3462 $self->{real_items} = \@items;
3463
3464 my $row = 0;
3465 for my $item (@items) {
3466 CFClient::Item::update_widgets $item;
3467
3468 $self->{child}->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget});
3471
3472 $row++;
3473 }
3474}
3475
3476#############################################################################
3477
3478package CFClient::UI::BindEditor;
3479
3480our @ISA = CFClient::UI::FancyFrame::;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487 $self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491 text => "start recording",
3492 tooltip => "Start/Stops recording of actions."
3493 ."All subsequent actions after the recording started will be captured."
3494 ."The actions are displayed after the record was stopped."
3495 ."To bind the action you have to click on the 'Bind' button",
3496 on_activate => sub {
3497 unless ($self->{recording}) {
3498 $self->start;
3499 } else {
3500 $self->stop;
3501 }
3502 });
3503
3504 $vb->add (new CFClient::UI::Label text => "Actions:");
3505 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3508 $vb->add (my $hb = new CFClient::UI::HBox);
3509 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510 $hb->add (new CFClient::UI::Button
3511 text => "bind",
3512 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513 on_activate => sub {
3514 $self->ask_for_bind;
3515 });
3516
3517 $vb->add (my $hb = new CFClient::UI::HBox);
3518 $hb->add (new CFClient::UI::Button
3519 text => "ok",
3520 expand => 1,
3521 tooltip => "This closes the binding editor and saves the binding",
3522 on_activate => sub {
3523 $self->hide;
3524 $self->commit;
3525 });
3526
3527 $hb->add (new CFClient::UI::Button
3528 text => "cancel",
3529 expand => 1,
3530 tooltip => "This closes the binding editor without saving",
3531 on_activate => sub {
3532 $self->hide;
3533 $self->{binding_cancel}->()
3534 if $self->{binding_cancel};
3535 });
3536
3537 $self->update_binding_widgets;
3538
3539 $self
3540}
3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3554sub commit {
3555 my ($self) = @_;
3556 my ($mod, $sym, $cmds) = $self->get_binding;
3557 if ($sym != 0 && @$cmds > 0) {
3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559 ."'. Don't forget 'Save Config'!");
3560 $self->{binding_change}->($mod, $sym, $cmds)
3561 if $self->{binding_change};
3562 } else {
3563 $::STATUSBOX->add ("No action bound, no key or action specified!");
3564 $self->{binding_cancel}->()
3565 if $self->{binding_cancel};
3566 }
3567}
3568
3569sub start {
3570 my ($self) = @_;
3571
3572 $self->{rec_btn}->set_text ("stop recording");
3573 $self->{recording} = 1;
3574 $self->clear_command_list;
3575 $::CONN->start_record if $::CONN;
3576}
3577
3578sub stop {
3579 my ($self) = @_;
3580
3581 $self->{rec_btn}->set_text ("start recording");
3582 $self->{recording} = 0;
3583
3584 my $rec;
3585 $rec = $::CONN->stop_record if $::CONN;
3586 return unless ref $rec eq 'ARRAY';
3587 $self->set_command_list ($rec);
3588}
3589
3590
3591sub ask_for_bind_and_commit {
3592 my ($self) = @_;
3593 $self->ask_for_bind (1);
3594}
3595
3596sub ask_for_bind {
3597 my ($self, $commit, $end_cb) = @_;
3598
3599 CFClient::Binder::open_binding_dialog (sub {
3600 my ($mod, $sym) = @_;
3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602 $self->update_binding_widgets;
3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3605 });
3606}
3607
3608# $mod and $sym are the modifiers and key symbol
3609# $cmds is a array ref of strings (the commands)
3610# $cb is the callback that is executed on OK
3611# $ccb is the callback that is executed on CANCEL and
3612# when the binding was unsuccessful on OK
3613sub set_binding {
3614 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616 $self->clear_command_list;
3617 $self->{recording} = 0;
3618 $self->{rec_btn}->set_text ("start recording");
3619
3620 $self->{binding} = [$mod, $sym];
3621 $self->{commands} = $cmds;
3622
3623 $self->{binding_change} = $cb;
3624 $self->{binding_cancel} = $ccb;
3625
3626 $self->update_binding_widgets;
3627}
3628
3629# this is a shortcut method that asks for a binding
3630# and then just binds it.
3631sub do_quick_binding {
3632 my ($self, $cmds, $end_cb) = @_;
3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634 $self->ask_for_bind (1, $end_cb);
3635}
3636
3637sub update_binding_widgets {
3638 my ($self) = @_;
3639 my ($mod, $sym, $cmds) = $self->get_binding;
3640 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641 $self->set_command_list ($cmds);
3642}
3643
3644sub get_binding {
3645 my ($self) = @_;
3646 return (
3647 $self->{binding}->[0],
3648 $self->{binding}->[1],
3649 [ grep { defined $_ } @{$self->{commands}} ]
3650 );
3651}
3652
3653sub clear_command_list {
3654 my ($self) = @_;
3655 $self->{cmdbox}->clear ();
3656}
3657
3658sub set_command_list {
3659 my ($self, $cmds) = @_;
3660
3661 $self->{cmdbox}->clear ();
3662 $self->{commands} = $cmds;
3663
3664 my $idx = 0;
3665
3666 for (@$cmds) {
3667 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669 my $i = $idx;
3670 $hb->add (new CFClient::UI::Label text => $_);
3671 $hb->add (new CFClient::UI::Button
3672 text => "delete",
3673 tooltip => "Deletes the action from the record",
3674 on_activate => sub {
3675 $self->{cmdbox}->remove ($hb);
3676 $cmds->[$i] = undef;
3677 });
3678
3679
3680 $idx++
3681 }
3682}
3683
3684#############################################################################
3685
3686package CFClient::UI::SpellList;
3687
3688our @ISA = CFClient::UI::Table::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3694 binding => [],
3695 commands => [],
3696 @_,
3697 )
3698}
3699
3700my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3701
3702my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3703 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3704my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3705 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3706my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3707 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3708my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3709 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3710my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3711 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712
3713sub rebuild_spell_list {
3714 my ($self) = @_;
3715
3716 $CFClient::UI::ROOT->on_refresh ($self => sub {
3717 $self->clear;
3718
3719 return unless $::CONN;
3720
3721 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3722 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3723 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3724 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3725 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726
3727 my $row = 0;
3728
3729 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730 my $spell = $self->{spell}{$_};
3731
3732 $row++;
3733
3734 my $spell_cb = sub {
3735 my ($widget, $ev) = @_;
3736
3737 if ($ev->{button} == 1) {
3738 $::CONN->user_send ("cast $spell->{name}");
3739 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu
3743 items => [
3744 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746 ],
3747 )->popup ($ev);
3748 } else {
3749 return 0;
3750 }
3751
3752 1
3753 };
3754
3755 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756
3757 #TODO: add path info to tooltip
3758 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3759
3760 $self->add (0, $row, new CFClient::UI::Face
3761 face => $spell->{face},
3762 can_hover => 1,
3763 can_events => 1,
3764 tooltip => $tooltip,
3765 on_button_down => $spell_cb,
3766 );
3767
3768 $self->add (1, $row, new CFClient::UI::Label
3769 expand => 1,
3770 text => $spell->{name},
3771 can_hover => 1,
3772 can_events => 1,
3773 tooltip => $tooltip,
3774 on_button_down => $spell_cb,
3775 );
3776
3777 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3778 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3779 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3780 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781 }
3782 });
3783}
3784
3785sub add_spell {
3786 my ($self, $spell) = @_;
3787
3788 $self->{spell}->{$spell->{name}} = $spell;
3789 $self->rebuild_spell_list;
3790}
3791
3792sub remove_spell {
3793 my ($self, $spell) = @_;
3794
3795 delete $self->{spell}->{$spell->{name}};
3796 $self->rebuild_spell_list;
3797}
3798
3799sub clear_spells {
3800 my ($self) = @_;
3801
3802 $self->{spell} = {};
3803 $self->rebuild_spell_list;
3804}
3805
3806#############################################################################
3807
3808package CFClient::UI::Root; 3795package CFPlus::UI::Root;
3809 3796
3810our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
3811 3798
3812use List::Util qw(min max); 3799use List::Util qw(min max);
3813 3800
3814use CFClient::OpenGL; 3801use CFPlus::OpenGL;
3815 3802
3816sub new { 3803sub new {
3817 my $class = shift; 3804 my $class = shift;
3818 3805
3819 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3820 visible => 1, 3807 visible => 1,
3821 @_, 3808 @_,
3822 ); 3809 );
3823 3810
3824 Scalar::Util::weaken ($self->{root} = $self); 3811 CFPlus::weaken ($self->{root} = $self);
3825 3812
3826 $self 3813 $self
3827} 3814}
3828 3815
3829sub size_request { 3816sub size_request {
… …
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996 3983
3997 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3998 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3999 3986
3987 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h;
3989
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995
4000 $w = int $w + 0.5; 3996 $w = int $w + 0.5;
4001 $h = int $h + 0.5; 3997 $h = int $h + 0.5;
4002 3998
4003 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3999 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004 $widget->{old_w} = $widget->{w}; 4000 $widget->{old_w} = $widget->{w};
… …
4027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
4029 glLoadIdentity; 4025 glLoadIdentity;
4030 4026
4031 { 4027 {
4032 package CFClient::UI::Base; 4028 package CFPlus::UI::Base;
4033 4029
4034 ($draw_x, $draw_y, $draw_w, $draw_h) = 4030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4035 (0, 0, $self->{w}, $self->{h}); 4031 (0, 0, $self->{w}, $self->{h});
4036 }
4037 4032
4038 $self->_draw; 4033 $self->_draw;
4034 }
4039} 4035}
4040 4036
4041############################################################################# 4037#############################################################################
4042 4038
4043package CFClient::UI; 4039package CFPlus::UI;
4044 4040
4045$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
4046$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047 4043
40481 40441
4049 4045

Diff Legend

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