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.288 by root, Mon Jun 5 21:14:40 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
… …
526} 571}
527 572
528sub reconfigure { 573sub reconfigure {
529 my ($self) = @_; 574 my ($self) = @_;
530 575
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 576 $self->realloc;
536 $self->update; 577 $self->update;
537} 578}
538 579
539# using global variables seems a bit hacky, but passing through all drawing 580# using global variables seems a bit hacky, but passing through all drawing
… …
546 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
547 588
548 # update screen rectangle 589 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 592
554 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 596
… …
580 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
583 glEnd; 622 glEnd;
584 glPopMatrix; 623 glPopMatrix;
585 #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;
586 } 625 }
587 626
588 $self->_draw; 627 $self->_draw;
589 glPopMatrix; 628 glPopMatrix;
590} 629}
… …
596} 635}
597 636
598sub DESTROY { 637sub DESTROY {
599 my ($self) = @_; 638 my ($self) = @_;
600 639
640 return if CFPlus::in_destruct;
641
601 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
602 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603} 646}
604 647
605############################################################################# 648#############################################################################
606 649
607package CFClient::UI::DrawBG; 650package CFPlus::UI::DrawBG;
608 651
609our @ISA = CFClient::UI::Base::; 652our @ISA = CFPlus::UI::Base::;
610 653
611use strict; 654use strict;
612use CFClient::OpenGL; 655use CFPlus::OpenGL;
613 656
614sub new { 657sub new {
615 my $class = shift; 658 my $class = shift;
616 659
617 # range [value, low, high, page] 660 # range [value, low, high, page]
… …
648 } 691 }
649} 692}
650 693
651############################################################################# 694#############################################################################
652 695
653package CFClient::UI::Empty; 696package CFPlus::UI::Empty;
654 697
655our @ISA = CFClient::UI::Base::; 698our @ISA = CFPlus::UI::Base::;
656 699
657sub new { 700sub new {
658 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
659 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
660} 703}
… …
667 710
668sub draw { } 711sub draw { }
669 712
670############################################################################# 713#############################################################################
671 714
672package CFClient::UI::Container; 715package CFPlus::UI::Container;
673 716
674our @ISA = CFClient::UI::Base::; 717our @ISA = CFPlus::UI::Base::;
675 718
676sub new { 719sub new {
677 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
678 721
679 my $children = delete $arg{children}; 722 my $children = delete $arg{children};
… …
688 if $children; 731 if $children;
689 732
690 $self 733 $self
691} 734}
692 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
693sub add { 744sub add {
694 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
695 746
696 $_->set_parent ($self) 747 $_->set_parent ($self)
697 for @widgets; 748 for @widgets;
… …
757 $_->draw for @{$self->{children}}; 808 $_->draw for @{$self->{children}};
758} 809}
759 810
760############################################################################# 811#############################################################################
761 812
762package CFClient::UI::Bin; 813package CFPlus::UI::Bin;
763 814
764our @ISA = CFClient::UI::Container::; 815our @ISA = CFPlus::UI::Container::;
765 816
766sub new { 817sub new {
767 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
768 819
769 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
770 821
771 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
772} 823}
773 824
774sub add { 825sub add {
775 my ($self, $child) = @_; 826 my ($self, $child) = @_;
776 827
777 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
780} 830}
781 831
782sub remove { 832sub remove {
783 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
784 834
785 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
786 836
787 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new CFPlus::UI::Empty]
788 unless @{$self->{children}}; 838 unless @{$self->{children}};
789} 839}
790 840
791sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
792 842
793sub size_request { 843sub size_request {
794 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
795} 845}
796 846
797sub size_allocate { 847sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
799 849
800 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
801} 853}
802 854
803############################################################################# 855#############################################################################
804 856
805# back-buffered drawing area 857# back-buffered drawing area
806 858
807package CFClient::UI::Window; 859package CFPlus::UI::Window;
808 860
809our @ISA = CFClient::UI::Bin::; 861our @ISA = CFPlus::UI::Bin::;
810 862
811use CFClient::OpenGL; 863use CFPlus::OpenGL;
812 864
813sub new { 865sub new {
814 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
815 867
816 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
821 873
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 875 $self->SUPER::update;
824} 876}
825 877
826sub size_allocate { 878sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
828 880
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
831} 884}
832 885
833sub _render { 886sub _render {
834 my ($self) = @_; 887 my ($self) = @_;
835 888
… …
837} 890}
838 891
839sub render_child { 892sub render_child {
840 my ($self) = @_; 893 my ($self) = @_;
841 894
842 $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 {
843 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
844 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
845 898
846 { 899 {
847 package CFClient::UI::Base; 900 package CFPlus::UI::Base;
848 901
849 ($draw_x, $draw_y, $draw_w, $draw_h) = 902 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
851 } 904 }
852 905
… …
871 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
872} 925}
873 926
874############################################################################# 927#############################################################################
875 928
876package CFClient::UI::ViewPort; 929package CFPlus::UI::ViewPort;
877 930
878our @ISA = CFClient::UI::Window::; 931our @ISA = CFPlus::UI::Window::;
879 932
880sub new { 933sub new {
881 my $class = shift; 934 my $class = shift;
882 935
883 $class->SUPER::new ( 936 $class->SUPER::new (
… …
896 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
897 950
898 ($w, $h) 951 ($w, $h)
899} 952}
900 953
901sub size_allocate { 954sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
903 956
904 my $child = $self->child; 957 my $child = $self->child;
905 958
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 961
909 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
910 $self->update; 963 $self->update;
964
965 1
911} 966}
912 967
913sub set_offset { 968sub set_offset {
914 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
915 970
… …
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 998 ) {
944 $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})
945 } else { 1000 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1002 }
948} 1003}
949 1004
950sub _render { 1005sub _render {
951 my ($self) = @_; 1006 my ($self) = @_;
952 1007
953 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};
954 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};
955 1010
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1012
958 $self->SUPER::_render; 1013 $self->SUPER::_render;
959} 1014}
960 1015
961############################################################################# 1016#############################################################################
962 1017
963package CFClient::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
964 1019
965our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFPlus::UI::HBox::;
966 1021
967sub new { 1022sub new {
968 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
969 1024
970 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
971 1026
972 my $self; 1027 my $self;
973 1028
974 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFPlus::UI::Slider
975 vertical => 1, 1030 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1031 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1032 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
979 }, 1034 },
980 ; 1035 ;
981 1036
982 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1,
984 slider => $slider, 1040 slider => $slider,
985 %arg, 1041 %arg,
986 ); 1042 );
987 1043
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
990 1046
991 $self 1047 $self
992} 1048}
993 1049
1050#TODO# update range on size_allocate depending on child
1051
994sub add { 1052sub add {
995 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
996 1054
997 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
998} 1056}
999 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
1000sub update { 1074sub update {
1001 my ($self) = @_; 1075 my ($self) = @_;
1002 1076
1003 $self->SUPER::update; 1077 $self->SUPER::update;
1004 1078
1005 # todo: overwrite size_allocate of child 1079 $self->update_slider;
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1080}
1009 1081
1010sub size_allocate { 1082sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1012 1084
1085 $self->update_slider;
1086
1013 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017} 1088}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1089
1022############################################################################# 1090#############################################################################
1023 1091
1024package CFClient::UI::Frame; 1092package CFPlus::UI::Frame;
1025 1093
1026our @ISA = CFClient::UI::Bin::; 1094our @ISA = CFPlus::UI::Bin::;
1027 1095
1028use CFClient::OpenGL; 1096use CFPlus::OpenGL;
1029 1097
1030sub new { 1098sub new {
1031 my $class = shift; 1099 my $class = shift;
1032 1100
1033 $class->SUPER::new ( 1101 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1127 $self->SUPER::_draw;
1060} 1128}
1061 1129
1062############################################################################# 1130#############################################################################
1063 1131
1064package CFClient::UI::FancyFrame; 1132package CFPlus::UI::FancyFrame;
1065 1133
1066our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1067 1135
1068use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1069 1137
1070my $bg = 1138my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1139 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1; 1140 mipmap => 1, wrap => 1;
1073 1141
1074my @border = 1142my @border =
1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1076 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);
1077 1145
1078sub new { 1146sub new {
1079 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1080
1081 my $title = delete $arg{title};
1082 1148
1083 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1152 border => 0.6,
1087 can_events => 1, 1153 can_events => 1,
1088 min_w => 16, 1154 min_w => 64,
1089 min_h => 16, 1155 min_h => 32,
1090 %arg, 1156 %arg,
1091 ); 1157 );
1092 1158
1093 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1160 align => 0,
1095 valign => 1, 1161 valign => 1,
1096 text => $title, 1162 text => $self->{title},
1097 fontsize => $self->{border} 1163 fontsize => $self->{border},
1098 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 }
1099 1174
1100 $self 1175 $self
1101} 1176}
1102 1177
1103sub add { 1178sub add {
1104 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1105 1180
1106 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1184}
1109 1185
1110sub border { 1186sub border {
1111 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1112} 1188}
1113 1189
1114sub size_request { 1190sub size_request {
1115 my ($self) = @_; 1191 my ($self) = @_;
1116 1192
1117 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1118 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1119 1198
1120 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1121 1200
1122 ( 1201 (
1123 $w + $self->border * 2, 1202 $w + $self->border * 2,
1124 $h + $self->border * 2, 1203 $h + $self->border * 2,
1125 ) 1204 )
1126} 1205}
1127 1206
1128sub size_allocate { 1207sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1130 1209
1131 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1214 }
1136 1215
1137 my $border = $self->border; 1216 my $border = $self->border;
1138 1217
1139 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1140 $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;
1141 1233
1142 $self->child->configure ($border, $border, $w, $h); 1234 1
1143} 1235}
1144 1236
1145sub button_down { 1237sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1147 1239
1148 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1241 my $border = $self->border;
1150 1242
… …
1181 1273
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1275
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1279 };
1188 } else { 1280 } else {
1189 return 0; 1281 return 0;
1190 } 1282 }
1191 1283
1192 1 1284 1
1193} 1285}
1194 1286
1195sub button_up { 1287sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1197 1289
1198 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1199} 1291}
1200 1292
1201sub mouse_motion { 1293sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1203 1295
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1297
1206 !!$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
1207} 1307}
1208 1308
1209sub _draw { 1309sub _draw {
1210 my ($self) = @_; 1310 my ($self) = @_;
1211 1311
… …
1237 1337
1238 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1239 1339
1240 $child->draw; 1340 $child->draw;
1241 1341
1242 if ($self->{title}) { 1342 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1343 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1245 } 1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1246} 1351}
1247 1352
1248############################################################################# 1353#############################################################################
1249 1354
1250package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1251 1356
1252our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1253 1358
1254use List::Util qw(max sum); 1359use List::Util qw(max sum);
1255 1360
1256use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1257 1362
1258sub new { 1363sub new {
1259 my $class = shift; 1364 my $class = shift;
1260 1365
1261 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1267sub children { 1372sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269} 1374}
1270 1375
1271sub add { 1376sub add {
1272 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1273 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1274 $child->set_parent ($self); 1381 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1276 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1277 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1278} 1394}
1279 1395
1280# 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?
1281sub clear { 1397sub clear {
1282 my ($self) = @_; 1398 my ($self) = @_;
… …
1323 (sum @$ws), 1439 (sum @$ws),
1324 (sum @$hs), 1440 (sum @$hs),
1325 ) 1441 )
1326} 1442}
1327 1443
1328sub size_allocate { 1444sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1330 1446
1331 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1332 1448
1333 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1340 1456
1341 # linearly scale sizes 1457 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1460
1345 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1346 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1347 1463
1348 my $y; 1464 my $y;
1349 1465
1350 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1351 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1365 } 1481 }
1366 1482
1367 $y += $row_h; 1483 $y += $row_h;
1368 } 1484 }
1369 1485
1486 1
1370} 1487}
1371 1488
1372sub find_widget { 1489sub find_widget {
1373 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1374 1491
… …
1393 } 1510 }
1394} 1511}
1395 1512
1396############################################################################# 1513#############################################################################
1397 1514
1398package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1399 1516
1400our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1401 1518
1402sub size_request { 1519sub size_request {
1403 my ($self) = @_; 1520 my ($self) = @_;
1404 1521
1405 $self->{vertical} 1522 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1530 )
1414} 1531}
1415 1532
1416sub size_allocate { 1533sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1418 1535
1419 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1421 1538
1422 my @req; 1539 my @req;
1423 1540
1424 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1426 } else { 1543 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1429 1546
1430 if ($req > $space) { 1547 if ($req > $space) {
1431 # ah well, not enough space 1548 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1433 } else { 1550 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1552
1436 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1437 1554
1438 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1556 for 0 .. $#children;
1440 } 1557 }
1441 } 1558 }
1442 1559
1443 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1444 1561
1445 my $pos = 0; 1562 my $pos = 0;
1446 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1448 $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));
1449 1566
1450 $pos += $alloc; 1567 $pos += $alloc;
1451 } 1568 }
1452 1569
1453 1 1570 1
1454} 1571}
1455 1572
1456############################################################################# 1573#############################################################################
1457 1574
1458package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1459 1576
1460our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1461 1578
1462sub new { 1579sub new {
1463 my $class = shift; 1580 my $class = shift;
1464 1581
1465 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1468 ) 1585 )
1469} 1586}
1470 1587
1471############################################################################# 1588#############################################################################
1472 1589
1473package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1474 1591
1475our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1476 1593
1477sub new { 1594sub new {
1478 my $class = shift; 1595 my $class = shift;
1479 1596
1480 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1483 ) 1600 )
1484} 1601}
1485 1602
1486############################################################################# 1603#############################################################################
1487 1604
1488package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1489 1606
1490our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1491 1608
1492use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1493 1610
1494sub new { 1611sub new {
1495 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1496 1613
1497 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1501 #font => default_font 1618 #font => default_font
1502 #text => initial text 1619 #text => initial text
1503 #markup => initial narkup 1620 #markup => initial narkup
1504 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1505 ellipsise => 3, # end 1622 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1624 fontsize => 1,
1508 align => -1, 1625 align => -1,
1509 valign => -1, 1626 valign => -1,
1510 padding_x => 2, 1627 padding_x => 2,
1511 padding_y => 2, 1628 padding_y => 2,
1512 can_events => 0, 1629 can_events => 0,
1513 %arg 1630 %arg
1514 ); 1631 );
1515 1632
1516 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1636 $self->{template} = $layout;
1520 } 1637 }
1521 1638
1522 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1526 } 1643 }
1527 1644
1528 $self 1645 $self
1529} 1646}
1530 1647
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1648sub update {
1542 my ($self) = @_; 1649 my ($self) = @_;
1543 1650
1544 delete $self->{texture}; 1651 delete $self->{texture};
1545 $self->SUPER::update; 1652 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1557 1664
1558 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1560 1667
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1563 1669
1564 delete $self->{req_h}; 1670 delete $self->{size_req};
1565 $self->realloc; 1671 $self->realloc;
1566 $self->update; 1672 $self->update;
1567} 1673}
1568 1674
1569sub set_markup { 1675sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1574 1680
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1682
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1579 1684
1580 delete $self->{req_h}; 1685 delete $self->{size_req};
1581 $self->realloc; 1686 $self->realloc;
1582 $self->update; 1687 $self->update;
1583} 1688}
1584 1689
1585sub size_request { 1690sub size_request {
1586 my ($self) = @_; 1691 my ($self) = @_;
1587 1692
1588 if (exists $self->{req_h}) { 1693 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1699
1597 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1598 1701
1599 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1600 $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);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1706
1603 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1604 1708
1605 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1607 } 1711 }
1608 1712
1609 ($w, $h) 1713 [$w, $h]
1610 } 1714 };
1611}
1612 1715
1716 @{ $self->{size_req} }
1717}
1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1613sub size_allocate { 1723sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1615 1725
1616 delete $self->{ox}; 1726 delete $self->{ox};
1617 1727
1618 delete $self->{texture} 1728 delete $self->{texture}
1619 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
1620} 1732}
1621 1733
1622sub set_fontsize { 1734sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1624 1736
1625 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1626 delete $self->{texture}; 1739 delete $self->{texture};
1627 1740
1628 $self->realloc; 1741 $self->realloc;
1629} 1742}
1630 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1631sub _draw { 1753sub _draw {
1632 my ($self) = @_; 1754 my ($self) = @_;
1633 1755
1634 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1635 1757
1636 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1765
1644 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1645 }; 1767 };
1646 1768
1647 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1651 1773
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1777 };
1656 1778
1657 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 1781
1659 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1667
1668 glDisable GL_TEXTURE_2D;
1669} 1783}
1670 1784
1671############################################################################# 1785#############################################################################
1672 1786
1673package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1674 1788
1675our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1676 1790
1677use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1678 1792
1679sub new { 1793sub new {
1680 my $class = shift; 1794 my $class = shift;
1681 1795
1682 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1687 can_hover => 1, 1801 can_hover => 1,
1688 can_focus => 1, 1802 can_focus => 1,
1689 valign => 0, 1803 valign => 0,
1690 can_events => 1, 1804 can_events => 1,
1691 #text => ... 1805 #text => ...
1806 #hidden => "*",
1692 @_ 1807 @_
1693 ) 1808 )
1694} 1809}
1695 1810
1696sub _set_text { 1811sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1819 $self->{text} = $text;
1705 1820
1706 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1823 delete $self->{size_req};
1709 1824
1710 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1711 1826
1712 $self->realloc; 1827 $self->realloc;
1713 $self->update; 1828 $self->update;
1714} 1829}
1715 1830
… …
1730 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1731 1846
1732 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1733} 1848}
1734 1849
1735sub key_down { 1850sub invoke_key_down {
1736 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1737 1852
1738 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1743 1858
1744 if ($uni == 8) { 1859 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1753 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1755 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 1872 $self->emit ('escape');
1758 } elsif ($uni) { 1873 } elsif ($uni) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 1875 } else {
1761 return 0; 1876 return 0;
1762 } 1877 }
… …
1766 $self->realloc; 1881 $self->realloc;
1767 1882
1768 1 1883 1
1769} 1884}
1770 1885
1771sub focus_in { 1886sub invoke_focus_in {
1772 my ($self) = @_; 1887 my ($self) = @_;
1773 1888
1774 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1775 1890
1776 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1777} 1892}
1778 1893
1779sub button_down { 1894sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1781 1896
1782 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 1898
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 1900
1786 # byte-index to char-index 1901 # byte-index to char-index
1787 my $text = $self->{text}; 1902 my $text = $self->{text};
1788 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1790 1905
1791 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1792 $self->update; 1907 $self->update;
1793 1908
1794 1 1909 1
1795} 1910}
1796 1911
1797sub mouse_motion { 1912sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1799# 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#
1800 1915
1801 0 1916 1
1802} 1917}
1803 1918
1804sub _draw { 1919sub _draw {
1805 my ($self) = @_; 1920 my ($self) = @_;
1806 1921
… …
1841 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};
1842 glEnd; 1957 glEnd;
1843 } 1958 }
1844} 1959}
1845 1960
1846package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1847 1962
1848our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1849 1964
1850use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1851 1966
1852sub key_down { 1967sub invoke_key_down {
1853 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1854 1969
1855 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1856 1971
1857 if ($sym == 13) { 1972 if ($sym == 13) {
1858 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1860 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1863 $self->update; 1979 $self->update;
1864 1980
1865 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1868 } 1984 }
1869 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 1989 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 1991 }
1876 1992
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 1996
1881 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 1999 } else {
1884 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1885 } 2001 }
1886 2002
1887 } else { 2003 } else {
1888 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1889 } 2005 }
1890 2006
1891 1 2007 1
1892} 2008}
1893 2009
1894############################################################################# 2010#############################################################################
1895 2011
1896package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1897 2013
1898our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1899 2015
1900use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1901 2017
1902my @tex = 2018my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1905 2021
1906sub new { 2022sub new {
1907 my $class = shift; 2023 my $class = shift;
1908 2024
… …
1917 can_events => 1, 2033 can_events => 1,
1918 @_ 2034 @_
1919 ) 2035 )
1920} 2036}
1921 2037
1922sub activate { }
1923
1924sub button_up { 2038sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1926 2040
1927 $self->emit ("activate") 2041 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1947 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1948} 2062}
1949 2063
1950############################################################################# 2064#############################################################################
1951 2065
1952package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1953 2067
1954our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1955 2069
1956my @tex = 2070my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2073
1960use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1961 2075
1962sub new { 2076sub new {
1963 my $class = shift; 2077 my $class = shift;
1964 2078
1965 $class->SUPER::new ( 2079 $class->SUPER::new (
… …
1979 my ($self) = @_; 2093 my ($self) = @_;
1980 2094
1981 (6) x 2 2095 (6) x 2
1982} 2096}
1983 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1984sub button_down { 2106sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1986 2108
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2111 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2112 } else {
1992 return 0 2113 return 0
1993 } 2114 }
1994 2115
1995 1 2116 1
… …
2015 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
2016} 2137}
2017 2138
2018############################################################################# 2139#############################################################################
2019 2140
2020package CFClient::UI::Image; 2141package CFPlus::UI::Image;
2021 2142
2022our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
2023 2144
2024use CFClient::OpenGL; 2145use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2146
2027our %loaded_images; 2147our %texture_cache;
2028 2148
2029sub new { 2149sub new {
2030 my $class = shift; 2150 my $class = shift;
2031 2151
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2033 2156
2034 $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";
2035 2159
2036 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 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;
2038 2162
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2040 2164
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2166
2045 $self 2167 $self
2046} 2168}
2047 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
2048sub size_request { 2185sub size_request {
2049 my ($self) = @_; 2186 my ($self) = @_;
2050 2187
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2052} 2189}
2053 2190
2054sub _draw { 2191sub _draw {
2055 my ($self) = @_; 2192 my ($self) = @_;
2056 2193
… …
2066 } 2203 }
2067 2204
2068 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2207
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2072 2209
2073 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2074} 2211}
2075 2212
2076############################################################################# 2213#############################################################################
2077 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
2078package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
2079 2252
2080our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2081 2254
2082use List::Util qw(min max); 2255use List::Util qw(min max);
2083 2256
2084use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2085 2258
2086my %tex = ( 2259my %tex = (
2087 food => [ 2260 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2263 ],
2091 grace => [ 2264 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 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/
2094 ], 2267 ],
2095 hp => [ 2268 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2271 ],
2099 mana => [ 2272 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 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/
2102 ], 2275 ],
2103); 2276);
2104 2277
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2340
2168 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2169 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);
2170 2346
2171 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2193 2369
2194 if ($t3) { 2370 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2377 glEnd;
2202 } 2378 }
2203 2379
2204 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2206} 2382}
2207 2383
2208############################################################################# 2384#############################################################################
2209 2385
2210package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2211 2387
2212our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2213 2389
2214sub new { 2390sub new {
2215 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2216 2392
2217 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2395 can_hover => 1,
2220 can_events => 1, 2396 can_events => 1,
2221 %arg, 2397 %arg,
2222 ); 2398 );
2223 2399
2224 $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");
2225 $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);
2226 $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");
2227 2403
2228 $self 2404 $self
2229} 2405}
2230 2406
2231sub set_fontsize { 2407sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2253} 2429}
2254 2430
2255############################################################################# 2431#############################################################################
2256 2432
2257package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2258 2434
2259use strict; 2435use strict;
2260 2436
2261use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2262 2438
2263our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2264 2440
2265my @tex = 2441my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2268 2444
2269sub new { 2445sub new {
2270 my $class = shift; 2446 my $class = shift;
2271 2447
… …
2292 $self->update; 2468 $self->update;
2293 2469
2294 $self 2470 $self
2295} 2471}
2296 2472
2297sub changed { }
2298
2299sub set_range { 2473sub set_range {
2300 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2301 2475
2302 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2303 2477
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2306} 2482}
2307 2483
2308sub set_value { 2484sub set_value {
2309 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2310 2486
… …
2321 if $unit; 2497 if $unit;
2322 2498
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2500
2325 if ($value != $old_value) { 2501 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2327 $self->update; 2503 $self->update;
2328 } 2504 }
2329} 2505}
2330 2506
2331sub size_request { 2507sub size_request {
2332 my ($self) = @_; 2508 my ($self) = @_;
2333 2509
2334 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2335} 2511}
2336 2512
2337sub button_down { 2513sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2339 2515
2340 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2517
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2519
2344 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2521}
2346 2522
2347sub mouse_motion { 2523sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2349 2525
2350 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2528
… …
2358 } else { 2534 } else {
2359 return 0; 2535 return 0;
2360 } 2536 }
2361 2537
2362 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
2363} 2549}
2364 2550
2365sub update { 2551sub update {
2366 my ($self) = @_; 2552 my ($self) = @_;
2367 2553
… …
2416 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2417} 2603}
2418 2604
2419############################################################################# 2605#############################################################################
2420 2606
2421package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2422 2608
2423our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2424 2610
2425sub new { 2611sub new {
2426 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2427 2613
2428 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2429 2615
2430 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 2619 to_value => sub { shift },
2434 from_value => sub { shift }, 2620 from_value => sub { shift },
2435 %arg, 2621 %arg,
2436 ); 2622 );
2437 2623
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2459 2645
2460############################################################################# 2646#############################################################################
2461 2647
2462package CFClient::UI::TextView; 2648package CFPlus::UI::TextScroller;
2463 2649
2464our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2465 2651
2466use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2467 2653
2468sub new { 2654sub new {
2469 my $class = shift; 2655 my $class = shift;
2470 2656
2471 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2472 fontsize => 1, 2658 fontsize => 1,
2473 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2474 #font => default_font 2661 #font => default_font
2475 @_, 2662 @_,
2476 2663
2477 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2478 par => [], 2665 par => [],
2479 height => 0, 2666 height => 0,
2480 children => [ 2667 children => [
2481 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2483 ], 2670 ],
2484 ); 2671 );
2485 2672
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2487 2674
… …
2493 2680
2494 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2682 $self->reflow;
2496} 2683}
2497 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
2498sub size_allocate { 2694sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2500 2696
2501 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2699
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $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});
2506 2704
2507 $self->reflow; 2705 $self->reflow;
2508}
2509 2706
2510sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2511 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) = @_;
2512 2723
2513 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2514 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $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});
2517 $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}}
2518 2737 );
2738
2519 $layout->size 2739 $layout
2520} 2740}
2521 2741
2522sub reflow { 2742sub reflow {
2523 my ($self) = @_; 2743 my ($self) = @_;
2524 2744
… …
2533 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2534} 2754}
2535 2755
2536sub clear { 2756sub clear {
2537 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2538 2761
2539 $self->{par} = []; 2762 $self->{par} = [];
2540 $self->{height} = 0; 2763 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2765}
2543 2766
2544sub add_paragraph { 2767sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2546 2769
2547 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2548 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2549 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2551 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2552 2780
2553 $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;
2554} 2794}
2555 2795
2556sub update { 2796sub update {
2557 my ($self) = @_; 2797 my ($self) = @_;
2558 2798
… …
2560 2800
2561 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2562 2802
2563 delete $self->{texture}; 2803 delete $self->{texture};
2564 2804
2565 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 2807
2568 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2569 my $height = 0; 2809 my $height = 0;
2570 2810
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2577 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3]; 2815
2581 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2582 } 2819 }
2583 2820
2584 $height += $_->[1]; 2821 $height += $para->{h};
2585 } 2822 }
2586 2823
2587 $self->{height} = $height; 2824 $self->{height} = $height;
2588 2825
2589 $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]);
2590 2827
2591 delete $self->{texture}; 2828 delete $self->{texture};
2592 } 2829 }
2593 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2597 2838
2598 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2599 2840
2600 my $y0 = $top; 2841 my $y0 = $top;
2601 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2602 2843
2603 my $y = 0; 2844 my $y = 0;
2604 2845
2605 my $layout = $self->{layout};
2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608
2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 2847 my $h = $para->{h};
2615 2848
2616 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] });
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 2850
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2622 2852
2623 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2624 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 }
2625 } 2867 }
2626 2868
2627 $y += $h; 2869 $y += $h;
2628 } 2870 }
2629
2630 glDisable GL_BLEND;
2631 }; 2871 };
2632 }); 2872 });
2873}
2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2633} 2882}
2634 2883
2635sub _draw { 2884sub _draw {
2636 my ($self) = @_; 2885 my ($self) = @_;
2637 2886
… …
2640 glColor 0, 0, 0, 1; 2889 glColor 0, 0, 0, 1;
2641 $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});
2642 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2643 2892
2644 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2645
2646} 2894}
2647 2895
2648############################################################################# 2896#############################################################################
2649 2897
2650package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2651 2899
2652use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2653 2901
2654our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2655 2903
2656sub moveto { 2904sub moveto {
2657 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2658 2906
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 2935 glPopMatrix;
2688} 2936}
2689 2937
2690############################################################################# 2938#############################################################################
2691 2939
2692package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2693 2941
2694our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2695 2943
2696sub new { 2944sub new {
2697 my $class = shift; 2945 my $class = shift;
2698 2946
2699 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2712} 2960}
2713 2961
2714############################################################################# 2962#############################################################################
2715 2963
2716package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2717 2965
2718our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2719 2967
2720use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2721 2969
2722sub new { 2970sub new {
2723 my $class = shift; 2971 my $class = shift;
2724 2972
2725 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2741 } 2989 }
2742 2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2993
2743 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 2995 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 2997 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2748 ellipsise => 0, 2999 ellipsise => 0,
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3008
2758 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2759} 3010}
2760 3011
2761sub size_allocate { 3012sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2763 3014
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3016}
2766 3017
2767sub visibility_change { 3018sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2769 3020
2770 return unless $visible; 3021 return unless $visible;
2771 3022
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2774 or return; 3025 or return;
2775 3026
3027 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3029
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2780 3032
2781 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2782 }); 3037 });
2783} 3038}
2784 3039
2785sub _draw { 3040sub _draw {
2786 my ($self) = @_; 3041 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2811} 3066}
2812 3067
2813############################################################################# 3068#############################################################################
2814 3069
2815package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2816 3071
2817our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2818 3073
2819use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2820 3075
2821sub new { 3076sub new {
2822 my $class = shift; 3077 my $class = shift;
2823 3078
2824 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2859sub _draw { 3114sub _draw {
2860 my ($self) = @_; 3115 my ($self) = @_;
2861 3116
2862 return unless $::CONN; 3117 return unless $::CONN;
2863 3118
3119 $self->SUPER::_draw;
3120
2864 my $face; 3121 my $face;
2865 3122
2866 if ($self->{frame}) { 3123 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2868 3125
… …
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2881 } 3138 }
2882} 3139}
2883 3140
2884sub DESTROY { 3141sub destroy {
2885 my ($self) = @_; 3142 my ($self) = @_;
2886 3143
2887 $self->{timer}->cancel 3144 $self->{timer}->cancel
2888 if $self->{timer}; 3145 if $self->{timer};
2889 3146
2890 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2891} 3148}
2892 3149
2893############################################################################# 3150#############################################################################
2894 3151
2895package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
2896 3153
2897our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
2898 3155
2899# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
2900 3157
2901############################################################################# 3158#############################################################################
2902 3159
2903package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2904 3161
2905our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2906 3163
2907use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2908 3165
2909sub new { 3166sub new {
2910 my $class = shift; 3167 my $class = shift;
2911 3168
2912 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2913 items => [], 3170 items => [],
2914 z => 100, 3171 z => 100,
2915 @_, 3172 @_,
2916 ); 3173 );
2917 3174
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2919 3176
2920 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2922 3179
2923 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2924 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2925 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2926 can_hover => 1, 3186 can_hover => 1,
2927 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,
2928 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2929 } 3202 }
2930 3203
2931 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2932 3205
2933 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2938 3211
2939# 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)
2940sub popup { 3213sub popup {
2941 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2942 3215
2943 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2944 3217
2945 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3219 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2948 3221
2949 $self->show; 3222 $self->show;
2950 $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);
2951} 3224}
2952 3225
2953sub mouse_motion { 3226sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2955 3228
2956 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2959 3232
2960 0 3233 0
2961} 3234}
2962 3235
2963sub button_up { 3236sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2965 3238
2966 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3240 undef $GRAB;
2968 $self->hide; 3241 $self->hide;
2969 3242
2970 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3245 } else {
2973 return 0 3246 return 0
2974 } 3247 }
2975 3248
2976 1 3249 1
2977} 3250}
2978 3251
2979############################################################################# 3252#############################################################################
2980 3253
2981package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
2982 3255
2983our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
2984 3257
2985sub new { 3258sub new {
2986 my $class = shift; 3259 my $class = shift;
2987 3260
2988 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
3002 3275
3003 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3277 if @{ $self->{children} };
3005} 3278}
3006 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
3007sub set_current_page { 3286sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3009 3288
3010 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3290 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
3013 3292
3014 $self->{current} = $widget; 3293 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3295
3017 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
3018 3297
3019 $self->realloc; 3298 $self->realloc;
3020} 3299}
3021 3300
3022sub visible_children { 3301sub visible_children {
… …
3027 my ($self) = @_; 3306 my ($self) = @_;
3028 3307
3029 $self->{current}->size_request 3308 $self->{current}->size_request
3030} 3309}
3031 3310
3032sub size_allocate { 3311sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3034 3313
3035 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3036} 3317}
3037 3318
3038sub _draw { 3319sub _draw {
3039 my ($self) = @_; 3320 my ($self) = @_;
3040 3321
3041 $self->{current}->draw; 3322 $self->{current}->draw;
3042} 3323}
3043 3324
3044############################################################################# 3325#############################################################################
3045 3326
3046package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3047 3328
3048our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3049 3330
3050sub new { 3331sub new {
3051 my $class = shift; 3332 my $class = shift;
3052 3333
3053 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3057 @_, 3338 @_,
3058 ); 3339 );
3059 3340
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3066sub add { 3347sub add {
3067 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3068 3349
3069 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3070 3351
3071 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3072 markup => $title, 3353 markup => $title,
3073 tooltip => $tooltip, 3354 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3075 ); 3356 );
3076 3357
3077 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3078} 3359}
3079 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3080sub set_current_page { 3367sub set_current_page {
3081 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3082 3369
3083 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3085} 3372}
3086 3373
3087############################################################################# 3374#############################################################################
3088 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
3089package CFClient::UI::Statusbox; 3432package CFPlus::UI::Statusbox;
3090 3433
3091our @ISA = CFClient::UI::VBox::; 3434our @ISA = CFPlus::UI::VBox::;
3092 3435
3093sub new { 3436sub new {
3094 my $class = shift; 3437 my $class = shift;
3095 3438
3096 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
… …
3108sub reorder { 3451sub reorder {
3109 my ($self) = @_; 3452 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 3453 my $NOW = Time::HiRes::time;
3111 3454
3112 # freeze display when hovering over any label 3455 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 3456 return if $CFPlus::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3457 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 3458 values %{ $self->{item} };
3116 3459
3117 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 3462 }
… …
3140 for ($short) { 3483 for ($short) {
3141 s/^\s+//; 3484 s/^\s+//;
3142 s/\s+/ /g; 3485 s/\s+/ /g;
3143 } 3486 }
3144 3487
3145 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3146 markup => $short, 3489 markup => $short,
3147 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3188 $item->{count}++; 3531 $item->{count}++;
3189 } else { 3532 } else {
3190 $item->{count} = 1; 3533 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
3192 } 3535 }
3193 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3538 delete $item->{label};
3196 } else { 3539 } else {
3197 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
3204 count => 1, 3547 count => 1,
3205 %arg, 3548 %arg,
3206 }; 3549 };
3207 } 3550 }
3208 3551
3552 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3553 $self->reorder;
3554 });
3210} 3555}
3211 3556
3212sub reconfigure { 3557sub reconfigure {
3213 my ($self) = @_; 3558 my ($self) = @_;
3214 3559
… …
3217 3562
3218 $self->reorder; 3563 $self->reorder;
3219 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
3220} 3565}
3221 3566
3222sub DESTROY { 3567sub destroy {
3223 my ($self) = @_; 3568 my ($self) = @_;
3224 3569
3225 $self->{timer}->cancel; 3570 $self->{timer}->cancel;
3226 3571
3227 $self->SUPER::DESTROY; 3572 $self->SUPER::destroy;
3228} 3573}
3229 3574
3230############################################################################# 3575#############################################################################
3231 3576
3232package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3233 3578
3234our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3235 3580
3236sub new { 3581sub new {
3237 my $class = shift; 3582 my $class = shift;
3238 3583
3239 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3241 @_, 3587 @_,
3242 ); 3588 );
3243 3589
3590 $self->set_sort_order (undef);
3591
3244 $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;
3245} 3628}
3246 3629
3247sub set_items { 3630sub set_items {
3248 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3249 3632
3250 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3251 return unless $items; 3634 $self->update_items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270} 3635}
3271 3636
3272############################################################################# 3637#############################################################################
3273 3638
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList; 3639package CFPlus::UI::SpellList;
3472 3640
3473our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3474 3642
3475sub new { 3643sub new {
3476 my $class = shift; 3644 my $class = shift;
3477 3645
3478 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3480 commands => [], 3648 commands => [],
3481 @_, 3649 @_,
3482 ) 3650 )
3483} 3651}
3484 3652
3485# 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
3486sub add_spell { 3738sub add_spell {
3487 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3488 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3489 3742 $self->rebuild_spell_list;
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517} 3743}
3518 3744
3519sub remove_spell { 3745sub remove_spell {
3520 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3521 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3522 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3523} 3750}
3524 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3525############################################################################# 3759#############################################################################
3526 3760
3527package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3528 3762
3529our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3530 3764
3531use List::Util qw(min max); 3765use List::Util qw(min max);
3532 3766
3533use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3534 3768
3535sub new { 3769sub new {
3536 my $class = shift; 3770 my $class = shift;
3537 3771
3538 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3563 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3564 3798
3565 int $coord + 0.5 3799 int $coord + 0.5
3566} 3800}
3567 3801
3568sub size_allocate { 3802sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3570 3804
3571 for my $child ($self->children) { 3805 for my $child ($self->children) {
3572 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)};
3573 3807
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3579 3813
3580 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3581 } 3815 }
3816
3817 1
3582} 3818}
3583 3819
3584sub coord2local { 3820sub coord2local {
3585 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3586 3822
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 3949
3714 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3716 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
3717 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3719 3964
3720 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}) {
3721 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 3991 glLoadIdentity;
3747 3992
3748 { 3993 {
3749 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3750 3995
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3753 } 3998 }
3754 3999
3755 $self->_draw; 4000 $self->_draw;
3756} 4001}
3757 4002
3758############################################################################# 4003#############################################################################
3759 4004
3760package CFClient::UI; 4005package CFPlus::UI;
3761 4006
3762$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4009
37651 40101
3766 4011

Diff Legend

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