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.303 by elmex, Tue Jun 13 10:28:38 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->focus_out; 309 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
289} 311}
290 312
291sub set_visibility { 313sub set_visibility {
292 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
336sub size_request { 358sub size_request {
337 require Carp; 359 require Carp;
338 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
339} 361}
340 362
363sub baseline_shift {
364 0
365}
366
341sub configure { 367sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
343 369
344 if ($self->{aspect}) { 370 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
346 372
347 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 375
350 # use alignment to adjust x, y 376 # use alignment to adjust x, y
351 377
352 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
367 393
368 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
369 } 395 }
370} 396}
371 397
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 398sub children {
377 # nop 399 # nop
378} 400}
379 401
380sub visible_children { 402sub visible_children {
… …
398 420
399 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
400 422
401 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
402 424
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 428 }
407} 429}
408 430
409# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
410sub coord2local { 432sub coord2local {
411 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
412 434
435 Carp::confess unless $self->{parent};#d#
436
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 438}
415 439
416# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
417sub coord2global { 441sub coord2global {
418 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
419 443
444 Carp::confess unless $self->{parent};#d#
445
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 447}
422 448
423sub focus_in { 449sub invoke_focus_in {
424 my ($self) = @_; 450 my ($self) = @_;
425 451
426 return if $FOCUS == $self; 452 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
428 454
429 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
430 456
431 $self->_emit (focus_in => $focus); 457 $self->update;
432 458
433 $focus->update if $focus; 459 0
434 $FOCUS->update;
435} 460}
436 461
437sub focus_out { 462sub invoke_focus_out {
438 my ($self) = @_; 463 my ($self) = @_;
439 464
440 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
441 466
442 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
443 468
444 $self->_emit (focus_out => $focus); 469 $self->update;
445 470
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 472 unless $FOCUS;
450}
451 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
452sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 485sub invoke_button_up { 0 }
454sub key_down { 0 } 486sub invoke_key_down { 0 }
455sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
456 489
457sub button_down { 490sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
459 492
460 $self->focus_in; 493 $self->grab_focus;
461 494
462 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
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 }
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);
521
522sub emit {
523 my ($self, $signal, @args) = @_;
524
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
536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 543}
464 544
465sub find_widget { 545sub find_widget {
466 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
467 547
… …
475} 555}
476 556
477sub set_parent { 557sub set_parent {
478 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
479 559
480 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 561 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 562}
506 563
507sub realloc { 564sub realloc {
508 my ($self) = @_; 565 my ($self) = @_;
509 566
… …
542 return unless $self->{h} && $self->{w}; 599 return unless $self->{h} && $self->{w};
543 600
544 # update screen rectangle 601 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 602 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 603 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 604
550 # skip widgets that are entirely outside the drawing area 605 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 608
… …
576 glVertex $self->{w} - 1, 0; 631 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 632 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 633 glVertex 0 , $self->{h} - 1;
579 glEnd; 634 glEnd;
580 glPopMatrix; 635 glPopMatrix;
581 #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;
582 } 637 }
583 638
584 $self->_draw; 639 $self->_draw;
585 glPopMatrix; 640 glPopMatrix;
586} 641}
… …
589 my ($self) = @_; 644 my ($self) = @_;
590 645
591 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
592} 647}
593 648
649my $cntx;#d#
594sub DESTROY { 650sub DESTROY {
595 my ($self) = @_; 651 my ($self) = @_;
596 652
597 delete $WIDGET{$self+0}; 653 return if CFPlus::in_destruct;
598 654
599 eval { $self->destroy }; 655 eval { $self->destroy };
600 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};
601} 659}
602 660
603############################################################################# 661#############################################################################
604 662
605package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
606 664
607our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
608 666
609use strict; 667use strict;
610use CFClient::OpenGL; 668use CFPlus::OpenGL;
611 669
612sub new { 670sub new {
613 my $class = shift; 671 my $class = shift;
614 672
615 # range [value, low, high, page] 673 # range [value, low, high, page]
… …
646 } 704 }
647} 705}
648 706
649############################################################################# 707#############################################################################
650 708
651package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
652 710
653our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
654 712
655sub new { 713sub new {
656 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
658} 716}
… …
665 723
666sub draw { } 724sub draw { }
667 725
668############################################################################# 726#############################################################################
669 727
670package CFClient::UI::Container; 728package CFPlus::UI::Container;
671 729
672our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
673 731
674sub new { 732sub new {
675 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
676 734
677 my $children = delete $arg{children}; 735 my $children = delete $arg{children};
… …
686 if $children; 744 if $children;
687 745
688 $self 746 $self
689} 747}
690 748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
755}
756
691sub add { 757sub add {
692 my ($self, @widgets) = @_; 758 my ($self, @widgets) = @_;
693 759
694 $_->set_parent ($self) 760 $_->set_parent ($self)
695 for @widgets; 761 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 821 $_->draw for @{$self->{children}};
756} 822}
757 823
758############################################################################# 824#############################################################################
759 825
760package CFClient::UI::Bin; 826package CFPlus::UI::Bin;
761 827
762our @ISA = CFClient::UI::Container::; 828our @ISA = CFPlus::UI::Container::;
763 829
764sub new { 830sub new {
765 my ($class, %arg) = @_; 831 my ($class, %arg) = @_;
766 832
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 834
769 $class->SUPER::new (children => [$child], %arg) 835 $class->SUPER::new (children => [$child], %arg)
770} 836}
771 837
772sub add { 838sub add {
… …
779sub remove { 845sub remove {
780 my ($self, $widget) = @_; 846 my ($self, $widget) = @_;
781 847
782 $self->SUPER::remove ($widget); 848 $self->SUPER::remove ($widget);
783 849
784 $self->{children} = [new CFClient::UI::Empty] 850 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 851 unless @{$self->{children}};
786} 852}
787 853
788sub child { $_[0]->{children}[0] } 854sub child { $_[0]->{children}[0] }
789 855
790sub size_request { 856sub size_request {
791 $_[0]{children}[0]->size_request 857 $_[0]{children}[0]->size_request
792} 858}
793 859
794sub size_allocate { 860sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 861 my ($self, $w, $h) = @_;
796 862
797 $self->{children}[0]->configure (0, 0, $w, $h); 863 $self->{children}[0]->configure (0, 0, $w, $h);
864
865 1
798} 866}
799 867
800############################################################################# 868#############################################################################
801 869
802# back-buffered drawing area 870# back-buffered drawing area
803 871
804package CFClient::UI::Window; 872package CFPlus::UI::Window;
805 873
806our @ISA = CFClient::UI::Bin::; 874our @ISA = CFPlus::UI::Bin::;
807 875
808use CFClient::OpenGL; 876use CFPlus::OpenGL;
809 877
810sub new { 878sub new {
811 my ($class, %arg) = @_; 879 my ($class, %arg) = @_;
812 880
813 my $self = $class->SUPER::new (%arg); 881 my $self = $class->SUPER::new (%arg);
… …
818 886
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 887 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 888 $self->SUPER::update;
821} 889}
822 890
823sub size_allocate { 891sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 892 my ($self, $w, $h) = @_;
825 893
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 894 $self->update;
895
896 $self->SUPER::invoke_size_allocate ($w, $h)
828} 897}
829 898
830sub _render { 899sub _render {
831 my ($self) = @_; 900 my ($self) = @_;
832 901
… …
834} 903}
835 904
836sub render_child { 905sub render_child {
837 my ($self) = @_; 906 my ($self) = @_;
838 907
839 $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 {
840 glClearColor 0, 0, 0, 0; 909 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
842 911
843 { 912 {
844 package CFClient::UI::Base; 913 package CFPlus::UI::Base;
845 914
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
848 } 919 }
849
850 $self->_render;
851 }; 920 };
852} 921}
853 922
854sub _draw { 923sub _draw {
855 my ($self) = @_; 924 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 925
859 my $tex = $self->{texture} 926 my $tex = $self->{texture}
860 or return; 927 or return;
861 928
862 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
865 932
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
867 934
868 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
869} 936}
870 937
871############################################################################# 938#############################################################################
872 939
873package CFClient::UI::ViewPort; 940package CFPlus::UI::ViewPort;
874 941
875our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
876 943
877sub new { 944sub new {
878 my $class = shift; 945 my $class = shift;
879 946
880 $class->SUPER::new ( 947 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 960 $h = 10 if $self->{scroll_y};
894 961
895 ($w, $h) 962 ($w, $h)
896} 963}
897 964
898sub size_allocate { 965sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
900 967
901 my $child = $self->child; 968 my $child = $self->child;
902 969
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 972
906 $self->child->configure (0, 0, $w, $h); 973 $self->child->configure (0, 0, $w, $h);
907 $self->update; 974 $self->update;
975
976 1
908} 977}
909 978
910sub set_offset { 979sub set_offset {
911 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
912 981
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1009 ) {
941 $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})
942 } else { 1011 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1013 }
945} 1014}
946 1015
947sub _render { 1016sub _render {
948 my ($self) = @_; 1017 my ($self) = @_;
949 1018
950 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};
951 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};
952 1021
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1023
955 $self->SUPER::_render; 1024 $self->SUPER::_render;
956} 1025}
957 1026
958############################################################################# 1027#############################################################################
959 1028
960package CFClient::UI::ScrolledWindow; 1029package CFPlus::UI::ScrolledWindow;
961 1030
962our @ISA = CFClient::UI::HBox::; 1031our @ISA = CFPlus::UI::HBox::;
963 1032
964sub new { 1033sub new {
965 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
966 1035
967 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
968 1037
969 my $self; 1038 my $self;
970 1039
971 my $slider = new CFClient::UI::Slider 1040 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1041 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1042 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1043 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1044 $self->{vp}->set_offset (0, $_[1]);
976 }, 1045 },
977 ; 1046 ;
978 1047
979 $self = $class->SUPER::new ( 1048 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
981 slider => $slider, 1051 slider => $slider,
982 %arg, 1052 %arg,
983 ); 1053 );
984 1054
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1055 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1056 $self->add ($child) if $child;
987 1057
988 $self 1058 $self
989} 1059}
990 1060
1061#TODO# update range on size_allocate depending on child
1062
991sub add { 1063sub add {
992 my ($self, $widget) = @_; 1064 my ($self, $widget) = @_;
993 1065
994 $self->{vp}->add ($self->{child} = $widget); 1066 $self->{vp}->add ($self->{child} = $widget);
995} 1067}
996 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
997sub update { 1085sub update {
998 my ($self) = @_; 1086 my ($self) = @_;
999 1087
1000 $self->SUPER::update; 1088 $self->SUPER::update;
1001 1089
1002 # todo: overwrite size_allocate of child 1090 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1091}
1006 1092
1007sub size_allocate { 1093sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1094 my ($self, $w, $h) = @_;
1009 1095
1096 $self->update_slider;
1097
1010 $self->SUPER::size_allocate ($w, $h); 1098 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1099}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1100
1019############################################################################# 1101#############################################################################
1020 1102
1021package CFClient::UI::Frame; 1103package CFPlus::UI::Frame;
1022 1104
1023our @ISA = CFClient::UI::Bin::; 1105our @ISA = CFPlus::UI::Bin::;
1024 1106
1025use CFClient::OpenGL; 1107use CFPlus::OpenGL;
1026 1108
1027sub new { 1109sub new {
1028 my $class = shift; 1110 my $class = shift;
1029 1111
1030 $class->SUPER::new ( 1112 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1138 $self->SUPER::_draw;
1057} 1139}
1058 1140
1059############################################################################# 1141#############################################################################
1060 1142
1061package CFClient::UI::FancyFrame; 1143package CFPlus::UI::FancyFrame;
1062 1144
1063our @ISA = CFClient::UI::Bin::; 1145our @ISA = CFPlus::UI::Bin::;
1064 1146
1065use 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;
1066 1248
1067my $bg = 1249my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1251 mipmap => 1, wrap => 1;
1070 1252
1071my @border = 1253my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1256
1075sub new { 1257sub new {
1076 my ($class, %arg) = @_; 1258 my ($class, %arg) = @_;
1077 1259
1078 my $self = $class->SUPER::new ( 1260 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1261 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1262 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1263 border => 0.6,
1082 can_events => 1, 1264 can_events => 1,
1083 min_w => 16, 1265 min_w => 64,
1084 min_h => 16, 1266 min_h => 32,
1085 %arg, 1267 %arg,
1086 ); 1268 );
1087 1269
1088 $self->{title_widget} = new CFClient::UI::Label 1270 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1271 align => 0,
1090 valign => 1, 1272 valign => 1,
1091 text => $self->{title}, 1273 text => $self->{title},
1092 fontsize => $self->{border}, 1274 fontsize => $self->{border},
1093 if exists $self->{title}; 1275 if exists $self->{title};
1094 1276
1095 unless ($self->{no_close_button}) { 1277 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1278 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1279 new CFPlus::UI::ImageButton
1098 image => 'x1_close.png', 1280 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1281 on_activate => sub { $self->emit ("delete") };
1100 1282
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1284 }
1103 1285
1104 $self 1286 $self
1105} 1287}
1106 1288
1107sub add { 1289sub add {
1108 my ($self, @widgets) = @_; 1290 my ($self, @widgets) = @_;
1109 1291
1110 $self->SUPER::add (@widgets); 1292 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1293 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1294 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1295}
1114 1296
1115sub border { 1297sub border {
1116 int $_[0]{border} * $::FONTSIZE 1298 int $_[0]{border} * $::FONTSIZE
1117} 1299}
… …
1120 my ($self) = @_; 1302 my ($self) = @_;
1121 1303
1122 $self->{title_widget}->size_request 1304 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1305 if $self->{title_widget};
1124 1306
1125 $self->{close_btn}->size_request 1307 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1308 if $self->{close_button};
1127 1309
1128 my ($w, $h) = $self->SUPER::size_request; 1310 my ($w, $h) = $self->SUPER::size_request;
1129 1311
1130 ( 1312 (
1131 $w + $self->border * 2, 1313 $w + $self->border * 2,
1132 $h + $self->border * 2, 1314 $h + $self->border * 2,
1133 ) 1315 )
1134} 1316}
1135 1317
1136sub size_allocate { 1318sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1138 1320
1139 if ($self->{title_widget}) { 1321 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1322 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1323 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1324 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1325 }
1144 1326
1145 my $border = $self->border; 1327 my $border = $self->border;
1146 1328
1147 $h -= List::Util::max 0, $border * 2; 1329 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1330 $w -= List::Util::max 0, $border * 2;
1149 1331
1150 $self->child->configure ($border, $border, $w, $h); 1332 $self->child->configure ($border, $border, $w, $h);
1151 1333
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1335 if $self->{close_button};
1154}
1155 1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1344
1345 1
1346}
1347
1156sub button_down { 1348sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
1158 1350
1159 my ($w, $h) = @$self{qw(w h)}; 1351 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1352 my $border = $self->border;
1161 1353
… …
1192 1384
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1385 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1386
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1387 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1388 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1389 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1390 };
1199 } else { 1391 } else {
1200 return 0; 1392 return 0;
1201 } 1393 }
1202 1394
1203 1 1395 1
1204} 1396}
1205 1397
1206sub button_up { 1398sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1399 my ($self, $ev, $x, $y) = @_;
1208 1400
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1401 ! ! delete $self->{motion}
1213} 1402}
1214 1403
1215sub mouse_motion { 1404sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1405 my ($self, $ev, $x, $y) = @_;
1217 1406
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1408
1220 !!$self->{motion} 1409 ! ! $self->{motion}
1410}
1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
1221} 1418}
1222 1419
1223sub _draw { 1420sub _draw {
1224 my ($self) = @_; 1421 my ($self) = @_;
1225 1422
… …
1258 $self->{title_widget}->_draw; 1455 $self->{title_widget}->_draw;
1259 1456
1260 glTranslate 0, - ($border - $self->{h}); 1457 glTranslate 0, - ($border - $self->{h});
1261 } 1458 }
1262 1459
1263 $self->{close_btn}->draw 1460 $self->{close_button}->draw
1264 if $self->{close_btn}; 1461 if $self->{close_button};
1265} 1462}
1266 1463
1267############################################################################# 1464#############################################################################
1268 1465
1269package CFClient::UI::Table; 1466package CFPlus::UI::Table;
1270 1467
1271our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
1272 1469
1273use List::Util qw(max sum); 1470use List::Util qw(max sum);
1274 1471
1275use CFClient::OpenGL; 1472use CFPlus::OpenGL;
1276 1473
1277sub new { 1474sub new {
1278 my $class = shift; 1475 my $class = shift;
1279 1476
1280 $class->SUPER::new ( 1477 $class->SUPER::new (
… …
1286sub children { 1483sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288} 1485}
1289 1486
1290sub add { 1487sub add {
1291 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
1292 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1293 $child->set_parent ($self); 1492 $child->set_parent ($self);
1294 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
1295 1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1296 $self->realloc; 1498 $self->realloc;
1297} 1499}
1298 1500
1299sub remove { 1501sub remove {
1300 my ($self, $child) = @_; 1502 my ($self, $child) = @_;
… …
1348 (sum @$ws), 1550 (sum @$ws),
1349 (sum @$hs), 1551 (sum @$hs),
1350 ) 1552 )
1351} 1553}
1352 1554
1353sub size_allocate { 1555sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1556 my ($self, $w, $h) = @_;
1355 1557
1356 my ($ws, $hs) = $self->get_wh; 1558 my ($ws, $hs) = $self->get_wh;
1357 1559
1358 my $req_w = (sum @$ws) || 1; 1560 my $req_w = (sum @$ws) || 1;
… …
1365 1567
1366 # linearly scale sizes 1568 # linearly scale sizes
1367 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369 1571
1370 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1371 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1372 1574
1373 my $y; 1575 my $y;
1374 1576
1375 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1376 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1390 } 1592 }
1391 1593
1392 $y += $row_h; 1594 $y += $row_h;
1393 } 1595 }
1394 1596
1597 1
1395} 1598}
1396 1599
1397sub find_widget { 1600sub find_widget {
1398 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
1399 1602
… …
1418 } 1621 }
1419} 1622}
1420 1623
1421############################################################################# 1624#############################################################################
1422 1625
1423package CFClient::UI::Box; 1626package CFPlus::UI::Box;
1424 1627
1425our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1426 1629
1427sub size_request { 1630sub size_request {
1428 my ($self) = @_; 1631 my ($self) = @_;
1429 1632
1430 $self->{vertical} 1633 $self->{vertical}
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1640 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1641 )
1439} 1642}
1440 1643
1441sub size_allocate { 1644sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1443 1646
1444 my $space = $self->{vertical} ? $h : $w; 1647 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1648 my @children = $self->visible_children;
1446 1649
1447 my @req; 1650 my @req;
1448 1651
1449 if ($self->{homogeneous}) { 1652 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1653 @req = ($space / (@children || 1)) x @children;
1451 } else { 1654 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1655 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1656 my $req = List::Util::sum @req;
1454 1657
1455 if ($req > $space) { 1658 if ($req > $space) {
1456 # ah well, not enough space 1659 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1660 $_ *= $space / $req for @req;
1458 } else { 1661 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1662 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1663
1461 $space = ($space - $req) / $expand; # remaining space to give away 1664 $space = ($space - $req) / $expand; # remaining space to give away
1462 1665
1463 $req[$_] += $space * $children->[$_]{expand} 1666 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1667 for 0 .. $#children;
1465 } 1668 }
1466 } 1669 }
1467 1670
1468 CFClient::UI::harmonize \@req; 1671 CFPlus::UI::harmonize \@req;
1469 1672
1470 my $pos = 0; 1673 my $pos = 0;
1471 for (0 .. $#$children) { 1674 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1675 my $alloc = $req[$_];
1473 $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));
1474 1677
1475 $pos += $alloc; 1678 $pos += $alloc;
1476 } 1679 }
1477 1680
1478 1 1681 1
1479} 1682}
1480 1683
1481############################################################################# 1684#############################################################################
1482 1685
1483package CFClient::UI::HBox; 1686package CFPlus::UI::HBox;
1484 1687
1485our @ISA = CFClient::UI::Box::; 1688our @ISA = CFPlus::UI::Box::;
1486 1689
1487sub new { 1690sub new {
1488 my $class = shift; 1691 my $class = shift;
1489 1692
1490 $class->SUPER::new ( 1693 $class->SUPER::new (
… …
1493 ) 1696 )
1494} 1697}
1495 1698
1496############################################################################# 1699#############################################################################
1497 1700
1498package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1499 1702
1500our @ISA = CFClient::UI::Box::; 1703our @ISA = CFPlus::UI::Box::;
1501 1704
1502sub new { 1705sub new {
1503 my $class = shift; 1706 my $class = shift;
1504 1707
1505 $class->SUPER::new ( 1708 $class->SUPER::new (
… …
1508 ) 1711 )
1509} 1712}
1510 1713
1511############################################################################# 1714#############################################################################
1512 1715
1513package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1514 1717
1515our @ISA = CFClient::UI::DrawBG::; 1718our @ISA = CFPlus::UI::DrawBG::;
1516 1719
1517use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1518 1721
1519sub new { 1722sub new {
1520 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1521 1724
1522 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1728 #active_bg => none
1526 #font => default_font 1729 #font => default_font
1527 #text => initial text 1730 #text => initial text
1528 #markup => initial narkup 1731 #markup => initial narkup
1529 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1530 ellipsise => 3, # end 1734 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1736 fontsize => 1,
1533 align => -1, 1737 align => -1,
1534 valign => -1, 1738 valign => -1,
1535 padding_x => 2, 1739 padding_x => 2,
1536 padding_y => 2, 1740 padding_y => 2,
1537 can_events => 0, 1741 can_events => 0,
1538 %arg 1742 %arg
1539 ); 1743 );
1540 1744
1541 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1748 $self->{template} = $layout;
1545 } 1749 }
1546 1750
1547 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1551 } 1755 }
1552 1756
1553 $self 1757 $self
1554} 1758}
1555 1759
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1760sub update {
1567 my ($self) = @_; 1761 my ($self) = @_;
1568 1762
1569 delete $self->{texture}; 1763 delete $self->{texture};
1570 $self->SUPER::update; 1764 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1582 1776
1583 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1585 1779
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1588 1781
1589 delete $self->{size_req}; 1782 delete $self->{size_req};
1590 $self->realloc; 1783 $self->realloc;
1591 $self->update; 1784 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1599 1792
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1794
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1604 1796
1605 delete $self->{size_req}; 1797 delete $self->{size_req};
1606 $self->realloc; 1798 $self->realloc;
1607 $self->update; 1799 $self->update;
… …
1619 1811
1620 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1621 1813
1622 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1623 $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);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1818
1626 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1627 1820
1628 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
… …
1633 }; 1826 };
1634 1827
1635 @{ $self->{size_req} } 1828 @{ $self->{size_req} }
1636} 1829}
1637 1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1638sub size_allocate { 1835sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1640 1837
1641 delete $self->{ox}; 1838 delete $self->{ox};
1642 1839
1643 delete $self->{texture} 1840 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1841 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1842
1843 1
1645} 1844}
1646 1845
1647sub set_fontsize { 1846sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1649 1848
1650 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1651 delete $self->{texture}; 1851 delete $self->{texture};
1652 1852
1653 $self->realloc; 1853 $self->realloc;
1654} 1854}
1655 1855
1656sub reconfigure { 1856sub reconfigure {
1657 my ($self) = @_; 1857 my ($self) = @_;
1658 1858
1659 delete $self->{size_req}; 1859 delete $self->{size_req};
1860 delete $self->{texture};
1660 1861
1661 $self->SUPER::reconfigure; 1862 $self->SUPER::reconfigure;
1662} 1863}
1663 1864
1664sub _draw { 1865sub _draw {
1665 my ($self) = @_; 1866 my ($self) = @_;
1666 1867
1667 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1668 1869
1669 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1877
1677 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1678 }; 1879 };
1679 1880
1680 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1684 1885
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1889 };
1689 1890
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1893
1695 if ($tex->{format} == GL_ALPHA) { 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1895}
1706 1896
1707############################################################################# 1897#############################################################################
1708 1898
1709package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1710 1900
1711our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1712 1902
1713use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1714 1904
1715sub new { 1905sub new {
1716 my $class = shift; 1906 my $class = shift;
1717 1907
1718 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1723 can_hover => 1, 1913 can_hover => 1,
1724 can_focus => 1, 1914 can_focus => 1,
1725 valign => 0, 1915 valign => 0,
1726 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1727 #text => ... 1918 #text => ...
1728 #hidden => "*", 1919 #hidden => "*",
1729 @_ 1920 @_
1730 ) 1921 )
1731} 1922}
… …
1742 1933
1743 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1936 delete $self->{size_req};
1746 1937
1747 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1748 1939
1749 $self->realloc; 1940 $self->realloc;
1750 $self->update; 1941 $self->update;
1751} 1942}
1752 1943
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1768 1959
1769 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1770} 1961}
1771 1962
1772sub key_down { 1963sub invoke_key_down {
1773 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1774 1965
1775 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1780 1971
1781 if ($uni == 8) { 1972 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1790 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1792 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1793 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1988 $self->emit ('escape');
1795 } elsif ($uni) { 1989 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1991 } else {
1798 return 0; 1992 return 0;
1799 } 1993 }
1800 1994
1801 $self->_set_text ($text); 1995 $self->_set_text ($text);
1802 1996
1803 $self->realloc; 1997 $self->realloc;
1998 $self->update;
1804 1999
1805 1 2000 1
1806} 2001}
1807 2002
1808sub focus_in { 2003sub invoke_focus_in {
1809 my ($self) = @_; 2004 my ($self) = @_;
1810 2005
1811 $self->{last_activity} = $::NOW; 2006 $self->{last_activity} = $::NOW;
1812 2007
1813 $self->SUPER::focus_in; 2008 $self->SUPER::invoke_focus_in
1814} 2009}
1815 2010
1816sub button_down { 2011sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 2012 my ($self, $ev, $x, $y) = @_;
1818 2013
1819 $self->SUPER::button_down ($ev, $x, $y); 2014 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 2015
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2016 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2017
1823 # byte-index to char-index 2018 # byte-index to char-index
1824 my $text = $self->{text}; 2019 my $text = $self->{text};
1825 utf8::encode $text; 2020 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2021 $self->{cursor} = length $text;
1827 2022
1828 $self->_set_text ($self->{text}); 2023 $self->_set_text ($self->{text});
1829 $self->update; 2024 $self->update;
1830 2025
1831 1 2026 1
1832} 2027}
1833 2028
1834sub mouse_motion { 2029sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 2030 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2031# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 2032
1838 0 2033 1
1839} 2034}
1840 2035
1841sub _draw { 2036sub _draw {
1842 my ($self) = @_; 2037 my ($self) = @_;
1843 2038
… …
1870 utf8::encode $text; 2065 utf8::encode $text;
1871 2066
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2068 }
1874 2069
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2070 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2072 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2073 glEnd;
1880 } 2074 }
1881} 2075}
1882 2076
2077#############################################################################
2078
1883package CFClient::UI::Entry; 2079package CFPlus::UI::Entry;
1884 2080
1885our @ISA = CFClient::UI::EntryBase::; 2081our @ISA = CFPlus::UI::EntryBase::;
1886 2082
1887use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1888 2084
1889sub key_down { 2085sub invoke_key_down {
1890 my ($self, $ev) = @_; 2086 my ($self, $ev) = @_;
1891 2087
1892 my $sym = $ev->{sym}; 2088 my $sym = $ev->{sym};
1893 2089
1894 if ($sym == 13) { 2090 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2091 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2092 my $txt = $self->get_text;
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}]);
1920 } else { 2117 } else {
1921 $self->set_text ($self->{history_saveback}); 2118 $self->set_text ($self->{history_saveback});
1922 } 2119 }
1923 2120
1924 } else { 2121 } else {
1925 return $self->SUPER::key_down ($ev) 2122 return $self->SUPER::invoke_key_down ($ev)
1926 } 2123 }
1927 2124
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
… …
1954 can_events => 1, 2190 can_events => 1,
1955 @_ 2191 @_
1956 ) 2192 )
1957} 2193}
1958 2194
1959sub activate { }
1960
1961sub button_up { 2195sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2196 my ($self, $ev, $x, $y) = @_;
1963 2197
1964 $self->emit ("activate") 2198 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2199 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2200 && $y >= 0 && $y < $self->{h};
… …
1984 $self->SUPER::_draw; 2218 $self->SUPER::_draw;
1985} 2219}
1986 2220
1987############################################################################# 2221#############################################################################
1988 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
1989package CFClient::UI::ImageButton; 2372package CFPlus::UI::ImageButton;
1990 2373
1991our @ISA = CFClient::UI::Image::; 2374our @ISA = CFPlus::UI::Image::;
1992 2375
1993use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1994 2377
1995my %textures; 2378my %textures;
1996 2379
1997sub new { 2380sub new {
1998 my $class = shift; 2381 my $class = shift;
… …
2008 can_events => 1, 2391 can_events => 1,
2009 @_ 2392 @_
2010 ); 2393 );
2011} 2394}
2012 2395
2013sub activate { }
2014
2015sub button_up { 2396sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2397 my ($self, $ev, $x, $y) = @_;
2017 2398
2018 $self->emit ("activate") 2399 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2400 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2401 && $y >= 0 && $y < $self->{h};
… …
2022 1 2403 1
2023} 2404}
2024 2405
2025############################################################################# 2406#############################################################################
2026 2407
2027package CFClient::UI::CheckBox;
2028
2029our @ISA = CFClient::UI::DrawBG::;
2030
2031my @tex =
2032 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035use CFClient::OpenGL;
2036
2037sub new {
2038 my $class = shift;
2039
2040 $class->SUPER::new (
2041 padding_x => 2,
2042 padding_y => 2,
2043 fg => [1, 1, 1],
2044 active_fg => [1, 1, 0],
2045 bg => [0, 0, 0, 0.2],
2046 active_bg => [1, 1, 1, 0.5],
2047 state => 0,
2048 can_hover => 1,
2049 @_
2050 )
2051}
2052
2053sub size_request {
2054 my ($self) = @_;
2055
2056 (6) x 2
2057}
2058
2059sub button_down {
2060 my ($self, $ev, $x, $y) = @_;
2061
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
2070 1
2071}
2072
2073sub _draw {
2074 my ($self) = @_;
2075
2076 $self->SUPER::_draw;
2077
2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088 glEnable GL_TEXTURE_2D;
2089 $tex->draw_quad_alpha (0, 0, $s, $s);
2090 glDisable GL_TEXTURE_2D;
2091}
2092
2093#############################################################################
2094
2095package CFClient::UI::Image; 2408package CFPlus::UI::VGauge;
2096 2409
2097our @ISA = CFClient::UI::Base::; 2410our @ISA = CFPlus::UI::Base::;
2098
2099use CFClient::OpenGL;
2100use Carp qw/confess/;
2101
2102our %loaded_images;
2103
2104sub new {
2105 my $class = shift;
2106
2107 my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111 $loaded_images{$self->{image}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116 Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119
2120 $self
2121}
2122
2123sub size_request {
2124 my ($self) = @_;
2125
2126 ($self->{tex}->{w}, $self->{tex}->{h})
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131
2132 my $tex = $self->{tex};
2133
2134 my ($w, $h) = ($self->{w}, $self->{h});
2135
2136 if ($self->{rot90}) {
2137 glRotate 90, 0, 0, 1;
2138 glTranslate 0, -$self->{w}, 0;
2139
2140 ($w, $h) = ($h, $w);
2141 }
2142
2143 glEnable GL_TEXTURE_2D;
2144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146 $tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148 glDisable GL_TEXTURE_2D;
2149}
2150
2151#############################################################################
2152
2153package CFClient::UI::VGauge;
2154
2155our @ISA = CFClient::UI::Base::;
2156 2411
2157use List::Util qw(min max); 2412use List::Util qw(min max);
2158 2413
2159use CFClient::OpenGL; 2414use CFPlus::OpenGL;
2160 2415
2161my %tex = ( 2416my %tex = (
2162 food => [ 2417 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2419 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2420 ],
2166 grace => [ 2421 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 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/
2169 ], 2424 ],
2170 hp => [ 2425 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2427 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2428 ],
2174 mana => [ 2429 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 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/
2177 ], 2432 ],
2178); 2433);
2179 2434
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2435# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2495 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2496 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2497
2243 my $h1 = $self->{h} * (1 - $ycut1); 2498 my $h1 = $self->{h} * (1 - $ycut1);
2244 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);
2245 2503
2246 glEnable GL_BLEND; 2504 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2505 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2506 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2507 glEnable GL_TEXTURE_2D;
… …
2268 2526
2269 if ($t3) { 2527 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2528 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2529 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2530 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2531 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2532 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2533 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2534 glEnd;
2277 } 2535 }
2278 2536
2279 glDisable GL_BLEND; 2537 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
2281} 2539}
2282 2540
2283############################################################################# 2541#############################################################################
2284 2542
2285package CFClient::UI::Gauge; 2543package CFPlus::UI::Gauge;
2286 2544
2287our @ISA = CFClient::UI::VBox::; 2545our @ISA = CFPlus::UI::VBox::;
2288 2546
2289sub new { 2547sub new {
2290 my ($class, %arg) = @_; 2548 my ($class, %arg) = @_;
2291 2549
2292 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2552 can_hover => 1,
2295 can_events => 1, 2553 can_events => 1,
2296 %arg, 2554 %arg,
2297 ); 2555 );
2298 2556
2299 $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");
2300 $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);
2301 $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");
2302 2560
2303 $self 2561 $self
2304} 2562}
2305 2563
2306sub set_fontsize { 2564sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2585 $self->{value}->set_text ($val);
2328} 2586}
2329 2587
2330############################################################################# 2588#############################################################################
2331 2589
2332package CFClient::UI::Slider; 2590package CFPlus::UI::Slider;
2333 2591
2334use strict; 2592use strict;
2335 2593
2336use CFClient::OpenGL; 2594use CFPlus::OpenGL;
2337 2595
2338our @ISA = CFClient::UI::DrawBG::; 2596our @ISA = CFPlus::UI::DrawBG::;
2339 2597
2340my @tex = 2598my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 2600 qw(s1_slider.png s1_slider_bg.png);
2343 2601
2344sub new { 2602sub new {
2345 my $class = shift; 2603 my $class = shift;
2346 2604
… …
2367 $self->update; 2625 $self->update;
2368 2626
2369 $self 2627 $self
2370} 2628}
2371 2629
2372sub changed { }
2373
2374sub set_range { 2630sub set_range {
2375 my ($self, $range) = @_; 2631 my ($self, $range) = @_;
2376 2632
2377 ($range, $self->{range}) = ($self->{range}, $range); 2633 ($range, $self->{range}) = ($self->{range}, $range);
2378 2634
… …
2398 if $unit; 2654 if $unit;
2399 2655
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2656 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2657
2402 if ($value != $old_value) { 2658 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2659 $self->emit (changed => $value);
2404 $self->update; 2660 $self->update;
2405 } 2661 }
2406} 2662}
2407 2663
2408sub size_request { 2664sub size_request {
2409 my ($self) = @_; 2665 my ($self) = @_;
2410 2666
2411 ($self->{req_w}, $self->{req_h}) 2667 ($self->{req_w}, $self->{req_h})
2412} 2668}
2413 2669
2414sub button_down { 2670sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2671 my ($self, $ev, $x, $y) = @_;
2416 2672
2417 $self->SUPER::button_down ($ev, $x, $y); 2673 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2674
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2675 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2676
2421 $self->mouse_motion ($ev, $x, $y) 2677 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2678}
2423 2679
2424sub mouse_motion { 2680sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2426 2682
2427 if ($GRAB == $self) { 2683 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2684 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2685
… …
2435 } else { 2691 } else {
2436 return 0; 2692 return 0;
2437 } 2693 }
2438 2694
2439 1 2695 1
2696}
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
2440} 2706}
2441 2707
2442sub update { 2708sub update {
2443 my ($self) = @_; 2709 my ($self) = @_;
2444 2710
… …
2493 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2494} 2760}
2495 2761
2496############################################################################# 2762#############################################################################
2497 2763
2498package CFClient::UI::ValSlider; 2764package CFPlus::UI::ValSlider;
2499 2765
2500our @ISA = CFClient::UI::HBox::; 2766our @ISA = CFPlus::UI::HBox::;
2501 2767
2502sub new { 2768sub new {
2503 my ($class, %arg) = @_; 2769 my ($class, %arg) = @_;
2504 2770
2505 my $range = delete $arg{range}; 2771 my $range = delete $arg{range};
2506 2772
2507 my $self = $class->SUPER::new ( 2773 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2774 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2775 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 2776 to_value => sub { shift },
2511 from_value => sub { shift }, 2777 from_value => sub { shift },
2512 %arg, 2778 %arg,
2513 ); 2779 );
2514 2780
… …
2534sub set_range { shift->{slider}->set_range (@_) } 2800sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 2801sub set_value { shift->{slider}->set_value (@_) }
2536 2802
2537############################################################################# 2803#############################################################################
2538 2804
2539package CFClient::UI::TextScroller; 2805package CFPlus::UI::TextScroller;
2540 2806
2541our @ISA = CFClient::UI::HBox::; 2807our @ISA = CFPlus::UI::HBox::;
2542 2808
2543use CFClient::OpenGL; 2809use CFPlus::OpenGL;
2544 2810
2545sub new { 2811sub new {
2546 my $class = shift; 2812 my $class = shift;
2547 2813
2548 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
2549 fontsize => 1, 2815 fontsize => 1,
2550 can_events => 0, 2816 can_events => 1,
2551 indent => 0, 2817 indent => 0,
2552 #font => default_font 2818 #font => default_font
2553 @_, 2819 @_,
2554 2820
2555 layout => (new CFClient::Layout 1), 2821 layout => (new CFPlus::Layout),
2556 par => [], 2822 par => [],
2557 height => 0, 2823 height => 0,
2558 children => [ 2824 children => [
2559 (new CFClient::UI::Empty expand => 1), 2825 (new CFPlus::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2826 (new CFPlus::UI::Slider vertical => 1),
2561 ], 2827 ],
2562 ); 2828 );
2563 2829
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 2830 $self->{children}[1]->connect (changed => sub { $self->update });
2565 2831
… …
2571 2837
2572 $self->{fontsize} = $fontsize; 2838 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2839 $self->reflow;
2574} 2840}
2575 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
2576sub size_allocate { 2851sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2852 my ($self, $w, $h) = @_;
2578 2853
2579 $self->SUPER::size_allocate ($w, $h); 2854 my ($empty, $slider, @other) = @{ $self->{children} };
2855 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2856
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2857 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2858 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2859 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2860 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2861
2586 $self->reflow; 2862 $self->reflow;
2587}
2588 2863
2589sub text_size { 2864 local $self->{children} = [$empty, $slider];
2865 $self->SUPER::invoke_size_allocate ($w, $h)
2866}
2867
2868sub invoke_mouse_wheel {
2590 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) = @_;
2591 2880
2592 my $layout = $self->{layout}; 2881 my $layout = $self->{layout};
2593 2882
2883 $layout->set_font ($self->{font}) if $self->{font};
2884 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2885 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2886 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2887 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $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}}
2598 2894 );
2895
2599 $layout->size 2896 $layout
2600} 2897}
2601 2898
2602sub reflow { 2899sub reflow {
2603 my ($self) = @_; 2900 my ($self) = @_;
2604 2901
… …
2611 2908
2612 # todo: base offset on lines or so, not on pixels 2909 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 2910 $self->{children}[1]->set_value ($offset);
2614} 2911}
2615 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
2616sub clear { 2928sub clear {
2617 my ($self) = @_; 2929 my ($self) = @_;
2930
2931 my (undef, undef, @other) = @{ $self->{children} };
2932 $self->remove ($_) for @other;
2618 2933
2619 $self->{par} = []; 2934 $self->{par} = [];
2620 $self->{height} = 0; 2935 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2936 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2937}
2623 2938
2624sub add_paragraph { 2939sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2940 my $self = shift;
2626 2941
2627 for my $line (split /\n/, $text) { 2942 for my $para (@_) {
2628 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
2629 $self->{height} += $h; 2990 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2991 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 2992
2633 $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 }
2634} 2999}
2635 3000
2636sub update { 3001sub update {
2637 my ($self) = @_; 3002 my ($self) = @_;
2638 3003
… …
2641 return unless $self->{h} > 0; 3006 return unless $self->{h} > 0;
2642 3007
2643 delete $self->{texture}; 3008 delete $self->{texture};
2644 3009
2645 $ROOT->on_post_alloc ($self => sub { 3010 $ROOT->on_post_alloc ($self => sub {
3011 $self->force_uptodate;
3012
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3013 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 3014
2648 if (delete $self->{need_reflow}) {
2649 my $height = 0;
2650
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2667
2668 $self->{height} = $height;
2669
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2671
2672 delete $self->{texture};
2673 }
2674
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3015 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 3016 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 3017 glClear GL_COLOR_BUFFER_BIT;
2678 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;
2679 my $top = int $self->{children}[1]{range}[0]; 3027 my $top = int $self->{children}[1]{range}[0];
2680 3028
2681 my $y0 = $top; 3029 my $y0 = $top;
2682 my $y1 = $top + $H; 3030 my $y1 = $top + $H;
2683 3031
2684 my $y = 0;
2685
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 3032 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 3033 my $h = $para->{h};
3034 my $y = $para->{y};
2696 3035
2697 if ($y0 < $y + $h && $y < $y1) { 3036 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 3037 my $layout = $self->get_layout ($para);
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 3038
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3039 $layout->render ($para->{indent}, $y - $y0);
2704 3040
2705 glRasterPos $par->[3], $y - $y0; 3041 if (my @w = @{ $para->{widget} }) {
2706 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 }
2707 } 3053 }
2708 3054
2709 $y += $h; 3055 $paridx++;
3056 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3057 }
2711 3058
2712 glDisable GL_BLEND; 3059 $self->{top_paragraph} = $top_paragraph;
2713 }; 3060 };
2714 }); 3061 });
3062}
3063
3064sub reconfigure {
3065 my ($self) = @_;
3066
3067 $self->SUPER::reconfigure;
3068
3069 $_->{w} = 1e10 for @{ $self->{par} };
3070 $self->reflow;
2715} 3071}
2716 3072
2717sub _draw { 3073sub _draw {
2718 my ($self) = @_; 3074 my ($self) = @_;
2719 3075
… …
2722 glColor 0, 0, 0, 1; 3078 glColor 0, 0, 0, 1;
2723 $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});
2724 glDisable GL_TEXTURE_2D; 3080 glDisable GL_TEXTURE_2D;
2725 3081
2726 $self->{children}[1]->draw; 3082 $self->{children}[1]->draw;
2727
2728} 3083}
2729 3084
2730############################################################################# 3085#############################################################################
2731 3086
2732package CFClient::UI::Animator; 3087package CFPlus::UI::Animator;
2733 3088
2734use CFClient::OpenGL; 3089use CFPlus::OpenGL;
2735 3090
2736our @ISA = CFClient::UI::Bin::; 3091our @ISA = CFPlus::UI::Bin::;
2737 3092
2738sub moveto { 3093sub moveto {
2739 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2740 3095
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3096 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3124 glPopMatrix;
2770} 3125}
2771 3126
2772############################################################################# 3127#############################################################################
2773 3128
2774package CFClient::UI::Flopper; 3129package CFPlus::UI::Flopper;
2775 3130
2776our @ISA = CFClient::UI::Button::; 3131our @ISA = CFPlus::UI::Button::;
2777 3132
2778sub new { 3133sub new {
2779 my $class = shift; 3134 my $class = shift;
2780 3135
2781 my $self = $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3148 $self->{other}->toggle_visibility;
2794} 3149}
2795 3150
2796############################################################################# 3151#############################################################################
2797 3152
2798package CFClient::UI::Tooltip; 3153package CFPlus::UI::Tooltip;
2799 3154
2800our @ISA = CFClient::UI::Bin::; 3155our @ISA = CFPlus::UI::Bin::;
2801 3156
2802use CFClient::OpenGL; 3157use CFPlus::OpenGL;
2803 3158
2804sub new { 3159sub new {
2805 my $class = shift; 3160 my $class = shift;
2806 3161
2807 $class->SUPER::new ( 3162 $class->SUPER::new (
… …
2810 ) 3165 )
2811} 3166}
2812 3167
2813sub set_tooltip_from { 3168sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3169 my ($self, $widget) = @_;
3170
3171 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3172 if $widget->{tooltip} =~ /^#(.*)$/;
2815 3173
2816 my $tooltip = $widget->{tooltip}; 3174 my $tooltip = $widget->{tooltip};
2817 3175
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3176 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3177 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2823 } 3181 }
2824 3182
2825 $tooltip =~ s/^\n+//; 3183 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3184 $tooltip =~ s/\n+$//;
2827 3185
2828 $self->add (new CFClient::UI::Label 3186 $self->add (new CFPlus::UI::Label
2829 markup => $tooltip, 3187 markup => $tooltip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3188 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 3189 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3190 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3191 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3192 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3193 );
2836} 3194}
2837 3195
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3199 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3200
2843 ($w + 4, $h + 4) 3201 ($w + 4, $h + 4)
2844} 3202}
2845 3203
2846sub size_allocate { 3204sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3205 my ($self, $w, $h) = @_;
2848 3206
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3207 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3208}
2851 3209
2852sub visibility_change { 3210sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3211 my ($self, $visible) = @_;
2854 3212
2855 return unless $visible; 3213 return unless $visible;
2856 3214
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3215 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3216 my $widget = $self->{owner}
2859 or return; 3217 or return;
2860 3218
3219 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3220 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3221
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3222 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3223 if $x + $self->{w} > $self->{root}{w};
2865 3224
2866 $self->move_abs ($x, $y); 3225 $self->move_abs ($x, $y);
3226 } else {
3227 $self->hide;
3228 }
2867 }); 3229 });
2868} 3230}
2869 3231
2870sub _draw { 3232sub _draw {
2871 my ($self) = @_; 3233 my ($self) = @_;
… …
2895 $self->SUPER::_draw; 3257 $self->SUPER::_draw;
2896} 3258}
2897 3259
2898############################################################################# 3260#############################################################################
2899 3261
2900package CFClient::UI::Face; 3262package CFPlus::UI::Face;
2901 3263
2902our @ISA = CFClient::UI::Base::; 3264our @ISA = CFPlus::UI::DrawBG::;
2903 3265
2904use CFClient::OpenGL; 3266use CFPlus::OpenGL;
2905 3267
2906sub new { 3268sub new {
2907 my $class = shift; 3269 my $class = shift;
2908 3270
2909 my $self = $class->SUPER::new ( 3271 my $self = $class->SUPER::new (
… …
2911 can_events => 0, 3273 can_events => 0,
2912 @_, 3274 @_,
2913 ); 3275 );
2914 3276
2915 if ($self->{anim} && $self->{animspeed}) { 3277 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self); 3278 CFPlus::weaken (my $widget = $self);
2917 3279
2918 $self->{timer} = Event->timer ( 3280 $self->{timer} = Event->timer (
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920 hard => 1, 3282 hard => 1,
2921 interval => $self->{animspeed}, 3283 interval => $self->{animspeed},
… …
2944sub _draw { 3306sub _draw {
2945 my ($self) = @_; 3307 my ($self) = @_;
2946 3308
2947 return unless $::CONN; 3309 return unless $::CONN;
2948 3310
3311 $self->SUPER::_draw;
3312
2949 my $face; 3313 my $face;
2950 3314
2951 if ($self->{frame}) { 3315 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}]; 3316 my $anim = $::CONN->{anim}[$self->{anim}];
2953 3317
… …
2975 $self->SUPER::destroy; 3339 $self->SUPER::destroy;
2976} 3340}
2977 3341
2978############################################################################# 3342#############################################################################
2979 3343
2980package CFClient::UI::Buttonbar; 3344package CFPlus::UI::Buttonbar;
2981 3345
2982our @ISA = CFClient::UI::HBox::; 3346our @ISA = CFPlus::UI::HBox::;
2983 3347
2984# TODO: should actualyl wrap buttons and other goodies. 3348# TODO: should actually wrap buttons and other goodies.
2985 3349
2986############################################################################# 3350#############################################################################
2987 3351
2988package CFClient::UI::Menu; 3352package CFPlus::UI::Menu;
2989 3353
2990our @ISA = CFClient::UI::FancyFrame::; 3354our @ISA = CFPlus::UI::Toplevel::;
2991 3355
2992use CFClient::OpenGL; 3356use CFPlus::OpenGL;
2993 3357
2994sub new { 3358sub new {
2995 my $class = shift; 3359 my $class = shift;
2996 3360
2997 my $self = $class->SUPER::new ( 3361 my $self = $class->SUPER::new (
2998 items => [], 3362 items => [],
2999 z => 100, 3363 z => 100,
3000 @_, 3364 @_,
3001 ); 3365 );
3002 3366
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3367 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004 3368
3005 for my $item (@{ $self->{items} }) { 3369 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3370 my ($widget, $cb, $tooltip) = @$item;
3007 3371
3008 # handle various types of items, only text for now 3372 # handle various types of items, only text for now
3009 if (!ref $widget) { 3373 if (!ref $widget) {
3374 if ($widget =~ /\t/) {
3375 my ($left, $right) = split /\t/, $widget, 2;
3376
3010 $widget = new CFClient::UI::Label 3377 $widget = new CFPlus::UI::HBox
3011 can_hover => 1, 3378 can_hover => 1,
3012 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,
3013 markup => $widget, 3391 markup => $widget,
3014 tooltip => $tooltip 3392 tooltip => $tooltip;
3393 }
3015 } 3394 }
3016 3395
3017 $self->{item}{$widget} = $item; 3396 $self->{item}{$widget} = $item;
3018 3397
3019 $self->{vbox}->add ($widget); 3398 $self->{vbox}->add ($widget);
… …
3024 3403
3025# popup given the event (must be a mouse button down event currently) 3404# popup given the event (must be a mouse button down event currently)
3026sub popup { 3405sub popup {
3027 my ($self, $ev) = @_; 3406 my ($self, $ev) = @_;
3028 3407
3029 $self->_emit ("popdown"); 3408 $self->emit ("popdown");
3030 3409
3031 # maybe save $GRAB? must be careful about events... 3410 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3411 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3412 $self->{button} = $ev->{button};
3034 3413
3035 $self->show; 3414 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3415 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3416}
3038 3417
3039sub mouse_motion { 3418sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3419 my ($self, $ev, $x, $y) = @_;
3041 3420
3042 # TODO: should use vbox->find_widget or so 3421 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3422 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3423 $self->{hover} = $self->{item}{$HOVER};
3045 3424
3046 0 3425 0
3047} 3426}
3048 3427
3049sub button_up { 3428sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3429 my ($self, $ev, $x, $y) = @_;
3051 3430
3052 if ($ev->{button} == $self->{button}) { 3431 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3432 undef $GRAB;
3054 $self->hide; 3433 $self->hide;
3055 3434
3056 $self->_emit ("popdown"); 3435 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3436 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3437 } else {
3059 return 0 3438 return 0
3060 } 3439 }
3061 3440
3062 1 3441 1
3063} 3442}
3064 3443
3065############################################################################# 3444#############################################################################
3066 3445
3067package CFClient::UI::Multiplexer; 3446package CFPlus::UI::Multiplexer;
3068 3447
3069our @ISA = CFClient::UI::Container::; 3448our @ISA = CFPlus::UI::Container::;
3070 3449
3071sub new { 3450sub new {
3072 my $class = shift; 3451 my $class = shift;
3073 3452
3074 my $self = $class->SUPER::new ( 3453 my $self = $class->SUPER::new (
… …
3088 3467
3089 $self->{current} = $self->{children}[0] 3468 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3469 if @{ $self->{children} };
3091} 3470}
3092 3471
3472sub get_current_page {
3473 my ($self) = @_;
3474
3475 $self->{current}
3476}
3477
3093sub set_current_page { 3478sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3479 my ($self, $page_or_widget) = @_;
3095 3480
3096 my $widget = ref $page_or_widget 3481 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3482 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3483 : $self->{children}[$page_or_widget];
3099 3484
3100 $self->{current} = $widget; 3485 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3486 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3487
3103 $self->_emit (page_changed => $self->{current}); 3488 $self->emit (page_changed => $self->{current});
3104 3489
3105 $self->realloc; 3490 $self->realloc;
3106} 3491}
3107 3492
3108sub visible_children { 3493sub visible_children {
… …
3113 my ($self) = @_; 3498 my ($self) = @_;
3114 3499
3115 $self->{current}->size_request 3500 $self->{current}->size_request
3116} 3501}
3117 3502
3118sub size_allocate { 3503sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
3120 3505
3121 $self->{current}->configure (0, 0, $w, $h); 3506 $self->{current}->configure (0, 0, $w, $h);
3507
3508 1
3122} 3509}
3123 3510
3124sub _draw { 3511sub _draw {
3125 my ($self) = @_; 3512 my ($self) = @_;
3126 3513
3127 $self->{current}->draw; 3514 $self->{current}->draw;
3128} 3515}
3129 3516
3130############################################################################# 3517#############################################################################
3131 3518
3132package CFClient::UI::Notebook; 3519package CFPlus::UI::Notebook;
3133 3520
3134our @ISA = CFClient::UI::VBox::; 3521our @ISA = CFPlus::UI::VBox::;
3135 3522
3136sub new { 3523sub new {
3137 my $class = shift; 3524 my $class = shift;
3138 3525
3139 my $self = $class->SUPER::new ( 3526 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3527 buttonbar => (new CFPlus::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3528 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self 3529 # filter => # will be put between multiplexer and $self
3143 @_, 3530 @_,
3144 ); 3531 );
3145 3532
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3533 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3150} 3537}
3151 3538
3152sub add { 3539sub add {
3153 my ($self, $title, $widget, $tooltip) = @_; 3540 my ($self, $title, $widget, $tooltip) = @_;
3154 3541
3155 Scalar::Util::weaken $self; 3542 CFPlus::weaken $self;
3156 3543
3157 $self->{buttonbar}->add (new CFClient::UI::Button 3544 $self->{buttonbar}->add (new CFPlus::UI::Button
3158 markup => $title, 3545 markup => $title,
3159 tooltip => $tooltip, 3546 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) }, 3547 on_activate => sub { $self->set_current_page ($widget) },
3161 ); 3548 );
3162 3549
3163 $self->{multiplexer}->add ($widget); 3550 $self->{multiplexer}->add ($widget);
3164} 3551}
3165 3552
3553sub get_current_page {
3554 my ($self) = @_;
3555
3556 $self->{multiplexer}->get_current_page
3557}
3558
3166sub set_current_page { 3559sub set_current_page {
3167 my ($self, $page) = @_; 3560 my ($self, $page) = @_;
3168 3561
3169 $self->{multiplexer}->set_current_page ($page); 3562 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3563 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3564}
3172 3565
3173############################################################################# 3566#############################################################################
3174 3567
3175package CFClient::UI::Combobox; 3568package CFPlus::UI::Selector;
3176 3569
3177use utf8; 3570use utf8;
3178 3571
3179our @ISA = CFClient::UI::Button::; 3572our @ISA = CFPlus::UI::Button::;
3180 3573
3181sub new { 3574sub new {
3182 my $class = shift; 3575 my $class = shift;
3183 3576
3184 my $self = $class->SUPER::new ( 3577 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 3583 $self->_set_value ($self->{value});
3191 3584
3192 $self 3585 $self
3193} 3586}
3194 3587
3195sub button_down { 3588sub invoke_button_down {
3196 my ($self, $ev) = @_; 3589 my ($self, $ev) = @_;
3197 3590
3198 my @menu_items; 3591 my @menu_items;
3199 3592
3200 for (@{ $self->{options} }) { 3593 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 3594 my ($value, $title, $tooltip) = @$_;
3202 3595
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3596 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 3597 }
3205 3598
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3599 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 3600}
3208 3601
3209sub _set_value { 3602sub _set_value {
3210 my ($self, $value) = @_; 3603 my ($self, $value) = @_;
3211 3604
… …
3221 my ($self, $value) = @_; 3614 my ($self, $value) = @_;
3222 3615
3223 return unless $self->{value} ne $value; 3616 return unless $self->{value} ne $value;
3224 3617
3225 $self->_set_value ($value); 3618 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3619 $self->emit (changed => $value);
3227} 3620}
3228 3621
3229############################################################################# 3622#############################################################################
3230 3623
3231package CFClient::UI::Statusbox; 3624package CFPlus::UI::Statusbox;
3232 3625
3233our @ISA = CFClient::UI::VBox::; 3626our @ISA = CFPlus::UI::VBox::;
3234 3627
3235sub new { 3628sub new {
3236 my $class = shift; 3629 my $class = shift;
3237 3630
3238 my $self = $class->SUPER::new ( 3631 my $self = $class->SUPER::new (
3239 fontsize => 0.8, 3632 fontsize => 0.8,
3240 @_, 3633 @_,
3241 ); 3634 );
3242 3635
3243 Scalar::Util::weaken (my $this = $self); 3636 CFPlus::weaken (my $this = $self);
3244 3637
3245 $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 });
3246 3639
3247 $self 3640 $self
3248} 3641}
… …
3250sub reorder { 3643sub reorder {
3251 my ($self) = @_; 3644 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 3645 my $NOW = Time::HiRes::time;
3253 3646
3254 # freeze display when hovering over any label 3647 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 3648 return if $CFPlus::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3649 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 3650 values %{ $self->{item} };
3258 3651
3259 while (my ($k, $v) = each %{ $self->{item} }) { 3652 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3653 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 3654 }
… …
3282 for ($short) { 3675 for ($short) {
3283 s/^\s+//; 3676 s/^\s+//;
3284 s/\s+/ /g; 3677 s/\s+/ /g;
3285 } 3678 }
3286 3679
3287 new CFClient::UI::Label 3680 new CFPlus::UI::Label
3288 markup => $short, 3681 markup => $short,
3289 tooltip => $item->{tooltip}, 3682 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 3683 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 3684 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 3685 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3346 count => 1, 3739 count => 1,
3347 %arg, 3740 %arg,
3348 }; 3741 };
3349 } 3742 }
3350 3743
3744 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3745 $self->reorder;
3746 });
3352} 3747}
3353 3748
3354sub reconfigure { 3749sub reconfigure {
3355 my ($self) = @_; 3750 my ($self) = @_;
3356 3751
… …
3369 $self->SUPER::destroy; 3764 $self->SUPER::destroy;
3370} 3765}
3371 3766
3372############################################################################# 3767#############################################################################
3373 3768
3374package CFClient::UI::Inventory;
3375
3376our @ISA = CFClient::UI::ScrolledWindow::;
3377
3378sub new {
3379 my $class = shift;
3380
3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
3623 @_,
3624 )
3625}
3626
3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
3713 my ($self, $spell) = @_;
3714
3715 $self->{spell}->{$spell->{name}} = $spell;
3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root; 3769package CFPlus::UI::Root;
3736 3770
3737our @ISA = CFClient::UI::Container::; 3771our @ISA = CFPlus::UI::Container::;
3738 3772
3739use List::Util qw(min max); 3773use List::Util qw(min max);
3740 3774
3741use CFClient::OpenGL; 3775use CFPlus::OpenGL;
3742 3776
3743sub new { 3777sub new {
3744 my $class = shift; 3778 my $class = shift;
3745 3779
3746 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3747 visible => 1, 3781 visible => 1,
3748 @_, 3782 @_,
3749 ); 3783 );
3750 3784
3751 Scalar::Util::weaken ($self->{root} = $self); 3785 CFPlus::weaken ($self->{root} = $self);
3752 3786
3753 $self 3787 $self
3754} 3788}
3755 3789
3756sub size_request { 3790sub size_request {
… …
3771 $coord = $max - $size if $coord > $max - $size; 3805 $coord = $max - $size if $coord > $max - $size;
3772 3806
3773 int $coord + 0.5 3807 int $coord + 0.5
3774} 3808}
3775 3809
3776sub size_allocate { 3810sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 3811 my ($self, $w, $h) = @_;
3778 3812
3779 for my $child ($self->children) { 3813 for my $child ($self->children) {
3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3814 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3781 3815
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 3819 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 3820 $Y = _to_pixel $Y, $H, $self->{h};
3787 3821
3788 $child->configure ($X, $Y, $W, $H); 3822 $child->configure ($X, $Y, $W, $H);
3789 } 3823 }
3824
3825 1
3790} 3826}
3791 3827
3792sub coord2local { 3828sub coord2local {
3793 my ($self, $x, $y) = @_; 3829 my ($self, $x, $y) = @_;
3794 3830
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 3957
3922 $w = 0 if $w < 0; 3958 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 3959 $h = 0 if $h < 0;
3924 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
3925 $w = int $w + 0.5; 3970 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 3971 $h = int $h + 0.5;
3927 3972
3928 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}) {
3929 $widget->{old_w} = $widget->{w}; 3974 $widget->{old_w} = $widget->{w};
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3997 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 3998 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 3999 glLoadIdentity;
3955 4000
3956 { 4001 {
3957 package CFClient::UI::Base; 4002 package CFPlus::UI::Base;
3958 4003
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4004 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4005 (0, 0, $self->{w}, $self->{h});
3961 }
3962 4006
3963 $self->_draw; 4007 $self->_draw;
4008 }
3964} 4009}
3965 4010
3966############################################################################# 4011#############################################################################
3967 4012
3968package CFClient::UI; 4013package CFPlus::UI;
3969 4014
3970$ROOT = new CFClient::UI::Root; 4015$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4016$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4017
39731 40181
3974 4019

Diff Legend

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