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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.349 by root, Thu Aug 17 16:05:36 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
79sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 82 if $FOCUS;
82} 83}
83 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
84sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
90 106
91 $GRAB = $widget; 107 $GRAB = $widget;
92 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
93 109
94 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
95 } 111 }
96 112
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
98 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
100 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
101} 123}
102 124
103sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
104 my ($ev) = @_; 126 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 127
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 129
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 131
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
112 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 134
114 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 137 $grab->update if $grab;
117 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
118 139
140 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 141 $TOOLTIP_WATCHER->cb->();
120 } 142 }
121} 143}
122 144
123sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
124 my ($ev) = @_; 146 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
126 148
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 150
129 if ($widget != $HOVER) { 151 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 152
132 $hover->update if $hover && $hover->{can_hover}; 153 $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; 154 if $HOVER;
140} 155}
141 156
142# convert position array to integers 157# convert position array to integers
143sub harmonize { 158sub harmonize {
… …
193 reconfigure_widgets; 208 reconfigure_widgets;
194} 209}
195 210
196############################################################################# 211#############################################################################
197 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
198package CFClient::UI::Base; 221package CFPlus::UI::Base;
199 222
200use strict; 223use strict;
201 224
202use CFClient::OpenGL; 225use CFPlus::OpenGL;
203 226
204sub new { 227sub new {
205 my $class = shift; 228 my $class = shift;
206 229
207 my $self = bless { 230 my $self = bless {
… …
212 h => undef, 235 h => undef,
213 can_events => 1, 236 can_events => 1,
214 @_ 237 @_
215 }, $class; 238 }, $class;
216 239
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 241
219 for (keys %$self) { 242 for (keys %$self) {
220 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
222 } 245 }
223 } 246 }
224 247
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $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}; 250 $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}; 251 $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}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 253
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 256
234 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
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
… …
272 295
273 return unless $self->{visible}; 296 return unless $self->{visible};
274 297
275 $_->set_invisible for $self->children; 298 $_->set_invisible for $self->children;
276 299
300 delete $self->{visible};
277 delete $self->{root}; 301 delete $self->{root};
278 delete $self->{visible};
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) = @_;
… …
315} 337}
316 338
317sub move_abs { 339sub move_abs {
318 my ($self, $x, $y, $z) = @_; 340 my ($self, $x, $y, $z) = @_;
319 341
320 $self->{x} = List::Util::max 0, int $x; 342 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 343 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 344 $self->{z} = $z if defined $z;
323 345
324 $self->update; 346 $self->update;
325} 347}
326 348
… …
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
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
515
516sub emit {
517 my ($self, $signal, @args) = @_;
518
519 # I do not really like this solution, but I dislike duplication
520 # and needlessly verbose code, too.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 #d##TODO# stop propagating at first true, do not use sum
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 532}
464 533
465sub find_widget { 534sub find_widget {
466 my ($self, $x, $y) = @_; 535 my ($self, $x, $y) = @_;
467 536
… …
477sub set_parent { 546sub set_parent {
478 my ($self, $parent) = @_; 547 my ($self, $parent) = @_;
479 548
480 Scalar::Util::weaken ($self->{parent} = $parent); 549 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 550 $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} 551}
506 552
507sub realloc { 553sub realloc {
508 my ($self) = @_; 554 my ($self) = @_;
509 555
… …
542 return unless $self->{h} && $self->{w}; 588 return unless $self->{h} && $self->{w};
543 589
544 # update screen rectangle 590 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 591 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 592 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 593
550 # skip widgets that are entirely outside the drawing area 594 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 597
… …
576 glVertex $self->{w} - 1, 0; 620 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 621 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 622 glVertex 0 , $self->{h} - 1;
579 glEnd; 623 glEnd;
580 glPopMatrix; 624 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 626 }
583 627
584 $self->_draw; 628 $self->_draw;
585 glPopMatrix; 629 glPopMatrix;
586} 630}
… …
592} 636}
593 637
594sub DESTROY { 638sub DESTROY {
595 my ($self) = @_; 639 my ($self) = @_;
596 640
641 return if CFPlus::in_destruct;
642
597 delete $WIDGET{$self+0}; 643 delete $WIDGET{$self+0};
598 #$self->deactivate; 644
645 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 647}
600 648
601############################################################################# 649#############################################################################
602 650
603package CFClient::UI::DrawBG; 651package CFPlus::UI::DrawBG;
604 652
605our @ISA = CFClient::UI::Base::; 653our @ISA = CFPlus::UI::Base::;
606 654
607use strict; 655use strict;
608use CFClient::OpenGL; 656use CFPlus::OpenGL;
609 657
610sub new { 658sub new {
611 my $class = shift; 659 my $class = shift;
612 660
613 # range [value, low, high, page] 661 # range [value, low, high, page]
… …
644 } 692 }
645} 693}
646 694
647############################################################################# 695#############################################################################
648 696
649package CFClient::UI::Empty; 697package CFPlus::UI::Empty;
650 698
651our @ISA = CFClient::UI::Base::; 699our @ISA = CFPlus::UI::Base::;
652 700
653sub new { 701sub new {
654 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 703 $class->SUPER::new (can_events => 0, %arg);
656} 704}
… …
663 711
664sub draw { } 712sub draw { }
665 713
666############################################################################# 714#############################################################################
667 715
668package CFClient::UI::Container; 716package CFPlus::UI::Container;
669 717
670our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
671 719
672sub new { 720sub new {
673 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
674 722
675 my $children = delete $arg{children}; 723 my $children = delete $arg{children};
… …
684 if $children; 732 if $children;
685 733
686 $self 734 $self
687} 735}
688 736
737sub realloc {
738 my ($self) = @_;
739
740 $self->{force_realloc} = 1;
741 $self->{force_size_alloc} = 1;
742 $self->SUPER::realloc;
743}
744
689sub add { 745sub add {
690 my ($self, @widgets) = @_; 746 my ($self, @widgets) = @_;
691 747
692 $_->set_parent ($self) 748 $_->set_parent ($self)
693 for @widgets; 749 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 809 $_->draw for @{$self->{children}};
754} 810}
755 811
756############################################################################# 812#############################################################################
757 813
758package CFClient::UI::Bin; 814package CFPlus::UI::Bin;
759 815
760our @ISA = CFClient::UI::Container::; 816our @ISA = CFPlus::UI::Container::;
761 817
762sub new { 818sub new {
763 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
764 820
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 821 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 822
767 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
768} 824}
769 825
770sub add { 826sub add {
771 my ($self, $child) = @_; 827 my ($self, $child) = @_;
772 828
773 $self->{children} = []; 829 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
776} 831}
777 832
778sub remove { 833sub remove {
779 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
780 835
781 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
782 837
783 $self->{children} = [new CFClient::UI::Empty] 838 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 839 unless @{$self->{children}};
785} 840}
786 841
787sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
788 843
789sub size_request { 844sub size_request {
790 $_[0]{children}[0]->size_request 845 $_[0]{children}[0]->size_request
791} 846}
792 847
793sub size_allocate { 848sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 849 my ($self, $w, $h) = @_;
795 850
796 $self->{children}[0]->configure (0, 0, $w, $h); 851 $self->{children}[0]->configure (0, 0, $w, $h);
852
853 1
797} 854}
798 855
799############################################################################# 856#############################################################################
800 857
801# back-buffered drawing area 858# back-buffered drawing area
802 859
803package CFClient::UI::Window; 860package CFPlus::UI::Window;
804 861
805our @ISA = CFClient::UI::Bin::; 862our @ISA = CFPlus::UI::Bin::;
806 863
807use CFClient::OpenGL; 864use CFPlus::OpenGL;
808 865
809sub new { 866sub new {
810 my ($class, %arg) = @_; 867 my ($class, %arg) = @_;
811 868
812 my $self = $class->SUPER::new (%arg); 869 my $self = $class->SUPER::new (%arg);
… …
817 874
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 875 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 876 $self->SUPER::update;
820} 877}
821 878
822sub size_allocate { 879sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 880 my ($self, $w, $h) = @_;
824 881
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 882 $self->update;
883
884 $self->SUPER::invoke_size_allocate ($w, $h)
827} 885}
828 886
829sub _render { 887sub _render {
830 my ($self) = @_; 888 my ($self) = @_;
831 889
… …
833} 891}
834 892
835sub render_child { 893sub render_child {
836 my ($self) = @_; 894 my ($self) = @_;
837 895
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 896 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 897 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
841 899
842 { 900 {
843 package CFClient::UI::Base; 901 package CFPlus::UI::Base;
844 902
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
847 } 905 }
848 906
… …
851} 909}
852 910
853sub _draw { 911sub _draw {
854 my ($self) = @_; 912 my ($self) = @_;
855 913
856 my ($w, $h) = @$self{qw(w h)};
857
858 my $tex = $self->{texture} 914 my $tex = $self->{texture}
859 or return; 915 or return;
860 916
861 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 919 glColor 0, 0, 0, 1;
864 920
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
866 922
867 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
868} 924}
869 925
870############################################################################# 926#############################################################################
871 927
872package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
873 929
874our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
875 931
876sub new { 932sub new {
877 my $class = shift; 933 my $class = shift;
878 934
879 $class->SUPER::new ( 935 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
893 949
894 ($w, $h) 950 ($w, $h)
895} 951}
896 952
897sub size_allocate { 953sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
899 955
900 my $child = $self->child; 956 my $child = $self->child;
901 957
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 960
905 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
906 $self->update; 962 $self->update;
963
964 1
907} 965}
908 966
909sub set_offset { 967sub set_offset {
910 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
911 969
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 997 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 999 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1001 }
944} 1002}
945 1003
946sub _render { 1004sub _render {
947 my ($self) = @_; 1005 my ($self) = @_;
948 1006
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1009
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1011
954 $self->SUPER::_render; 1012 $self->SUPER::_render;
955} 1013}
956 1014
957############################################################################# 1015#############################################################################
958 1016
959package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
960 1018
961our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
962 1020
963sub new { 1021sub new {
964 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
965 1023
966 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
967 1025
968 my $self; 1026 my $self;
969 1027
970 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1029 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1031 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
975 }, 1033 },
976 ; 1034 ;
977 1035
978 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
980 slider => $slider, 1039 slider => $slider,
981 %arg, 1040 %arg,
982 ); 1041 );
983 1042
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1044 $self->add ($child) if $child;
986 1045
987 $self 1046 $self
988} 1047}
989 1048
1049#TODO# update range on size_allocate depending on child
1050
990sub add { 1051sub add {
991 my ($self, $widget) = @_; 1052 my ($self, $widget) = @_;
992 1053
993 $self->{vp}->add ($self->{child} = $widget); 1054 $self->{vp}->add ($self->{child} = $widget);
994} 1055}
995 1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
996sub update { 1073sub update {
997 my ($self) = @_; 1074 my ($self) = @_;
998 1075
999 $self->SUPER::update; 1076 $self->SUPER::update;
1000 1077
1001 # todo: overwrite size_allocate of child 1078 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1079}
1005 1080
1006sub size_allocate { 1081sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1082 my ($self, $w, $h) = @_;
1008 1083
1084 $self->update_slider;
1085
1009 $self->SUPER::size_allocate ($w, $h); 1086 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1087}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1088
1018############################################################################# 1089#############################################################################
1019 1090
1020package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
1021 1092
1022our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
1023 1094
1024use CFClient::OpenGL; 1095use CFPlus::OpenGL;
1025 1096
1026sub new { 1097sub new {
1027 my $class = shift; 1098 my $class = shift;
1028 1099
1029 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1056} 1127}
1057 1128
1058############################################################################# 1129#############################################################################
1059 1130
1060package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1061 1132
1062our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1063 1134
1064use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1136
1074sub new { 1137sub new {
1075 my ($class, %arg) = @_; 1138 my ($class, %arg) = @_;
1076 1139
1077 my $title = delete $arg{title}; 1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1236
1237my $bg =
1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1239 mipmap => 1, wrap => 1;
1240
1241my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244
1245sub new {
1246 my ($class, %arg) = @_;
1078 1247
1079 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1251 border => 0.6,
1083 can_events => 1, 1252 can_events => 1,
1084 min_w => 16, 1253 min_w => 64,
1085 min_h => 16, 1254 min_h => 32,
1086 %arg, 1255 %arg,
1087 ); 1256 );
1088 1257
1089 $self->{title} = new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1259 align => 0,
1091 valign => 1, 1260 valign => 1,
1092 text => $title, 1261 text => $self->{title},
1093 fontsize => $self->{border} 1262 fontsize => $self->{border},
1094 if defined $title; 1263 if exists $self->{title};
1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1095 1273
1096 $self 1274 $self
1097} 1275}
1098 1276
1099sub add { 1277sub add {
1100 my ($self, @widgets) = @_; 1278 my ($self, @widgets) = @_;
1101 1279
1102 $self->SUPER::add (@widgets); 1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1283}
1105 1284
1106sub border { 1285sub border {
1107 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1108} 1287}
1109 1288
1110sub size_request { 1289sub size_request {
1111 my ($self) = @_; 1290 my ($self) = @_;
1112 1291
1113 $self->{title}->size_request 1292 $self->{title_widget}->size_request
1114 if $self->{title}; 1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1115 1297
1116 my ($w, $h) = $self->SUPER::size_request; 1298 my ($w, $h) = $self->SUPER::size_request;
1117 1299
1118 ( 1300 (
1119 $w + $self->border * 2, 1301 $w + $self->border * 2,
1120 $h + $self->border * 2, 1302 $h + $self->border * 2,
1121 ) 1303 )
1122} 1304}
1123 1305
1124sub size_allocate { 1306sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1307 my ($self, $w, $h) = @_;
1126 1308
1127 if ($self->{title}) { 1309 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1310 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1311 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1313 }
1132 1314
1133 my $border = $self->border; 1315 my $border = $self->border;
1134 1316
1135 $h -= List::Util::max 0, $border * 2; 1317 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1318 $w -= List::Util::max 0, $border * 2;
1319
1320 $self->child->configure ($border, $border, $w, $h);
1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1137 1332
1138 $self->child->configure ($border, $border, $w, $h); 1333 1
1139} 1334}
1140 1335
1141sub button_down { 1336sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
1143 1338
1144 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1340 my $border = $self->border;
1146 1341
… …
1177 1372
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1374
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1376 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1378 };
1184 } else { 1379 } else {
1185 return 0; 1380 return 0;
1186 } 1381 }
1187 1382
1188 1 1383 1
1189} 1384}
1190 1385
1191sub button_up { 1386sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
1193 1388
1194 !!delete $self->{motion} 1389 ! ! delete $self->{motion}
1195} 1390}
1196 1391
1197sub mouse_motion { 1392sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1199 1394
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1396
1202 !!$self->{motion} 1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1203} 1406}
1204 1407
1205sub _draw { 1408sub _draw {
1206 my ($self) = @_; 1409 my ($self) = @_;
1207 1410
… …
1233 1436
1234 glDisable GL_TEXTURE_2D; 1437 glDisable GL_TEXTURE_2D;
1235 1438
1236 $child->draw; 1439 $child->draw;
1237 1440
1238 if ($self->{title}) { 1441 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1442 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1443 $self->{title_widget}->_draw;
1444
1445 glTranslate 0, - ($border - $self->{h});
1241 } 1446 }
1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1242} 1450}
1243 1451
1244############################################################################# 1452#############################################################################
1245 1453
1246package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1247 1455
1248our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1249 1457
1250use List::Util qw(max sum); 1458use List::Util qw(max sum);
1251 1459
1252use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1253 1461
1254sub new { 1462sub new {
1255 my $class = shift; 1463 my $class = shift;
1256 1464
1257 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1263sub children { 1471sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1473}
1266 1474
1267sub add { 1475sub add {
1268 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1269 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1480 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1272 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1486 $self->realloc;
1487}
1488
1489sub remove {
1490 my ($self, $child) = @_;
1491
1492 # TODO: not yet implemented
1274} 1493}
1275 1494
1276# TODO: move to container class maybe? send children a signal on removal? 1495# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1496sub clear {
1278 my ($self) = @_; 1497 my ($self) = @_;
… …
1319 (sum @$ws), 1538 (sum @$ws),
1320 (sum @$hs), 1539 (sum @$hs),
1321 ) 1540 )
1322} 1541}
1323 1542
1324sub size_allocate { 1543sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1544 my ($self, $w, $h) = @_;
1326 1545
1327 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1328 1547
1329 my $req_w = (sum @$ws) || 1; 1548 my $req_w = (sum @$ws) || 1;
… …
1336 1555
1337 # linearly scale sizes 1556 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1559
1341 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1343 1562
1344 my $y; 1563 my $y;
1345 1564
1346 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1361 } 1580 }
1362 1581
1363 $y += $row_h; 1582 $y += $row_h;
1364 } 1583 }
1365 1584
1585 1
1366} 1586}
1367 1587
1368sub find_widget { 1588sub find_widget {
1369 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1370 1590
… …
1389 } 1609 }
1390} 1610}
1391 1611
1392############################################################################# 1612#############################################################################
1393 1613
1394package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1395 1615
1396our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1397 1617
1398sub size_request { 1618sub size_request {
1399 my ($self) = @_; 1619 my ($self) = @_;
1400 1620
1401 $self->{vertical} 1621 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1629 )
1410} 1630}
1411 1631
1412sub size_allocate { 1632sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1633 my ($self, $w, $h) = @_;
1414 1634
1415 my $space = $self->{vertical} ? $h : $w; 1635 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1636 my @children = $self->visible_children;
1417 1637
1418 my @req; 1638 my @req;
1419 1639
1420 if ($self->{homogeneous}) { 1640 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1641 @req = ($space / (@children || 1)) x @children;
1422 } else { 1642 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1644 my $req = List::Util::sum @req;
1425 1645
1426 if ($req > $space) { 1646 if ($req > $space) {
1427 # ah well, not enough space 1647 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1648 $_ *= $space / $req for @req;
1429 } else { 1649 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1651
1432 $space = ($space - $req) / $expand; # remaining space to give away 1652 $space = ($space - $req) / $expand; # remaining space to give away
1433 1653
1434 $req[$_] += $space * $children->[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1655 for 0 .. $#children;
1436 } 1656 }
1437 } 1657 }
1438 1658
1439 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1440 1660
1441 my $pos = 0; 1661 my $pos = 0;
1442 for (0 .. $#$children) { 1662 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1665
1446 $pos += $alloc; 1666 $pos += $alloc;
1447 } 1667 }
1448 1668
1449 1 1669 1
1450} 1670}
1451 1671
1452############################################################################# 1672#############################################################################
1453 1673
1454package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1455 1675
1456our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1457 1677
1458sub new { 1678sub new {
1459 my $class = shift; 1679 my $class = shift;
1460 1680
1461 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1464 ) 1684 )
1465} 1685}
1466 1686
1467############################################################################# 1687#############################################################################
1468 1688
1469package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1470 1690
1471our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1472 1692
1473sub new { 1693sub new {
1474 my $class = shift; 1694 my $class = shift;
1475 1695
1476 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1479 ) 1699 )
1480} 1700}
1481 1701
1482############################################################################# 1702#############################################################################
1483 1703
1484package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1485 1705
1486our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1487 1707
1488use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1489 1709
1490sub new { 1710sub new {
1491 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1492 1712
1493 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1716 #active_bg => none
1497 #font => default_font 1717 #font => default_font
1498 #text => initial text 1718 #text => initial text
1499 #markup => initial narkup 1719 #markup => initial narkup
1500 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1501 ellipsise => 3, # end 1722 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1724 fontsize => 1,
1504 align => -1, 1725 align => -1,
1505 valign => -1, 1726 valign => -1,
1506 padding_x => 2, 1727 padding_x => 2,
1507 padding_y => 2, 1728 padding_y => 2,
1508 can_events => 0, 1729 can_events => 0,
1509 %arg 1730 %arg
1510 ); 1731 );
1511 1732
1512 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1736 $self->{template} = $layout;
1516 } 1737 }
1517 1738
1518 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1522 } 1743 }
1523 1744
1524 $self 1745 $self
1525} 1746}
1526 1747
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1748sub update {
1538 my ($self) = @_; 1749 my ($self) = @_;
1539 1750
1540 delete $self->{texture}; 1751 delete $self->{texture};
1541 $self->SUPER::update; 1752 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1553 1764
1554 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1556 1767
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1769
1559 delete $self->{req_h}; 1770 delete $self->{size_req};
1560
1561 $self->realloc; 1771 $self->realloc;
1562 $self->update; 1772 $self->update;
1563} 1773}
1564 1774
1565sub set_markup { 1775sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1570 1780
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1782
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1784
1575 delete $self->{req_h}; 1785 delete $self->{size_req};
1576
1577 $self->realloc; 1786 $self->realloc;
1578 $self->update; 1787 $self->update;
1579} 1788}
1580 1789
1581sub size_request { 1790sub size_request {
1582 my ($self) = @_; 1791 my ($self) = @_;
1583 1792
1584 if (exists $self->{req_h}) { 1793 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1794 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1795 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1796 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1799
1593 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1594 1801
1595 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1806
1599 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1600 1808
1601 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1810 $h = List::Util::max $h, $h2;
1603 } 1811 }
1604 1812
1605 ($w, $h) 1813 [$w, $h]
1606 } 1814 };
1607}
1608 1815
1816 @{ $self->{size_req} }
1817}
1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1609sub size_allocate { 1823sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1611 1825
1612 delete $self->{ox}; 1826 delete $self->{ox};
1613 1827
1614 delete $self->{texture} 1828 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1616} 1832}
1617 1833
1618sub set_fontsize { 1834sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1620 1836
1621 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1622 delete $self->{texture}; 1839 delete $self->{texture};
1623 1840
1624 $self->realloc; 1841 $self->realloc;
1625} 1842}
1626 1843
1844sub reconfigure {
1845 my ($self) = @_;
1846
1847 delete $self->{size_req};
1848 delete $self->{texture};
1849
1850 $self->SUPER::reconfigure;
1851}
1852
1627sub _draw { 1853sub _draw {
1628 my ($self) = @_; 1854 my ($self) = @_;
1629 1855
1630 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1631 1857
1632 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1865
1640 new_from_layout CFClient::Texture $self->{layout} 1866 [$self->{layout}->size]
1641 }; 1867 };
1642 1868
1643 unless (exists $self->{ox}) { 1869 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1647 1873
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1877 };
1652 1878
1653 glEnable GL_TEXTURE_2D; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1881
1656 if ($tex->{format} == GL_ALPHA) { 1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 1883}
1665 1884
1666############################################################################# 1885#############################################################################
1667 1886
1668package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1669 1888
1670our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1671 1890
1672use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1673 1892
1674sub new { 1893sub new {
1675 my $class = shift; 1894 my $class = shift;
1676 1895
1677 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1682 can_hover => 1, 1901 can_hover => 1,
1683 can_focus => 1, 1902 can_focus => 1,
1684 valign => 0, 1903 valign => 0,
1685 can_events => 1, 1904 can_events => 1,
1686 #text => ... 1905 #text => ...
1906 #hidden => "*",
1687 @_ 1907 @_
1688 ) 1908 )
1689} 1909}
1690 1910
1691sub _set_text { 1911sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 1918 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 1919 $self->{text} = $text;
1700 1920
1701 $text =~ s/./*/g if $self->{hidden}; 1921 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 1922 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 1923 delete $self->{size_req};
1704 1924
1705 $self->_emit (changed => $self->{text}); 1925 $self->emit (changed => $self->{text});
1706 1926
1707 $self->realloc; 1927 $self->realloc;
1708 $self->update; 1928 $self->update;
1709} 1929}
1710 1930
… …
1725 my ($w, $h) = $self->SUPER::size_request; 1945 my ($w, $h) = $self->SUPER::size_request;
1726 1946
1727 ($w + 1, $h) # add 1 for cursor 1947 ($w + 1, $h) # add 1 for cursor
1728} 1948}
1729 1949
1730sub key_down { 1950sub invoke_key_down {
1731 my ($self, $ev) = @_; 1951 my ($self, $ev) = @_;
1732 1952
1733 my $mod = $ev->{mod}; 1953 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 1954 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 1955 my $uni = $ev->{unicode};
… …
1738 1958
1739 if ($uni == 8) { 1959 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1748 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1750 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1751 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 1975 $self->emit ('escape');
1753 } elsif ($uni) { 1976 } elsif ($uni) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 1978 } else {
1756 return 0; 1979 return 0;
1757 } 1980 }
… …
1761 $self->realloc; 1984 $self->realloc;
1762 1985
1763 1 1986 1
1764} 1987}
1765 1988
1766sub focus_in { 1989sub invoke_focus_in {
1767 my ($self) = @_; 1990 my ($self) = @_;
1768 1991
1769 $self->{last_activity} = $::NOW; 1992 $self->{last_activity} = $::NOW;
1770 1993
1771 $self->SUPER::focus_in; 1994 $self->SUPER::invoke_focus_in
1772} 1995}
1773 1996
1774sub button_down { 1997sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1776 1999
1777 $self->SUPER::button_down ($ev, $x, $y); 2000 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 2001
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 2002 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 2003
1781 # byte-index to char-index 2004 # byte-index to char-index
1782 my $text = $self->{text}; 2005 my $text = $self->{text};
1783 utf8::encode $text; 2006 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 2007 $self->{cursor} = length $text;
1785 2008
1786 $self->_set_text ($self->{text}); 2009 $self->_set_text ($self->{text});
1787 $self->update; 2010 $self->update;
1788 2011
1789 1 2012 1
1790} 2013}
1791 2014
1792sub mouse_motion { 2015sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 2016 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2017# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 2018
1796 0 2019 1
1797} 2020}
1798 2021
1799sub _draw { 2022sub _draw {
1800 my ($self) = @_; 2023 my ($self) = @_;
1801 2024
… …
1828 utf8::encode $text; 2051 utf8::encode $text;
1829 2052
1830 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1831 } 2054 }
1832 2055
1833 glColor @{$self->{fg}};
1834 glBegin GL_LINES; 2056 glBegin GL_LINES;
1835 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2057 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 2059 glEnd;
1838 } 2060 }
1839} 2061}
1840 2062
1841package CFClient::UI::Entry; 2063package CFPlus::UI::Entry;
1842 2064
1843our @ISA = CFClient::UI::EntryBase::; 2065our @ISA = CFPlus::UI::EntryBase::;
1844 2066
1845use CFClient::OpenGL; 2067use CFPlus::OpenGL;
1846 2068
1847sub key_down { 2069sub invoke_key_down {
1848 my ($self, $ev) = @_; 2070 my ($self, $ev) = @_;
1849 2071
1850 my $sym = $ev->{sym}; 2072 my $sym = $ev->{sym};
1851 2073
1852 if ($sym == 13) { 2074 if ($sym == 13) {
1853 unshift @{$self->{history}}, 2075 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 2076 my $txt = $self->get_text;
2077
1855 $self->{history_pointer} = -1; 2078 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 2079 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 2080 $self->emit (activate => $txt);
1858 $self->update; 2081 $self->update;
1859 2082
1860 } elsif ($sym == CFClient::SDLK_UP) { 2083 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 2084 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 2085 $self->{history_saveback} = $self->get_text;
1863 } 2086 }
1864 if (@{$self->{history} || []} > 0) { 2087 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 2088 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 2090 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 2091 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2092 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 2093 }
1871 2094
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 2095 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 2096 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 2098
1876 if ($self->{history_pointer} >= 0) { 2099 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2100 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 2101 } else {
1879 $self->set_text ($self->{history_saveback}); 2102 $self->set_text ($self->{history_saveback});
1880 } 2103 }
1881 2104
1882 } else { 2105 } else {
1883 return $self->SUPER::key_down ($ev) 2106 return $self->SUPER::invoke_key_down ($ev)
1884 } 2107 }
1885 2108
1886 1 2109 1
1887} 2110}
1888 2111
1889############################################################################# 2112#############################################################################
1890 2113
1891package CFClient::UI::Button; 2114package CFPlus::UI::Button;
1892 2115
1893our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1894 2117
1895use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1896 2119
1897my @tex = 2120my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2122 qw(b1_button_active.png);
1900 2123
1901sub new { 2124sub new {
1902 my $class = shift; 2125 my $class = shift;
1903 2126
… …
1912 can_events => 1, 2135 can_events => 1,
1913 @_ 2136 @_
1914 ) 2137 )
1915} 2138}
1916 2139
1917sub activate { }
1918
1919sub button_up { 2140sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1921 2142
1922 $self->emit ("activate") 2143 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2144 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2145 && $y >= 0 && $y < $self->{h};
… …
1942 $self->SUPER::_draw; 2163 $self->SUPER::_draw;
1943} 2164}
1944 2165
1945############################################################################# 2166#############################################################################
1946 2167
1947package CFClient::UI::CheckBox; 2168package CFPlus::UI::CheckBox;
1948 2169
1949our @ISA = CFClient::UI::DrawBG::; 2170our @ISA = CFPlus::UI::DrawBG::;
1950 2171
1951my @tex = 2172my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2174 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2175
1955use CFClient::OpenGL; 2176use CFPlus::OpenGL;
1956 2177
1957sub new { 2178sub new {
1958 my $class = shift; 2179 my $class = shift;
1959 2180
1960 $class->SUPER::new ( 2181 $class->SUPER::new (
… …
1974 my ($self) = @_; 2195 my ($self) = @_;
1975 2196
1976 (6) x 2 2197 (6) x 2
1977} 2198}
1978 2199
2200sub toggle {
2201 my ($self) = @_;
2202
2203 $self->{state} = !$self->{state};
2204 $self->emit (changed => $self->{state});
2205 $self->update;
2206}
2207
1979sub button_down { 2208sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1981 2210
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2211 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2212 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2213 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2214 } else {
1987 return 0 2215 return 0
1988 } 2216 }
1989 2217
1990 1 2218 1
… …
2010 glDisable GL_TEXTURE_2D; 2238 glDisable GL_TEXTURE_2D;
2011} 2239}
2012 2240
2013############################################################################# 2241#############################################################################
2014 2242
2015package CFClient::UI::Image; 2243package CFPlus::UI::Image;
2016 2244
2017our @ISA = CFClient::UI::Base::; 2245our @ISA = CFPlus::UI::Base::;
2018 2246
2019use CFClient::OpenGL; 2247use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2248
2022our %loaded_images; 2249our %texture_cache;
2023 2250
2024sub new { 2251sub new {
2025 my $class = shift; 2252 my $class = shift;
2026 2253
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2254 my $self = $class->SUPER::new (
2255 can_events => 0,
2256 @_,
2257 );
2028 2258
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2259 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required";
2030 2261
2031 $loaded_images{$self->{image}} ||= 2262 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2264
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2265 Scalar::Util::weaken $texture_cache{$self->{path}};
2035 2266
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2268
2040 $self 2269 $self
2041} 2270}
2042 2271
2272sub STORABLE_freeze {
2273 my ($self, $cloning) = @_;
2274
2275 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2277
2278 $self->{path}
2279}
2280
2281sub STORABLE_attach {
2282 my ($self, $cloning, $path) = @_;
2283
2284 $self->new (path => $path)
2285}
2286
2043sub size_request { 2287sub size_request {
2044 my ($self) = @_; 2288 my ($self) = @_;
2045 2289
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2290 ($self->{tex}{w}, $self->{tex}{h})
2047} 2291}
2048 2292
2049sub _draw { 2293sub _draw {
2050 my ($self) = @_; 2294 my ($self) = @_;
2051 2295
… …
2061 } 2305 }
2062 2306
2063 glEnable GL_TEXTURE_2D; 2307 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2309
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2310 $tex->draw_quad (0, 0, $w, $h);
2067 2311
2068 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
2069} 2313}
2070 2314
2071############################################################################# 2315#############################################################################
2072 2316
2317package CFPlus::UI::ImageButton;
2318
2319our @ISA = CFPlus::UI::Image::;
2320
2321use CFPlus::OpenGL;
2322
2323my %textures;
2324
2325sub new {
2326 my $class = shift;
2327
2328 my $self = $class->SUPER::new (
2329 padding_x => 4,
2330 padding_y => 4,
2331 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1],
2333 can_hover => 1,
2334 align => 0,
2335 valign => 0,
2336 can_events => 1,
2337 @_
2338 );
2339}
2340
2341sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_;
2343
2344 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w}
2346 && $y >= 0 && $y < $self->{h};
2347
2348 1
2349}
2350
2351#############################################################################
2352
2073package CFClient::UI::VGauge; 2353package CFPlus::UI::VGauge;
2074 2354
2075our @ISA = CFClient::UI::Base::; 2355our @ISA = CFPlus::UI::Base::;
2076 2356
2077use List::Util qw(min max); 2357use List::Util qw(min max);
2078 2358
2079use CFClient::OpenGL; 2359use CFPlus::OpenGL;
2080 2360
2081my %tex = ( 2361my %tex = (
2082 food => [ 2362 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2365 ],
2086 grace => [ 2366 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2369 ],
2090 hp => [ 2370 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2373 ],
2094 mana => [ 2374 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2375 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2377 ],
2098); 2378);
2099 2379
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2380# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2440 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2441 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2442
2163 my $h1 = $self->{h} * (1 - $ycut1); 2443 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2444 my $h2 = $self->{h} * (1 - $ycut2);
2445 my $h3 = $self->{h};
2446
2447 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2448
2166 glEnable GL_BLEND; 2449 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2450 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2451 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
… …
2188 2471
2189 if ($t3) { 2472 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2473 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2474 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2475 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2476 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2477 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2478 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2479 glEnd;
2197 } 2480 }
2198 2481
2199 glDisable GL_BLEND; 2482 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2201} 2484}
2202 2485
2203############################################################################# 2486#############################################################################
2204 2487
2205package CFClient::UI::Gauge; 2488package CFPlus::UI::Gauge;
2206 2489
2207our @ISA = CFClient::UI::VBox::; 2490our @ISA = CFPlus::UI::VBox::;
2208 2491
2209sub new { 2492sub new {
2210 my ($class, %arg) = @_; 2493 my ($class, %arg) = @_;
2211 2494
2212 my $self = $class->SUPER::new ( 2495 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2497 can_hover => 1,
2215 can_events => 1, 2498 can_events => 1,
2216 %arg, 2499 %arg,
2217 ); 2500 );
2218 2501
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2502 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2220 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2503 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2221 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2505
2223 $self 2506 $self
2224} 2507}
2225 2508
2226sub set_fontsize { 2509sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2530 $self->{value}->set_text ($val);
2248} 2531}
2249 2532
2250############################################################################# 2533#############################################################################
2251 2534
2252package CFClient::UI::Slider; 2535package CFPlus::UI::Slider;
2253 2536
2254use strict; 2537use strict;
2255 2538
2256use CFClient::OpenGL; 2539use CFPlus::OpenGL;
2257 2540
2258our @ISA = CFClient::UI::DrawBG::; 2541our @ISA = CFPlus::UI::DrawBG::;
2259 2542
2260my @tex = 2543my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2545 qw(s1_slider.png s1_slider_bg.png);
2263 2546
2264sub new { 2547sub new {
2265 my $class = shift; 2548 my $class = shift;
2266 2549
… …
2287 $self->update; 2570 $self->update;
2288 2571
2289 $self 2572 $self
2290} 2573}
2291 2574
2292sub changed { }
2293
2294sub set_range { 2575sub set_range {
2295 my ($self, $range) = @_; 2576 my ($self, $range) = @_;
2296 2577
2297 ($range, $self->{range}) = ($self->{range}, $range); 2578 ($range, $self->{range}) = ($self->{range}, $range);
2298 2579
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2580 if ("@$range" ne "@{$self->{range}}") {
2581 $self->update;
2582 $self->set_value ($self->{range}[0]);
2583 }
2301} 2584}
2302 2585
2303sub set_value { 2586sub set_value {
2304 my ($self, $value) = @_; 2587 my ($self, $value) = @_;
2305 2588
… …
2316 if $unit; 2599 if $unit;
2317 2600
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2601 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2602
2320 if ($value != $old_value) { 2603 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2604 $self->emit (changed => $value);
2322 $self->update; 2605 $self->update;
2323 } 2606 }
2324} 2607}
2325 2608
2326sub size_request { 2609sub size_request {
2327 my ($self) = @_; 2610 my ($self) = @_;
2328 2611
2329 ($self->{req_w}, $self->{req_h}) 2612 ($self->{req_w}, $self->{req_h})
2330} 2613}
2331 2614
2332sub button_down { 2615sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2616 my ($self, $ev, $x, $y) = @_;
2334 2617
2335 $self->SUPER::button_down ($ev, $x, $y); 2618 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2619
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2621
2339 $self->mouse_motion ($ev, $x, $y) 2622 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2623}
2341 2624
2342sub mouse_motion { 2625sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2626 my ($self, $ev, $x, $y) = @_;
2344 2627
2345 if ($GRAB == $self) { 2628 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2629 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2630
… …
2353 } else { 2636 } else {
2354 return 0; 2637 return 0;
2355 } 2638 }
2356 2639
2357 1 2640 1
2641}
2642
2643sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_;
2645
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2649
2650 ! ! $delta
2358} 2651}
2359 2652
2360sub update { 2653sub update {
2361 my ($self) = @_; 2654 my ($self) = @_;
2362 2655
… …
2411 glDisable GL_TEXTURE_2D; 2704 glDisable GL_TEXTURE_2D;
2412} 2705}
2413 2706
2414############################################################################# 2707#############################################################################
2415 2708
2416package CFClient::UI::ValSlider; 2709package CFPlus::UI::ValSlider;
2417 2710
2418our @ISA = CFClient::UI::HBox::; 2711our @ISA = CFPlus::UI::HBox::;
2419 2712
2420sub new { 2713sub new {
2421 my ($class, %arg) = @_; 2714 my ($class, %arg) = @_;
2422 2715
2423 my $range = delete $arg{range}; 2716 my $range = delete $arg{range};
2424 2717
2425 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 2721 to_value => sub { shift },
2429 from_value => sub { shift }, 2722 from_value => sub { shift },
2430 %arg, 2723 %arg,
2431 ); 2724 );
2432 2725
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2745sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2746sub set_value { shift->{slider}->set_value (@_) }
2454 2747
2455############################################################################# 2748#############################################################################
2456 2749
2457package CFClient::UI::TextView; 2750package CFPlus::UI::TextScroller;
2458 2751
2459our @ISA = CFClient::UI::HBox::; 2752our @ISA = CFPlus::UI::HBox::;
2460 2753
2461use CFClient::OpenGL; 2754use CFPlus::OpenGL;
2462 2755
2463sub new { 2756sub new {
2464 my $class = shift; 2757 my $class = shift;
2465 2758
2466 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
2467 fontsize => 1, 2760 fontsize => 1,
2468 can_events => 0, 2761 can_events => 1,
2762 indent => 0,
2469 #font => default_font 2763 #font => default_font
2470 @_, 2764 @_,
2471 2765
2472 layout => (new CFClient::Layout 1), 2766 layout => (new CFPlus::Layout),
2473 par => [], 2767 par => [],
2474 height => 0, 2768 height => 0,
2475 children => [ 2769 children => [
2476 (new CFClient::UI::Empty expand => 1), 2770 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 2771 (new CFPlus::UI::Slider vertical => 1),
2478 ], 2772 ],
2479 ); 2773 );
2480 2774
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 2775 $self->{children}[1]->connect (changed => sub { $self->update });
2482 2776
… …
2488 2782
2489 $self->{fontsize} = $fontsize; 2783 $self->{fontsize} = $fontsize;
2490 $self->reflow; 2784 $self->reflow;
2491} 2785}
2492 2786
2787sub size_request {
2788 my ($self) = @_;
2789
2790 my ($empty, $slider) = @{ $self->{children} };
2791
2792 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request
2794}
2795
2493sub size_allocate { 2796sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 2797 my ($self, $w, $h) = @_;
2495 2798
2496 $self->SUPER::size_allocate ($w, $h); 2799 my ($empty, $slider, @other) = @{ $self->{children} };
2800 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 2801
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2802 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2803 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 2804 $self->{layout}->set_width ($empty->{w});
2805 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 2806
2502 $self->reflow; 2807 $self->reflow;
2503}
2504 2808
2505sub text_size { 2809 local $self->{children} = [$empty, $slider];
2810 $self->SUPER::invoke_size_allocate ($w, $h)
2811}
2812
2813sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 2814 my ($self, $ev) = @_;
2815
2816 return 0 unless $ev->{dy}; # only vertical movements
2817
2818 $self->{children}[1]->emit (mouse_wheel => $ev);
2819
2820 1
2821}
2822
2823sub get_layout {
2824 my ($self, $para) = @_;
2507 2825
2508 my $layout = $self->{layout}; 2826 my $layout = $self->{layout};
2509 2827
2828 $layout->set_font ($self->{font}) if $self->{font};
2829 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2830 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 2831 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 2833 $layout->set_markup ($para->{markup});
2834
2835 $layout->set_shapes (
2836 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}}
2513 2839 );
2840
2514 $layout->size 2841 $layout
2515} 2842}
2516 2843
2517sub reflow { 2844sub reflow {
2518 my ($self) = @_; 2845 my ($self) = @_;
2519 2846
… …
2526 2853
2527 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2528 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2529} 2856}
2530 2857
2858sub current_paragraph {
2859 my ($self) = @_;
2860
2861 $self->{top_paragraph} - 1
2862}
2863
2864sub scroll_to {
2865 my ($self, $para) = @_;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{scroll_to} = $para;
2870 $self->update;
2871}
2872
2531sub clear { 2873sub clear {
2532 my ($self) = @_; 2874 my ($self) = @_;
2875
2876 my (undef, undef, @other) = @{ $self->{children} };
2877 $self->remove ($_) for @other;
2533 2878
2534 $self->{par} = []; 2879 $self->{par} = [];
2535 $self->{height} = 0; 2880 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2881 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 2882}
2538 2883
2539sub add_paragraph { 2884sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 2885 my $self = shift;
2541 2886
2542 for my $line (split /\n/, $text) { 2887 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 2888 $para = {
2889 fg => [1, 1, 1, 1],
2890 indent => 0,
2891 markup => "",
2892 widget => [],
2893 ref $para ? %$para : (markup => $para),
2894 w => 1e10,
2895 wrapped => 1,
2896 };
2897
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para;
2900 }
2901
2902 $self->{need_reflow}++;
2903 $self->update;
2904}
2905
2906sub scroll_to_bottom {
2907 my ($self) = @_;
2908
2909 $self->{scroll_to} = $#{$self->{par}};
2910 $self->update;
2911}
2912
2913sub force_uptodate {
2914 my ($self) = @_;
2915
2916 if (delete $self->{need_reflow}) {
2917 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2918
2919 my $height = 0;
2920
2921 for my $para (@{$self->{par}}) {
2922 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2923 my $layout = $self->get_layout ($para);
2924 my ($w, $h) = $layout->size;
2925
2926 $para->{w} = $w + $para->{indent};
2927 $para->{h} = $h;
2928 $para->{wrapped} = $layout->has_wrapped;
2929 }
2930
2931 $para->{y} = $height;
2932 $height += $para->{h};
2933 }
2934
2544 $self->{height} += $h; 2935 $self->{height} = $height;
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2936 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546 }
2547 2937
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2938 delete $self->{texture};
2939 }
2940
2941 if (my $paridx = delete $self->{scroll_to}) {
2942 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2943 }
2549} 2944}
2550 2945
2551sub update { 2946sub update {
2552 my ($self) = @_; 2947 my ($self) = @_;
2553 2948
… …
2555 2950
2556 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2557 2952
2558 delete $self->{texture}; 2953 delete $self->{texture};
2559 2954
2560 $ROOT->on_post_alloc ($self, sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 2959
2563 if (delete $self->{need_reflow}) {
2564 my $height = 0;
2565
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h;
2577 }
2578
2579 $height += $_->[1];
2580 }
2581
2582 $self->{height} = $height;
2583
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586 delete $self->{texture};
2587 }
2588
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2592 2963
2593 my $top = int $self->{children}[1]{range}[0]; 2964 my $top = int $self->{children}[1]{range}[0];
2594 2965
2966 my $paridx = 0;
2967 my $top_paragraph;
2968 my $top = int $self->{children}[1]{range}[0];
2969
2595 my $y0 = $top; 2970 my $y0 = $top;
2596 my $y1 = $top + $H; 2971 my $y1 = $top + $H;
2597 2972
2598 my $y = 0;
2599
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 2973 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 2974 my $h = $para->{h};
2975 my $y = $para->{y};
2610 2976
2611 if ($y0 < $y + $h && $y < $y1) { 2977 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 2978 my $layout = $self->get_layout ($para);
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 2979
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2980 $layout->render ($para->{indent}, $y - $y0);
2617 2981
2618 glRasterPos $par->[3], $y - $y0; 2982 if (my @w = @{ $para->{widget} }) {
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2983 my @s = $layout->get_shapes;
2984
2985 for (@w) {
2986 my ($dx, $dy) = splice @s, 0, 2, ();
2987
2988 $_->{x} = $dx + $para->{indent};
2989 $_->{y} = $dy + $y - $y0;
2990
2991 $_->draw;
2992 }
2993 }
2620 } 2994 }
2621 2995
2622 $y += $h; 2996 $paridx++;
2997 $top_paragraph ||= $paridx if $y >= $top;
2623 } 2998 }
2624 2999
2625 glDisable GL_BLEND; 3000 $self->{top_paragraph} = $top_paragraph;
2626 }; 3001 };
2627 }); 3002 });
3003}
3004
3005sub reconfigure {
3006 my ($self) = @_;
3007
3008 $self->SUPER::reconfigure;
3009
3010 $_->{w} = 1e10 for @{ $self->{par} };
3011 $self->reflow;
2628} 3012}
2629 3013
2630sub _draw { 3014sub _draw {
2631 my ($self) = @_; 3015 my ($self) = @_;
2632 3016
… …
2635 glColor 0, 0, 0, 1; 3019 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3020 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 3021 glDisable GL_TEXTURE_2D;
2638 3022
2639 $self->{children}[1]->draw; 3023 $self->{children}[1]->draw;
2640
2641} 3024}
2642 3025
2643############################################################################# 3026#############################################################################
2644 3027
2645package CFClient::UI::Animator; 3028package CFPlus::UI::Animator;
2646 3029
2647use CFClient::OpenGL; 3030use CFPlus::OpenGL;
2648 3031
2649our @ISA = CFClient::UI::Bin::; 3032our @ISA = CFPlus::UI::Bin::;
2650 3033
2651sub moveto { 3034sub moveto {
2652 my ($self, $x, $y) = @_; 3035 my ($self, $x, $y) = @_;
2653 3036
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3037 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 3065 glPopMatrix;
2683} 3066}
2684 3067
2685############################################################################# 3068#############################################################################
2686 3069
2687package CFClient::UI::Flopper; 3070package CFPlus::UI::Flopper;
2688 3071
2689our @ISA = CFClient::UI::Button::; 3072our @ISA = CFPlus::UI::Button::;
2690 3073
2691sub new { 3074sub new {
2692 my $class = shift; 3075 my $class = shift;
2693 3076
2694 my $self = $class->SUPER::new ( 3077 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 3089 $self->{other}->toggle_visibility;
2707} 3090}
2708 3091
2709############################################################################# 3092#############################################################################
2710 3093
2711package CFClient::UI::Tooltip; 3094package CFPlus::UI::Tooltip;
2712 3095
2713our @ISA = CFClient::UI::Bin::; 3096our @ISA = CFPlus::UI::Bin::;
2714 3097
2715use CFClient::OpenGL; 3098use CFPlus::OpenGL;
2716 3099
2717sub new { 3100sub new {
2718 my $class = shift; 3101 my $class = shift;
2719 3102
2720 $class->SUPER::new ( 3103 $class->SUPER::new (
… …
2723 ) 3106 )
2724} 3107}
2725 3108
2726sub set_tooltip_from { 3109sub set_tooltip_from {
2727 my ($self, $widget) = @_; 3110 my ($self, $widget) = @_;
3111
3112 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3113 if $widget->{tooltip} =~ /^#(.*)$/;
2728 3114
2729 my $tooltip = $widget->{tooltip}; 3115 my $tooltip = $widget->{tooltip};
2730 3116
2731 if ($ENV{CFPLUS_DEBUG} & 2) { 3117 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 3118 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3119 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 3120 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 3121 . "visible $widget->{visible}";
2736 } 3122 }
2737 3123
3124 $tooltip =~ s/^\n+//;
3125 $tooltip =~ s/\n+$//;
3126
2738 $self->add (new CFClient::UI::Label 3127 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 3128 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3129 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 3130 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 3131 style => 1, # FLAG_INVERSE
2743 ellipsise => 0, 3132 ellipsise => 0,
2744 font => ($widget->{tooltip_font} || $::FONT_PROP), 3133 font => ($widget->{tooltip_font} || $::FONT_PROP),
2745 ); 3134 );
2746} 3135}
2747 3136
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3140 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3141
2753 ($w + 4, $h + 4) 3142 ($w + 4, $h + 4)
2754} 3143}
2755 3144
2756sub size_allocate { 3145sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3146 my ($self, $w, $h) = @_;
2758 3147
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3148 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3149}
2761 3150
2762sub visibility_change { 3151sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3152 my ($self, $visible) = @_;
2764 3153
2765 return unless $visible; 3154 return unless $visible;
2766 3155
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3156 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3157 my $widget = $self->{owner}
2769 or return; 3158 or return;
2770 3159
3160 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3161 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3162
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3163 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3164 if $x + $self->{w} > $self->{root}{w};
2775 3165
2776 $self->move_abs ($x, $y); 3166 $self->move_abs ($x, $y);
3167 } else {
3168 $self->hide;
3169 }
2777 }); 3170 });
2778} 3171}
2779 3172
2780sub _draw { 3173sub _draw {
2781 my ($self) = @_; 3174 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3198 $self->SUPER::_draw;
2806} 3199}
2807 3200
2808############################################################################# 3201#############################################################################
2809 3202
2810package CFClient::UI::Face; 3203package CFPlus::UI::Face;
2811 3204
2812our @ISA = CFClient::UI::Base::; 3205our @ISA = CFPlus::UI::DrawBG::;
2813 3206
2814use CFClient::OpenGL; 3207use CFPlus::OpenGL;
2815 3208
2816sub new { 3209sub new {
2817 my $class = shift; 3210 my $class = shift;
2818 3211
2819 my $self = $class->SUPER::new ( 3212 my $self = $class->SUPER::new (
… …
2854sub _draw { 3247sub _draw {
2855 my ($self) = @_; 3248 my ($self) = @_;
2856 3249
2857 return unless $::CONN; 3250 return unless $::CONN;
2858 3251
3252 $self->SUPER::_draw;
3253
2859 my $face; 3254 my $face;
2860 3255
2861 if ($self->{frame}) { 3256 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3257 my $anim = $::CONN->{anim}[$self->{anim}];
2863 3258
… …
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3269 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3270 glDisable GL_TEXTURE_2D;
2876 } 3271 }
2877} 3272}
2878 3273
2879sub DESTROY { 3274sub destroy {
2880 my ($self) = @_; 3275 my ($self) = @_;
2881 3276
2882 $self->{timer}->cancel 3277 $self->{timer}->cancel
2883 if $self->{timer}; 3278 if $self->{timer};
2884 3279
2885 $self->SUPER::DESTROY; 3280 $self->SUPER::destroy;
2886} 3281}
2887 3282
2888############################################################################# 3283#############################################################################
2889 3284
2890package CFClient::UI::Buttonbar; 3285package CFPlus::UI::Buttonbar;
2891 3286
2892our @ISA = CFClient::UI::HBox::; 3287our @ISA = CFPlus::UI::HBox::;
2893 3288
2894# TODO: should actualyl wrap buttons and other goodies. 3289# TODO: should actualyl wrap buttons and other goodies.
2895 3290
2896############################################################################# 3291#############################################################################
2897 3292
2898package CFClient::UI::Menu; 3293package CFPlus::UI::Menu;
2899 3294
2900our @ISA = CFClient::UI::FancyFrame::; 3295our @ISA = CFPlus::UI::Toplevel::;
2901 3296
2902use CFClient::OpenGL; 3297use CFPlus::OpenGL;
2903 3298
2904sub new { 3299sub new {
2905 my $class = shift; 3300 my $class = shift;
2906 3301
2907 my $self = $class->SUPER::new ( 3302 my $self = $class->SUPER::new (
2908 items => [], 3303 items => [],
2909 z => 100, 3304 z => 100,
2910 @_, 3305 @_,
2911 ); 3306 );
2912 3307
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3308 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3309
2915 for my $item (@{ $self->{items} }) { 3310 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3311 my ($widget, $cb, $tooltip) = @$item;
2917 3312
2918 # handle various types of items, only text for now 3313 # handle various types of items, only text for now
2919 if (!ref $widget) { 3314 if (!ref $widget) {
3315 if ($widget =~ /\t/) {
3316 my ($left, $right) = split /\t/, $widget, 2;
3317
2920 $widget = new CFClient::UI::Label 3318 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3319 can_hover => 1,
2922 can_events => 1, 3320 can_events => 1,
3321 tooltip => $tooltip,
3322 children => [
3323 (new CFPlus::UI::Label markup => $left, expand => 1),
3324 (new CFPlus::UI::Label markup => $right, align => +1),
3325 ],
3326 ;
3327
3328 } else {
3329 $widget = new CFPlus::UI::Label
3330 can_hover => 1,
3331 can_events => 1,
2923 text => $widget; 3332 markup => $widget,
3333 tooltip => $tooltip;
3334 }
2924 } 3335 }
2925 3336
2926 $self->{item}{$widget} = $item; 3337 $self->{item}{$widget} = $item;
2927 3338
2928 $self->{vbox}->add ($widget); 3339 $self->{vbox}->add ($widget);
… …
2933 3344
2934# popup given the event (must be a mouse button down event currently) 3345# popup given the event (must be a mouse button down event currently)
2935sub popup { 3346sub popup {
2936 my ($self, $ev) = @_; 3347 my ($self, $ev) = @_;
2937 3348
2938 $self->_emit ("popdown"); 3349 $self->emit ("popdown");
2939 3350
2940 # maybe save $GRAB? must be careful about events... 3351 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3352 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3353 $self->{button} = $ev->{button};
2943 3354
2944 $self->show; 3355 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3356 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3357}
2947 3358
2948sub mouse_motion { 3359sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3360 my ($self, $ev, $x, $y) = @_;
2950 3361
2951 # TODO: should use vbox->find_widget or so 3362 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3363 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3364 $self->{hover} = $self->{item}{$HOVER};
2954 3365
2955 0 3366 0
2956} 3367}
2957 3368
2958sub button_up { 3369sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3370 my ($self, $ev, $x, $y) = @_;
2960 3371
2961 if ($ev->{button} == $self->{button}) { 3372 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3373 undef $GRAB;
2963 $self->hide; 3374 $self->hide;
2964 3375
2965 $self->_emit ("popdown"); 3376 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3377 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3378 } else {
2968 return 0 3379 return 0
2969 } 3380 }
2970 3381
2971 1 3382 1
2972} 3383}
2973 3384
2974############################################################################# 3385#############################################################################
2975 3386
2976package CFClient::UI::Multiplexer; 3387package CFPlus::UI::Multiplexer;
2977 3388
2978our @ISA = CFClient::UI::Container::; 3389our @ISA = CFPlus::UI::Container::;
2979 3390
2980sub new { 3391sub new {
2981 my $class = shift; 3392 my $class = shift;
2982 3393
2983 my $self = $class->SUPER::new ( 3394 my $self = $class->SUPER::new (
… …
2997 3408
2998 $self->{current} = $self->{children}[0] 3409 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3410 if @{ $self->{children} };
3000} 3411}
3001 3412
3413sub get_current_page {
3414 my ($self) = @_;
3415
3416 $self->{current}
3417}
3418
3002sub set_current_page { 3419sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3420 my ($self, $page_or_widget) = @_;
3004 3421
3005 my $widget = ref $page_or_widget 3422 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3423 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3424 : $self->{children}[$page_or_widget];
3008 3425
3009 $self->{current} = $widget; 3426 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3427 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3428
3012 $self->_emit (page_changed => $self->{current}); 3429 $self->emit (page_changed => $self->{current});
3013 3430
3014 $self->realloc; 3431 $self->realloc;
3015} 3432}
3016 3433
3017sub visible_children { 3434sub visible_children {
… …
3022 my ($self) = @_; 3439 my ($self) = @_;
3023 3440
3024 $self->{current}->size_request 3441 $self->{current}->size_request
3025} 3442}
3026 3443
3027sub size_allocate { 3444sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3445 my ($self, $w, $h) = @_;
3029 3446
3030 $self->{current}->configure (0, 0, $w, $h); 3447 $self->{current}->configure (0, 0, $w, $h);
3448
3449 1
3031} 3450}
3032 3451
3033sub _draw { 3452sub _draw {
3034 my ($self) = @_; 3453 my ($self) = @_;
3035 3454
3036 $self->{current}->draw; 3455 $self->{current}->draw;
3037} 3456}
3038 3457
3039############################################################################# 3458#############################################################################
3040 3459
3041package CFClient::UI::Notebook; 3460package CFPlus::UI::Notebook;
3042 3461
3043our @ISA = CFClient::UI::VBox::; 3462our @ISA = CFPlus::UI::VBox::;
3044 3463
3045sub new { 3464sub new {
3046 my $class = shift; 3465 my $class = shift;
3047 3466
3048 my $self = $class->SUPER::new ( 3467 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3468 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3469 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3470 # filter => # will be put between multiplexer and $self
3052 @_, 3471 @_,
3053 ); 3472 );
3054 3473
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3474 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3061sub add { 3480sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3481 my ($self, $title, $widget, $tooltip) = @_;
3063 3482
3064 Scalar::Util::weaken $self; 3483 Scalar::Util::weaken $self;
3065 3484
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3485 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3486 markup => $title,
3068 tooltip => $tooltip, 3487 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3488 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3489 );
3071 3490
3072 $self->{multiplexer}->add ($widget); 3491 $self->{multiplexer}->add ($widget);
3073} 3492}
3074 3493
3494sub get_current_page {
3495 my ($self) = @_;
3496
3497 $self->{multiplexer}->get_current_page
3498}
3499
3075sub set_current_page { 3500sub set_current_page {
3076 my ($self, $page) = @_; 3501 my ($self, $page) = @_;
3077 3502
3078 $self->{multiplexer}->set_current_page ($page); 3503 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3504 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3505}
3081 3506
3082############################################################################# 3507#############################################################################
3083 3508
3509package CFPlus::UI::Selector;
3510
3511use utf8;
3512
3513our @ISA = CFPlus::UI::Button::;
3514
3515sub new {
3516 my $class = shift;
3517
3518 my $self = $class->SUPER::new (
3519 options => [], # [value, title, longdesc], ...
3520 value => undef,
3521 @_,
3522 );
3523
3524 $self->_set_value ($self->{value});
3525
3526 $self
3527}
3528
3529sub invoke_button_down {
3530 my ($self, $ev) = @_;
3531
3532 my @menu_items;
3533
3534 for (@{ $self->{options} }) {
3535 my ($value, $title, $tooltip) = @$_;
3536
3537 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3538 }
3539
3540 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3541}
3542
3543sub _set_value {
3544 my ($self, $value) = @_;
3545
3546 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3547 or return;
3548
3549 $self->{value} = $item->[0];
3550 $self->set_markup ("$item->[1] ⇓");
3551 $self->set_tooltip ($item->[2]);
3552}
3553
3554sub set_value {
3555 my ($self, $value) = @_;
3556
3557 return unless $self->{value} ne $value;
3558
3559 $self->_set_value ($value);
3560 $self->emit (changed => $value);
3561}
3562
3563#############################################################################
3564
3084package CFClient::UI::Statusbox; 3565package CFPlus::UI::Statusbox;
3085 3566
3086our @ISA = CFClient::UI::VBox::; 3567our @ISA = CFPlus::UI::VBox::;
3087 3568
3088sub new { 3569sub new {
3089 my $class = shift; 3570 my $class = shift;
3090 3571
3091 my $self = $class->SUPER::new ( 3572 my $self = $class->SUPER::new (
… …
3103sub reorder { 3584sub reorder {
3104 my ($self) = @_; 3585 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3586 my $NOW = Time::HiRes::time;
3106 3587
3107 # freeze display when hovering over any label 3588 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3589 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3590 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3591 values %{ $self->{item} };
3111 3592
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3593 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3594 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3595 }
… …
3135 for ($short) { 3616 for ($short) {
3136 s/^\s+//; 3617 s/^\s+//;
3137 s/\s+/ /g; 3618 s/\s+/ /g;
3138 } 3619 }
3139 3620
3140 new CFClient::UI::Label 3621 new CFPlus::UI::Label
3141 markup => $short, 3622 markup => $short,
3142 tooltip => $item->{tooltip}, 3623 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3624 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3625 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3626 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 3664 $item->{count}++;
3184 } else { 3665 } else {
3185 $item->{count} = 1; 3666 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3667 $item->{text} = $item->{tooltip} = $text;
3187 } 3668 }
3188 $item->{id} = ++$self->{id}; 3669 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3670 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3671 delete $item->{label};
3191 } else { 3672 } else {
3192 $self->{item}{$group} = { 3673 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3674 id => ++$self->{id},
… …
3199 count => 1, 3680 count => 1,
3200 %arg, 3681 %arg,
3201 }; 3682 };
3202 } 3683 }
3203 3684
3685 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3686 $self->reorder;
3687 });
3205} 3688}
3206 3689
3207sub reconfigure { 3690sub reconfigure {
3208 my ($self) = @_; 3691 my ($self) = @_;
3209 3692
… …
3212 3695
3213 $self->reorder; 3696 $self->reorder;
3214 $self->SUPER::reconfigure; 3697 $self->SUPER::reconfigure;
3215} 3698}
3216 3699
3217sub DESTROY { 3700sub destroy {
3218 my ($self) = @_; 3701 my ($self) = @_;
3219 3702
3220 $self->{timer}->cancel; 3703 $self->{timer}->cancel;
3221 3704
3222 $self->SUPER::DESTROY; 3705 $self->SUPER::destroy;
3223} 3706}
3224 3707
3225############################################################################# 3708#############################################################################
3226 3709
3227package CFClient::UI::Inventory; 3710package CFPlus::UI::Inventory;
3228 3711
3229our @ISA = CFClient::UI::ScrolledWindow::; 3712our @ISA = CFPlus::UI::Table::;
3230 3713
3231sub new { 3714sub new {
3232 my $class = shift; 3715 my $class = shift;
3233 3716
3234 my $self = $class->SUPER::new ( 3717 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3718 col_expand => [0, 1, 0],
3719 items => [],
3236 @_, 3720 @_,
3237 ); 3721 );
3238 3722
3723 $self->set_sort_order (undef);
3724
3239 $self 3725 $self
3726}
3727
3728sub update_items {
3729 my ($self) = @_;
3730
3731 $self->clear;
3732
3733 my @item = $self->{sort}->(@{ $self->{items} });
3734
3735 my @adds;
3736 my $row = 0;
3737 for my $item ($self->{sort}->(@{ $self->{items} })) {
3738 CFPlus::Item::update_widgets $item;
3739
3740 push @adds, 0, $row, $item->{face_widget};
3741 push @adds, 1, $row, $item->{desc_widget};
3742 push @adds, 2, $row, $item->{weight_widget};
3743
3744 $row++;
3745 }
3746
3747 $self->add (@adds);
3748}
3749
3750sub set_sort_order {
3751 my ($self, $order) = @_;
3752
3753 $self->{sort} = $order ||= sub {
3754 sort {
3755 $a->{type} <=> $b->{type}
3756 or $a->{name} cmp $b->{name}
3757 } @_
3758 };
3759
3760 $self->update_items;
3240} 3761}
3241 3762
3242sub set_items { 3763sub set_items {
3243 my ($self, $items) = @_; 3764 my ($self, $items) = @_;
3244 3765
3245 $self->{child}->clear; 3766 $self->{items} = [$items ? values %$items : ()];
3246 return unless $items; 3767 $self->update_items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265} 3768}
3266 3769
3267############################################################################# 3770#############################################################################
3268 3771
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList; 3772package CFPlus::UI::SpellList;
3467 3773
3468our @ISA = CFClient::UI::Table::; 3774our @ISA = CFPlus::UI::Table::;
3469 3775
3470sub new { 3776sub new {
3471 my $class = shift; 3777 my $class = shift;
3472 3778
3473 my $self = $class->SUPER::new ( 3779 my $self = $class->SUPER::new (
… …
3475 commands => [], 3781 commands => [],
3476 @_, 3782 @_,
3477 ) 3783 )
3478} 3784}
3479 3785
3480# XXX: Do sorting? Argl... 3786my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3787
3788my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3789 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3790my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3791 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3792my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3796my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3798
3799sub rebuild_spell_list {
3800 my ($self) = @_;
3801
3802 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3803 $self->clear;
3804
3805 return unless $::CONN;
3806
3807 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3808 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3809 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3810 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3811 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3812
3813 my $row = 0;
3814
3815 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3816 my $spell = $self->{spell}{$_};
3817
3818 $row++;
3819
3820 my $spell_cb = sub {
3821 my ($widget, $ev) = @_;
3822
3823 if ($ev->{button} == 1) {
3824 $::CONN->user_send ("cast $spell->{name}");
3825 } elsif ($ev->{button} == 2) {
3826 $::CONN->user_send ("invoke $spell->{name}");
3827 } elsif ($ev->{button} == 3) {
3828 (new CFPlus::UI::Menu
3829 items => [
3830 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3831 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3832 ],
3833 )->popup ($ev);
3834 } else {
3835 return 0;
3836 }
3837
3838 1
3839 };
3840
3841 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3842
3843 #TODO: add path info to tooltip
3844 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3845
3846 $self->add (0, $row, new CFPlus::UI::Face
3847 face => $spell->{face},
3848 can_hover => 1,
3849 can_events => 1,
3850 tooltip => $tooltip,
3851 on_button_down => $spell_cb,
3852 );
3853
3854 $self->add (1, $row, new CFPlus::UI::Label
3855 expand => 1,
3856 text => $spell->{name},
3857 can_hover => 1,
3858 can_events => 1,
3859 tooltip => $tooltip,
3860 on_button_down => $spell_cb,
3861 );
3862
3863 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3864 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3865 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3866 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3867 }
3868 });
3869}
3870
3481sub add_spell { 3871sub add_spell {
3482 my ($self, $spell) = @_; 3872 my ($self, $spell) = @_;
3873
3483 $self->{spells}->{$spell->{name}} = $spell; 3874 $self->{spell}->{$spell->{name}} = $spell;
3484 3875 $self->rebuild_spell_list;
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512} 3876}
3513 3877
3514sub remove_spell { 3878sub remove_spell {
3515 my ($self, $spell) = @_; 3879 my ($self, $spell) = @_;
3880
3516 delete $self->{spells}->{$spell->{name}}; 3881 delete $self->{spell}->{$spell->{name}};
3517 $self->rebuild_spell_list; 3882 $self->rebuild_spell_list;
3518} 3883}
3519 3884
3885sub clear_spells {
3886 my ($self) = @_;
3887
3888 $self->{spell} = {};
3889 $self->rebuild_spell_list;
3890}
3891
3520############################################################################# 3892#############################################################################
3521 3893
3522package CFClient::UI::Root; 3894package CFPlus::UI::Root;
3523 3895
3524our @ISA = CFClient::UI::Container::; 3896our @ISA = CFPlus::UI::Container::;
3525 3897
3526use List::Util qw(min max); 3898use List::Util qw(min max);
3527 3899
3528use CFClient::OpenGL; 3900use CFPlus::OpenGL;
3529 3901
3530sub new { 3902sub new {
3531 my $class = shift; 3903 my $class = shift;
3532 3904
3533 my $self = $class->SUPER::new ( 3905 my $self = $class->SUPER::new (
… …
3558 $coord = $max - $size if $coord > $max - $size; 3930 $coord = $max - $size if $coord > $max - $size;
3559 3931
3560 int $coord + 0.5 3932 int $coord + 0.5
3561} 3933}
3562 3934
3563sub size_allocate { 3935sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 3936 my ($self, $w, $h) = @_;
3565 3937
3566 for my $child ($self->children) { 3938 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3939 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 3940
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 3944 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 3945 $Y = _to_pixel $Y, $H, $self->{h};
3574 3946
3575 $child->configure ($X, $Y, $W, $H); 3947 $child->configure ($X, $Y, $W, $H);
3576 } 3948 }
3949
3950 1
3577} 3951}
3578 3952
3579sub coord2local { 3953sub coord2local {
3580 my ($self, $x, $y) = @_; 3954 my ($self, $x, $y) = @_;
3581 3955
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4081 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 4082
3709 $w = 0 if $w < 0; 4083 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 4084 $h = 0 if $h < 0;
3711 4085
4086 $w = max $widget->{min_w}, $w;
4087 $h = max $widget->{min_h}, $h;
4088
4089# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4090# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4091
4092 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4093 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4094
3712 $w = int $w + 0.5; 4095 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 4096 $h = int $h + 0.5;
3714 4097
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4098 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 4099 $widget->{old_w} = $widget->{w};
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4122 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 4123 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 4124 glLoadIdentity;
3742 4125
3743 { 4126 {
3744 package CFClient::UI::Base; 4127 package CFPlus::UI::Base;
3745 4128
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 4129 ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 4130 (0, 0, $self->{w}, $self->{h});
3748 } 4131 }
3749 4132
3750 $self->_draw; 4133 $self->_draw;
3751} 4134}
3752 4135
3753############################################################################# 4136#############################################################################
3754 4137
3755package CFClient::UI; 4138package CFPlus::UI;
3756 4139
3757$ROOT = new CFClient::UI::Root; 4140$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4141$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4142
37601 41431
3761 4144

Diff Legend

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