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.307 by root, Sun Jun 18 19:13: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 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 525 # I do not really like this solution, but I do not like duplication
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
476 ($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
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 542 $self->{parent} && $self->{parent}->emit ($signal, @args)
478} 543}
479 544
480sub find_widget { 545sub find_widget {
481 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
482 547
… …
490} 555}
491 556
492sub set_parent { 557sub set_parent {
493 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
494 559
495 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible}; 561 $self->set_visible if $parent->{visible};
497} 562}
498 563
499sub realloc { 564sub realloc {
500 my ($self) = @_; 565 my ($self) = @_;
… …
534 return unless $self->{h} && $self->{w}; 599 return unless $self->{h} && $self->{w};
535 600
536 # update screen rectangle 601 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 602 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 603 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 604
542 # skip widgets that are entirely outside the drawing area 605 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 608
… …
568 glVertex $self->{w} - 1, 0; 631 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1; 632 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1; 633 glVertex 0 , $self->{h} - 1;
571 glEnd; 634 glEnd;
572 glPopMatrix; 635 glPopMatrix;
573 #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;
574 } 637 }
575 638
576 $self->_draw; 639 $self->_draw;
577 glPopMatrix; 640 glPopMatrix;
578} 641}
… …
581 my ($self) = @_; 644 my ($self) = @_;
582 645
583 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
584} 647}
585 648
649my $cntx;#d#
586sub DESTROY { 650sub DESTROY {
587 my ($self) = @_; 651 my ($self) = @_;
588 652
589 delete $WIDGET{$self+0}; 653 return if CFPlus::in_destruct;
590 654
591 eval { $self->destroy }; 655 eval { $self->destroy };
592 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};
593} 659}
594 660
595############################################################################# 661#############################################################################
596 662
597package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
598 664
599our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
600 666
601use strict; 667use strict;
602use CFClient::OpenGL; 668use CFPlus::OpenGL;
603 669
604sub new { 670sub new {
605 my $class = shift; 671 my $class = shift;
606 672
607 # range [value, low, high, page] 673 # range [value, low, high, page]
… …
638 } 704 }
639} 705}
640 706
641############################################################################# 707#############################################################################
642 708
643package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
644 710
645our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
646 712
647sub new { 713sub new {
648 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
649 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
650} 716}
… …
657 723
658sub draw { } 724sub draw { }
659 725
660############################################################################# 726#############################################################################
661 727
662package CFClient::UI::Container; 728package CFPlus::UI::Container;
663 729
664our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
665 731
666sub new { 732sub new {
667 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
668 734
669 my $children = delete $arg{children}; 735 my $children = delete $arg{children};
… …
678 if $children; 744 if $children;
679 745
680 $self 746 $self
681} 747}
682 748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
755}
756
683sub add { 757sub add {
684 my ($self, @widgets) = @_; 758 my ($self, @widgets) = @_;
685 759
686 $_->set_parent ($self) 760 $_->set_parent ($self)
687 for @widgets; 761 for @widgets;
… …
747 $_->draw for @{$self->{children}}; 821 $_->draw for @{$self->{children}};
748} 822}
749 823
750############################################################################# 824#############################################################################
751 825
752package CFClient::UI::Bin; 826package CFPlus::UI::Bin;
753 827
754our @ISA = CFClient::UI::Container::; 828our @ISA = CFPlus::UI::Container::;
755 829
756sub new { 830sub new {
757 my ($class, %arg) = @_; 831 my ($class, %arg) = @_;
758 832
759 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
760 834
761 $class->SUPER::new (children => [$child], %arg) 835 $class->SUPER::new (children => [$child], %arg)
762} 836}
763 837
764sub add { 838sub add {
… …
771sub remove { 845sub remove {
772 my ($self, $widget) = @_; 846 my ($self, $widget) = @_;
773 847
774 $self->SUPER::remove ($widget); 848 $self->SUPER::remove ($widget);
775 849
776 $self->{children} = [new CFClient::UI::Empty] 850 $self->{children} = [new CFPlus::UI::Empty]
777 unless @{$self->{children}}; 851 unless @{$self->{children}};
778} 852}
779 853
780sub child { $_[0]->{children}[0] } 854sub child { $_[0]->{children}[0] }
781 855
… …
793 867
794############################################################################# 868#############################################################################
795 869
796# back-buffered drawing area 870# back-buffered drawing area
797 871
798package CFClient::UI::Window; 872package CFPlus::UI::Window;
799 873
800our @ISA = CFClient::UI::Bin::; 874our @ISA = CFPlus::UI::Bin::;
801 875
802use CFClient::OpenGL; 876use CFPlus::OpenGL;
803 877
804sub new { 878sub new {
805 my ($class, %arg) = @_; 879 my ($class, %arg) = @_;
806 880
807 my $self = $class->SUPER::new (%arg); 881 my $self = $class->SUPER::new (%arg);
… …
829} 903}
830 904
831sub render_child { 905sub render_child {
832 my ($self) = @_; 906 my ($self) = @_;
833 907
834 $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 {
835 glClearColor 0, 0, 0, 0; 909 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
837 911
838 { 912 {
839 package CFClient::UI::Base; 913 package CFPlus::UI::Base;
840 914
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
843 } 919 }
844
845 $self->_render;
846 }; 920 };
847} 921}
848 922
849sub _draw { 923sub _draw {
850 my ($self) = @_; 924 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 925
854 my $tex = $self->{texture} 926 my $tex = $self->{texture}
855 or return; 927 or return;
856 928
857 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
860 932
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
862 934
863 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
864} 936}
865 937
866############################################################################# 938#############################################################################
867 939
868package CFClient::UI::ViewPort; 940package CFPlus::UI::ViewPort;
869 941
870our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
871 943
872sub new { 944sub new {
873 my $class = shift; 945 my $class = shift;
874 946
875 $class->SUPER::new ( 947 $class->SUPER::new (
… …
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) { 1009 ) {
938 $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})
939 } else { 1011 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
941 } 1013 }
942} 1014}
943 1015
944sub _render { 1016sub _render {
945 my ($self) = @_; 1017 my ($self) = @_;
946 1018
947 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};
948 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};
949 1021
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951 1023
952 $self->SUPER::_render; 1024 $self->SUPER::_render;
953} 1025}
954 1026
955############################################################################# 1027#############################################################################
956 1028
957package CFClient::UI::ScrolledWindow; 1029package CFPlus::UI::ScrolledWindow;
958 1030
959our @ISA = CFClient::UI::HBox::; 1031our @ISA = CFPlus::UI::HBox::;
960 1032
961sub new { 1033sub new {
962 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
963 1035
964 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
965 1037
966 my $self; 1038 my $self;
967 1039
968 my $slider = new CFClient::UI::Slider 1040 my $slider = new CFPlus::UI::Slider
969 vertical => 1, 1041 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix 1042 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub { 1043 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]); 1044 $self->{vp}->set_offset (0, $_[1]);
973 }, 1045 },
974 ; 1046 ;
975 1047
976 $self = $class->SUPER::new ( 1048 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
978 slider => $slider, 1051 slider => $slider,
979 %arg, 1052 %arg,
980 ); 1053 );
981 1054
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1055 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child; 1056 $self->add ($child) if $child;
984 1057
985 $self 1058 $self
986} 1059}
987 1060
1061#TODO# update range on size_allocate depending on child
1062
988sub add { 1063sub add {
989 my ($self, $widget) = @_; 1064 my ($self, $widget) = @_;
990 1065
991 $self->{vp}->add ($self->{child} = $widget); 1066 $self->{vp}->add ($self->{child} = $widget);
992} 1067}
993 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
994sub update { 1085sub update {
995 my ($self) = @_; 1086 my ($self) = @_;
996 1087
997 $self->SUPER::update; 1088 $self->SUPER::update;
998 1089
999 # todo: overwrite size_allocate of child 1090 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1091}
1003 1092
1004sub invoke_size_allocate { 1093sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1094 my ($self, $w, $h) = @_;
1006 1095
1007 my $child = $self->{vp}->child; 1096 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1097
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1098 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1099}
1012 1100
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016############################################################################# 1101#############################################################################
1017 1102
1018package CFClient::UI::Frame; 1103package CFPlus::UI::Frame;
1019 1104
1020our @ISA = CFClient::UI::Bin::; 1105our @ISA = CFPlus::UI::Bin::;
1021 1106
1022use CFClient::OpenGL; 1107use CFPlus::OpenGL;
1023 1108
1024sub new { 1109sub new {
1025 my $class = shift; 1110 my $class = shift;
1026 1111
1027 $class->SUPER::new ( 1112 $class->SUPER::new (
… …
1053 $self->SUPER::_draw; 1138 $self->SUPER::_draw;
1054} 1139}
1055 1140
1056############################################################################# 1141#############################################################################
1057 1142
1058package CFClient::UI::FancyFrame; 1143package CFPlus::UI::FancyFrame;
1059 1144
1060our @ISA = CFClient::UI::Bin::; 1145our @ISA = CFPlus::UI::Bin::;
1061 1146
1062use 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;
1063 1248
1064my $bg = 1249my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1; 1251 mipmap => 1, wrap => 1;
1067 1252
1068my @border = 1253my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1070 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);
1071 1256
1072sub new { 1257sub new {
1073 my ($class, %arg) = @_; 1258 my ($class, %arg) = @_;
1074 1259
1075 my $self = $class->SUPER::new ( 1260 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1261 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1262 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1263 border => 0.6,
1079 can_events => 1, 1264 can_events => 1,
1080 min_w => 16, 1265 min_w => 64,
1081 min_h => 16, 1266 min_h => 32,
1082 %arg, 1267 %arg,
1083 ); 1268 );
1084 1269
1085 $self->{title_widget} = new CFClient::UI::Label 1270 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1271 align => 0,
1087 valign => 1, 1272 valign => 1,
1088 text => $self->{title}, 1273 text => $self->{title},
1089 fontsize => $self->{border}, 1274 fontsize => $self->{border},
1090 if exists $self->{title}; 1275 if exists $self->{title};
1091 1276
1092 if ($self->{has_close_button}) { 1277 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1278 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1279 new CFPlus::UI::ImageButton
1095 image => 'x1_close.png', 1280 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1281 on_activate => sub { $self->emit ("delete") };
1097 1282
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1099 } 1284 }
1100 1285
1101 $self 1286 $self
1102} 1287}
1103 1288
1104sub add { 1289sub add {
1105 my ($self, @widgets) = @_; 1290 my ($self, @widgets) = @_;
1106 1291
1107 $self->SUPER::add (@widgets); 1292 $self->SUPER::add (@widgets);
1108 $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};
1109 $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};
1110} 1295}
1111 1296
1112sub border { 1297sub border {
1113 int $_[0]{border} * $::FONTSIZE 1298 int $_[0]{border} * $::FONTSIZE
1114} 1299}
… …
1147 $self->child->configure ($border, $border, $w, $h); 1332 $self->child->configure ($border, $border, $w, $h);
1148 1333
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1335 if $self->{close_button};
1151 1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1344
1152 1 1345 1
1153} 1346}
1154 1347
1155sub invoke_button_down { 1348sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
… …
1214 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215 1408
1216 ! ! $self->{motion} 1409 ! ! $self->{motion}
1217} 1410}
1218 1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
1418}
1419
1219sub _draw { 1420sub _draw {
1220 my ($self) = @_; 1421 my ($self) = @_;
1221 1422
1222 my $child = $self->{children}[0]; 1423 my $child = $self->{children}[0];
1223 1424
… …
1260 if $self->{close_button}; 1461 if $self->{close_button};
1261} 1462}
1262 1463
1263############################################################################# 1464#############################################################################
1264 1465
1265package CFClient::UI::Table; 1466package CFPlus::UI::Table;
1266 1467
1267our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
1268 1469
1269use List::Util qw(max sum); 1470use List::Util qw(max sum);
1270 1471
1271use CFClient::OpenGL; 1472use CFPlus::OpenGL;
1272 1473
1273sub new { 1474sub new {
1274 my $class = shift; 1475 my $class = shift;
1275 1476
1276 $class->SUPER::new ( 1477 $class->SUPER::new (
… …
1282sub children { 1483sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284} 1485}
1285 1486
1286sub add { 1487sub add {
1287 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
1288 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1289 $child->set_parent ($self); 1492 $child->set_parent ($self);
1290 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
1291 1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1292 $self->realloc; 1498 $self->realloc;
1293} 1499}
1294 1500
1295sub remove { 1501sub remove {
1296 my ($self, $child) = @_; 1502 my ($self, $child) = @_;
… …
1361 1567
1362 # linearly scale sizes 1568 # linearly scale sizes
1363 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365 1571
1366 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1367 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1368 1574
1369 my $y; 1575 my $y;
1370 1576
1371 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1372 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1415 } 1621 }
1416} 1622}
1417 1623
1418############################################################################# 1624#############################################################################
1419 1625
1420package CFClient::UI::Box; 1626package CFPlus::UI::Box;
1421 1627
1422our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1423 1629
1424sub size_request { 1630sub size_request {
1425 my ($self) = @_; 1631 my ($self) = @_;
1426 1632
1427 $self->{vertical} 1633 $self->{vertical}
… …
1437 1643
1438sub invoke_size_allocate { 1644sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1440 1646
1441 my $space = $self->{vertical} ? $h : $w; 1647 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1648 my @children = $self->visible_children;
1443 1649
1444 my @req; 1650 my @req;
1445 1651
1446 if ($self->{homogeneous}) { 1652 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1653 @req = ($space / (@children || 1)) x @children;
1448 } else { 1654 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1655 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1656 my $req = List::Util::sum @req;
1451 1657
1452 if ($req > $space) { 1658 if ($req > $space) {
1453 # ah well, not enough space 1659 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1660 $_ *= $space / $req for @req;
1455 } else { 1661 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1662 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1663
1458 $space = ($space - $req) / $expand; # remaining space to give away 1664 $space = ($space - $req) / $expand; # remaining space to give away
1459 1665
1460 $req[$_] += $space * $children->[$_]{expand} 1666 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1667 for 0 .. $#children;
1462 } 1668 }
1463 } 1669 }
1464 1670
1465 CFClient::UI::harmonize \@req; 1671 CFPlus::UI::harmonize \@req;
1466 1672
1467 my $pos = 0; 1673 my $pos = 0;
1468 for (0 .. $#$children) { 1674 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1675 my $alloc = $req[$_];
1470 $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));
1471 1677
1472 $pos += $alloc; 1678 $pos += $alloc;
1473 } 1679 }
1474 1680
1475 1 1681 1
1476} 1682}
1477 1683
1478############################################################################# 1684#############################################################################
1479 1685
1480package CFClient::UI::HBox; 1686package CFPlus::UI::HBox;
1481 1687
1482our @ISA = CFClient::UI::Box::; 1688our @ISA = CFPlus::UI::Box::;
1483 1689
1484sub new { 1690sub new {
1485 my $class = shift; 1691 my $class = shift;
1486 1692
1487 $class->SUPER::new ( 1693 $class->SUPER::new (
… …
1490 ) 1696 )
1491} 1697}
1492 1698
1493############################################################################# 1699#############################################################################
1494 1700
1495package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1496 1702
1497our @ISA = CFClient::UI::Box::; 1703our @ISA = CFPlus::UI::Box::;
1498 1704
1499sub new { 1705sub new {
1500 my $class = shift; 1706 my $class = shift;
1501 1707
1502 $class->SUPER::new ( 1708 $class->SUPER::new (
… …
1505 ) 1711 )
1506} 1712}
1507 1713
1508############################################################################# 1714#############################################################################
1509 1715
1510package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1511 1717
1512our @ISA = CFClient::UI::DrawBG::; 1718our @ISA = CFPlus::UI::DrawBG::;
1513 1719
1514use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1515 1721
1516sub new { 1722sub new {
1517 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1518 1724
1519 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
… …
1522 #active_bg => none 1728 #active_bg => none
1523 #font => default_font 1729 #font => default_font
1524 #text => initial text 1730 #text => initial text
1525 #markup => initial narkup 1731 #markup => initial narkup
1526 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1527 ellipsise => 3, # end 1734 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1529 fontsize => 1, 1736 fontsize => 1,
1530 align => -1, 1737 align => -1,
1531 valign => -1, 1738 valign => -1,
1532 padding_x => 2, 1739 padding_x => 2,
1533 padding_y => 2, 1740 padding_y => 2,
1534 can_events => 0, 1741 can_events => 0,
1535 %arg 1742 %arg
1536 ); 1743 );
1537 1744
1538 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1540 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1748 $self->{template} = $layout;
1542 } 1749 }
1543 1750
1544 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1548 } 1755 }
1549 1756
1550 $self 1757 $self
1551} 1758}
1552 1759
1553sub escape($) {
1554 local $_ = $_[0];
1555
1556 s/&/&amp;/g;
1557 s/>/&gt;/g;
1558 s/</&lt;/g;
1559
1560 $_
1561}
1562
1563sub update { 1760sub update {
1564 my ($self) = @_; 1761 my ($self) = @_;
1565 1762
1566 delete $self->{texture}; 1763 delete $self->{texture};
1567 $self->SUPER::update; 1764 $self->SUPER::update;
… …
1578 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1579 1776
1580 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1582 1779
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1585 1781
1586 delete $self->{size_req}; 1782 delete $self->{size_req};
1587 $self->realloc; 1783 $self->realloc;
1588 $self->update; 1784 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1596 1792
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1794
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1601 1796
1602 delete $self->{size_req}; 1797 delete $self->{size_req};
1603 $self->realloc; 1798 $self->realloc;
1604 $self->update; 1799 $self->update;
… …
1616 1811
1617 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1618 1813
1619 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1620 $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);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1818
1623 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1624 1820
1625 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
… …
1630 }; 1826 };
1631 1827
1632 @{ $self->{size_req} } 1828 @{ $self->{size_req} }
1633} 1829}
1634 1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1635sub invoke_size_allocate { 1835sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1637 1837
1638 delete $self->{ox}; 1838 delete $self->{ox};
1639 1839
… …
1645 1845
1646sub set_fontsize { 1846sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1648 1848
1649 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1650 delete $self->{texture}; 1851 delete $self->{texture};
1651 1852
1652 $self->realloc; 1853 $self->realloc;
1653} 1854}
1654 1855
1655sub reconfigure { 1856sub reconfigure {
1656 my ($self) = @_; 1857 my ($self) = @_;
1657 1858
1658 delete $self->{size_req}; 1859 delete $self->{size_req};
1860 delete $self->{texture};
1659 1861
1660 $self->SUPER::reconfigure; 1862 $self->SUPER::reconfigure;
1661} 1863}
1662 1864
1663sub _draw { 1865sub _draw {
1664 my ($self) = @_; 1866 my ($self) = @_;
1665 1867
1666 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1667 1869
1668 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1877
1676 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1677 }; 1879 };
1678 1880
1679 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1683 1885
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1889 };
1688 1890
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1893
1694 if ($tex->{format} == GL_ALPHA) { 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696 glColor @{$self->{fg}};
1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701 }
1702
1703 glDisable GL_TEXTURE_2D;
1704} 1895}
1705 1896
1706############################################################################# 1897#############################################################################
1707 1898
1708package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1709 1900
1710our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1711 1902
1712use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1713 1904
1714sub new { 1905sub new {
1715 my $class = shift; 1906 my $class = shift;
1716 1907
1717 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1721 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1722 can_hover => 1, 1913 can_hover => 1,
1723 can_focus => 1, 1914 can_focus => 1,
1724 valign => 0, 1915 valign => 0,
1725 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1726 #text => ... 1918 #text => ...
1727 #hidden => "*", 1919 #hidden => "*",
1728 @_ 1920 @_
1729 ) 1921 )
1730} 1922}
… …
1779 1971
1780 if ($uni == 8) { 1972 if ($uni == 8) {
1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1783 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1784 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1785 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1786 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1787 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1788 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1789 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1790 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1791 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1792 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1793 $self->emit ('escape'); 1988 $self->emit ('escape');
1794 } elsif ($uni) { 1989 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1795 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else { 1991 } else {
1797 return 0; 1992 return 0;
1798 } 1993 }
1799 1994
1800 $self->_set_text ($text); 1995 $self->_set_text ($text);
1801 1996
1802 $self->realloc; 1997 $self->realloc;
1998 $self->update;
1803 1999
1804 1 2000 1
1805} 2001}
1806 2002
1807sub invoke_focus_in { 2003sub invoke_focus_in {
… …
1819 2015
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 2016 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 2017
1822 # byte-index to char-index 2018 # byte-index to char-index
1823 my $text = $self->{text}; 2019 my $text = $self->{text};
1824 utf8::encode $text; 2020 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 2021 $self->{cursor} = length $text;
1826 2022
1827 $self->_set_text ($self->{text}); 2023 $self->_set_text ($self->{text});
1828 $self->update; 2024 $self->update;
1829 2025
1830 1 2026 1
… …
1869 utf8::encode $text; 2065 utf8::encode $text;
1870 2066
1871 @$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)
1872 } 2068 }
1873 2069
1874 glColor @{$self->{fg}};
1875 glBegin GL_LINES; 2070 glBegin GL_LINES;
1876 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};
1877 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};
1878 glEnd; 2073 glEnd;
1879 } 2074 }
1880} 2075}
1881 2076
2077#############################################################################
2078
1882package CFClient::UI::Entry; 2079package CFPlus::UI::Entry;
1883 2080
1884our @ISA = CFClient::UI::EntryBase::; 2081our @ISA = CFPlus::UI::EntryBase::;
1885 2082
1886use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1887 2084
1888sub invoke_key_down { 2085sub invoke_key_down {
1889 my ($self, $ev) = @_; 2086 my ($self, $ev) = @_;
1890 2087
1891 my $sym = $ev->{sym}; 2088 my $sym = $ev->{sym};
1892 2089
1893 if ($sym == 13) { 2090 if ($ev->{uni} == 0x0d || $sym == 13) {
1894 unshift @{$self->{history}}, 2091 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 2092 my $txt = $self->get_text;
1896 2093
1897 $self->{history_pointer} = -1; 2094 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2095 $self->{history_saveback} = '';
1899 $self->emit (activate => $txt); 2096 $self->emit (activate => $txt);
1900 $self->update; 2097 $self->update;
1901 2098
1902 } elsif ($sym == CFClient::SDLK_UP) { 2099 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2100 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2101 $self->{history_saveback} = $self->get_text;
1905 } 2102 }
1906 if (@{$self->{history} || []} > 0) { 2103 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2104 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2106 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2107 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2108 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2109 }
1913 2110
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2111 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2112 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2113 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2114
1918 if ($self->{history_pointer} >= 0) { 2115 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2116 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1928 1 2125 1
1929} 2126}
1930 2127
1931############################################################################# 2128#############################################################################
1932 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
1933package CFClient::UI::Button; 2169package CFPlus::UI::Button;
1934 2170
1935our @ISA = CFClient::UI::Label::; 2171our @ISA = CFPlus::UI::Label::;
1936 2172
1937use CFClient::OpenGL; 2173use CFPlus::OpenGL;
1938 2174
1939my @tex = 2175my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2177 qw(b1_button_active.png);
1942 2178
1943sub new { 2179sub new {
1944 my $class = shift; 2180 my $class = shift;
1945 2181
… …
1982 $self->SUPER::_draw; 2218 $self->SUPER::_draw;
1983} 2219}
1984 2220
1985############################################################################# 2221#############################################################################
1986 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
1987package CFClient::UI::ImageButton; 2372package CFPlus::UI::ImageButton;
1988 2373
1989our @ISA = CFClient::UI::Image::; 2374our @ISA = CFPlus::UI::Image::;
1990 2375
1991use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1992 2377
1993my %textures; 2378my %textures;
1994 2379
1995sub new { 2380sub new {
1996 my $class = shift; 2381 my $class = shift;
… …
2018 1 2403 1
2019} 2404}
2020 2405
2021############################################################################# 2406#############################################################################
2022 2407
2023package CFClient::UI::CheckBox;
2024
2025our @ISA = CFClient::UI::DrawBG::;
2026
2027my @tex =
2028 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2029 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2030
2031use CFClient::OpenGL;
2032
2033sub new {
2034 my $class = shift;
2035
2036 $class->SUPER::new (
2037 padding_x => 2,
2038 padding_y => 2,
2039 fg => [1, 1, 1],
2040 active_fg => [1, 1, 0],
2041 bg => [0, 0, 0, 0.2],
2042 active_bg => [1, 1, 1, 0.5],
2043 state => 0,
2044 can_hover => 1,
2045 @_
2046 )
2047}
2048
2049sub size_request {
2050 my ($self) = @_;
2051
2052 (6) x 2
2053}
2054
2055sub invoke_button_down {
2056 my ($self, $ev, $x, $y) = @_;
2057
2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2060 $self->{state} = !$self->{state};
2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
2066 1
2067}
2068
2069sub _draw {
2070 my ($self) = @_;
2071
2072 $self->SUPER::_draw;
2073
2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2075
2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2079
2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2081
2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
2083
2084 glEnable GL_TEXTURE_2D;
2085 $tex->draw_quad_alpha (0, 0, $s, $s);
2086 glDisable GL_TEXTURE_2D;
2087}
2088
2089#############################################################################
2090
2091package CFClient::UI::Image; 2408package CFPlus::UI::VGauge;
2092 2409
2093our @ISA = CFClient::UI::Base::; 2410our @ISA = CFPlus::UI::Base::;
2094
2095use CFClient::OpenGL;
2096use Carp qw/confess/;
2097
2098our %loaded_images;
2099
2100sub new {
2101 my $class = shift;
2102
2103 my $self = $class->SUPER::new (can_events => 0, @_);
2104
2105 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2106
2107 $loaded_images{$self->{image}} ||=
2108 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2109
2110 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2111
2112 Scalar::Util::weaken $loaded_images{$self->{image}};
2113
2114 $self->{aspect} = $tex->{w} / $tex->{h};
2115
2116 $self
2117}
2118
2119sub size_request {
2120 my ($self) = @_;
2121
2122 ($self->{tex}->{w}, $self->{tex}->{h})
2123}
2124
2125sub _draw {
2126 my ($self) = @_;
2127
2128 my $tex = $self->{tex};
2129
2130 my ($w, $h) = ($self->{w}, $self->{h});
2131
2132 if ($self->{rot90}) {
2133 glRotate 90, 0, 0, 1;
2134 glTranslate 0, -$self->{w}, 0;
2135
2136 ($w, $h) = ($h, $w);
2137 }
2138
2139 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141
2142 $tex->draw_quad_alpha (0, 0, $w, $h);
2143
2144 glDisable GL_TEXTURE_2D;
2145}
2146
2147#############################################################################
2148
2149package CFClient::UI::VGauge;
2150
2151our @ISA = CFClient::UI::Base::;
2152 2411
2153use List::Util qw(min max); 2412use List::Util qw(min max);
2154 2413
2155use CFClient::OpenGL; 2414use CFPlus::OpenGL;
2156 2415
2157my %tex = ( 2416my %tex = (
2158 food => [ 2417 food => [
2159 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2419 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161 ], 2420 ],
2162 grace => [ 2421 grace => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 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/
2165 ], 2424 ],
2166 hp => [ 2425 hp => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2427 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169 ], 2428 ],
2170 mana => [ 2429 mana => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 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/
2173 ], 2432 ],
2174); 2433);
2175 2434
2176# eg. VGauge->new (gauge => 'food'), default gauge: food 2435# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2495 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2496 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2497
2239 my $h1 = $self->{h} * (1 - $ycut1); 2498 my $h1 = $self->{h} * (1 - $ycut1);
2240 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);
2241 2503
2242 glEnable GL_BLEND; 2504 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2505 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2506 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2507 glEnable GL_TEXTURE_2D;
… …
2264 2526
2265 if ($t3) { 2527 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2528 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2529 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2530 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2531 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2532 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2533 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2534 glEnd;
2273 } 2535 }
2274 2536
2275 glDisable GL_BLEND; 2537 glDisable GL_BLEND;
2276 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
2277} 2539}
2278 2540
2279############################################################################# 2541#############################################################################
2280 2542
2281package CFClient::UI::Gauge; 2543package CFPlus::UI::Gauge;
2282 2544
2283our @ISA = CFClient::UI::VBox::; 2545our @ISA = CFPlus::UI::VBox::;
2284 2546
2285sub new { 2547sub new {
2286 my ($class, %arg) = @_; 2548 my ($class, %arg) = @_;
2287 2549
2288 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
… …
2290 can_hover => 1, 2552 can_hover => 1,
2291 can_events => 1, 2553 can_events => 1,
2292 %arg, 2554 %arg,
2293 ); 2555 );
2294 2556
2295 $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");
2296 $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);
2297 $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");
2298 2560
2299 $self 2561 $self
2300} 2562}
2301 2563
2302sub set_fontsize { 2564sub set_fontsize {
… …
2323 $self->{value}->set_text ($val); 2585 $self->{value}->set_text ($val);
2324} 2586}
2325 2587
2326############################################################################# 2588#############################################################################
2327 2589
2328package CFClient::UI::Slider; 2590package CFPlus::UI::Slider;
2329 2591
2330use strict; 2592use strict;
2331 2593
2332use CFClient::OpenGL; 2594use CFPlus::OpenGL;
2333 2595
2334our @ISA = CFClient::UI::DrawBG::; 2596our @ISA = CFPlus::UI::DrawBG::;
2335 2597
2336my @tex = 2598my @tex =
2337 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338 qw(s1_slider.png s1_slider_bg.png); 2600 qw(s1_slider.png s1_slider_bg.png);
2339 2601
2340sub new { 2602sub new {
2341 my $class = shift; 2603 my $class = shift;
2342 2604
… …
2431 } 2693 }
2432 2694
2433 1 2695 1
2434} 2696}
2435 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
2436sub update { 2708sub update {
2437 my ($self) = @_; 2709 my ($self) = @_;
2438 2710
2439 delete $self->{knob_w}; 2711 delete $self->{knob_w};
2440 $self->SUPER::update; 2712 $self->SUPER::update;
… …
2487 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2488} 2760}
2489 2761
2490############################################################################# 2762#############################################################################
2491 2763
2492package CFClient::UI::ValSlider; 2764package CFPlus::UI::ValSlider;
2493 2765
2494our @ISA = CFClient::UI::HBox::; 2766our @ISA = CFPlus::UI::HBox::;
2495 2767
2496sub new { 2768sub new {
2497 my ($class, %arg) = @_; 2769 my ($class, %arg) = @_;
2498 2770
2499 my $range = delete $arg{range}; 2771 my $range = delete $arg{range};
2500 2772
2501 my $self = $class->SUPER::new ( 2773 my $self = $class->SUPER::new (
2502 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2774 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2775 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504 to_value => sub { shift }, 2776 to_value => sub { shift },
2505 from_value => sub { shift }, 2777 from_value => sub { shift },
2506 %arg, 2778 %arg,
2507 ); 2779 );
2508 2780
… …
2528sub set_range { shift->{slider}->set_range (@_) } 2800sub set_range { shift->{slider}->set_range (@_) }
2529sub set_value { shift->{slider}->set_value (@_) } 2801sub set_value { shift->{slider}->set_value (@_) }
2530 2802
2531############################################################################# 2803#############################################################################
2532 2804
2533package CFClient::UI::TextScroller; 2805package CFPlus::UI::TextScroller;
2534 2806
2535our @ISA = CFClient::UI::HBox::; 2807our @ISA = CFPlus::UI::HBox::;
2536 2808
2537use CFClient::OpenGL; 2809use CFPlus::OpenGL;
2538 2810
2539sub new { 2811sub new {
2540 my $class = shift; 2812 my $class = shift;
2541 2813
2542 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
2543 fontsize => 1, 2815 fontsize => 1,
2544 can_events => 0, 2816 can_events => 1,
2545 indent => 0, 2817 indent => 0,
2546 #font => default_font 2818 #font => default_font
2547 @_, 2819 @_,
2548 2820
2549 layout => (new CFClient::Layout 1), 2821 layout => (new CFPlus::Layout),
2550 par => [], 2822 par => [],
2551 height => 0, 2823 height => 0,
2552 children => [ 2824 children => [
2553 (new CFClient::UI::Empty expand => 1), 2825 (new CFPlus::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 2826 (new CFPlus::UI::Slider vertical => 1),
2555 ], 2827 ],
2556 ); 2828 );
2557 2829
2558 $self->{children}[1]->connect (changed => sub { $self->update }); 2830 $self->{children}[1]->connect (changed => sub { $self->update });
2559 2831
… …
2565 2837
2566 $self->{fontsize} = $fontsize; 2838 $self->{fontsize} = $fontsize;
2567 $self->reflow; 2839 $self->reflow;
2568} 2840}
2569 2841
2842sub size_request {
2843 my ($self) = @_;
2844
2845 my ($empty, $slider) = @{ $self->{children} };
2846
2847 local $self->{children} = [$empty, $slider];
2848 $self->SUPER::size_request
2849}
2850
2570sub invoke_size_allocate { 2851sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 2852 my ($self, $w, $h) = @_;
2572 2853
2854 my ($empty, $slider, @other) = @{ $self->{children} };
2855 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2856
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2857 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2858 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 2859 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2860 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 2861
2578 $self->reflow; 2862 $self->reflow;
2579 2863
2864 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 2865 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 2866}
2582 2867
2583sub text_size { 2868sub invoke_mouse_wheel {
2584 my ($self, $text, $indent) = @_; 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
2876}
2877
2878sub get_layout {
2879 my ($self, $para) = @_;
2585 2880
2586 my $layout = $self->{layout}; 2881 my $layout = $self->{layout};
2587 2882
2883 $layout->set_font ($self->{font}) if $self->{font};
2884 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2885 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 2886 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2887 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $layout->set_markup ($text); 2888 $layout->set_markup ($para->{markup});
2889
2890 $layout->set_shapes (
2891 map
2892 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2893 @{$para->{widget}}
2592 2894 );
2895
2593 $layout->size 2896 $layout
2594} 2897}
2595 2898
2596sub reflow { 2899sub reflow {
2597 my ($self) = @_; 2900 my ($self) = @_;
2598 2901
… …
2605 2908
2606 # todo: base offset on lines or so, not on pixels 2909 # todo: base offset on lines or so, not on pixels
2607 $self->{children}[1]->set_value ($offset); 2910 $self->{children}[1]->set_value ($offset);
2608} 2911}
2609 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;
2926}
2927
2610sub clear { 2928sub clear {
2611 my ($self) = @_; 2929 my ($self) = @_;
2930
2931 my (undef, undef, @other) = @{ $self->{children} };
2932 $self->remove ($_) for @other;
2612 2933
2613 $self->{par} = []; 2934 $self->{par} = [];
2614 $self->{height} = 0; 2935 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2936 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 2937}
2617 2938
2618sub add_paragraph { 2939sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 2940 my $self = shift;
2620 2941
2621 for my $line (split /\n/, $text) { 2942 for my $para (@_) {
2622 my ($w, $h) = $self->text_size ($line); 2943 $para = {
2944 fg => [1, 1, 1, 1],
2945 indent => 0,
2946 markup => "",
2947 widget => [],
2948 ref $para ? %$para : (markup => $para),
2949 w => 1e10,
2950 wrapped => 1,
2951 };
2952
2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954 push @{$self->{par}}, $para;
2955 }
2956
2957 $self->{need_reflow}++;
2958 $self->update;
2959}
2960
2961sub scroll_to_bottom {
2962 my ($self) = @_;
2963
2964 $self->{scroll_to} = $#{$self->{par}};
2965 $self->update;
2966}
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
2623 $self->{height} += $h; 2990 $self->{height} = $height;
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2991 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625 }
2626 2992
2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 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 }
2628} 2999}
2629 3000
2630sub update { 3001sub update {
2631 my ($self) = @_; 3002 my ($self) = @_;
2632 3003
… …
2635 return unless $self->{h} > 0; 3006 return unless $self->{h} > 0;
2636 3007
2637 delete $self->{texture}; 3008 delete $self->{texture};
2638 3009
2639 $ROOT->on_post_alloc ($self => sub { 3010 $ROOT->on_post_alloc ($self => sub {
3011 $self->force_uptodate;
3012
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3013 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 3014
2642 if (delete $self->{need_reflow}) {
2643 my $height = 0;
2644
2645 my $layout = $self->{layout};
2646
2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2648
2649 for (@{$self->{par}}) {
2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2653 $layout->set_markup ($_->[4]);
2654 my ($w, $h) = $layout->size;
2655 $_->[0] = $w + $_->[3];
2656 $_->[1] = $h;
2657 }
2658
2659 $height += $_->[1];
2660 }
2661
2662 $self->{height} = $height;
2663
2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2665
2666 delete $self->{texture};
2667 }
2668
2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3015 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 3016 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 3017 glClear GL_COLOR_BUFFER_BIT;
2672 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;
2673 my $top = int $self->{children}[1]{range}[0]; 3027 my $top = int $self->{children}[1]{range}[0];
2674 3028
2675 my $y0 = $top; 3029 my $y0 = $top;
2676 my $y1 = $top + $H; 3030 my $y1 = $top + $H;
2677 3031
2678 my $y = 0;
2679
2680 my $layout = $self->{layout};
2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683
2684 glEnable GL_BLEND;
2685 #TODO# not correct in windows where rgba is forced off
2686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2687
2688 for my $par (@{$self->{par}}) { 3032 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 3033 my $h = $para->{h};
3034 my $y = $para->{y};
2690 3035
2691 if ($y0 < $y + $h && $y < $y1) { 3036 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] }); 3037 my $layout = $self->get_layout ($para);
2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2695 $layout->set_markup ($par->[4]);
2696 3038
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3039 $layout->render ($para->{indent}, $y - $y0);
2698 3040
2699 glRasterPos $par->[3], $y - $y0; 3041 if (my @w = @{ $para->{widget} }) {
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3042 my @s = $layout->get_shapes;
3043
3044 for (@w) {
3045 my ($dx, $dy) = splice @s, 0, 2, ();
3046
3047 $_->{x} = $dx + $para->{indent};
3048 $_->{y} = $dy + $y - $y0;
3049
3050 $_->draw;
3051 }
3052 }
2701 } 3053 }
2702 3054
2703 $y += $h; 3055 $paridx++;
3056 $top_paragraph ||= $paridx if $y >= $top;
2704 } 3057 }
2705 3058
2706 glDisable GL_BLEND; 3059 $self->{top_paragraph} = $top_paragraph;
2707 }; 3060 };
2708 }); 3061 });
3062}
3063
3064sub reconfigure {
3065 my ($self) = @_;
3066
3067 $self->SUPER::reconfigure;
3068
3069 $_->{w} = 1e10 for @{ $self->{par} };
3070 $self->reflow;
2709} 3071}
2710 3072
2711sub _draw { 3073sub _draw {
2712 my ($self) = @_; 3074 my ($self) = @_;
2713 3075
… …
2716 glColor 0, 0, 0, 1; 3078 glColor 0, 0, 0, 1;
2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3079 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718 glDisable GL_TEXTURE_2D; 3080 glDisable GL_TEXTURE_2D;
2719 3081
2720 $self->{children}[1]->draw; 3082 $self->{children}[1]->draw;
2721
2722} 3083}
2723 3084
2724############################################################################# 3085#############################################################################
2725 3086
2726package CFClient::UI::Animator; 3087package CFPlus::UI::Animator;
2727 3088
2728use CFClient::OpenGL; 3089use CFPlus::OpenGL;
2729 3090
2730our @ISA = CFClient::UI::Bin::; 3091our @ISA = CFPlus::UI::Bin::;
2731 3092
2732sub moveto { 3093sub moveto {
2733 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2734 3095
2735 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3096 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2763 glPopMatrix; 3124 glPopMatrix;
2764} 3125}
2765 3126
2766############################################################################# 3127#############################################################################
2767 3128
2768package CFClient::UI::Flopper; 3129package CFPlus::UI::Flopper;
2769 3130
2770our @ISA = CFClient::UI::Button::; 3131our @ISA = CFPlus::UI::Button::;
2771 3132
2772sub new { 3133sub new {
2773 my $class = shift; 3134 my $class = shift;
2774 3135
2775 my $self = $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
… …
2787 $self->{other}->toggle_visibility; 3148 $self->{other}->toggle_visibility;
2788} 3149}
2789 3150
2790############################################################################# 3151#############################################################################
2791 3152
2792package CFClient::UI::Tooltip; 3153package CFPlus::UI::Tooltip;
2793 3154
2794our @ISA = CFClient::UI::Bin::; 3155our @ISA = CFPlus::UI::Bin::;
2795 3156
2796use CFClient::OpenGL; 3157use CFPlus::OpenGL;
2797 3158
2798sub new { 3159sub new {
2799 my $class = shift; 3160 my $class = shift;
2800 3161
2801 $class->SUPER::new ( 3162 $class->SUPER::new (
… …
2804 ) 3165 )
2805} 3166}
2806 3167
2807sub set_tooltip_from { 3168sub set_tooltip_from {
2808 my ($self, $widget) = @_; 3169 my ($self, $widget) = @_;
3170
3171 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3172 if $widget->{tooltip} =~ /^#(.*)$/;
2809 3173
2810 my $tooltip = $widget->{tooltip}; 3174 my $tooltip = $widget->{tooltip};
2811 3175
2812 if ($ENV{CFPLUS_DEBUG} & 2) { 3176 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n" 3177 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2817 } 3181 }
2818 3182
2819 $tooltip =~ s/^\n+//; 3183 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//; 3184 $tooltip =~ s/\n+$//;
2821 3185
2822 $self->add (new CFClient::UI::Label 3186 $self->add (new CFPlus::UI::Label
2823 markup => $tooltip, 3187 markup => $tooltip,
2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3188 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825 fontsize => 0.8, 3189 fontsize => 0.8,
2826 fg => [0, 0, 0, 1], 3190 style => 1, # FLAG_INVERSE
2827 ellipsise => 0, 3191 ellipsise => 0,
2828 font => ($widget->{tooltip_font} || $::FONT_PROP), 3192 font => ($widget->{tooltip_font} || $::FONT_PROP),
2829 ); 3193 );
2830} 3194}
2831 3195
… …
2850 3214
2851 $self->{root}->on_post_alloc ("move_$self" => sub { 3215 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner} 3216 my $widget = $self->{owner}
2853 or return; 3217 or return;
2854 3218
3219 if ($widget->{visible}) {
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3220 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856 3221
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3222 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w}; 3223 if $x + $self->{w} > $self->{root}{w};
2859 3224
2860 $self->move_abs ($x, $y); 3225 $self->move_abs ($x, $y);
3226 } else {
3227 $self->hide;
3228 }
2861 }); 3229 });
2862} 3230}
2863 3231
2864sub _draw { 3232sub _draw {
2865 my ($self) = @_; 3233 my ($self) = @_;
… …
2889 $self->SUPER::_draw; 3257 $self->SUPER::_draw;
2890} 3258}
2891 3259
2892############################################################################# 3260#############################################################################
2893 3261
2894package CFClient::UI::Face; 3262package CFPlus::UI::Face;
2895 3263
2896our @ISA = CFClient::UI::Base::; 3264our @ISA = CFPlus::UI::DrawBG::;
2897 3265
2898use CFClient::OpenGL; 3266use CFPlus::OpenGL;
2899 3267
2900sub new { 3268sub new {
2901 my $class = shift; 3269 my $class = shift;
2902 3270
2903 my $self = $class->SUPER::new ( 3271 my $self = $class->SUPER::new (
… …
2905 can_events => 0, 3273 can_events => 0,
2906 @_, 3274 @_,
2907 ); 3275 );
2908 3276
2909 if ($self->{anim} && $self->{animspeed}) { 3277 if ($self->{anim} && $self->{animspeed}) {
2910 Scalar::Util::weaken (my $widget = $self); 3278 CFPlus::weaken (my $widget = $self);
2911 3279
2912 $self->{timer} = Event->timer ( 3280 $self->{timer} = Event->timer (
2913 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2914 hard => 1, 3282 hard => 1,
2915 interval => $self->{animspeed}, 3283 interval => $self->{animspeed},
… …
2938sub _draw { 3306sub _draw {
2939 my ($self) = @_; 3307 my ($self) = @_;
2940 3308
2941 return unless $::CONN; 3309 return unless $::CONN;
2942 3310
3311 $self->SUPER::_draw;
3312
2943 my $face; 3313 my $face;
2944 3314
2945 if ($self->{frame}) { 3315 if ($self->{frame}) {
2946 my $anim = $::CONN->{anim}[$self->{anim}]; 3316 my $anim = $::CONN->{anim}[$self->{anim}];
2947 3317
… …
2969 $self->SUPER::destroy; 3339 $self->SUPER::destroy;
2970} 3340}
2971 3341
2972############################################################################# 3342#############################################################################
2973 3343
2974package CFClient::UI::Buttonbar; 3344package CFPlus::UI::Buttonbar;
2975 3345
2976our @ISA = CFClient::UI::HBox::; 3346our @ISA = CFPlus::UI::HBox::;
2977 3347
2978# TODO: should actualyl wrap buttons and other goodies. 3348# TODO: should actually wrap buttons and other goodies.
2979 3349
2980############################################################################# 3350#############################################################################
2981 3351
2982package CFClient::UI::Menu; 3352package CFPlus::UI::Menu;
2983 3353
2984our @ISA = CFClient::UI::FancyFrame::; 3354our @ISA = CFPlus::UI::Toplevel::;
2985 3355
2986use CFClient::OpenGL; 3356use CFPlus::OpenGL;
2987 3357
2988sub new { 3358sub new {
2989 my $class = shift; 3359 my $class = shift;
2990 3360
2991 my $self = $class->SUPER::new ( 3361 my $self = $class->SUPER::new (
2992 items => [], 3362 items => [],
2993 z => 100, 3363 z => 100,
2994 @_, 3364 @_,
2995 ); 3365 );
2996 3366
2997 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3367 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998 3368
2999 for my $item (@{ $self->{items} }) { 3369 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3370 my ($widget, $cb, $tooltip) = @$item;
3001 3371
3002 # handle various types of items, only text for now 3372 # handle various types of items, only text for now
3003 if (!ref $widget) { 3373 if (!ref $widget) {
3374 if ($widget =~ /\t/) {
3375 my ($left, $right) = split /\t/, $widget, 2;
3376
3004 $widget = new CFClient::UI::Label 3377 $widget = new CFPlus::UI::HBox
3005 can_hover => 1, 3378 can_hover => 1,
3006 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,
3007 markup => $widget, 3391 markup => $widget,
3008 tooltip => $tooltip 3392 tooltip => $tooltip;
3393 }
3009 } 3394 }
3010 3395
3011 $self->{item}{$widget} = $item; 3396 $self->{item}{$widget} = $item;
3012 3397
3013 $self->{vbox}->add ($widget); 3398 $self->{vbox}->add ($widget);
… …
3056 1 3441 1
3057} 3442}
3058 3443
3059############################################################################# 3444#############################################################################
3060 3445
3061package CFClient::UI::Multiplexer; 3446package CFPlus::UI::Multiplexer;
3062 3447
3063our @ISA = CFClient::UI::Container::; 3448our @ISA = CFPlus::UI::Container::;
3064 3449
3065sub new { 3450sub new {
3066 my $class = shift; 3451 my $class = shift;
3067 3452
3068 my $self = $class->SUPER::new ( 3453 my $self = $class->SUPER::new (
… …
3082 3467
3083 $self->{current} = $self->{children}[0] 3468 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3469 if @{ $self->{children} };
3085} 3470}
3086 3471
3472sub get_current_page {
3473 my ($self) = @_;
3474
3475 $self->{current}
3476}
3477
3087sub set_current_page { 3478sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3479 my ($self, $page_or_widget) = @_;
3089 3480
3090 my $widget = ref $page_or_widget 3481 my $widget = ref $page_or_widget
3091 ? $page_or_widget 3482 ? $page_or_widget
… …
3123 $self->{current}->draw; 3514 $self->{current}->draw;
3124} 3515}
3125 3516
3126############################################################################# 3517#############################################################################
3127 3518
3128package CFClient::UI::Notebook; 3519package CFPlus::UI::Notebook;
3129 3520
3130our @ISA = CFClient::UI::VBox::; 3521our @ISA = CFPlus::UI::VBox::;
3131 3522
3132sub new { 3523sub new {
3133 my $class = shift; 3524 my $class = shift;
3134 3525
3135 my $self = $class->SUPER::new ( 3526 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar), 3527 buttonbar => (new CFPlus::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3528 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self 3529 # filter => # will be put between multiplexer and $self
3139 @_, 3530 @_,
3140 ); 3531 );
3141 3532
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3533 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3146} 3537}
3147 3538
3148sub add { 3539sub add {
3149 my ($self, $title, $widget, $tooltip) = @_; 3540 my ($self, $title, $widget, $tooltip) = @_;
3150 3541
3151 Scalar::Util::weaken $self; 3542 CFPlus::weaken $self;
3152 3543
3153 $self->{buttonbar}->add (new CFClient::UI::Button 3544 $self->{buttonbar}->add (new CFPlus::UI::Button
3154 markup => $title, 3545 markup => $title,
3155 tooltip => $tooltip, 3546 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) }, 3547 on_activate => sub { $self->set_current_page ($widget) },
3157 ); 3548 );
3158 3549
3159 $self->{multiplexer}->add ($widget); 3550 $self->{multiplexer}->add ($widget);
3160} 3551}
3161 3552
3553sub get_current_page {
3554 my ($self) = @_;
3555
3556 $self->{multiplexer}->get_current_page
3557}
3558
3162sub set_current_page { 3559sub set_current_page {
3163 my ($self, $page) = @_; 3560 my ($self, $page) = @_;
3164 3561
3165 $self->{multiplexer}->set_current_page ($page); 3562 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current}); 3563 $self->emit (page_changed => $self->{multiplexer}{current});
3167} 3564}
3168 3565
3169############################################################################# 3566#############################################################################
3170 3567
3171package CFClient::UI::Combobox; 3568package CFPlus::UI::Selector;
3172 3569
3173use utf8; 3570use utf8;
3174 3571
3175our @ISA = CFClient::UI::Button::; 3572our @ISA = CFPlus::UI::Button::;
3176 3573
3177sub new { 3574sub new {
3178 my $class = shift; 3575 my $class = shift;
3179 3576
3180 my $self = $class->SUPER::new ( 3577 my $self = $class->SUPER::new (
… …
3197 my ($value, $title, $tooltip) = @$_; 3594 my ($value, $title, $tooltip) = @$_;
3198 3595
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3596 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 } 3597 }
3201 3598
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3599 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203} 3600}
3204 3601
3205sub _set_value { 3602sub _set_value {
3206 my ($self, $value) = @_; 3603 my ($self, $value) = @_;
3207 3604
… …
3222 $self->emit (changed => $value); 3619 $self->emit (changed => $value);
3223} 3620}
3224 3621
3225############################################################################# 3622#############################################################################
3226 3623
3227package CFClient::UI::Statusbox; 3624package CFPlus::UI::Statusbox;
3228 3625
3229our @ISA = CFClient::UI::VBox::; 3626our @ISA = CFPlus::UI::VBox::;
3230 3627
3231sub new { 3628sub new {
3232 my $class = shift; 3629 my $class = shift;
3233 3630
3234 my $self = $class->SUPER::new ( 3631 my $self = $class->SUPER::new (
3235 fontsize => 0.8, 3632 fontsize => 0.8,
3236 @_, 3633 @_,
3237 ); 3634 );
3238 3635
3239 Scalar::Util::weaken (my $this = $self); 3636 CFPlus::weaken (my $this = $self);
3240 3637
3241 $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 });
3242 3639
3243 $self 3640 $self
3244} 3641}
… …
3246sub reorder { 3643sub reorder {
3247 my ($self) = @_; 3644 my ($self) = @_;
3248 my $NOW = Time::HiRes::time; 3645 my $NOW = Time::HiRes::time;
3249 3646
3250 # freeze display when hovering over any label 3647 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner} 3648 return if $CFPlus::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3649 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} }; 3650 values %{ $self->{item} };
3254 3651
3255 while (my ($k, $v) = each %{ $self->{item} }) { 3652 while (my ($k, $v) = each %{ $self->{item} }) {
3256 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3653 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257 } 3654 }
… …
3278 for ($short) { 3675 for ($short) {
3279 s/^\s+//; 3676 s/^\s+//;
3280 s/\s+/ /g; 3677 s/\s+/ /g;
3281 } 3678 }
3282 3679
3283 new CFClient::UI::Label 3680 new CFPlus::UI::Label
3284 markup => $short, 3681 markup => $short,
3285 tooltip => $item->{tooltip}, 3682 tooltip => $item->{tooltip},
3286 tooltip_font => $::FONT_PROP, 3683 tooltip_font => $::FONT_PROP,
3287 tooltip_width => 0.67, 3684 tooltip_width => 0.67,
3288 fontsize => $item->{fontsize} || $self->{fontsize}, 3685 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3342 count => 1, 3739 count => 1,
3343 %arg, 3740 %arg,
3344 }; 3741 };
3345 } 3742 }
3346 3743
3744 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3745 $self->reorder;
3746 });
3348} 3747}
3349 3748
3350sub reconfigure { 3749sub reconfigure {
3351 my ($self) = @_; 3750 my ($self) = @_;
3352 3751
… …
3365 $self->SUPER::destroy; 3764 $self->SUPER::destroy;
3366} 3765}
3367 3766
3368############################################################################# 3767#############################################################################
3369 3768
3370package CFClient::UI::Inventory;
3371
3372our @ISA = CFClient::UI::ScrolledWindow::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
3620 @_,
3621 )
3622}
3623
3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
3710 my ($self, $spell) = @_;
3711
3712 $self->{spell}->{$spell->{name}} = $spell;
3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
3732package CFClient::UI::Root; 3769package CFPlus::UI::Root;
3733 3770
3734our @ISA = CFClient::UI::Container::; 3771our @ISA = CFPlus::UI::Container::;
3735 3772
3736use List::Util qw(min max); 3773use List::Util qw(min max);
3737 3774
3738use CFClient::OpenGL; 3775use CFPlus::OpenGL;
3739 3776
3740sub new { 3777sub new {
3741 my $class = shift; 3778 my $class = shift;
3742 3779
3743 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3744 visible => 1, 3781 visible => 1,
3745 @_, 3782 @_,
3746 ); 3783 );
3747 3784
3748 Scalar::Util::weaken ($self->{root} = $self); 3785 CFPlus::weaken ($self->{root} = $self);
3749 3786
3750 $self 3787 $self
3751} 3788}
3752 3789
3753sub size_request { 3790sub size_request {
… …
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920 3957
3921 $w = 0 if $w < 0; 3958 $w = 0 if $w < 0;
3922 $h = 0 if $h < 0; 3959 $h = 0 if $h < 0;
3923 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
3924 $w = int $w + 0.5; 3970 $w = int $w + 0.5;
3925 $h = int $h + 0.5; 3971 $h = int $h + 0.5;
3926 3972
3927 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}) {
3928 $widget->{old_w} = $widget->{w}; 3974 $widget->{old_w} = $widget->{w};
… …
3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3997 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952 glMatrixMode GL_MODELVIEW; 3998 glMatrixMode GL_MODELVIEW;
3953 glLoadIdentity; 3999 glLoadIdentity;
3954 4000
3955 { 4001 {
3956 package CFClient::UI::Base; 4002 package CFPlus::UI::Base;
3957 4003
3958 ($draw_x, $draw_y, $draw_w, $draw_h) = 4004 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h}); 4005 (0, 0, $self->{w}, $self->{h});
3960 }
3961 4006
3962 $self->_draw; 4007 $self->_draw;
4008 }
3963} 4009}
3964 4010
3965############################################################################# 4011#############################################################################
3966 4012
3967package CFClient::UI; 4013package CFPlus::UI;
3968 4014
3969$ROOT = new CFClient::UI::Root; 4015$ROOT = new CFPlus::UI::Root;
3970$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4016$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971 4017
39721 40181
3973 4019

Diff Legend

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