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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 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
247sub show { 273sub show {
248 my ($self) = @_; 274 my ($self) = @_;
249 275
250 return if $self->{parent}; 276 return if $self->{parent};
251 277
252 $CFClient::UI::ROOT->add ($self); 278 $CFPlus::UI::ROOT->add ($self);
253} 279}
254 280
255sub set_visible { 281sub set_visible {
256 my ($self) = @_; 282 my ($self) = @_;
257 283
… …
278 delete $self->{root}; 304 delete $self->{root};
279 305
280 undef $GRAB if $GRAB == $self; 306 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 307 undef $HOVER if $HOVER == $self;
282 308
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 309 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 310 if $TOOLTIP->{owner} == $self;
285 311
286 $self->emit ("focus_out"); 312 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 313 $self->emit (visibility_change => 0);
288} 314}
… …
345 my ($self, $x, $y, $w, $h) = @_; 371 my ($self, $x, $y, $w, $h) = @_;
346 372
347 if ($self->{aspect}) { 373 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 374 my ($ow, $oh) = ($w, $h);
349 375
350 $w = List::Util::min $w, int $h * $self->{aspect}; 376 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 377 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 378
353 # use alignment to adjust x, y 379 # use alignment to adjust x, y
354 380
355 $x += int 0.5 * ($ow - $w); 381 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 382 $y += int 0.5 * ($oh - $h);
… …
397 423
398 return if $self->{tooltip} eq $tooltip; 424 return if $self->{tooltip} eq $tooltip;
399 425
400 $self->{tooltip} = $tooltip; 426 $self->{tooltip} = $tooltip;
401 427
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 429 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 430 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 431 }
406} 432}
407 433
408# translate global coordinates to local coordinate system 434# translate global coordinates to local coordinate system
409sub coord2local { 435sub coord2local {
410 my ($self, $x, $y) = @_; 436 my ($self, $x, $y) = @_;
411 437
438 Carp::confess unless $self->{parent};#d#
439
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 441}
414 442
415# translate local coordinates to global coordinate system 443# translate local coordinates to global coordinate system
416sub coord2global { 444sub coord2global {
417 my ($self, $x, $y) = @_; 445 my ($self, $x, $y) = @_;
418 446
447 Carp::confess unless $self->{parent};#d#
448
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 450}
421 451
422sub invoke_focus_in { 452sub invoke_focus_in {
423 my ($self) = @_; 453 my ($self) = @_;
424 454
425 return if $FOCUS == $self; 455 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 456 return unless $self->{can_focus};
427 457
428 my $focus = $FOCUS; $FOCUS = $self; 458 $FOCUS = $self;
429 459
430 $focus->update if $focus; 460 $self->update;
431 $FOCUS->update;
432 461
433 0 462 0
434} 463}
435 464
436sub invoke_focus_out { 465sub invoke_focus_out {
437 my ($self) = @_; 466 my ($self) = @_;
438 467
439 return unless $FOCUS == $self; 468 return unless $FOCUS == $self;
440 469
441 my $focus = $FOCUS; undef $FOCUS; 470 undef $FOCUS;
442 471
443 $focus->update if $focus; #? 472 $self->update;
444 473
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 474 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 475 unless $FOCUS;
447 476
448 0 477 0
449} 478}
450 479
451sub grab_focus { 480sub grab_focus {
452 my ($self) = @_; 481 my ($self) = @_;
453 482
483 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 484 $self->emit ("focus_in");
455} 485}
456 486
457sub invoke_mouse_motion { 1 } 487sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 488sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 489sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 490sub invoke_key_up { 0 }
491sub invoke_mouse_wheel { 0 }
461 492
462sub invoke_button_down { 493sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 494 my ($self, $ev, $x, $y) = @_;
464 495
465 $self->grab_focus; 496 $self->grab_focus;
466 497
467 1 498 0
468} 499}
469 500
470sub connect { 501sub connect {
471 my ($self, $signal, $cb) = @_; 502 my ($self, $signal, $cb) = @_;
472 503
473 push @{ $self->{signal_cb}{$signal} }, $cb; 504 push @{ $self->{signal_cb}{$signal} }, $cb;
505
506 defined wantarray and CFPlus::guard {
507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
508 @{ $self->{signal_cb}{$signal} };
509 }
474} 510}
511
512sub disconnect_all {
513 my ($self, $signal) = @_;
514
515 delete $self->{signal_cb}{$signal};
516}
517
518my %has_coords = (
519 button_down => 1,
520 button_up => 1,
521 mouse_motion => 1,
522 mouse_wheel => 1,
523);
475 524
476sub emit { 525sub emit {
477 my ($self, $signal, @args) = @_; 526 my ($self, $signal, @args) = @_;
478 527
479 #d##TODO# stop propagating at first true, do not use sum 528 # 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 529 # and needlessly verbose code, either.
530 my @append
531 = $has_coords{$signal}
532 ? $args[0]->xy ($self)
533 : ();
534
535 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
536
537 for my $cb (
538 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 539 ($self->can ("invoke_$signal") || sub { 1 }), # closure
540 ) {
541 return $cb->($self, @args, @append) || next;
542 }
543
544 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 545 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 546}
484 547
485sub find_widget { 548sub find_widget {
486 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
487 550
… …
495} 558}
496 559
497sub set_parent { 560sub set_parent {
498 my ($self, $parent) = @_; 561 my ($self, $parent) = @_;
499 562
500 Scalar::Util::weaken ($self->{parent} = $parent); 563 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 564 $self->set_visible if $parent->{visible};
502} 565}
503 566
504sub realloc { 567sub realloc {
505 my ($self) = @_; 568 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 634 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 635 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 636 glVertex 0 , $self->{h} - 1;
574 glEnd; 637 glEnd;
575 glPopMatrix; 638 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 640 }
578 641
579 $self->_draw; 642 $self->_draw;
580 glPopMatrix; 643 glPopMatrix;
581} 644}
… …
584 my ($self) = @_; 647 my ($self) = @_;
585 648
586 warn "no draw defined for $self\n"; 649 warn "no draw defined for $self\n";
587} 650}
588 651
652my $cntx;#d#
589sub DESTROY { 653sub DESTROY {
590 my ($self) = @_; 654 my ($self) = @_;
591 655
592 delete $WIDGET{$self+0}; 656 return if CFPlus::in_destruct;
593 657
594 eval { $self->destroy }; 658 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660
661 delete $WIDGET{$self+0};
596} 662}
597 663
598############################################################################# 664#############################################################################
599 665
600package CFClient::UI::DrawBG; 666package CFPlus::UI::DrawBG;
601 667
602our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
603 669
604use strict; 670use strict;
605use CFClient::OpenGL; 671use CFPlus::OpenGL;
606 672
607sub new { 673sub new {
608 my $class = shift; 674 my $class = shift;
609 675
610 # range [value, low, high, page] 676 # range [value, low, high, page]
… …
641 } 707 }
642} 708}
643 709
644############################################################################# 710#############################################################################
645 711
646package CFClient::UI::Empty; 712package CFPlus::UI::Empty;
647 713
648our @ISA = CFClient::UI::Base::; 714our @ISA = CFPlus::UI::Base::;
649 715
650sub new { 716sub new {
651 my ($class, %arg) = @_; 717 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 718 $class->SUPER::new (can_events => 0, %arg);
653} 719}
… …
660 726
661sub draw { } 727sub draw { }
662 728
663############################################################################# 729#############################################################################
664 730
665package CFClient::UI::Container; 731package CFPlus::UI::Container;
666 732
667our @ISA = CFClient::UI::Base::; 733our @ISA = CFPlus::UI::Base::;
668 734
669sub new { 735sub new {
670 my ($class, %arg) = @_; 736 my ($class, %arg) = @_;
671 737
672 my $children = delete $arg{children}; 738 my $children = delete $arg{children};
… …
681 if $children; 747 if $children;
682 748
683 $self 749 $self
684} 750}
685 751
752sub realloc {
753 my ($self) = @_;
754
755 $self->{force_realloc} = 1;
756 $self->{force_size_alloc} = 1;
757 $self->SUPER::realloc;
758}
759
686sub add { 760sub add {
687 my ($self, @widgets) = @_; 761 my ($self, @widgets) = @_;
688 762
689 $_->set_parent ($self) 763 $_->set_parent ($self)
690 for @widgets; 764 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
751} 825}
752 826
753############################################################################# 827#############################################################################
754 828
755package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
756 830
757our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
758 832
759sub new { 833sub new {
760 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
761 835
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 837
764 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
765} 839}
766 840
767sub add { 841sub add {
… …
774sub remove { 848sub remove {
775 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
776 850
777 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
778 852
779 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 854 unless @{$self->{children}};
781} 855}
782 856
783sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
784 858
… …
796 870
797############################################################################# 871#############################################################################
798 872
799# back-buffered drawing area 873# back-buffered drawing area
800 874
801package CFClient::UI::Window; 875package CFPlus::UI::Window;
802 876
803our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
804 878
805use CFClient::OpenGL; 879use CFPlus::OpenGL;
806 880
807sub new { 881sub new {
808 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
809 883
810 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
832} 906}
833 907
834sub render_child { 908sub render_child {
835 my ($self) = @_; 909 my ($self) = @_;
836 910
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
840 914
841 { 915 {
842 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
843 917
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
846 } 922 }
847
848 $self->_render;
849 }; 923 };
850} 924}
851 925
852sub _draw { 926sub _draw {
853 my ($self) = @_; 927 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 928
857 my $tex = $self->{texture} 929 my $tex = $self->{texture}
858 or return; 930 or return;
859 931
860 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
863 935
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
865 937
866 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
867} 939}
868 940
869############################################################################# 941#############################################################################
870 942
871package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
872 944
873our @ISA = CFClient::UI::Window::; 945our @ISA = CFPlus::UI::Window::;
874 946
875sub new { 947sub new {
876 my $class = shift; 948 my $class = shift;
877 949
878 $class->SUPER::new ( 950 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1012 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1014 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1015 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1016 }
945} 1017}
946 1018
947sub _render { 1019sub _render {
948 my ($self) = @_; 1020 my ($self) = @_;
949 1021
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1022 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}; 1023 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1024
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1026
955 $self->SUPER::_render; 1027 $self->SUPER::_render;
956} 1028}
957 1029
958############################################################################# 1030#############################################################################
959 1031
960package CFClient::UI::ScrolledWindow; 1032package CFPlus::UI::ScrolledWindow;
961 1033
962our @ISA = CFClient::UI::HBox::; 1034our @ISA = CFPlus::UI::HBox::;
963 1035
964sub new { 1036sub new {
965 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
966 1038
967 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
968 1040
969 my $self; 1041 my $self;
970 1042
971 my $slider = new CFClient::UI::Slider 1043 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1044 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1045 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1046 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1047 $self->{vp}->set_offset (0, $_[1]);
976 }, 1048 },
977 ; 1049 ;
978 1050
979 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1052 vp => (new CFPlus::UI::ViewPort expand => 1),
1053 can_events => 1,
981 slider => $slider, 1054 slider => $slider,
982 %arg, 1055 %arg,
983 ); 1056 );
984 1057
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1058 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1059 $self->add ($child) if $child;
987 1060
988 $self 1061 $self
989} 1062}
990 1063
1064#TODO# update range on size_allocate depending on child
1065
991sub add { 1066sub add {
992 my ($self, $widget) = @_; 1067 my ($self, $widget) = @_;
993 1068
994 $self->{vp}->add ($self->{child} = $widget); 1069 $self->{vp}->add ($self->{child} = $widget);
995} 1070}
996 1071
1072sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_;
1074
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev);
1078
1079 1
1080}
1081
1082sub update_slider {
1083 my ($self) = @_;
1084
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1086}
1087
997sub update { 1088sub update {
998 my ($self) = @_; 1089 my ($self) = @_;
999 1090
1000 $self->SUPER::update; 1091 $self->SUPER::update;
1001 1092
1002 # todo: overwrite size_allocate of child 1093 $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} 1094}
1006 1095
1007sub invoke_size_allocate { 1096sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1097 my ($self, $w, $h) = @_;
1009 1098
1010 my $child = $self->{vp}->child; 1099 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012 1100
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1101 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1102}
1015 1103
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1104#############################################################################
1020 1105
1021package CFClient::UI::Frame; 1106package CFPlus::UI::Frame;
1022 1107
1023our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFPlus::UI::Bin::;
1024 1109
1025use CFClient::OpenGL; 1110use CFPlus::OpenGL;
1026 1111
1027sub new { 1112sub new {
1028 my $class = shift; 1113 my $class = shift;
1029 1114
1030 $class->SUPER::new ( 1115 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1141 $self->SUPER::_draw;
1057} 1142}
1058 1143
1059############################################################################# 1144#############################################################################
1060 1145
1061package CFClient::UI::FancyFrame; 1146package CFPlus::UI::FancyFrame;
1062 1147
1063our @ISA = CFClient::UI::Bin::; 1148our @ISA = CFPlus::UI::Bin::;
1064 1149
1065use CFClient::OpenGL; 1150use CFPlus::OpenGL;
1151
1152sub new {
1153 my ($class, %arg) = @_;
1154
1155 if ((exists $arg{label}) && !ref $arg{label}) {
1156 $arg{label} = new CFPlus::UI::Label
1157 align => 1,
1158 valign => 0,
1159 text => $arg{label},
1160 fontsize => ($arg{border} || 0.8) * 0.75;
1161 }
1162
1163 my $self = $class->SUPER::new (
1164 # label => "",
1165 fg => [0.6, 0.3, 0.1],
1166 border => 0.8,
1167 style => 'single',
1168 %arg,
1169 );
1170
1171 $self
1172}
1173
1174sub add {
1175 my ($self, @widgets) = @_;
1176
1177 $self->SUPER::add (@widgets);
1178 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1179}
1180
1181sub border {
1182 int $_[0]{border} * $::FONTSIZE
1183}
1184
1185sub size_request {
1186 my ($self) = @_;
1187
1188 ($self->{label_w}, undef) = $self->{label}->size_request
1189 if $self->{label};
1190
1191 my ($w, $h) = $self->SUPER::size_request;
1192
1193 (
1194 $w + $self->border * 2,
1195 $h + $self->border * 2,
1196 )
1197}
1198
1199sub invoke_size_allocate {
1200 my ($self, $w, $h) = @_;
1201
1202 my $border = $self->border;
1203
1204 $w -= List::Util::max 0, $border * 2;
1205 $h -= List::Util::max 0, $border * 2;
1206
1207 if (my $label = $self->{label}) {
1208 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1209 $label->{h} = List::Util::min $h, $border;
1210 $label->invoke_size_allocate ($label->{w}, $label->{h});
1211 }
1212
1213 $self->child->configure ($border, $border, $w, $h);
1214
1215 1
1216}
1217
1218sub _draw {
1219 my ($self) = @_;
1220
1221 my $child = $self->{children}[0];
1222
1223 my $border = $self->border;
1224 my ($w, $h) = ($self->{w}, $self->{h});
1225
1226 $child->draw;
1227
1228 glColor @{$self->{fg}};
1229 glBegin GL_LINE_STRIP;
1230 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1231 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1233 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1234 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1235 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1236 glEnd;
1237
1238 if ($self->{label}) {
1239 glTranslate $border * 2, 0;
1240 $self->{label}->_draw;
1241 }
1242}
1243
1244#############################################################################
1245
1246package CFPlus::UI::Toplevel;
1247
1248our @ISA = CFPlus::UI::Bin::;
1249
1250use CFPlus::OpenGL;
1066 1251
1067my $bg = 1252my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1254 mipmap => 1, wrap => 1;
1070 1255
1071my @border = 1256my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1257 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); 1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1259
1075sub new { 1260sub new {
1076 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1077 1262
1078 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1264 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1265 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1266 border => 0.6,
1082 can_events => 1, 1267 can_events => 1,
1083 min_w => 16, 1268 min_w => 64,
1084 min_h => 16, 1269 min_h => 32,
1085 %arg, 1270 %arg,
1086 ); 1271 );
1087 1272
1088 $self->{title_widget} = new CFClient::UI::Label 1273 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1274 align => 0,
1090 valign => 1, 1275 valign => 1,
1091 text => $self->{title}, 1276 text => $self->{title},
1092 fontsize => $self->{border}, 1277 fontsize => $self->{border},
1093 if exists $self->{title}; 1278 if exists $self->{title};
1094 1279
1095 if ($self->{has_close_button}) { 1280 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1281 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1282 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1283 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1284 on_activate => sub { $self->emit ("delete") };
1100 1285
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1286 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1287 }
1103 1288
1104 $self 1289 $self
1105} 1290}
1106 1291
1107sub add { 1292sub add {
1108 my ($self, @widgets) = @_; 1293 my ($self, @widgets) = @_;
1109 1294
1110 $self->SUPER::add (@widgets); 1295 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1296 $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}; 1297 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1298}
1114 1299
1115sub border { 1300sub border {
1116 int $_[0]{border} * $::FONTSIZE 1301 int $_[0]{border} * $::FONTSIZE
1117} 1302}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1335 $self->child->configure ($border, $border, $w, $h);
1151 1336
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1337 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1338 if $self->{close_button};
1154 1339
1340 1
1341}
1342
1343sub invoke_delete {
1344 my ($self) = @_;
1345
1346 $self->hide;
1347
1155 1 1348 1
1156} 1349}
1157 1350
1158sub invoke_button_down { 1351sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1352 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1410 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1411
1219 ! ! $self->{motion} 1412 ! ! $self->{motion}
1220} 1413}
1221 1414
1415sub invoke_visibility_change {
1416 my ($self, $visible) = @_;
1417
1418 delete $self->{motion} unless $visible;
1419
1420 0
1421}
1422
1222sub _draw { 1423sub _draw {
1223 my ($self) = @_; 1424 my ($self) = @_;
1224 1425
1225 my $child = $self->{children}[0]; 1426 my $child = $self->{children}[0];
1226 1427
… …
1263 if $self->{close_button}; 1464 if $self->{close_button};
1264} 1465}
1265 1466
1266############################################################################# 1467#############################################################################
1267 1468
1268package CFClient::UI::Table; 1469package CFPlus::UI::Table;
1269 1470
1270our @ISA = CFClient::UI::Base::; 1471our @ISA = CFPlus::UI::Base::;
1271 1472
1272use List::Util qw(max sum); 1473use List::Util qw(max sum);
1273 1474
1274use CFClient::OpenGL; 1475use CFPlus::OpenGL;
1275 1476
1276sub new { 1477sub new {
1277 my $class = shift; 1478 my $class = shift;
1278 1479
1279 $class->SUPER::new ( 1480 $class->SUPER::new (
… …
1285sub children { 1486sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1488}
1288 1489
1289sub add { 1490sub add {
1290 my ($self, $x, $y, $child) = @_; 1491 my ($self) = shift;
1291 1492
1493 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1495 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1496 $self->{children}[$y][$x] = $child;
1497 }
1294 1498
1499 $self->{force_realloc} = 1;
1500 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1501 $self->realloc;
1296} 1502}
1297 1503
1298sub remove { 1504sub remove {
1299 my ($self, $child) = @_; 1505 my ($self, $child) = @_;
… …
1364 1570
1365 # linearly scale sizes 1571 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1574
1369 CFClient::UI::harmonize $ws; 1575 CFPlus::UI::harmonize $ws;
1370 CFClient::UI::harmonize $hs; 1576 CFPlus::UI::harmonize $hs;
1371 1577
1372 my $y; 1578 my $y;
1373 1579
1374 for my $r (0 .. $#{$self->{children}}) { 1580 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1581 my $row = $self->{children}[$r]
… …
1418 } 1624 }
1419} 1625}
1420 1626
1421############################################################################# 1627#############################################################################
1422 1628
1423package CFClient::UI::Box; 1629package CFPlus::UI::Box;
1424 1630
1425our @ISA = CFClient::UI::Container::; 1631our @ISA = CFPlus::UI::Container::;
1426 1632
1427sub size_request { 1633sub size_request {
1428 my ($self) = @_; 1634 my ($self) = @_;
1429 1635
1430 $self->{vertical} 1636 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1669 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1670 for 0 .. $#children;
1465 } 1671 }
1466 } 1672 }
1467 1673
1468 CFClient::UI::harmonize \@req; 1674 CFPlus::UI::harmonize \@req;
1469 1675
1470 my $pos = 0; 1676 my $pos = 0;
1471 for (0 .. $#children) { 1677 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1678 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1679 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1684 1
1479} 1685}
1480 1686
1481############################################################################# 1687#############################################################################
1482 1688
1483package CFClient::UI::HBox; 1689package CFPlus::UI::HBox;
1484 1690
1485our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1486 1692
1487sub new { 1693sub new {
1488 my $class = shift; 1694 my $class = shift;
1489 1695
1490 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1493 ) 1699 )
1494} 1700}
1495 1701
1496############################################################################# 1702#############################################################################
1497 1703
1498package CFClient::UI::VBox; 1704package CFPlus::UI::VBox;
1499 1705
1500our @ISA = CFClient::UI::Box::; 1706our @ISA = CFPlus::UI::Box::;
1501 1707
1502sub new { 1708sub new {
1503 my $class = shift; 1709 my $class = shift;
1504 1710
1505 $class->SUPER::new ( 1711 $class->SUPER::new (
… …
1508 ) 1714 )
1509} 1715}
1510 1716
1511############################################################################# 1717#############################################################################
1512 1718
1513package CFClient::UI::Label; 1719package CFPlus::UI::Label;
1514 1720
1515our @ISA = CFClient::UI::DrawBG::; 1721our @ISA = CFPlus::UI::DrawBG::;
1516 1722
1517use CFClient::OpenGL; 1723use CFPlus::OpenGL;
1518 1724
1519sub new { 1725sub new {
1520 my ($class, %arg) = @_; 1726 my ($class, %arg) = @_;
1521 1727
1522 my $self = $class->SUPER::new ( 1728 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1731 #active_bg => none
1526 #font => default_font 1732 #font => default_font
1527 #text => initial text 1733 #text => initial text
1528 #markup => initial narkup 1734 #markup => initial narkup
1529 #max_w => maximum pixel width 1735 #max_w => maximum pixel width
1736 #style => 0, # render flags
1530 ellipsise => 3, # end 1737 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1738 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1739 fontsize => 1,
1533 align => -1, 1740 align => -1,
1534 valign => -1, 1741 valign => -1,
1535 padding_x => 2, 1742 padding_x => 2,
1536 padding_y => 2, 1743 padding_y => 2,
1537 can_events => 0, 1744 can_events => 0,
1538 %arg 1745 %arg
1539 ); 1746 );
1540 1747
1541 if (exists $self->{template}) { 1748 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1749 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1750 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1751 $self->{template} = $layout;
1545 } 1752 }
1546 1753
1547 if (exists $self->{markup}) { 1754 if (exists $self->{markup}) {
… …
1551 } 1758 }
1552 1759
1553 $self 1760 $self
1554} 1761}
1555 1762
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1763sub update {
1567 my ($self) = @_; 1764 my ($self) = @_;
1568 1765
1569 delete $self->{texture}; 1766 delete $self->{texture};
1570 $self->SUPER::update; 1767 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1778 my ($self, $text) = @_;
1582 1779
1583 return if $self->{text} eq "T$text"; 1780 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1781 $self->{text} = "T$text";
1585 1782
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1783 $self->{layout}->set_text ($text);
1588 1784
1589 delete $self->{size_req}; 1785 delete $self->{size_req};
1590 $self->realloc; 1786 $self->realloc;
1591 $self->update; 1787 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1793 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1794 $self->{text} = "M$markup";
1599 1795
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1796 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1797
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1798 $self->{layout}->set_markup ($markup);
1604 1799
1605 delete $self->{size_req}; 1800 delete $self->{size_req};
1606 $self->realloc; 1801 $self->realloc;
1607 $self->update; 1802 $self->update;
… …
1619 1814
1620 my ($w, $h) = $self->{layout}->size; 1815 my ($w, $h) = $self->{layout}->size;
1621 1816
1622 if (exists $self->{template}) { 1817 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1818 $self->{template}->set_font ($self->{font}) if $self->{font};
1819 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1820 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1821
1626 my ($w2, $h2) = $self->{template}->size; 1822 my ($w2, $h2) = $self->{template}->size;
1627 1823
1628 $w = List::Util::max $w, $w2; 1824 $w = List::Util::max $w, $w2;
… …
1652 1848
1653sub set_fontsize { 1849sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1850 my ($self, $fontsize) = @_;
1655 1851
1656 $self->{fontsize} = $fontsize; 1852 $self->{fontsize} = $fontsize;
1853 delete $self->{size_req};
1657 delete $self->{texture}; 1854 delete $self->{texture};
1658 1855
1659 $self->realloc; 1856 $self->realloc;
1660} 1857}
1661 1858
1662sub reconfigure { 1859sub reconfigure {
1663 my ($self) = @_; 1860 my ($self) = @_;
1664 1861
1665 delete $self->{size_req}; 1862 delete $self->{size_req};
1863 delete $self->{texture};
1666 1864
1667 $self->SUPER::reconfigure; 1865 $self->SUPER::reconfigure;
1668} 1866}
1669 1867
1670sub _draw { 1868sub _draw {
1671 my ($self) = @_; 1869 my ($self) = @_;
1672 1870
1673 $self->SUPER::_draw; # draw background, if applicable 1871 $self->SUPER::_draw; # draw background, if applicable
1674 1872
1675 my $tex = $self->{texture} ||= do { 1873 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1874 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1875 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1876 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1877 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1878 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1879 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1880
1683 new_from_layout CFClient::Texture $self->{layout} 1881 [$self->{layout}->size]
1684 }; 1882 };
1685 1883
1686 unless (exists $self->{ox}) { 1884 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1885 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1886 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1887 : ($self->{w} - $size->[0]) * 0.5);
1690 1888
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1891 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1892 };
1695 1893
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1894 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1895 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1896
1701 if ($tex->{format} == GL_ALPHA) { 1897 $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} 1898}
1712 1899
1713############################################################################# 1900#############################################################################
1714 1901
1715package CFClient::UI::EntryBase; 1902package CFPlus::UI::EntryBase;
1716 1903
1717our @ISA = CFClient::UI::Label::; 1904our @ISA = CFPlus::UI::Label::;
1718 1905
1719use CFClient::OpenGL; 1906use CFPlus::OpenGL;
1720 1907
1721sub new { 1908sub new {
1722 my $class = shift; 1909 my $class = shift;
1723 1910
1724 $class->SUPER::new ( 1911 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1729 can_hover => 1, 1916 can_hover => 1,
1730 can_focus => 1, 1917 can_focus => 1,
1731 valign => 0, 1918 valign => 0,
1732 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1733 #text => ... 1921 #text => ...
1734 #hidden => "*", 1922 #hidden => "*",
1735 @_ 1923 @_
1736 ) 1924 )
1737} 1925}
… …
1786 1974
1787 if ($uni == 8) { 1975 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 1977 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 1978 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 1979 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 1980 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 1981 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1982 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 1983 } elsif ($sym == CFPlus::SDLK_HOME) {
1984 # what a hack
1985 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1
1988 : 0;
1989 } elsif ($sym == CFPlus::SDLK_END) {
1990 # uh, again
1991 $self->{cursor} =
1992 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1993 ? $self->{cursor} + length $1
1994 : length $self->{text};
1995 } elsif ($uni == 21) { # ctrl-u
1996 $text = "";
1796 $self->{cursor} = 0; 1997 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 1998 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 1999 $self->emit ('escape');
1801 } elsif ($uni) { 2000 } elsif ($uni == 0x0d) {
2001 substr $text, $self->{cursor}++, 0, "\012";
2002 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2003 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2004 } else {
1804 return 0; 2005 return 0;
1805 } 2006 }
1806 2007
1807 $self->_set_text ($text); 2008 $self->_set_text ($text);
1808 2009
1809 $self->realloc; 2010 $self->realloc;
2011 $self->update;
1810 2012
1811 1 2013 1
1812} 2014}
1813 2015
1814sub invoke_focus_in { 2016sub invoke_focus_in {
… …
1826 2028
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2029 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2030
1829 # byte-index to char-index 2031 # byte-index to char-index
1830 my $text = $self->{text}; 2032 my $text = $self->{text};
1831 utf8::encode $text; 2033 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2034 $self->{cursor} = length $text;
1833 2035
1834 $self->_set_text ($self->{text}); 2036 $self->_set_text ($self->{text});
1835 $self->update; 2037 $self->update;
1836 2038
1837 1 2039 1
… …
1876 utf8::encode $text; 2078 utf8::encode $text;
1877 2079
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2081 }
1880 2082
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2083 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2084 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}; 2085 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2086 glEnd;
1886 } 2087 }
1887} 2088}
1888 2089
2090#############################################################################
2091
1889package CFClient::UI::Entry; 2092package CFPlus::UI::Entry;
1890 2093
1891our @ISA = CFClient::UI::EntryBase::; 2094our @ISA = CFPlus::UI::EntryBase::;
1892 2095
1893use CFClient::OpenGL; 2096use CFPlus::OpenGL;
1894 2097
1895sub invoke_key_down { 2098sub invoke_key_down {
1896 my ($self, $ev) = @_; 2099 my ($self, $ev) = @_;
1897 2100
1898 my $sym = $ev->{sym}; 2101 my $sym = $ev->{sym};
1899 2102
1900 if ($sym == 13) { 2103 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2104 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2105 my $txt = $self->get_text;
1903 2106
1904 $self->{history_pointer} = -1; 2107 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2108 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2109 $self->emit (activate => $txt);
1907 $self->update; 2110 $self->update;
1908 2111
1909 } elsif ($sym == CFClient::SDLK_UP) { 2112 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2113 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2114 $self->{history_saveback} = $self->get_text;
1912 } 2115 }
1913 if (@{$self->{history} || []} > 0) { 2116 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2117 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2119 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2120 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2121 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2122 }
1920 2123
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2124 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2125 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2126 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2127
1925 if ($self->{history_pointer} >= 0) { 2128 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2129 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2138 1
1936} 2139}
1937 2140
1938############################################################################# 2141#############################################################################
1939 2142
2143package CFPlus::UI::TextEdit;
2144
2145our @ISA = CFPlus::UI::EntryBase::;
2146
2147use CFPlus::OpenGL;
2148
2149sub move_cursor_ver {
2150 my ($self, $dy) = @_;
2151
2152 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2153
2154 $y += $dy;
2155
2156 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2157 $self->{cursor} = $index;
2158 delete $self->{cur_h};
2159 $self->update;
2160 return;
2161 }
2162}
2163
2164sub invoke_key_down {
2165 my ($self, $ev) = @_;
2166
2167 my $sym = $ev->{sym};
2168
2169 if ($sym == CFPlus::SDLK_UP) {
2170 $self->move_cursor_ver (-1);
2171 } elsif ($sym == CFPlus::SDLK_DOWN) {
2172 $self->move_cursor_ver (+1);
2173 } else {
2174 return $self->SUPER::invoke_key_down ($ev)
2175 }
2176
2177 1
2178}
2179
2180#############################################################################
2181
1940package CFClient::UI::Button; 2182package CFPlus::UI::Button;
1941 2183
1942our @ISA = CFClient::UI::Label::; 2184our @ISA = CFPlus::UI::Label::;
1943 2185
1944use CFClient::OpenGL; 2186use CFPlus::OpenGL;
1945 2187
1946my @tex = 2188my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2190 qw(b1_button_active.png);
1949 2191
1950sub new { 2192sub new {
1951 my $class = shift; 2193 my $class = shift;
1952 2194
… …
1989 $self->SUPER::_draw; 2231 $self->SUPER::_draw;
1990} 2232}
1991 2233
1992############################################################################# 2234#############################################################################
1993 2235
2236package CFPlus::UI::CheckBox;
2237
2238our @ISA = CFPlus::UI::DrawBG::;
2239
2240my @tex =
2241 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2242 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2243
2244use CFPlus::OpenGL;
2245
2246sub new {
2247 my $class = shift;
2248
2249 $class->SUPER::new (
2250 padding_x => 2,
2251 padding_y => 2,
2252 fg => [1, 1, 1],
2253 active_fg => [1, 1, 0],
2254 bg => [0, 0, 0, 0.2],
2255 active_bg => [1, 1, 1, 0.5],
2256 state => 0,
2257 can_hover => 1,
2258 @_
2259 )
2260}
2261
2262sub size_request {
2263 my ($self) = @_;
2264
2265 (6) x 2
2266}
2267
2268sub toggle {
2269 my ($self) = @_;
2270
2271 $self->{state} = !$self->{state};
2272 $self->emit (changed => $self->{state});
2273 $self->update;
2274}
2275
2276sub invoke_button_down {
2277 my ($self, $ev, $x, $y) = @_;
2278
2279 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2280 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2281 $self->toggle;
2282 } else {
2283 return 0
2284 }
2285
2286 1
2287}
2288
2289sub _draw {
2290 my ($self) = @_;
2291
2292 $self->SUPER::_draw;
2293
2294 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2295
2296 my ($w, $h) = @$self{qw(w h)};
2297
2298 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2299
2300 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2301
2302 my $tex = $self->{state} ? $tex[1] : $tex[0];
2303
2304 glEnable GL_TEXTURE_2D;
2305 $tex->draw_quad_alpha (0, 0, $s, $s);
2306 glDisable GL_TEXTURE_2D;
2307}
2308
2309#############################################################################
2310
2311package CFPlus::UI::Image;
2312
2313our @ISA = CFPlus::UI::Base::;
2314
2315use CFPlus::OpenGL;
2316
2317our %texture_cache;
2318
2319sub new {
2320 my $class = shift;
2321
2322 my $self = $class->SUPER::new (
2323 can_events => 0,
2324 @_,
2325 );
2326
2327 $self->{path} || $self->{tex}
2328 or Carp::croak "'path' or 'tex' attributes required";
2329
2330 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2331 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2332
2333 CFPlus::weaken $texture_cache{$self->{path}};
2334
2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2336
2337 $self
2338}
2339
2340sub STORABLE_freeze {
2341 my ($self, $cloning) = @_;
2342
2343 $self->{path}
2344 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2345
2346 $self->{path}
2347}
2348
2349sub STORABLE_attach {
2350 my ($self, $cloning, $path) = @_;
2351
2352 $self->new (path => $path)
2353}
2354
2355sub size_request {
2356 my ($self) = @_;
2357
2358 ($self->{tex}{w}, $self->{tex}{h})
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363
2364 my $tex = $self->{tex};
2365
2366 my ($w, $h) = ($self->{w}, $self->{h});
2367
2368 if ($self->{rot90}) {
2369 glRotate 90, 0, 0, 1;
2370 glTranslate 0, -$self->{w}, 0;
2371
2372 ($w, $h) = ($h, $w);
2373 }
2374
2375 glEnable GL_TEXTURE_2D;
2376 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377
2378 $tex->draw_quad (0, 0, $w, $h);
2379
2380 glDisable GL_TEXTURE_2D;
2381}
2382
2383#############################################################################
2384
1994package CFClient::UI::ImageButton; 2385package CFPlus::UI::ImageButton;
1995 2386
1996our @ISA = CFClient::UI::Image::; 2387our @ISA = CFPlus::UI::Image::;
1997 2388
1998use CFClient::OpenGL; 2389use CFPlus::OpenGL;
1999 2390
2000my %textures; 2391my %textures;
2001 2392
2002sub new { 2393sub new {
2003 my $class = shift; 2394 my $class = shift;
… …
2025 1 2416 1
2026} 2417}
2027 2418
2028############################################################################# 2419#############################################################################
2029 2420
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; 2421package CFPlus::UI::VGauge;
2099 2422
2100our @ISA = CFClient::UI::Base::; 2423our @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 2424
2161use List::Util qw(min max); 2425use List::Util qw(min max);
2162 2426
2163use CFClient::OpenGL; 2427use CFPlus::OpenGL;
2164 2428
2165my %tex = ( 2429my %tex = (
2166 food => [ 2430 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2432 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2433 ],
2170 grace => [ 2434 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2435 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/ 2436 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2437 ],
2174 hp => [ 2438 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2439 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2440 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2441 ],
2178 mana => [ 2442 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2443 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/ 2444 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2445 ],
2182); 2446);
2183 2447
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2448# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2508 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2509 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2510
2247 my $h1 = $self->{h} * (1 - $ycut1); 2511 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2512 my $h2 = $self->{h} * (1 - $ycut2);
2513 my $h3 = $self->{h};
2514
2515 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2516
2250 glEnable GL_BLEND; 2517 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2518 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2519 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
… …
2272 2539
2273 if ($t3) { 2540 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2541 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2542 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2543 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2544 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2545 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2546 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2547 glEnd;
2281 } 2548 }
2282 2549
2283 glDisable GL_BLEND; 2550 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2551 glDisable GL_TEXTURE_2D;
2285} 2552}
2286 2553
2287############################################################################# 2554#############################################################################
2288 2555
2289package CFClient::UI::Gauge; 2556package CFPlus::UI::Gauge;
2290 2557
2291our @ISA = CFClient::UI::VBox::; 2558our @ISA = CFPlus::UI::VBox::;
2292 2559
2293sub new { 2560sub new {
2294 my ($class, %arg) = @_; 2561 my ($class, %arg) = @_;
2295 2562
2296 my $self = $class->SUPER::new ( 2563 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2565 can_hover => 1,
2299 can_events => 1, 2566 can_events => 1,
2300 %arg, 2567 %arg,
2301 ); 2568 );
2302 2569
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2570 $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); 2571 $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"); 2572 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2573
2307 $self 2574 $self
2308} 2575}
2309 2576
2310sub set_fontsize { 2577sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2598 $self->{value}->set_text ($val);
2332} 2599}
2333 2600
2334############################################################################# 2601#############################################################################
2335 2602
2336package CFClient::UI::Slider; 2603package CFPlus::UI::Slider;
2337 2604
2338use strict; 2605use strict;
2339 2606
2340use CFClient::OpenGL; 2607use CFPlus::OpenGL;
2341 2608
2342our @ISA = CFClient::UI::DrawBG::; 2609our @ISA = CFPlus::UI::DrawBG::;
2343 2610
2344my @tex = 2611my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2613 qw(s1_slider.png s1_slider_bg.png);
2347 2614
2348sub new { 2615sub new {
2349 my $class = shift; 2616 my $class = shift;
2350 2617
… …
2439 } 2706 }
2440 2707
2441 1 2708 1
2442} 2709}
2443 2710
2711sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_;
2713
2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2715
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717
2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719
2720 ! ! $delta
2721}
2722
2444sub update { 2723sub update {
2445 my ($self) = @_; 2724 my ($self) = @_;
2446 2725
2447 delete $self->{knob_w}; 2726 delete $self->{knob_w};
2448 $self->SUPER::update; 2727 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2496} 2775}
2497 2776
2498############################################################################# 2777#############################################################################
2499 2778
2500package CFClient::UI::ValSlider; 2779package CFPlus::UI::ValSlider;
2501 2780
2502our @ISA = CFClient::UI::HBox::; 2781our @ISA = CFPlus::UI::HBox::;
2503 2782
2504sub new { 2783sub new {
2505 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2506 2785
2507 my $range = delete $arg{range}; 2786 my $range = delete $arg{range};
2508 2787
2509 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2789 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2790 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2791 to_value => sub { shift },
2513 from_value => sub { shift }, 2792 from_value => sub { shift },
2514 %arg, 2793 %arg,
2515 ); 2794 );
2516 2795
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2815sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2816sub set_value { shift->{slider}->set_value (@_) }
2538 2817
2539############################################################################# 2818#############################################################################
2540 2819
2541package CFClient::UI::TextScroller; 2820package CFPlus::UI::TextScroller;
2542 2821
2543our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2544 2823
2545use CFClient::OpenGL; 2824use CFPlus::OpenGL;
2546 2825
2547sub new { 2826sub new {
2548 my $class = shift; 2827 my $class = shift;
2549 2828
2550 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2551 fontsize => 1, 2830 fontsize => 1,
2552 can_events => 0, 2831 can_events => 1,
2553 indent => 0, 2832 indent => 0,
2554 #font => default_font 2833 #font => default_font
2555 @_, 2834 @_,
2556 2835
2557 layout => (new CFClient::Layout 1), 2836 layout => (new CFPlus::Layout),
2558 par => [], 2837 par => [],
2838 max_par => 0,
2559 height => 0, 2839 height => 0,
2560 children => [ 2840 children => [
2561 (new CFClient::UI::Empty expand => 1), 2841 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2842 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2843 ],
2564 ); 2844 );
2565 2845
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2846 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2847
… …
2597 2877
2598 $self->reflow; 2878 $self->reflow;
2599 2879
2600 local $self->{children} = [$empty, $slider]; 2880 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 2881 $self->SUPER::invoke_size_allocate ($w, $h)
2882}
2883
2884sub invoke_mouse_wheel {
2885 my ($self, $ev) = @_;
2886
2887 return 0 unless $ev->{dy}; # only vertical movements
2888
2889 $self->{children}[1]->emit (mouse_wheel => $ev);
2890
2891 1
2602} 2892}
2603 2893
2604sub get_layout { 2894sub get_layout {
2605 my ($self, $para) = @_; 2895 my ($self, $para) = @_;
2606 2896
… …
2634 2924
2635 # todo: base offset on lines or so, not on pixels 2925 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 2926 $self->{children}[1]->set_value ($offset);
2637} 2927}
2638 2928
2929sub current_paragraph {
2930 my ($self) = @_;
2931
2932 $self->{top_paragraph} - 1
2933}
2934
2935sub scroll_to {
2936 my ($self, $para) = @_;
2937
2938 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2939
2940 $self->{scroll_to} = $para;
2941 $self->update;
2942}
2943
2639sub clear { 2944sub clear {
2640 my ($self) = @_; 2945 my ($self) = @_;
2641 2946
2642 my (undef, undef, @other) = @{ $self->{children} }; 2947 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 2948 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 2951 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2952 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 2953}
2649 2954
2650sub add_paragraph { 2955sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 2956 my $self = shift;
2652 2957
2653 my ($text, @w) = ref $para ? @$para : $para; 2958 for my $para (@_) {
2654
2655 $para = { 2959 $para = {
2960 fg => [1, 1, 1, 1],
2961 indent => 0,
2962 markup => "",
2963 widget => [],
2964 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 2965 w => 1e10,
2657 wrapped => 1, 2966 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 2967 };
2663 2968
2664 $self->add (@w) if @w; 2969 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 2970 push @{$self->{par}}, $para;
2971 }
2972
2973 if (my $max = $self->{max_par}) {
2974 shift @{$self->{par}} while @{$self->{par}} > $max;
2975 }
2666 2976
2667 $self->{need_reflow}++; 2977 $self->{need_reflow}++;
2668 $self->update; 2978 $self->update;
2669} 2979}
2670 2980
2671sub scroll_to_bottom { 2981sub scroll_to_bottom {
2672 my ($self) = @_; 2982 my ($self) = @_;
2673 2983
2674 $self->{scroll_to_bottom} = 1; 2984 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 2985 $self->update;
2676} 2986}
2677 2987
2988sub force_uptodate {
2989 my ($self) = @_;
2990
2991 if (delete $self->{need_reflow}) {
2992 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2993
2994 my $height = 0;
2995
2996 for my $para (@{$self->{par}}) {
2997 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2998 my $layout = $self->get_layout ($para);
2999 my ($w, $h) = $layout->size;
3000
3001 $para->{w} = $w + $para->{indent};
3002 $para->{h} = $h;
3003 $para->{wrapped} = $layout->has_wrapped;
3004 }
3005
3006 $para->{y} = $height;
3007 $height += $para->{h};
3008 }
3009
3010 $self->{height} = $height;
3011 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3012
3013 delete $self->{texture};
3014 }
3015
3016 if (my $paridx = delete $self->{scroll_to}) {
3017 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3018 }
3019}
3020
2678sub update { 3021sub update {
2679 my ($self) = @_; 3022 my ($self) = @_;
2680 3023
2681 $self->SUPER::update; 3024 $self->SUPER::update;
2682 3025
2683 return unless $self->{h} > 0; 3026 return unless $self->{h} > 0;
2684 3027
2685 delete $self->{texture}; 3028 delete $self->{texture};
2686 3029
2687 $ROOT->on_post_alloc ($self => sub { 3030 $ROOT->on_post_alloc ($self => sub {
3031 $self->force_uptodate;
3032
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3034
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 { 3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3036 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3037 glClear GL_COLOR_BUFFER_BIT;
2720 3038
3039 package CFPlus::UI::Base;
3040 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3041 (0, 0, $self->{w}, $self->{h});
3042
3043 my $top = int $self->{children}[1]{range}[0];
3044
3045 my $paridx = 0;
3046 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3047 my $top = int $self->{children}[1]{range}[0];
2722 3048
2723 my $y0 = $top; 3049 my $y0 = $top;
2724 my $y1 = $top + $H; 3050 my $y1 = $top + $H;
2725 3051
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}}) { 3052 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3053 my $h = $para->{h};
3054 my $y = $para->{y};
2734 3055
2735 if ($y0 < $y + $h && $y < $y1) { 3056 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3057 my $layout = $self->get_layout ($para);
2738 3058
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3059 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3060
2744 if (my @w = @{ $para->{widget} }) { 3061 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3062 my @s = $layout->get_shapes;
2746 3063
2747 for (@w) { 3064 for (@w) {
… …
2753 $_->draw; 3070 $_->draw;
2754 } 3071 }
2755 } 3072 }
2756 } 3073 }
2757 3074
2758 $y += $h; 3075 $paridx++;
3076 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3077 }
2760 3078
2761 glDisable GL_BLEND; 3079 $self->{top_paragraph} = $top_paragraph;
2762 }; 3080 };
2763 }); 3081 });
2764} 3082}
2765 3083
2766sub reconfigure { 3084sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3102 $self->{children}[1]->draw;
2785} 3103}
2786 3104
2787############################################################################# 3105#############################################################################
2788 3106
2789package CFClient::UI::Animator; 3107package CFPlus::UI::Animator;
2790 3108
2791use CFClient::OpenGL; 3109use CFPlus::OpenGL;
2792 3110
2793our @ISA = CFClient::UI::Bin::; 3111our @ISA = CFPlus::UI::Bin::;
2794 3112
2795sub moveto { 3113sub moveto {
2796 my ($self, $x, $y) = @_; 3114 my ($self, $x, $y) = @_;
2797 3115
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3116 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3144 glPopMatrix;
2827} 3145}
2828 3146
2829############################################################################# 3147#############################################################################
2830 3148
2831package CFClient::UI::Flopper; 3149package CFPlus::UI::Flopper;
2832 3150
2833our @ISA = CFClient::UI::Button::; 3151our @ISA = CFPlus::UI::Button::;
2834 3152
2835sub new { 3153sub new {
2836 my $class = shift; 3154 my $class = shift;
2837 3155
2838 my $self = $class->SUPER::new ( 3156 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3168 $self->{other}->toggle_visibility;
2851} 3169}
2852 3170
2853############################################################################# 3171#############################################################################
2854 3172
2855package CFClient::UI::Tooltip; 3173package CFPlus::UI::Tooltip;
2856 3174
2857our @ISA = CFClient::UI::Bin::; 3175our @ISA = CFPlus::UI::Bin::;
2858 3176
2859use CFClient::OpenGL; 3177use CFPlus::OpenGL;
2860 3178
2861sub new { 3179sub new {
2862 my $class = shift; 3180 my $class = shift;
2863 3181
2864 $class->SUPER::new ( 3182 $class->SUPER::new (
… …
2867 ) 3185 )
2868} 3186}
2869 3187
2870sub set_tooltip_from { 3188sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3189 my ($self, $widget) = @_;
3190
3191 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3193
2873 my $tooltip = $widget->{tooltip}; 3194 my $tooltip = $widget->{tooltip};
2874 3195
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3196 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3197 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3201 }
2881 3202
2882 $tooltip =~ s/^\n+//; 3203 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3204 $tooltip =~ s/\n+$//;
2884 3205
2885 $self->add (new CFClient::UI::Label 3206 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3207 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3208 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3209 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3210 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3211 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3212 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3213 );
2893} 3214}
2894 3215
… …
2913 3234
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3235 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3236 my $widget = $self->{owner}
2916 or return; 3237 or return;
2917 3238
3239 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3240 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3241
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3242 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3243 if $x + $self->{w} > $self->{root}{w};
2922 3244
2923 $self->move_abs ($x, $y); 3245 $self->move_abs ($x, $y);
3246 } else {
3247 $self->hide;
3248 }
2924 }); 3249 });
2925} 3250}
2926 3251
2927sub _draw { 3252sub _draw {
2928 my ($self) = @_; 3253 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3277 $self->SUPER::_draw;
2953} 3278}
2954 3279
2955############################################################################# 3280#############################################################################
2956 3281
2957package CFClient::UI::Face; 3282package CFPlus::UI::Face;
2958 3283
2959our @ISA = CFClient::UI::Base::; 3284our @ISA = CFPlus::UI::DrawBG::;
2960 3285
2961use CFClient::OpenGL; 3286use CFPlus::OpenGL;
2962 3287
2963sub new { 3288sub new {
2964 my $class = shift; 3289 my $class = shift;
2965 3290
2966 my $self = $class->SUPER::new ( 3291 my $self = $class->SUPER::new (
… …
2968 can_events => 0, 3293 can_events => 0,
2969 @_, 3294 @_,
2970 ); 3295 );
2971 3296
2972 if ($self->{anim} && $self->{animspeed}) { 3297 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3298 CFPlus::weaken (my $widget = $self);
2974 3299
2975 $self->{timer} = Event->timer ( 3300 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3302 hard => 1,
2978 interval => $self->{animspeed}, 3303 interval => $self->{animspeed},
… …
3001sub _draw { 3326sub _draw {
3002 my ($self) = @_; 3327 my ($self) = @_;
3003 3328
3004 return unless $::CONN; 3329 return unless $::CONN;
3005 3330
3331 $self->SUPER::_draw;
3332
3006 my $face; 3333 my $face;
3007 3334
3008 if ($self->{frame}) { 3335 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}]; 3336 my $anim = $::CONN->{anim}[$self->{anim}];
3010 3337
… …
3032 $self->SUPER::destroy; 3359 $self->SUPER::destroy;
3033} 3360}
3034 3361
3035############################################################################# 3362#############################################################################
3036 3363
3037package CFClient::UI::Buttonbar; 3364package CFPlus::UI::Buttonbar;
3038 3365
3039our @ISA = CFClient::UI::HBox::; 3366our @ISA = CFPlus::UI::HBox::;
3040 3367
3041# TODO: should actualyl wrap buttons and other goodies. 3368# TODO: should actually wrap buttons and other goodies.
3042 3369
3043############################################################################# 3370#############################################################################
3044 3371
3045package CFClient::UI::Menu; 3372package CFPlus::UI::Menu;
3046 3373
3047our @ISA = CFClient::UI::FancyFrame::; 3374our @ISA = CFPlus::UI::Toplevel::;
3048 3375
3049use CFClient::OpenGL; 3376use CFPlus::OpenGL;
3050 3377
3051sub new { 3378sub new {
3052 my $class = shift; 3379 my $class = shift;
3053 3380
3054 my $self = $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3055 items => [], 3382 items => [],
3056 z => 100, 3383 z => 100,
3057 @_, 3384 @_,
3058 ); 3385 );
3059 3386
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3387 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3388
3062 for my $item (@{ $self->{items} }) { 3389 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3390 my ($widget, $cb, $tooltip) = @$item;
3064 3391
3065 # handle various types of items, only text for now 3392 # handle various types of items, only text for now
3066 if (!ref $widget) { 3393 if (!ref $widget) {
3394 if ($widget =~ /\t/) {
3395 my ($left, $right) = split /\t/, $widget, 2;
3396
3067 $widget = new CFClient::UI::Label 3397 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3398 can_hover => 1,
3069 can_events => 1, 3399 can_events => 1,
3400 tooltip => $tooltip,
3401 children => [
3402 (new CFPlus::UI::Label markup => $left, expand => 1),
3403 (new CFPlus::UI::Label markup => $right, align => +1),
3404 ],
3405 ;
3406
3407 } else {
3408 $widget = new CFPlus::UI::Label
3409 can_hover => 1,
3410 can_events => 1,
3070 markup => $widget, 3411 markup => $widget,
3071 tooltip => $tooltip 3412 tooltip => $tooltip;
3413 }
3072 } 3414 }
3073 3415
3074 $self->{item}{$widget} = $item; 3416 $self->{item}{$widget} = $item;
3075 3417
3076 $self->{vbox}->add ($widget); 3418 $self->{vbox}->add ($widget);
… …
3119 1 3461 1
3120} 3462}
3121 3463
3122############################################################################# 3464#############################################################################
3123 3465
3124package CFClient::UI::Multiplexer; 3466package CFPlus::UI::Multiplexer;
3125 3467
3126our @ISA = CFClient::UI::Container::; 3468our @ISA = CFPlus::UI::Container::;
3127 3469
3128sub new { 3470sub new {
3129 my $class = shift; 3471 my $class = shift;
3130 3472
3131 my $self = $class->SUPER::new ( 3473 my $self = $class->SUPER::new (
… …
3145 3487
3146 $self->{current} = $self->{children}[0] 3488 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3489 if @{ $self->{children} };
3148} 3490}
3149 3491
3492sub get_current_page {
3493 my ($self) = @_;
3494
3495 $self->{current}
3496}
3497
3150sub set_current_page { 3498sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3499 my ($self, $page_or_widget) = @_;
3152 3500
3153 my $widget = ref $page_or_widget 3501 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3502 ? $page_or_widget
… …
3186 $self->{current}->draw; 3534 $self->{current}->draw;
3187} 3535}
3188 3536
3189############################################################################# 3537#############################################################################
3190 3538
3191package CFClient::UI::Notebook; 3539package CFPlus::UI::Notebook;
3192 3540
3193our @ISA = CFClient::UI::VBox::; 3541our @ISA = CFPlus::UI::VBox::;
3194 3542
3195sub new { 3543sub new {
3196 my $class = shift; 3544 my $class = shift;
3197 3545
3198 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3547 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3549 # filter => # will be put between multiplexer and $self
3202 @_, 3550 @_,
3203 ); 3551 );
3204 3552
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3209} 3557}
3210 3558
3211sub add { 3559sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3560 my ($self, $title, $widget, $tooltip) = @_;
3213 3561
3214 Scalar::Util::weaken $self; 3562 CFPlus::weaken $self;
3215 3563
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3565 markup => $title,
3218 tooltip => $tooltip, 3566 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3567 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3568 );
3221 3569
3222 $self->{multiplexer}->add ($widget); 3570 $self->{multiplexer}->add ($widget);
3223} 3571}
3224 3572
3573sub get_current_page {
3574 my ($self) = @_;
3575
3576 $self->{multiplexer}->get_current_page
3577}
3578
3225sub set_current_page { 3579sub set_current_page {
3226 my ($self, $page) = @_; 3580 my ($self, $page) = @_;
3227 3581
3228 $self->{multiplexer}->set_current_page ($page); 3582 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3583 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3584}
3231 3585
3232############################################################################# 3586#############################################################################
3233 3587
3234package CFClient::UI::Combobox; 3588package CFPlus::UI::Selector;
3235 3589
3236use utf8; 3590use utf8;
3237 3591
3238our @ISA = CFClient::UI::Button::; 3592our @ISA = CFPlus::UI::Button::;
3239 3593
3240sub new { 3594sub new {
3241 my $class = shift; 3595 my $class = shift;
3242 3596
3243 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3614 my ($value, $title, $tooltip) = @$_;
3261 3615
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3616 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3617 }
3264 3618
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3619 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3620}
3267 3621
3268sub _set_value { 3622sub _set_value {
3269 my ($self, $value) = @_; 3623 my ($self, $value) = @_;
3270 3624
… …
3285 $self->emit (changed => $value); 3639 $self->emit (changed => $value);
3286} 3640}
3287 3641
3288############################################################################# 3642#############################################################################
3289 3643
3290package CFClient::UI::Statusbox; 3644package CFPlus::UI::Statusbox;
3291 3645
3292our @ISA = CFClient::UI::VBox::; 3646our @ISA = CFPlus::UI::VBox::;
3293 3647
3294sub new { 3648sub new {
3295 my $class = shift; 3649 my $class = shift;
3296 3650
3297 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 3652 fontsize => 0.8,
3299 @_, 3653 @_,
3300 ); 3654 );
3301 3655
3302 Scalar::Util::weaken (my $this = $self); 3656 CFPlus::weaken (my $this = $self);
3303 3657
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3658 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 3659
3306 $self 3660 $self
3307} 3661}
… …
3309sub reorder { 3663sub reorder {
3310 my ($self) = @_; 3664 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3665 my $NOW = Time::HiRes::time;
3312 3666
3313 # freeze display when hovering over any label 3667 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3668 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3669 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3670 values %{ $self->{item} };
3317 3671
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3672 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3673 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3674 }
… …
3341 for ($short) { 3695 for ($short) {
3342 s/^\s+//; 3696 s/^\s+//;
3343 s/\s+/ /g; 3697 s/\s+/ /g;
3344 } 3698 }
3345 3699
3346 new CFClient::UI::Label 3700 new CFPlus::UI::Label
3347 markup => $short, 3701 markup => $short,
3348 tooltip => $item->{tooltip}, 3702 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3703 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3704 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3705 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3759 count => 1,
3406 %arg, 3760 %arg,
3407 }; 3761 };
3408 } 3762 }
3409 3763
3764 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3765 $self->reorder;
3766 });
3411} 3767}
3412 3768
3413sub reconfigure { 3769sub reconfigure {
3414 my ($self) = @_; 3770 my ($self) = @_;
3415 3771
… …
3428 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3429} 3785}
3430 3786
3431############################################################################# 3787#############################################################################
3432 3788
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 3789package CFPlus::UI::Root;
3806 3790
3807our @ISA = CFClient::UI::Container::; 3791our @ISA = CFPlus::UI::Container::;
3808 3792
3809use List::Util qw(min max); 3793use List::Util qw(min max);
3810 3794
3811use CFClient::OpenGL; 3795use CFPlus::OpenGL;
3812 3796
3813sub new { 3797sub new {
3814 my $class = shift; 3798 my $class = shift;
3815 3799
3816 my $self = $class->SUPER::new ( 3800 my $self = $class->SUPER::new (
3817 visible => 1, 3801 visible => 1,
3818 @_, 3802 @_,
3819 ); 3803 );
3820 3804
3821 Scalar::Util::weaken ($self->{root} = $self); 3805 CFPlus::weaken ($self->{root} = $self);
3822 3806
3823 $self 3807 $self
3824} 3808}
3825 3809
3826sub size_request { 3810sub size_request {
… …
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 3977
3994 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3996 3980
3981 $w = max $widget->{min_w}, $w;
3982 $h = max $widget->{min_h}, $h;
3983
3984# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986
3987 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989
3997 $w = int $w + 0.5; 3990 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 3991 $h = int $h + 0.5;
3999 3992
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3993 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 3994 $widget->{old_w} = $widget->{w};
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4017 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4018 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4019 glLoadIdentity;
4027 4020
4028 { 4021 {
4029 package CFClient::UI::Base; 4022 package CFPlus::UI::Base;
4030 4023
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4024 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4025 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4026
4035 $self->_draw; 4027 $self->_draw;
4028 }
4036} 4029}
4037 4030
4038############################################################################# 4031#############################################################################
4039 4032
4040package CFClient::UI; 4033package CFPlus::UI;
4041 4034
4042$ROOT = new CFClient::UI::Root; 4035$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4036$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4037
40451 40381
4046 4039

Diff Legend

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