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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
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) {
1981 # what a hack
1982 $self->{cursor} =
1983 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1984 ? length $1
1985 : 0;
1986 } elsif ($sym == CFPlus::SDLK_END) {
1987 # uh, again
1988 $self->{cursor} =
1989 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1990 ? $self->{cursor} + length $1
1991 : length $self->{text};
1992 } elsif ($uni == 21) { # ctrl-u
1993 $text = "";
1790 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1996 $self->emit ('escape');
1795 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2001 } else {
1798 return 0; 2002 return 0;
1799 } 2003 }
1800 2004
1801 $self->_set_text ($text); 2005 $self->_set_text ($text);
1802 2006
1803 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1804 2009
1805 1 2010 1
1806} 2011}
1807 2012
1808sub focus_in { 2013sub invoke_focus_in {
1809 my ($self) = @_; 2014 my ($self) = @_;
1810 2015
1811 $self->{last_activity} = $::NOW; 2016 $self->{last_activity} = $::NOW;
1812 2017
1813 $self->SUPER::focus_in; 2018 $self->SUPER::invoke_focus_in
1814} 2019}
1815 2020
1816sub button_down { 2021sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
1818 2023
1819 $self->SUPER::button_down ($ev, $x, $y); 2024 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 2025
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2026 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2027
1823 # byte-index to char-index 2028 # byte-index to char-index
1824 my $text = $self->{text}; 2029 my $text = $self->{text};
1825 utf8::encode $text; 2030 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2031 $self->{cursor} = length $text;
1827 2032
1828 $self->_set_text ($self->{text}); 2033 $self->_set_text ($self->{text});
1829 $self->update; 2034 $self->update;
1830 2035
1831 1 2036 1
1832} 2037}
1833 2038
1834sub mouse_motion { 2039sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2041# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 2042
1838 0 2043 1
1839} 2044}
1840 2045
1841sub _draw { 2046sub _draw {
1842 my ($self) = @_; 2047 my ($self) = @_;
1843 2048
… …
1870 utf8::encode $text; 2075 utf8::encode $text;
1871 2076
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2077 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2078 }
1874 2079
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2080 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2081 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}; 2082 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2083 glEnd;
1880 } 2084 }
1881} 2085}
1882 2086
2087#############################################################################
2088
1883package CFClient::UI::Entry; 2089package CFPlus::UI::Entry;
1884 2090
1885our @ISA = CFClient::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1886 2092
1887use CFClient::OpenGL; 2093use CFPlus::OpenGL;
1888 2094
1889sub key_down { 2095sub invoke_key_down {
1890 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1891 2097
1892 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1893 2099
1894 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
2103
1897 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 2106 $self->emit (activate => $txt);
1900 $self->update; 2107 $self->update;
1901 2108
1902 } elsif ($sym == CFClient::SDLK_UP) { 2109 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2110 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2111 $self->{history_saveback} = $self->get_text;
1905 } 2112 }
1906 if (@{$self->{history} || []} > 0) { 2113 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2114 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2116 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2117 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2118 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2119 }
1913 2120
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2121 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2122 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2123 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2124
1918 if ($self->{history_pointer} >= 0) { 2125 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2126 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 2127 } else {
1921 $self->set_text ($self->{history_saveback}); 2128 $self->set_text ($self->{history_saveback});
1922 } 2129 }
1923 2130
1924 } else { 2131 } else {
1925 return $self->SUPER::key_down ($ev) 2132 return $self->SUPER::invoke_key_down ($ev)
1926 } 2133 }
1927 2134
1928 1 2135 1
1929} 2136}
1930 2137
1931############################################################################# 2138#############################################################################
1932 2139
2140package CFPlus::UI::TextEdit;
2141
2142our @ISA = CFPlus::UI::EntryBase::;
2143
2144use CFPlus::OpenGL;
2145
2146sub move_cursor_ver {
2147 my ($self, $dy) = @_;
2148
2149 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2150
2151 $y += $dy;
2152
2153 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2154 $self->{cursor} = $index;
2155 delete $self->{cur_h};
2156 $self->update;
2157 return;
2158 }
2159}
2160
2161sub invoke_key_down {
2162 my ($self, $ev) = @_;
2163
2164 my $sym = $ev->{sym};
2165
2166 if ($sym == CFPlus::SDLK_UP) {
2167 $self->move_cursor_ver (-1);
2168 } elsif ($sym == CFPlus::SDLK_DOWN) {
2169 $self->move_cursor_ver (+1);
2170 } else {
2171 return $self->SUPER::invoke_key_down ($ev)
2172 }
2173
2174 1
2175}
2176
2177#############################################################################
2178
1933package CFClient::UI::Button; 2179package CFPlus::UI::Button;
1934 2180
1935our @ISA = CFClient::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
1936 2182
1937use CFClient::OpenGL; 2183use CFPlus::OpenGL;
1938 2184
1939my @tex = 2185my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2187 qw(b1_button_active.png);
1942 2188
1943sub new { 2189sub new {
1944 my $class = shift; 2190 my $class = shift;
1945 2191
… …
1954 can_events => 1, 2200 can_events => 1,
1955 @_ 2201 @_
1956 ) 2202 )
1957} 2203}
1958 2204
1959sub activate { }
1960
1961sub button_up { 2205sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1963 2207
1964 $self->emit ("activate") 2208 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2209 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2210 && $y >= 0 && $y < $self->{h};
… …
1984 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1985} 2229}
1986 2230
1987############################################################################# 2231#############################################################################
1988 2232
2233package CFPlus::UI::CheckBox;
2234
2235our @ISA = CFPlus::UI::DrawBG::;
2236
2237my @tex =
2238 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2240
2241use CFPlus::OpenGL;
2242
2243sub new {
2244 my $class = shift;
2245
2246 $class->SUPER::new (
2247 padding_x => 2,
2248 padding_y => 2,
2249 fg => [1, 1, 1],
2250 active_fg => [1, 1, 0],
2251 bg => [0, 0, 0, 0.2],
2252 active_bg => [1, 1, 1, 0.5],
2253 state => 0,
2254 can_hover => 1,
2255 @_
2256 )
2257}
2258
2259sub size_request {
2260 my ($self) = @_;
2261
2262 (6) x 2
2263}
2264
2265sub toggle {
2266 my ($self) = @_;
2267
2268 $self->{state} = !$self->{state};
2269 $self->emit (changed => $self->{state});
2270 $self->update;
2271}
2272
2273sub invoke_button_down {
2274 my ($self, $ev, $x, $y) = @_;
2275
2276 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2277 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2278 $self->toggle;
2279 } else {
2280 return 0
2281 }
2282
2283 1
2284}
2285
2286sub _draw {
2287 my ($self) = @_;
2288
2289 $self->SUPER::_draw;
2290
2291 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2292
2293 my ($w, $h) = @$self{qw(w h)};
2294
2295 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2296
2297 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2298
2299 my $tex = $self->{state} ? $tex[1] : $tex[0];
2300
2301 glEnable GL_TEXTURE_2D;
2302 $tex->draw_quad_alpha (0, 0, $s, $s);
2303 glDisable GL_TEXTURE_2D;
2304}
2305
2306#############################################################################
2307
2308package CFPlus::UI::Image;
2309
2310our @ISA = CFPlus::UI::Base::;
2311
2312use CFPlus::OpenGL;
2313
2314our %texture_cache;
2315
2316sub new {
2317 my $class = shift;
2318
2319 my $self = $class->SUPER::new (
2320 can_events => 0,
2321 @_,
2322 );
2323
2324 $self->{path} || $self->{tex}
2325 or Carp::croak "'path' or 'tex' attributes required";
2326
2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2328 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2329
2330 CFPlus::weaken $texture_cache{$self->{path}};
2331
2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2333
2334 $self
2335}
2336
2337sub STORABLE_freeze {
2338 my ($self, $cloning) = @_;
2339
2340 $self->{path}
2341 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2342
2343 $self->{path}
2344}
2345
2346sub STORABLE_attach {
2347 my ($self, $cloning, $path) = @_;
2348
2349 $self->new (path => $path)
2350}
2351
2352sub size_request {
2353 my ($self) = @_;
2354
2355 ($self->{tex}{w}, $self->{tex}{h})
2356}
2357
2358sub _draw {
2359 my ($self) = @_;
2360
2361 my $tex = $self->{tex};
2362
2363 my ($w, $h) = ($self->{w}, $self->{h});
2364
2365 if ($self->{rot90}) {
2366 glRotate 90, 0, 0, 1;
2367 glTranslate 0, -$self->{w}, 0;
2368
2369 ($w, $h) = ($h, $w);
2370 }
2371
2372 glEnable GL_TEXTURE_2D;
2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2374
2375 $tex->draw_quad (0, 0, $w, $h);
2376
2377 glDisable GL_TEXTURE_2D;
2378}
2379
2380#############################################################################
2381
1989package CFClient::UI::ImageButton; 2382package CFPlus::UI::ImageButton;
1990 2383
1991our @ISA = CFClient::UI::Image::; 2384our @ISA = CFPlus::UI::Image::;
1992 2385
1993use CFClient::OpenGL; 2386use CFPlus::OpenGL;
1994 2387
1995my %textures; 2388my %textures;
1996 2389
1997sub new { 2390sub new {
1998 my $class = shift; 2391 my $class = shift;
… …
2008 can_events => 1, 2401 can_events => 1,
2009 @_ 2402 @_
2010 ); 2403 );
2011} 2404}
2012 2405
2013sub activate { }
2014
2015sub button_up { 2406sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2407 my ($self, $ev, $x, $y) = @_;
2017 2408
2018 $self->emit ("activate") 2409 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2410 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2411 && $y >= 0 && $y < $self->{h};
… …
2022 1 2413 1
2023} 2414}
2024 2415
2025############################################################################# 2416#############################################################################
2026 2417
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; 2418package CFPlus::UI::VGauge;
2096 2419
2097our @ISA = CFClient::UI::Base::; 2420our @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 2421
2157use List::Util qw(min max); 2422use List::Util qw(min max);
2158 2423
2159use CFClient::OpenGL; 2424use CFPlus::OpenGL;
2160 2425
2161my %tex = ( 2426my %tex = (
2162 food => [ 2427 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2429 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2430 ],
2166 grace => [ 2431 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2432 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/ 2433 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169 ], 2434 ],
2170 hp => [ 2435 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2437 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2438 ],
2174 mana => [ 2439 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2440 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/ 2441 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177 ], 2442 ],
2178); 2443);
2179 2444
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2445# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2505 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2506 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2507
2243 my $h1 = $self->{h} * (1 - $ycut1); 2508 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2509 my $h2 = $self->{h} * (1 - $ycut2);
2510 my $h3 = $self->{h};
2511
2512 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2513
2246 glEnable GL_BLEND; 2514 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2515 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2516 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
… …
2268 2536
2269 if ($t3) { 2537 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2538 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2539 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2540 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2541 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2542 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2543 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2544 glEnd;
2277 } 2545 }
2278 2546
2279 glDisable GL_BLEND; 2547 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2281} 2549}
2282 2550
2283############################################################################# 2551#############################################################################
2284 2552
2285package CFClient::UI::Gauge; 2553package CFPlus::UI::Gauge;
2286 2554
2287our @ISA = CFClient::UI::VBox::; 2555our @ISA = CFPlus::UI::VBox::;
2288 2556
2289sub new { 2557sub new {
2290 my ($class, %arg) = @_; 2558 my ($class, %arg) = @_;
2291 2559
2292 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2562 can_hover => 1,
2295 can_events => 1, 2563 can_events => 1,
2296 %arg, 2564 %arg,
2297 ); 2565 );
2298 2566
2299 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2567 $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); 2568 $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"); 2569 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302 2570
2303 $self 2571 $self
2304} 2572}
2305 2573
2306sub set_fontsize { 2574sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2595 $self->{value}->set_text ($val);
2328} 2596}
2329 2597
2330############################################################################# 2598#############################################################################
2331 2599
2332package CFClient::UI::Slider; 2600package CFPlus::UI::Slider;
2333 2601
2334use strict; 2602use strict;
2335 2603
2336use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2337 2605
2338our @ISA = CFClient::UI::DrawBG::; 2606our @ISA = CFPlus::UI::DrawBG::;
2339 2607
2340my @tex = 2608my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 2610 qw(s1_slider.png s1_slider_bg.png);
2343 2611
2344sub new { 2612sub new {
2345 my $class = shift; 2613 my $class = shift;
2346 2614
… …
2367 $self->update; 2635 $self->update;
2368 2636
2369 $self 2637 $self
2370} 2638}
2371 2639
2372sub changed { }
2373
2374sub set_range { 2640sub set_range {
2375 my ($self, $range) = @_; 2641 my ($self, $range) = @_;
2376 2642
2377 ($range, $self->{range}) = ($self->{range}, $range); 2643 ($range, $self->{range}) = ($self->{range}, $range);
2378 2644
… …
2398 if $unit; 2664 if $unit;
2399 2665
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2666 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2667
2402 if ($value != $old_value) { 2668 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2669 $self->emit (changed => $value);
2404 $self->update; 2670 $self->update;
2405 } 2671 }
2406} 2672}
2407 2673
2408sub size_request { 2674sub size_request {
2409 my ($self) = @_; 2675 my ($self) = @_;
2410 2676
2411 ($self->{req_w}, $self->{req_h}) 2677 ($self->{req_w}, $self->{req_h})
2412} 2678}
2413 2679
2414sub button_down { 2680sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2416 2682
2417 $self->SUPER::button_down ($ev, $x, $y); 2683 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2684
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2686
2421 $self->mouse_motion ($ev, $x, $y) 2687 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2688}
2423 2689
2424sub mouse_motion { 2690sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2426 2692
2427 if ($GRAB == $self) { 2693 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2694 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2695
… …
2435 } else { 2701 } else {
2436 return 0; 2702 return 0;
2437 } 2703 }
2438 2704
2439 1 2705 1
2706}
2707
2708sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_;
2710
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712
2713 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2714
2715 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2716
2717 ! ! $delta
2440} 2718}
2441 2719
2442sub update { 2720sub update {
2443 my ($self) = @_; 2721 my ($self) = @_;
2444 2722
… …
2493 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2494} 2772}
2495 2773
2496############################################################################# 2774#############################################################################
2497 2775
2498package CFClient::UI::ValSlider; 2776package CFPlus::UI::ValSlider;
2499 2777
2500our @ISA = CFClient::UI::HBox::; 2778our @ISA = CFPlus::UI::HBox::;
2501 2779
2502sub new { 2780sub new {
2503 my ($class, %arg) = @_; 2781 my ($class, %arg) = @_;
2504 2782
2505 my $range = delete $arg{range}; 2783 my $range = delete $arg{range};
2506 2784
2507 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2786 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2787 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 2788 to_value => sub { shift },
2511 from_value => sub { shift }, 2789 from_value => sub { shift },
2512 %arg, 2790 %arg,
2513 ); 2791 );
2514 2792
… …
2534sub set_range { shift->{slider}->set_range (@_) } 2812sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 2813sub set_value { shift->{slider}->set_value (@_) }
2536 2814
2537############################################################################# 2815#############################################################################
2538 2816
2539package CFClient::UI::TextScroller; 2817package CFPlus::UI::TextScroller;
2540 2818
2541our @ISA = CFClient::UI::HBox::; 2819our @ISA = CFPlus::UI::HBox::;
2542 2820
2543use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2544 2822
2545sub new { 2823sub new {
2546 my $class = shift; 2824 my $class = shift;
2547 2825
2548 my $self = $class->SUPER::new ( 2826 my $self = $class->SUPER::new (
2549 fontsize => 1, 2827 fontsize => 1,
2550 can_events => 0, 2828 can_events => 1,
2551 indent => 0, 2829 indent => 0,
2552 #font => default_font 2830 #font => default_font
2553 @_, 2831 @_,
2554 2832
2555 layout => (new CFClient::Layout 1), 2833 layout => (new CFPlus::Layout),
2556 par => [], 2834 par => [],
2835 max_par => 0,
2557 height => 0, 2836 height => 0,
2558 children => [ 2837 children => [
2559 (new CFClient::UI::Empty expand => 1), 2838 (new CFPlus::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2839 (new CFPlus::UI::Slider vertical => 1),
2561 ], 2840 ],
2562 ); 2841 );
2563 2842
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 2843 $self->{children}[1]->connect (changed => sub { $self->update });
2565 2844
… …
2571 2850
2572 $self->{fontsize} = $fontsize; 2851 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2852 $self->reflow;
2574} 2853}
2575 2854
2855sub size_request {
2856 my ($self) = @_;
2857
2858 my ($empty, $slider) = @{ $self->{children} };
2859
2860 local $self->{children} = [$empty, $slider];
2861 $self->SUPER::size_request
2862}
2863
2576sub size_allocate { 2864sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2865 my ($self, $w, $h) = @_;
2578 2866
2579 $self->SUPER::size_allocate ($w, $h); 2867 my ($empty, $slider, @other) = @{ $self->{children} };
2868 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2869
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2870 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2871 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2872 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2873 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2874
2586 $self->reflow; 2875 $self->reflow;
2587}
2588 2876
2589sub text_size { 2877 local $self->{children} = [$empty, $slider];
2878 $self->SUPER::invoke_size_allocate ($w, $h)
2879}
2880
2881sub invoke_mouse_wheel {
2590 my ($self, $text, $indent) = @_; 2882 my ($self, $ev) = @_;
2883
2884 return 0 unless $ev->{dy}; # only vertical movements
2885
2886 $self->{children}[1]->emit (mouse_wheel => $ev);
2887
2888 1
2889}
2890
2891sub get_layout {
2892 my ($self, $para) = @_;
2591 2893
2592 my $layout = $self->{layout}; 2894 my $layout = $self->{layout};
2593 2895
2896 $layout->set_font ($self->{font}) if $self->{font};
2897 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2898 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2899 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2900 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2901 $layout->set_markup ($para->{markup});
2902
2903 $layout->set_shapes (
2904 map
2905 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2906 @{$para->{widget}}
2598 2907 );
2908
2599 $layout->size 2909 $layout
2600} 2910}
2601 2911
2602sub reflow { 2912sub reflow {
2603 my ($self) = @_; 2913 my ($self) = @_;
2604 2914
… …
2611 2921
2612 # todo: base offset on lines or so, not on pixels 2922 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 2923 $self->{children}[1]->set_value ($offset);
2614} 2924}
2615 2925
2926sub current_paragraph {
2927 my ($self) = @_;
2928
2929 $self->{top_paragraph} - 1
2930}
2931
2932sub scroll_to {
2933 my ($self, $para) = @_;
2934
2935 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2936
2937 $self->{scroll_to} = $para;
2938 $self->update;
2939}
2940
2616sub clear { 2941sub clear {
2617 my ($self) = @_; 2942 my ($self) = @_;
2943
2944 my (undef, undef, @other) = @{ $self->{children} };
2945 $self->remove ($_) for @other;
2618 2946
2619 $self->{par} = []; 2947 $self->{par} = [];
2620 $self->{height} = 0; 2948 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2949 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2950}
2623 2951
2624sub add_paragraph { 2952sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2953 my $self = shift;
2626 2954
2627 for my $line (split /\n/, $text) { 2955 for my $para (@_) {
2628 my ($w, $h) = $self->text_size ($line); 2956 $para = {
2957 fg => [1, 1, 1, 1],
2958 indent => 0,
2959 markup => "",
2960 widget => [],
2961 ref $para ? %$para : (markup => $para),
2962 w => 1e10,
2963 wrapped => 1,
2964 };
2965
2966 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2967 push @{$self->{par}}, $para;
2968 }
2969
2970 if (my $max = $self->{max_par}) {
2971 shift @{$self->{par}} while @{$self->{par}} > $max;
2972 }
2973
2974 $self->{need_reflow}++;
2975 $self->update;
2976}
2977
2978sub scroll_to_bottom {
2979 my ($self) = @_;
2980
2981 $self->{scroll_to} = $#{$self->{par}};
2982 $self->update;
2983}
2984
2985sub force_uptodate {
2986 my ($self) = @_;
2987
2988 if (delete $self->{need_reflow}) {
2989 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2990
2991 my $height = 0;
2992
2993 for my $para (@{$self->{par}}) {
2994 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2995 my $layout = $self->get_layout ($para);
2996 my ($w, $h) = $layout->size;
2997
2998 $para->{w} = $w + $para->{indent};
2999 $para->{h} = $h;
3000 $para->{wrapped} = $layout->has_wrapped;
3001 }
3002
3003 $para->{y} = $height;
3004 $height += $para->{h};
3005 }
3006
2629 $self->{height} += $h; 3007 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3008 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 3009
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3010 delete $self->{texture};
3011 }
3012
3013 if (my $paridx = delete $self->{scroll_to}) {
3014 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3015 }
2634} 3016}
2635 3017
2636sub update { 3018sub update {
2637 my ($self) = @_; 3019 my ($self) = @_;
2638 3020
… …
2641 return unless $self->{h} > 0; 3023 return unless $self->{h} > 0;
2642 3024
2643 delete $self->{texture}; 3025 delete $self->{texture};
2644 3026
2645 $ROOT->on_post_alloc ($self => sub { 3027 $ROOT->on_post_alloc ($self => sub {
3028 $self->force_uptodate;
3029
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3030 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 3031
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 { 3032 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 3033 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 3034 glClear GL_COLOR_BUFFER_BIT;
2678 3035
3036 package CFPlus::UI::Base;
3037 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3038 (0, 0, $self->{w}, $self->{h});
3039
3040 my $top = int $self->{children}[1]{range}[0];
3041
3042 my $paridx = 0;
3043 my $top_paragraph;
2679 my $top = int $self->{children}[1]{range}[0]; 3044 my $top = int $self->{children}[1]{range}[0];
2680 3045
2681 my $y0 = $top; 3046 my $y0 = $top;
2682 my $y1 = $top + $H; 3047 my $y1 = $top + $H;
2683 3048
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}}) { 3049 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 3050 my $h = $para->{h};
3051 my $y = $para->{y};
2696 3052
2697 if ($y0 < $y + $h && $y < $y1) { 3053 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 3054 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 3055
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3056 $layout->render ($para->{indent}, $y - $y0);
2704 3057
2705 glRasterPos $par->[3], $y - $y0; 3058 if (my @w = @{ $para->{widget} }) {
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3059 my @s = $layout->get_shapes;
3060
3061 for (@w) {
3062 my ($dx, $dy) = splice @s, 0, 2, ();
3063
3064 $_->{x} = $dx + $para->{indent};
3065 $_->{y} = $dy + $y - $y0;
3066
3067 $_->draw;
3068 }
3069 }
2707 } 3070 }
2708 3071
2709 $y += $h; 3072 $paridx++;
3073 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3074 }
2711 3075
2712 glDisable GL_BLEND; 3076 $self->{top_paragraph} = $top_paragraph;
2713 }; 3077 };
2714 }); 3078 });
3079}
3080
3081sub reconfigure {
3082 my ($self) = @_;
3083
3084 $self->SUPER::reconfigure;
3085
3086 $_->{w} = 1e10 for @{ $self->{par} };
3087 $self->reflow;
2715} 3088}
2716 3089
2717sub _draw { 3090sub _draw {
2718 my ($self) = @_; 3091 my ($self) = @_;
2719 3092
… …
2722 glColor 0, 0, 0, 1; 3095 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3096 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 3097 glDisable GL_TEXTURE_2D;
2725 3098
2726 $self->{children}[1]->draw; 3099 $self->{children}[1]->draw;
2727
2728} 3100}
2729 3101
2730############################################################################# 3102#############################################################################
2731 3103
2732package CFClient::UI::Animator; 3104package CFPlus::UI::Animator;
2733 3105
2734use CFClient::OpenGL; 3106use CFPlus::OpenGL;
2735 3107
2736our @ISA = CFClient::UI::Bin::; 3108our @ISA = CFPlus::UI::Bin::;
2737 3109
2738sub moveto { 3110sub moveto {
2739 my ($self, $x, $y) = @_; 3111 my ($self, $x, $y) = @_;
2740 3112
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3113 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3141 glPopMatrix;
2770} 3142}
2771 3143
2772############################################################################# 3144#############################################################################
2773 3145
2774package CFClient::UI::Flopper; 3146package CFPlus::UI::Flopper;
2775 3147
2776our @ISA = CFClient::UI::Button::; 3148our @ISA = CFPlus::UI::Button::;
2777 3149
2778sub new { 3150sub new {
2779 my $class = shift; 3151 my $class = shift;
2780 3152
2781 my $self = $class->SUPER::new ( 3153 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3165 $self->{other}->toggle_visibility;
2794} 3166}
2795 3167
2796############################################################################# 3168#############################################################################
2797 3169
2798package CFClient::UI::Tooltip; 3170package CFPlus::UI::Tooltip;
2799 3171
2800our @ISA = CFClient::UI::Bin::; 3172our @ISA = CFPlus::UI::Bin::;
2801 3173
2802use CFClient::OpenGL; 3174use CFPlus::OpenGL;
2803 3175
2804sub new { 3176sub new {
2805 my $class = shift; 3177 my $class = shift;
2806 3178
2807 $class->SUPER::new ( 3179 $class->SUPER::new (
… …
2810 ) 3182 )
2811} 3183}
2812 3184
2813sub set_tooltip_from { 3185sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3186 my ($self, $widget) = @_;
3187
3188 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3189 if $widget->{tooltip} =~ /^#(.*)$/;
2815 3190
2816 my $tooltip = $widget->{tooltip}; 3191 my $tooltip = $widget->{tooltip};
2817 3192
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3193 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3194 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2823 } 3198 }
2824 3199
2825 $tooltip =~ s/^\n+//; 3200 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3201 $tooltip =~ s/\n+$//;
2827 3202
2828 $self->add (new CFClient::UI::Label 3203 $self->add (new CFPlus::UI::Label
2829 markup => $tooltip, 3204 markup => $tooltip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3205 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 3206 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3207 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3208 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3209 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3210 );
2836} 3211}
2837 3212
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3216 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3217
2843 ($w + 4, $h + 4) 3218 ($w + 4, $h + 4)
2844} 3219}
2845 3220
2846sub size_allocate { 3221sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3222 my ($self, $w, $h) = @_;
2848 3223
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3224 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3225}
2851 3226
2852sub visibility_change { 3227sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3228 my ($self, $visible) = @_;
2854 3229
2855 return unless $visible; 3230 return unless $visible;
2856 3231
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3232 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3233 my $widget = $self->{owner}
2859 or return; 3234 or return;
2860 3235
3236 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3237 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3238
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3239 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3240 if $x + $self->{w} > $self->{root}{w};
2865 3241
2866 $self->move_abs ($x, $y); 3242 $self->move_abs ($x, $y);
3243 } else {
3244 $self->hide;
3245 }
2867 }); 3246 });
2868} 3247}
2869 3248
2870sub _draw { 3249sub _draw {
2871 my ($self) = @_; 3250 my ($self) = @_;
… …
2895 $self->SUPER::_draw; 3274 $self->SUPER::_draw;
2896} 3275}
2897 3276
2898############################################################################# 3277#############################################################################
2899 3278
2900package CFClient::UI::Face; 3279package CFPlus::UI::Face;
2901 3280
2902our @ISA = CFClient::UI::Base::; 3281our @ISA = CFPlus::UI::DrawBG::;
2903 3282
2904use CFClient::OpenGL; 3283use CFPlus::OpenGL;
2905 3284
2906sub new { 3285sub new {
2907 my $class = shift; 3286 my $class = shift;
2908 3287
2909 my $self = $class->SUPER::new ( 3288 my $self = $class->SUPER::new (
… …
2911 can_events => 0, 3290 can_events => 0,
2912 @_, 3291 @_,
2913 ); 3292 );
2914 3293
2915 if ($self->{anim} && $self->{animspeed}) { 3294 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self); 3295 CFPlus::weaken (my $widget = $self);
2917 3296
2918 $self->{timer} = Event->timer ( 3297 $self->{timer} = Event->timer (
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3298 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920 hard => 1, 3299 hard => 1,
2921 interval => $self->{animspeed}, 3300 interval => $self->{animspeed},
… …
2944sub _draw { 3323sub _draw {
2945 my ($self) = @_; 3324 my ($self) = @_;
2946 3325
2947 return unless $::CONN; 3326 return unless $::CONN;
2948 3327
3328 $self->SUPER::_draw;
3329
2949 my $face; 3330 my $face;
2950 3331
2951 if ($self->{frame}) { 3332 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}]; 3333 my $anim = $::CONN->{anim}[$self->{anim}];
2953 3334
… …
2975 $self->SUPER::destroy; 3356 $self->SUPER::destroy;
2976} 3357}
2977 3358
2978############################################################################# 3359#############################################################################
2979 3360
2980package CFClient::UI::Buttonbar; 3361package CFPlus::UI::Buttonbar;
2981 3362
2982our @ISA = CFClient::UI::HBox::; 3363our @ISA = CFPlus::UI::HBox::;
2983 3364
2984# TODO: should actualyl wrap buttons and other goodies. 3365# TODO: should actually wrap buttons and other goodies.
2985 3366
2986############################################################################# 3367#############################################################################
2987 3368
2988package CFClient::UI::Menu; 3369package CFPlus::UI::Menu;
2989 3370
2990our @ISA = CFClient::UI::FancyFrame::; 3371our @ISA = CFPlus::UI::Toplevel::;
2991 3372
2992use CFClient::OpenGL; 3373use CFPlus::OpenGL;
2993 3374
2994sub new { 3375sub new {
2995 my $class = shift; 3376 my $class = shift;
2996 3377
2997 my $self = $class->SUPER::new ( 3378 my $self = $class->SUPER::new (
2998 items => [], 3379 items => [],
2999 z => 100, 3380 z => 100,
3000 @_, 3381 @_,
3001 ); 3382 );
3002 3383
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3384 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004 3385
3005 for my $item (@{ $self->{items} }) { 3386 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3387 my ($widget, $cb, $tooltip) = @$item;
3007 3388
3008 # handle various types of items, only text for now 3389 # handle various types of items, only text for now
3009 if (!ref $widget) { 3390 if (!ref $widget) {
3391 if ($widget =~ /\t/) {
3392 my ($left, $right) = split /\t/, $widget, 2;
3393
3010 $widget = new CFClient::UI::Label 3394 $widget = new CFPlus::UI::HBox
3011 can_hover => 1, 3395 can_hover => 1,
3012 can_events => 1, 3396 can_events => 1,
3397 tooltip => $tooltip,
3398 children => [
3399 (new CFPlus::UI::Label markup => $left, expand => 1),
3400 (new CFPlus::UI::Label markup => $right, align => +1),
3401 ],
3402 ;
3403
3404 } else {
3405 $widget = new CFPlus::UI::Label
3406 can_hover => 1,
3407 can_events => 1,
3013 markup => $widget, 3408 markup => $widget,
3014 tooltip => $tooltip 3409 tooltip => $tooltip;
3410 }
3015 } 3411 }
3016 3412
3017 $self->{item}{$widget} = $item; 3413 $self->{item}{$widget} = $item;
3018 3414
3019 $self->{vbox}->add ($widget); 3415 $self->{vbox}->add ($widget);
… …
3024 3420
3025# popup given the event (must be a mouse button down event currently) 3421# popup given the event (must be a mouse button down event currently)
3026sub popup { 3422sub popup {
3027 my ($self, $ev) = @_; 3423 my ($self, $ev) = @_;
3028 3424
3029 $self->_emit ("popdown"); 3425 $self->emit ("popdown");
3030 3426
3031 # maybe save $GRAB? must be careful about events... 3427 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3428 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3429 $self->{button} = $ev->{button};
3034 3430
3035 $self->show; 3431 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3432 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3433}
3038 3434
3039sub mouse_motion { 3435sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3436 my ($self, $ev, $x, $y) = @_;
3041 3437
3042 # TODO: should use vbox->find_widget or so 3438 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3439 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3440 $self->{hover} = $self->{item}{$HOVER};
3045 3441
3046 0 3442 0
3047} 3443}
3048 3444
3049sub button_up { 3445sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3446 my ($self, $ev, $x, $y) = @_;
3051 3447
3052 if ($ev->{button} == $self->{button}) { 3448 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3449 undef $GRAB;
3054 $self->hide; 3450 $self->hide;
3055 3451
3056 $self->_emit ("popdown"); 3452 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3453 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3454 } else {
3059 return 0 3455 return 0
3060 } 3456 }
3061 3457
3062 1 3458 1
3063} 3459}
3064 3460
3065############################################################################# 3461#############################################################################
3066 3462
3067package CFClient::UI::Multiplexer; 3463package CFPlus::UI::Multiplexer;
3068 3464
3069our @ISA = CFClient::UI::Container::; 3465our @ISA = CFPlus::UI::Container::;
3070 3466
3071sub new { 3467sub new {
3072 my $class = shift; 3468 my $class = shift;
3073 3469
3074 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
… …
3088 3484
3089 $self->{current} = $self->{children}[0] 3485 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3486 if @{ $self->{children} };
3091} 3487}
3092 3488
3489sub get_current_page {
3490 my ($self) = @_;
3491
3492 $self->{current}
3493}
3494
3093sub set_current_page { 3495sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3496 my ($self, $page_or_widget) = @_;
3095 3497
3096 my $widget = ref $page_or_widget 3498 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3499 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3500 : $self->{children}[$page_or_widget];
3099 3501
3100 $self->{current} = $widget; 3502 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3503 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3504
3103 $self->_emit (page_changed => $self->{current}); 3505 $self->emit (page_changed => $self->{current});
3104 3506
3105 $self->realloc; 3507 $self->realloc;
3106} 3508}
3107 3509
3108sub visible_children { 3510sub visible_children {
… …
3113 my ($self) = @_; 3515 my ($self) = @_;
3114 3516
3115 $self->{current}->size_request 3517 $self->{current}->size_request
3116} 3518}
3117 3519
3118sub size_allocate { 3520sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3521 my ($self, $w, $h) = @_;
3120 3522
3121 $self->{current}->configure (0, 0, $w, $h); 3523 $self->{current}->configure (0, 0, $w, $h);
3524
3525 1
3122} 3526}
3123 3527
3124sub _draw { 3528sub _draw {
3125 my ($self) = @_; 3529 my ($self) = @_;
3126 3530
3127 $self->{current}->draw; 3531 $self->{current}->draw;
3128} 3532}
3129 3533
3130############################################################################# 3534#############################################################################
3131 3535
3132package CFClient::UI::Notebook; 3536package CFPlus::UI::Notebook;
3133 3537
3134our @ISA = CFClient::UI::VBox::; 3538our @ISA = CFPlus::UI::VBox::;
3135 3539
3136sub new { 3540sub new {
3137 my $class = shift; 3541 my $class = shift;
3138 3542
3139 my $self = $class->SUPER::new ( 3543 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3544 buttonbar => (new CFPlus::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3545 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self 3546 # filter => # will be put between multiplexer and $self
3143 @_, 3547 @_,
3144 ); 3548 );
3145 3549
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3550 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3150} 3554}
3151 3555
3152sub add { 3556sub add {
3153 my ($self, $title, $widget, $tooltip) = @_; 3557 my ($self, $title, $widget, $tooltip) = @_;
3154 3558
3155 Scalar::Util::weaken $self; 3559 CFPlus::weaken $self;
3156 3560
3157 $self->{buttonbar}->add (new CFClient::UI::Button 3561 $self->{buttonbar}->add (new CFPlus::UI::Button
3158 markup => $title, 3562 markup => $title,
3159 tooltip => $tooltip, 3563 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) }, 3564 on_activate => sub { $self->set_current_page ($widget) },
3161 ); 3565 );
3162 3566
3163 $self->{multiplexer}->add ($widget); 3567 $self->{multiplexer}->add ($widget);
3164} 3568}
3165 3569
3570sub get_current_page {
3571 my ($self) = @_;
3572
3573 $self->{multiplexer}->get_current_page
3574}
3575
3166sub set_current_page { 3576sub set_current_page {
3167 my ($self, $page) = @_; 3577 my ($self, $page) = @_;
3168 3578
3169 $self->{multiplexer}->set_current_page ($page); 3579 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3580 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3581}
3172 3582
3173############################################################################# 3583#############################################################################
3174 3584
3175package CFClient::UI::Combobox; 3585package CFPlus::UI::Selector;
3176 3586
3177use utf8; 3587use utf8;
3178 3588
3179our @ISA = CFClient::UI::Button::; 3589our @ISA = CFPlus::UI::Button::;
3180 3590
3181sub new { 3591sub new {
3182 my $class = shift; 3592 my $class = shift;
3183 3593
3184 my $self = $class->SUPER::new ( 3594 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 3600 $self->_set_value ($self->{value});
3191 3601
3192 $self 3602 $self
3193} 3603}
3194 3604
3195sub button_down { 3605sub invoke_button_down {
3196 my ($self, $ev) = @_; 3606 my ($self, $ev) = @_;
3197 3607
3198 my @menu_items; 3608 my @menu_items;
3199 3609
3200 for (@{ $self->{options} }) { 3610 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 3611 my ($value, $title, $tooltip) = @$_;
3202 3612
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3613 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 3614 }
3205 3615
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3616 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 3617}
3208 3618
3209sub _set_value { 3619sub _set_value {
3210 my ($self, $value) = @_; 3620 my ($self, $value) = @_;
3211 3621
… …
3221 my ($self, $value) = @_; 3631 my ($self, $value) = @_;
3222 3632
3223 return unless $self->{value} ne $value; 3633 return unless $self->{value} ne $value;
3224 3634
3225 $self->_set_value ($value); 3635 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3636 $self->emit (changed => $value);
3227} 3637}
3228 3638
3229############################################################################# 3639#############################################################################
3230 3640
3231package CFClient::UI::Statusbox; 3641package CFPlus::UI::Statusbox;
3232 3642
3233our @ISA = CFClient::UI::VBox::; 3643our @ISA = CFPlus::UI::VBox::;
3234 3644
3235sub new { 3645sub new {
3236 my $class = shift; 3646 my $class = shift;
3237 3647
3238 my $self = $class->SUPER::new ( 3648 my $self = $class->SUPER::new (
3239 fontsize => 0.8, 3649 fontsize => 0.8,
3240 @_, 3650 @_,
3241 ); 3651 );
3242 3652
3243 Scalar::Util::weaken (my $this = $self); 3653 CFPlus::weaken (my $this = $self);
3244 3654
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3655 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246 3656
3247 $self 3657 $self
3248} 3658}
… …
3250sub reorder { 3660sub reorder {
3251 my ($self) = @_; 3661 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 3662 my $NOW = Time::HiRes::time;
3253 3663
3254 # freeze display when hovering over any label 3664 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 3665 return if $CFPlus::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3666 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 3667 values %{ $self->{item} };
3258 3668
3259 while (my ($k, $v) = each %{ $self->{item} }) { 3669 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3670 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 3671 }
… …
3282 for ($short) { 3692 for ($short) {
3283 s/^\s+//; 3693 s/^\s+//;
3284 s/\s+/ /g; 3694 s/\s+/ /g;
3285 } 3695 }
3286 3696
3287 new CFClient::UI::Label 3697 new CFPlus::UI::Label
3288 markup => $short, 3698 markup => $short,
3289 tooltip => $item->{tooltip}, 3699 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 3700 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 3701 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 3702 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3346 count => 1, 3756 count => 1,
3347 %arg, 3757 %arg,
3348 }; 3758 };
3349 } 3759 }
3350 3760
3761 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3762 $self->reorder;
3763 });
3352} 3764}
3353 3765
3354sub reconfigure { 3766sub reconfigure {
3355 my ($self) = @_; 3767 my ($self) = @_;
3356 3768
… …
3369 $self->SUPER::destroy; 3781 $self->SUPER::destroy;
3370} 3782}
3371 3783
3372############################################################################# 3784#############################################################################
3373 3785
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, $end_cb) = @_;
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 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root; 3786package CFPlus::UI::Root;
3737 3787
3738our @ISA = CFClient::UI::Container::; 3788our @ISA = CFPlus::UI::Container::;
3739 3789
3740use List::Util qw(min max); 3790use List::Util qw(min max);
3741 3791
3742use CFClient::OpenGL; 3792use CFPlus::OpenGL;
3743 3793
3744sub new { 3794sub new {
3745 my $class = shift; 3795 my $class = shift;
3746 3796
3747 my $self = $class->SUPER::new ( 3797 my $self = $class->SUPER::new (
3748 visible => 1, 3798 visible => 1,
3749 @_, 3799 @_,
3750 ); 3800 );
3751 3801
3752 Scalar::Util::weaken ($self->{root} = $self); 3802 CFPlus::weaken ($self->{root} = $self);
3753 3803
3754 $self 3804 $self
3755} 3805}
3756 3806
3757sub size_request { 3807sub size_request {
… …
3772 $coord = $max - $size if $coord > $max - $size; 3822 $coord = $max - $size if $coord > $max - $size;
3773 3823
3774 int $coord + 0.5 3824 int $coord + 0.5
3775} 3825}
3776 3826
3777sub size_allocate { 3827sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3828 my ($self, $w, $h) = @_;
3779 3829
3780 for my $child ($self->children) { 3830 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3831 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3832
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3836 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3837 $Y = _to_pixel $Y, $H, $self->{h};
3788 3838
3789 $child->configure ($X, $Y, $W, $H); 3839 $child->configure ($X, $Y, $W, $H);
3790 } 3840 }
3841
3842 1
3791} 3843}
3792 3844
3793sub coord2local { 3845sub coord2local {
3794 my ($self, $x, $y) = @_; 3846 my ($self, $x, $y) = @_;
3795 3847
… …
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3973 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922 3974
3923 $w = 0 if $w < 0; 3975 $w = 0 if $w < 0;
3924 $h = 0 if $h < 0; 3976 $h = 0 if $h < 0;
3925 3977
3978 $w = max $widget->{min_w}, $w;
3979 $h = max $widget->{min_h}, $h;
3980
3981# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3982# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3983
3984 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3985 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3986
3926 $w = int $w + 0.5; 3987 $w = int $w + 0.5;
3927 $h = int $h + 0.5; 3988 $h = int $h + 0.5;
3928 3989
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3990 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w}; 3991 $widget->{old_w} = $widget->{w};
… …
3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4014 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954 glMatrixMode GL_MODELVIEW; 4015 glMatrixMode GL_MODELVIEW;
3955 glLoadIdentity; 4016 glLoadIdentity;
3956 4017
3957 { 4018 {
3958 package CFClient::UI::Base; 4019 package CFPlus::UI::Base;
3959 4020
3960 ($draw_x, $draw_y, $draw_w, $draw_h) = 4021 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h}); 4022 (0, 0, $self->{w}, $self->{h});
3962 }
3963 4023
3964 $self->_draw; 4024 $self->_draw;
4025 }
3965} 4026}
3966 4027
3967############################################################################# 4028#############################################################################
3968 4029
3969package CFClient::UI; 4030package CFPlus::UI;
3970 4031
3971$ROOT = new CFClient::UI::Root; 4032$ROOT = new CFPlus::UI::Root;
3972$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4033$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973 4034
39741 40351
3975 4036

Diff Legend

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