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.340 by root, Sun Jul 30 13:16:44 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 CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->cb->();
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
98 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
100 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
193 reconfigure_widgets; 207 reconfigure_widgets;
194} 208}
195 209
196############################################################################# 210#############################################################################
197 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
198package CFClient::UI::Base; 220package CFPlus::UI::Base;
199 221
200use strict; 222use strict;
201 223
202use CFClient::OpenGL; 224use CFPlus::OpenGL;
203 225
204sub new { 226sub new {
205 my $class = shift; 227 my $class = shift;
206 228
207 my $self = bless { 229 my $self = bless {
… …
212 h => undef, 234 h => undef,
213 can_events => 1, 235 can_events => 1,
214 @_ 236 @_
215 }, $class; 237 }, $class;
216 238
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 240
219 for (keys %$self) { 241 for (keys %$self) {
220 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
222 } 244 }
223 } 245 }
224 246
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 248 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 249 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 250 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 252
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 255
234 $self->show if $layout->{show}; 256 $self->show if $layout->{show};
… …
247sub show { 269sub show {
248 my ($self) = @_; 270 my ($self) = @_;
249 271
250 return if $self->{parent}; 272 return if $self->{parent};
251 273
252 $CFClient::UI::ROOT->add ($self); 274 $CFPlus::UI::ROOT->add ($self);
253} 275}
254 276
255sub set_visible { 277sub set_visible {
256 my ($self) = @_; 278 my ($self) = @_;
257 279
… …
272 294
273 return unless $self->{visible}; 295 return unless $self->{visible};
274 296
275 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
276 298
299 delete $self->{visible};
277 delete $self->{root}; 300 delete $self->{root};
278 delete $self->{visible};
279 301
280 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
282 304
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 305 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
285 307
286 $self->focus_out; 308 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
289} 310}
290 311
291sub set_visibility { 312sub set_visibility {
292 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
315} 336}
316 337
317sub move_abs { 338sub move_abs {
318 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
319 340
320 $self->{x} = List::Util::max 0, int $x; 341 $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; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
323 344
324 $self->update; 345 $self->update;
325} 346}
326 347
… …
336sub size_request { 357sub size_request {
337 require Carp; 358 require Carp;
338 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
339} 360}
340 361
362sub baseline_shift {
363 0
364}
365
341sub configure { 366sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
343 368
344 if ($self->{aspect}) { 369 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
346 371
347 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 374
350 # use alignment to adjust x, y 375 # use alignment to adjust x, y
351 376
352 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
367 392
368 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
369 } 394 }
370} 395}
371 396
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 397sub children {
377 # nop 398 # nop
378} 399}
379 400
380sub visible_children { 401sub visible_children {
… …
398 419
399 return if $self->{tooltip} eq $tooltip; 420 return if $self->{tooltip} eq $tooltip;
400 421
401 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
402 423
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 426 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 427 }
407} 428}
408 429
409# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
410sub coord2local { 431sub coord2local {
411 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
412 433
434 Carp::confess unless $self->{parent};#d#
435
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 437}
415 438
416# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
417sub coord2global { 440sub coord2global {
418 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
419 442
443 Carp::confess unless $self->{parent};#d#
444
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 446}
422 447
423sub focus_in { 448sub invoke_focus_in {
424 my ($self) = @_; 449 my ($self) = @_;
425 450
426 return if $FOCUS == $self; 451 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
428 453
429 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
430 455
431 $self->_emit (focus_in => $focus); 456 $self->update;
432 457
433 $focus->update if $focus; 458 0
434 $FOCUS->update;
435} 459}
436 460
437sub focus_out { 461sub invoke_focus_out {
438 my ($self) = @_; 462 my ($self) = @_;
439 463
440 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
441 465
442 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
443 467
444 $self->_emit (focus_out => $focus); 468 $self->update;
445 469
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 471 unless $FOCUS;
450}
451 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
452sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 484sub invoke_button_up { 0 }
454sub key_down { 0 } 485sub invoke_key_down { 0 }
455sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
456 488
457sub button_down { 489sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
459 491
460 $self->focus_in; 492 $self->grab_focus;
461 493
462 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 531}
464 532
465sub find_widget { 533sub find_widget {
466 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
467 535
… …
477sub set_parent { 545sub set_parent {
478 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
479 547
480 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 549 $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} 550}
506 551
507sub realloc { 552sub realloc {
508 my ($self) = @_; 553 my ($self) = @_;
509 554
… …
542 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
543 588
544 # update screen rectangle 589 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 592
550 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 596
… …
576 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
579 glEnd; 622 glEnd;
580 glPopMatrix; 623 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 625 }
583 626
584 $self->_draw; 627 $self->_draw;
585 glPopMatrix; 628 glPopMatrix;
586} 629}
… …
592} 635}
593 636
594sub DESTROY { 637sub DESTROY {
595 my ($self) = @_; 638 my ($self) = @_;
596 639
640 return if CFPlus::in_destruct;
641
597 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
598 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 646}
600 647
601############################################################################# 648#############################################################################
602 649
603package CFClient::UI::DrawBG; 650package CFPlus::UI::DrawBG;
604 651
605our @ISA = CFClient::UI::Base::; 652our @ISA = CFPlus::UI::Base::;
606 653
607use strict; 654use strict;
608use CFClient::OpenGL; 655use CFPlus::OpenGL;
609 656
610sub new { 657sub new {
611 my $class = shift; 658 my $class = shift;
612 659
613 # range [value, low, high, page] 660 # range [value, low, high, page]
… …
644 } 691 }
645} 692}
646 693
647############################################################################# 694#############################################################################
648 695
649package CFClient::UI::Empty; 696package CFPlus::UI::Empty;
650 697
651our @ISA = CFClient::UI::Base::; 698our @ISA = CFPlus::UI::Base::;
652 699
653sub new { 700sub new {
654 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
656} 703}
… …
663 710
664sub draw { } 711sub draw { }
665 712
666############################################################################# 713#############################################################################
667 714
668package CFClient::UI::Container; 715package CFPlus::UI::Container;
669 716
670our @ISA = CFClient::UI::Base::; 717our @ISA = CFPlus::UI::Base::;
671 718
672sub new { 719sub new {
673 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
674 721
675 my $children = delete $arg{children}; 722 my $children = delete $arg{children};
… …
684 if $children; 731 if $children;
685 732
686 $self 733 $self
687} 734}
688 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
689sub add { 744sub add {
690 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
691 746
692 $_->set_parent ($self) 747 $_->set_parent ($self)
693 for @widgets; 748 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 808 $_->draw for @{$self->{children}};
754} 809}
755 810
756############################################################################# 811#############################################################################
757 812
758package CFClient::UI::Bin; 813package CFPlus::UI::Bin;
759 814
760our @ISA = CFClient::UI::Container::; 815our @ISA = CFPlus::UI::Container::;
761 816
762sub new { 817sub new {
763 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
764 819
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 821
767 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
768} 823}
769 824
770sub add { 825sub add {
771 my ($self, $child) = @_; 826 my ($self, $child) = @_;
772 827
773 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
776} 830}
777 831
778sub remove { 832sub remove {
779 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
780 834
781 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
782 836
783 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 838 unless @{$self->{children}};
785} 839}
786 840
787sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
788 842
789sub size_request { 843sub size_request {
790 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
791} 845}
792 846
793sub size_allocate { 847sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
795 849
796 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
797} 853}
798 854
799############################################################################# 855#############################################################################
800 856
801# back-buffered drawing area 857# back-buffered drawing area
802 858
803package CFClient::UI::Window; 859package CFPlus::UI::Window;
804 860
805our @ISA = CFClient::UI::Bin::; 861our @ISA = CFPlus::UI::Bin::;
806 862
807use CFClient::OpenGL; 863use CFPlus::OpenGL;
808 864
809sub new { 865sub new {
810 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
811 867
812 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
817 873
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 875 $self->SUPER::update;
820} 876}
821 877
822sub size_allocate { 878sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
824 880
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
827} 884}
828 885
829sub _render { 886sub _render {
830 my ($self) = @_; 887 my ($self) = @_;
831 888
… …
833} 890}
834 891
835sub render_child { 892sub render_child {
836 my ($self) = @_; 893 my ($self) = @_;
837 894
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
841 898
842 { 899 {
843 package CFClient::UI::Base; 900 package CFPlus::UI::Base;
844 901
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 902 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
847 } 904 }
848 905
… …
867 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
868} 925}
869 926
870############################################################################# 927#############################################################################
871 928
872package CFClient::UI::ViewPort; 929package CFPlus::UI::ViewPort;
873 930
874our @ISA = CFClient::UI::Window::; 931our @ISA = CFPlus::UI::Window::;
875 932
876sub new { 933sub new {
877 my $class = shift; 934 my $class = shift;
878 935
879 $class->SUPER::new ( 936 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
893 950
894 ($w, $h) 951 ($w, $h)
895} 952}
896 953
897sub size_allocate { 954sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
899 956
900 my $child = $self->child; 957 my $child = $self->child;
901 958
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 961
905 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
906 $self->update; 963 $self->update;
964
965 1
907} 966}
908 967
909sub set_offset { 968sub set_offset {
910 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
911 970
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 998 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1000 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1002 }
944} 1003}
945 1004
946sub _render { 1005sub _render {
947 my ($self) = @_; 1006 my ($self) = @_;
948 1007
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1008 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}; 1009 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1010
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1012
954 $self->SUPER::_render; 1013 $self->SUPER::_render;
955} 1014}
956 1015
957############################################################################# 1016#############################################################################
958 1017
959package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
960 1019
961our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::HBox::;
962 1021
963sub new { 1022sub new {
964 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
965 1024
966 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
967 1026
968 my $self; 1027 my $self;
969 1028
970 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1030 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1032 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
975 }, 1034 },
976 ; 1035 ;
977 1036
978 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1,
980 slider => $slider, 1040 slider => $slider,
981 %arg, 1041 %arg,
982 ); 1042 );
983 1043
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
986 1046
987 $self 1047 $self
988} 1048}
989 1049
1050#TODO# update range on size_allocate depending on child
1051
990sub add { 1052sub add {
991 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
992 1054
993 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
994} 1056}
995 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
996sub update { 1074sub update {
997 my ($self) = @_; 1075 my ($self) = @_;
998 1076
999 $self->SUPER::update; 1077 $self->SUPER::update;
1000 1078
1001 # todo: overwrite size_allocate of child 1079 $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} 1080}
1005 1081
1006sub size_allocate { 1082sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1008 1084
1085 $self->update_slider;
1086
1009 $self->SUPER::size_allocate ($w, $h); 1087 $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} 1088}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1089
1018############################################################################# 1090#############################################################################
1019 1091
1020package CFClient::UI::Frame; 1092package CFPlus::UI::Frame;
1021 1093
1022our @ISA = CFClient::UI::Bin::; 1094our @ISA = CFPlus::UI::Bin::;
1023 1095
1024use CFClient::OpenGL; 1096use CFPlus::OpenGL;
1025 1097
1026sub new { 1098sub new {
1027 my $class = shift; 1099 my $class = shift;
1028 1100
1029 $class->SUPER::new ( 1101 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1127 $self->SUPER::_draw;
1056} 1128}
1057 1129
1058############################################################################# 1130#############################################################################
1059 1131
1060package CFClient::UI::FancyFrame; 1132package CFPlus::UI::FancyFrame;
1061 1133
1062our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1063 1135
1064use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1065 1137
1066my $bg = 1138my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1; 1140 mipmap => 1, wrap => 1;
1069 1141
1070my @border = 1142my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1145
1074sub new { 1146sub new {
1075 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1148
1079 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1152 border => 0.6,
1083 can_events => 1, 1153 can_events => 1,
1084 min_w => 16, 1154 min_w => 64,
1085 min_h => 16, 1155 min_h => 32,
1086 %arg, 1156 %arg,
1087 ); 1157 );
1088 1158
1089 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1160 align => 0,
1091 valign => 1, 1161 valign => 1,
1092 text => $title, 1162 text => $self->{title},
1093 fontsize => $self->{border} 1163 fontsize => $self->{border},
1094 if defined $title; 1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFPlus::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFPlus::UI::Container::add ($self->{close_button});
1173 }
1095 1174
1096 $self 1175 $self
1097} 1176}
1098 1177
1099sub add { 1178sub add {
1100 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1101 1180
1102 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1184}
1105 1185
1106sub border { 1186sub border {
1107 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1108} 1188}
1109 1189
1110sub size_request { 1190sub size_request {
1111 my ($self) = @_; 1191 my ($self) = @_;
1112 1192
1113 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1114 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1115 1198
1116 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1117 1200
1118 ( 1201 (
1119 $w + $self->border * 2, 1202 $w + $self->border * 2,
1120 $h + $self->border * 2, 1203 $h + $self->border * 2,
1121 ) 1204 )
1122} 1205}
1123 1206
1124sub size_allocate { 1207sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1126 1209
1127 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1214 }
1132 1215
1133 my $border = $self->border; 1216 my $border = $self->border;
1134 1217
1135 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1137 1233
1138 $self->child->configure ($border, $border, $w, $h); 1234 1
1139} 1235}
1140 1236
1141sub button_down { 1237sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1143 1239
1144 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1241 my $border = $self->border;
1146 1242
… …
1177 1273
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1275
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1279 };
1184 } else { 1280 } else {
1185 return 0; 1281 return 0;
1186 } 1282 }
1187 1283
1188 1 1284 1
1189} 1285}
1190 1286
1191sub button_up { 1287sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1193 1289
1194 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1195} 1291}
1196 1292
1197sub mouse_motion { 1293sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1199 1295
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1297
1202 !!$self->{motion} 1298 ! ! $self->{motion}
1299}
1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1203} 1307}
1204 1308
1205sub _draw { 1309sub _draw {
1206 my ($self) = @_; 1310 my ($self) = @_;
1207 1311
… …
1233 1337
1234 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1235 1339
1236 $child->draw; 1340 $child->draw;
1237 1341
1238 if ($self->{title}) { 1342 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1343 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1241 } 1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1242} 1351}
1243 1352
1244############################################################################# 1353#############################################################################
1245 1354
1246package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1247 1356
1248our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1249 1358
1250use List::Util qw(max sum); 1359use List::Util qw(max sum);
1251 1360
1252use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1253 1362
1254sub new { 1363sub new {
1255 my $class = shift; 1364 my $class = shift;
1256 1365
1257 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1263sub children { 1372sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1374}
1266 1375
1267sub add { 1376sub add {
1268 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1269 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1381 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1272 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1274} 1394}
1275 1395
1276# TODO: move to container class maybe? send children a signal on removal? 1396# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1397sub clear {
1278 my ($self) = @_; 1398 my ($self) = @_;
… …
1319 (sum @$ws), 1439 (sum @$ws),
1320 (sum @$hs), 1440 (sum @$hs),
1321 ) 1441 )
1322} 1442}
1323 1443
1324sub size_allocate { 1444sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1326 1446
1327 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1328 1448
1329 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1336 1456
1337 # linearly scale sizes 1457 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1460
1341 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1343 1463
1344 my $y; 1464 my $y;
1345 1465
1346 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1361 } 1481 }
1362 1482
1363 $y += $row_h; 1483 $y += $row_h;
1364 } 1484 }
1365 1485
1486 1
1366} 1487}
1367 1488
1368sub find_widget { 1489sub find_widget {
1369 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1370 1491
… …
1389 } 1510 }
1390} 1511}
1391 1512
1392############################################################################# 1513#############################################################################
1393 1514
1394package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1395 1516
1396our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1397 1518
1398sub size_request { 1519sub size_request {
1399 my ($self) = @_; 1520 my ($self) = @_;
1400 1521
1401 $self->{vertical} 1522 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1530 )
1410} 1531}
1411 1532
1412sub size_allocate { 1533sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1414 1535
1415 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1417 1538
1418 my @req; 1539 my @req;
1419 1540
1420 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1422 } else { 1543 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1425 1546
1426 if ($req > $space) { 1547 if ($req > $space) {
1427 # ah well, not enough space 1548 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1429 } else { 1550 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1552
1432 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1433 1554
1434 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1556 for 0 .. $#children;
1436 } 1557 }
1437 } 1558 }
1438 1559
1439 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1440 1561
1441 my $pos = 0; 1562 my $pos = 0;
1442 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1566
1446 $pos += $alloc; 1567 $pos += $alloc;
1447 } 1568 }
1448 1569
1449 1 1570 1
1450} 1571}
1451 1572
1452############################################################################# 1573#############################################################################
1453 1574
1454package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1455 1576
1456our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1457 1578
1458sub new { 1579sub new {
1459 my $class = shift; 1580 my $class = shift;
1460 1581
1461 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1464 ) 1585 )
1465} 1586}
1466 1587
1467############################################################################# 1588#############################################################################
1468 1589
1469package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1470 1591
1471our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1472 1593
1473sub new { 1594sub new {
1474 my $class = shift; 1595 my $class = shift;
1475 1596
1476 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1479 ) 1600 )
1480} 1601}
1481 1602
1482############################################################################# 1603#############################################################################
1483 1604
1484package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1485 1606
1486our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1487 1608
1488use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1489 1610
1490sub new { 1611sub new {
1491 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1492 1613
1493 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1497 #font => default_font 1618 #font => default_font
1498 #text => initial text 1619 #text => initial text
1499 #markup => initial narkup 1620 #markup => initial narkup
1500 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1501 ellipsise => 3, # end 1622 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1624 fontsize => 1,
1504 align => -1, 1625 align => -1,
1505 valign => -1, 1626 valign => -1,
1506 padding_x => 2, 1627 padding_x => 2,
1507 padding_y => 2, 1628 padding_y => 2,
1508 can_events => 0, 1629 can_events => 0,
1509 %arg 1630 %arg
1510 ); 1631 );
1511 1632
1512 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1636 $self->{template} = $layout;
1516 } 1637 }
1517 1638
1518 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1522 } 1643 }
1523 1644
1524 $self 1645 $self
1525} 1646}
1526 1647
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1648sub update {
1538 my ($self) = @_; 1649 my ($self) = @_;
1539 1650
1540 delete $self->{texture}; 1651 delete $self->{texture};
1541 $self->SUPER::update; 1652 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1553 1664
1554 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1556 1667
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1669
1559 delete $self->{req_h}; 1670 delete $self->{size_req};
1560
1561 $self->realloc; 1671 $self->realloc;
1562 $self->update; 1672 $self->update;
1563} 1673}
1564 1674
1565sub set_markup { 1675sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1570 1680
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1682
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1684
1575 delete $self->{req_h}; 1685 delete $self->{size_req};
1576
1577 $self->realloc; 1686 $self->realloc;
1578 $self->update; 1687 $self->update;
1579} 1688}
1580 1689
1581sub size_request { 1690sub size_request {
1582 my ($self) = @_; 1691 my ($self) = @_;
1583 1692
1584 if (exists $self->{req_h}) { 1693 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1699
1593 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1594 1701
1595 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1706
1599 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1600 1708
1601 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1603 } 1711 }
1604 1712
1605 ($w, $h) 1713 [$w, $h]
1606 } 1714 };
1607}
1608 1715
1716 @{ $self->{size_req} }
1717}
1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1609sub size_allocate { 1723sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1611 1725
1612 delete $self->{ox}; 1726 delete $self->{ox};
1613 1727
1614 delete $self->{texture} 1728 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1616} 1732}
1617 1733
1618sub set_fontsize { 1734sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1620 1736
1621 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1622 delete $self->{texture}; 1739 delete $self->{texture};
1623 1740
1624 $self->realloc; 1741 $self->realloc;
1625} 1742}
1626 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1627sub _draw { 1753sub _draw {
1628 my ($self) = @_; 1754 my ($self) = @_;
1629 1755
1630 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1631 1757
1632 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1765
1640 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1641 }; 1767 };
1642 1768
1643 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1647 1773
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1777 };
1652 1778
1653 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1781
1656 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
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} 1783}
1665 1784
1666############################################################################# 1785#############################################################################
1667 1786
1668package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1669 1788
1670our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1671 1790
1672use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1673 1792
1674sub new { 1793sub new {
1675 my $class = shift; 1794 my $class = shift;
1676 1795
1677 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1682 can_hover => 1, 1801 can_hover => 1,
1683 can_focus => 1, 1802 can_focus => 1,
1684 valign => 0, 1803 valign => 0,
1685 can_events => 1, 1804 can_events => 1,
1686 #text => ... 1805 #text => ...
1806 #hidden => "*",
1687 @_ 1807 @_
1688 ) 1808 )
1689} 1809}
1690 1810
1691sub _set_text { 1811sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 1819 $self->{text} = $text;
1700 1820
1701 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 1823 delete $self->{size_req};
1704 1824
1705 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1706 1826
1707 $self->realloc; 1827 $self->realloc;
1708 $self->update; 1828 $self->update;
1709} 1829}
1710 1830
… …
1725 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1726 1846
1727 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1728} 1848}
1729 1849
1730sub key_down { 1850sub invoke_key_down {
1731 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1732 1852
1733 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1738 1858
1739 if ($uni == 8) { 1859 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1748 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1750 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 1872 $self->emit ('escape');
1753 } elsif ($uni) { 1873 } elsif ($uni) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 1875 } else {
1756 return 0; 1876 return 0;
1757 } 1877 }
… …
1761 $self->realloc; 1881 $self->realloc;
1762 1882
1763 1 1883 1
1764} 1884}
1765 1885
1766sub focus_in { 1886sub invoke_focus_in {
1767 my ($self) = @_; 1887 my ($self) = @_;
1768 1888
1769 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1770 1890
1771 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1772} 1892}
1773 1893
1774sub button_down { 1894sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1776 1896
1777 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 1898
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 1900
1781 # byte-index to char-index 1901 # byte-index to char-index
1782 my $text = $self->{text}; 1902 my $text = $self->{text};
1783 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1785 1905
1786 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1787 $self->update; 1907 $self->update;
1788 1908
1789 1 1909 1
1790} 1910}
1791 1911
1792sub mouse_motion { 1912sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 1915
1796 0 1916 1
1797} 1917}
1798 1918
1799sub _draw { 1919sub _draw {
1800 my ($self) = @_; 1920 my ($self) = @_;
1801 1921
… …
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 1957 glEnd;
1838 } 1958 }
1839} 1959}
1840 1960
1841package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1842 1962
1843our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1844 1964
1845use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1846 1966
1847sub key_down { 1967sub invoke_key_down {
1848 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1849 1969
1850 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1851 1971
1852 if ($sym == 13) { 1972 if ($sym == 13) {
1853 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1855 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1858 $self->update; 1979 $self->update;
1859 1980
1860 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1863 } 1984 }
1864 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 1989 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 1991 }
1871 1992
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 1996
1876 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 1999 } else {
1879 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1880 } 2001 }
1881 2002
1882 } else { 2003 } else {
1883 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1884 } 2005 }
1885 2006
1886 1 2007 1
1887} 2008}
1888 2009
1889############################################################################# 2010#############################################################################
1890 2011
1891package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1892 2013
1893our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1894 2015
1895use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1896 2017
1897my @tex = 2018my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1900 2021
1901sub new { 2022sub new {
1902 my $class = shift; 2023 my $class = shift;
1903 2024
… …
1912 can_events => 1, 2033 can_events => 1,
1913 @_ 2034 @_
1914 ) 2035 )
1915} 2036}
1916 2037
1917sub activate { }
1918
1919sub button_up { 2038sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1921 2040
1922 $self->emit ("activate") 2041 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1942 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1943} 2062}
1944 2063
1945############################################################################# 2064#############################################################################
1946 2065
1947package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1948 2067
1949our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1950 2069
1951my @tex = 2070my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2073
1955use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1956 2075
1957sub new { 2076sub new {
1958 my $class = shift; 2077 my $class = shift;
1959 2078
1960 $class->SUPER::new ( 2079 $class->SUPER::new (
… …
1974 my ($self) = @_; 2093 my ($self) = @_;
1975 2094
1976 (6) x 2 2095 (6) x 2
1977} 2096}
1978 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1979sub button_down { 2106sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1981 2108
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2111 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2112 } else {
1987 return 0 2113 return 0
1988 } 2114 }
1989 2115
1990 1 2116 1
… …
2010 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
2011} 2137}
2012 2138
2013############################################################################# 2139#############################################################################
2014 2140
2015package CFClient::UI::Image; 2141package CFPlus::UI::Image;
2016 2142
2017our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
2018 2144
2019use CFClient::OpenGL; 2145use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2146
2022our %loaded_images; 2147our %texture_cache;
2023 2148
2024sub new { 2149sub new {
2025 my $class = shift; 2150 my $class = shift;
2026 2151
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2028 2156
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2030 2159
2031 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2162
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2035 2164
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2166
2040 $self 2167 $self
2041} 2168}
2042 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2043sub size_request { 2185sub size_request {
2044 my ($self) = @_; 2186 my ($self) = @_;
2045 2187
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2047} 2189}
2048 2190
2049sub _draw { 2191sub _draw {
2050 my ($self) = @_; 2192 my ($self) = @_;
2051 2193
… …
2061 } 2203 }
2062 2204
2063 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2207
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2067 2209
2068 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2069} 2211}
2070 2212
2071############################################################################# 2213#############################################################################
2072 2214
2215package CFPlus::UI::ImageButton;
2216
2217our @ISA = CFPlus::UI::Image::;
2218
2219use CFPlus::OpenGL;
2220
2221my %textures;
2222
2223sub new {
2224 my $class = shift;
2225
2226 my $self = $class->SUPER::new (
2227 padding_x => 4,
2228 padding_y => 4,
2229 fg => [1, 1, 1],
2230 active_fg => [0, 0, 1],
2231 can_hover => 1,
2232 align => 0,
2233 valign => 0,
2234 can_events => 1,
2235 @_
2236 );
2237}
2238
2239sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_;
2241
2242 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w}
2244 && $y >= 0 && $y < $self->{h};
2245
2246 1
2247}
2248
2249#############################################################################
2250
2073package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
2074 2252
2075our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2076 2254
2077use List::Util qw(min max); 2255use List::Util qw(min max);
2078 2256
2079use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2080 2258
2081my %tex = ( 2259my %tex = (
2082 food => [ 2260 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2263 ],
2086 grace => [ 2264 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 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/ 2266 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2267 ],
2090 hp => [ 2268 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2271 ],
2094 mana => [ 2272 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 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/ 2274 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2275 ],
2098); 2276);
2099 2277
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2340
2163 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2346
2166 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2188 2369
2189 if ($t3) { 2370 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2377 glEnd;
2197 } 2378 }
2198 2379
2199 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2201} 2382}
2202 2383
2203############################################################################# 2384#############################################################################
2204 2385
2205package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2206 2387
2207our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2208 2389
2209sub new { 2390sub new {
2210 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2211 2392
2212 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2395 can_hover => 1,
2215 can_events => 1, 2396 can_events => 1,
2216 %arg, 2397 %arg,
2217 ); 2398 );
2218 2399
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2400 $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); 2401 $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"); 2402 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2403
2223 $self 2404 $self
2224} 2405}
2225 2406
2226sub set_fontsize { 2407sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2248} 2429}
2249 2430
2250############################################################################# 2431#############################################################################
2251 2432
2252package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2253 2434
2254use strict; 2435use strict;
2255 2436
2256use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2257 2438
2258our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2259 2440
2260my @tex = 2441my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2263 2444
2264sub new { 2445sub new {
2265 my $class = shift; 2446 my $class = shift;
2266 2447
… …
2287 $self->update; 2468 $self->update;
2288 2469
2289 $self 2470 $self
2290} 2471}
2291 2472
2292sub changed { }
2293
2294sub set_range { 2473sub set_range {
2295 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2296 2475
2297 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2298 2477
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2301} 2482}
2302 2483
2303sub set_value { 2484sub set_value {
2304 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2305 2486
… …
2316 if $unit; 2497 if $unit;
2317 2498
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2500
2320 if ($value != $old_value) { 2501 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2322 $self->update; 2503 $self->update;
2323 } 2504 }
2324} 2505}
2325 2506
2326sub size_request { 2507sub size_request {
2327 my ($self) = @_; 2508 my ($self) = @_;
2328 2509
2329 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2330} 2511}
2331 2512
2332sub button_down { 2513sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2334 2515
2335 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2517
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2519
2339 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2521}
2341 2522
2342sub mouse_motion { 2523sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2344 2525
2345 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2528
… …
2353 } else { 2534 } else {
2354 return 0; 2535 return 0;
2355 } 2536 }
2356 2537
2357 1 2538 1
2539}
2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2358} 2549}
2359 2550
2360sub update { 2551sub update {
2361 my ($self) = @_; 2552 my ($self) = @_;
2362 2553
… …
2411 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2412} 2603}
2413 2604
2414############################################################################# 2605#############################################################################
2415 2606
2416package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2417 2608
2418our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2419 2610
2420sub new { 2611sub new {
2421 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2422 2613
2423 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2424 2615
2425 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 2619 to_value => sub { shift },
2429 from_value => sub { shift }, 2620 from_value => sub { shift },
2430 %arg, 2621 %arg,
2431 ); 2622 );
2432 2623
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2454 2645
2455############################################################################# 2646#############################################################################
2456 2647
2457package CFClient::UI::TextView; 2648package CFPlus::UI::TextScroller;
2458 2649
2459our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2460 2651
2461use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2462 2653
2463sub new { 2654sub new {
2464 my $class = shift; 2655 my $class = shift;
2465 2656
2466 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2467 fontsize => 1, 2658 fontsize => 1,
2468 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2469 #font => default_font 2661 #font => default_font
2470 @_, 2662 @_,
2471 2663
2472 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2473 par => [], 2665 par => [],
2474 height => 0, 2666 height => 0,
2475 children => [ 2667 children => [
2476 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2478 ], 2670 ],
2479 ); 2671 );
2480 2672
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2482 2674
… …
2488 2680
2489 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2490 $self->reflow; 2682 $self->reflow;
2491} 2683}
2492 2684
2685sub size_request {
2686 my ($self) = @_;
2687
2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2692}
2693
2493sub size_allocate { 2694sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2495 2696
2496 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 2699
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 2704
2502 $self->reflow; 2705 $self->reflow;
2503}
2504 2706
2505sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2721sub get_layout {
2722 my ($self, $para) = @_;
2507 2723
2508 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2509 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 2731 $layout->set_markup ($para->{markup});
2732
2733 $layout->set_shapes (
2734 map
2735 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2736 @{$para->{widget}}
2513 2737 );
2738
2514 $layout->size 2739 $layout
2515} 2740}
2516 2741
2517sub reflow { 2742sub reflow {
2518 my ($self) = @_; 2743 my ($self) = @_;
2519 2744
… …
2528 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2529} 2754}
2530 2755
2531sub clear { 2756sub clear {
2532 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2533 2761
2534 $self->{par} = []; 2762 $self->{par} = [];
2535 $self->{height} = 0; 2763 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 2765}
2538 2766
2539sub add_paragraph { 2767sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2541 2769
2542 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2544 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2546 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2547 2780
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para;
2783 }
2784
2785 $self->{need_reflow}++;
2786 $self->update;
2787}
2788
2789sub scroll_to_bottom {
2790 my ($self) = @_;
2791
2792 $self->{scroll_to_bottom} = 1;
2793 $self->update;
2549} 2794}
2550 2795
2551sub update { 2796sub update {
2552 my ($self) = @_; 2797 my ($self) = @_;
2553 2798
… …
2555 2800
2556 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2557 2802
2558 delete $self->{texture}; 2803 delete $self->{texture};
2559 2804
2560 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 2807
2563 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2564 my $height = 0; 2809 my $height = 0;
2565 2810
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2572 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3]; 2815
2576 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2577 } 2819 }
2578 2820
2579 $height += $_->[1]; 2821 $height += $para->{h};
2580 } 2822 }
2581 2823
2582 $self->{height} = $height; 2824 $self->{height} = $height;
2583 2825
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2585 2827
2586 delete $self->{texture}; 2828 delete $self->{texture};
2587 } 2829 }
2588 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2592 2838
2593 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2594 2840
2595 my $y0 = $top; 2841 my $y0 = $top;
2596 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2597 2843
2598 my $y = 0; 2844 my $y = 0;
2599 2845
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}}) { 2846 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 2847 my $h = $para->{h};
2610 2848
2611 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] });
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 2850
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2617 2852
2618 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2854
2855 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes;
2857
2858 for (@w) {
2859 my ($dx, $dy) = splice @s, 0, 2, ();
2860
2861 $_->{x} = $dx + $para->{indent};
2862 $_->{y} = $dy + $y - $y0;
2863
2864 $_->draw;
2865 }
2866 }
2620 } 2867 }
2621 2868
2622 $y += $h; 2869 $y += $h;
2623 } 2870 }
2624
2625 glDisable GL_BLEND;
2626 }; 2871 };
2627 }); 2872 });
2873}
2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2628} 2882}
2629 2883
2630sub _draw { 2884sub _draw {
2631 my ($self) = @_; 2885 my ($self) = @_;
2632 2886
… …
2635 glColor 0, 0, 0, 1; 2889 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2890 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2638 2892
2639 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2640
2641} 2894}
2642 2895
2643############################################################################# 2896#############################################################################
2644 2897
2645package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2646 2899
2647use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2648 2901
2649our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2650 2903
2651sub moveto { 2904sub moveto {
2652 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2653 2906
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 2935 glPopMatrix;
2683} 2936}
2684 2937
2685############################################################################# 2938#############################################################################
2686 2939
2687package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2688 2941
2689our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2690 2943
2691sub new { 2944sub new {
2692 my $class = shift; 2945 my $class = shift;
2693 2946
2694 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2707} 2960}
2708 2961
2709############################################################################# 2962#############################################################################
2710 2963
2711package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2712 2965
2713our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2714 2967
2715use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2716 2969
2717sub new { 2970sub new {
2718 my $class = shift; 2971 my $class = shift;
2719 2972
2720 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2736 } 2989 }
2737 2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2993
2738 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 2995 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 2997 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2743 ellipsise => 0, 2999 ellipsise => 0,
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3008
2753 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2754} 3010}
2755 3011
2756sub size_allocate { 3012sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2758 3014
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3016}
2761 3017
2762sub visibility_change { 3018sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2764 3020
2765 return unless $visible; 3021 return unless $visible;
2766 3022
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2769 or return; 3025 or return;
2770 3026
3027 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3029
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2775 3032
2776 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2777 }); 3037 });
2778} 3038}
2779 3039
2780sub _draw { 3040sub _draw {
2781 my ($self) = @_; 3041 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2806} 3066}
2807 3067
2808############################################################################# 3068#############################################################################
2809 3069
2810package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2811 3071
2812our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2813 3073
2814use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2815 3075
2816sub new { 3076sub new {
2817 my $class = shift; 3077 my $class = shift;
2818 3078
2819 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2854sub _draw { 3114sub _draw {
2855 my ($self) = @_; 3115 my ($self) = @_;
2856 3116
2857 return unless $::CONN; 3117 return unless $::CONN;
2858 3118
3119 $self->SUPER::_draw;
3120
2859 my $face; 3121 my $face;
2860 3122
2861 if ($self->{frame}) { 3123 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2863 3125
… …
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2876 } 3138 }
2877} 3139}
2878 3140
2879sub DESTROY { 3141sub destroy {
2880 my ($self) = @_; 3142 my ($self) = @_;
2881 3143
2882 $self->{timer}->cancel 3144 $self->{timer}->cancel
2883 if $self->{timer}; 3145 if $self->{timer};
2884 3146
2885 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2886} 3148}
2887 3149
2888############################################################################# 3150#############################################################################
2889 3151
2890package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
2891 3153
2892our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
2893 3155
2894# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
2895 3157
2896############################################################################# 3158#############################################################################
2897 3159
2898package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2899 3161
2900our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2901 3163
2902use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2903 3165
2904sub new { 3166sub new {
2905 my $class = shift; 3167 my $class = shift;
2906 3168
2907 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2908 items => [], 3170 items => [],
2909 z => 100, 3171 z => 100,
2910 @_, 3172 @_,
2911 ); 3173 );
2912 3174
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3176
2915 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2917 3179
2918 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2919 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2920 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3186 can_hover => 1,
2922 can_events => 1, 3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFPlus::UI::Label markup => $left, expand => 1),
3191 (new CFPlus::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
3196 $widget = new CFPlus::UI::Label
3197 can_hover => 1,
3198 can_events => 1,
2923 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2924 } 3202 }
2925 3203
2926 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2927 3205
2928 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2933 3211
2934# popup given the event (must be a mouse button down event currently) 3212# popup given the event (must be a mouse button down event currently)
2935sub popup { 3213sub popup {
2936 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2937 3215
2938 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2939 3217
2940 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3219 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2943 3221
2944 $self->show; 3222 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3223 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3224}
2947 3225
2948sub mouse_motion { 3226sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2950 3228
2951 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2954 3232
2955 0 3233 0
2956} 3234}
2957 3235
2958sub button_up { 3236sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2960 3238
2961 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3240 undef $GRAB;
2963 $self->hide; 3241 $self->hide;
2964 3242
2965 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3245 } else {
2968 return 0 3246 return 0
2969 } 3247 }
2970 3248
2971 1 3249 1
2972} 3250}
2973 3251
2974############################################################################# 3252#############################################################################
2975 3253
2976package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
2977 3255
2978our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
2979 3257
2980sub new { 3258sub new {
2981 my $class = shift; 3259 my $class = shift;
2982 3260
2983 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
2997 3275
2998 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3277 if @{ $self->{children} };
3000} 3278}
3001 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
3002sub set_current_page { 3286sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3004 3288
3005 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3290 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
3008 3292
3009 $self->{current} = $widget; 3293 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3295
3012 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
3013 3297
3014 $self->realloc; 3298 $self->realloc;
3015} 3299}
3016 3300
3017sub visible_children { 3301sub visible_children {
… …
3022 my ($self) = @_; 3306 my ($self) = @_;
3023 3307
3024 $self->{current}->size_request 3308 $self->{current}->size_request
3025} 3309}
3026 3310
3027sub size_allocate { 3311sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3029 3313
3030 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3031} 3317}
3032 3318
3033sub _draw { 3319sub _draw {
3034 my ($self) = @_; 3320 my ($self) = @_;
3035 3321
3036 $self->{current}->draw; 3322 $self->{current}->draw;
3037} 3323}
3038 3324
3039############################################################################# 3325#############################################################################
3040 3326
3041package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3042 3328
3043our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3044 3330
3045sub new { 3331sub new {
3046 my $class = shift; 3332 my $class = shift;
3047 3333
3048 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3052 @_, 3338 @_,
3053 ); 3339 );
3054 3340
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3061sub add { 3347sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3063 3349
3064 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3065 3351
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3353 markup => $title,
3068 tooltip => $tooltip, 3354 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3356 );
3071 3357
3072 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3073} 3359}
3074 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3075sub set_current_page { 3367sub set_current_page {
3076 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3077 3369
3078 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3372}
3081 3373
3082############################################################################# 3374#############################################################################
3083 3375
3376package CFPlus::UI::Selector;
3377
3378use utf8;
3379
3380our @ISA = CFPlus::UI::Button::;
3381
3382sub new {
3383 my $class = shift;
3384
3385 my $self = $class->SUPER::new (
3386 options => [], # [value, title, longdesc], ...
3387 value => undef,
3388 @_,
3389 );
3390
3391 $self->_set_value ($self->{value});
3392
3393 $self
3394}
3395
3396sub invoke_button_down {
3397 my ($self, $ev) = @_;
3398
3399 my @menu_items;
3400
3401 for (@{ $self->{options} }) {
3402 my ($value, $title, $tooltip) = @$_;
3403
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 }
3406
3407 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408}
3409
3410sub _set_value {
3411 my ($self, $value) = @_;
3412
3413 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3414 or return;
3415
3416 $self->{value} = $item->[0];
3417 $self->set_markup ("$item->[1] ⇓");
3418 $self->set_tooltip ($item->[2]);
3419}
3420
3421sub set_value {
3422 my ($self, $value) = @_;
3423
3424 return unless $self->{value} ne $value;
3425
3426 $self->_set_value ($value);
3427 $self->emit (changed => $value);
3428}
3429
3430#############################################################################
3431
3084package CFClient::UI::Statusbox; 3432package CFPlus::UI::Statusbox;
3085 3433
3086our @ISA = CFClient::UI::VBox::; 3434our @ISA = CFPlus::UI::VBox::;
3087 3435
3088sub new { 3436sub new {
3089 my $class = shift; 3437 my $class = shift;
3090 3438
3091 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
… …
3103sub reorder { 3451sub reorder {
3104 my ($self) = @_; 3452 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3453 my $NOW = Time::HiRes::time;
3106 3454
3107 # freeze display when hovering over any label 3455 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3456 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3458 values %{ $self->{item} };
3111 3459
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3462 }
… …
3135 for ($short) { 3483 for ($short) {
3136 s/^\s+//; 3484 s/^\s+//;
3137 s/\s+/ /g; 3485 s/\s+/ /g;
3138 } 3486 }
3139 3487
3140 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3141 markup => $short, 3489 markup => $short,
3142 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 3531 $item->{count}++;
3184 } else { 3532 } else {
3185 $item->{count} = 1; 3533 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
3187 } 3535 }
3188 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3538 delete $item->{label};
3191 } else { 3539 } else {
3192 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
3199 count => 1, 3547 count => 1,
3200 %arg, 3548 %arg,
3201 }; 3549 };
3202 } 3550 }
3203 3551
3552 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3553 $self->reorder;
3554 });
3205} 3555}
3206 3556
3207sub reconfigure { 3557sub reconfigure {
3208 my ($self) = @_; 3558 my ($self) = @_;
3209 3559
… …
3212 3562
3213 $self->reorder; 3563 $self->reorder;
3214 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
3215} 3565}
3216 3566
3217sub DESTROY { 3567sub destroy {
3218 my ($self) = @_; 3568 my ($self) = @_;
3219 3569
3220 $self->{timer}->cancel; 3570 $self->{timer}->cancel;
3221 3571
3222 $self->SUPER::DESTROY; 3572 $self->SUPER::destroy;
3223} 3573}
3224 3574
3225############################################################################# 3575#############################################################################
3226 3576
3227package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3228 3578
3229our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3230 3580
3231sub new { 3581sub new {
3232 my $class = shift; 3582 my $class = shift;
3233 3583
3234 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3236 @_, 3587 @_,
3237 ); 3588 );
3238 3589
3590 $self->set_sort_order (undef);
3591
3239 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3240} 3628}
3241 3629
3242sub set_items { 3630sub set_items {
3243 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3244 3632
3245 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3246 return unless $items; 3634 $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} 3635}
3266 3636
3267############################################################################# 3637#############################################################################
3268 3638
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; 3639package CFPlus::UI::SpellList;
3467 3640
3468our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3469 3642
3470sub new { 3643sub new {
3471 my $class = shift; 3644 my $class = shift;
3472 3645
3473 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3475 commands => [], 3648 commands => [],
3476 @_, 3649 @_,
3477 ) 3650 )
3478} 3651}
3479 3652
3480# XXX: Do sorting? Argl... 3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFPlus::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3481sub add_spell { 3738sub add_spell {
3482 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3483 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3484 3742 $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} 3743}
3513 3744
3514sub remove_spell { 3745sub remove_spell {
3515 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3516 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3517 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3518} 3750}
3519 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3520############################################################################# 3759#############################################################################
3521 3760
3522package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3523 3762
3524our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3525 3764
3526use List::Util qw(min max); 3765use List::Util qw(min max);
3527 3766
3528use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3529 3768
3530sub new { 3769sub new {
3531 my $class = shift; 3770 my $class = shift;
3532 3771
3533 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3558 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3559 3798
3560 int $coord + 0.5 3799 int $coord + 0.5
3561} 3800}
3562 3801
3563sub size_allocate { 3802sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3565 3804
3566 for my $child ($self->children) { 3805 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3806 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 3807
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3574 3813
3575 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3576 } 3815 }
3816
3817 1
3577} 3818}
3578 3819
3579sub coord2local { 3820sub coord2local {
3580 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3581 3822
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 3949
3709 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3711 3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3712 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3714 3964
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 3991 glLoadIdentity;
3742 3992
3743 { 3993 {
3744 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3745 3995
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3748 } 3998 }
3749 3999
3750 $self->_draw; 4000 $self->_draw;
3751} 4001}
3752 4002
3753############################################################################# 4003#############################################################################
3754 4004
3755package CFClient::UI; 4005package CFPlus::UI;
3756 4006
3757$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4009
37601 40101
3761 4011

Diff Legend

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