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

Diff Legend

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