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.315 by root, Wed Jun 28 21:17:01 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;
… …
994 my ($self, $widget) = @_; 1067 my ($self, $widget) = @_;
995 1068
996 $self->{vp}->add ($self->{child} = $widget); 1069 $self->{vp}->add ($self->{child} = $widget);
997} 1070}
998 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
999sub update_slider { 1082sub update_slider {
1000 my ($self) = @_; 1083 my ($self) = @_;
1001 1084
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1086}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1101 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1102}
1020 1103
1021############################################################################# 1104#############################################################################
1022 1105
1023package CFClient::UI::Frame; 1106package CFPlus::UI::Frame;
1024 1107
1025our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFPlus::UI::Bin::;
1026 1109
1027use CFClient::OpenGL; 1110use CFPlus::OpenGL;
1028 1111
1029sub new { 1112sub new {
1030 my $class = shift; 1113 my $class = shift;
1031 1114
1032 $class->SUPER::new ( 1115 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1141 $self->SUPER::_draw;
1059} 1142}
1060 1143
1061############################################################################# 1144#############################################################################
1062 1145
1063package CFClient::UI::FancyFrame; 1146package CFPlus::UI::FancyFrame;
1064 1147
1065our @ISA = CFClient::UI::Bin::; 1148our @ISA = CFPlus::UI::Bin::;
1066 1149
1067use 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;
1068 1251
1069my $bg = 1252my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1254 mipmap => 1, wrap => 1;
1072 1255
1073my @border = 1256my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1259
1077sub new { 1260sub new {
1078 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1079 1262
1080 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1264 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1265 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1266 border => 0.6,
1084 can_events => 1, 1267 can_events => 1,
1085 min_w => 16, 1268 min_w => 64,
1086 min_h => 16, 1269 min_h => 32,
1087 %arg, 1270 %arg,
1088 ); 1271 );
1089 1272
1090 $self->{title_widget} = new CFClient::UI::Label 1273 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1274 align => 0,
1092 valign => 1, 1275 valign => 1,
1093 text => $self->{title}, 1276 text => $self->{title},
1094 fontsize => $self->{border}, 1277 fontsize => $self->{border},
1095 if exists $self->{title}; 1278 if exists $self->{title};
1096 1279
1097 if ($self->{has_close_button}) { 1280 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1281 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1282 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1283 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1284 on_activate => sub { $self->emit ("delete") };
1102 1285
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1286 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1287 }
1105 1288
1106 $self 1289 $self
1107} 1290}
1108 1291
1109sub add { 1292sub add {
1110 my ($self, @widgets) = @_; 1293 my ($self, @widgets) = @_;
1111 1294
1112 $self->SUPER::add (@widgets); 1295 $self->SUPER::add (@widgets);
1113 $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};
1114 $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};
1115} 1298}
1116 1299
1117sub border { 1300sub border {
1118 int $_[0]{border} * $::FONTSIZE 1301 int $_[0]{border} * $::FONTSIZE
1119} 1302}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1335 $self->child->configure ($border, $border, $w, $h);
1153 1336
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1337 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1338 if $self->{close_button};
1156 1339
1340 1
1341}
1342
1343sub invoke_delete {
1344 my ($self) = @_;
1345
1346 $self->hide;
1347
1157 1 1348 1
1158} 1349}
1159 1350
1160sub invoke_button_down { 1351sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1352 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1410 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1411
1221 ! ! $self->{motion} 1412 ! ! $self->{motion}
1222} 1413}
1223 1414
1415sub invoke_visibility_change {
1416 my ($self, $visible) = @_;
1417
1418 delete $self->{motion} unless $visible;
1419
1420 0
1421}
1422
1224sub _draw { 1423sub _draw {
1225 my ($self) = @_; 1424 my ($self) = @_;
1226 1425
1227 my $child = $self->{children}[0]; 1426 my $child = $self->{children}[0];
1228 1427
… …
1265 if $self->{close_button}; 1464 if $self->{close_button};
1266} 1465}
1267 1466
1268############################################################################# 1467#############################################################################
1269 1468
1270package CFClient::UI::Table; 1469package CFPlus::UI::Table;
1271 1470
1272our @ISA = CFClient::UI::Base::; 1471our @ISA = CFPlus::UI::Base::;
1273 1472
1274use List::Util qw(max sum); 1473use List::Util qw(max sum);
1275 1474
1276use CFClient::OpenGL; 1475use CFPlus::OpenGL;
1277 1476
1278sub new { 1477sub new {
1279 my $class = shift; 1478 my $class = shift;
1280 1479
1281 $class->SUPER::new ( 1480 $class->SUPER::new (
… …
1287sub children { 1486sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1488}
1290 1489
1291sub add { 1490sub add {
1292 my ($self, $x, $y, $child) = @_; 1491 my ($self) = shift;
1293 1492
1493 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1495 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1496 $self->{children}[$y][$x] = $child;
1497 }
1296 1498
1499 $self->{force_realloc} = 1;
1500 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1501 $self->realloc;
1298} 1502}
1299 1503
1300sub remove { 1504sub remove {
1301 my ($self, $child) = @_; 1505 my ($self, $child) = @_;
… …
1366 1570
1367 # linearly scale sizes 1571 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1574
1371 CFClient::UI::harmonize $ws; 1575 CFPlus::UI::harmonize $ws;
1372 CFClient::UI::harmonize $hs; 1576 CFPlus::UI::harmonize $hs;
1373 1577
1374 my $y; 1578 my $y;
1375 1579
1376 for my $r (0 .. $#{$self->{children}}) { 1580 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1581 my $row = $self->{children}[$r]
… …
1420 } 1624 }
1421} 1625}
1422 1626
1423############################################################################# 1627#############################################################################
1424 1628
1425package CFClient::UI::Box; 1629package CFPlus::UI::Box;
1426 1630
1427our @ISA = CFClient::UI::Container::; 1631our @ISA = CFPlus::UI::Container::;
1428 1632
1429sub size_request { 1633sub size_request {
1430 my ($self) = @_; 1634 my ($self) = @_;
1431 1635
1432 $self->{vertical} 1636 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1669 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1670 for 0 .. $#children;
1467 } 1671 }
1468 } 1672 }
1469 1673
1470 CFClient::UI::harmonize \@req; 1674 CFPlus::UI::harmonize \@req;
1471 1675
1472 my $pos = 0; 1676 my $pos = 0;
1473 for (0 .. $#children) { 1677 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1678 my $alloc = $req[$_];
1475 $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));
… …
1480 1 1684 1
1481} 1685}
1482 1686
1483############################################################################# 1687#############################################################################
1484 1688
1485package CFClient::UI::HBox; 1689package CFPlus::UI::HBox;
1486 1690
1487our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1488 1692
1489sub new { 1693sub new {
1490 my $class = shift; 1694 my $class = shift;
1491 1695
1492 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1495 ) 1699 )
1496} 1700}
1497 1701
1498############################################################################# 1702#############################################################################
1499 1703
1500package CFClient::UI::VBox; 1704package CFPlus::UI::VBox;
1501 1705
1502our @ISA = CFClient::UI::Box::; 1706our @ISA = CFPlus::UI::Box::;
1503 1707
1504sub new { 1708sub new {
1505 my $class = shift; 1709 my $class = shift;
1506 1710
1507 $class->SUPER::new ( 1711 $class->SUPER::new (
… …
1510 ) 1714 )
1511} 1715}
1512 1716
1513############################################################################# 1717#############################################################################
1514 1718
1515package CFClient::UI::Label; 1719package CFPlus::UI::Label;
1516 1720
1517our @ISA = CFClient::UI::DrawBG::; 1721our @ISA = CFPlus::UI::DrawBG::;
1518 1722
1519use CFClient::OpenGL; 1723use CFPlus::OpenGL;
1520 1724
1521sub new { 1725sub new {
1522 my ($class, %arg) = @_; 1726 my ($class, %arg) = @_;
1523 1727
1524 my $self = $class->SUPER::new ( 1728 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1731 #active_bg => none
1528 #font => default_font 1732 #font => default_font
1529 #text => initial text 1733 #text => initial text
1530 #markup => initial narkup 1734 #markup => initial narkup
1531 #max_w => maximum pixel width 1735 #max_w => maximum pixel width
1736 #style => 0, # render flags
1532 ellipsise => 3, # end 1737 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1738 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1739 fontsize => 1,
1535 align => -1, 1740 align => -1,
1536 valign => -1, 1741 valign => -1,
1537 padding_x => 2, 1742 padding_x => 2,
1538 padding_y => 2, 1743 padding_y => 2,
1539 can_events => 0, 1744 can_events => 0,
1540 %arg 1745 %arg
1541 ); 1746 );
1542 1747
1543 if (exists $self->{template}) { 1748 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1749 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1750 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1751 $self->{template} = $layout;
1547 } 1752 }
1548 1753
1549 if (exists $self->{markup}) { 1754 if (exists $self->{markup}) {
… …
1553 } 1758 }
1554 1759
1555 $self 1760 $self
1556} 1761}
1557 1762
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1763sub update {
1569 my ($self) = @_; 1764 my ($self) = @_;
1570 1765
1571 delete $self->{texture}; 1766 delete $self->{texture};
1572 $self->SUPER::update; 1767 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1778 my ($self, $text) = @_;
1584 1779
1585 return if $self->{text} eq "T$text"; 1780 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1781 $self->{text} = "T$text";
1587 1782
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1783 $self->{layout}->set_text ($text);
1590 1784
1591 delete $self->{size_req}; 1785 delete $self->{size_req};
1592 $self->realloc; 1786 $self->realloc;
1593 $self->update; 1787 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1793 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1794 $self->{text} = "M$markup";
1601 1795
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1796 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1797
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1798 $self->{layout}->set_markup ($markup);
1606 1799
1607 delete $self->{size_req}; 1800 delete $self->{size_req};
1608 $self->realloc; 1801 $self->realloc;
1609 $self->update; 1802 $self->update;
… …
1621 1814
1622 my ($w, $h) = $self->{layout}->size; 1815 my ($w, $h) = $self->{layout}->size;
1623 1816
1624 if (exists $self->{template}) { 1817 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1820 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1821
1628 my ($w2, $h2) = $self->{template}->size; 1822 my ($w2, $h2) = $self->{template}->size;
1629 1823
1630 $w = List::Util::max $w, $w2; 1824 $w = List::Util::max $w, $w2;
… …
1654 1848
1655sub set_fontsize { 1849sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1850 my ($self, $fontsize) = @_;
1657 1851
1658 $self->{fontsize} = $fontsize; 1852 $self->{fontsize} = $fontsize;
1853 delete $self->{size_req};
1659 delete $self->{texture}; 1854 delete $self->{texture};
1660 1855
1661 $self->realloc; 1856 $self->realloc;
1662} 1857}
1663 1858
1664sub reconfigure { 1859sub reconfigure {
1665 my ($self) = @_; 1860 my ($self) = @_;
1666 1861
1667 delete $self->{size_req}; 1862 delete $self->{size_req};
1863 delete $self->{texture};
1668 1864
1669 $self->SUPER::reconfigure; 1865 $self->SUPER::reconfigure;
1670} 1866}
1671 1867
1672sub _draw { 1868sub _draw {
1673 my ($self) = @_; 1869 my ($self) = @_;
1674 1870
1675 $self->SUPER::_draw; # draw background, if applicable 1871 $self->SUPER::_draw; # draw background, if applicable
1676 1872
1677 my $tex = $self->{texture} ||= do { 1873 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1874 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1875 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1876 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1877 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1878 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1879 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1880
1685 new_from_layout CFClient::Texture $self->{layout} 1881 [$self->{layout}->size]
1686 }; 1882 };
1687 1883
1688 unless (exists $self->{ox}) { 1884 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1885 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1886 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1887 : ($self->{w} - $size->[0]) * 0.5);
1692 1888
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1891 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1892 };
1697 1893
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1894 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1895 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1896
1703 if ($tex->{format} == GL_ALPHA) { 1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1898}
1714 1899
1715############################################################################# 1900#############################################################################
1716 1901
1717package CFClient::UI::EntryBase; 1902package CFPlus::UI::EntryBase;
1718 1903
1719our @ISA = CFClient::UI::Label::; 1904our @ISA = CFPlus::UI::Label::;
1720 1905
1721use CFClient::OpenGL; 1906use CFPlus::OpenGL;
1722 1907
1723sub new { 1908sub new {
1724 my $class = shift; 1909 my $class = shift;
1725 1910
1726 $class->SUPER::new ( 1911 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1731 can_hover => 1, 1916 can_hover => 1,
1732 can_focus => 1, 1917 can_focus => 1,
1733 valign => 0, 1918 valign => 0,
1734 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1735 #text => ... 1921 #text => ...
1736 #hidden => "*", 1922 #hidden => "*",
1737 @_ 1923 @_
1738 ) 1924 )
1739} 1925}
… …
1788 1974
1789 if ($uni == 8) { 1975 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 1977 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 1978 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 1979 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 1980 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 1981 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1982 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } 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 = "";
1798 $self->{cursor} = 0; 1997 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 1998 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 1999 $self->emit ('escape');
1803 } elsif ($uni) { 2000 } elsif ($uni == 0x0d) {
2001 substr $text, $self->{cursor}++, 0, "\012";
2002 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2003 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2004 } else {
1806 return 0; 2005 return 0;
1807 } 2006 }
1808 2007
1809 $self->_set_text ($text); 2008 $self->_set_text ($text);
1810 2009
1811 $self->realloc; 2010 $self->realloc;
2011 $self->update;
1812 2012
1813 1 2013 1
1814} 2014}
1815 2015
1816sub invoke_focus_in { 2016sub invoke_focus_in {
… …
1828 2028
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2029 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2030
1831 # byte-index to char-index 2031 # byte-index to char-index
1832 my $text = $self->{text}; 2032 my $text = $self->{text};
1833 utf8::encode $text; 2033 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2034 $self->{cursor} = length $text;
1835 2035
1836 $self->_set_text ($self->{text}); 2036 $self->_set_text ($self->{text});
1837 $self->update; 2037 $self->update;
1838 2038
1839 1 2039 1
… …
1878 utf8::encode $text; 2078 utf8::encode $text;
1879 2079
1880 @$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)
1881 } 2081 }
1882 2082
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2083 glBegin GL_LINES;
1885 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};
1886 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};
1887 glEnd; 2086 glEnd;
1888 } 2087 }
1889} 2088}
1890 2089
2090#############################################################################
2091
1891package CFClient::UI::Entry; 2092package CFPlus::UI::Entry;
1892 2093
1893our @ISA = CFClient::UI::EntryBase::; 2094our @ISA = CFPlus::UI::EntryBase::;
1894 2095
1895use CFClient::OpenGL; 2096use CFPlus::OpenGL;
1896 2097
1897sub invoke_key_down { 2098sub invoke_key_down {
1898 my ($self, $ev) = @_; 2099 my ($self, $ev) = @_;
1899 2100
1900 my $sym = $ev->{sym}; 2101 my $sym = $ev->{sym};
1901 2102
1902 if ($sym == 13) { 2103 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2104 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2105 my $txt = $self->get_text;
1905 2106
1906 $self->{history_pointer} = -1; 2107 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2108 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2109 $self->emit (activate => $txt);
1909 $self->update; 2110 $self->update;
1910 2111
1911 } elsif ($sym == CFClient::SDLK_UP) { 2112 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2113 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2114 $self->{history_saveback} = $self->get_text;
1914 } 2115 }
1915 if (@{$self->{history} || []} > 0) { 2116 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2117 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2119 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2120 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2121 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2122 }
1922 2123
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2124 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2125 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2126 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2127
1927 if ($self->{history_pointer} >= 0) { 2128 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2129 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2138 1
1938} 2139}
1939 2140
1940############################################################################# 2141#############################################################################
1941 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
1942package CFClient::UI::Button; 2182package CFPlus::UI::Button;
1943 2183
1944our @ISA = CFClient::UI::Label::; 2184our @ISA = CFPlus::UI::Label::;
1945 2185
1946use CFClient::OpenGL; 2186use CFPlus::OpenGL;
1947 2187
1948my @tex = 2188my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2190 qw(b1_button_active.png);
1951 2191
1952sub new { 2192sub new {
1953 my $class = shift; 2193 my $class = shift;
1954 2194
… …
1991 $self->SUPER::_draw; 2231 $self->SUPER::_draw;
1992} 2232}
1993 2233
1994############################################################################# 2234#############################################################################
1995 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
1996package CFClient::UI::ImageButton; 2385package CFPlus::UI::ImageButton;
1997 2386
1998our @ISA = CFClient::UI::Image::; 2387our @ISA = CFPlus::UI::Image::;
1999 2388
2000use CFClient::OpenGL; 2389use CFPlus::OpenGL;
2001 2390
2002my %textures; 2391my %textures;
2003 2392
2004sub new { 2393sub new {
2005 my $class = shift; 2394 my $class = shift;
… …
2027 1 2416 1
2028} 2417}
2029 2418
2030############################################################################# 2419#############################################################################
2031 2420
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2421package CFPlus::UI::VGauge;
2101 2422
2102our @ISA = CFClient::UI::Base::; 2423our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2424
2163use List::Util qw(min max); 2425use List::Util qw(min max);
2164 2426
2165use CFClient::OpenGL; 2427use CFPlus::OpenGL;
2166 2428
2167my %tex = ( 2429my %tex = (
2168 food => [ 2430 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2432 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2433 ],
2172 grace => [ 2434 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2435 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2436 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2437 ],
2176 hp => [ 2438 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2439 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2440 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2441 ],
2180 mana => [ 2442 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2444 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2445 ],
2184); 2446);
2185 2447
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2448# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2508 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2509 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2510
2249 my $h1 = $self->{h} * (1 - $ycut1); 2511 my $h1 = $self->{h} * (1 - $ycut1);
2250 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);
2251 2516
2252 glEnable GL_BLEND; 2517 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2518 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2519 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
… …
2274 2539
2275 if ($t3) { 2540 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2541 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2542 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2543 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2544 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2545 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2546 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2547 glEnd;
2283 } 2548 }
2284 2549
2285 glDisable GL_BLEND; 2550 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2551 glDisable GL_TEXTURE_2D;
2287} 2552}
2288 2553
2289############################################################################# 2554#############################################################################
2290 2555
2291package CFClient::UI::Gauge; 2556package CFPlus::UI::Gauge;
2292 2557
2293our @ISA = CFClient::UI::VBox::; 2558our @ISA = CFPlus::UI::VBox::;
2294 2559
2295sub new { 2560sub new {
2296 my ($class, %arg) = @_; 2561 my ($class, %arg) = @_;
2297 2562
2298 my $self = $class->SUPER::new ( 2563 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2565 can_hover => 1,
2301 can_events => 1, 2566 can_events => 1,
2302 %arg, 2567 %arg,
2303 ); 2568 );
2304 2569
2305 $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");
2306 $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);
2307 $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");
2308 2573
2309 $self 2574 $self
2310} 2575}
2311 2576
2312sub set_fontsize { 2577sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2598 $self->{value}->set_text ($val);
2334} 2599}
2335 2600
2336############################################################################# 2601#############################################################################
2337 2602
2338package CFClient::UI::Slider; 2603package CFPlus::UI::Slider;
2339 2604
2340use strict; 2605use strict;
2341 2606
2342use CFClient::OpenGL; 2607use CFPlus::OpenGL;
2343 2608
2344our @ISA = CFClient::UI::DrawBG::; 2609our @ISA = CFPlus::UI::DrawBG::;
2345 2610
2346my @tex = 2611my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2613 qw(s1_slider.png s1_slider_bg.png);
2349 2614
2350sub new { 2615sub new {
2351 my $class = shift; 2616 my $class = shift;
2352 2617
… …
2441 } 2706 }
2442 2707
2443 1 2708 1
2444} 2709}
2445 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
2446sub update { 2723sub update {
2447 my ($self) = @_; 2724 my ($self) = @_;
2448 2725
2449 delete $self->{knob_w}; 2726 delete $self->{knob_w};
2450 $self->SUPER::update; 2727 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2498} 2775}
2499 2776
2500############################################################################# 2777#############################################################################
2501 2778
2502package CFClient::UI::ValSlider; 2779package CFPlus::UI::ValSlider;
2503 2780
2504our @ISA = CFClient::UI::HBox::; 2781our @ISA = CFPlus::UI::HBox::;
2505 2782
2506sub new { 2783sub new {
2507 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2508 2785
2509 my $range = delete $arg{range}; 2786 my $range = delete $arg{range};
2510 2787
2511 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2789 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2790 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2791 to_value => sub { shift },
2515 from_value => sub { shift }, 2792 from_value => sub { shift },
2516 %arg, 2793 %arg,
2517 ); 2794 );
2518 2795
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2815sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2816sub set_value { shift->{slider}->set_value (@_) }
2540 2817
2541############################################################################# 2818#############################################################################
2542 2819
2543package CFClient::UI::TextScroller; 2820package CFPlus::UI::TextScroller;
2544 2821
2545our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2546 2823
2547use CFClient::OpenGL; 2824use CFPlus::OpenGL;
2548 2825
2549sub new { 2826sub new {
2550 my $class = shift; 2827 my $class = shift;
2551 2828
2552 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2553 fontsize => 1, 2830 fontsize => 1,
2554 can_events => 0, 2831 can_events => 1,
2555 indent => 0, 2832 indent => 0,
2556 #font => default_font 2833 #font => default_font
2557 @_, 2834 @_,
2558 2835
2559 layout => (new CFClient::Layout 1), 2836 layout => (new CFPlus::Layout),
2560 par => [], 2837 par => [],
2838 max_par => 0,
2561 height => 0, 2839 height => 0,
2562 children => [ 2840 children => [
2563 (new CFClient::UI::Empty expand => 1), 2841 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2842 (new CFPlus::UI::Slider vertical => 1),
2565 ], 2843 ],
2566 ); 2844 );
2567 2845
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 2846 $self->{children}[1]->connect (changed => sub { $self->update });
2569 2847
… …
2599 2877
2600 $self->reflow; 2878 $self->reflow;
2601 2879
2602 local $self->{children} = [$empty, $slider]; 2880 local $self->{children} = [$empty, $slider];
2603 $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
2604} 2892}
2605 2893
2606sub get_layout { 2894sub get_layout {
2607 my ($self, $para) = @_; 2895 my ($self, $para) = @_;
2608 2896
… …
2636 2924
2637 # todo: base offset on lines or so, not on pixels 2925 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset); 2926 $self->{children}[1]->set_value ($offset);
2639} 2927}
2640 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
2641sub clear { 2944sub clear {
2642 my ($self) = @_; 2945 my ($self) = @_;
2643 2946
2644 my (undef, undef, @other) = @{ $self->{children} }; 2947 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other; 2948 $self->remove ($_) for @other;
… …
2648 $self->{height} = 0; 2951 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2952 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 2953}
2651 2954
2652sub add_paragraph { 2955sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 2956 my $self = shift;
2654 2957
2655 my ($text, @w) = ref $para ? @$para : $para; 2958 for my $para (@_) {
2656
2657 $para = { 2959 $para = {
2960 fg => [1, 1, 1, 1],
2961 indent => 0,
2962 markup => "",
2963 widget => [],
2964 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 2965 w => 1e10,
2659 wrapped => 1, 2966 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 2967 };
2665 2968
2666 $self->add (@w) if @w; 2969 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 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 }
2668 2976
2669 $self->{need_reflow}++; 2977 $self->{need_reflow}++;
2670 $self->update; 2978 $self->update;
2671} 2979}
2672 2980
2673sub scroll_to_bottom { 2981sub scroll_to_bottom {
2674 my ($self) = @_; 2982 my ($self) = @_;
2675 2983
2676 $self->{scroll_to_bottom} = 1; 2984 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 2985 $self->update;
2678} 2986}
2679 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
2680sub update { 3021sub update {
2681 my ($self) = @_; 3022 my ($self) = @_;
2682 3023
2683 $self->SUPER::update; 3024 $self->SUPER::update;
2684 3025
2685 return unless $self->{h} > 0; 3026 return unless $self->{h} > 0;
2686 3027
2687 delete $self->{texture}; 3028 delete $self->{texture};
2688 3029
2689 $ROOT->on_post_alloc ($self => sub { 3030 $ROOT->on_post_alloc ($self => sub {
3031 $self->force_uptodate;
3032
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3034
2692 if (delete $self->{need_reflow}) {
2693 my $height = 0;
2694
2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2707
2708 $self->{height} = $height;
2709
2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3036 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3037 glClear GL_COLOR_BUFFER_BIT;
2722 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;
2723 my $top = int $self->{children}[1]{range}[0]; 3047 my $top = int $self->{children}[1]{range}[0];
2724 3048
2725 my $y0 = $top; 3049 my $y0 = $top;
2726 my $y1 = $top + $H; 3050 my $y1 = $top + $H;
2727 3051
2728 my $y = 0;
2729
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 3052 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3053 my $h = $para->{h};
3054 my $y = $para->{y};
2736 3055
2737 if ($y0 < $y + $h && $y < $y1) { 3056 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3057 my $layout = $self->get_layout ($para);
2740 3058
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3059 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 3060
2746 if (my @w = @{ $para->{widget} }) { 3061 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3062 my @s = $layout->get_shapes;
2748 3063
2749 glDisable GL_BLEND;
2750 for (@w) { 3064 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3065 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3066
2753 $_->{x} = $dx + $para->{indent}; 3067 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3068 $_->{y} = $dy + $y - $y0;
2755 3069
2756 $_->draw; 3070 $_->draw;
2757 } 3071 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3072 }
2761 } 3073 }
2762 3074
2763 $y += $h; 3075 $paridx++;
3076 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3077 }
2765 3078
2766 glDisable GL_BLEND; 3079 $self->{top_paragraph} = $top_paragraph;
2767 }; 3080 };
2768 }); 3081 });
2769} 3082}
2770 3083
2771sub reconfigure { 3084sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3102 $self->{children}[1]->draw;
2790} 3103}
2791 3104
2792############################################################################# 3105#############################################################################
2793 3106
2794package CFClient::UI::Animator; 3107package CFPlus::UI::Animator;
2795 3108
2796use CFClient::OpenGL; 3109use CFPlus::OpenGL;
2797 3110
2798our @ISA = CFClient::UI::Bin::; 3111our @ISA = CFPlus::UI::Bin::;
2799 3112
2800sub moveto { 3113sub moveto {
2801 my ($self, $x, $y) = @_; 3114 my ($self, $x, $y) = @_;
2802 3115
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3116 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3144 glPopMatrix;
2832} 3145}
2833 3146
2834############################################################################# 3147#############################################################################
2835 3148
2836package CFClient::UI::Flopper; 3149package CFPlus::UI::Flopper;
2837 3150
2838our @ISA = CFClient::UI::Button::; 3151our @ISA = CFPlus::UI::Button::;
2839 3152
2840sub new { 3153sub new {
2841 my $class = shift; 3154 my $class = shift;
2842 3155
2843 my $self = $class->SUPER::new ( 3156 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3168 $self->{other}->toggle_visibility;
2856} 3169}
2857 3170
2858############################################################################# 3171#############################################################################
2859 3172
2860package CFClient::UI::Tooltip; 3173package CFPlus::UI::Tooltip;
2861 3174
2862our @ISA = CFClient::UI::Bin::; 3175our @ISA = CFPlus::UI::Bin::;
2863 3176
2864use CFClient::OpenGL; 3177use CFPlus::OpenGL;
2865 3178
2866sub new { 3179sub new {
2867 my $class = shift; 3180 my $class = shift;
2868 3181
2869 $class->SUPER::new ( 3182 $class->SUPER::new (
… …
2872 ) 3185 )
2873} 3186}
2874 3187
2875sub set_tooltip_from { 3188sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3189 my ($self, $widget) = @_;
3190
3191 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192 if $widget->{tooltip} =~ /^#(.*)$/;
2877 3193
2878 my $tooltip = $widget->{tooltip}; 3194 my $tooltip = $widget->{tooltip};
2879 3195
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3196 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3197 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2885 } 3201 }
2886 3202
2887 $tooltip =~ s/^\n+//; 3203 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3204 $tooltip =~ s/\n+$//;
2889 3205
2890 $self->add (new CFClient::UI::Label 3206 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 3207 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3208 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 3209 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3210 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3211 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3212 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3213 );
2898} 3214}
2899 3215
… …
2918 3234
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3235 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3236 my $widget = $self->{owner}
2921 or return; 3237 or return;
2922 3238
3239 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3240 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3241
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3242 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3243 if $x + $self->{w} > $self->{root}{w};
2927 3244
2928 $self->move_abs ($x, $y); 3245 $self->move_abs ($x, $y);
3246 } else {
3247 $self->hide;
3248 }
2929 }); 3249 });
2930} 3250}
2931 3251
2932sub _draw { 3252sub _draw {
2933 my ($self) = @_; 3253 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3277 $self->SUPER::_draw;
2958} 3278}
2959 3279
2960############################################################################# 3280#############################################################################
2961 3281
2962package CFClient::UI::Face; 3282package CFPlus::UI::Face;
2963 3283
2964our @ISA = CFClient::UI::Base::; 3284our @ISA = CFPlus::UI::DrawBG::;
2965 3285
2966use CFClient::OpenGL; 3286use CFPlus::OpenGL;
2967 3287
2968sub new { 3288sub new {
2969 my $class = shift; 3289 my $class = shift;
2970 3290
2971 my $self = $class->SUPER::new ( 3291 my $self = $class->SUPER::new (
… …
2973 can_events => 0, 3293 can_events => 0,
2974 @_, 3294 @_,
2975 ); 3295 );
2976 3296
2977 if ($self->{anim} && $self->{animspeed}) { 3297 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self); 3298 CFPlus::weaken (my $widget = $self);
2979 3299
2980 $self->{timer} = Event->timer ( 3300 $self->{timer} = Event->timer (
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982 hard => 1, 3302 hard => 1,
2983 interval => $self->{animspeed}, 3303 interval => $self->{animspeed},
… …
3006sub _draw { 3326sub _draw {
3007 my ($self) = @_; 3327 my ($self) = @_;
3008 3328
3009 return unless $::CONN; 3329 return unless $::CONN;
3010 3330
3331 $self->SUPER::_draw;
3332
3011 my $face; 3333 my $face;
3012 3334
3013 if ($self->{frame}) { 3335 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}]; 3336 my $anim = $::CONN->{anim}[$self->{anim}];
3015 3337
… …
3037 $self->SUPER::destroy; 3359 $self->SUPER::destroy;
3038} 3360}
3039 3361
3040############################################################################# 3362#############################################################################
3041 3363
3042package CFClient::UI::Buttonbar; 3364package CFPlus::UI::Buttonbar;
3043 3365
3044our @ISA = CFClient::UI::HBox::; 3366our @ISA = CFPlus::UI::HBox::;
3045 3367
3046# TODO: should actualyl wrap buttons and other goodies. 3368# TODO: should actually wrap buttons and other goodies.
3047 3369
3048############################################################################# 3370#############################################################################
3049 3371
3050package CFClient::UI::Menu; 3372package CFPlus::UI::Menu;
3051 3373
3052our @ISA = CFClient::UI::FancyFrame::; 3374our @ISA = CFPlus::UI::Toplevel::;
3053 3375
3054use CFClient::OpenGL; 3376use CFPlus::OpenGL;
3055 3377
3056sub new { 3378sub new {
3057 my $class = shift; 3379 my $class = shift;
3058 3380
3059 my $self = $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3060 items => [], 3382 items => [],
3061 z => 100, 3383 z => 100,
3062 @_, 3384 @_,
3063 ); 3385 );
3064 3386
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3387 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3388
3067 for my $item (@{ $self->{items} }) { 3389 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3390 my ($widget, $cb, $tooltip) = @$item;
3069 3391
3070 # handle various types of items, only text for now 3392 # handle various types of items, only text for now
3071 if (!ref $widget) { 3393 if (!ref $widget) {
3394 if ($widget =~ /\t/) {
3395 my ($left, $right) = split /\t/, $widget, 2;
3396
3072 $widget = new CFClient::UI::Label 3397 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3398 can_hover => 1,
3074 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,
3075 markup => $widget, 3411 markup => $widget,
3076 tooltip => $tooltip 3412 tooltip => $tooltip;
3413 }
3077 } 3414 }
3078 3415
3079 $self->{item}{$widget} = $item; 3416 $self->{item}{$widget} = $item;
3080 3417
3081 $self->{vbox}->add ($widget); 3418 $self->{vbox}->add ($widget);
… …
3124 1 3461 1
3125} 3462}
3126 3463
3127############################################################################# 3464#############################################################################
3128 3465
3129package CFClient::UI::Multiplexer; 3466package CFPlus::UI::Multiplexer;
3130 3467
3131our @ISA = CFClient::UI::Container::; 3468our @ISA = CFPlus::UI::Container::;
3132 3469
3133sub new { 3470sub new {
3134 my $class = shift; 3471 my $class = shift;
3135 3472
3136 my $self = $class->SUPER::new ( 3473 my $self = $class->SUPER::new (
… …
3150 3487
3151 $self->{current} = $self->{children}[0] 3488 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3489 if @{ $self->{children} };
3153} 3490}
3154 3491
3492sub get_current_page {
3493 my ($self) = @_;
3494
3495 $self->{current}
3496}
3497
3155sub set_current_page { 3498sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3499 my ($self, $page_or_widget) = @_;
3157 3500
3158 my $widget = ref $page_or_widget 3501 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3502 ? $page_or_widget
… …
3191 $self->{current}->draw; 3534 $self->{current}->draw;
3192} 3535}
3193 3536
3194############################################################################# 3537#############################################################################
3195 3538
3196package CFClient::UI::Notebook; 3539package CFPlus::UI::Notebook;
3197 3540
3198our @ISA = CFClient::UI::VBox::; 3541our @ISA = CFPlus::UI::VBox::;
3199 3542
3200sub new { 3543sub new {
3201 my $class = shift; 3544 my $class = shift;
3202 3545
3203 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3547 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3549 # filter => # will be put between multiplexer and $self
3207 @_, 3550 @_,
3208 ); 3551 );
3209 3552
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3214} 3557}
3215 3558
3216sub add { 3559sub add {
3217 my ($self, $title, $widget, $tooltip) = @_; 3560 my ($self, $title, $widget, $tooltip) = @_;
3218 3561
3219 Scalar::Util::weaken $self; 3562 CFPlus::weaken $self;
3220 3563
3221 $self->{buttonbar}->add (new CFClient::UI::Button 3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3222 markup => $title, 3565 markup => $title,
3223 tooltip => $tooltip, 3566 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3567 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3568 );
3226 3569
3227 $self->{multiplexer}->add ($widget); 3570 $self->{multiplexer}->add ($widget);
3228} 3571}
3229 3572
3573sub get_current_page {
3574 my ($self) = @_;
3575
3576 $self->{multiplexer}->get_current_page
3577}
3578
3230sub set_current_page { 3579sub set_current_page {
3231 my ($self, $page) = @_; 3580 my ($self, $page) = @_;
3232 3581
3233 $self->{multiplexer}->set_current_page ($page); 3582 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3583 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3584}
3236 3585
3237############################################################################# 3586#############################################################################
3238 3587
3239package CFClient::UI::Combobox; 3588package CFPlus::UI::Selector;
3240 3589
3241use utf8; 3590use utf8;
3242 3591
3243our @ISA = CFClient::UI::Button::; 3592our @ISA = CFPlus::UI::Button::;
3244 3593
3245sub new { 3594sub new {
3246 my $class = shift; 3595 my $class = shift;
3247 3596
3248 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3614 my ($value, $title, $tooltip) = @$_;
3266 3615
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3616 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3617 }
3269 3618
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3619 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3620}
3272 3621
3273sub _set_value { 3622sub _set_value {
3274 my ($self, $value) = @_; 3623 my ($self, $value) = @_;
3275 3624
… …
3290 $self->emit (changed => $value); 3639 $self->emit (changed => $value);
3291} 3640}
3292 3641
3293############################################################################# 3642#############################################################################
3294 3643
3295package CFClient::UI::Statusbox; 3644package CFPlus::UI::Statusbox;
3296 3645
3297our @ISA = CFClient::UI::VBox::; 3646our @ISA = CFPlus::UI::VBox::;
3298 3647
3299sub new { 3648sub new {
3300 my $class = shift; 3649 my $class = shift;
3301 3650
3302 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3303 fontsize => 0.8, 3652 fontsize => 0.8,
3304 @_, 3653 @_,
3305 ); 3654 );
3306 3655
3307 Scalar::Util::weaken (my $this = $self); 3656 CFPlus::weaken (my $this = $self);
3308 3657
3309 $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 });
3310 3659
3311 $self 3660 $self
3312} 3661}
… …
3314sub reorder { 3663sub reorder {
3315 my ($self) = @_; 3664 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3665 my $NOW = Time::HiRes::time;
3317 3666
3318 # freeze display when hovering over any label 3667 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3668 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3669 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3670 values %{ $self->{item} };
3322 3671
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3672 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3673 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3674 }
… …
3346 for ($short) { 3695 for ($short) {
3347 s/^\s+//; 3696 s/^\s+//;
3348 s/\s+/ /g; 3697 s/\s+/ /g;
3349 } 3698 }
3350 3699
3351 new CFClient::UI::Label 3700 new CFPlus::UI::Label
3352 markup => $short, 3701 markup => $short,
3353 tooltip => $item->{tooltip}, 3702 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3703 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3704 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3705 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3435 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3436} 3785}
3437 3786
3438############################################################################# 3787#############################################################################
3439 3788
3440package CFClient::UI::Inventory;
3441
3442our @ISA = CFClient::UI::ScrolledWindow::;
3443
3444sub new {
3445 my $class = shift;
3446
3447 my $self = $class->SUPER::new (
3448 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3449 @_,
3450 );
3451
3452 $self
3453}
3454
3455sub set_items {
3456 my ($self, $items) = @_;
3457
3458 $self->{child}->clear;
3459 return unless $items;
3460
3461 my @items = sort {
3462 ($a->{type} <=> $b->{type})
3463 or ($a->{name} cmp $b->{name})
3464 } values %$items;
3465
3466 $self->{real_items} = \@items;
3467
3468 my $row = 0;
3469 for my $item (@items) {
3470 CFClient::Item::update_widgets $item;
3471
3472 $self->{child}->add (0, $row, $item->{face_widget});
3473 $self->{child}->add (1, $row, $item->{desc_widget});
3474 $self->{child}->add (2, $row, $item->{weight_widget});
3475
3476 $row++;
3477 }
3478}
3479
3480#############################################################################
3481
3482package CFClient::UI::SpellList;
3483
3484our @ISA = CFClient::UI::Table::;
3485
3486sub new {
3487 my $class = shift;
3488
3489 my $self = $class->SUPER::new (
3490 binding => [],
3491 commands => [],
3492 @_,
3493 )
3494}
3495
3496my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3497
3498my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3500my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3504my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3506my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3507 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511
3512 $CFClient::UI::ROOT->on_refresh ($self => sub {
3513 $self->clear;
3514
3515 return unless $::CONN;
3516
3517 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3518 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3519 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3520 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3521 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3522
3523 my $row = 0;
3524
3525 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3526 my $spell = $self->{spell}{$_};
3527
3528 $row++;
3529
3530 my $spell_cb = sub {
3531 my ($widget, $ev) = @_;
3532
3533 if ($ev->{button} == 1) {
3534 $::CONN->user_send ("cast $spell->{name}");
3535 } elsif ($ev->{button} == 2) {
3536 $::CONN->user_send ("invoke $spell->{name}");
3537 } elsif ($ev->{button} == 3) {
3538 (new CFClient::UI::Menu
3539 items => [
3540 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3541 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3542 ],
3543 )->popup ($ev);
3544 } else {
3545 return 0;
3546 }
3547
3548 1
3549 };
3550
3551 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3552
3553 #TODO: add path info to tooltip
3554 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3555
3556 $self->add (0, $row, new CFClient::UI::Face
3557 face => $spell->{face},
3558 can_hover => 1,
3559 can_events => 1,
3560 tooltip => $tooltip,
3561 on_button_down => $spell_cb,
3562 );
3563
3564 $self->add (1, $row, new CFClient::UI::Label
3565 expand => 1,
3566 text => $spell->{name},
3567 can_hover => 1,
3568 can_events => 1,
3569 tooltip => $tooltip,
3570 on_button_down => $spell_cb,
3571 );
3572
3573 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3574 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3575 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3576 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3577 }
3578 });
3579}
3580
3581sub add_spell {
3582 my ($self, $spell) = @_;
3583
3584 $self->{spell}->{$spell->{name}} = $spell;
3585 $self->rebuild_spell_list;
3586}
3587
3588sub remove_spell {
3589 my ($self, $spell) = @_;
3590
3591 delete $self->{spell}->{$spell->{name}};
3592 $self->rebuild_spell_list;
3593}
3594
3595sub clear_spells {
3596 my ($self) = @_;
3597
3598 $self->{spell} = {};
3599 $self->rebuild_spell_list;
3600}
3601
3602#############################################################################
3603
3604package CFClient::UI::Root; 3789package CFPlus::UI::Root;
3605 3790
3606our @ISA = CFClient::UI::Container::; 3791our @ISA = CFPlus::UI::Container::;
3607 3792
3608use List::Util qw(min max); 3793use List::Util qw(min max);
3609 3794
3610use CFClient::OpenGL; 3795use CFPlus::OpenGL;
3611 3796
3612sub new { 3797sub new {
3613 my $class = shift; 3798 my $class = shift;
3614 3799
3615 my $self = $class->SUPER::new ( 3800 my $self = $class->SUPER::new (
3616 visible => 1, 3801 visible => 1,
3617 @_, 3802 @_,
3618 ); 3803 );
3619 3804
3620 Scalar::Util::weaken ($self->{root} = $self); 3805 CFPlus::weaken ($self->{root} = $self);
3621 3806
3622 $self 3807 $self
3623} 3808}
3624 3809
3625sub size_request { 3810sub size_request {
… …
3791 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3792 3977
3793 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3794 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3795 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
3796 $w = int $w + 0.5; 3990 $w = int $w + 0.5;
3797 $h = int $h + 0.5; 3991 $h = int $h + 0.5;
3798 3992
3799 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}) {
3800 $widget->{old_w} = $widget->{w}; 3994 $widget->{old_w} = $widget->{w};
… …
3823 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4017 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3824 glMatrixMode GL_MODELVIEW; 4018 glMatrixMode GL_MODELVIEW;
3825 glLoadIdentity; 4019 glLoadIdentity;
3826 4020
3827 { 4021 {
3828 package CFClient::UI::Base; 4022 package CFPlus::UI::Base;
3829 4023
3830 ($draw_x, $draw_y, $draw_w, $draw_h) = 4024 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3831 (0, 0, $self->{w}, $self->{h}); 4025 (0, 0, $self->{w}, $self->{h});
3832 }
3833 4026
3834 $self->_draw; 4027 $self->_draw;
4028 }
3835} 4029}
3836 4030
3837############################################################################# 4031#############################################################################
3838 4032
3839package CFClient::UI; 4033package CFPlus::UI;
3840 4034
3841$ROOT = new CFClient::UI::Root; 4035$ROOT = new CFPlus::UI::Root;
3842$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4036$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3843 4037
38441 40381
3845 4039

Diff Legend

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